unify before/after show num.

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

diff --git a/kita/src/libkita/kitaconfig.cpp b/kita/src/libkita/kitaconfig.cpp
index a957e50..dbb0b29 100644 (file)
--- a/kita/src/libkita/kitaconfig.cpp
+++ b/kita/src/libkita/kitaconfig.cpp
@@ -27,7 +27,7 @@ KitaConfig::KitaConfig()
         m_popupColor( "black" ), m_popupBackgroundColor( "yellow" ),
         m_showMailAddress( false ), m_MarkTime( 24 ), m_alwaysUseTab( false ),
         m_viewMode( View_2pane ), m_sortOrder( Order_Mark ), m_showAA( false ),
-        m_afterShowNum( 100 ), m_preShowNum( 50 )
+        m_showNum( 100 )
 {}
 
 KitaConfig::~KitaConfig()
@@ -43,8 +43,7 @@ void KitaConfig::writeConfig( KConfig* config )
     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( "ShowNum", KitaConfig::showNum() );
     config->writeEntry( "UsePart", KitaConfig::usePart() );
     config->writeEntry( "PartMimeList", KitaConfig::partMimeList() );
 
@@ -68,8 +67,7 @@ void KitaConfig::readConfig( KConfig* config )
     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::setShowNum( config->readNumEntry( "ShowNum", 100 ) );
     KitaConfig::setUsePart( config->readBoolEntry( "UsePart", true ) );
     if ( config->hasKey( "PartMimeList" ) )
         KitaConfig::setPartMimeList( config->readListEntry( "PartMimeList" ) );

diff --git a/kita/src/libkita/kitaconfig.h b/kita/src/libkita/kitaconfig.h
index 83c1236..8e1983d 100644 (file)
--- a/kita/src/libkita/kitaconfig.h
+++ b/kita/src/libkita/kitaconfig.h
@@ -53,8 +53,7 @@ private:
     ViewMode m_viewMode;
     SortOrder m_sortOrder;
     bool m_showAA;
-    int m_afterShowNum;
-    int m_preShowNum;
+    int m_showNum;
     bool m_usePart;
     QStringList m_partMimeList;
     QString m_userID;
@@ -111,10 +110,8 @@ public:
     static void setSortOrder( int order ) { getInstance() ->m_sortOrder = static_cast<SortOrder>( order ); }
     static bool showAA() { return getInstance() ->m_showAA; }
     static void setShowAA( bool on ) { getInstance() ->m_showAA = on; }
-    static int afterShowNum() { return getInstance() ->m_afterShowNum; }
-    static void setAfterShowNum( int value ) { getInstance() ->m_afterShowNum = value; }
-    static int preShowNum() { return getInstance() ->m_preShowNum; }
-    static void setPreShowNum( int value ) { getInstance() ->m_preShowNum = value; }
+    static int showNum() { return getInstance() ->m_showNum; }
+    static void setShowNum( int num ) { getInstance() ->m_showNum = num; }
     static bool usePart() { return getInstance()->m_usePart; }
     static void setUsePart( bool value ) { getInstance()->m_usePart = value; }
     static QStringList& partMimeList() { return getInstance()->m_partMimeList; }

diff --git a/kita/src/part/kitahtmlpart.cpp b/kita/src/part/kitahtmlpart.cpp
index b741731..f135782 100644 (file)
--- a/kita/src/part/kitahtmlpart.cpp
+++ b/kita/src/part/kitahtmlpart.cpp
@@ -387,10 +387,8 @@ bool KitaHTMLPart::load( int centerNum )
 
     /* config */
 
-    int preShowNum = KitaConfig::preShowNum();
-    if( preShowNum == 0 ) preShowNum = 5000;
-    int afterShowNum = KitaConfig::afterShowNum();
-    if( afterShowNum == 0 ) afterShowNum = 5000;  /* TODO: fix it. */
+    int showNum = KitaConfig::showNum();
+    if( showNum == 0 ) showNum = 5000;
 
     /*--------------------------------*/
     m_centerNum = centerNum;
@@ -400,7 +398,7 @@ bool KitaHTMLPart::load( int centerNum )
     if( Kita::DatManager::getReadNum( m_datURL ) == 0 ) return FALSE;
 
     m_domtree->appendTemplate();
-    showResponses( m_centerNum - preShowNum, m_centerNum + afterShowNum );
+    showResponses( m_centerNum - showNum, m_centerNum + showNum );
     updateScreen( TRUE , FALSE );
     gotoAnchor( QString().setNum( m_centerNum ), FALSE );
     view()->setFocus();
@@ -455,8 +453,8 @@ void KitaHTMLPart::slotReceiveData()
 
     const int delta = 20;
     const int oneAfterAnother = TRUE;
-    int afterShowNum = KitaConfig::afterShowNum();
-    if( afterShowNum == 0 ) afterShowNum = 5000;  /* TODO: fix it. */
+    int showNum = KitaConfig::showNum();
+    if( showNum == 0 ) showNum = 5000;  /* TODO: fix it. */
 
     /*--------------------------------*/
 
@@ -465,7 +463,7 @@ void KitaHTMLPart::slotReceiveData()
 
     int readNum = Kita::DatManager::getReadNum( m_datURL );
     int bottom = m_domtree->getBottomResNumber();
-    int showNum = m_centerNum + afterShowNum;
+    showNum += m_centerNum;
 
     /* parsing */
     if( oneAfterAnother ) parseResponses( bottom+1, readNum );
