[Digikam-devel] extragear/graphics/digikam

[Gilles Caulier]

SVN commit 502293 by cgilles:

digikam from trunk : Showfoto/IE common GUI implementation : slotZoomChanged() method is now common to IE and Showfoto
CCMAIL: digikam-devel at kde.org?

 M  +0 -12     showfoto/showfoto.cpp  
 M  +0 -1      showfoto/showfoto.h  
 M  +11 -0     utilities/imageeditor/editor/editorwindow.cpp  
 M  +1 -0      utilities/imageeditor/editor/editorwindow.h  
 M  +0 -12     utilities/imageeditor/editor/imagewindow.cpp  
 M  +0 -1      utilities/imageeditor/editor/imagewindow.h  


--- trunk/extragear/graphics/digikam/showfoto/showfoto.cpp #502292:502293
@@ -1315,18 +1315,6 @@
     KMainWindow::show();
 }
 
-void ShowFoto::slotZoomChanged(float zoom)
-{
-    m_zoomLabel->setText(i18n("Zoom: ") +
-                         QString::number(zoom*100, 'f', 2) +
-                         QString("%"));
-
-    m_zoomPlusAction->setEnabled(!m_canvas->maxZoom() &&
-                                 !m_zoomFitAction->isChecked());
-    m_zoomMinusAction->setEnabled(!m_canvas->minZoom() &&
-                                  !m_zoomFitAction->isChecked());
-}
-
 void ShowFoto::slotSetup()
 {
     Setup setup(this);
--- trunk/extragear/graphics/digikam/showfoto/showfoto.h #502292:502293
@@ -167,7 +167,6 @@
     
     void slotToggleFullScreen();
     void slotToggleSlideShow();
-    void slotZoomChanged(float zoom);
     void slotEscapePressed();
     void slotToggleShowBar();
     void slotViewHistogram();
--- trunk/extragear/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp #502292:502293
@@ -261,6 +261,17 @@
     m_canvas->slotToggleAutoZoom();
 }
 
+void EditorWindow::slotZoomChanged(float zoom)
+{
+    m_zoomLabel->setText(i18n("Zoom: ") +
+                         QString::number(zoom*100, 'f', 2) +
+                         QString("%"));
+
+    m_zoomPlusAction->setEnabled(!m_canvas->maxZoom() &&
+                                 !m_zoomFitAction->isChecked());
+    m_zoomMinusAction->setEnabled(!m_canvas->minZoom() &&
+                                  !m_zoomFitAction->isChecked());
+}
 }  // namespace Digikam
 
 #include "editorwindow.moc"
--- trunk/extragear/graphics/digikam/utilities/imageeditor/editor/editorwindow.h #502292:502293
@@ -75,6 +75,7 @@
     void slotNewToolbarConfig();
 
     void slotToggleAutoZoom();
+    void slotZoomChanged(float zoom);
     
 protected:
     
--- trunk/extragear/graphics/digikam/utilities/imageeditor/editor/imagewindow.cpp #502292:502293
@@ -790,18 +790,6 @@
     }
 }
 
-void ImageWindow::slotZoomChanged(float zoom)
-{
-    m_zoomLabel->setText(i18n("Zoom: ") +
-                         QString::number(zoom*100, 'f', 2) +
-                         QString("%"));
-
-    m_zoomPlusAction->setEnabled(!m_canvas->maxZoom() &&
-                                 !m_zoomFitAction->isChecked());
-    m_zoomMinusAction->setEnabled(!m_canvas->minZoom() &&
-                                  !m_zoomFitAction->isChecked());
-}
-
 void ImageWindow::slotChanged(bool moreUndo, bool moreRedo)
 {
     m_resLabel->setText(QString::number(m_canvas->imageWidth())  +
--- trunk/extragear/graphics/digikam/utilities/imageeditor/editor/imagewindow.h #502292:502293
@@ -166,7 +166,6 @@
     void slotEscapePressed();
 
     void slotContextMenu();
-    void slotZoomChanged(float zoom);
     void slotChanged(bool, bool);
     void slotSelected(bool);