[Digikam-devel] extragear/graphics

[Gilles Caulier]

SVN commit 439442 by cgilles:

BugFix: Image pannel widget settings must be writting in dedicaced dialog plugin section on host config file, not on a common section.

CCMAIL: digikam-devel at kde.org

 M  +1 -1      digikam/imageplugins/imageeffect_blur.cpp  
 M  +1 -1      digikam/imageplugins/imageeffect_sharpen.cpp  
 M  +6 -3      digikam/libs/widgets/imagepannelwidget.cpp  
 M  +10 -7     digikam/libs/widgets/imagepannelwidget.h  
 M  +3 -2      digikamimageplugins/common/dialogs/ctrlpaneldialog.cpp  


--- trunk/extragear/graphics/digikam/imageplugins/imageeffect_blur.cpp #439441:439442
@@ -66,7 +66,7 @@
 
     QHBoxLayout *hlay1 = new QHBoxLayout(topLayout);
     
-    m_imagePreviewWidget = new Digikam::ImagePannelWidget(240, 160, plainPage(), true);
+    m_imagePreviewWidget = new Digikam::ImagePannelWidget(240, 160, "Blur Tool Dialog", plainPage(), true);
     hlay1->addWidget(m_imagePreviewWidget);
 
     // -------------------------------------------------------------
--- trunk/extragear/graphics/digikam/imageplugins/imageeffect_sharpen.cpp #439441:439442
@@ -65,7 +65,7 @@
     QVBoxLayout *topLayout = new QVBoxLayout( plainPage(), 0, spacingHint());
 
     QHBoxLayout *hlay1 = new QHBoxLayout(topLayout);
-    m_imagePreviewWidget = new Digikam::ImagePannelWidget(240, 160, plainPage(), true);
+    m_imagePreviewWidget = new Digikam::ImagePannelWidget(240, 160, "Sharpen Tool Dialog", plainPage(), true);
     hlay1->addWidget(m_imagePreviewWidget);
 
     // -------------------------------------------------------------
--- trunk/extragear/graphics/digikam/libs/widgets/imagepannelwidget.cpp #439441:439442
@@ -50,10 +50,12 @@
 namespace Digikam
 {
 
-ImagePannelWidget::ImagePannelWidget(uint w, uint h, QWidget *parent, 
+ImagePannelWidget::ImagePannelWidget(uint w, uint h, QString settingsSection, QWidget *parent,
                                      bool progress, int separateViewMode)
                  : QWidget(parent, 0, Qt::WDestructiveClose)
 {
+    m_settingsSection = settingsSection;
+    
     m_mainLayout = new QGridLayout( this, 2, 2 , KDialog::marginHint(), KDialog::spacingHint());
     
     QFrame *frame1 = new QFrame(this);
@@ -308,8 +310,9 @@
 void ImagePannelWidget::readSettings(void)
 {
     KConfig *config = kapp->config();
-    config->setGroup("Control Panel Settings");
+    config->setGroup(m_settingsSection);
     int mode = config->readNumEntry("Separate View", Digikam::ImageRegionWidget::SeparateViewVertical);
+    
     m_imageRegionWidget->blockSignals(true);
     m_imagePanIconWidget->blockSignals(true);
     m_separateView->blockSignals(true);
@@ -324,7 +327,7 @@
 void ImagePannelWidget::writeSettings(void)
 {
     KConfig *config = kapp->config();
-    config->setGroup("Control Panel Settings");
+    config->setGroup(m_settingsSection);
     config->writeEntry( "Separate View", m_separateView->selectedId() );
     config->sync();
 }
--- trunk/extragear/graphics/digikam/libs/widgets/imagepannelwidget.h #439441:439442
@@ -29,6 +29,7 @@
 #include <qsize.h>
 #include <qlayout.h>
 #include <qpixmap.h>
+#include <qstring.h>
 
 // Local includes
 
@@ -60,7 +61,7 @@
     
 public:
 
-    ImagePannelWidget(uint w, uint h, QWidget *parent=0, bool progress=false, 
+    ImagePannelWidget(uint w, uint h, QString settingsSection, QWidget *parent=0, bool progress=false, 
                       int separateViewMode=SeparateViewAll);
     ~ImagePannelWidget();
     
@@ -107,18 +108,20 @@
     
 protected:
     
+    void resizeEvent(QResizeEvent *e);
+
+private:
+    
     Digikam::ImageRegionWidget  *m_imageRegionWidget;
     Digikam::ImagePanIconWidget *m_imagePanIconWidget;
     
-    QGridLayout   *m_mainLayout;
+    QGridLayout                 *m_mainLayout;
     
-    QHButtonGroup *m_separateView;
+    QHButtonGroup               *m_separateView;
     
-    KProgress     *m_progressBar;
+    KProgress                   *m_progressBar;
     
-protected:
-    
-    void resizeEvent(QResizeEvent *e);
+    QString                      m_settingsSection;
 
 private:
         
--- trunk/extragear/graphics/digikamimageplugins/common/dialogs/ctrlpaneldialog.cpp #439441:439442
@@ -92,8 +92,9 @@
 
     QHBoxLayout *hlay1 = new QHBoxLayout(topLayout);
     
-    m_imagePreviewWidget = new Digikam::ImagePannelWidget(240, 160, plainPage(), 
-                                        progressBar, separateViewMode);
+    m_imagePreviewWidget = new Digikam::ImagePannelWidget(240, 160, 
+                                        name + QString::QString(" Tool Dialog"),
+                                        plainPage(),  progressBar, separateViewMode);
     hlay1->addWidget(m_imagePreviewWidget);
     
     // -------------------------------------------------------------