Merge branch 'master' into kf6

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

diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index ac395d09df601350740532a0f811f988535feea9..0e79a475d4a9b8db4058bc1305f3a69b135e5564 100644 (file)
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -47,6 +47,11 @@ TerminalPanel::TerminalPanel(QWidget *parent)
 
 TerminalPanel::~TerminalPanel()
 {
+    if (m_konsolePart) {
+        // Avoid when QObject cleanup, which comes after our destructor, deletes the konsolePart
+        // and subsequently calls back into our slot when the destructor has already run.
+        disconnect(m_konsolePart, &KParts::ReadOnlyPart::destroyed, this, &TerminalPanel::terminalExited);
+    }
 }
 
 void TerminalPanel::goHome()
@@ -77,18 +82,22 @@ 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() && 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
-        changeDir(QUrl::fromLocalFile(QStringLiteral("/")));
-
-        // Because we have disconnected from the part's currentDirectoryChanged()
-        // signal, we have to update m_konsolePartCurrentDirectory manually. If this
-        // was not done, showing the panel again might not set the part's working
-        // directory correctly.
-        m_konsolePartCurrentDirectory = '/';
+    if (isHiddenInVisibleWindow()) {
+        if (m_konsolePartMissingMessage) {
+            m_konsolePartMissingMessage->hide();
+        } else if (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
+            changeDir(QUrl::fromLocalFile(QStringLiteral("/")));
+
+            // Because we have disconnected from the part's currentDirectoryChanged()
+            // signal, we have to update m_konsolePartCurrentDirectory manually. If this
+            // was not done, showing the panel again might not set the part's working
+            // directory correctly.
+            m_konsolePartCurrentDirectory = '/';
+        }
     }
 }
 
@@ -168,25 +177,26 @@ void TerminalPanel::showEvent(QShowEvent *event)
                 });
             }
 
-        } 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 {
+            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->setSizeConstraint(QLayout::SetMaximumSize);
+            }
+
             m_konsolePartMissingMessage->animatedShow();
         }
     }