[Digikam-devel] extragear/graphics/digikam

[Gilles Caulier]

SVN commit 502297 by cgilles:

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

 M  +0 -9      showfoto/showfoto.cpp  
 M  +0 -3      showfoto/showfoto.h  
 M  +15 -6     utilities/imageeditor/editor/editorwindow.cpp  
 M  +5 -0      utilities/imageeditor/editor/editorwindow.h  
 M  +0 -9      utilities/imageeditor/editor/imagewindow.cpp  
 M  +1 -4      utilities/imageeditor/editor/imagewindow.h  


--- trunk/extragear/graphics/digikam/showfoto/showfoto.cpp #502296:502297
@@ -109,7 +109,6 @@
     m_splash                 = 0;
     m_BCGAction              = 0;
     m_deleteItem2Trash       = true;
-    m_fullScreen             = false;
     m_fullScreenHideToolBar  = false;
     m_fullScreenHideThumbBar = true;
     m_isReadOnly             = false;
@@ -1152,14 +1151,6 @@
     }
 }
 
-void ShowFoto::slotEscapePressed()
-{
-    if (!m_fullScreen)
-        return;
-
-    m_fullScreenAction->activate();
-}
-
 void ShowFoto::slotToggleShowBar()
 {
     if (m_showBarAction->isChecked())
--- trunk/extragear/graphics/digikam/showfoto/showfoto.h #502296:502297
@@ -72,7 +72,6 @@
 private:
     
     bool                             m_removeFullScreenButton;
-    bool                             m_fullScreen;
     bool                             m_fullScreenHideToolBar;
     bool                             m_fullScreenHideThumbBar;
     bool                             m_deleteItem2Trash;
@@ -88,7 +87,6 @@
 
     KURL                             m_lastOpenedDirectory;
     
-    KToggleAction                   *m_fullScreenAction;
     KToggleAction                   *m_showBarAction;
     KToggleAction                   *m_slideShowAction;
     
@@ -167,7 +165,6 @@
     
     void slotToggleFullScreen();
     void slotToggleSlideShow();
-    void slotEscapePressed();
     void slotToggleShowBar();
     void slotViewHistogram();
     void slotChangeBCG();
--- trunk/extragear/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp #502296:502297
@@ -85,12 +85,14 @@
 {
     d = new EditorWindowPriv;
 
-    m_canvas          = 0;
-    m_undoAction      = 0;
-    m_redoAction      = 0;
-    m_zoomPlusAction  = 0;
-    m_zoomMinusAction = 0;
-    m_zoomFitAction   = 0;
+    m_canvas           = 0;
+    m_undoAction       = 0;
+    m_redoAction       = 0;
+    m_zoomPlusAction   = 0;
+    m_zoomMinusAction  = 0;
+    m_zoomFitAction    = 0;
+    m_fullScreenAction = 0;
+    m_fullScreen       = false;
 
     // Settings containers instance.
 
@@ -272,6 +274,13 @@
     m_zoomMinusAction->setEnabled(!m_canvas->minZoom() &&
                                   !m_zoomFitAction->isChecked());
 }
+
+void EditorWindow::slotEscapePressed()
+{
+    if (m_fullScreen)
+        m_fullScreenAction->activate();
+}
+
 }  // namespace Digikam
 
 #include "editorwindow.moc"
--- trunk/extragear/graphics/digikam/utilities/imageeditor/editor/editorwindow.h #502296:502297
@@ -77,6 +77,8 @@
     void slotToggleAutoZoom();
     void slotZoomChanged(float zoom);
     
+    void slotEscapePressed();
+    
 protected:
     
     void setupStatusBar();
@@ -89,6 +91,8 @@
 
 protected:
 
+    bool                     m_fullScreen;
+
     QLabel                  *m_zoomLabel;
     QLabel                  *m_resLabel;
 
@@ -98,6 +102,7 @@
     KAction                 *m_zoomMinusAction;
 
     KToggleAction           *m_zoomFitAction;
+    KToggleAction           *m_fullScreenAction;
 
     KToolBarPopupAction     *m_undoAction;
     KToolBarPopupAction     *m_redoAction;
--- trunk/extragear/graphics/digikam/utilities/imageeditor/editor/imagewindow.cpp #502296:502297
@@ -95,7 +95,6 @@
     m_instance              = this;
     m_rotatedOrFlipped      = false;
     m_allowSaving           = true;
-    m_fullScreen            = false;
     m_fullScreenHideToolBar = false;
     m_isReadOnly            = false;
     m_view                  = 0L;
@@ -1295,14 +1294,6 @@
     }
 }
 
-void ImageWindow::slotEscapePressed()
-{
-    if (m_fullScreen)
-    {
-        m_fullScreenAction->activate();
-    }
-}
-
 bool ImageWindow::promptUserSave()
 {
     if (m_saveAction->isEnabled())
--- trunk/extragear/graphics/digikam/utilities/imageeditor/editor/imagewindow.h #502296:502297
@@ -78,7 +78,6 @@
 private:
 
     bool                    m_rotatedOrFlipped;
-    bool                    m_fullScreen;
     bool                    m_fullScreenHideToolBar;
     bool                    m_removeFullScreenButton;
 
@@ -108,7 +107,6 @@
     KAction                *m_saveAsAction;
     KAction                *m_restoreAction;
      
-    KToggleAction          *m_fullScreenAction;
     KSelectAction          *m_viewHistogramAction;
 
     KActionMenu            *m_rotateAction;
@@ -163,8 +161,7 @@
 
     void slotViewHistogram();
     void slotToggleFullScreen();
-    void slotEscapePressed();
-
+    
     void slotContextMenu();
     void slotChanged(bool, bool);
     void slotSelected(bool);