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 d2d569c9ff10d57236f220cad9a3e4d47f0e81f1..59b2694fb01aaf03cb0fe01702df5489afc8122c 100644 (file)
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -47,12 +47,13 @@ TerminalPanel::TerminalPanel(QWidget* parent) :
     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_layout->setMargin(0);
+    m_layout->setContentsMargins(0, 0, 0, 0);
 }
 
 TerminalPanel::~TerminalPanel()
@@ -78,19 +79,17 @@ void TerminalPanel::terminalExited()
     emit hideTerminalPanel();
 }
 
-bool TerminalPanel::isHiddenInVisibleWindow()
+bool TerminalPanel::isHiddenInVisibleWindow() const
 {
     return parentWidget()
-        && parentWidget()->isHidden()
-        && m_terminal
-        && (m_terminal->foregroundProcessId() == -1);
+        && 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.
-    if (isHiddenInVisibleWindow()) {
+    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)));
@@ -106,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;
     }
 
-    const bool sendInput = m_terminal && (m_terminal->foregroundProcessId() == -1) && isVisible();
+    const bool sendInput = m_terminal && !hasProgramRunning() && isVisible();
     if (sendInput) {
         changeDir(url());
     }
@@ -138,6 +147,7 @@ void TerminalPanel::showEvent(QShowEvent* event)
         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);
             if (m_konsolePartMissingMessage) {
                 m_layout->removeWidget(m_konsolePartMissingMessage);
@@ -166,7 +176,9 @@ void TerminalPanel::showEvent(QShowEvent* event)
     }
     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)));
@@ -252,3 +264,12 @@ void TerminalPanel::slotKonsolePartCurrentDirectoryChanged(const QString& dir)
     const QUrl url(QUrl::fromLocalFile(dir));
     emit changeUrl(url);
 }
+
+bool TerminalPanel::terminalHasFocus() const
+{
+    if (m_terminalWidget) {
+        return m_terminalWidget->hasFocus();
+    }
+
+    return hasFocus();
+}