Differential D23757 Diff 65694 src/dolphinmainwindow.cpp

Changeset View

Standalone View

View Options

src/dolphinmainwindow.cpp

Show First 20 Lines • Show All 988 Lines • ▼ Show 20 Line(s)987{
989 Q_ASSERT(menu); 989​ Q_ASSERT(menu);
990 990​
991 // All actions get cleared by QMenu::clear(). This includes the sub-menus 991​ // All actions get cleared by QMenu::clear(). This includes the sub-menus
992 // because 'menu' is their parent. 992​ // because 'menu' is their parent.
993 menu->clear(); 993​ menu->clear();
994 994​
995 KActionCollection* ac = actionCollection(); 995​ KActionCollection* ac = actionCollection();
996 996​
997​ // Add 'New Window' and 'New Tab' entries.
998​ addActionToMenu(ac->action(QStringLiteral("file_new")), menu);
999​ addActionToMenu(ac->action(QStringLiteral("new_tab")), menu);
1000​
997 // Add "Create New" menu 1001​ // Add "Create New" menu
998 menu->addMenu(m_newFileMenu->menu()); 1002​ menu->addMenu(m_newFileMenu->menu());
999 1003​
1000 menu->addSeparator(); 1004​ menu->addSeparator();
elvisangelaccioUnsubmitted
Done

...and also 'Recently Closed Tabs'

Or just "Add tabs-related entries"

Or just remove the comment :-)

elvisangelaccio: ...and also 'Recently Closed Tabs' Or just "Add tabs-related entries" Or just remove the…
1001 1005​
1002 // Overwrite Find action to Search action 1006​ // Overwrite Find action to Search action
1003 QAction *searchAction = ac->action(KStandardAction::name(KStandardAction::Find)); 1007​ QAction *searchAction = ac->action(KStandardAction::name(KStandardAction::Find));
1004 searchAction->setText(i18n("Search...")); 1008​ searchAction->setText(i18n("Search..."));
1005 1009​
1006 // Add "Edit" actions 1010​ // Add "Edit" actions
1007 bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) | 1011​ bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) |
1008 addActionToMenu(searchAction, menu) | 1012​ addActionToMenu(searchAction, menu) |
1009 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::SelectAll)), menu) | 1013​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::SelectAll)), menu) |
1010 addActionToMenu(ac->action(QStringLiteral("invert_selection")), menu); 1014​ addActionToMenu(ac->action(QStringLiteral("invert_selection")), menu);
1011 1015​
1012 if (added) { 1016​ if (added) {
1013 menu->addSeparator(); 1017​ menu->addSeparator();
1014 } 1018​ }
1015 1019​
1016 // Add "View" actions 1020​ // Add "View" actions
1017 if (!GeneralSettings::showZoomSlider()) { 1021​ if (!GeneralSettings::showZoomSlider()) {
1018 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomIn)), menu); 1022​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomIn)), menu);
1019 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomOut)), menu); 1023​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomOut)), menu);
1020 menu->addSeparator(); 1024​ menu->addSeparator();
1021 } 1025​ }
1022 1026​
1023 added = addActionToMenu(ac->action(QStringLiteral("sort")), menu) | 1027​ added = addActionToMenu(ac->action(QStringLiteral("sort")), menu) |
elvisangelaccioUnsubmitted
Done

Why remove sort?

elvisangelaccio: Why remove `sort`?
ngrahamAuthorUnsubmitted
Done

Same reason to remove the view mode chooser: Because it's in the default toolbar and the viewport context menu.

ngraham: Same reason to remove the view mode chooser: Because it's in the default toolbar and the…
1024 addActionToMenu(ac->action(QStringLiteral("view_mode")), menu) | 1028​ addActionToMenu(ac->action(QStringLiteral("view_mode")), menu) |
1025 addActionToMenu(ac->action(QStringLiteral("additional_info")), menu) | 1029​ addActionToMenu(ac->action(QStringLiteral("additional_info")), menu) |
1026 addActionToMenu(ac->action(QStringLiteral("show_preview")), menu) | 1030​ addActionToMenu(ac->action(QStringLiteral("show_preview")), menu) |
1027 addActionToMenu(ac->action(QStringLiteral("show_in_groups")), menu) | 1031​ addActionToMenu(ac->action(QStringLiteral("show_in_groups")), menu) |
1028 addActionToMenu(ac->action(QStringLiteral("show_hidden_files")), menu); 1032​ addActionToMenu(ac->action(QStringLiteral("show_hidden_files")), menu);
1029 1033​
1030 if (added) { 1034​ if (added) {
1031 menu->addSeparator(); 1035​ menu->addSeparator();
1032 } 1036​ }
1033 1037​
1034 added = addActionToMenu(ac->action(QStringLiteral("split_view")), menu) | 1038​ added = addActionToMenu(ac->action(QStringLiteral("split_view")), menu) |
1035 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Redisplay)), menu) | 1039​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Redisplay)), menu) |
1036 addActionToMenu(ac->action(QStringLiteral("view_properties")), menu); 1040​ addActionToMenu(ac->action(QStringLiteral("view_properties")), menu);
1037 if (added) { 1041​ if (added) {
1038 menu->addSeparator(); 1042​ menu->addSeparator();
1039 } 1043​ }
1040 1044​
1041 addActionToMenu(ac->action(QStringLiteral("panels")), menu); 1045​ addActionToMenu(ac->action(QStringLiteral("panels")), menu);
1042 QMenu* locationBarMenu = new QMenu(i18nc("@action:inmenu", "Location Bar"), menu); 1046​ QMenu* locationBarMenu = new QMenu(i18nc("@action:inmenu", "Location Bar"), menu);
1043 locationBarMenu->addAction(ac->action(QStringLiteral("editable_location"))); 1047​ locationBarMenu->addAction(ac->action(QStringLiteral("editable_location")));
1044 locationBarMenu->addAction(ac->action(QStringLiteral("replace_location"))); 1048​ locationBarMenu->addAction(ac->action(QStringLiteral("replace_location")));
1045 menu->addMenu(locationBarMenu); 1049​ menu->addMenu(locationBarMenu);
1046 1050​
1047 menu->addSeparator(); 1051​ menu->addSeparator();
elvisangelaccioUnsubmitted
Done

