Differential D19926 Diff 54510 src/dolphinmainwindow.cpp

Changeset View

Standalone View

View Options

src/dolphinmainwindow.cpp

Show All 17 Lines
18 * Free Software Foundation, Inc., * 18​ * Free Software Foundation, Inc., *
19 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 19​ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
20 ***************************************************************************/ 20​ ***************************************************************************/
21 21​
22#include "dolphinmainwindow.h" 22​#include "dolphinmainwindow.h"
23 23​
24#include "config-terminal.h" 24​#include "config-terminal.h"
25#include "global.h" 25​#include "global.h"
26​#include "dolphinbookmarkhandler.h"
26#include "dolphindockwidget.h" 27​#include "dolphindockwidget.h"
27#include "dolphincontextmenu.h" 28​#include "dolphincontextmenu.h"
28#include "dolphinnewfilemenu.h" 29​#include "dolphinnewfilemenu.h"
29#include "dolphinrecenttabsmenu.h" 30​#include "dolphinrecenttabsmenu.h"
30#include "dolphinviewcontainer.h" 31​#include "dolphinviewcontainer.h"
31#include "dolphintabpage.h" 32​#include "dolphintabpage.h"
32#include "middleclickactioneventfilter.h" 33​#include "middleclickactioneventfilter.h"
33#include "panels/folders/folderspanel.h" 34​#include "panels/folders/folderspanel.h"
▲ Show 20 Lines • Show All 144 Lines • ▼ Show 20 Line(s)104{
178 connect(middleClickEventFilter, &MiddleClickActionEventFilter::actionMiddleClicked, this, &DolphinMainWindow::slotToolBarActionMiddleClicked); 179​ connect(middleClickEventFilter, &MiddleClickActionEventFilter::actionMiddleClicked, this, &DolphinMainWindow::slotToolBarActionMiddleClicked);
179 toolBar()->installEventFilter(middleClickEventFilter); 180​ toolBar()->installEventFilter(middleClickEventFilter);
180} 181​}
181 182​
182DolphinMainWindow::~DolphinMainWindow() 183​DolphinMainWindow::~DolphinMainWindow()
183{ 184​{
184} 185​}
185 186​
187​QList<DolphinViewContainer*> DolphinMainWindow::allViewContainers() const
188​{
189​ QList<DolphinViewContainer*> viewContainers;
190​ viewContainers.reserve(m_tabWidget->count());
191​ for (int i = 0; i < m_tabWidget->count(); ++i) {
192​ viewContainers << m_tabWidget->tabPageAt(i)->activeViewContainer();
193​ }
194​ return viewContainers;
195​}
196​
186void DolphinMainWindow::openDirectories(const QList<QUrl>& dirs, bool splitView) 197​void DolphinMainWindow::openDirectories(const QList<QUrl>& dirs, bool splitView)
187{ 198​{
188 m_tabWidget->openDirectories(dirs, splitView); 199​ m_tabWidget->openDirectories(dirs, splitView);
189} 200​}
190 201​
191void DolphinMainWindow::openFiles(const QList<QUrl>& files, bool splitView) 202​void DolphinMainWindow::openFiles(const QList<QUrl>& files, bool splitView)
192{ 203​{
193 m_tabWidget->openFiles(files, splitView); 204​ m_tabWidget->openFiles(files, splitView);
▲ Show 20 Lines • Show All 781 Lines • ▼ Show 20 Line(s)927{
975 QMenu* goMenu = new QMenu(i18nc("@action:inmenu", "Go"), menu); 986​ QMenu* goMenu = new QMenu(i18nc("@action:inmenu", "Go"), menu);
976 goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back))); 987​ goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back)));
977 goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward))); 988​ goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward)));
978 goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up))); 989​ goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up)));
979 goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Home))); 990​ goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Home)));
980 goMenu->addAction(ac->action(QStringLiteral("closed_tabs"))); 991​ goMenu->addAction(ac->action(QStringLiteral("closed_tabs")));
981 menu->addMenu(goMenu); 992​ menu->addMenu(goMenu);
982 993​
983 // Add "Tool" menu 994​ // Add "Tool" menu
984 QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu); 995​ QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu);
985 toolsMenu->addAction(ac->action(QStringLiteral("show_filter_bar"))); 996​ toolsMenu->addAction(ac->action(QStringLiteral("show_filter_bar")));
986 toolsMenu->addAction(ac->action(QStringLiteral("compare_files"))); 997​ toolsMenu->addAction(ac->action(QStringLiteral("compare_files")));
elvisangelaccioUnsubmitted
Done

