use KConfig XT (partially)

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

diff --git a/kita/src/libkita/.cvsignore b/kita/src/libkita/.cvsignore
index f7ccdb9..000d7f7 100644 (file)
--- a/kita/src/libkita/.cvsignore
+++ b/kita/src/libkita/.cvsignore
@@ -7,3 +7,5 @@ Makefile.in
 *.all_cpp.cpp
 .deps
 .libs
+config_xt.cpp
+config_xt.h

diff --git a/kita/src/libkita/Makefile.am b/kita/src/libkita/Makefile.am
index 8273c1b..5758c18 100644 (file)
--- a/kita/src/libkita/Makefile.am
+++ b/kita/src/libkita/Makefile.am
@@ -2,9 +2,11 @@ INCLUDES = $(all_includes)
 
 lib_LTLIBRARIES = libkita.la
 
-libkita_la_SOURCES = thread.h thread.cpp qcp932codec.cpp qcp932codec.h favoritethreads.h favoritethreads.cpp kita_misc.cpp threadinfo.h threadinfo.cpp access.cpp cache.cpp favoriteboards.cpp kitaconfig.cpp datmanager.cpp datinfo.cpp signalcollection.cpp account.cpp imgmanager.cpp threadindex.cpp boardmanager.cpp downloadmanager.cpp
+libkita_la_SOURCES = thread.h thread.cpp qcp932codec.cpp qcp932codec.h favoritethreads.h favoritethreads.cpp kita_misc.cpp threadinfo.h threadinfo.cpp access.cpp cache.cpp favoriteboards.cpp kitaconfig.cpp datmanager.cpp datinfo.cpp signalcollection.cpp account.cpp imgmanager.cpp threadindex.cpp boardmanager.cpp downloadmanager.cpp config_xt.kcfgc
 
 METASOURCES = AUTO
 
 SUBDIRS =  tests
 noinst_HEADERS = kita_misc.h access.h cache.h favoriteboards.h parsemisc.h kitaconfig.h datmanager.h datinfo.h signalcollection.cpp account.h imgmanager.h threadindex.h boardmanager.h downloadmanager.h event.h
+
+kde_kcfg_DATA = config_xt.kcfg

diff --git a/kita/src/libkita/config_xt.kcfg b/kita/src/libkita/config_xt.kcfg
new file mode 100644 (file)
index 0000000..dec0cb6
--- /dev/null
+++ b/kita/src/libkita/config_xt.kcfg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kcfg>
+  <kcfgfile name="kitarc" />
+  <group name="Global">
+    <entry name="Font" type="Font">
+       <label>List font.</label>
+    </entry>
+  </group>
+</kcfg>

diff --git a/kita/src/libkita/config_xt.kcfgc b/kita/src/libkita/config_xt.kcfgc
new file mode 100644 (file)
index 0000000..e4f483b
--- /dev/null
+++ b/kita/src/libkita/config_xt.kcfgc
@@ -0,0 +1,5 @@
+File=config_xt.kcfg
+ClassName=Config
+NameSpace=Kita
+Singleton=true
+Mutators=true

diff --git a/kita/src/libkita/kitaconfig.cpp b/kita/src/libkita/kitaconfig.cpp
index ffb8d78..0b5bf3e 100644 (file)
--- a/kita/src/libkita/kitaconfig.cpp
+++ b/kita/src/libkita/kitaconfig.cpp
@@ -9,6 +9,7 @@
 ***************************************************************************/
 
 #include "kitaconfig.h"
+#include "config_xt.h"
 
 #include <kconfig.h>
 
@@ -27,7 +28,6 @@ KitaConfig::KitaConfig()
         m_threadBackgroundColor( KitaConfig::defaultThreadBackgroundColor() ),
         m_popupColor( KitaConfig::defaultPopupColor() ),
         m_popupBackgroundColor( KitaConfig::defaultPopupBackgroundColor() ),
-        m_listFont( KitaConfig::defaultListFont() ),
         m_threadFont( KitaConfig::defaultThreadFont() ),
         m_popupFont( KitaConfig::defaultPopupFont() ),
         // m_boardListURL
