rename

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

diff --git a/kita/src/prefs/faceprefbase.ui b/kita/src/prefs/faceprefbase.ui
index 4aac1a3..9113f54 100644 (file)
--- a/kita/src/prefs/faceprefbase.ui
+++ b/kita/src/prefs/faceprefbase.ui
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>Kita::FacePrefBase</class>
 <widget class="QWidget">
     <property name="name">
@@ -9,7 +9,7 @@
             <x>0</x>
             <y>0</y>
             <width>600</width>
-            <height>500</height>
+            <height>504</height>
         </rect>
     </property>
     <property name="caption">
@@ -70,7 +70,7 @@
                     </spacer>
                     <widget class="QGroupBox" row="0" column="0">
                         <property name="name">
-                            <cstring>groupBox2</cstring>
+                            <cstring>listGroupBox</cstring>
                         </property>
                         <property name="title">
                             <string>Board/Subject List</string>
@@ -81,7 +81,7 @@
                             </property>
                             <widget class="QPushButton" row="0" column="1">
                                 <property name="name">
-                                    <cstring>fontButton</cstring>
+                                    <cstring>listFontButton</cstring>
                                 </property>
                                 <property name="text">
                                     <string>set font</string>
@@ -89,7 +89,7 @@
                             </widget>
                             <widget class="KColorButton" row="2" column="1">
                                 <property name="name">
-                                    <cstring>popupColorButton_2_2</cstring>
+                                    <cstring>listBackgroundColorButton</cstring>
                                 </property>
                                 <property name="enabled">
                                     <bool>false</bool>
@@ -100,7 +100,7 @@
                             </widget>
                             <widget class="QLabel" row="1" column="0">
                                 <property name="name">
-                                    <cstring>popupLabel_2_2</cstring>
+                                    <cstring>listColorLabel</cstring>
                                 </property>
                                 <property name="enabled">
                                     <bool>false</bool>
@@ -111,7 +111,7 @@
                             </widget>
                             <widget class="QLabel" row="2" column="0">
                                 <property name="name">
-                                    <cstring>popupBackgroundLabel_2_2</cstring>
+                                    <cstring>listBackgroundColorLabel</cstring>
                                 </property>
                                 <property name="enabled">
                                     <bool>false</bool>
@@ -122,7 +122,7 @@
                             </widget>
                             <widget class="KColorButton" row="1" column="1">
                                 <property name="name">
-                                    <cstring>popupBackgroundColorButton_2_2</cstring>
+                                    <cstring>listColorButton</cstring>
                                 </property>
                                 <property name="enabled">
                                     <bool>false</bool>
@@ -133,7 +133,7 @@
                             </widget>
                             <widget class="QLabel" row="0" column="0">
                                 <property name="name">
-                                    <cstring>fontLabel</cstring>
+                                    <cstring>listFontLabel</cstring>
                                 </property>
                                 <property name="text">
                                     <string>font</string>
@@ -143,7 +143,7 @@
                     </widget>
                     <widget class="QGroupBox" row="1" column="0">
                         <property name="name">
-                            <cstring>groupBox1</cstring>
+                            <cstring>threadGroupBox</cstring>
                         </property>
                         <property name="title">
                             <string>Thread</string>
@@ -154,7 +154,7 @@
                             </property>
                             <widget class="KColorButton" row="1" column="1">
                                 <property name="name">
-                                    <cstring>popupBackgroundColorButton_2</cstring>
+                                    <cstring>threadColorButton</cstring>
                                 </property>
                                 <property name="enabled">
                                     <bool>false</bool>
@@ -165,7 +165,7 @@
                             </widget>
                             <widget class="QLabel" row="1" column="0">
                                 <property name="name">
-                                    <cstring>popupLabel_2</cstring>
+                                    <cstring>threadColorLabel</cstring>
                                 </property>
                                 <property name="enabled">
                                     <bool>false</bool>
@@ -176,7 +176,7 @@
                             </widget>
                             <widget class="KColorButton" row="2" column="1">
                                 <property name="name">
-                                    <cstring>popupColorButton_2</cstring>
+                                    <cstring>threadBackgroundColorButton</cstring>
                                 </property>
                                 <property name="enabled">
                                     <bool>false</bool>
@@ -187,7 +187,7 @@
                             </widget>
                             <widget class="QLabel" row="2" column="0">
                                 <property name="name">
