[Digikam-devel] branches/extragear/kde3/graphics/digikam

[Gilles Caulier]

SVN commit 757162 by cgilles:

digiKam from KDE3 branch : bugfix : if something is changed in current image, editor must please user when File/Revert option is called
CCMAIL: digikam-devel at kde.org


 M  +11 -11    project/project.kdevelop  
 M  +8 -0      showfoto/showfoto.cpp  
 M  +1 -0      showfoto/showfoto.h  
 M  +1 -1      utilities/imageeditor/editor/editorwindow.cpp  
 M  +1 -0      utilities/imageeditor/editor/editorwindow.h  
 M  +7 -1      utilities/imageeditor/editor/imagewindow.cpp  
 M  +1 -0      utilities/imageeditor/editor/imagewindow.h  


--- branches/extragear/kde3/graphics/digikam/project/project.kdevelop #757161:757162
@@ -12,10 +12,10 @@
     </keywords>
     <projectdirectory>./</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description/>
+    <description></description>
     <ignoreparts/>
     <projectname>digikam</projectname>
-    <defaultencoding/>
+    <defaultencoding></defaultencoding>
   </general>
   <kdevfileview>
     <groups>
@@ -75,10 +75,10 @@
     <general>
       <dbgshell>libtool</dbgshell>
       <programargs/>
-      <gdbpath/>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
+      <gdbpath></gdbpath>
+      <configGdbScript></configGdbScript>
+      <runShellScript></runShellScript>
+      <runGdbScript></runGdbScript>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
       <floatingtoolbar>false</floatingtoolbar>
@@ -113,13 +113,13 @@
     <run>
       <directoryradio>build</directoryradio>
       <customdirectory>/</customdirectory>
-      <mainprogram>/home/gilles/Documents/devel/SVN/branch/kde3/graphics/digikam/digikam/digikam</mainprogram>
-      <programargs/>
+      <mainprogram>/home/gilles/Documents/Devel/SVN/branches/graphics/digikam/digikam/digikam</mainprogram>
+      <programargs></programargs>
       <terminal>false</terminal>
       <autocompile>false</autocompile>
       <envvars/>
-      <globaldebugarguments/>
-      <globalcwd/>
+      <globaldebugarguments></globaldebugarguments>
+      <globalcwd>/home/gilles/Documents/Devel/SVN/branches/graphics/digikam/project/../..</globalcwd>
       <useglobalprogram>true</useglobalprogram>
       <autoinstall>false</autoinstall>
       <autokdesu>false</autokdesu>
@@ -194,7 +194,7 @@
       <resolveIncludePathsUsingMakeExperimental>false</resolveIncludePathsUsingMakeExperimental>
     </codecompletion>
     <creategettersetter>
-      <prefixGet/>
+      <prefixGet></prefixGet>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
       <parameterName>theValue</parameterName>
--- branches/extragear/kde3/graphics/digikam/showfoto/showfoto.cpp #757161:757162
@@ -1193,4 +1193,12 @@
     }
 }
 
+void ShowFoto::slotRevert()
+{
+    if(!promptUserSave(d->currentItem->url()))
+        return;
+
+    m_canvas->slotRestore();
+}
+
 }   // namespace ShowFoto
--- branches/extragear/kde3/graphics/digikam/showfoto/showfoto.h #757161:757162
@@ -120,6 +120,7 @@
     void slotSavingStarted(const QString &filename);
 
     void slotContextMenu();
+    void slotRevert();
 
 private:
     
--- branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp #757161:757162
@@ -275,7 +275,7 @@
     m_saveAsAction = KStdAction::saveAs(this, SLOT(slotSaveAs()),
                                         actionCollection(), "editorwindow_saveas");
 
-    m_revertAction = KStdAction::revert(m_canvas, SLOT(slotRestore()),
+    m_revertAction = KStdAction::revert(this, SLOT(slotRevert()),
                                         actionCollection(), "editorwindow_revert");
 
     m_saveAction->setEnabled(false);
--- branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/editorwindow.h #757161:757162
@@ -195,6 +195,7 @@
     virtual void slotUpdateItemInfo()=0;
     virtual void slotChanged()=0;
     virtual void slotContextMenu()=0;
+    virtual void slotRevert()=0;
 
 private slots:
 
--- branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/imagewindow.cpp #757161:757162
@@ -1224,6 +1224,12 @@
     }
 }
 
-}  // namespace Digikam
+void ImageWindow::slotRevert()
+{
+    if(!promptUserSave(d->urlCurrent))
+        return;
 
+    m_canvas->slotRestore();
+}
 
+}  // namespace Digikam
--- branches/extragear/kde3/graphics/digikam/utilities/imageeditor/editor/imagewindow.h #757161:757162
@@ -124,6 +124,7 @@
     void slotUpdateItemInfo();
 
     void slotContextMenu();
+    void slotRevert();
 
     void slotAssignTag(int tagID);
     void slotRemoveTag(int tagID);