Differential D23757 Diff 66123 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 "Create New" menu ​
998 menu->addMenu(m_newFileMenu->menu()); 997​ menu->addMenu(m_newFileMenu->menu());
998​ addActionToMenu(ac->action(QStringLiteral("file_new")), menu);
999​ addActionToMenu(ac->action(QStringLiteral("new_tab")), menu);
1000​ addActionToMenu(ac->action(QStringLiteral("closed_tabs")), menu);
999 1001​
1000 menu->addSeparator(); 1002​ 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 1003​
1002 // Overwrite Find action to Search action ​
1003 QAction *searchAction = ac->action(KStandardAction::name(KStandardAction::Find)); ​
1004 searchAction->setText(i18n("Search...")); ​
1005 ​
1006 // Add "Edit" actions 1004​ // Add "Edit" actions
1007 bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) | 1005​ bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) |
1008 addActionToMenu(searchAction, menu) | ​
1009 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::SelectAll)), menu) | 1006​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::SelectAll)), menu) |
1010 addActionToMenu(ac->action(QStringLiteral("invert_selection")), menu); 1007​ addActionToMenu(ac->action(QStringLiteral("invert_selection")), menu);
1011 1008​
1012 if (added) { 1009​ if (added) {
1013 menu->addSeparator(); 1010​ menu->addSeparator();
1014 } 1011​ }
1015 1012​
1016 // Add "View" actions 1013​ // Add "View" actions
1017 if (!GeneralSettings::showZoomSlider()) { 1014​ if (!GeneralSettings::showZoomSlider()) {
1018 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomIn)), menu); 1015​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomIn)), menu);
1019 addActionToMenu(ac->action(QStringLiteral("view_zoom_reset")), menu); 1016​ addActionToMenu(ac->action(QStringLiteral("view_zoom_reset")), menu);
1020 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomOut)), menu); 1017​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomOut)), menu);
1021 menu->addSeparator(); 1018​ menu->addSeparator();
1022 } 1019​ }
1023 1020​
1024 added = addActionToMenu(ac->action(QStringLiteral("sort")), menu) | 1021​ added = addActionToMenu(ac->action(QStringLiteral("show_preview")), 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…
1025 addActionToMenu(ac->action(QStringLiteral("view_mode")), menu) | ​
1026 addActionToMenu(ac->action(QStringLiteral("additional_info")), menu) | ​
1027 addActionToMenu(ac->action(QStringLiteral("show_preview")), menu) | ​
1028 addActionToMenu(ac->action(QStringLiteral("show_in_groups")), menu) | 1022​ addActionToMenu(ac->action(QStringLiteral("show_in_groups")), menu) |
1029 addActionToMenu(ac->action(QStringLiteral("show_hidden_files")), menu); 1023​ addActionToMenu(ac->action(QStringLiteral("show_hidden_files")), menu) |
1030 1024​ addActionToMenu(ac->action(QStringLiteral("additional_info")), menu) |
1031 if (added) { ​
1032 menu->addSeparator(); ​
1033 } ​
1034 ​
1035 added = addActionToMenu(ac->action(QStringLiteral("split_view")), menu) | ​
1036 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Redisplay)), menu) | ​
1037 addActionToMenu(ac->action(QStringLiteral("view_properties")), menu); 1025​ addActionToMenu(ac->action(QStringLiteral("view_properties")), menu);
1026​
1038 if (added) { 1027​ if (added) {
1039 menu->addSeparator(); 1028​ menu->addSeparator();
1040 } 1029​ }
1041 1030​
1042 addActionToMenu(ac->action(QStringLiteral("panels")), menu); 1031​ // Add a curated assortment of items from the "Tools" menu
1043 QMenu* locationBarMenu = new QMenu(i18nc("@action:inmenu", "Location Bar"), menu); 1032​ addActionToMenu(ac->action(QStringLiteral("show_filter_bar")), menu);
1044 locationBarMenu->addAction(ac->action(QStringLiteral("editable_location"))); 1033​ addActionToMenu(ac->action(QStringLiteral("open_terminal")), menu);
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…
1045 locationBarMenu->addAction(ac->action(QStringLiteral("replace_location"))); ​
1046 menu->addMenu(locationBarMenu); ​
1047 1034​
1048 menu->addSeparator(); 1035​ menu->addSeparator();
1049 1036​
1050 // Add "Go" menu 1037​ // Add "Show Panels" menu
1051 QMenu* goMenu = new QMenu(i18nc("@action:inmenu", "Go"), menu); 1038​ addActionToMenu(ac->action(QStringLiteral("panels")), menu);
1052 goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back))); ​
1053 goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward))); ​
1054 goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up))); ​
1055 goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Home))); ​
1056 goMenu->addAction(ac->action(QStringLiteral("closed_tabs"))); ​
1057 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.
1058 m_bookmarkHandler->fillControlMenu(bookmarkMenu->menu(), ac); ​
1059 goMenu->addAction(bookmarkMenu); ​
1060 menu->addMenu(goMenu); ​
1061 ​
1062 // Add "Tool" menu ​
1063 QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu); ​
1064 toolsMenu->addAction(ac->action(QStringLiteral("show_filter_bar"))); ​
1065 toolsMenu->addAction(ac->action(QStringLiteral("compare_files"))); ​
1066 toolsMenu->addAction(ac->action(QStringLiteral("open_terminal"))); ​
1067 toolsMenu->addAction(ac->action(QStringLiteral("change_remote_encoding"))); ​
1068 menu->addMenu(toolsMenu); ​
1069 1039​
1070 // Add "Settings" menu entries 1040​ // Add "Settings" menu entries
1071 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu); 1041​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu);
1072 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu); 1042​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu);
1073 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu); 1043​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu);
1044​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ShowMenubar)), menu);
1074 1045​
1075 // Add "Help" menu 1046​ // Add "Help" menu
1076 menu->addMenu(m_helpMenu->menu()); 1047​ auto helpMenu = m_helpMenu->menu();
1077 1048​ helpMenu->setIcon(QIcon::fromTheme(QStringLiteral("system-help")));
1078 menu->addSeparator(); 1049​ menu->addMenu(helpMenu);
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 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ShowMenubar)), menu); ​
1080} 1050​}
1081 1051​
1082void DolphinMainWindow::updateToolBar() 1052​void DolphinMainWindow::updateToolBar()
1083{ 1053​{
1084 if (!menuBar()->isVisible()) { 1054​ if (!menuBar()->isVisible()) {
1085 createControlButton(); 1055​ createControlButton();
1086 } 1056​ }
1087} 1057​}
▲ Show 20 Lines • Show All 1079 Lines • Show Last 20 Lines