[Kst] kdeextragear-2/kst/kst

George Staikos staikos at kde.org
Mon Dec 6 04:37:11 CET 2004


CVS commit by staikos: 

more feedback on loading and a delayed instantiation
BUG: 92870


  M +1 -1      kst.cpp   1.263
  M +6 -6      kstdoc.cpp   1.139


--- kdeextragear-2/kst/kst/kst.cpp  #1.262:1.263
@@ -804,5 +804,4 @@ bool KstApp::openDocumentFile(const QStr
   opening = true;
   KURL url;
-  QFileInfo finfo(in_filename);
   bool rc = false;
 
@@ -813,4 +812,5 @@ bool KstApp::openDocumentFile(const QStr
     setCaption(doc->title());
     if (url.isLocalFile()) {
+      QFileInfo finfo(in_filename);
       addRecentFile(finfo.absFilePath());
     } else {

--- kdeextragear-2/kst/kst/kstdoc.cpp  #1.138:1.139
@@ -199,7 +199,5 @@ bool KstDoc::openDocument(const KURL& ur
   KstRVectorPtr vector;
   KstApp *app = KstApp::inst();
-  QString readingDocument = i18n("Reading document");
-  QString openingDocument = i18n("Opening document");
-
+  QString readingDocument = i18n("Reading Kst file");
 
   QDomNode n = docElem.firstChild();
@@ -352,5 +350,4 @@ bool KstDoc::openDocument(const KURL& ur
     kapp->eventLoop()->processEvents(QEventLoop::ExcludeSocketNotifiers, 10);
   }
-  app->slotUpdateProgress(0, 0, openingDocument);
 
   if (warnOldKstFile) {
@@ -358,4 +355,5 @@ bool KstDoc::openDocument(const KURL& ur
   }
 
+  app->slotUpdateProgress(0, 0, i18n("Creating plots"));
   //
   // if we have anything left in plotHolderWhileOpeningDocument then
@@ -396,4 +394,5 @@ bool KstDoc::openDocument(const KURL& ur
   KstApp::inst()->plotHolderWhileOpeningDocument().clear();
 
+  app->slotUpdateProgress(0, 0, i18n("Loading data"));
   //
   // lazy load data
@@ -432,4 +431,5 @@ bool KstDoc::openDocument(const KURL& ur
   createScalars();
 
+  app->slotUpdateProgress(0, 0, i18n("Synchronizing data"));
   //
   // update plots now that lazy loading is done





More information about the Kst mailing list