refactoring.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@738 56b19765-1e22-0410-a548-a0f45d66c51a

diff --git a/kita/src/kita.cpp b/kita/src/kita.cpp
index 2c03e75..0e7beaa 100644 (file)
--- a/kita/src/kita.cpp
+++ b/kita/src/kita.cpp
@@ -73,15 +73,17 @@ KitaMainWindow::KitaMainWindow()
   // and a status bar
   statusBar()->show();
 
+  readDockConfig( KGlobal::config() );
+
+  readConfig( KGlobal::config() );
+
+  applyMainWindowSettings( KGlobal::config(), settingsGroup() );
+
   // apply the saved mainwindow settings, if any, and ask the mainwindow
   // to automatically save settings if changed: window size, toolbar
   // position, icon size, etc.
   setAutoSaveSettings();
 
-  readDockConfig( KGlobal::config() );
-
-  readConfig(KGlobal::config());
-
   // allow the view to change the statusbar and caption
   connect( m_threadView, SIGNAL( signalChangeStatusbar( const QString& ) ),
                          SLOT( changeStatusbar( const QString& ) ) );
@@ -132,6 +134,7 @@ KitaMainWindow::~KitaMainWindow()
   saveFavorites();
 
   saveCache();
+
   writeConfig(KGlobal::config());
 
   writeDockConfig( KGlobal::config() );
@@ -376,7 +379,6 @@ void KitaMainWindow::optionsConfigureKeys()
 void KitaMainWindow::optionsConfigureToolbars()
 {
   // use the standard toolbar editor
-  saveMainWindowSettings( KGlobal::config(), settingsGroup() );
   KEditToolbar dlg(actionCollection());
   connect( &dlg, SIGNAL( newToolbarConfig() ),
                  SLOT( newToolbarConfig() ) );
@@ -388,7 +390,6 @@ void KitaMainWindow::newToolbarConfig()
   // this slot is called when user clicks "Ok" or "Apply" in the toolbar editor.
   // recreate our GUI, and re-apply the settings (e.g. "text under icons", etc.)
   createGUI();
-  applyMainWindowSettings( KGlobal::config(), settingsGroup() );
 }
 
 void KitaMainWindow::windowShowBoardlist()