Differential D19926 Diff 56004 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 55 Lines • ▼ Show 20 Line(s)
89DolphinMainWindow::DolphinMainWindow() : 90​DolphinMainWindow::DolphinMainWindow() :
90 KXmlGuiWindow(nullptr), 91​ KXmlGuiWindow(nullptr),
91 m_newFileMenu(nullptr), 92​ m_newFileMenu(nullptr),
92 m_tabWidget(nullptr), 93​ m_tabWidget(nullptr),
93 m_activeViewContainer(nullptr), 94​ m_activeViewContainer(nullptr),
94 m_actionHandler(nullptr), 95​ m_actionHandler(nullptr),
95 m_remoteEncoding(nullptr), 96​ m_remoteEncoding(nullptr),
96 m_settingsDialog(), 97​ m_settingsDialog(),
98​ m_bookmarkHandler(nullptr),
97 m_controlButton(nullptr), 99​ m_controlButton(nullptr),
98 m_updateToolBarTimer(nullptr), 100​ m_updateToolBarTimer(nullptr),
99 m_lastHandleUrlStatJob(nullptr), 101​ m_lastHandleUrlStatJob(nullptr),
100 m_terminalPanel(nullptr), 102​ m_terminalPanel(nullptr),
101 m_placesPanel(nullptr), 103​ m_placesPanel(nullptr),
102 m_tearDownFromPlacesRequested(false) 104​ m_tearDownFromPlacesRequested(false)
103{ 105​{
104 Q_INIT_RESOURCE(dolphin); 106​ Q_INIT_RESOURCE(dolphin);
▲ Show 20 Lines • Show All 73 Lines • ▼ Show 20 Line(s)
178 connect(middleClickEventFilter, &MiddleClickActionEventFilter::actionMiddleClicked, this, &DolphinMainWindow::slotToolBarActionMiddleClicked); 180​ connect(middleClickEventFilter, &MiddleClickActionEventFilter::actionMiddleClicked, this, &DolphinMainWindow::slotToolBarActionMiddleClicked);
179 toolBar()->installEventFilter(middleClickEventFilter); 181​ toolBar()->installEventFilter(middleClickEventFilter);
180} 182​}
181 183​
182DolphinMainWindow::~DolphinMainWindow() 184​DolphinMainWindow::~DolphinMainWindow()
183{ 185​{
184} 186​}
185 187​
188​QList<DolphinViewContainer*> DolphinMainWindow::allViewContainers() const
189​{
190​ QList<DolphinViewContainer*> viewContainers;
191​ viewContainers.reserve(m_tabWidget->count());
192​ for (int i = 0; i < m_tabWidget->count(); ++i) {
193​ viewContainers << m_tabWidget->tabPageAt(i)->activeViewContainer();
194​ }
195​ return viewContainers;
196​}
197​
186void DolphinMainWindow::openDirectories(const QList<QUrl>& dirs, bool splitView) 198​void DolphinMainWindow::openDirectories(const QList<QUrl>& dirs, bool splitView)
187{ 199​{
188 m_tabWidget->openDirectories(dirs, splitView); 200​ m_tabWidget->openDirectories(dirs, splitView);
189} 201​}
190 202​
191void DolphinMainWindow::openFiles(const QList<QUrl>& files, bool splitView) 203​void DolphinMainWindow::openFiles(const QList<QUrl>& files, bool splitView)
192{ 204​{
193 m_tabWidget->openFiles(files, splitView); 205​ m_tabWidget->openFiles(files, splitView);
▲ Show 20 Lines • Show All 781 Lines • ▼ Show 20 Line(s)928{
975 QMenu* goMenu = new QMenu(i18nc("@action:inmenu", "Go"), menu); 987​ QMenu* goMenu = new QMenu(i18nc("@action:inmenu", "Go"), menu);
976 goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back))); 988​ goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back)));
977 goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward))); 989​ goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward)));
978 goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up))); 990​ goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up)));
979 goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Home))); 991​ goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Home)));
980 goMenu->addAction(ac->action(QStringLiteral("closed_tabs"))); 992​ goMenu->addAction(ac->action(QStringLiteral("closed_tabs")));
981 menu->addMenu(goMenu); 993​ menu->addMenu(goMenu);
982 994​
995​ // Add "Bookmarks" menu
996​ KActionMenu *bookmarkMenu = new KActionMenu(i18nc("@title:menu", "&Bookmarks"), menu);
997​ m_bookmarkHandler->fillControlMenu(bookmarkMenu->menu(), ac);
998​ addActionToMenu(bookmarkMenu, menu);
elvisangelaccioUnsubmitted
Done

