Fixes Dolphin crash on "Defocus Terminal Panel" menu click if no Konsole is installed.

[dolphin.git] / src / panels / terminal / terminalpanel.cpp

diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index ee88bd4c5aad508e0ca6bd6ddcaa5e5f7b446827..59b2694fb01aaf03cb0fe01702df5489afc8122c 100644 (file)
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -19,59 +19,83 @@
 
 #include "terminalpanel.h"
 
 
 #include "terminalpanel.h"
 

-#include <signal.h>
-
-#include <KPluginLoader>
-#include <KPluginFactory>
-#include <KService>
-#include <kde_terminal_interface.h>
-#include <KParts/ReadOnlyPart>
-#include <KShell>
+#include <KIO/DesktopExecParser>

 #include <KIO/Job>
 #include <KIO/JobUiDelegate>
 #include <KJobWidgets>
 #include <KIO/Job>
 #include <KIO/JobUiDelegate>
 #include <KJobWidgets>

+#include <KLocalizedString>
+#include <KMessageWidget>
+#include <KParts/ReadOnlyPart>
+#include <KPluginFactory>
+#include <KPluginLoader>
+#include <KService>
+#include <KShell>
+#include <kde_terminal_interface.h>

 
 

+#include <QAction>
+#include <QDesktopServices>

 #include <QDir>
 #include <QDir>

+#include <QLabel>

 #include <QShowEvent>
 #include <QShowEvent>

+#include <QTimer>

 #include <QVBoxLayout>
 
 TerminalPanel::TerminalPanel(QWidget* parent) :
     Panel(parent),
     m_clearTerminal(true),
 #include <QVBoxLayout>
 
 TerminalPanel::TerminalPanel(QWidget* parent) :
     Panel(parent),
     m_clearTerminal(true),

-    m_mostLocalUrlJob(0),
-    m_layout(0),
-    m_terminal(0),
-    m_terminalWidget(0),
-    m_konsolePart(0),
+    m_mostLocalUrlJob(nullptr),
+    m_layout(nullptr),
+    m_terminal(nullptr),
+    m_terminalWidget(nullptr),
+    m_konsolePartMissingMessage(nullptr),
+    m_konsolePart(nullptr),

     m_konsolePartCurrentDirectory(),
     m_sendCdToTerminalHistory()
 {
     m_layout = new QVBoxLayout(this);
     m_konsolePartCurrentDirectory(),
     m_sendCdToTerminalHistory()
 {
     m_layout = new QVBoxLayout(this);

-    m_layout->setMargin(0);
+    m_layout->setContentsMargins(0, 0, 0, 0);

 }
 
 TerminalPanel::~TerminalPanel()
 {
 }
 
 }
 
 TerminalPanel::~TerminalPanel()
 {
 }
 

+void TerminalPanel::goHome()
+{
+    sendCdToTerminal(QDir::homePath(), HistoryPolicy::SkipHistory);
+}
+
+QString TerminalPanel::currentWorkingDirectory()
+{
+    if (m_terminal) {
+        return m_terminal->currentWorkingDirectory();
+    }
+    return QString();
+}
+

 void TerminalPanel::terminalExited()
 {
 void TerminalPanel::terminalExited()
 {

-    m_terminal = 0;
+    m_terminal = nullptr;

     emit hideTerminalPanel();
 }
 
     emit hideTerminalPanel();
 }
 

+bool TerminalPanel::isHiddenInVisibleWindow() const
+{
+    return parentWidget()
+        && parentWidget()->isHidden();
+}
+

 void TerminalPanel::dockVisibilityChanged()
 {
     // Only react when the DockWidget itself (not some parent) is hidden. This way we don't
     // respond when e.g. Dolphin is minimized.
 void TerminalPanel::dockVisibilityChanged()
 {
     // Only react when the DockWidget itself (not some parent) is hidden. This way we don't
     // respond when e.g. Dolphin is minimized.

-    if (parentWidget() && parentWidget()->isHidden() &&
-        m_terminal && (m_terminal->foregroundProcessId() == -1)) {
+    if (isHiddenInVisibleWindow() && m_terminal && !hasProgramRunning()) {

         // Make sure that the following "cd /" command will not affect the view.
         disconnect(m_konsolePart, SIGNAL(currentDirectoryChanged(QString)),
                    this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));
 
         // Make sure this terminal does not prevent unmounting any removable drives
         // Make sure that the following "cd /" command will not affect the view.
         disconnect(m_konsolePart, SIGNAL(currentDirectoryChanged(QString)),
                    this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));
 
         // Make sure this terminal does not prevent unmounting any removable drives

-        changeDir(QUrl::fromLocalFile("/"));
+        changeDir(QUrl::fromLocalFile(QStringLiteral("/")));

 
         // Because we have disconnected from the part's currentDirectoryChanged()
         // signal, we have to update m_konsolePartCurrentDirectory manually. If this
 
         // Because we have disconnected from the part's currentDirectoryChanged()
         // signal, we have to update m_konsolePartCurrentDirectory manually. If this


@@ -81,13 +105,23 @@ void TerminalPanel::dockVisibilityChanged()
     }
 }
 
     }
 }
 

