move readConfig/writeConfig to KitaConfig

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

diff --git a/kita/src/kita.cpp b/kita/src/kita.cpp
index a9b2c41..317e412 100644 (file)
--- a/kita/src/kita.cpp
+++ b/kita/src/kita.cpp
@@ -93,7 +93,7 @@ KitaMainWindow::KitaMainWindow()
 
     readDockConfig( KGlobal::config() );
 
-    readConfig( KGlobal::config() );
+    KitaConfig::readConfig( KGlobal::config() );
 
     // apply the saved mainwindow settings, if any, and ask the mainwindow
     // to automatically save settings if changed: window size, toolbar
@@ -175,7 +175,7 @@ KitaMainWindow::~KitaMainWindow()
 
     saveMainWindowSettings( KGlobal::config(), "MainWindow" );
 
-    writeConfig( KGlobal::config() );
+    KitaConfig::writeConfig( KGlobal::config() );
 
     writeDockConfig( KGlobal::config() );
 }
@@ -293,30 +293,6 @@ void KitaMainWindow::slotURLLine()
     m_threadTab->showThread( datURL, KitaConfig::alwaysUseTab() );
 }
 
-void KitaMainWindow::writeConfig( KConfig* config )
-{
-    config->setGroup( "Global" );
-    config->writeEntry( "Font", KitaConfig::font() );
-    config->writeEntry( "ThreadFont", KitaConfig::threadFont() );
-    config->writeEntry( "ShowMailAddress", KitaConfig::showMailAddress() );
-    config->writeEntry( "MarkTime", KitaConfig::MarkTime() );
-    config->writeEntry( "SortOrder", KitaConfig::sortOrder() );
-    config->writeEntry( "AlwaysUseTab", KitaConfig::alwaysUseTab() );
-    config->writeEntry( "ShowAA", KitaConfig::showAA() );
-    config->writeEntry( "AfterShowNum", KitaConfig::afterShowNum() );
-    config->writeEntry( "PreShowNum", KitaConfig::preShowNum() );
-    config->writeEntry( "UsePart", KitaConfig::usePart() );
-    config->writeEntry( "PartMimeList", KitaConfig::partMimeList() );
-
-    config->setGroup( "Color" );
-    config->writeEntry( "Popup", KitaConfig::popupColor() );
-    config->writeEntry( "PopupBackground", KitaConfig::popupBackgroundColor() );
-    
-    config->setGroup( "Account" );
-    config->writeEntry( "UserID", KitaConfig::userID() );
-    config->writeEntry( "Password", encryptStr( KitaConfig::password() ) );
-}
-
 void KitaMainWindow::saveProperties( KConfig* config )
 {
     // the 'config' object points to the session managed
@@ -325,51 +301,7 @@ void KitaMainWindow::saveProperties( KConfig* config )
 
     //    if (m_view->currentURL() != QString::null)
     //        config->writeEntry("lastURL", m_view->currentURL());
-    writeConfig( config );
-}
-
-void KitaMainWindow::readConfig( KConfig* config )
-{
-    config->setGroup( "Global" );
-    KitaConfig::setFont( config->readFontEntry( "Font" ) );
-    KitaConfig::setThreadFont( config->readFontEntry( "ThreadFont" ) );
-    KitaConfig::setShowMailAddresss( config->readBoolEntry( "ShowMailAddress" ) );
-    KitaConfig::setMarkTime( config->readUnsignedNumEntry( "MarkTime" , 24 ) );
-    KitaConfig::setViewMode( config->readNumEntry( "ViewMode", KitaConfig::View_2pane ) );
-    KitaConfig::setSortOrder( config->readNumEntry( "SortOrder", KitaConfig::Order_Mark ) );
-    KitaConfig::setAlwaysUseTab( config->readBoolEntry( "AlwaysUseTab", false ) );
-    KitaConfig::setShowAA( config->readBoolEntry( "ShowAA", false ) );
-    KitaConfig::setAfterShowNum( config->readNumEntry( "AfterShowNum", 100 ) );
-    KitaConfig::setPreShowNum( config->readNumEntry( "PreShowNum", 50 ) );
-    KitaConfig::setUsePart( config->readBoolEntry( "UsePart", true ) );
-    if ( config->hasKey( "PartMimeList" ) )
-        KitaConfig::setPartMimeList( config->readListEntry( "PartMimeList" ) );
-    else {
-        // set partMimeList default
-        QStringList list;
-        list << "image/gif" << "image/jpeg" << "image/png" << "image/x-bmp";
-        KitaConfig::setPartMimeList( list );
-    }
-
-    setFont( KitaConfig::font() );
-
-    config->setGroup( "Color" );
-
-    QColor popupColor = config->readColorEntry( "Popup" );
-    if ( popupColor.isValid() )
-    {
-        KitaConfig::setPopupColor( popupColor );
-    }
-
-    QColor popupBackgroundColor = config->readColorEntry( "PopupBackground" );
-    if ( popupColor.isValid() )
-    {
-        KitaConfig::setPopupBackgroundColor( popupBackgroundColor );
-    }
-    
-    config->setGroup( "Account" );
-    KitaConfig::setUserID( config->readEntry( "UserID" ) );
-    KitaConfig::setPassword( decryptStr( config->readEntry( "Password" ) ) );
+    KitaConfig::writeConfig( config );
 }
 
 void KitaMainWindow::readProperties( KConfig* config )
