From 1ea685b2f1576b0d810bf60bd24fdcb540034b67 Mon Sep 17 00:00:00 2001
From: ikemo <ikemo@56b19765-1e22-0410-a548-a0f45d66c51a>
Date: Thu, 16 Feb 2006 15:07:21 +0000
Subject: [PATCH] move to KConfig XT

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/kita/kita/trunk@1779 56b19765-1e22-0410-a548-a0f45d66c51a
---
 kita/src/board/boardview.cpp    |  2 +-
 kita/src/libkita/config_xt.kcfg |  8 ++++++++
 kita/src/libkita/kita_misc.cpp  |  2 +-
 kita/src/libkita/kitaconfig.cpp |  6 ------
 kita/src/libkita/kitaconfig.h   | 11 -----------
 kita/src/prefs/prefs.cpp        | 27 +++++++++++++++------------
 kita/src/thread/htmlpart.cpp    |  6 +++---
 7 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/kita/src/board/boardview.cpp b/kita/src/board/boardview.cpp
index 02203bb..d2b30f4 100644
--- a/kita/src/board/boardview.cpp
+++ b/kita/src/board/boardview.cpp
@@ -334,7 +334,7 @@ void KitaBoardView::updateListViewItem( QListViewItem* item, Kita::Thread* threa
         m_readNum++;
         item->setText( Col_MarkOrder, QString::number( ( viewPos > 1000 ) ? ts_readed : ts_read ) );
 
-    } else if ( since.secsTo( current ) < 3600 * KitaConfig::MarkTime() ) { /* new thread */
+    } else if ( since.secsTo( current ) < 3600 * Kita::Config::markTime() ) { /* new thread */
 
         item->setPixmap( Col_Mark, SmallIcon( "newthread" ) );
         m_newNum++;
diff --git a/kita/src/libkita/config_xt.kcfg b/kita/src/libkita/config_xt.kcfg
index af4b69d..8d26856 100644
--- a/kita/src/libkita/config_xt.kcfg
+++ b/kita/src/libkita/config_xt.kcfg
@@ -37,5 +37,13 @@
         <label>Number of responses displayed once.</label>
         <default>100</default>
     </entry>
+    <entry name="UseStyleSheet" type="Bool">
+        <label>Whether use custom stylesheet or not.</label>
+        <default>false</default>
+    </entry>
+    <entry name="MarkTime" type="Int">
+        <label>Time marked as newly arrived thread. (0 == after last access.)</label>
+        <default>24</default>
+    </entry>
   </group>
 </kcfg>
diff --git a/kita/src/libkita/kita_misc.cpp b/kita/src/libkita/kita_misc.cpp
index 8492178..b6f1d21 100644
--- a/kita/src/libkita/kita_misc.cpp
+++ b/kita/src/libkita/kita_misc.cpp
@@ -1226,7 +1226,7 @@ void Kita::createTitleHTML( RESDAT& resdat, QString& titleHTML )
     if ( !resdat.parsed ) return ;
 
     bool showMailAddress = Kita::Config::showMailAddress();
-    bool useTableTag = KitaConfig::useStyleSheet();
+    bool useTableTag = Kita::Config::useStyleSheet();
 
     if ( m_colonstr == QString::null ) {
         m_colonstr = utf8ToUnicode( KITAUTF8_COLON );
diff --git a/kita/src/libkita/kitaconfig.cpp b/kita/src/libkita/kitaconfig.cpp
index 728ec05..e1c6915 100644
--- a/kita/src/libkita/kitaconfig.cpp
+++ b/kita/src/libkita/kitaconfig.cpp
@@ -30,14 +30,12 @@ KitaConfig::KitaConfig()
         m_popupBackgroundColor( KitaConfig::defaultPopupBackgroundColor() ),
         // m_boardListURL
         // m_nameCompletion
-        m_useStyleSheet( KitaConfig::defaultUseStyleSheet() ),
         m_styleSheetText( KitaConfig::defaultStyleSheetText() ),
         m_asciiArtList( KitaConfig::defaultAsciiArtList() ),
         m_aboneNameList( KitaConfig::defaultAboneNameList() ),
         m_aboneIDList( KitaConfig::defaultAboneIDList() ),
         m_aboneWordList( KitaConfig::defaultAboneWordList() ),
         m_aboneChain( KitaConfig::defaultAboneChain() ),
-        m_MarkTime( KitaConfig::defaultMarkTime() ),
         m_sortOrder( static_cast<SortOrder>( KitaConfig::defaultSortOrder() ) ),
         m_partMimeList( KitaConfig::defaultPartMimeList() ),
         m_BeMailAddress( KitaConfig::defaultBeMailAddress() ),
@@ -59,9 +57,7 @@ KitaConfig::~KitaConfig()
 void KitaConfig::writeConfig( KConfig* config )
 {
     config->setGroup( "Global" );
-    config->writeEntry( "MarkTime", KitaConfig::MarkTime() );
     config->writeEntry( "SortOrder", KitaConfig::sortOrder() );
-    config->writeEntry( "UseStyleSheet", KitaConfig::useStyleSheet() );
     config->writeEntry( "PartMimeList", KitaConfig::partMimeList() );
     config->writeEntry( "AboneChain", KitaConfig::aboneChain() );
     config->writeEntry( "CheckResponsed", KitaConfig::checkResponsed() );
@@ -90,9 +86,7 @@ void KitaConfig::readConfig( KConfig* config )
 {
     config->setGroup( "Global" );
 
-    KitaConfig::setMarkTime( config->readUnsignedNumEntry( "MarkTime", KitaConfig::defaultMarkTime() ) );
     KitaConfig::setSortOrder( config->readNumEntry( "SortOrder", KitaConfig::defaultSortOrder() ) );
-    KitaConfig::setUseStyleSheet( config->readBoolEntry( "UseStyleSheet", KitaConfig::defaultUseStyleSheet() ) );
     KitaConfig::setAboneChain( config->readBoolEntry( "AboneChain", KitaConfig::defaultAboneChain() ) );
     KitaConfig::setCheckResponsed( config->readBoolEntry( "CheckResponsed", KitaConfig::defaultCheckResponsed() ) );
     KitaConfig::setCopyOnClick( config->readBoolEntry( "CopyOnClick", KitaConfig::defaultCopyOnClick() ) );
diff --git a/kita/src/libkita/kitaconfig.h b/kita/src/libkita/kitaconfig.h
index 92c8e37..e9fe204 100644
--- a/kita/src/libkita/kitaconfig.h
+++ b/kita/src/libkita/kitaconfig.h
@@ -36,14 +36,12 @@ private:
     QColor m_popupBackgroundColor;
     QString m_boardListURL;
     KCompletion m_nameCompletion;
-    bool m_useStyleSheet;
     QString m_styleSheetText;
     QStringList m_asciiArtList;
     QStringList m_aboneNameList;
     QStringList m_aboneIDList;
     QStringList m_aboneWordList;
     bool m_aboneChain;
-    int m_MarkTime;
     SortOrder m_sortOrder;
     QStringList m_partMimeList;
     QString m_userID;
@@ -91,10 +89,6 @@ public:
     static void setPopupBackgroundColor( QColor color ) { getInstance() ->m_popupBackgroundColor = color; }
     static QColor defaultPopupBackgroundColor() { return QColor( "yellow" ); }
 
-    static bool useStyleSheet() { return getInstance() ->m_useStyleSheet; }
-    static void setUseStyleSheet( bool value ) { getInstance() ->m_useStyleSheet = value; }
-    static bool defaultUseStyleSheet() { return false; }
-
     static QString& styleSheetText() { return getInstance() ->m_styleSheetText; }
     static void setStyleSheetText( QString text ) { getInstance() ->m_styleSheetText = text; }
     static QString defaultStyleSheetText();
@@ -123,11 +117,6 @@ public:
     static void addAboneWord( QString word ) { getInstance() ->m_aboneWordList.append( word ); }
     static QStringList defaultAboneWordList() { return QStringList(); }
 
-    // MarkTime(0) == special value (after last access)
-    static int MarkTime() { return getInstance() ->m_MarkTime; }
-    static void setMarkTime( int value ) { getInstance() ->m_MarkTime = value; }
-    static int defaultMarkTime() { return 24; }
-
     static int sortOrder() { return getInstance() ->m_sortOrder; }
     static void setSortOrder( int order ) { getInstance() ->m_sortOrder = static_cast<SortOrder>( order ); }
     static int defaultSortOrder() { return Order_Mark; }
diff --git a/kita/src/prefs/prefs.cpp b/kita/src/prefs/prefs.cpp
index 6bcd032..ec6573a 100644
--- a/kita/src/prefs/prefs.cpp
+++ b/kita/src/prefs/prefs.cpp
@@ -239,7 +239,7 @@ UIPrefPage::UIPrefPage( QWidget* parent )
         : UIPrefBase( parent )
 {
     useTabCheckBox->setChecked( Kita::Config::alwaysUseTab() );
-    MarkTimespinBox->setValue( KitaConfig::MarkTime() );
+    MarkTimespinBox->setValue( Kita::Config::markTime() );
     showMailCheckBox->setChecked( Kita::Config::showMailAddress() );
     orderGroup->setButton( KitaConfig::sortOrder() );
     showNumSpin->setValue( Kita::Config::showNum() );
@@ -263,7 +263,7 @@ UIPrefPage::UIPrefPage( QWidget* parent )
 void UIPrefPage::apply()
 {
     Kita::Config::setAlwaysUseTab( useTabCheckBox->isChecked() );
-    KitaConfig::setMarkTime( MarkTimespinBox->value() );
+    Kita::Config::setMarkTime( MarkTimespinBox->value() );
     Kita::Config::setShowMailAddress( showMailCheckBox->isChecked() );
     KitaConfig::setSortOrder( orderGroup->id( orderGroup->selected() ) );
     Kita::Config::setShowNum( showNumSpin->value() );
@@ -273,13 +273,15 @@ void UIPrefPage::apply()
 
 void UIPrefPage::reset()
 {
-    useTabCheckBox->setChecked( true ); // FIXME: don't write default value here.
-    MarkTimespinBox->setValue( KitaConfig::defaultMarkTime() );
-    showMailCheckBox->setChecked( false ); // FIXME: don't write default value here.
-    orderGroup->setButton( KitaConfig::defaultSortOrder() );
-    showNumSpin->setValue( 100 ); // FIXME: don't write default value here.
-    useExtPartCheck->setChecked( true ); // FIXME: don't write default value here.
+     // FIXME: don't write default value here.
+    useTabCheckBox->setChecked( true );
+    MarkTimespinBox->setValue( 24 );
+    showMailCheckBox->setChecked( false );
+    showNumSpin->setValue( 100 );
+    useExtPartCheck->setChecked( true );
+
     partMimeList->setText( KitaConfig::defaultPartMimeList().join( "," ) );
+    orderGroup->setButton( KitaConfig::defaultSortOrder() );
 }
 
 void UIPrefPage::slotEditFileAssociation()
@@ -323,7 +325,7 @@ FacePrefPage::FacePrefPage( QWidget* parent )
 
     // stylesheet
     styleSheetText->setText( KitaConfig::styleSheetText() );
-    useStyleSheetCheckBox->setChecked( KitaConfig::useStyleSheet() );
+    useStyleSheetCheckBox->setChecked( Kita::Config::useStyleSheet() );
 
     connect( styleSheetText, SIGNAL( textChanged() ), SIGNAL( changed() ) );
     connect( useStyleSheetCheckBox, SIGNAL( toggled( bool ) ), SIGNAL( changed() ) );
@@ -362,9 +364,9 @@ void FacePrefPage::apply()
 
     // stylesheet
     if ( KitaConfig::styleSheetText() != styleSheetText->text() ||
-            KitaConfig::useStyleSheet() != useStyleSheetCheckBox->isChecked() ) {
+            Kita::Config::useStyleSheet() != useStyleSheetCheckBox->isChecked() ) {
         KitaConfig::setStyleSheetText( styleSheetText->text() );
-        KitaConfig::setUseStyleSheet( useStyleSheetCheckBox->isChecked() );
+        Kita::Config::setUseStyleSheet( useStyleSheetCheckBox->isChecked() );
         emit setStyleSheetOfHTMLPart();
     }
 }
@@ -391,7 +393,8 @@ void FacePrefPage::reset()
     m_threadColorChanged = TRUE;
 
     // reset
-    useStyleSheetCheckBox->setChecked( KitaConfig::defaultUseStyleSheet() );
+    // FIXME: don't write default value here.
+    useStyleSheetCheckBox->setChecked( false );
     styleSheetText->setText( KitaConfig::defaultStyleSheetText() );
 }
 
diff --git a/kita/src/thread/htmlpart.cpp b/kita/src/thread/htmlpart.cpp
index 3ee52dd..a1cfd3c 100644
--- a/kita/src/thread/htmlpart.cpp
+++ b/kita/src/thread/htmlpart.cpp
@@ -235,7 +235,7 @@ void KitaHTMLPart::createHTMLDocument()
     QString text = "<html><head><style>";
     text += KitaConfig::defaultStyleSheetText();
     text += style;
-    if ( KitaConfig::useStyleSheet() ) {
+    if ( Kita::Config::useStyleSheet() ) {
         text += KitaConfig::styleSheetText();
     }
     text += "</style></head><body></body></html>";
@@ -449,7 +449,7 @@ void KitaHTMLPart::slotSetStyleSheetOfHTMLPart()
 
             QString style0 = KitaConfig::defaultStyleSheetText();
             style0 += style;
-            if ( KitaConfig::useStyleSheet() ) {
+            if ( Kita::Config::useStyleSheet() ) {
                 style0 += KitaConfig::styleSheetText();
             }
 
@@ -2246,7 +2246,7 @@ namespace Kita
         QString text = "<html><head><style>";
         text += KitaConfig::defaultStyleSheetText();
         text += style;
-        if ( KitaConfig::useStyleSheet() ) {
+        if ( Kita::Config::useStyleSheet() ) {
             text += KitaConfig::styleSheetText();
         }
         text += "</style></head><body class=\"pop\">";
-- 
2.11.0