Differential D10959 Diff 54284 src/dolphinmainwindow.cpp

Changeset View

Standalone View

View Options

src/dolphinmainwindow.cpp

Show All 34 Lines
35#include "panels/places/placespanel.h" 35​#include "panels/places/placespanel.h"
36#include "panels/information/informationpanel.h" 36​#include "panels/information/informationpanel.h"
37#include "panels/terminal/terminalpanel.h" 37​#include "panels/terminal/terminalpanel.h"
38#include "settings/dolphinsettingsdialog.h" 38​#include "settings/dolphinsettingsdialog.h"
39#include "statusbar/dolphinstatusbar.h" 39​#include "statusbar/dolphinstatusbar.h"
40#include "views/dolphinviewactionhandler.h" 40​#include "views/dolphinviewactionhandler.h"
41#include "views/dolphinremoteencoding.h" 41​#include "views/dolphinremoteencoding.h"
42#include "views/draganddrophelper.h" 42​#include "views/draganddrophelper.h"
43#include "views/viewproperties.h" 43​#include "views/viewproperties.h"
elvisangelaccioUnsubmitted
Done

Please remove the unrelated changes to the includes

elvisangelaccio: Please remove the unrelated changes to the includes
44#include "views/dolphinnewfilemenuobserver.h" 44​#include "views/dolphinnewfilemenuobserver.h"
45#include "dolphin_generalsettings.h" 45​#include "dolphin_generalsettings.h"
46 46​
47#include <KActionCollection> 47​#include <KActionCollection>
48#include <KActionMenu> 48​#include <KActionMenu>
49#include <KAuthorized> 49​#include <KAuthorized>
50#include <KConfig> 50​#include <KConfig>
51#include <KDualAction> 51​#include <KDualAction>
▲ Show 20 Lines • Show All 919 Lines • ▼ Show 20 Line(s)907{
971 goMenu->addAction(ac->action(QStringLiteral("closed_tabs"))); 971​ goMenu->addAction(ac->action(QStringLiteral("closed_tabs")));
972 menu->addMenu(goMenu); 972​ menu->addMenu(goMenu);
973 973​
974 // Add "Tool" menu 974​ // Add "Tool" menu
975 QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu); 975​ QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu);
976 toolsMenu->addAction(ac->action(QStringLiteral("show_filter_bar"))); 976​ toolsMenu->addAction(ac->action(QStringLiteral("show_filter_bar")));
977 toolsMenu->addAction(ac->action(QStringLiteral("compare_files"))); 977​ toolsMenu->addAction(ac->action(QStringLiteral("compare_files")));
978 toolsMenu->addAction(ac->action(QStringLiteral("open_terminal"))); 978​ toolsMenu->addAction(ac->action(QStringLiteral("open_terminal")));
979​ toolsMenu->addAction(ac->action(QStringLiteral("focus_terminal_panel")));
979 toolsMenu->addAction(ac->action(QStringLiteral("change_remote_encoding"))); 980​ toolsMenu->addAction(ac->action(QStringLiteral("change_remote_encoding")));
980 menu->addMenu(toolsMenu); 981​ menu->addMenu(toolsMenu);
981 982​
982 // Add "Settings" menu entries 983​ // Add "Settings" menu entries
983 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu); 984​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu);
984 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu); 985​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu);
985 addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu); 986​ addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu);
986 987​
▲ Show 20 Lines • Show All 229 Lines • ▼ Show 20 Line(s)
1216 1217​
1217#ifdef HAVE_TERMINAL 1218​#ifdef HAVE_TERMINAL
1218 if (KAuthorized::authorize(QStringLiteral("shell_access"))) { 1219​ if (KAuthorized::authorize(QStringLiteral("shell_access"))) {
1219 QAction* openTerminal = actionCollection()->addAction(QStringLiteral("open_terminal")); 1220​ QAction* openTerminal = actionCollection()->addAction(QStringLiteral("open_terminal"));
1220 openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal")); 1221​ openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal"));
1221 openTerminal->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal"))); 1222​ openTerminal->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal")));
1222 actionCollection()->setDefaultShortcut(openTerminal, Qt::SHIFT + Qt::Key_F4); 1223​ actionCollection()->setDefaultShortcut(openTerminal, Qt::SHIFT + Qt::Key_F4);
1223 connect(openTerminal, &QAction::triggered, this, &DolphinMainWindow::openTerminal); 1224​ connect(openTerminal, &QAction::triggered, this, &DolphinMainWindow::openTerminal);
1225​
1226​ QAction* focusTerminalPanel = actionCollection()->addAction(QStringLiteral("focus_terminal_panel"));
1227​ focusTerminalPanel->setText(i18nc("@action:inmenu Tools", "Focus Terminal Panel"));
elvisangelaccioUnsubmitted
Done

This action is not the Tools menu. Either add it there or remove Tools from the translation context ;)

