[Digikam-devel] extragear/graphics/digikam/utilities/setup

[Francisco J. Cruz]

SVN commit 493896 by fjcruz:

Bug fixed: if "Default Path" for icc files in Color Management setup dialog is empty and user try to enable color management, this one is disabled and an error message is showed .

CCMAIL:digikam-devel at kde.org

 M  +15 -0     setupicc.cpp  


--- trunk/extragear/graphics/digikam/utilities/setup/setupicc.cpp #493895:493896
@@ -216,6 +216,10 @@
     KConfig* config = kapp->config();
 
     config->setGroup("Color Management");
+    if (!m_enableColorManagement->isChecked())
+    {
+        return;
+    }
     config->writeEntry("EnableCM", m_enableColorManagement->isChecked());
     if (m_defaultApplyICC->isChecked())
     {
@@ -227,6 +231,15 @@
     }
 //     config->writeEntry("ApplyICC", m_defaultApplyICC->isChecked());
 //     config->writeEntry("AskICC", m_defaultAskICC->isChecked());
+    if (m_defaultPath->url().isEmpty())
+    {
+        QString message = QString(i18n("<p>You must set a default path to color profiles files.</p>"));
+        message.append(i18n("<p>This settings will not be written.</p>"));
+        KMessageBox::error(this, message );
+        config->writeEntry("EnableCM", false);
+        config->sync();
+        return;
+    }
     config->writeEntry("DefaultPath", m_defaultPath->url());
     config->writeEntry("WorkSpaceProfile", m_workProfiles->currentItem());
     config->writeEntry("MonitorProfile", m_monitorProfiles->currentItem());
@@ -335,6 +348,8 @@
                 case icSigColorSpaceClass:
                     m_workICCFiles_description.append(QString(cmsTakeProductDesc(tmpProfile)));
                     m_workICCFiles_file.append(fileName);
+                    m_inICCFiles_description.append(QString(cmsTakeProductDesc(tmpProfile)));
+                    m_inICCFiles_file.append(fileName);
                     break;
             }