Hide the "Sort by Rating" and "Sort by Tags" menu entries for KDE 4.0, as currently...

[dolphin.git] / src / terminalsidebarpage.cpp

diff --git a/src/terminalsidebarpage.cpp b/src/terminalsidebarpage.cpp
index 2d2b3a5bbafb92e87747ba3f62baeddab3e2c871..25a92b380a050726df7356a4f6e1e46eb40fa3bd 100644 (file)
--- 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 <klibloader.h>
 #include <kde_terminal_interface.h>
 #include <kparts/part.h>

-#include <konsole_part.h>
+#include <kshell.h>

 
 

-#include <QVBoxLayout>
+#include <QBoxLayout>
+#include <QShowEvent>

 
 TerminalSidebarPage::TerminalSidebarPage(QWidget* parent) :
     SidebarPage(parent),
 
 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()) {
 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)
 {
         }
     }
 }
 
 void TerminalSidebarPage::showEvent(QShowEvent* event)
 {

+    if (event->spontaneous()) {
+        SidebarPage::showEvent(event);
+        return;
+    }
+

     if (m_terminal == 0) {
     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());
         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<konsolePart*>(part));
+            m_terminal = qobject_cast<TerminalInterface *>(part);

         }
     }
     if (m_terminal != 0) {
         }
     }
     if (m_terminal != 0) {