dolphin can use soprano, but nowhere in apps we look for it; so search for Soprano...

[dolphin.git] / src / terminalsidebarpage.cpp

diff --git a/src/terminalsidebarpage.cpp b/src/terminalsidebarpage.cpp
index 341b637bdcbdd9ab41f5d258bce02080017eec88..4a82599f0c64d8c527c65be9dc99c6ac4fb581e8 100644 (file)
--- a/src/terminalsidebarpage.cpp
+++ b/src/terminalsidebarpage.cpp
@@ -22,13 +22,16 @@
 #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 <kshell.h>

 
 

-#include <QtGui/QBoxLayout>
+#include <QBoxLayout>
+#include <QShowEvent>

 
 TerminalSidebarPage::TerminalSidebarPage(QWidget* parent) :
     SidebarPage(parent),
     m_layout(0),
 
 TerminalSidebarPage::TerminalSidebarPage(QWidget* parent) :
     SidebarPage(parent),
     m_layout(0),

-    m_terminal(0)
+    m_terminal(0),
+    m_terminalWidget(0)

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


@@ -38,29 +41,52 @@ 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->sendInput("cd " + url.path() + '\n');
+            m_terminal->sendInput("cd " + KShell::quoteArg(url.path()) + '\n');

         }
     }
 }
 
         }
     }
 }
 

+void TerminalSidebarPage::terminalExited()
+{
+    emit hideTerminalSidebarPage();
+
+    m_terminal = 0;
+}
+

 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) {
         if (part != 0) {

-            m_layout->addWidget(part->widget());
+            connect(part, SIGNAL(destroyed(QObject*)), this, SLOT(terminalExited()));
+            m_terminalWidget = part->widget();
+            m_layout->addWidget(m_terminalWidget);

             m_terminal = qobject_cast<TerminalInterface *>(part);
             m_terminal = qobject_cast<TerminalInterface *>(part);

+            m_terminal->showShellInDir(url().path());

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

-        m_terminal->showShellInDir(url().path());
+        m_terminal->sendInput("cd " + KShell::quoteArg(url().path()) + '\n');

         m_terminal->sendInput("clear\n");
         m_terminal->sendInput("clear\n");

+        m_terminalWidget->setFocus();

     }
 
     SidebarPage::showEvent(event);
     }
 
     SidebarPage::showEvent(event);