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

List:       kde-commits
Subject:    extragear/graphics/digikamimageplugins
From:       Gilles Caulier <caulier.gilles () free ! fr>
Date:       2005-08-18 21:06:39
Message-ID: 1124399199.256881.30927.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 450695 by cgilles:

DigikamImageplugins dialog templates : new methods to read and write users settings \
properly. Border and LensDistortion plugins fixed.

CCMAIL: gerhard@kulzer.net

 M  +12 -2     border/imageeffect_border.cpp  
 M  +2 -2      border/imageeffect_border.h  
 M  +3 -1      common/dialogs/ctrlpaneldialog.cpp  
 M  +3 -1      common/dialogs/ctrlpaneldialog.h  
 M  +6 -3      common/dialogs/imageguidedialog.cpp  
 M  +2 -0      common/dialogs/imageguidedialog.h  
 M  +33 -0     lensdistortion/imageeffect_lensdistortion.cpp  
 M  +7 -2      lensdistortion/imageeffect_lensdistortion.h  


--- trunk/extragear/graphics/digikamimageplugins/border/imageeffect_border.cpp \
#450694:450695 @@ -157,8 +157,13 @@
     writeSettings();
 }
 
-void ImageEffect_Border::readSettings(void)
+void ImageEffect_Border::readUserSettings(void)
 {
+    m_borderType->blockSignals(true);
+    m_borderWidth->blockSignals(true);
+    m_firstColorButton->blockSignals(true);
+    m_secondColorButton->blockSignals(true);
+    
     KConfig *config = kapp->config();
     config->setGroup("Add Border Tool Settings");
     
@@ -182,11 +187,16 @@
     delete white;
     delete gray1;
     delete gray2;
+    
+    m_borderType->blockSignals(false);
+    m_borderWidth->blockSignals(false);
+    m_firstColorButton->blockSignals(false);
+    m_secondColorButton->blockSignals(false);
               
     slotBorderTypeChanged(m_borderType->currentItem());
 }
     
-void ImageEffect_Border::writeSettings(void)
+void ImageEffect_Border::writeUserSettings(void)
 {
     KConfig *config = kapp->config();
     config->setGroup("Add Border Tool Settings");
--- trunk/extragear/graphics/digikamimageplugins/border/imageeffect_border.h \
#450694:450695 @@ -71,8 +71,6 @@
     
 private:
 
-    void readSettings(void);
-    void writeSettings(void);
     QString getBorderPath(int border);
     
 private slots:
@@ -80,9 +78,11 @@
     void slotBorderTypeChanged(int borderType);
     void slotColorForegroundChanged(const QColor &color);
     void slotColorBackgroundChanged(const QColor &color);
+    void readUserSettings(void);
     
 protected:
     
+    void writeUserSettings(void);
     void prepareEffect(void);
     void prepareFinal(void);
     void putPreviewData(void);
--- trunk/extragear/graphics/digikamimageplugins/common/dialogs/ctrlpaneldialog.cpp \
#450694:450695 @@ -115,7 +115,7 @@
 void CtrlPanelDialog::slotInit()
 {
     // Reset values to defaults.
-    QTimer::singleShot(0, this, SLOT(slotDefault()));
+    QTimer::singleShot(0, this, SLOT(readUserSettings()));
 
     if (!m_tryAction)
        {
@@ -181,6 +181,7 @@
        kapp->restoreOverrideCursor();
        }
 
+    writeUserSettings();
     done(Cancel);
 }
 
@@ -194,6 +195,7 @@
        kapp->restoreOverrideCursor();
        }
 
+    writeUserSettings();
     e->accept();
 }
 
--- trunk/extragear/graphics/digikamimageplugins/common/dialogs/ctrlpaneldialog.h \
#450694:450695 @@ -93,6 +93,7 @@
     virtual void slotCancel();
     virtual void slotUser1();
     virtual void slotInit();
+    virtual void readUserSettings(void){ slotDefault(); };
      
     void slotHelp();
     void slotFocusChanged(void);    
@@ -102,7 +103,8 @@
     void closeEvent(QCloseEvent *e);
     void customEvent(QCustomEvent *event);
     void abortPreview(void);
-        
+
+    virtual void writeUserSettings(void){};            
     virtual void resetValues(void){};
     virtual void prepareEffect(void){};
     virtual void prepareFinal(void){};