@@ -383,7 +315,7 @@ void KitaMainWindow::readProperties( KConfig* config )
 
     //    if (url != QString::null)
     //        m_view->openURL(KURL(url));
-    readConfig( config );
+    KitaConfig::readConfig( config );
 }
 
 void KitaMainWindow::dragEnterEvent( QDragEnterEvent* event )
@@ -981,22 +913,4 @@ void KitaMainWindow::slotIsKitaActive()
     if(isActiveWindow()) emit kitaIsActive();
 }
 
-
-/*
- * encryptStr and decryptStr are copied from kdepim/kmail/kmaccount.{h,cpp}
- */
-QString KitaMainWindow::encryptStr( const QString& aStr )
-{
-    QString result;
-    for (uint i = 0; i < aStr.length(); i++)
-        result += (aStr[i].unicode() < 0x20) ? aStr[i] :
-                  QChar(0x1001F - aStr[i].unicode());
-    return result;
-}
-
-QString KitaMainWindow::decryptStr( const QString& aStr )
-{
-    return encryptStr( aStr );
-}
-
 #include "kita.moc"

diff --git a/kita/src/kita.h b/kita/src/kita.h
index cd672ab..374f66a 100644 (file)
--- a/kita/src/kita.h
+++ b/kita/src/kita.h
@@ -79,10 +79,6 @@ protected:
      * with @ref saveProperties
      */
     void readProperties( KConfig* );
-
-    void readConfig( KConfig* );
-    void writeConfig( KConfig* );
-
     void windowActivationChange( bool );
 
 private slots:
@@ -132,9 +128,6 @@ private:
     KDockWidget* m_mainDock;
     KDockWidget* m_boardDock;
     KDockWidget* m_subjectDock;
-        
-    QString encryptStr( const QString& str );
-    QString decryptStr( const QString& str );
 
     void setupAccel();
     void setupActions();

diff --git a/kita/src/libkita/kitaconfig.cpp b/kita/src/libkita/kitaconfig.cpp
index 3846ddf..a957e50 100644 (file)
--- a/kita/src/libkita/kitaconfig.cpp
+++ b/kita/src/libkita/kitaconfig.cpp
@@ -10,6 +10,8 @@
 
 #include "kitaconfig.h"
 
+#include <kconfig.h>
+
 KitaConfig* KitaConfig::instance = 0;
 
 KitaConfig* KitaConfig::getInstance()
@@ -30,3 +32,88 @@ KitaConfig::KitaConfig()
 
 KitaConfig::~KitaConfig()
 {}
