[Digikam-devel] extragear/graphics/digikam

[Gilles Caulier]

SVN commit 496316 by cgilles:

digikam from trunk : IE/ Showfoto : if current image is read only (RAW file for example), we need to use saveAs() method instead save() method.

Tom, if you have backported my previous commit #496058 in stable, you need to backport this one too.

CCMAIL: digikam-devel at kde.org

 M  +1 -3      showfoto/showfoto.cpp  
 M  +1 -1      showfoto/showfoto.h  
 M  +1 -1      utilities/imageeditor/editor/imagewindow.cpp  
 M  +1 -1      utilities/imageeditor/editor/imagewindow.h  


--- trunk/extragear/graphics/digikam/showfoto/showfoto.cpp #496315:496316
@@ -1153,9 +1153,7 @@
     m_revertAction->setEnabled(moreUndo);
     m_undoAction->setEnabled(moreUndo);
     m_redoAction->setEnabled(moreRedo);
-    
-    if (!m_isReadOnly)
-        m_saveAction->setEnabled(moreUndo);
+    m_saveAction->setEnabled(moreUndo);
 
     if (m_currentItem)
     {
--- trunk/extragear/graphics/digikam/showfoto/showfoto.h #496315:496316
@@ -176,7 +176,7 @@
     void slotOpenFilesInFolder();
     void slotDeleteCurrentItem();
 
-    void slotSave()   { save();   };
+    void slotSave()   { if (m_isReadOnly) saveAs(); else save(); };
     void slotSaveAs() { saveAs(); };
     
     void slotToggleFullScreen();
--- trunk/extragear/graphics/digikam/utilities/imageeditor/editor/imagewindow.cpp #496315:496316
@@ -856,7 +856,7 @@
     m_undoAction->setEnabled(moreUndo);
     m_redoAction->setEnabled(moreRedo);
 
-    if (m_allowSaving && !m_isReadOnly)
+    if (m_allowSaving)
     {
         m_saveAction->setEnabled(moreUndo);
     }
--- trunk/extragear/graphics/digikam/utilities/imageeditor/editor/imagewindow.h #496315:496316
@@ -189,7 +189,7 @@
 
     void slotRotatedOrFlipped();
     
-    void slotSave()   { save();   };
+    void slotSave()   { if (m_isReadOnly) saveAs(); else save(); };
     void slotSaveAs() { saveAs(); };
 
     void slotAboutToShowUndoMenu();