elvisangelaccio: This action is not the Tools menu. Either add it there or remove Tools from the translation…
1228​ focusTerminalPanel->setIcon(QIcon::fromTheme(QStringLiteral("swap-panels")));
1229​ actionCollection()->setDefaultShortcut(focusTerminalPanel, Qt::CTRL + Qt::SHIFT + Qt::Key_F4);
1230​ connect(focusTerminalPanel, &QAction::triggered, this, &DolphinMainWindow::focusTerminalPanel);
1224 } 1231​ }
1225#endif 1232​#endif
1226 1233​
1227 // setup 'Settings' menu 1234​ // setup 'Settings' menu
1228 KToggleAction* showMenuBar = KStandardAction::showMenubar(nullptr, nullptr, actionCollection()); 1235​ KToggleAction* showMenuBar = KStandardAction::showMenubar(nullptr, nullptr, actionCollection());
1229 connect(showMenuBar, &KToggleAction::triggered, // Fixes #286822 1236​ connect(showMenuBar, &KToggleAction::triggered, // Fixes #286822
elvisangelaccioUnsubmitted
Done

Please add braces. Maybe this could also go in a private slot rathern than a lambda.

elvisangelaccio: Please add braces. Maybe this could also go in a private slot rathern than a lambda.
1230 this, &DolphinMainWindow::toggleShowMenuBar, Qt::QueuedConnection); 1237​ this, &DolphinMainWindow::toggleShowMenuBar, Qt::QueuedConnection);
1231 KStandardAction::preferences(this, &DolphinMainWindow::editSettings, actionCollection()); 1238​ KStandardAction::preferences(this, &DolphinMainWindow::editSettings, actionCollection());
1232 1239​
elvisangelaccioUnsubmitted
Done

Please use a dedicated function.

elvisangelaccio: Please use a dedicated function.
1233 // not in menu actions 1240​ // not in menu actions
1234 QList<QKeySequence> nextTabKeys = KStandardShortcut::tabNext(); 1241​ QList<QKeySequence> nextTabKeys = KStandardShortcut::tabNext();
1235 nextTabKeys.append(QKeySequence(Qt::CTRL + Qt::Key_Tab)); 1242​ nextTabKeys.append(QKeySequence(Qt::CTRL + Qt::Key_Tab));
1236 1243​
1237 QList<QKeySequence> prevTabKeys = KStandardShortcut::tabPrev(); 1244​ QList<QKeySequence> prevTabKeys = KStandardShortcut::tabPrev();
1238 prevTabKeys.append(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Tab)); 1245​ prevTabKeys.append(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_Tab));
1239 1246​
1240 QAction* activateNextTab = actionCollection()->addAction(QStringLiteral("activate_next_tab")); 1247​ QAction* activateNextTab = actionCollection()->addAction(QStringLiteral("activate_next_tab"));
▲ Show 20 Lines • Show All 405 Lines • ▼ Show 20 Line(s)1649{
1646 panelAction->setText(dockAction->text()); 1653​ panelAction->setText(dockAction->text());
1647 panelAction->setIcon(icon); 1654​ panelAction->setIcon(icon);
1648 actionCollection()->setDefaultShortcut(panelAction, shortcut); 1655​ actionCollection()->setDefaultShortcut(panelAction, shortcut);
1649 1656​
1650 connect(panelAction, &QAction::triggered, dockAction, &QAction::trigger); 1657​ connect(panelAction, &QAction::triggered, dockAction, &QAction::trigger);
1651 connect(dockAction, &QAction::toggled, panelAction, &QAction::setChecked); 1658​ connect(dockAction, &QAction::toggled, panelAction, &QAction::setChecked);
1652} 1659​}
1653 1660​
1661​void DolphinMainWindow::focusTerminalPanel()
1662​{
1663​ if (m_terminalPanel->isVisible()) {
1664​ if (m_terminalPanel->terminalHasFocus()) {
1665​ m_activeViewContainer->view()->setFocus(Qt::FocusReason::ShortcutFocusReason);
1666​ actionCollection()->action(QStringLiteral("focus_terminal_panel"))->setText(i18nc("@action:inmenu Tools", "Focus Terminal Panel"));
elvisangelaccioUnsubmitted
Done

Please use the same context we use above ("@action:inmenu Tools")

Same for the i18n calls below.

elvisangelaccio: Please use the same context we use above ("@action:inmenu Tools") Same for the i18n calls…
1667​ } else {
1668​ m_terminalPanel->setFocus(Qt::FocusReason::ShortcutFocusReason);
1669​ actionCollection()->action(QStringLiteral("focus_terminal_panel"))->setText(i18nc("@action:inmenu Tools", "Defocus Terminal Panel"));
1670​ }
1671​ } else {
1672​ actionCollection()->action(QStringLiteral("show_terminal_panel"))->trigger();
1673​ actionCollection()->action(QStringLiteral("focus_terminal_panel"))->setText(i18nc("@action:inmenu Tools", "Defocus Terminal Panel"));
1674​ }
1675​}
1676​
1654DolphinMainWindow::UndoUiInterface::UndoUiInterface() : 1677​DolphinMainWindow::UndoUiInterface::UndoUiInterface() :
1655 KIO::FileUndoManager::UiInterface() 1678​ KIO::FileUndoManager::UiInterface()
1656{ 1679​{
1657} 1680​}
1658 1681​
1659DolphinMainWindow::UndoUiInterface::~UndoUiInterface() 1682​DolphinMainWindow::UndoUiInterface::~UndoUiInterface()
1660{ 1683​{
1661} 1684​}
Show All 12 Lines