+
+void KitaConfig::writeConfig( KConfig* config )
+{
+    config->setGroup( "Global" );
+    config->writeEntry( "Font", KitaConfig::font() );
+    config->writeEntry( "ThreadFont", KitaConfig::threadFont() );
+    config->writeEntry( "ShowMailAddress", KitaConfig::showMailAddress() );
+    config->writeEntry( "MarkTime", KitaConfig::MarkTime() );
+    config->writeEntry( "SortOrder", KitaConfig::sortOrder() );
+    config->writeEntry( "AlwaysUseTab", KitaConfig::alwaysUseTab() );
+    config->writeEntry( "ShowAA", KitaConfig::showAA() );
+    config->writeEntry( "AfterShowNum", KitaConfig::afterShowNum() );
+    config->writeEntry( "PreShowNum", KitaConfig::preShowNum() );
+    config->writeEntry( "UsePart", KitaConfig::usePart() );
+    config->writeEntry( "PartMimeList", KitaConfig::partMimeList() );
+
+    config->setGroup( "Color" );
+    config->writeEntry( "Popup", KitaConfig::popupColor() );
+    config->writeEntry( "PopupBackground", KitaConfig::popupBackgroundColor() );
+    
+    config->setGroup( "Account" );
+    config->writeEntry( "UserID", KitaConfig::userID() );
+    config->writeEntry( "Password", encryptStr( KitaConfig::password() ) );
+}
+
+void KitaConfig::readConfig( KConfig* config )
+{
+    config->setGroup( "Global" );
+    KitaConfig::setFont( config->readFontEntry( "Font" ) );
+    KitaConfig::setThreadFont( config->readFontEntry( "ThreadFont" ) );
+    KitaConfig::setShowMailAddresss( config->readBoolEntry( "ShowMailAddress" ) );
+    KitaConfig::setMarkTime( config->readUnsignedNumEntry( "MarkTime" , 24 ) );
+    KitaConfig::setViewMode( config->readNumEntry( "ViewMode", KitaConfig::View_2pane ) );
+    KitaConfig::setSortOrder( config->readNumEntry( "SortOrder", KitaConfig::Order_Mark ) );
+    KitaConfig::setAlwaysUseTab( config->readBoolEntry( "AlwaysUseTab", false ) );
+    KitaConfig::setShowAA( config->readBoolEntry( "ShowAA", false ) );
+    KitaConfig::setAfterShowNum( config->readNumEntry( "AfterShowNum", 100 ) );
+    KitaConfig::setPreShowNum( config->readNumEntry( "PreShowNum", 50 ) );
+    KitaConfig::setUsePart( config->readBoolEntry( "UsePart", true ) );
+    if ( config->hasKey( "PartMimeList" ) )
+        KitaConfig::setPartMimeList( config->readListEntry( "PartMimeList" ) );
+    else {
+        // set partMimeList default
+        QStringList list;
+        list << "image/gif" << "image/jpeg" << "image/png" << "image/x-bmp";
+        KitaConfig::setPartMimeList( list );
+    }
+
+    setFont( KitaConfig::font() );
+
+    config->setGroup( "Color" );
+
+    QColor popupColor = config->readColorEntry( "Popup" );
+    if ( popupColor.isValid() )
+    {
+        KitaConfig::setPopupColor( popupColor );
+    }
+
+    QColor popupBackgroundColor = config->readColorEntry( "PopupBackground" );
+    if ( popupColor.isValid() )
+    {
+        KitaConfig::setPopupBackgroundColor( popupBackgroundColor );
+    }
+    
+    config->setGroup( "Account" );
+    KitaConfig::setUserID( config->readEntry( "UserID" ) );
+    KitaConfig::setPassword( decryptStr( config->readEntry( "Password" ) ) );
+}
+
+/*
+ * encryptStr and decryptStr are copied from kdepim/kmail/kmaccount.{h,cpp}
+ */
+QString KitaConfig::encryptStr( const QString& aStr )
+{
+    QString result;
+    for (uint i = 0; i < aStr.length(); i++)
+        result += (aStr[i].unicode() < 0x20) ? aStr[i] :
+                  QChar(0x1001F - aStr[i].unicode());
+    return result;
+}
+
+QString KitaConfig::decryptStr( const QString& aStr )
+{
+    return encryptStr( aStr );
+}

diff --git a/kita/src/libkita/kitaconfig.h b/kita/src/libkita/kitaconfig.h
index 7ab99e4..5a2b195 100644 (file)
--- a/kita/src/libkita/kitaconfig.h
+++ b/kita/src/libkita/kitaconfig.h
@@ -60,7 +60,13 @@ private:
     
     KitaConfig();
     virtual ~KitaConfig();
+        
+    static QString encryptStr( const QString& str );
+    static QString decryptStr( const QString& str );
 public:
+    static void writeConfig( KConfig* config );
+    static void readConfig( KConfig* config );
+    
     static KitaConfig* getInstance();
     static QFont& font() { return getInstance() ->m_font; }
     static void setFont( QFont font ) { getInstance() ->m_font = font; }