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

List:       kde-commits
Subject:    extragear/graphics/digikam/utilities/setup
From:       Gilles Caulier <caulier.gilles () free ! fr>
Date:       2006-12-05 14:33:11
Message-ID: 1165329191.313454.7622.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 610775 by cgilles:

digikam from trunk : bugfix : if CM is not enable at the first time, the user cannot \
set on this option duing a bug in factorization of methods readSettings() and \
restoreSettings()

 M  +5 -3      setupicc.cpp  
 M  +1 -1      setupicc.h  


--- trunk/extragear/graphics/digikam/utilities/setup/setupicc.cpp #610774:610775
@@ -426,13 +426,15 @@
             *(d->proofICCPath.find(d->proofProfilesKC->currentText())));
 }
 
-void SetupICC::readSettings()
+void SetupICC::readSettings(bool restore)
 {
     KConfig* config = kapp->config();
     config->setGroup("Color Management");
 
+    if (!restore)
+        d->enableColorManagement->setChecked(config->readBoolEntry("EnableCM", \
false)); +
     d->defaultPathKU->setURL(config->readPathEntry("DefaultPath", QString::null));
-    d->enableColorManagement->setChecked(config->readBoolEntry("EnableCM", false));
     d->bpcAlgorithm->setChecked(config->readBoolEntry("BPCAlgorithm", false));
     d->renderingIntentKC->setCurrentItem(config->readNumEntry("RenderingIntent", \
                0));
     d->managedView->setChecked(config->readBoolEntry("ManagedView", false));
@@ -644,7 +646,7 @@
 
     if (t)
     {
-        readSettings();
+        readSettings(true);
         slotToggleManagedView(d->managedView->isChecked());
     }
     else
--- trunk/extragear/graphics/digikam/utilities/setup/setupicc.h #610774:610775
@@ -50,7 +50,7 @@
 
 private:
 
-    void readSettings();
+    void readSettings(bool restore=false);
     void fillCombos(const QString& path, bool report);
     void enableWidgets();
     void disableWidgets();


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