+QString TerminalPanel::runningProgramName() const
+{
+    return m_terminal ? m_terminal->foregroundProcessName() : QString();
+}
+
+bool TerminalPanel::hasProgramRunning() const
+{
+    return m_terminal && (m_terminal->foregroundProcessId() != -1);
+}
+

 bool TerminalPanel::urlChanged()
 {
     if (!url().isValid()) {
         return false;
     }
 
 bool TerminalPanel::urlChanged()
 {
     if (!url().isValid()) {
         return false;
     }
 

-    const bool sendInput = m_terminal && (m_terminal->foregroundProcessId() == -1) && isVisible();
+    const bool sendInput = m_terminal && !hasProgramRunning() && isVisible();

     if (sendInput) {
         changeDir(url());
     }
     if (sendInput) {
         changeDir(url());
     }


@@ -104,22 +138,47 @@ void TerminalPanel::showEvent(QShowEvent* event)
 
     if (!m_terminal) {
         m_clearTerminal = true;
 
     if (!m_terminal) {
         m_clearTerminal = true;

-        KPluginFactory* factory = 0;
-        KService::Ptr service = KService::serviceByDesktopName("konsolepart");
+        KPluginFactory* factory = nullptr;
+        KService::Ptr service = KService::serviceByDesktopName(QStringLiteral("konsolepart"));

         if (service) {
             factory = KPluginLoader(service->library()).factory();
         }
         if (service) {
             factory = KPluginLoader(service->library()).factory();
         }

-        m_konsolePart = factory ? (factory->create<KParts::ReadOnlyPart>(this)) : 0;
+        m_konsolePart = factory ? (factory->create<KParts::ReadOnlyPart>(this)) : nullptr;

         if (m_konsolePart) {
             connect(m_konsolePart, &KParts::ReadOnlyPart::destroyed, this, &TerminalPanel::terminalExited);
             m_terminalWidget = m_konsolePart->widget();
         if (m_konsolePart) {
             connect(m_konsolePart, &KParts::ReadOnlyPart::destroyed, this, &TerminalPanel::terminalExited);
             m_terminalWidget = m_konsolePart->widget();

+            setFocusProxy(m_terminalWidget);

             m_layout->addWidget(m_terminalWidget);
             m_layout->addWidget(m_terminalWidget);

+            if (m_konsolePartMissingMessage) {
+                m_layout->removeWidget(m_konsolePartMissingMessage);
+            }

             m_terminal = qobject_cast<TerminalInterface*>(m_konsolePart);
             m_terminal = qobject_cast<TerminalInterface*>(m_konsolePart);

+        } else if (!m_konsolePartMissingMessage) {
+            const auto konsoleInstallUrl = QUrl("appstream://org.kde.konsole.desktop");
+            const auto konsoleNotInstalledText = i18n("Terminal cannot be shown because Konsole is not installed. "
+                                                      "Please install it and then reopen the panel.");
+            m_konsolePartMissingMessage = new KMessageWidget(konsoleNotInstalledText, this);
+            m_konsolePartMissingMessage->setCloseButtonVisible(false);
+            m_konsolePartMissingMessage->hide();
+            if (KIO::DesktopExecParser::hasSchemeHandler(konsoleInstallUrl)) {
+                auto installKonsoleAction = new QAction(i18n("Install Konsole"), this);
+                connect(installKonsoleAction, &QAction::triggered, [konsoleInstallUrl]() {
+                    QDesktopServices::openUrl(konsoleInstallUrl);
+                });
+                m_konsolePartMissingMessage->addAction(installKonsoleAction);
+            }
+            m_layout->addWidget(m_konsolePartMissingMessage);
+            m_layout->addStretch();
+            QTimer::singleShot(0, m_konsolePartMissingMessage, &KMessageWidget::animatedShow);
+        } else {
+            m_konsolePartMissingMessage->animatedShow();

         }
     }
     if (m_terminal) {
         m_terminal->showShellInDir(url().toLocalFile());
         }
     }
     if (m_terminal) {
         m_terminal->showShellInDir(url().toLocalFile());

-        changeDir(url());
+        if(!hasProgramRunning()) {
+            changeDir(url());
+        }

         m_terminalWidget->setFocus();
         connect(m_konsolePart, SIGNAL(currentDirectoryChanged(QString)),
                 this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));
         m_terminalWidget->setFocus();
         connect(m_konsolePart, SIGNAL(currentDirectoryChanged(QString)),
                 this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));


@@ -131,36 +190,38 @@ void TerminalPanel::showEvent(QShowEvent* event)
 void TerminalPanel::changeDir(const QUrl& url)
 {
     delete m_mostLocalUrlJob;
 void TerminalPanel::changeDir(const QUrl& url)
 {
     delete m_mostLocalUrlJob;

-    m_mostLocalUrlJob = 0;
+    m_mostLocalUrlJob = nullptr;

 
     if (url.isLocalFile()) {
         sendCdToTerminal(url.toLocalFile());
     } else {
         m_mostLocalUrlJob = KIO::mostLocalUrl(url, KIO::HideProgressInfo);
 
     if (url.isLocalFile()) {
         sendCdToTerminal(url.toLocalFile());
     } else {
         m_mostLocalUrlJob = KIO::mostLocalUrl(url, KIO::HideProgressInfo);

-        if (m_mostLocalUrlJob->ui()) {
+        if (m_mostLocalUrlJob->uiDelegate()) {

             KJobWidgets::setWindow(m_mostLocalUrlJob, this);
         }
         connect(m_mostLocalUrlJob, &KIO::StatJob::result, this, &TerminalPanel::slotMostLocalUrlResult);
     }
 }
 
             KJobWidgets::setWindow(m_mostLocalUrlJob, this);
         }
         connect(m_mostLocalUrlJob, &KIO::StatJob::result, this, &TerminalPanel::slotMostLocalUrlResult);
     }
 }
 

-void TerminalPanel::sendCdToTerminal(const QString& dir)
+void TerminalPanel::sendCdToTerminal(const QString& dir, HistoryPolicy addToHistory)

 {
     if (dir == m_konsolePartCurrentDirectory) {
         m_clearTerminal = false;
         return;
     }
 
 {
     if (dir == m_konsolePartCurrentDirectory) {
         m_clearTerminal = false;
         return;
     }
 

+#ifndef Q_OS_WIN

     if (!m_clearTerminal) {
         // The TerminalV2 interface does not provide a way to delete the
         // current line before sending a new input. This is mandatory,
         // otherwise sending a 'cd x' to a existing 'rm -rf *' might
     if (!m_clearTerminal) {
         // The TerminalV2 interface does not provide a way to delete the
         // current line before sending a new input. This is mandatory,
         // otherwise sending a 'cd x' to a existing 'rm -rf *' might

-        // result in data loss. As workaround SIGINT is send.
+        // result in data loss. As workaround SIGINT is sent.

         const int processId = m_terminal->terminalProcessId();
         if (processId > 0) {
             kill(processId, SIGINT);
         }
     }
         const int processId = m_terminal->terminalProcessId();
         if (processId > 0) {
             kill(processId, SIGINT);
         }
     }

+#endif

 
     m_terminal->sendInput(" cd " + KShell::quoteArg(dir) + '\n');
 
 
     m_terminal->sendInput(" cd " + KShell::quoteArg(dir) + '\n');
 


@@ -168,10 +229,11 @@ void TerminalPanel::sendCdToTerminal(const QString& dir)
     // the directory change, because this directory change is not caused by a "cd" command that the
     // user entered in the panel. Therefore, we have to remember 'dir'. Note that it could also be
     // a symbolic link -> remember the 'canonical' path.
     // the directory change, because this directory change is not caused by a "cd" command that the
     // user entered in the panel. Therefore, we have to remember 'dir'. Note that it could also be
     // a symbolic link -> remember the 'canonical' path.

-    m_sendCdToTerminalHistory.enqueue(QDir(dir).canonicalPath());
+    if (addToHistory == HistoryPolicy::AddToHistory)
+        m_sendCdToTerminalHistory.enqueue(QDir(dir).canonicalPath());

 
     if (m_clearTerminal) {
 
     if (m_clearTerminal) {

-        m_terminal->sendInput(" clear\n");
+        m_terminal->sendInput(QStringLiteral(" clear\n"));

         m_clearTerminal = false;
     }
 }
         m_clearTerminal = false;
     }
 }


@@ -184,7 +246,7 @@ void TerminalPanel::slotMostLocalUrlResult(KJob* job)
         sendCdToTerminal(url.toLocalFile());
     }
 
         sendCdToTerminal(url.toLocalFile());
     }
 

-    m_mostLocalUrlJob = 0;
+    m_mostLocalUrlJob = nullptr;

 }
 
 void TerminalPanel::slotKonsolePartCurrentDirectoryChanged(const QString& dir)
 }
 
 void TerminalPanel::slotKonsolePartCurrentDirectoryChanged(const QString& dir)


@@ -202,3 +264,12 @@ void TerminalPanel::slotKonsolePartCurrentDirectoryChanged(const QString& dir)
     const QUrl url(QUrl::fromLocalFile(dir));
     emit changeUrl(url);
 }
     const QUrl url(QUrl::fromLocalFile(dir));
     emit changeUrl(url);
 }

+
+bool TerminalPanel::terminalHasFocus() const
+{
+    if (m_terminalWidget) {
+        return m_terminalWidget->hasFocus();
+    }
+
+    return hasFocus();
+}