Set the focus to the active view, after leaving the terminal panel

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

diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index c8352f73a461c5073acb747f175707b7f8bd8700..849d3f8c903965f6e62e5dfd138c76bb1726abca 100644 (file)
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -31,19 +31,20 @@
 #include <KIO/JobUiDelegate>
 #include <KJobWidgets>
 
 #include <KIO/JobUiDelegate>
 #include <KJobWidgets>
 

-#include <QBoxLayout>

 #include <QDir>
 #include <QShowEvent>
 #include <QDir>
 #include <QShowEvent>

+#include <QVBoxLayout>

 
 TerminalPanel::TerminalPanel(QWidget* parent) :
     Panel(parent),
     m_clearTerminal(true),
 
 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_konsolePartCurrentDirectory()
+    m_mostLocalUrlJob(nullptr),
+    m_layout(nullptr),
+    m_terminal(nullptr),
+    m_terminalWidget(nullptr),
+    m_konsolePart(nullptr),
+    m_konsolePartCurrentDirectory(),
+    m_sendCdToTerminalHistory()

 {
     m_layout = new QVBoxLayout(this);
     m_layout->setMargin(0);
 {
     m_layout = new QVBoxLayout(this);
     m_layout->setMargin(0);


@@ -53,24 +54,44 @@ 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()
+{
+    return parentWidget()
+        && parentWidget()->isHidden()
+        && m_terminal
+        && (m_terminal->foregroundProcessId() == -1);
+}
+

 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()) {

         // 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


@@ -103,12 +124,12 @@ 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();


@@ -117,33 +138,33 @@ void TerminalPanel::showEvent(QShowEvent* event)
         }
     }
     if (m_terminal) {
         }
     }
     if (m_terminal) {

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

         m_terminal->showShellInDir(url().toLocalFile());
         changeDir(url());
         m_terminalWidget->setFocus();
         m_terminal->showShellInDir(url().toLocalFile());
         changeDir(url());
         m_terminalWidget->setFocus();

+        connect(m_konsolePart, SIGNAL(currentDirectoryChanged(QString)),
+                this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));

     }
 
     Panel::showEvent(event);
 }
 
     }
 
     Panel::showEvent(event);
 }
 

-void TerminalPanel::changeDir(const KUrl& url)
+void TerminalPanel::changeDir(const QUrl& url)

 {
     delete m_mostLocalUrlJob;
 {
     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;
 {
     if (dir == m_konsolePartCurrentDirectory) {
         m_clearTerminal = false;


@@ -162,10 +183,16 @@ void TerminalPanel::sendCdToTerminal(const QString& dir)
     }
 
     m_terminal->sendInput(" cd " + KShell::quoteArg(dir) + '\n');
     }
 
     m_terminal->sendInput(" cd " + KShell::quoteArg(dir) + '\n');

-    m_konsolePartCurrentDirectory = dir;
+
+    // We want to ignore the currentDirectoryChanged(QString) signal, which we will receive after
+    // 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.
+    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;
     }
 }


@@ -173,25 +200,26 @@ void TerminalPanel::sendCdToTerminal(const QString& dir)
 void TerminalPanel::slotMostLocalUrlResult(KJob* job)
 {
     KIO::StatJob* statJob = static_cast<KIO::StatJob *>(job);
 void TerminalPanel::slotMostLocalUrlResult(KJob* job)
 {
     KIO::StatJob* statJob = static_cast<KIO::StatJob *>(job);

-    const KUrl url = statJob->mostLocalUrl();
+    const QUrl url = statJob->mostLocalUrl();

     if (url.isLocalFile()) {
         sendCdToTerminal(url.toLocalFile());
     }
 
     if (url.isLocalFile()) {
         sendCdToTerminal(url.toLocalFile());
     }
 

-    m_mostLocalUrlJob = 0;
+    m_mostLocalUrlJob = nullptr;

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

-    m_konsolePartCurrentDirectory = dir;
-
-    // Only change the view URL if 'dir' is different from the current view URL.
-    // Note that the current view URL could also be a symbolic link to 'dir'
-    // -> use QDir::canonicalPath() to check that.
-    const KUrl oldUrl(url());
-    const KUrl newUrl(dir);
-    if (newUrl != oldUrl && dir != QDir(oldUrl.path()).canonicalPath()) {
-        emit changeUrl(newUrl);
+    m_konsolePartCurrentDirectory = QDir(dir).canonicalPath();
+
+    // Only emit a changeUrl signal if the directory change was caused by the user inside the
+    // terminal, and not by sendCdToTerminal(QString).
+    while (!m_sendCdToTerminalHistory.empty()) {
+        if (m_konsolePartCurrentDirectory == m_sendCdToTerminalHistory.dequeue()) {
+            return;
+        }

     }
     }

-}

 
 

+    const QUrl url(QUrl::fromLocalFile(dir));
+    emit changeUrl(url);
+}