--- trunk/extragear/graphics/digikamimageplugins/common/dialogs/imageguidedialog.cpp \
#450694:450695 @@ -158,7 +158,6 @@
 ImageGuideDialog::~ImageGuideDialog()
 {
     saveDialogSize(m_name + QString::QString(" Tool Dialog"));
-    writeSettings();
 
     if (m_timer)
        delete m_timer;
@@ -186,13 +185,15 @@
     config->writeEntry( "Guide Color", m_guideColorBt->color() );
     config->writeEntry( "Guide Width", m_guideSize->value() );
     config->sync();
+    
+    writeUserSettings();
 }
 
 void ImageGuideDialog::slotInit()
 {
     readSettings();
     // Reset values to defaults.
-    QTimer::singleShot(0, this, SLOT(slotDefault()));
+    QTimer::singleShot(0, this, SLOT(readUserSettings()));
 
     connect(m_imagePreviewWidget, SIGNAL(signalResized()),
             this, SLOT(slotResized()));
@@ -270,7 +271,8 @@
 
        kapp->restoreOverrideCursor();
        }
-
+    
+    writeSettings();
     done(Cancel);
 }
 
@@ -284,6 +286,7 @@
        kapp->restoreOverrideCursor();
        }
 
+    writeSettings();
     e->accept();
 }
 
--- trunk/extragear/graphics/digikamimageplugins/common/dialogs/imageguidedialog.h \
#450694:450695 @@ -105,6 +105,7 @@
     virtual void slotUser1();
     virtual void slotDefault();
     virtual void slotInit();
+    virtual void readUserSettings(void){ slotDefault(); };
     
     void slotResized();           
     void slotHelp();
@@ -117,6 +118,7 @@
     void readSettings(void);
     void writeSettings(void);
             
+    virtual void writeUserSettings(void){};
     virtual void resetValues(void){};
     virtual void prepareEffect(void){};
     virtual void prepareFinal(void){};
--- trunk/extragear/graphics/digikamimageplugins/lensdistortion/imageeffect_lensdistortion.cpp \
#450694:450695 @@ -42,6 +42,7 @@
 // KDE includes.
 
 #include <klocale.h>
+#include <kconfig.h>
 #include <kaboutdata.h>
 #include <kiconloader.h>
 #include <kapplication.h>
@@ -168,6 +169,38 @@
 {
 }
 
+void ImageEffect_LensDistortion::readUserSettings(void)
+{
+    m_mainInput->blockSignals(true);
+    m_edgeInput->blockSignals(true);
+    m_rescaleInput->blockSignals(true);
+    
+    KConfig *config = kapp->config();
+    config->setGroup("Lens Distortion Tool Settings");
+
+    m_mainInput->setValue( config->readDoubleNumEntry( "2nd order distortion", 0.0 ) \
); +    m_edgeInput->setValue( config->readDoubleNumEntry("4th order distortion",0.0) \
); +    m_rescaleInput->setValue( config->readDoubleNumEntry( "Zoom factor", 0.0 ) );
+    kdDebug() << "Reading LensDistortion settings" << endl;
+    
+    m_mainInput->blockSignals(false);
+    m_edgeInput->blockSignals(false);
+    m_rescaleInput->blockSignals(false);
+    
+    slotEffect();
+}
+
+void ImageEffect_LensDistortion::writeUserSettings(void)
+{
+    KConfig *config = kapp->config();
+    config->setGroup("Lens Distortion Tool Settings");
+    config->writeEntry( "2nd order distortion", m_mainInput->value() );
+    config->writeEntry( "4th order distortion", m_edgeInput->value() );
+    config->writeEntry( "Zoom factor", m_rescaleInput->value() );
+    config->sync();
+    kdDebug() << "Writing LensDistortion settings" << endl;
+}
+
 void ImageEffect_LensDistortion::renderingFinished()
 {
     m_mainInput->setEnabled(true);
--- trunk/extragear/graphics/digikamimageplugins/lensdistortion/imageeffect_lensdistortion.h \
#450694:450695 @@ -55,9 +55,14 @@
     KDoubleNumInput      *m_edgeInput;
     KDoubleNumInput      *m_rescaleInput;
     KDoubleNumInput      *m_brightenInput;
+    
+private slots:
+    
+    void readUserSettings(void);
+        
+protected:
 
-protected:
-    
+    void writeUserSettings(void);    
     void prepareEffect(void);
     void prepareFinal(void);
     void putPreviewData(void);


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