Please move this under the Go menu too.

elvisangelaccio: Please move this under the Go menu too.
999​
983 // Add "Tool" menu 1000​ // Add "Tool" menu
984 QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu); 1001​ QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu);
985 toolsMenu->addAction(ac->action(QStringLiteral("show_filter_bar"))); 1002​ toolsMenu->addAction(ac->action(QStringLiteral("show_filter_bar")));
986 toolsMenu->addAction(ac->action(QStringLiteral("compare_files"))); 1003​ toolsMenu->addAction(ac->action(QStringLiteral("compare_files")));
987 toolsMenu->addAction(ac->action(QStringLiteral("open_terminal"))); 1004​ toolsMenu->addAction(ac->action(QStringLiteral("open_terminal")));
988 toolsMenu->addAction(ac->action(QStringLiteral("change_remote_encoding"))); 1005​ toolsMenu->addAction(ac->action(QStringLiteral("change_remote_encoding")));
989 menu->addMenu(toolsMenu); 1006​ menu->addMenu(toolsMenu);
990 1007​
▲ Show 20 Lines • Show All 241 Lines • ▼ Show 20 Line(s)1248 if (KAuthorized::authorize(QStringLiteral("shell_access"))) {
1232 QAction* openTerminal = actionCollection()->addAction(QStringLiteral("open_terminal")); 1249​ QAction* openTerminal = actionCollection()->addAction(QStringLiteral("open_terminal"));
1233 openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal")); 1250​ openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal"));
1234 openTerminal->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal"))); 1251​ openTerminal->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal")));
1235 actionCollection()->setDefaultShortcut(openTerminal, Qt::SHIFT + Qt::Key_F4); 1252​ actionCollection()->setDefaultShortcut(openTerminal, Qt::SHIFT + Qt::Key_F4);
1236 connect(openTerminal, &QAction::triggered, this, &DolphinMainWindow::openTerminal); 1253​ connect(openTerminal, &QAction::triggered, this, &DolphinMainWindow::openTerminal);
1237 } 1254​ }
1238#endif 1255​#endif
1239 1256​
1257​ // setup 'Bookmarks' menu
1258​ KActionMenu *bookmarkMenu = new KActionMenu(i18nc("@title:menu", "&Bookmarks"), this);
1259​ m_bookmarkHandler = new DolphinBookmarkHandler(this, actionCollection(), bookmarkMenu->menu(), this);
1260​ actionCollection()->addAction(QStringLiteral("bookmarks"), bookmarkMenu);
1261​
1240 // setup 'Settings' menu 1262​ // setup 'Settings' menu
1241 KToggleAction* showMenuBar = KStandardAction::showMenubar(nullptr, nullptr, actionCollection()); 1263​ KToggleAction* showMenuBar = KStandardAction::showMenubar(nullptr, nullptr, actionCollection());
1242 connect(showMenuBar, &KToggleAction::triggered, // Fixes #286822 1264​ connect(showMenuBar, &KToggleAction::triggered, // Fixes #286822
1243 this, &DolphinMainWindow::toggleShowMenuBar, Qt::QueuedConnection); 1265​ this, &DolphinMainWindow::toggleShowMenuBar, Qt::QueuedConnection);
1244 KStandardAction::preferences(this, &DolphinMainWindow::editSettings, actionCollection()); 1266​ KStandardAction::preferences(this, &DolphinMainWindow::editSettings, actionCollection());
1245 1267​
1246 // not in menu actions 1268​ // not in menu actions
1247 QList<QKeySequence> nextTabKeys = KStandardShortcut::tabNext(); 1269​ QList<QKeySequence> nextTabKeys = KStandardShortcut::tabNext();
▲ Show 20 Lines • Show All 439 Lines • Show Last 20 Lines