Please move this under the Go menu too.

elvisangelaccio: Please move this under the Go menu too.
987 toolsMenu->addAction(ac->action(QStringLiteral("open_terminal"))); 998​ toolsMenu->addAction(ac->action(QStringLiteral("open_terminal")));
988 toolsMenu->addAction(ac->action(QStringLiteral("change_remote_encoding"))); 999​ toolsMenu->addAction(ac->action(QStringLiteral("change_remote_encoding")));
989 menu->addMenu(toolsMenu); 1000​ menu->addMenu(toolsMenu);
990 1001​
991 // Add "Settings" menu entries 1002​ // Add "Settings" menu entries
992 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu); 1003​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu);
993 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu); 1004​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu);
994 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu); 1005​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu);
▲ Show 20 Lines • Show All 233 Lines • ▼ Show 20 Line(s)1238 if (KAuthorized::authorize(QStringLiteral("shell_access"))) {
1228 QAction* openTerminal = actionCollection()->addAction(QStringLiteral("open_terminal")); 1239​ QAction* openTerminal = actionCollection()->addAction(QStringLiteral("open_terminal"));
1229 openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal")); 1240​ openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal"));
1230 openTerminal->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal"))); 1241​ openTerminal->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal")));
1231 actionCollection()->setDefaultShortcut(openTerminal, Qt::SHIFT + Qt::Key_F4); 1242​ actionCollection()->setDefaultShortcut(openTerminal, Qt::SHIFT + Qt::Key_F4);
1232 connect(openTerminal, &QAction::triggered, this, &DolphinMainWindow::openTerminal); 1243​ connect(openTerminal, &QAction::triggered, this, &DolphinMainWindow::openTerminal);
1233 } 1244​ }
1234#endif 1245​#endif
1235 1246​
1247​ // setup 'Bookmarks' menu
1248​ KActionMenu *bookmarkMenu = new KActionMenu(i18nc("@title:menu", "&Bookmarks"), this);
1249​ new DolphinBookmarkHandler(this, actionCollection(), bookmarkMenu->menu(), this);
1250​ actionCollection()->addAction(QStringLiteral("bookmarks"), bookmarkMenu);
1251​
1236 // setup 'Settings' menu 1252​ // setup 'Settings' menu
1237 KToggleAction* showMenuBar = KStandardAction::showMenubar(nullptr, nullptr, actionCollection()); 1253​ KToggleAction* showMenuBar = KStandardAction::showMenubar(nullptr, nullptr, actionCollection());
1238 connect(showMenuBar, &KToggleAction::triggered, // Fixes #286822 1254​ connect(showMenuBar, &KToggleAction::triggered, // Fixes #286822
1239 this, &DolphinMainWindow::toggleShowMenuBar, Qt::QueuedConnection); 1255​ this, &DolphinMainWindow::toggleShowMenuBar, Qt::QueuedConnection);
1240 KStandardAction::preferences(this, &DolphinMainWindow::editSettings, actionCollection()); 1256​ KStandardAction::preferences(this, &DolphinMainWindow::editSettings, actionCollection());
1241 1257​
1242 // not in menu actions 1258​ // not in menu actions
1243 QList<QKeySequence> nextTabKeys = KStandardShortcut::tabNext(); 1259​ QList<QKeySequence> nextTabKeys = KStandardShortcut::tabNext();
▲ Show 20 Lines • Show All 439 Lines • Show Last 20 Lines