X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a4713e9ea4e7af747f4a406f68c907c1f09aac95..1e72ef9ca039a133e4694c4aff6e7e89cd482da8:/src/terminalsidebarpage.cpp

diff --git a/src/terminalsidebarpage.cpp b/src/terminalsidebarpage.cpp
index ff410711c..25a92b380 100644
--- a/src/terminalsidebarpage.cpp
+++ b/src/terminalsidebarpage.cpp
@@ -22,9 +22,10 @@
 #include <klibloader.h>
 #include <kde_terminal_interface.h>
 #include <kparts/part.h>
-#include <Part.h>
+#include <kshell.h>
 
-#include <QVBoxLayout>
+#include <QBoxLayout>
+#include <QShowEvent>
 
 TerminalSidebarPage::TerminalSidebarPage(QWidget* parent) :
     SidebarPage(parent),
@@ -39,29 +40,36 @@ TerminalSidebarPage::~TerminalSidebarPage()
 {
 }
 
+QSize TerminalSidebarPage::sizeHint() const
+{
+    QSize size = SidebarPage::sizeHint();
+    size.setHeight(200);
+    return size;
+}
+
 void TerminalSidebarPage::setUrl(const KUrl& url)
 {
     if (!SidebarPage::url().equals(url, KUrl::CompareWithoutTrailingSlash)) {
         SidebarPage::setUrl(url);
         if ((m_terminal != 0) && isVisible()) {
-            m_terminal->showShellInDir(url.path());
+            m_terminal->sendInput("cd " + KShell::quoteArg(url.path()) + '\n');
         }
     }
 }
 
 void TerminalSidebarPage::showEvent(QShowEvent* event)
 {
+    if (event->spontaneous()) {
+        SidebarPage::showEvent(event);
+        return;
+    }
+
     if (m_terminal == 0) {
-        KLibFactory* factory = KLibLoader::self()->factory("libkonsolepart");
-        KParts::Part* part = static_cast<KParts::Part*>(factory->create(this, "KParts::ReadOnlyPart"));
+        KPluginFactory* factory = KPluginLoader("libkonsolepart").factory();
+        KParts::ReadOnlyPart* part = factory ? (factory->create<KParts::ReadOnlyPart>(this)) : 0;
         if (part != 0) {
             m_layout->addWidget(part->widget());
-
-            // TODO: in KDE3 the following code worked:
-            //     m_terminal = static_cast<TerminalInterface*>(part->qt_cast("TerminalInterface"));
-            // which does not work anymore in Qt4. As temporary workaround <konsole_part.h> is
-            // included directly:
-            m_terminal = static_cast<TerminalInterface*>(reinterpret_cast<Konsole::Part*>(part));
+            m_terminal = qobject_cast<TerminalInterface *>(part);
         }
     }
     if (m_terminal != 0) {