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

List:       kde-commits
Subject:    extragear/graphics/digikam/utilities/imageeditor/rawimport
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2010-12-02 8:02:53
Message-ID: 20101202080253.7C826AC8A4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1202756 by cgilles:

add new method to know if demosaicing settings are dirty
remap signal/slots to right place for raw settings widgets


 M  +5 -5      rawimport.cpp  
 M  +1 -2      rawimport.h  
 M  +11 -1     rawsettingsbox.cpp  
 M  +4 -3      rawsettingsbox.h  


--- trunk/extragear/graphics/digikam/utilities/imageeditor/rawimport/rawimport.cpp #1202755:1202756
@@ -144,6 +144,11 @@
     return d->previewWidget->postProcessedImage();
 }
 
+bool RawImport::demosaicingSettingsDirty()
+{
+    return d->settingsBox->updateBtnEnabled();
+}
+
 void RawImport::slotUpdatePreview()
 {
     DRawDecoding settings = rawDecodingSettings();
@@ -204,11 +209,6 @@
     setBusy(false);
 }
 
-void RawImport::slotDemosaicingChanged()
-{
-    d->settingsBox->enableUpdateBtn(true);
-}
-
 void RawImport::slotLoadingProgress(float v)
 {
     EditorToolIface::editorToolIface()->setToolProgress((int)(v*100));
--- trunk/extragear/graphics/digikam/utilities/imageeditor/rawimport/rawimport.h #1202755:1202756
@@ -52,6 +52,7 @@
 
     DRawDecoding rawDecodingSettings() const;
     DImg& postProcessedImage() const;
+    bool demosaicingSettingsDirty();
 
 private:
 
@@ -74,8 +75,6 @@
     void slotUpdatePreview();
     void slotAbort();
 
-    void slotDemosaicingChanged();
-
     void slotOk();
     void slotCancel();
 
--- trunk/extragear/graphics/digikam/utilities/imageeditor/rawimport/rawsettingsbox.cpp #1202755:1202756
@@ -358,7 +358,7 @@
             this, SIGNAL(signalAbortPreview()));
 
     connect(d->decodingSettingsBox, SIGNAL(signalSettingsChanged()),
-            this, SIGNAL(signalDemosaicingChanged()));
+            this, SLOT(slotDemosaicingChanged()));
 
     connect(d->curveWidget, SIGNAL(signalCurvesChanged()),
             this, SIGNAL(signalPostProcessingChanged()));
@@ -385,11 +385,21 @@
     delete d;
 }
 
+void RawSettingsBox::slotDemosaicingChanged()
+{
+    enableUpdateBtn(true);
+}
+
 void RawSettingsBox::enableUpdateBtn(bool b)
 {
     d->updateBtn->setEnabled(b);
 }
 
+bool RawSettingsBox::updateBtnEnabled()
+{
+    return d->updateBtn->isEnabled();
+}
+
 void RawSettingsBox::setBusy(bool b)
 {
     d->decodingSettingsBox->setEnabled(!b);
--- trunk/extragear/graphics/digikam/utilities/imageeditor/rawimport/rawsettingsbox.h #1202755:1202756
@@ -58,19 +58,20 @@
     void setDemosaicedImage(DImg& img);
     void setPostProcessedImage(DImg& img);
 
+    void resetSettings();
+
     void enableUpdateBtn(bool b);
+    bool updateBtnEnabled();
 
-    void resetSettings();
-
 Q_SIGNALS:
 
     void signalUpdatePreview();
     void signalAbortPreview();
-    void signalDemosaicingChanged();
     void signalPostProcessingChanged();
 
 private Q_SLOTS:
 
+    void slotDemosaicingChanged();
     void slotResetCurve();
 
 private:
[prev in list] [next in list] [prev in thread] [next in thread]