Differential D15609 Diff 41950 src/dolphinmainwindow.cpp

Changeset View

Standalone View

View Options

src/dolphinmainwindow.cpp

Show First 20 Lines • Show All 854 Lines • ▼ Show 20 Line(s)852{
855 855​
856 // All actions get cleared by QMenu::clear(). This includes the sub-menus 856​ // All actions get cleared by QMenu::clear(). This includes the sub-menus
857 // because 'menu' is their parent. 857​ // because 'menu' is their parent.
858 menu->clear(); 858​ menu->clear();
859 859​
860 KActionCollection* ac = actionCollection(); 860​ KActionCollection* ac = actionCollection();
861 861​
862 // Add "Edit" actions 862​ // Add "Edit" actions
863 bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) | 863​ bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) |
864 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Find)), menu) | 864​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Find)), menu) |
865 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::SelectAll)), menu) | 865​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::SelectAll)), menu) |
866 addActionToMenu(ac->action(QStringLiteral("invert_selection")), menu); 866​ addActionToMenu(ac->action(QStringLiteral("invert_selection")), menu);
867 867​
anthonyfieroniUnsubmitted
Done

Why this?

anthonyfieroni: Why this?
868 if (added) { 868​ if (added) {
869 menu->addSeparator(); 869​ menu->addSeparator();
870 } 870​ }
elvisangelaccioUnsubmitted
Done

Why duplicate the menu initialization? It's enough to use this one-liner:

menu->addMenu(m_newFileMenu->menu());
elvisangelaccio: Why duplicate the menu initialization? It's enough to use this one-liner: menu->addMenu…
871 871​
872 // Add "View" actions 872​ // Add "View" actions
873 if (!GeneralSettings::showZoomSlider()) { 873​ if (!GeneralSettings::showZoomSlider()) {
874 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomIn)), menu); 874​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomIn)), menu);
875 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomOut)), menu); 875​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomOut)), menu);
876 menu->addSeparator(); 876​ menu->addSeparator();
877 } 877​ }
878 878​
Show All 35 Lines
914 // Add "Tool" menu 914​ // Add "Tool" menu
915 QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu); 915​ QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu);
916 toolsMenu->addAction(ac->action(QStringLiteral("show_filter_bar"))); 916​ toolsMenu->addAction(ac->action(QStringLiteral("show_filter_bar")));
917 toolsMenu->addAction(ac->action(QStringLiteral("compare_files"))); 917​ toolsMenu->addAction(ac->action(QStringLiteral("compare_files")));
918 toolsMenu->addAction(ac->action(QStringLiteral("open_terminal"))); 918​ toolsMenu->addAction(ac->action(QStringLiteral("open_terminal")));
919 toolsMenu->addAction(ac->action(QStringLiteral("change_remote_encoding"))); 919​ toolsMenu->addAction(ac->action(QStringLiteral("change_remote_encoding")));
920 menu->addMenu(toolsMenu); 920​ menu->addMenu(toolsMenu);
921 921​
922​ // Add "Create New" menu
923​ QMenu* createNewMenu = m_newFileMenu->menu();
elvisangelaccioUnsubmitted
Done

Why here though? "Create New" belongs to the File menu, so it should probably be the very first thing in the Control menu.

elvisangelaccio: Why here though? "Create New" belongs to the File menu, so it should probably be the very first…
924​ menu->addMenu(createNewMenu);
925​ menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
926​ menu->setIcon(QIcon::fromTheme(QStringLiteral("document-new")));
927​ m_newFileMenu->setDelayed(false);
928​ connect(createNewMenu, &QMenu::aboutToShow,
929​ this, &DolphinMainWindow::updateNewMenu);
930​
931​ menu->addSeparator();
932​
922 // Add "Settings" menu entries 933​ // Add "Settings" menu entries
923 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu); 934​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu);
924 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu); 935​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu);
925 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu); 936​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu);
926 937​
927 // Add "Help" menu 938​ // Add "Help" menu
928 auto helpMenu = new KHelpMenu(menu); 939​ auto helpMenu = new KHelpMenu(menu);
929 menu->addMenu(helpMenu->menu()); 940​ menu->addMenu(helpMenu->menu());
▲ Show 20 Lines • Show All 662 Lines • Show Last 20 Lines