@@ -500,8 +498,8 @@ void KitaHTMLPart::slotReceiveData()
 void KitaHTMLPart::slotFinishLoad()
 {
     /* config */
-    int afterShowNum = KitaConfig::afterShowNum();
-    if( afterShowNum == 0 ) afterShowNum = 5000;  /* TODO: fix it. */
+    int showNum = KitaConfig::showNum();
+    if( showNum == 0 ) showNum = 5000;  /* TODO: fix it. */
 
     /*--------------------------------*/
 
@@ -509,7 +507,7 @@ void KitaHTMLPart::slotFinishLoad()
     if( !m_domtree ) return;
 
     int bottom = m_domtree->getBottomResNumber();
-    int shownNum = m_centerNum + afterShowNum;
+    int shownNum = m_centerNum + showNum;
 
     showResponses(bottom+1, shownNum );
     updateScreen( TRUE, FALSE );

diff --git a/kita/src/pref.cpp b/kita/src/pref.cpp
index fd4bc65..3f4afd4 100644 (file)
--- a/kita/src/pref.cpp
+++ b/kita/src/pref.cpp
@@ -277,8 +277,7 @@ UIPrefPage::UIPrefPage( QWidget* parent )
     showMailCheckBox->setChecked( KitaConfig::showMailAddress() );
     viewGroup->setButton( KitaConfig::viewMode() );
     orderGroup->setButton( KitaConfig::sortOrder() );
-    afterShowNumSpin->setValue( KitaConfig::afterShowNum() );
-    preShowNumSpin->setValue( KitaConfig::preShowNum() );
+    showNumSpin->setValue( KitaConfig::showNum() );
     useExtPartCheck->setChecked( KitaConfig::usePart() );
     partMimeList->setText( KitaConfig::partMimeList().join( "," ) );
 
@@ -287,8 +286,7 @@ UIPrefPage::UIPrefPage( QWidget* parent )
     connect( showMailCheckBox, SIGNAL( clicked() ), SIGNAL( changed() ) );
     connect( viewGroup, SIGNAL( clicked( int ) ), SIGNAL( changed() ) );
     connect( orderGroup, SIGNAL( clicked( int ) ), SIGNAL( changed() ) );
-    connect( afterShowNumSpin, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) );
-    connect( preShowNumSpin, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) );
+    connect( showNumSpin, SIGNAL( valueChanged( int ) ), SIGNAL( changed() ) );
 #define NCC(ctl, signal) \
     connect( ctl, SIGNAL( signal ), SIGNAL( changed() ) )
 //    NCC( extPartGroup, toggled( bool ) );
@@ -303,8 +301,7 @@ void UIPrefPage::apply()
     KitaConfig::setShowMailAddresss( showMailCheckBox->isChecked() );
     KitaConfig::setViewMode( viewGroup->id( viewGroup->selected() ) );
     KitaConfig::setSortOrder( orderGroup->id( orderGroup->selected() ) );
-    KitaConfig::setAfterShowNum( afterShowNumSpin->value() );
-    KitaConfig::setPreShowNum( preShowNumSpin->value() );
+    KitaConfig::setShowNum( showNumSpin->value() );
     KitaConfig::setUsePart( useExtPartCheck->isChecked() );
     KitaConfig::setPartMimeList( partMimeList->text() );
 }

diff --git a/kita/src/uiprefbase.ui b/kita/src/uiprefbase.ui
index e7c23d7..40ee721 100644 (file)
--- a/kita/src/uiprefbase.ui
+++ b/kita/src/uiprefbase.ui
@@ -9,7 +9,7 @@
             <x>0</x>
             <y>0</y>
             <width>646</width>
-            <height>526</height>
+            <height>530</height>
         </rect>
     </property>
     <property name="caption">
@@ -125,7 +125,7 @@
                         </property>
                         <widget class="QSpinBox">
                             <property name="name">
-                                <cstring>preShowNumSpin</cstring>
+                                <cstring>showNumSpin</cstring>
                             </property>
                             <property name="prefix">
                                 <string>Display </string>
@@ -154,7 +154,7 @@
                                 <cstring>textLabel3_2</cstring>
                             </property>
                             <property name="text">
-                                <string>before the last read response.</string>
+                                <string>around the last read response.</string>
                             </property>
                         </widget>
                         <spacer>
@@ -176,67 +176,6 @@
                         </spacer>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
-                    <property name="name">
-                        <cstring>layout13</cstring>
-                    </property>
-                    <hbox>
-                        <property name="name">
-                            <cstring>unnamed</cstring>
-                        </property>
-                        <widget class="QSpinBox">
-                            <property name="name">
-                                <cstring>afterShowNumSpin</cstring>
-                            </property>
-                            <property name="prefix">
-                                <string>Display </string>
-                            </property>
-                            <property name="suffix">
-                                <string> res</string>
-                            </property>
-                            <property name="specialValueText">
-                                <string>Display all res</string>
-                            </property>
-                            <property name="wrapping">
-                                <bool>true</bool>
-                            </property>
-                            <property name="maxValue">
-                                <number>1000</number>
-                            </property>
-                            <property name="lineStep">
-                                <number>50</number>
-                            </property>
-                            <property name="value">
-                                <number>100</number>
-                            </property>
-                        </widget>
-                        <widget class="QLabel">
-                            <property name="name">
-                                <cstring>textLabel3</cstring>
-                            </property>
-                            <property name="text">
-                                <string>from the last read response.</string>
-                            </property>
-                        </widget>
-                        <spacer>
-                            <property name="name">
-                                <cstring>spacer11_2</cstring>
-                            </property>
-                            <property name="orientation">
-                                <enum>Horizontal</enum>
-                            </property>
-                            <property name="sizeType">
-                                <enum>Expanding</enum>
-                            </property>
-                            <property name="sizeHint">
-                                <size>
-                                    <width>293</width>
-                                    <height>20</height>
-                                </size>
-                            </property>
-                        </spacer>
-                    </hbox>
-                </widget>
             </vbox>
         </widget>
         <widget class="QButtonGroup">