Don't block unmounting when terminal panel's cwd is the mountpoint

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

diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index f827503a2b592520d81f41dc58a9b8f690c8dc51..b7d3605aa57ea147c67a1f772f1bf90825131e29 100644 (file)
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -24,15 +24,16 @@
 #include <KPluginLoader>
 #include <KPluginFactory>
 #include <KService>
 #include <KPluginLoader>
 #include <KPluginFactory>
 #include <KService>

-#include <kde_terminal_interface_v2.h>
-#include <KParts/Part>
+#include <kde_terminal_interface.h>
+#include <KParts/ReadOnlyPart>

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

+#include <KJobWidgets>

 
 

-#include <QBoxLayout>

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

+#include <QVBoxLayout>

 
 TerminalPanel::TerminalPanel(QWidget* parent) :
     Panel(parent),
 
 TerminalPanel::TerminalPanel(QWidget* parent) :
     Panel(parent),


@@ -53,6 +54,19 @@ 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()
 {
     m_terminal = 0;
 void TerminalPanel::terminalExited()
 {
     m_terminal = 0;


@@ -70,7 +84,7 @@ void TerminalPanel::dockVisibilityChanged()
                    this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));
 
         // Make sure this terminal does not prevent unmounting any removable drives
                    this, SLOT(slotKonsolePartCurrentDirectoryChanged(QString)));
 
         // Make sure this terminal does not prevent unmounting any removable drives

-        changeDir(KUrl::fromPath("/"));
+        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


@@ -104,16 +118,16 @@ void TerminalPanel::showEvent(QShowEvent* event)
     if (!m_terminal) {
         m_clearTerminal = true;
         KPluginFactory* factory = 0;
     if (!m_terminal) {
         m_clearTerminal = true;
         KPluginFactory* factory = 0;

-        KService::Ptr service = KService::serviceByDesktopName("konsolepart");
+        KService::Ptr service = KService::serviceByDesktopName(QStringLiteral("konsolepart"));

         if (service) {
             factory = KPluginLoader(service->library()).factory();
         }
         m_konsolePart = factory ? (factory->create<KParts::ReadOnlyPart>(this)) : 0;
         if (m_konsolePart) {
         if (service) {
             factory = KPluginLoader(service->library()).factory();
         }
         m_konsolePart = factory ? (factory->create<KParts::ReadOnlyPart>(this)) : 0;
         if (m_konsolePart) {

-            connect(m_konsolePart, SIGNAL(destroyed(QObject*)), this, SLOT(terminalExited()));
+            connect(m_konsolePart, &KParts::ReadOnlyPart::destroyed, this, &TerminalPanel::terminalExited);

             m_terminalWidget = m_konsolePart->widget();
             m_layout->addWidget(m_terminalWidget);
             m_terminalWidget = m_konsolePart->widget();
             m_layout->addWidget(m_terminalWidget);

-            m_terminal = qobject_cast<TerminalInterfaceV2 *>(m_konsolePart);
+            m_terminal = qobject_cast<TerminalInterface*>(m_konsolePart);

         }
     }
     if (m_terminal) {
         }
     }
     if (m_terminal) {


@@ -127,7 +141,7 @@ void TerminalPanel::showEvent(QShowEvent* event)
     Panel::showEvent(event);
 }
 
     Panel::showEvent(event);
 }
 

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

 {
     delete m_mostLocalUrlJob;
     m_mostLocalUrlJob = 0;
 {
     delete m_mostLocalUrlJob;
     m_mostLocalUrlJob = 0;


@@ -136,14 +150,14 @@ void TerminalPanel::changeDir(const KUrl& url)
         sendCdToTerminal(url.toLocalFile());
     } else {
         m_mostLocalUrlJob = KIO::mostLocalUrl(url, KIO::HideProgressInfo);
         sendCdToTerminal(url.toLocalFile());
     } else {
         m_mostLocalUrlJob = KIO::mostLocalUrl(url, KIO::HideProgressInfo);

-        if (m_mostLocalUrlJob->ui()) {
-            m_mostLocalUrlJob->ui()->setWindow(this);
+        if (m_mostLocalUrlJob->uiDelegate()) {
+            KJobWidgets::setWindow(m_mostLocalUrlJob, this);

         }
         }

-        connect(m_mostLocalUrlJob, SIGNAL(result(KJob*)), this, SLOT(slotMostLocalUrlResult(KJob*)));
+        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;


@@ -167,10 +181,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;
     }
 }


@@ -178,7 +193,7 @@ 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());
     }


@@ -198,7 +213,6 @@ void TerminalPanel::slotKonsolePartCurrentDirectoryChanged(const QString& dir)
         }
     }
 
         }
     }
 

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

 }
 }

-
-#include "terminalpanel.moc"