-                                    <cstring>popupBackgroundLabel_2</cstring>
+                                    <cstring>threadBackgroundColorLabel</cstring>
                                 </property>
                                 <property name="enabled">
                                     <bool>false</bool>
@@ -216,7 +216,7 @@
                     </widget>
                     <widget class="QGroupBox" row="2" column="0">
                         <property name="name">
-                            <cstring>groupBox3</cstring>
+                            <cstring>popupGroupBox</cstring>
                         </property>
                         <property name="title">
                             <string>Popup</string>
@@ -238,7 +238,7 @@
                             </widget>
                             <widget class="QLabel" row="1" column="0">
                                 <property name="name">
-                                    <cstring>popupLabel</cstring>
+                                    <cstring>popupColorLabel</cstring>
                                 </property>
                                 <property name="text">
                                     <string>text color</string>
@@ -246,7 +246,7 @@
                             </widget>
                             <widget class="QLabel" row="2" column="0">
                                 <property name="name">
-                                    <cstring>popupBackgroundLabel</cstring>
+                                    <cstring>popupBackgroundColorLabel</cstring>
                                 </property>
                                 <property name="text">
                                     <string>background color</string>
@@ -254,7 +254,7 @@
                             </widget>
                             <widget class="QLabel" row="0" column="0">
                                 <property name="name">
-                                    <cstring>threadFontLabel_2</cstring>
+                                    <cstring>popupFontLabel</cstring>
                                 </property>
                                 <property name="enabled">
                                     <bool>false</bool>

diff --git a/kita/src/prefs/prefs.cpp b/kita/src/prefs/prefs.cpp
index 432c1ff..1ca3262 100644 (file)
--- a/kita/src/prefs/prefs.cpp
+++ b/kita/src/prefs/prefs.cpp
@@ -263,7 +263,7 @@ FacePrefPage::FacePrefPage( QWidget* parent )
         : FacePrefBase( parent )
 {
     // font
-    connect( fontButton, SIGNAL( clicked() ), SLOT( slotFontButtonClicked() ) );
+    connect( listFontButton, SIGNAL( clicked() ), SLOT( slotFontButtonClicked() ) );
 
     connect( threadFontButton, SIGNAL( clicked() ),
              SLOT( slotThreadFontButtonClicked() ) );
@@ -297,7 +297,7 @@ FacePrefPage::FacePrefPage( QWidget* parent )
 void FacePrefPage::apply()
 {
     // font
-    QFont font = fontButton->font();
+    QFont font = listFontButton->font();
     KitaConfig::setFont( font );
     emit fontChanged( font );
 
@@ -326,8 +326,8 @@ void FacePrefPage::reset()
     // font
     QFont font;
     font = KitaConfig::defaultFont();
-    fontButton->setText( font.family() + " " + QString::number( font.pointSize() ) );
-    fontButton->setFont( font );
+    listFontButton->setText( font.family() + " " + QString::number( font.pointSize() ) );
+    listFontButton->setFont( font );
 
     font = KitaConfig::defaultThreadFont();
     threadFontButton->setText( font.family() + " " + QString::number( font.pointSize() ) );
@@ -346,8 +346,8 @@ void FacePrefPage::reset()
 void FacePrefPage::updateButtons()
 {
     QFont font = KitaConfig::font();
-    fontButton->setText( font.family() + " " + QString::number( font.pointSize() ) );
-    fontButton->setFont( font );
+    listFontButton->setText( font.family() + " " + QString::number( font.pointSize() ) );
+    listFontButton->setFont( font );
 
     QFont threadFont = KitaConfig::threadFont();
     threadFontButton->setText( threadFont.family() + " " + QString::number( threadFont.pointSize() ) );
@@ -368,11 +368,11 @@ void FacePrefPage::slotThreadFontButtonClicked()
 
 void FacePrefPage::slotFontButtonClicked()
 {
-    QFont font = fontButton->font();
+    QFont font = listFontButton->font();
 
     if ( KFontDialog::getFont( font, false, this ) == QDialog::Accepted ) {
-        fontButton->setText( font.family() + " " + QString::number( font.pointSize() ) );
-        fontButton->setFont( font );
+        listFontButton->setText( font.family() + " " + QString::number( font.pointSize() ) );
+        listFontButton->setFont( font );
         emit changed();
     }
 }