@@ -70,7 +70,6 @@ KitaConfig::~KitaConfig()
 void KitaConfig::writeConfig( KConfig* config )
 {
     config->setGroup( "Global" );
-    config->writeEntry( "Font", KitaConfig::listFont() );
     config->writeEntry( "ThreadFont", KitaConfig::threadFont() );
     config->writeEntry( "PopupFont", KitaConfig::popupFont() );
     config->writeEntry( "ShowMailAddress", KitaConfig::showMailAddress() );
@@ -113,12 +112,6 @@ void KitaConfig::readConfig( KConfig* config )
 {
     config->setGroup( "Global" );
 
-    if ( config->hasKey( "Font" ) ) {
-        KitaConfig::setListFont( config->readFontEntry( "Font" ) );
-    } else {
-        KitaConfig::setListFont( KitaConfig::defaultListFont() );
-    }
-
     if ( config->hasKey( "ThreadFont" ) ) {
         KitaConfig::setThreadFont( config->readFontEntry( "ThreadFont" ) );
     } else {

diff --git a/kita/src/libkita/kitaconfig.h b/kita/src/libkita/kitaconfig.h
index 8fe9be1..583e46a 100644 (file)
--- a/kita/src/libkita/kitaconfig.h
+++ b/kita/src/libkita/kitaconfig.h
@@ -34,7 +34,6 @@ private:
     QColor m_threadBackgroundColor;
     QColor m_popupColor;
     QColor m_popupBackgroundColor;
-    QFont m_listFont;
     QFont m_threadFont;
     QFont m_popupFont;
     QString m_boardListURL;
@@ -80,9 +79,6 @@ public:
     static void readConfig( KConfig* config );
 
     static KitaConfig* getInstance();
-    static QFont& listFont() { return getInstance() ->m_listFont; }
-    static void setListFont( QFont font ) { getInstance() ->m_listFont = font; }
-    static QFont defaultListFont() { return QFont(); }
 
     static QFont& threadFont() { return getInstance() ->m_threadFont; }
     static void setThreadFont( QFont font ) { getInstance() ->m_threadFont = font; }

diff --git a/kita/src/mainwindow.cpp b/kita/src/mainwindow.cpp
index 5d9babd..e1a7f88 100644 (file)
--- a/kita/src/mainwindow.cpp
+++ b/kita/src/mainwindow.cpp
@@ -33,6 +33,7 @@
 #include "libkita/imgmanager.h"
 #include "libkita/datmanager.h"
 #include "libkita/boardmanager.h"
+#include "libkita/config_xt.h"
 
 #include "image/imagetabwidget.h"
 
@@ -140,14 +141,15 @@ KitaMainWindow::KitaMainWindow()
 
 
     KitaConfig::readConfig( KGlobal::config() );
+    Kita::Config::self()->readConfig();
 
     // 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();
 
-    // font
-    setFont( KitaConfig::listFont() );
+    // set list font
+    setFont( Kita::Config::font() );
 
     // allow the view to change the statusbar and caption
     Kita::SignalCollection* signalCollection = Kita::SignalCollection::getInstance();
@@ -241,6 +243,7 @@ KitaMainWindow::~KitaMainWindow()
     saveMainWindowSettings( KGlobal::config(), "MainWindow" );
 
     KitaConfig::writeConfig( KGlobal::config() );
+    Kita::Config::self()->writeConfig();
 
     QString dockConfigPath = locateLocal( "appdata", "dock.conf" );
     KConfig dockConfig( dockConfigPath );

diff --git a/kita/src/prefs/prefs.cpp b/kita/src/prefs/prefs.cpp
index 43aaf8a..02f27d8 100644 (file)
--- a/kita/src/prefs/prefs.cpp
+++ b/kita/src/prefs/prefs.cpp
@@ -34,6 +34,7 @@
 #include "libkita/kitaconfig.h"
 #include "libkita/signalcollection.h"
 #include "libkita/boardmanager.h"
+#include "libkita/config_xt.h"
 #include "debugprefbase.h"
 #include "aboneprefpage.h"
 #include "loginprefpage.h"
@@ -339,7 +340,7 @@ void FacePrefPage::apply()
 {
     // font
     QFont font = listFontButton->font();
-    KitaConfig::setListFont( font );
+    Kita::Config::setFont( font );
     emit fontChanged( font );
 
     if ( m_threadFontchanged ) {
@@ -376,7 +377,6 @@ void FacePrefPage::reset()
 {
     // font
     QFont font;
-    font = KitaConfig::defaultListFont();
     listFontButton->setText( font.family() + " " + QString::number( font.pointSize() ) );
     listFontButton->setFont( font );
 
@@ -403,7 +403,7 @@ void FacePrefPage::reset()
 
 void FacePrefPage::updateButtons()
 {
-    QFont font = KitaConfig::listFont();
+    QFont font = Kita::Config::font();
     listFontButton->setText( font.family() + " " + QString::number( font.pointSize() ) );
     listFontButton->setFont( font );