>>944, cancel setting if 'OK' button pushed.

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

diff --git a/kita/src/pref.cpp b/kita/src/pref.cpp
index 4ff7daa..1e1e298 100644 (file)
--- a/kita/src/pref.cpp
+++ b/kita/src/pref.cpp
@@ -122,6 +122,17 @@ KitaFontPrefPage::KitaFontPrefPage( QWidget* parent )
     updateButtons();
 }
 
+void KitaPreferences::slotOk()
+{
+    m_fontPage->apply();
+    m_colorPage->apply();
+    m_asciiArtPage->commit();
+    m_uiPage->apply();
+    m_abonePage->apply();
+
+    KDialogBase::slotOk();
+} 
+
 void KitaFontPrefPage::apply()
 {
     QFont font = fontButton->font();

diff --git a/kita/src/pref.h b/kita/src/pref.h
index 33035d6..8c68820 100644 (file)
--- a/kita/src/pref.h
+++ b/kita/src/pref.h
@@ -55,6 +55,7 @@ private:
 
 private slots:
     void slotChanged();
+    virtual void slotOk();
     
 signals:
     void fontChanged( const QFont& );