branches/KDE/4.1/kdepim

SVN commit 835415 by vkrause:

Backport SVN commit 835338 by vkrause from trunk:

Move UiStateSaver to libkdepim and use it in KNode to save and restore
the splitter state.


 M  +0 -1      akonadi/clients/akonadiconsole/CMakeLists.txt  
 M  +1 -0      akonadi/clients/akonadiconsole/debugwidget.cpp  
 M  +2 -2      akonadi/clients/akonadiconsole/mainwindow.cpp  
 D             akonadi/clients/akonadiconsole/uistatesaver.cpp  
 D             akonadi/clients/akonadiconsole/uistatesaver.h  
 M  +8 -0      knode/knmainwidget.cpp  
 M  +1 -0      libkdepim/CMakeLists.txt  
 A             libkdepim/uistatesaver.cpp   trunk/KDE/kdepim/libkdepim/uistatesaver.cpp#835338 [License: LGPL (v2+)]
 A             libkdepim/uistatesaver.h   trunk/KDE/kdepim/libkdepim/uistatesaver.h#835338 [License: LGPL (v2+)]


--- branches/KDE/4.1/kdepim/akonadi/clients/akonadiconsole/CMakeLists.txt #835414:835415
@@ -12,7 +12,6 @@
   mainwidget.cpp
   mainwindow.cpp
   searchdialog.cpp
-  uistatesaver.cpp
 )
 
 qt4_add_dbus_interfaces( akonadiconsole_bin_SRCS
--- branches/KDE/4.1/kdepim/akonadi/clients/akonadiconsole/debugwidget.cpp #835414:835415
@@ -36,6 +36,7 @@
   QVBoxLayout *layout = new QVBoxLayout( this );
 
   QSplitter *splitter = new QSplitter( Qt::Vertical, this );
+  splitter->setObjectName( "debugSplitter" );
   layout->addWidget( splitter );
 
   mConnectionPages = new QTabWidget( splitter );
--- branches/KDE/4.1/kdepim/akonadi/clients/akonadiconsole/mainwindow.cpp #835414:835415
@@ -43,12 +43,12 @@
 
   setupGUI( Keys /*| ToolBar | StatusBar*/ | Save | Create, "akonadiconsoleui.rc" );
 
-  UiStateSaver::restoreState( this, KConfigGroup( KGlobal::config(), "UiState" ) );
+  KPIM::UiStateSaver::restoreState( this, KConfigGroup( KGlobal::config(), "UiState" ) );
 }
 
 bool MainWindow::queryExit()
 {
   KConfigGroup config( KGlobal::config(), "UiState" );
-  UiStateSaver::saveState( this, config );
+  KPIM::UiStateSaver::saveState( this, config );
   return KXmlGuiWindow::queryExit();
 }
--- branches/KDE/4.1/kdepim/knode/knmainwidget.cpp #835414:835415
@@ -44,6 +44,7 @@
 #include <kxmlguifactory.h>
 #include <ksqueezedtextlabel.h>
 
+#include <libkdepim/uistatesaver.h>
 #include "broadcaststatus.h"
 #include "recentaddresses.h"
 using KPIM::BroadcastStatus;
@@ -109,7 +110,9 @@
 
   // splitters
   mPrimarySplitter = new QSplitter( Qt::Horizontal, this );
+  mPrimarySplitter->setObjectName( "mPrimarySplitter" );
   mSecondSplitter = new QSplitter( Qt::Vertical, mPrimarySplitter );
+  mSecondSplitter->setObjectName( "mSecondSplitter" );
 
   //article view
   mArticleViewer = new ArticleWidget( mPrimarySplitter, knGlobals.guiClient, actionCollection() );
@@ -945,6 +948,8 @@
 
   resize(787,478);  // default optimized for 800x600
   //applyMainWindowSettings(KGlobal::config(),"mainWindow_options");
+
+  KPIM::UiStateSaver::restoreState( this, KConfigGroup( knGlobals.config(), "UI State" ) );
 }
 
 
@@ -958,6 +963,9 @@
   c_olView->writeConfig();
   h_drView->writeConfig();
   mArticleViewer->writeConfig();
+
+  KConfigGroup cfg( knGlobals.config(), "UI State" );
+  KPIM::UiStateSaver::saveState( this, cfg );
 }
 
 
--- branches/KDE/4.1/kdepim/libkdepim/CMakeLists.txt #835414:835415
@@ -75,6 +75,7 @@
    utils.cpp
    colorlistbox.cpp
    dictionarycombobox.cpp
+   uistatesaver.cpp
 )
 
 #if(WIN32)
_______________________________________________
Knode-devel mailing list
Knode-devel@...
https://mail.kde.org/mailman/listinfo/knode-devel