]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Don't show 'Open Terminal' on Windows
authorElvis Angelaccio <elvis.angelaccio@kde.org>
Sun, 21 Jan 2018 11:15:07 +0000 (12:15 +0100)
committerElvis Angelaccio <elvis.angelaccio@kde.org>
Sun, 21 Jan 2018 11:15:07 +0000 (12:15 +0100)
We already disable the TerminalPanel on Windows, we should do the same
with the 'Open Terminal' action for consistency.

src/dolphinmainwindow.cpp
src/dolphinpart.cpp

index 4d0e6b20dd79086f0d0ef4d625631d8db0790e90..62b07f5a24aa1fc815de1094e25a364979d031ed 100644 (file)
@@ -1184,6 +1184,7 @@ void DolphinMainWindow::setupActions()
     compareFiles->setEnabled(false);
     connect(compareFiles, &QAction::triggered, this, &DolphinMainWindow::compareFiles);
 
+#ifndef Q_OS_WIN
     if (KAuthorized::authorize(QStringLiteral("shell_access"))) {
         QAction* openTerminal = actionCollection()->addAction(QStringLiteral("open_terminal"));
         openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal"));
@@ -1191,6 +1192,7 @@ void DolphinMainWindow::setupActions()
         actionCollection()->setDefaultShortcut(openTerminal, Qt::SHIFT | Qt::Key_F4);
         connect(openTerminal, &QAction::triggered, this, &DolphinMainWindow::openTerminal);
     }
+#endif
 
     // setup 'Settings' menu
     KToggleAction* showMenuBar = KStandardAction::showMenubar(nullptr, nullptr, actionCollection());
index c8bc8b647d526c3bb94ed671188b42b694674cae..6f8e20489ace4d37372706c35ac1022e5c77c4bc 100644 (file)
@@ -223,6 +223,7 @@ void DolphinPart::createActions()
     m_findFileAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-find")));
     connect(m_findFileAction, &QAction::triggered, this, &DolphinPart::slotFindFile);
 
+#ifndef Q_OS_WIN
     if (KAuthorized::authorize(QStringLiteral("shell_access"))) {
         m_openTerminalAction = actionCollection()->addAction(QStringLiteral("open_terminal"));
         m_openTerminalAction->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal")));
@@ -230,6 +231,7 @@ void DolphinPart::createActions()
         connect(m_openTerminalAction, &QAction::triggered, this, &DolphinPart::slotOpenTerminal);
         actionCollection()->setDefaultShortcut(m_openTerminalAction, Qt::Key_F4);
     }
+#endif
 }
 
 void DolphinPart::createGoAction(const char* name, const char* iconName,