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

List:       kde-commits
Subject:    kdebase/kate/app
From:       Dominik Haumann <dhdev () gmx ! de>
Date:       2005-04-30 17:44:37
Message-ID: 20050430174437.B21BE665 () office ! kde ! org
[Download RAW message or body]

CVS commit by dhaumann: 

add setToolViewStyle() and toolViewStyle() to mainwindow base class.
Change kate to always use icons with text.

NOTE: if you get a compile error, update kdelibs/kutils/kmultitabbar.*


  M +2 -3      katemainwindow.cpp   1.312
  M +19 -0     katemdi.cpp   1.33
  M +12 -0     katemdi.h   1.23


--- kdebase/kate/app/katemainwindow.cpp  #1.311:1.312
@@ -90,7 +90,4 @@ KateMainWindow::KateMainWindow (KConfig 
   : KateMDI::MainWindow (0,(QString("__KateMainWindow#%1").arg(uniqueID)).latin1())
 {
- // setToolViewStyle(KMultiTabBar::KDEV3ICON);
-  // make the dockwidgets keep their size if possible
-  //manager()->setSplitterKeepSize(true);
   // first the very important id
   myID = uniqueID;
@@ -208,4 +205,6 @@ KateMainWindow::~KateMainWindow()
 void KateMainWindow::setupMainWindow ()
 {
+  setToolViewStyle( KMultiTabBar::KDEV3ICON );
+
   m_tabWidget = new KateTabWidget (centralWidget());
 

--- kdebase/kate/app/katemdi.cpp  #1.32:1.33
@@ -737,4 +737,18 @@ void MainWindow::toolViewDeleted (ToolVi
 }
 
+void MainWindow::setToolViewStyle (KMultiTabBar::KMultiTabBarStyle style)
+{
+  m_sidebars[0]->setStyle(style);
+  m_sidebars[1]->setStyle(style);
+  m_sidebars[2]->setStyle(style);
+  m_sidebars[3]->setStyle(style);
+}
+
+KMultiTabBar::KMultiTabBarStyle MainWindow::toolViewStyle ()
+{
+  // all sidebars have the same style, so just take Top
+  return m_sidebars[KMultiTabBar::Top]->tabStyle();
+}
+
 bool MainWindow::moveToolView (ToolView *widget, KMultiTabBar::KMultiTabBarPosition \
pos)  {
@@ -804,4 +818,6 @@ void MainWindow::startRestore (KConfig *
   m_hSplitter->setSizes(hs);
   m_vSplitter->setSizes(vs);
+
+  setToolViewStyle( (KMultiTabBar::KMultiTabBarStyle)m_restoreConfig->readNumEntry \
("Kate-MDI-Sidebar-Style", (int)toolViewStyle()) );  }
 
@@ -864,4 +880,7 @@ void MainWindow::saveSession (KConfig *c
   config->writeEntry ("Kate-MDI-V-Splitter", vs);
 
+  // save sidebar style
+  config->writeEntry ("Kate-MDI-Sidebar-Style", (int)toolViewStyle());
+
   // save the sidebars
   for (unsigned int i=0; i < 4; ++i)

--- kdebase/kate/app/katemdi.h  #1.22:1.23
@@ -288,4 +288,16 @@ class MainWindow : public KParts::MainWi
     ToolView *toolView (const QString &identifier);
 
+    /**
+     * set the toolview's tabbar style.
+     * @param style the tabbar style.
+     */
+    void setToolViewStyle (KMultiTabBar::KMultiTabBarStyle style);
+
+    /**
+     * get the toolview's tabbar style.
+     * @return toolview's tabbar style
+     */
+    KMultiTabBar::KMultiTabBarStyle toolViewStyle ();
+    
   protected:
     /**


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