Merge branch 'release/21.08'

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 3966a08fe3221b558d1b7947178fae26ee39825a..ec15bb978a0b012d57feaf9abdcaa45018bf9fd3 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -56,10 +56,10 @@
 #include <KStandardAction>
 #include <KStartupInfo>
 #include <KSycoca>
 #include <KStandardAction>
 #include <KStartupInfo>
 #include <KSycoca>

+#include <KTerminalLauncherJob>

 #include <KToggleAction>
 #include <KToolBar>
 #include <KToolBarPopupAction>
 #include <KToggleAction>
 #include <KToolBar>
 #include <KToolBarPopupAction>

-#include <KToolInvocation>

 #include <KUrlComboBox>
 #include <KUrlNavigator>
 #include <KWindowSystem>
 #include <KUrlComboBox>
 #include <KUrlNavigator>
 #include <KWindowSystem>


@@ -211,11 +211,9 @@ DolphinMainWindow::DolphinMainWindow() :
     QTimer::singleShot(0, this, &DolphinMainWindow::updateOpenPreferredSearchToolAction);
 
     m_fileItemActions.setParentWidget(this);
     QTimer::singleShot(0, this, &DolphinMainWindow::updateOpenPreferredSearchToolAction);
 
     m_fileItemActions.setParentWidget(this);

-#if KIO_VERSION >= QT_VERSION_CHECK(5, 82, 0)

     connect(&m_fileItemActions, &KFileItemActions::error, this, [this](const QString &errorMessage) {
         showErrorMessage(errorMessage);
     });
     connect(&m_fileItemActions, &KFileItemActions::error, this, [this](const QString &errorMessage) {
         showErrorMessage(errorMessage);
     });

-#endif

 
     connect(GeneralSettings::self(), &GeneralSettings::splitViewChanged,
             this, &DolphinMainWindow::slotSplitViewChanged);
 
     connect(GeneralSettings::self(), &GeneralSettings::splitViewChanged,
             this, &DolphinMainWindow::slotSplitViewChanged);


@@ -1048,7 +1046,9 @@ void DolphinMainWindow::openTerminal()
     const QUrl url = m_activeViewContainer->url();
 
     if (url.isLocalFile()) {
     const QUrl url = m_activeViewContainer->url();
 
     if (url.isLocalFile()) {

-        KToolInvocation::invokeTerminal(QString(), {}, url.toLocalFile());
+        auto job = new KTerminalLauncherJob(QString());
+        job->setWorkingDirectory(url.toLocalFile());
+        job->start();

         return;
     }
 
         return;
     }
 


@@ -1062,14 +1062,18 @@ void DolphinMainWindow::openTerminal()
                 statUrl = job->mostLocalUrl();
             }
 
                 statUrl = job->mostLocalUrl();
             }
 

-            KToolInvocation::invokeTerminal(QString(), {}, statUrl.isLocalFile() ? statUrl.toLocalFile() : QDir::homePath());
+            auto job = new KTerminalLauncherJob(QString());
+            job->setWorkingDirectory(statUrl.isLocalFile() ? statUrl.toLocalFile() : QDir::homePath());
+            job->start();

         });
 
         return;
     }
 
     // Nothing worked, just use $HOME
         });
 
         return;
     }
 
     // Nothing worked, just use $HOME

-    KToolInvocation::invokeTerminal(QString(), {}, QDir::homePath());
+    auto job = new KTerminalLauncherJob(QString());
+    job->setWorkingDirectory(QDir::homePath());
+    job->start();

 }
 
 void DolphinMainWindow::editSettings()
 }
 
 void DolphinMainWindow::editSettings()


@@ -1542,7 +1546,8 @@ void DolphinMainWindow::setupActions()
     stashSplit->setToolTip(i18nc("@info", "Opens the stash virtual directory in a split window"));
     stashSplit->setIcon(QIcon::fromTheme(QStringLiteral("folder-stash")));
     stashSplit->setCheckable(false);
     stashSplit->setToolTip(i18nc("@info", "Opens the stash virtual directory in a split window"));
     stashSplit->setIcon(QIcon::fromTheme(QStringLiteral("folder-stash")));
     stashSplit->setCheckable(false);

-    stashSplit->setVisible(QDBusConnection::sessionBus().interface()->isServiceRegistered(QStringLiteral("org.kde.kio.StashNotifier")));
+    QDBusConnectionInterface *sessionInterface = QDBusConnection::sessionBus().interface();
+    stashSplit->setVisible(sessionInterface && sessionInterface->isServiceRegistered(QStringLiteral("org.kde.kio.StashNotifier")));

     connect(stashSplit, &QAction::triggered, this, &DolphinMainWindow::toggleSplitStash);
 
     KStandardAction::redisplay(this, &DolphinMainWindow::reloadView, actionCollection());
     connect(stashSplit, &QAction::triggered, this, &DolphinMainWindow::toggleSplitStash);
 
     KStandardAction::redisplay(this, &DolphinMainWindow::reloadView, actionCollection());