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

List:       kde-commits
Subject:    kdebase/kate
From:       Christoph Cullmann <cullmann () kde ! org>
Date:       2005-04-22 18:02:39
Message-ID: 20050422180239.ACCD55FA () office ! kde ! org
[Download RAW message or body]

CVS commit by cullmann: 

little cleanup for session restore
remove kmdi headers


  M +3 -0      ChangeLog   1.65
  M +3 -3      app/kateexternaltools.cpp   1.37
  M +6 -5      app/katemainwindow.cpp   1.298
  M +0 -1      app/katemainwindow.h   1.98
  M +8 -0      app/katemdi.cpp   1.18
  M +1 -0      app/katesession.cpp   1.35
  M +0 -1      app/kateviewmanager.h   1.69


--- kdebase/kate/ChangeLog  #1.64:1.65
@@ -1,2 +1,5 @@
+2004-04-22 Christoph Cullmann <cullmann@kde.org>
+  * kate switched over to katemdi, even smaller replacement for kmdi2 :)
+
 2004-10-06 Christoph Cullmann <cullmann@kde.org>
   * kate switched over to kmdi2, a slim version of old kmdi

--- kdebase/kate/app/kateexternaltools.cpp  #1.36:1.37
@@ -41,4 +41,7 @@
 #include <krun.h>
 #include <kicondialog.h>
+#include <kpopupmenu.h>
+#include <kdebug.h>
+#include <kapplication.h>
 
 #include <qbitmap.h>
@@ -58,7 +61,4 @@
 #include <stdlib.h>
 #include <unistd.h>
-
-#include <kdebug.h>
-#include <kapplication.h>
 //END Includes
 

--- kdebase/kate/app/katemainwindow.cpp  #1.297:1.298
@@ -41,6 +41,4 @@
 #include "katetabwidget.h"
 
-#include <kmdi/tabwidget.h>
-
 #include <dcopclient.h>
 #include <kinstance.h>
@@ -183,9 +181,9 @@ void KateMainWindow::setupMainWindow ()
   m_viewManager = new KateViewManager (this);
 
-  KateMDI::ToolView *t = createToolView("kate_filelist", KMultiTabBar::Left, \
                SmallIcon("kmultiple"), i18n("Documents"));
-  filelist = new KateFileList (this, m_viewManager, t, "filelist");
+  KateMDI::ToolView *ft = createToolView("kate_filelist", KMultiTabBar::Left, \
SmallIcon("kmultiple"), i18n("Documents")); +  filelist = new KateFileList (this, \
m_viewManager, ft, "filelist");  filelist->readConfig(kapp->config(), "Filelist");
 
-  t = createToolView("kate_fileselector", KMultiTabBar::Left, SmallIcon("fileopen"), \
i18n("Filesystem Browser")); +  KateMDI::ToolView *t = \
createToolView("kate_fileselector", KMultiTabBar::Left, SmallIcon("fileopen"), \
i18n("Filesystem Browser"));  fileselector = new KateFileSelector( this, \
m_viewManager, t, "operator");  \
connect(fileselector->dirOperator(),SIGNAL(fileSelected(const \
KFileItem*)),this,SLOT(fileSelected(const KFileItem*))); @@ -205,4 +203,7 @@ void \
KateMainWindow::setupMainWindow ()  console->installEventFilter( this );
   }
+
+  // make per default the filelist visible, if we are in session restore, katemdi \
will skip this ;) +  showToolView (ft);
 }
 

--- kdebase/kate/app/katemainwindow.h  #1.97:1.98
@@ -34,5 +34,4 @@
 #include <kparts/part.h>
 #include <kparts/dockmainwindow.h>
-#include <kmdi/mainwindow.h>
 
 #include <scriptmanager.h>

--- kdebase/kate/app/katemdi.cpp  #1.17:1.18
@@ -418,4 +418,8 @@ bool MainWindow::showToolView (ToolView 
     return false;
 
+  // skip this if happens during restoring, or we will just see flicker
+  if (m_restoreConfig)
+    return true;
+
   return widget->sidebar()->showWidget (widget);
 }
@@ -426,4 +430,8 @@ bool MainWindow::hideToolView (ToolView 
     return false;
 
+  // skip this if happens during restoring, or we will just see flicker
+  if (m_restoreConfig)
+    return true;
+
   return widget->sidebar()->hideWidget (widget);
 }

--- kdebase/kate/app/katesession.cpp  #1.34:1.35
@@ -34,4 +34,5 @@
 #include <kstdguiitem.h>
 #include <kpushbutton.h>
+#include <kpopupmenu.h>
 
 #include <qdir.h>

--- kdebase/kate/app/kateviewmanager.h  #1.68:1.69
@@ -27,5 +27,4 @@
 #include <kate/view.h>
 #include <kate/document.h>
-#include <kmdi/tabwidget.h>
 #include <qguardedptr.h>
 


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