Fix scrolling on hidpi screens

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

diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index b3bbe11e832ac714bc848221c6e8bfe4dd4ef297..da68210c12e4610dcbfc233c257887aaac8493c9 100644 (file)
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -24,14 +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 <QShowEvent>

+#include <QVBoxLayout>

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


@@ -41,7 +43,8 @@ TerminalPanel::TerminalPanel(QWidget* parent) :
     m_terminal(0),
     m_terminalWidget(0),
     m_konsolePart(0),
     m_terminal(0),
     m_terminalWidget(0),
     m_konsolePart(0),

-    m_konsolePartCurrentDirectory()
+    m_konsolePartCurrentDirectory(),
+    m_sendCdToTerminalHistory()

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


@@ -68,13 +71,13 @@ 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
         // was not done, showing the panel again might not set the part's working
         // directory correctly.
 
         // 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 = "/";
+        m_konsolePartCurrentDirectory = '/';

     }
 }
 
     }
 }
 


@@ -102,30 +105,30 @@ 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");
-        if(service) {
+        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) {
             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) {

-        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;
     m_mostLocalUrlJob = 0;
 {
     delete m_mostLocalUrlJob;
     m_mostLocalUrlJob = 0;


@@ -135,15 +138,16 @@ void TerminalPanel::changeDir(const KUrl& url)
     } else {
         m_mostLocalUrlJob = KIO::mostLocalUrl(url, KIO::HideProgressInfo);
         if (m_mostLocalUrlJob->ui()) {
     } else {
         m_mostLocalUrlJob = KIO::mostLocalUrl(url, KIO::HideProgressInfo);
         if (m_mostLocalUrlJob->ui()) {

-            m_mostLocalUrlJob->ui()->setWindow(this);
+            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)
 {
     if (dir == m_konsolePartCurrentDirectory) {
     }
 }
 
 void TerminalPanel::sendCdToTerminal(const QString& dir)
 {
     if (dir == m_konsolePartCurrentDirectory) {

+        m_clearTerminal = false;

         return;
     }
 
         return;
     }
 


@@ -158,10 +162,16 @@ void TerminalPanel::sendCdToTerminal(const QString& dir)
         }
     }
 
         }
     }
 

-    m_terminal->sendInput("cd " + KShell::quoteArg(dir) + '\n');
+    m_terminal->sendInput(" cd " + KShell::quoteArg(dir) + '\n');
+
+    // 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.
+    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;
     }
 }


@@ -169,7 +179,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());
     }


@@ -179,12 +189,16 @@ void TerminalPanel::slotMostLocalUrlResult(KJob* job)
 
 void TerminalPanel::slotKonsolePartCurrentDirectoryChanged(const QString& dir)
 {
 
 void TerminalPanel::slotKonsolePartCurrentDirectoryChanged(const QString& dir)
 {

-    m_konsolePartCurrentDirectory = dir;
+    m_konsolePartCurrentDirectory = QDir(dir).canonicalPath();

 
 

-    const KUrl newUrl(dir);
-    if (newUrl != url()) {
-        emit changeUrl(newUrl);
+    // 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;
+        }

     }
     }

-}

 
 

-#include "terminalpanel.moc"
+    const QUrl url(QUrl::fromLocalFile(dir));
+    emit changeUrl(url);
+}