[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[1300] trunk/mmex/src/qifimport.cpp

[<vo...@us...>]

Revision: 1300
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1300&view=rev
Author:   vomikan
Date:     2011-05-28 20:55:10 +0000 (Sat, 28 May 2011)

Log Message:
-----------
added cancel button and message for progress bar

Modified Paths:
--------------
    trunk/mmex/src/qifimport.cpp

Modified: trunk/mmex/src/qifimport.cpp
===================================================================
--- trunk/mmex/src/qifimport.cpp	2011-05-28 14:14:30 UTC (rev 1299)
+++ trunk/mmex/src/qifimport.cpp	2011-05-28 20:55:10 UTC (rev 1300)
@@ -430,11 +430,17 @@
         subCategID = -1;
         double val = 0.0;
 
-		wxProgressDialog dlg(_("Please Wait"), _("Importing data from file"), 100, false, wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_SMOOTH );
+		wxProgressDialog dlg(_("Please Wait"), _(" transactions imported from QIF"), 101, false, wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_SMOOTH | wxPD_CAN_ABORT);
         while(!input.Eof())
         {   
-			dlg.Update((static_cast<double>(numLines)/1000.0 - numLines/1000) *100);
-			
+			notes = wxT("");
+			notes << numImported << _(" transactions imported from QIF");
+            dlg.Update(static_cast<int>((static_cast<double>(numImported)/100.0 - numImported/100) *100), notes);
+            notes = wxT("");
+
+			if (!dlg.Update(-1)) // if cancel clicked
+			return -1; // abort processing
+
             readLine = text.ReadLine();
             numLines++;
             if (readLine.Length() == 0)
@@ -705,16 +711,16 @@
 
                core->bTransactionList_.addTransaction(core, pTransaction);
 
+                numImported++;
                 notes = wxT("");
-                numImported++;
-                continue;
+				continue;
 			}
         }
         log << numImported << _(" transactions imported from QIF") << endl;
 
         outputLog.Close();
 
-        dlg.Update(100);
+        dlg.Update(101);
 		dlg.Destroy();
     }
     if ( !fileName.IsEmpty() )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.