[Digikam-devel] extragear/graphics/digikam

[Gilles Caulier]

SVN commit 435494 by cgilles:

digiKam image Control Pannel widget : add missing No Split preview mode and fix icon buttons.

CCMAIL: digikam-devel at kde.org

 M  +1 -1      imageplugins/pics/Makefile.am  
 M             imageplugins/pics/centerheight.png  
 M             imageplugins/pics/centerwidth.png  
 AM            imageplugins/pics/nocenter.png  
 M  +20 -2     libs/widgets/imagepannelwidget.cpp  


--- trunk/extragear/graphics/digikam/imageplugins/pics/Makefile.am #435493:435494
@@ -1,4 +1,4 @@
 imageplugincorepicsdir = $(kde_datadir)/digikam/data
 imageplugincorepics_DATA = browntone.png coldtone.png neutralbw.png platinum.png selenium.png sepia.png \
 			   bwgreen.png bwred.png bwyellow.png bworange.png autolevels.png normalize.png \
-			   equalize.png stretchcontrast.png centerwidth.png centerheight.png 
+			   equalize.png stretchcontrast.png centerwidth.png centerheight.png nocenter.png 
** trunk/extragear/graphics/digikam/imageplugins/pics/nocenter.png #property changes
Name: svn:mime-type
   + application/octet-stream
--- trunk/extragear/graphics/digikam/libs/widgets/imagepannelwidget.cpp #435493:435494
@@ -114,6 +114,16 @@
                                             "preview area to display original and target image "
                                             "at the same time. The original is on the left of the "
                                             "red dashed line, target on the right" ) );
+    
+    QPushButton *noSeparateButton = new QPushButton( m_separateView );
+    m_separateView->insert(noSeparateButton, Digikam::ImageRegionWidget::SeparateViewNone);
+    KGlobal::dirs()->addResourceType("nocenter", KGlobal::dirs()->kde_default("data") + "digikam/data");
+    directory = KGlobal::dirs()->findResourceDir("nocenter", "nocenter.png");
+    noSeparateButton->setPixmap( QPixmap( directory + "nocenter.png" ) );
+    noSeparateButton->setToggleButton(true);
+    QToolTip::add( noSeparateButton, i18n( "<p>If you enable this option, the preview area will not "
+                                           "be separed" ) );
+    
     m_separateView->setExclusive(true);
     m_separateView->setFrameShape(QFrame::NoFrame);
     
@@ -256,8 +266,16 @@
 {
     KConfig *config = kapp->config();
     config->setGroup("Control Panel Settings");
-    m_separateView->setButton(config->readNumEntry("Separate View",
-                              Digikam::ImageRegionWidget::SeparateViewVertical) );
+    int mode = config->readNumEntry("Separate View", Digikam::ImageRegionWidget::SeparateViewVertical);
+    m_imageRegionWidget->blockSignals(true);
+    m_imagePanIconWidget->blockSignals(true);
+    m_separateView->blockSignals(true);
+    m_imageRegionWidget->slotSeparateViewToggled( mode );                     
+    m_imagePanIconWidget->slotSeparateViewToggled( mode );
+    m_separateView->setButton( mode );
+    m_imageRegionWidget->blockSignals(false);
+    m_imagePanIconWidget->blockSignals(false);
+    m_separateView->blockSignals(false);
 }
     
 void ImagePannelWidget::writeSettings(void)