[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdewebdev/quanta
From:       Andras Mantia <amantia () kde ! org>
Date:       2006-07-06 11:23:11
Message-ID: 1152184991.448947.29482.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 558958 by amantia:

Don't become confused if exitting is cancelled during the toolbar saving process.


 M  +3 -1      ChangeLog  
 M  +16 -0     project/project.cpp  
 M  +2 -1      src/quanta.cpp  


--- branches/KDE/3.5/kdewebdev/quanta/ChangeLog #558957:558958
@@ -1,9 +1,11 @@
 This files contains the changes since Quanta 2.0 until the current 3.5.x series.
 
-Version 3.5.3 (Release date: xx-xx-2006; Started 24-06-2005):
+Version 3.5.4 (Release date: xx-xx-2006; Started 24-06-2005):
  - bugfixes:
       - make Open File in context menu work for remote projects as well
       - make possible to remove a shortcut assigned to an action
+      - don't become confused if exitting is cancelled during the toolbar
+        saving process
 
 Version 3.5.3 (Release date: 23-05-2006; Started 18-03-2005):
  - bugfixes:
--- branches/KDE/3.5/kdewebdev/quanta/project/project.cpp #558957:558958
@@ -61,6 +61,7 @@
 #include "teammembersdlg.h"
 #include "uploadprofilespage.h"
 #include "viewmanager.h"
+#include "qpevents.h"
 
 extern QString simpleMemberStr;
 extern QString taskLeaderStr;
@@ -1255,7 +1256,22 @@
           canExit = true;
     }
     if (canExit)
+    {
       emit eventHappened("after_project_close", d->baseURL.url(), QString::null);
+  // empty dom tree
+      d->dom.clear();
+      d->m_sessionDom.clear();
+      d->m_events->clear();
+      d->config->setGroup("Projects");
+      d->config->writePathEntry("Last Project", QString::null);
+      d->init();
+      newProjectLoaded(d->projectName, d->baseURL, d->templateURL);
+      reloadTree( &(d->m_projectFiles), true, QStringList());
+      d->adjustActions();
+      d->m_projectRecent->setCurrentItem(-1);
+      newStatus();
+//      kapp->processEvents(QEventLoop::ExcludeUserInput | \
QEventLoop::ExcludeSocketNotifiers); +    }
   }
   return canExit;
 }
--- branches/KDE/3.5/kdewebdev/quanta/src/quanta.cpp #558957:558958
@@ -4142,7 +4142,8 @@
     saveOptions();
    // kdDebug(24000) << "Quanta will exit" << endl;
     emit eventHappened("quanta_exit", \
                QDateTime::currentDateTime().toString(Qt::ISODate), QString::null);
-  }
+  } else
+    slotFileNew();
   return canExit;
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]