[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeedu/kwordquiz/src
From:       Peter Hedlund <peter () peterandlinda ! com>
Date:       2004-10-07 3:52:35
Message-ID: 20041007035235.0C8EB9991 () office ! kde ! org
[Download RAW message or body]

CVS commit by hedlund: 

Additional work on port to KConfigXT


  M +1 -1      kwordquiz.kcfg   1.2
  M +31 -10    kwordquizprefs.cpp   1.12


--- kdeedu/kwordquiz/src/kwordquiz.kcfg  #1.1:1.2
@@ -32,5 +32,5 @@
     <entry name="SpecialCharacters" type="String">
       <label>Characters for the special character toolbar</label>
-      <default>ßüçéèäæöø</default>
+      <default>ßüçéèäæöø</default>
     </entry>  
   </group>

--- kdeedu/kwordquiz/src/kwordquizprefs.cpp  #1.11:1.12
@@ -23,4 +23,5 @@
 #include <kpushbutton.h>
 #include <kdebug.h>
+#include <kconfigskeleton.h>
 
 #include <qlayout.h>
@@ -36,5 +37,4 @@
 #include "kwordquiz.h"
 #include "dlgspecchar.h"
-#include "prefs.h"
 
 KWordQuizPrefs::KWordQuizPrefs(QWidget *parent, const char *name,  KConfigSkeleton \
*config, DialogType dialogType, int dialogButtons, ButtonCode defaultButton, bool \
modal)  @@ -59,7 +59,11 @@ KWordQuizPrefs::KWordQuizPrefs(QWidget *
   KWordQuizApp *win=(KWordQuizApp *) parent;
   int i=0;
+
+  KConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
+  QString ds = item->property().toString();
+
   for ( QListViewItemIterator it = m_prefCharacter->lstCharacters; it.current(); \
++it)  {
-    it.current()->setText(2, (QString) Prefs::specialCharacters()[i++] ) ;
+    it.current()->setText(2, (QString) ds[i++] ) ;
     it.current()->setText(1, win->actionCollection()->action(QString("char_" + \
QString::number(i)).latin1())->shortcut().toString());  }
@@ -81,5 +85,6 @@ void KWordQuizPrefs::slotCharListSelecti
 void KWordQuizPrefs::slotSelectSpecChar( )
 {
-  QString f = Prefs::editorFont().family();
+  KConfigSkeletonItem * item = m_config->findItem("EditorFont");
+  QString f = item->property().toFont().family();
   QString s = m_prefCharacter->lstCharacters->currentItem()->text(2);
   QChar c = s[0];
@@ -128,4 +133,7 @@ bool KWordQuizPrefs::isDefault( )
 {
   kdDebug() << "isDefault" << endl;
+  bool bUseDefaults = m_config->useDefaults(true);
+  bool result /*= !hasChanged()*/;
+
   QString s;
   for ( QListViewItemIterator it = m_prefCharacter->lstCharacters; it.current(); \
++it) @@ -133,9 +141,15 @@ bool KWordQuizPrefs::isDefault( )
     s.append(it.current()->text(2));
   }
-  if ("ßüçéèäæöø" == s.stripWhiteSpace())
 
-    return KConfigDialog::isDefault();
+  KConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
+  QString ds = item->property().toString();
+
+  if (ds == s.stripWhiteSpace())
+    result = KConfigDialog::isDefault();
   else
-    return false;
+    result = false;
+
+  m_config->useDefaults(bUseDefaults);
+  return result;
 }
 
@@ -148,5 +162,8 @@ void KWordQuizPrefs::updateSettings( )
     s.append(it.current()->text(2));
   }
-  Prefs::setSpecialCharacters(s);
+
+  KConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
+  item->setProperty(QVariant(s));
+
   emit settingsChanged();
   m_hasChanged = false;
@@ -155,4 +172,6 @@ void KWordQuizPrefs::updateSettings( )
 void KWordQuizPrefs::updateWidgetsDefault( )
 {
+  bool bUseDefaults = m_config->useDefaults(true);
+
   QString s;
   for ( QListViewItemIterator it = m_prefCharacter->lstCharacters; it.current(); \
++it) @@ -161,5 +180,7 @@ void KWordQuizPrefs::updateWidgetsDefaul
   }
 
-  QString ds = "ßüçéèäæöø";
+  KConfigSkeletonItem * item = m_config->findItem("SpecialCharacters");
+  QString ds = item->property().toString();
+
   int i=0;
   for ( QListViewItemIterator it = m_prefCharacter->lstCharacters; it.current(); \
++it) @@ -169,5 +190,5 @@ void KWordQuizPrefs::updateWidgetsDefaul
   m_prefCharacter->lblPreview->setText(m_prefCharacter->lstCharacters->currentItem()->text(2));
  m_hasChanged = (ds != s);
-
+  m_config->useDefaults(bUseDefaults);
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]