Changeset View
Changeset View
Standalone View
Standalone View
src/dolphinmainwindow.cpp
| Show First 20 Lines • Show All 853 Lines • ▼ Show 20 Line(s) | 852 | { | |||
|---|---|---|---|---|---|
| 854 | Q_ASSERT(menu); | 854 | Q_ASSERT(menu); | ||
| 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 "Create New" menu | ||||
| 863 | menu->addMenu(m_newFileMenu->menu()); | ||||
| 864 | | ||||
| 865 | menu->addSeparator(); | ||||
| 866 | | ||||
| 862 | // Add "Edit" actions | 867 | // Add "Edit" actions | ||
anthonyfieroni: Why this? | |||||
| 863 | bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) | | 868 | bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) | | ||
| 864 | addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Find)), menu) | | 869 | addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Find)), menu) | | ||
| 865 | addActionToMenu(ac->action(KStandardAction::name(KStandardAction::SelectAll)), menu) | | 870 | addActionToMenu(ac->action(KStandardAction::name(KStandardAction::SelectAll)), menu) | | ||
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… | |||||
| 866 | addActionToMenu(ac->action(QStringLiteral("invert_selection")), menu); | 871 | addActionToMenu(ac->action(QStringLiteral("invert_selection")), menu); | ||
| 867 | 872 | | |||
| 868 | if (added) { | 873 | if (added) { | ||
| 869 | menu->addSeparator(); | 874 | menu->addSeparator(); | ||
| 870 | } | 875 | } | ||
| 871 | 876 | | |||
| 872 | // Add "View" actions | 877 | // Add "View" actions | ||
| 873 | if (!GeneralSettings::showZoomSlider()) { | 878 | if (!GeneralSettings::showZoomSlider()) { | ||
| ▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Line(s) | |||||
| 915 | QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu); | 920 | QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu); | ||
| 916 | toolsMenu->addAction(ac->action(QStringLiteral("show_filter_bar"))); | 921 | toolsMenu->addAction(ac->action(QStringLiteral("show_filter_bar"))); | ||
| 917 | toolsMenu->addAction(ac->action(QStringLiteral("compare_files"))); | 922 | toolsMenu->addAction(ac->action(QStringLiteral("compare_files"))); | ||
| 918 | toolsMenu->addAction(ac->action(QStringLiteral("open_terminal"))); | 923 | toolsMenu->addAction(ac->action(QStringLiteral("open_terminal"))); | ||
| 919 | toolsMenu->addAction(ac->action(QStringLiteral("change_remote_encoding"))); | 924 | toolsMenu->addAction(ac->action(QStringLiteral("change_remote_encoding"))); | ||
| 920 | menu->addMenu(toolsMenu); | 925 | menu->addMenu(toolsMenu); | ||
| 921 | 926 | | |||
| 922 | // Add "Settings" menu entries | 927 | // Add "Settings" menu entries | ||
| 923 | addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu); | 928 | addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu); | ||
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 | addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu); | 929 | addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu); | ||
| 925 | addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu); | 930 | addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu); | ||
| 926 | 931 | | |||
| 927 | // Add "Help" menu | 932 | // Add "Help" menu | ||
| 928 | auto helpMenu = new KHelpMenu(menu); | 933 | auto helpMenu = new KHelpMenu(menu); | ||
| 929 | menu->addMenu(helpMenu->menu()); | 934 | menu->addMenu(helpMenu->menu()); | ||
| 930 | 935 | | |||
| 931 | menu->addSeparator(); | 936 | menu->addSeparator(); | ||
| ▲ Show 20 Lines • Show All 660 Lines • Show Last 20 Lines | |||||
Why this?