[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kate/app
From:       Christoph Cullmann <cullmann () kde ! org>
Date:       2005-04-24 16:43:29
Message-ID: 20050424164329.C97A862B () office ! kde ! org
[Download RAW message or body]

CVS commit by cullmann: 

fix console hidding on konsole "exit"


  M +8 -2      kateconsole.cpp   1.15
  M +7 -3      kateconsole.h   1.9
  M +1 -1      katemainwindow.cpp   1.305


--- kdebase/kate/app/kateconsole.cpp  #1.14:1.15
@@ -37,9 +37,11 @@
 #include <qlayout.h>
 
-KateConsole::KateConsole (QWidget* parent, const char* name, Kate::ViewManager *kvm)
+KateConsole::KateConsole (KateMainWindow *mw, KateMDI::ToolView* parent, const char* \
name, Kate::ViewManager *kvm)  : QWidget (parent, name)
  , part (0)
  , lo (new QVBoxLayout(this))
  , m_kvm (kvm)
+, m_mw (mw)
+, m_toolView (parent)
 {
 }
@@ -47,4 +49,5 @@ KateConsole::KateConsole (QWidget* paren
 KateConsole::~KateConsole ()
 {
+  disconnect ( part, SIGNAL(destroyed()), this, SLOT(slotDestroyed()) );
 }
 
@@ -117,4 +120,7 @@ void KateConsole::slotDestroyed ()
   // hide the dockwidget
   if (parentWidget())
-    parentWidget()->hide ();
+  {
+    m_mw->hideToolView (m_toolView);
+    m_mw->centralWidget()->setFocus ();
+  }
 }

--- kdebase/kate/app/kateconsole.h  #1.8:1.9
@@ -23,4 +23,6 @@
 
 #include "katemain.h"
+#include "katemdi.h"
+#include "katemainwindow.h"
 #include "../interfaces/viewmanager.h"
 
@@ -33,5 +35,5 @@ class KateConsole : public QWidget
 
   public:
-    KateConsole (QWidget* parent, const char* name, Kate::ViewManager *);
+    KateConsole (KateMainWindow *mw, KateMDI::ToolView* parent, const char* name, \
Kate::ViewManager *);  ~KateConsole ();
 
@@ -49,4 +51,6 @@ class KateConsole : public QWidget
     QVBoxLayout* lo;
     Kate::ViewManager *m_kvm;
+    KateMainWindow *m_mw;
+  KateMDI::ToolView *m_toolView;
 
   public slots:

--- kdebase/kate/app/katemainwindow.cpp  #1.304:1.305
@@ -231,5 +231,5 @@ void KateMainWindow::setupMainWindow ()
 
     t = createToolView("kate_console", KMultiTabBar::Bottom, SmallIcon("konsole"), \
                i18n("Terminal"));
-    console = new KateConsole (t, "console",viewManager());
+    console = new KateConsole (this, t, "console", viewManager());
   }
 


[prev in list] [next in list] [prev in thread] [next in thread]