[Uml-devel] branches/KDE/3.5/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 520402 by okellogg:

slotAutoSave(): Apply attachment id=15199 from Daniel Calviño Sánchez
> Right now, if the autosave happens before the user has saved the file, the file
> is saved to ~/autosave.xmi and next savings happen to that file. The "Save
> as..." need to be used to save the file to a explicit location.
>
> With this little patch, if the autosave happens before the user has saved the
> file, the autosave file is still ~/autosave.xmi, but it's no longer considered
> as if the user has saved it explicitly. So when the user calls "Save" action, a
> file to be saved to is asked.
BUG:72019


 M  +5 -0      ChangeLog  
 M  +2 -1      THANKS  
 M  +1 -1      VERSION  
 M  +6 -2      umbrello/umldoc.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #520401:520402
@@ -1,3 +1,8 @@
+Version 1.5.3
+
+* Bugs/wishes from http://bugs.kde.org:
+* Save autosave file to a more obvious place (72019)
+
 Version 1.5.2
 
 * fixed problem reordering methods in classes/interfaces
--- branches/KDE/3.5/kdesdk/umbrello/THANKS #520401:520402
@@ -63,9 +63,10 @@
 Jonathan Riddell <jr @jriddell.org>
 Peeter Russak <pezz @tkwcy.ee>
 Paulo Roberto Rodriguez Sehn <paulo.sehn @gmail.com>
-Achim Spangler <Achim.Spangler @mnet-online.de>
+Daniel Calviño Sánchez <danxuliu @gmail.com>
 Leo Savernik <l.savernik @aon.at>
 Peter Soetens <peter.soetens @mech.kuleuven.ac.be>
+Achim Spangler <Achim.Spangler @mnet-online.de>
 Sebastian Stein <seb.stein @gmx.de>
 Andrew Sutton <asutton @cs.kent.edu>
 Tanuj <tagrawal @hss.hns.com>
--- branches/KDE/3.5/kdesdk/umbrello/VERSION #520401:520402
@@ -1 +1 @@
-1.5.2
+1.5.3
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umldoc.cpp #520401:520402
@@ -2392,7 +2392,9 @@
     if( tempURL.fileName() == i18n("Untitled") ) {
         tempURL.setPath( QDir::homeDirPath() + i18n("/autosave%1").arg(".xmi") );
         saveDocument( tempURL );
+        m_doc_url.setFileName( i18n("Untitled") );
         m_modified = true;
+        UMLApp::app()->setModified( m_modified );
     } else {
         // 2004-05-17 Achim Spangler
         KURL orgDocUrl = m_doc_url;
@@ -2408,8 +2410,10 @@
         // 2004-05-17 Achim Spangler
         // re-activate m_modified if autosave is writing to other file
         // than the main project file -> autosave-suffix != ".xmi"
-        if ( ".xmi" != optionState.generalState.autosavesuffix )
-            setModified( true );
+        if ( ".xmi" != optionState.generalState.autosavesuffix ) {
+            m_modified = true;
+            UMLApp::app()->setModified( m_modified );
+        }
         // restore original file name -
         // UMLDoc::saveDocument() sets doc_url to filename which is given as autosave-filename
         setURL( orgDocUrl );