I'm not sure about this one, since it will be disabled most of the time. If you want to compare 2 files you have to select both of them and then you will probably use the right-click.

I'd actually keep the "Tools" menu, while I agree with the removal of the "Go" menu (since you can use most of its actions from the toolbar).

elvisangelaccio: I'm not sure about this one, since it will be disabled most of the time. If you want to compare…
ngrahamAuthorUnsubmitted
Done

My thinking was that it would make sense not to show yet another submenu, especially since it would become a single-item group, with separators above and below it, which looks a bit ugly. The Hamburger menu is already a "curated" assortment of items.

ngraham: My thinking was that it would make sense not to show yet another submenu, especially since it…
1048 1052​
1049 // Add "Go" menu 1053​ // Add "Go" menu
1050 QMenu* goMenu = new QMenu(i18nc("@action:inmenu", "Go"), menu); 1054​ QMenu* goMenu = new QMenu(i18nc("@action:inmenu", "Go"), menu);
1051 goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back))); 1055​ goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back)));
1052 goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward))); 1056​ goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward)));
1053 goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up))); 1057​ goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up)));
1054 goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Home))); 1058​ goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Home)));
1055 goMenu->addAction(ac->action(QStringLiteral("closed_tabs"))); 1059​ goMenu->addAction(ac->action(QStringLiteral("closed_tabs")));
1056 KActionMenu *bookmarkMenu = new KActionMenu(i18nc("@title:menu", "&Bookmarks"), goMenu); 1060​ KActionMenu *bookmarkMenu = new KActionMenu(i18nc("@title:menu", "&Bookmarks"), goMenu);
elvisangelaccioUnsubmitted
Done

Ah, I didn't think about Bookmarks. I guess it can go...

elvisangelaccio: Ah, I didn't think about Bookmarks. I guess it can go...
ngrahamAuthorUnsubmitted
Done

Yeah I think its overkill for the simplified UI presentation in the hamburger menu.

ngraham: Yeah I think its overkill for the simplified UI presentation in the hamburger menu.
1057 m_bookmarkHandler->fillControlMenu(bookmarkMenu->menu(), ac); 1061​ m_bookmarkHandler->fillControlMenu(bookmarkMenu->menu(), ac);
1058 goMenu->addAction(bookmarkMenu); 1062​ goMenu->addAction(bookmarkMenu);
1059 menu->addMenu(goMenu); 1063​ menu->addMenu(goMenu);
1060 1064​
1061 // Add "Tool" menu 1065​ // Add "Tool" menu
1062 QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu); 1066​ QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu);
1063 toolsMenu->addAction(ac->action(QStringLiteral("show_filter_bar"))); 1067​ toolsMenu->addAction(ac->action(QStringLiteral("show_filter_bar")));
1064 toolsMenu->addAction(ac->action(QStringLiteral("compare_files"))); 1068​ toolsMenu->addAction(ac->action(QStringLiteral("compare_files")));
1065 toolsMenu->addAction(ac->action(QStringLiteral("open_terminal"))); 1069​ toolsMenu->addAction(ac->action(QStringLiteral("open_terminal")));
1066 toolsMenu->addAction(ac->action(QStringLiteral("change_remote_encoding"))); 1070​ toolsMenu->addAction(ac->action(QStringLiteral("change_remote_encoding")));
1067 menu->addMenu(toolsMenu); 1071​ menu->addMenu(toolsMenu);
1068 1072​
1069 // Add "Settings" menu entries 1073​ // Add "Settings" menu entries
1070 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu); 1074​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu);
1071 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu); 1075​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu);
1072 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu); 1076​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu);
1073 1077​
1074 // Add "Help" menu 1078​ // Add "Help" menu
1075 menu->addMenu(m_helpMenu->menu()); 1079​ menu->addMenu(m_helpMenu->menu());
1076 1080​
1077 menu->addSeparator(); 1081​ menu->addSeparator();
1078 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ShowMenubar)), menu); 1082​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ShowMenubar)), menu);
elvisangelaccioUnsubmitted
Done

Hmm, I don't really see what we gain by shuffling "Help" and "Show Menubar" and removing the separator...

elvisangelaccio: Hmm, I don't really see what we gain by shuffling "Help" and "Show Menubar" and removing the…
ngrahamAuthorUnsubmitted
Done

There's no logical grouping of "Help" and "Show Menubar", so I didn't think it made sense to put them in a section together.

Also, removing the separator generally alleviates the "separator overload" effect that currently contributes to the the menu being too tall and visually overwhelming.

ngraham: There's no logical grouping of "Help" and "Show Menubar", so I didn't think it made sense to…
elvisangelaccioUnsubmitted
Not Done

Fair enough :)

elvisangelaccio: Fair enough :)
1079} 1083​}
1080 1084​
1081void DolphinMainWindow::updateToolBar() 1085​void DolphinMainWindow::updateToolBar()
1082{ 1086​{
1083 if (!menuBar()->isVisible()) { 1087​ if (!menuBar()->isVisible()) {
1084 createControlButton(); 1088​ createControlButton();
1085 } 1089​ }
1086} 1090​}
▲ Show 20 Lines • Show All 1082 Lines • Show Last 20 Lines