Money Manager Ex

Revision: 778
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=778&view=rev
Author:   omalleypat
Date:     2009-11-14 02:48:27 +0000 (Sat, 14 Nov 2009)

Log Message:
-----------
If there are no Investment accounts, display a message to the user when the stocks tree item is clicked and don't show the stocks panel.

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2009-11-14 02:24:47 UTC (rev 777)
+++ trunk/mmex/src/mmex.cpp	2009-11-14 02:48:27 UTC (rev 778)
@@ -3532,14 +3532,32 @@
 
 void mmGUIFrame::OnStocks(wxCommandEvent& /*event*/)
 {
-    wxSizer *sizer = cleanupHomePanel();
-    
-    panelCurrent_ = new mmStocksPanel(db_.get(), inidb_.get(), -1, homePanel, ID_PANEL3, 
-        wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
-
-    sizer->Add(panelCurrent_, 1, wxGROW|wxALL, 1);
-
-    homePanel->Layout();
+	// First, check to see if there is a stock account setup
+	static const char sql[] = 
+    "SELECT * FROM ACCOUNTLIST_V1 WHERE ACCOUNTTYPE = 'Investment' ";
+	
+	
+    wxSQLite3Statement st = db_->PrepareStatement(sql);
+    //st.Bind(1, transID_);
+	
+    wxSQLite3ResultSet q1 = st.ExecuteQuery();
+    if (q1.NextRow())
+    {
+		wxSizer *sizer = cleanupHomePanel();
+		
+		panelCurrent_ = new mmStocksPanel(db_.get(), inidb_.get(), -1, homePanel, ID_PANEL3, 
+										  wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
+		
+		sizer->Add(panelCurrent_, 1, wxGROW|wxALL, 1);
+		
+		homePanel->Layout();		
+	}
+	else 
+	{
+		wxMessageBox(wxT("This database does not have any investment accounts associated with it.  You can create one using the Accounts menu."),
+					 wxT("No Investment Accounts Configured"),wxOK);
+	}
+	q1.Finalize();
 }
 //----------------------------------------------------------------------------
 


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

Revision: 793
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=793&view=rev
Author:   omalleypat
Date:     2009-11-15 17:29:13 +0000 (Sun, 15 Nov 2009)

Log Message:
-----------
This should fix the bug introduced in r777.  I have tested this on r777 and it works, however I am not able to compile HEAD right now due to a TinyXML issue introduced after 777 that I don't know how to fix.  I am checking this in anyway so others have what should be a stable version...

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2009-11-15 09:52:39 UTC (rev 792)
+++ trunk/mmex/src/mmex.cpp	2009-11-15 17:29:13 UTC (rev 793)
@@ -1083,19 +1083,19 @@
         new mmTreeItemData(wxT("Transaction Report")));
     ///////////////////////////////////////////////////////////////////
     
-	static const char sql[] = 
-    "select * from BUDGETYEAR_V1";
+	// Check to see if there are any budget years in the db
+	bool budget_exists=false;	
+	if (db_.get())
+	{
+		static const char sql_be[] = "select * from BUDGETYEAR_V1";
+		wxSQLite3ResultSet q_be = db_.get()->ExecuteQuery(sql_be);
+		if (q_be.NextRow())
+			budget_exists = true;
+		q_be.Finalize();
+	}
 	
-	
-    wxSQLite3Statement st = db_->PrepareStatement(sql);
-    //st.Bind(1, transID_);
-	
-    wxSQLite3ResultSet q1 = st.ExecuteQuery();
-    if (q1.NextRow())
-    {
-	
 	wxTreeItemId budgetPerformance;
-    if (mmIniOptions::enableBudget_)
+    if (mmIniOptions::enableBudget_ && budget_exists)
     {
         budgetPerformance = navTreeCtrl_->AppendItem(reports, 
             _("Budget Performance"), 4, 4);
@@ -1104,14 +1104,14 @@
     }
     ///////////////////////////////////////////////////////////////////
     wxTreeItemId budgetSetupPerformance;
-    if (mmIniOptions::enableBudget_)
+    if (mmIniOptions::enableBudget_ && budget_exists)
     {
         budgetSetupPerformance = navTreeCtrl_->AppendItem(reports, 
             _("Budget Setup and Performance"), 4, 4);
         navTreeCtrl_->SetItemData(budgetSetupPerformance, 
             new mmTreeItemData(wxT("Budget Setup Performance")));
     }
-		if (mmIniOptions::enableBudget_)
+		if (mmIniOptions::enableBudget_ && budget_exists)
 		{
 			static const char sql[] =
 			"select BUDGETYEARID, BUDGETYEARNAME "
@@ -1139,9 +1139,7 @@
 			navTreeCtrl_->Expand(budgeting);
 		}		
 		
-	}
-    st.Finalize();
-		///////////////////////////////////////////////////////////////////
+	///////////////////////////////////////////////////////////////////
     wxTreeItemId cashFlow = navTreeCtrl_->AppendItem(reports, 
         _("Cash Flow"), 4, 4);
     navTreeCtrl_->SetItemData(cashFlow, 


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

Revision: 794
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=794&view=rev
Author:   kkkvadim
Date:     2009-11-15 19:22:28 +0000 (Sun, 15 Nov 2009)

Log Message:
-----------
refactoring of 
if (db_ && mmIniOptions::enableBudget_)
...

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2009-11-15 17:29:13 UTC (rev 793)
+++ trunk/mmex/src/mmex.cpp	2009-11-15 19:22:28 UTC (rev 794)
@@ -1083,67 +1083,49 @@
         new mmTreeItemData(wxT("Transaction Report")));
     ///////////////////////////////////////////////////////////////////
     
-	// Check to see if there are any budget years in the db
-	bool budget_exists=false;	
-	if (db_.get())
-	{
-		static const char sql_be[] = "select * from BUDGETYEAR_V1";
-		wxSQLite3ResultSet q_be = db_.get()->ExecuteQuery(sql_be);
-		if (q_be.NextRow())
-			budget_exists = true;
-		q_be.Finalize();
-	}
-	
-	wxTreeItemId budgetPerformance;
-    if (mmIniOptions::enableBudget_ && budget_exists)
+    if (db_ && mmIniOptions::enableBudget_)
     {
-        budgetPerformance = navTreeCtrl_->AppendItem(reports, 
-            _("Budget Performance"), 4, 4);
-        navTreeCtrl_->SetItemData(budgetPerformance, 
-            new mmTreeItemData(wxT("Budget Performance")));
+        static const char sql[] =
+        "select BUDGETYEARID, BUDGETYEARNAME "
+        "from BUDGETYEAR_V1 "
+        "order by BUDGETYEARNAME";
+        
+        wxTreeItemId budgetPerformance;
+        wxTreeItemId budgetSetupPerformance;
+
+        wxSQLite3ResultSet q1 = db_->ExecuteQuery(sql);
+
+        for (size_t i = 0; q1.NextRow(); ++i)
+        {
+            if (!i) { // first loop only
+                budgetPerformance = navTreeCtrl_->AppendItem(reports, _("Budget Performance"), 4, 4);
+                navTreeCtrl_->SetItemData(budgetPerformance, new mmTreeItemData(wxT("Budget Performance")));
+
+                budgetSetupPerformance = navTreeCtrl_->AppendItem(reports, _("Budget Setup and Performance"), 4, 4);
+                navTreeCtrl_->SetItemData(budgetSetupPerformance, new mmTreeItemData(wxT("Budget Setup Performance")));
+            }
+
+            int id = q1.GetInt(wxT("BUDGETYEARID"));
+            const wxString name = q1.GetString(wxT("BUDGETYEARNAME"));
+            
+            wxTreeItemId bYear = navTreeCtrl_->AppendItem(budgeting, name, 3, 3);
+            navTreeCtrl_->SetItemData(bYear, new mmTreeItemData(id, true));
+            
+            wxTreeItemId bYearData = navTreeCtrl_->AppendItem(budgetPerformance, name, 4, 4);
+            navTreeCtrl_->SetItemData(bYearData, new mmTreeItemData(id, true));
+            
+            wxTreeItemId bYearSetupData = navTreeCtrl_->AppendItem(budgetSetupPerformance, name, 4, 4);
+            navTreeCtrl_->SetItemData(bYearSetupData, new mmTreeItemData(id, true));
+        }
+
+        q1.Finalize();
+        
+        navTreeCtrl_->Expand(budgeting);
     }
-    ///////////////////////////////////////////////////////////////////
-    wxTreeItemId budgetSetupPerformance;
-    if (mmIniOptions::enableBudget_ && budget_exists)
-    {
-        budgetSetupPerformance = navTreeCtrl_->AppendItem(reports, 
-            _("Budget Setup and Performance"), 4, 4);
-        navTreeCtrl_->SetItemData(budgetSetupPerformance, 
-            new mmTreeItemData(wxT("Budget Setup Performance")));
-    }
-		if (mmIniOptions::enableBudget_ && budget_exists)
-		{
-			static const char sql[] =
-			"select BUDGETYEARID, BUDGETYEARNAME "
-			"from BUDGETYEAR_V1 "
-			"order by BUDGETYEARNAME";
-			
-			wxSQLite3ResultSet q1 = db_.get()->ExecuteQuery(sql);
-			
-			while (q1.NextRow())
-			{
-				int id = q1.GetInt(wxT("BUDGETYEARID"));
-				const wxString name = q1.GetString(wxT("BUDGETYEARNAME"));
-				
-				wxTreeItemId bYear = navTreeCtrl_->AppendItem(budgeting, name, 3, 3);
-				navTreeCtrl_->SetItemData(bYear, new mmTreeItemData(id, true));
-				
-				wxTreeItemId bYearData = navTreeCtrl_->AppendItem(budgetPerformance, name, 4, 4);
-				navTreeCtrl_->SetItemData(bYearData, new mmTreeItemData(id, true));
-				
-				wxTreeItemId bYearSetupData = navTreeCtrl_->AppendItem(budgetSetupPerformance, name, 4, 4);
-				navTreeCtrl_->SetItemData(bYearSetupData, new mmTreeItemData(id, true));
-			}
-			q1.Finalize();
-			
-			navTreeCtrl_->Expand(budgeting);
-		}		
 		
 	///////////////////////////////////////////////////////////////////
-    wxTreeItemId cashFlow = navTreeCtrl_->AppendItem(reports, 
-        _("Cash Flow"), 4, 4);
-    navTreeCtrl_->SetItemData(cashFlow, 
-        new mmTreeItemData(wxT("Cash Flow")));
+    wxTreeItemId cashFlow = navTreeCtrl_->AppendItem(reports, _("Cash Flow"), 4, 4);
+    navTreeCtrl_->SetItemData(cashFlow, new mmTreeItemData(wxT("Cash Flow")));
 
     wxTreeItemId cashflowSpecificAccounts = navTreeCtrl_->AppendItem(cashFlow, 
         _("Cash Flow - Specific Accounts"), 4, 4);
@@ -1166,7 +1148,7 @@
     navTreeCtrl_->Expand(root);
     navTreeCtrl_->Expand(reports);
 
-    if (!db_.get())
+    if (!db_)
        return;
 
     /* Load Nav Tree Control */
@@ -3010,7 +2992,7 @@
     "where ACCOUNTTYPE = 'Checking' "
     "order by ACCOUNTNAME";
 
-    wxSQLite3ResultSet q1 = db_.get()->ExecuteQuery(sql);
+    wxSQLite3ResultSet q1 = db_->ExecuteQuery(sql);
     while (q1.NextRow())
     {
         as.Add(q1.GetString(wxT("ACCOUNTNAME")));


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

Revision: 833
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=833&view=rev
Author:   kkkvadim
Date:     2009-11-29 10:19:01 +0000 (Sun, 29 Nov 2009)

Log Message:
-----------
removed usage of TinyXML
-    EVT_MENU(MENU_IMPORT_QFX, mmGUIFrame::OnImportQFX)

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2009-11-29 09:59:24 UTC (rev 832)
+++ trunk/mmex/src/mmex.cpp	2009-11-29 10:19:01 UTC (rev 833)
@@ -27,8 +27,6 @@
 #include "stockspanel.h"
 #include "assetspanel.h"
 #include "univcsvdialog.h"
-#include "wxtinyxml.h"
-#include "tinyxml.h"
 #include "reportbase.h"
 #include "reportsummary.h"
 #include "reportcategexp.h"
@@ -112,8 +110,8 @@
 #include "../resources/wrench.xpm"
 //----------------------------------------------------------------------------
 #include <wx/debugrpt.h>
-#include "wx/sysopt.h"
-#include "wx/wizard.h"
+#include <wx/sysopt.h>
+#include <wx/wizard.h>
 #include <wx/xml/xml.h>
 //----------------------------------------------------------------------------
 #include <boost/scoped_array.hpp>
@@ -338,7 +336,6 @@
     EVT_MENU(MENU_IMPORT_CSV, mmGUIFrame::OnImportCSV)
     EVT_MENU(MENU_IMPORT_MMNETCSV, mmGUIFrame::OnImportCSVMMNET)
     EVT_MENU(MENU_IMPORT_QIF, mmGUIFrame::OnImportQIF)
-    EVT_MENU(MENU_IMPORT_QFX, mmGUIFrame::OnImportQFX)
     EVT_MENU(MENU_IMPORT_UNIVCSV, mmGUIFrame::OnImportUniversalCSV)
     EVT_MENU(wxID_EXIT,  mmGUIFrame::OnQuit)
     EVT_MENU(MENU_NEWACCT,  mmGUIFrame::OnNewAccount)
@@ -2251,7 +2248,6 @@
       importMenu->Append(MENU_IMPORT_CSV, _("&MMEX CSV Files"), _("Import from MMEX CSV"));
    if (mmIniOptions::enableImportMMNETCSV_)
       importMenu->Append(MENU_IMPORT_MMNETCSV, _("MM.&NET CSV Files"), _("Import from MM.NET CSV"));
-   //importMenu->Append(MENU_IMPORT_QFX, _("&QFX Files"), _("Import from QFX"));
    menuFile_->Append(MENU_IMPORT, _("&Import"), importMenu);
 
    menuFile_->AppendSeparator();
@@ -2940,78 +2936,6 @@
 }
 //----------------------------------------------------------------------------
 
-void mmGUIFrame::OnImportQFX(wxCommandEvent& /*event*/)
-{
-    if (mmDBWrapper::getNumAccounts(db_.get()) == 0)
-    {
-        mmShowErrorMessage(0, _("No Account available! Cannot Import! Create a new account first!"), 
-            _("Error"));
-        return ;
-    }
-
-    wxArrayString as;
-    int fromAccountID = -1;
-    
-    static const char sql[] = 
-    "select ACCOUNTNAME "
-    "from ACCOUNTLIST_V1 "
-    "where ACCOUNTTYPE = 'Checking' "
-    "order by ACCOUNTNAME";
-
-    wxSQLite3ResultSet q1 = db_->ExecuteQuery(sql);
-    while (q1.NextRow())
-    {
-        as.Add(q1.GetString(wxT("ACCOUNTNAME")));
-    }
-    q1.Finalize();
-
-    
-    wxSingleChoiceDialog* scd = new wxSingleChoiceDialog(0, _("Choose Account to import to:"), 
-        _("QFX Import"), as);
-    if (scd->ShowModal() == wxID_OK)
-    {
-        wxString acctName = scd->GetStringSelection();
-        fromAccountID = mmDBWrapper::getAccountID(db_.get(), acctName);
-     
-        wxString fileName = wxFileSelector(_("Choose QFX data file to import"), 
-                wxGetEmptyString(), wxGetEmptyString(), wxGetEmptyString(), wxT("*.qfx"), wxFILE_MUST_EXIST);
-        if ( !fileName.empty() )
-        {
-            wxTiXmlDocument xmlDoc; 
-
-            wxFileInputStream fs(fileName);
-            xmlDoc.LoadFile(fs);
-
-
-            TiXmlNode* node = 0;
-            for( node = xmlDoc.IterateChildren( 0 );
-                node;
-                node = xmlDoc.IterateChildren( node ) )
-            {
-                // parse XML declaration
-                if (node->ToDeclaration())
-                {
-                    //TiXmlDeclaration* declaration = node->ToDeclaration();
-                }
-
-                if (node->ToElement())
-                {
-                    TiXmlElement* ele = node->ToElement();
-                    std::string str = ele->ValueStr();
-                    wxString eleStr = wxString::FromAscii(str.c_str());
-                    if (eleStr != wxT("mmCoreDataStore"))
-                    {
-
-                    }
-                }
-            }
-           
-        }
-    }
-    scd->Destroy();
-}
-//----------------------------------------------------------------------------
-
 void mmGUIFrame::OnImportQIF(wxCommandEvent& /*event*/)
 {
     int accountID = mmImportQIF(core_.get());


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

Revision: 878
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=878&view=rev
Author:   kkkvadim
Date:     2009-12-13 11:58:23 +0000 (Sun, 13 Dec 2009)

Log Message:
-----------
- boost::shared_ptr<wxSQLite3Database> pDB(new wxSQLite3Database());
- db_ = pDB;
+ db_.reset(new wxSQLite3Database);

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2009-12-13 11:57:25 UTC (rev 877)
+++ trunk/mmex/src/mmex.cpp	2009-12-13 11:58:23 UTC (rev 878)
@@ -2528,8 +2528,7 @@
        }
        else
        {
-           boost::shared_ptr<wxSQLite3Database> pDB(new wxSQLite3Database());
-           db_ = pDB;
+           db_.reset(new wxSQLite3Database);
            db_->Open(fileName, password);
            password_ = password;
 


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

Revision: 953
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=953&view=rev
Author:   kkkvadim
Date:     2010-05-24 14:28:21 +0000 (Mon, 24 May 2010)

Log Message:
-----------
OnStocks sql optimized

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2010-05-24 13:25:04 UTC (rev 952)
+++ trunk/mmex/src/mmex.cpp	2010-05-24 14:28:21 UTC (rev 953)
@@ -3333,32 +3333,21 @@
 
 void mmGUIFrame::OnStocks(wxCommandEvent& /*event*/)
 {
-	// First, check to see if there is a stock account setup
 	static const char sql[] = 
-    "SELECT * FROM ACCOUNTLIST_V1 WHERE ACCOUNTTYPE = 'Investment' ";
+	"select count(*) "
+	"from ACCOUNTLIST_V1 "
+	"where ACCOUNTTYPE = 'Investment' "
+	"limit 1";
 	
-	
-    wxSQLite3Statement st = m_db->PrepareStatement(sql);
-    //st.Bind(1, transID_);
-	
-    wxSQLite3ResultSet q1 = st.ExecuteQuery();
-    if (q1.NextRow())
-    {
+	if (m_db->ExecuteScalar(sql)) {
 		wxSizer *sizer = cleanupHomePanel();
-		
-		panelCurrent_ = new mmStocksPanel(m_db.get(), m_inidb.get(), -1, homePanel, ID_PANEL3, 
-										  wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
-		
+		panelCurrent_ = new mmStocksPanel(m_db.get(), m_inidb.get(), -1, homePanel, ID_PANEL3, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
 		sizer->Add(panelCurrent_, 1, wxGROW|wxALL, 1);
-		
 		homePanel->Layout();		
+	} else {
+		wxMessageBox(_("No investment accounts found. You can create one using the Accounts menu."),
+			     _("Investment Accounts"));
 	}
-	else 
-	{
-		wxMessageBox(wxT("This database does not have any investment accounts associated with it.  You can create one using the Accounts menu."),
-					 wxT("No Investment Accounts Configured"),wxOK);
-	}
-	q1.Finalize();
 }
 //----------------------------------------------------------------------------
 


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

Revision: 986
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=986&view=rev
Author:   vomikan
Date:     2010-07-29 12:58:52 +0000 (Thu, 29 Jul 2010)

Log Message:
-----------
The improvement of html export and print preview 

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2010-07-29 05:51:51 UTC (rev 985)
+++ trunk/mmex/src/mmex.cpp	2010-07-29 12:58:52 UTC (rev 986)
@@ -3246,7 +3246,7 @@
     mmHelpPanel* hp = dynamic_cast<mmHelpPanel*>(panelCurrent_);
     if (rp)
     {
-        printer_ ->PreviewText(panelCurrent_->getReportText());
+        printer_ ->PreviewText(rp->getReportText());
     }
     else if (hp)
     {
@@ -3312,7 +3312,7 @@
         {
             wxFileOutputStream output( fileName );
             wxTextOutputStream text( output );
-            text << panelCurrent_->getReportText();
+            text << rp->getReportText();
         }
     }
 }


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

Revision: 1036
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1036&view=rev
Author:   stef145g
Date:     2010-12-17 23:07:47 +0000 (Fri, 17 Dec 2010)

Log Message:
-----------
Spelling mistake corrected

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2010-12-17 07:51:34 UTC (rev 1035)
+++ trunk/mmex/src/mmex.cpp	2010-12-17 23:07:47 UTC (rev 1036)
@@ -3992,7 +3992,7 @@
 
     mainSizer->Add(
         new wxStaticText(this, wxID_ANY,
-        _("Term accounts are specialized bank accounts. Intended for asset\ntype accounts such as Term Deposits and Bonds. These accounts\ncan have regular money comming in and out, being outside the\ngeneral income stream.")), 0,
+        _("Term accounts are specialized bank accounts. Intended for asset\ntype accounts such as Term Deposits and Bonds. These accounts\ncan have regular money coming in and out, being outside the\ngeneral income stream.")), 0,
         wxALL,
         5);
 


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

Revision: 1037
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1037&view=rev
Author:   stef145g
Date:     2010-12-18 03:02:53 +0000 (Sat, 18 Dec 2010)

Log Message:
-----------
Hide Term Accounts when none have been created.

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2010-12-17 23:07:47 UTC (rev 1036)
+++ trunk/mmex/src/mmex.cpp	2010-12-18 03:02:53 UTC (rev 1037)
@@ -795,6 +795,16 @@
 
 void mmGUIFrame::updateNavTreeControl()
 {
+    bool activateTermAccounts = false;
+    int numAccounts = (int) m_core->accountList_.accounts_.size();
+    
+    for (int iAdx = 0; iAdx < numAccounts; iAdx++)
+    {
+        mmTermAccount* pTA = dynamic_cast<mmTermAccount*>(m_core->accountList_.accounts_[iAdx].get());
+        if (pTA)
+            activateTermAccounts = true;
+    }
+
     navTreeCtrl_->DeleteAllItems();
     navTreeCtrl_->SetBackgroundColour(mmColors::navTreeBkColor);
 
@@ -806,10 +816,14 @@
     navTreeCtrl_->SetItemData(accounts, new mmTreeItemData(wxT("Bank Accounts")));
     navTreeCtrl_->SetItemBold(accounts, true);
 
-//  Positioning for new new type of accounts: Term Accounts        
-    wxTreeItemId termAccount = navTreeCtrl_->AppendItem(root, _("Term Accounts"), 2, 2);
-    navTreeCtrl_->SetItemData(termAccount, new mmTreeItemData(wxT("Term Accounts")));
-    navTreeCtrl_->SetItemBold(termAccount, true);
+    wxTreeItemId termAccount;
+    if (activateTermAccounts)
+    {
+    //  Positioning for new new type of accounts: Term Accounts        
+        termAccount = navTreeCtrl_->AppendItem(root, _("Term Accounts"), 2, 2);
+        navTreeCtrl_->SetItemData(termAccount, new mmTreeItemData(wxT("Term Accounts")));
+        navTreeCtrl_->SetItemBold(termAccount, true);
+    }
 
     wxTreeItemId stocks;
     if (mmIniOptions::enableStocks_)
@@ -1160,7 +1174,7 @@
 
     wxString vAccts = mmDBWrapper::getINISettingValue(m_inidb.get(), wxT("VIEWACCOUNTS"), wxT("ALL"));
 
-    int numAccounts = (int) m_core->accountList_.accounts_.size();
+//  int numAccounts = (int) m_core->accountList_.accounts_.size();
     for (int iAdx = 0; iAdx < numAccounts; iAdx++)
     {
         mmCheckingAccount* pCA = dynamic_cast<mmCheckingAccount*>(m_core->accountList_.accounts_[iAdx].get());
@@ -1200,6 +1214,13 @@
     }
 
     navTreeCtrl_->Expand(accounts);
+    if (activateTermAccounts)
+    {
+        navTreeCtrl_->Expand(termAccount);
+        menuBar_->FindItem(MENU_VIEW_TERMACCOUNTS)->Enable(true);
+    } else 
+        menuBar_->FindItem(MENU_VIEW_TERMACCOUNTS)->Enable(false);
+
 }
 //----------------------------------------------------------------------------
 


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

Revision: 1042
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1042&view=rev
Author:   stef145g
Date:     2010-12-19 06:03:52 +0000 (Sun, 19 Dec 2010)

Log Message:
-----------
Correct problem at with initial installation, caused by changes in last update.  

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2010-12-18 17:19:35 UTC (rev 1041)
+++ trunk/mmex/src/mmex.cpp	2010-12-19 06:03:52 UTC (rev 1042)
@@ -796,13 +796,16 @@
 void mmGUIFrame::updateNavTreeControl()
 {
     bool activateTermAccounts = false;
-    int numAccounts = (int) m_core->accountList_.accounts_.size();
-    
-    for (int iAdx = 0; iAdx < numAccounts; iAdx++)
+    // if no database is present yet, ignore testing for Term Accounts
+    if (m_db)
     {
-        mmTermAccount* pTA = dynamic_cast<mmTermAccount*>(m_core->accountList_.accounts_[iAdx].get());
-        if (pTA)
-            activateTermAccounts = true;
+        int numAccounts = (int) m_core->accountList_.accounts_.size();
+        for (int iAdx = 0; iAdx < numAccounts; iAdx++)
+        {
+            mmTermAccount* pTA = dynamic_cast<mmTermAccount*>(m_core->accountList_.accounts_[iAdx].get());
+            if (pTA)
+                activateTermAccounts = true;
+        }
     }
 
     navTreeCtrl_->DeleteAllItems();
@@ -1174,7 +1177,7 @@
 
     wxString vAccts = mmDBWrapper::getINISettingValue(m_inidb.get(), wxT("VIEWACCOUNTS"), wxT("ALL"));
 
-//  int numAccounts = (int) m_core->accountList_.accounts_.size();
+    int numAccounts = (int) m_core->accountList_.accounts_.size();
     for (int iAdx = 0; iAdx < numAccounts; iAdx++)
     {
         mmCheckingAccount* pCA = dynamic_cast<mmCheckingAccount*>(m_core->accountList_.accounts_[iAdx].get());


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

Revision: 1062
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1062&view=rev
Author:   stef145g
Date:     2011-01-04 00:33:27 +0000 (Tue, 04 Jan 2011)

Log Message:
-----------
Fix: User unable to start MMEX if encrypted file password is incorrect.

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2011-01-03 18:14:06 UTC (rev 1061)
+++ trunk/mmex/src/mmex.cpp	2011-01-04 00:33:27 UTC (rev 1062)
@@ -2747,15 +2747,19 @@
 
 	wxFileName checkExt(fileName);
 	wxString password;
+    bool passwordCheckPassed = true;
 	if (checkExt.GetExt().Lower() == wxT("emb") && wxFileName::FileExists(fileName))
 	{
         password = !pwd.empty() ? pwd : wxGetPasswordFromUser(_("Enter database's password"));
+        if (password.IsEmpty())
+            passwordCheckPassed = false;
 	}
 
     // Existing Database
     if (!openingNew 
         && !fileName.IsEmpty() 
-        && wxFileName::FileExists(fileName))
+        && wxFileName::FileExists(fileName)
+        && passwordCheckPassed)
     {    
         /* Do a backup before opening */
         wxString backupDBState =  mmDBWrapper::getINISettingValue(m_inidb.get(), wxT("BACKUPDB"), wxT("FALSE"));
@@ -2819,10 +2823,14 @@
     }
     else // open of existing database failed
     {
-       wxString note = mmex::getProgramName() + _(" - No File opened ");
-       this->SetTitle(note);   
+        wxString note = mmex::getProgramName() + _(" - No File opened ");
+        this->SetTitle(note);   
         
-        wxMessageDialog msgDlg(this, _("Cannot locate previously opened database.\nDo you want to browse to locate the file?"), 
+        wxString msgStr = _("Cannot locate previously opened database.\n");
+        if (!passwordCheckPassed)
+            msgStr = _("Password not entered for encrypted Database.\n");
+
+        wxMessageDialog msgDlg(this, msgStr + _("Do you want to browse to locate another file?"), 
                                 _("Error opening database"), wxYES_NO);
         if (msgDlg.ShowModal() == wxID_YES)
         {


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

Revision: 1087
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1087&view=rev
Author:   stef145g
Date:     2011-01-13 15:02:35 +0000 (Thu, 13 Jan 2011)

Log Message:
-----------
Fix Home Page Navigation, Removed PopupMenu "Go to..", fixed PopupMenu for Term Accounts 

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2011-01-13 06:14:51 UTC (rev 1086)
+++ trunk/mmex/src/mmex.cpp	2011-01-13 15:02:35 UTC (rev 1087)
@@ -1419,18 +1419,28 @@
            if (pAccount)
            {
               wxString acctType = pAccount->acctType_;
-              if (acctType == wxT("Checking"))
+
+              if ((acctType == wxT("Checking")) || acctType == wxT("Term") )
               {
                  gotoAccountID_ = data;
-                 wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_GOTOACCOUNT);
-                 GetEventHandler()->AddPendingEvent(evt);
+                 if (gotoAccountID_ != -1)    
+                 {
+                    createCheckingAccountPage(gotoAccountID_);
+                 }
+                 navTreeCtrl_->SetFocus();
+
+              //if (acctType == wxT("Checking"))
+              //{
+              //   gotoAccountID_ = data;
+              //   wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_GOTOACCOUNT);
+              //   GetEventHandler()->AddPendingEvent(evt);
+              //}
+              //else if (acctType == wxT("Term"))
+              //{
+              //   gotoAccountID_ = data;
+              //   wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_GOTOACCOUNT);
+              //   GetEventHandler()->AddPendingEvent(evt);
               }
-              else if (acctType == wxT("Term"))
-              {
-                 gotoAccountID_ = data;
-                 wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_GOTOACCOUNT);
-                 GetEventHandler()->AddPendingEvent(evt);
-              }
               else
               {
                  Freeze();
@@ -2224,29 +2234,29 @@
         int data = iData->getData();
         if (!iData->isBudgetingNode())
         {
-           boost::shared_ptr<mmAccount> pAccount = m_core->accountList_.getAccountSharedPtr(data); 
-           if (pAccount)
-           {
-              wxString acctType = pAccount->acctType_;
-              if (acctType == wxT("Checking"))
-              {
-                 wxMenu menu;
-                 menu.Append(MENU_TREEPOPUP_GOTO, _("&Go To.."));
-                 menu.Append(MENU_TREEPOPUP_EDIT, _("&Edit Account"));
-                 menu.Append(MENU_TREEPOPUP_DELETE, _("&Delete Account"));
-                 menu.AppendSeparator();
-                 menu.Append(MENU_TREEPOPUP_LAUNCHWEBSITE, _("&Launch Account Website"));
-                 PopupMenu(&menu, pt);
-              }
-              else if (acctType == wxT("Investment") || acctType == wxT("Term"))
-              {
-                 wxMenu menu;
-                 menu.Append(MENU_TREEPOPUP_EDIT, _("&Edit Account"));
-                 menu.Append(MENU_TREEPOPUP_DELETE, _("&Delete Account"));
-                 menu.AppendSeparator();
-                 menu.Append(MENU_TREEPOPUP_LAUNCHWEBSITE, _("&Launch Account Website"));
-                 PopupMenu(&menu, pt);
-              }
+            boost::shared_ptr<mmAccount> pAccount = m_core->accountList_.getAccountSharedPtr(data); 
+            if (pAccount)
+            {
+                wxString acctType = pAccount->acctType_;
+                if (acctType == wxT("Checking") || acctType == wxT("Term") || acctType == wxT("Investment"))
+                {
+                    wxMenu menu;
+//                  menu.Append(MENU_TREEPOPUP_GOTO, _("&Go To.."));
+                    menu.Append(MENU_TREEPOPUP_EDIT, _("&Edit Account"));
+                    menu.Append(MENU_TREEPOPUP_DELETE, _("&Delete Account"));
+                    menu.AppendSeparator();
+                    menu.Append(MENU_TREEPOPUP_LAUNCHWEBSITE, _("&Launch Account Website"));
+                    PopupMenu(&menu, pt);
+                }
+              //else if (acctType == wxT("Investment") || acctType == wxT("Term"))
+              //{
+              //   wxMenu menu;
+              //   menu.Append(MENU_TREEPOPUP_EDIT, _("&Edit Account"));
+              //   menu.Append(MENU_TREEPOPUP_DELETE, _("&Delete Account"));
+              //   menu.AppendSeparator();
+              //   menu.Append(MENU_TREEPOPUP_LAUNCHWEBSITE, _("&Launch Account Website"));
+              //   PopupMenu(&menu, pt);
+              //}
             }
             else
             {
@@ -2255,10 +2265,11 @@
             }
         }
     }
-		else 
-	{
-       if (iData->getString() == wxT("Bank Accounts"))
-		{
+    else 
+    {
+        if ( iData->getString() == wxT("Bank Accounts") || 
+             iData->getString() == wxT("Term Accounts"))
+        { // Create for both Bank & Term Accounts
 
          //wxMenu menu;
 			/*Popup Menu for Bank Accounts*/
@@ -2278,36 +2289,39 @@
 			//Favorite //
 			//Open     //
 
+		    wxMenu *menu = new wxMenu;
+            menu->Append(MENU_TREEPOPUP_ACCOUNT_NEW, _("New &Account"));
+            menu->Append(MENU_TREEPOPUP_ACCOUNT_DELETE, _("&Delete Account"));
+            menu->Append(MENU_TREEPOPUP_ACCOUNT_EDIT, _("&Edit Account"));
+            menu->Append(MENU_TREEPOPUP_ACCOUNT_LIST, _("Account &List"));
+		    menu->AppendSeparator();
+            // menu->Append(menuItemOnlineUpdateCurRate_);
+            // menu->AppendSeparator();
 
-		 wxMenu *menu = new wxMenu;
-         menu->Append(MENU_TREEPOPUP_ACCOUNT_NEW, _("New &Account"));
-         menu->Append(MENU_TREEPOPUP_ACCOUNT_DELETE, _("&Delete Account"));
-         menu->Append(MENU_TREEPOPUP_ACCOUNT_EDIT, _("&Edit Account"));
-         menu->Append(MENU_TREEPOPUP_ACCOUNT_LIST, _("Account &List"));
-         
-		 menu->AppendSeparator();
-		// menu->Append(menuItemOnlineUpdateCurRate_);
-		// menu->AppendSeparator();
+            // Create only for Bank Accounts
+            if (iData->getString() != wxT("Term Accounts"))
+            {
+                wxMenu *exportTo = new wxMenu;
+		        exportTo->Append(MENU_TREEPOPUP_ACCOUNT_EXPORT2CSV, _("&CSV Files"));
+		        exportTo->Append(MENU_TREEPOPUP_ACCOUNT_EXPORT2QIF, _("&QIF Files"));
+		        menu->AppendSubMenu(exportTo,  _("&Export"));
+		        wxMenu *importFrom = new wxMenu;
+		        importFrom->Append(MENU_TREEPOPUP_ACCOUNT_IMPORTUNIVCSV, _("&Universal CSV Files"));
+		        importFrom->Append(MENU_TREEPOPUP_ACCOUNT_IMPORTQIF, _("&QIF Files"));
+		        importFrom->Append(MENU_TREEPOPUP_ACCOUNT_IMPORTCSV, _("&MMEX CSV Files"));
+		        importFrom->Append(MENU_TREEPOPUP_ACCOUNT_IMPORTMMNET, _("MM.&NET CSV Files"));
+		        menu->AppendSubMenu(importFrom,  _("&Import"));
+		        menu->AppendSeparator();
+            }
 
-		 wxMenu *exportTo = new wxMenu;
-		 exportTo->Append(MENU_TREEPOPUP_ACCOUNT_EXPORT2CSV, _("&CSV Files"));
-		 exportTo->Append(MENU_TREEPOPUP_ACCOUNT_EXPORT2QIF, _("&QIF Files"));
-		 menu->AppendSubMenu(exportTo,  _("&Export"));
-		 wxMenu *importFrom = new wxMenu;
-		 importFrom->Append(MENU_TREEPOPUP_ACCOUNT_IMPORTUNIVCSV, _("&Universal CSV Files"));
-		 importFrom->Append(MENU_TREEPOPUP_ACCOUNT_IMPORTQIF, _("&QIF Files"));
-		 importFrom->Append(MENU_TREEPOPUP_ACCOUNT_IMPORTCSV, _("&MMEX CSV Files"));
-		 importFrom->Append(MENU_TREEPOPUP_ACCOUNT_IMPORTMMNET, _("MM.&NET CSV Files"));
-		 menu->AppendSubMenu(importFrom,  _("&Import"));
-		 menu->AppendSeparator();
-		 wxMenu *viewAccounts = new wxMenu;
-		 viewAccounts->Append(MENU_TREEPOPUP_ACCOUNT_VIEWALL, _("All"));
-		 viewAccounts->Append(MENU_TREEPOPUP_ACCOUNT_VIEWOPEN, _("Open"));
-		 viewAccounts->Append(MENU_TREEPOPUP_ACCOUNT_VIEWFAVORITE, _("Favorites"));
-		 menu->AppendSubMenu(viewAccounts, _("Accounts Visible"));
-         PopupMenu(&*menu, pt);
-		}
-	}
+            wxMenu *viewAccounts = new wxMenu;
+		    viewAccounts->Append(MENU_TREEPOPUP_ACCOUNT_VIEWALL, _("All"));
+		    viewAccounts->Append(MENU_TREEPOPUP_ACCOUNT_VIEWOPEN, _("Open"));
+		    viewAccounts->Append(MENU_TREEPOPUP_ACCOUNT_VIEWFAVORITE, _("Favorites"));
+		    menu->AppendSubMenu(viewAccounts, _("Accounts Visible"));
+            PopupMenu(&*menu, pt);
+        }
+    }
 }
 //----------------------------------------------------------------------------
 


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

Revision: 1090
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1090&view=rev
Author:   vomikan
Date:     2011-01-14 07:41:51 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
SetFocus() for Home Page navigation button added (for linux only)

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2011-01-14 05:37:30 UTC (rev 1089)
+++ trunk/mmex/src/mmex.cpp	2011-01-14 07:41:51 UTC (rev 1090)
@@ -820,7 +820,9 @@
     wxTreeItemId root = navTreeCtrl_->AddRoot(_("Home Page"), 0, 0);
     navTreeCtrl_->SetItemData(root, new mmTreeItemData(wxT("Home Page")));
     navTreeCtrl_->SetItemBold(root, true);
+    navTreeCtrl_->SetFocus();
 
+
     wxTreeItemId accounts = navTreeCtrl_->AppendItem(root, _("Bank Accounts"), 1, 1);
     navTreeCtrl_->SetItemData(accounts, new mmTreeItemData(wxT("Bank Accounts")));
     navTreeCtrl_->SetItemBold(accounts, true);


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

Revision: 1129
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1129&view=rev
Author:   vomikan
Date:     2011-01-31 11:22:52 +0000 (Mon, 31 Jan 2011)

Log Message:
-----------
UnselectAll works on Linux too 

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2011-01-31 06:30:59 UTC (rev 1128)
+++ trunk/mmex/src/mmex.cpp	2011-01-31 11:22:52 UTC (rev 1129)
@@ -653,7 +653,7 @@
 void mmGUIFrame::unselectNavTree()
 { 
     wxASSERT(navTreeCtrl_);
-    navTreeCtrl_->Unselect(); 
+    navTreeCtrl_->UnselectAll(); 
 }
 //----------------------------------------------------------------------------
 


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

Revision: 1191
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1191&view=rev
Author:   stef145g
Date:     2011-03-15 08:49:02 +0000 (Tue, 15 Mar 2011)

Log Message:
-----------
Stocks Code Broken. Event temporarily removed till fixed.

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2011-03-14 05:22:03 UTC (rev 1190)
+++ trunk/mmex/src/mmex.cpp	2011-03-15 08:49:02 UTC (rev 1191)
@@ -354,7 +354,12 @@
     EVT_MENU(MENU_SHOW_APPSTART, mmGUIFrame::OnShowAppStartDialog)
     EVT_MENU(MENU_EXPORT_HTML, mmGUIFrame::OnExportToHtml)
     EVT_MENU(MENU_BILLSDEPOSITS, mmGUIFrame::OnBillsDeposits)
-    EVT_MENU(MENU_STOCKS, mmGUIFrame::OnStocks)
+
+//  Fix me: Stock Code Broken - Getting exceptions in Debug Mode. Causes assert error.
+//          temporarily removed to prevent code execution.
+//          Something is not correct. Code being called when no an accountID present.
+//          Unexpected behavior Possible missing code somewhere ???
+//  EVT_MENU(MENU_STOCKS, mmGUIFrame::OnStocks)
     EVT_MENU(MENU_ASSETS, mmGUIFrame::OnAssets)
     EVT_MENU(MENU_CURRENCY, mmGUIFrame::OnCurrency)
 	EVT_MENU(MENU_TRANSACTIONREPORT, mmGUIFrame::OnTransactionReport)


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

Revision: 1198
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1198&view=rev
Author:   stef145g
Date:     2011-03-21 01:19:32 +0000 (Mon, 21 Mar 2011)

Log Message:
-----------
Auto Repeat Transactions Completion

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2011-03-21 01:18:42 UTC (rev 1197)
+++ trunk/mmex/src/mmex.cpp	2011-03-21 01:19:32 UTC (rev 1198)
@@ -691,53 +691,34 @@
 
 void mmGUIFrame::OnAutoRepeatTransactionsTimer(wxTimerEvent& /*event*/)
 {
-    /*To Do
-        reorganise code to allow code to be reused.
-        Code duplicated from billsdepositspanel.cpp
+    bool autoExecuteManual; // Used when decoding: REPEATS
+    bool autoExecuteSilent;
+    bool requireExecution;
 
-        Code in dialog to be reorganised as well as bill deposits and dialog are currently linked.
-    */
-
     static const char sql[] = 
-       "select c.categname, "
-       "sc.subcategname, "
-       "b.BDID, "
-       "b.NEXTOCCURRENCEDATE, "
-       "b.REPEATS, "
-       "b.PAYEEID, "
-       "b.TRANSCODE, "
-       "b.ACCOUNTID, "
-       "b.TOACCOUNTID, "
-       "b.TRANSAMOUNT, "
-       "b.TOTRANSAMOUNT, "
-       "b.NOTES, "
-       "b.CATEGID, "
-       "b.SUBCATEGID "
+    "select "
+        "b.BDID, "
+        "b.ACCOUNTID, b.TOACCOUNTID, "
+        "b.PAYEEID, b.TRANSCODE, b.TRANSAMOUNT, "
+        "b.STATUS, b.TRANSACTIONNUMBER, "
+        "b.NOTES, b.CATEGID, b.SUBCATEGID, "
+        "b.TOTRANSAMOUNT, "
+        "c.categname, sc.subcategname, "
+        "b.REPEATS, "
+        "b.NEXTOCCURRENCEDATE "
+    "from BILLSDEPOSITS_V1 b "
+        "left join category_v1 c on c.categid = b.categid "
+        "left join subcategory_v1 sc on sc.subcategid = b.subcategid";
 
-        "from BILLSDEPOSITS_V1 b "
-
-        "left join category_v1 c "
-        "on c.categid = b.categid "
-
-        "left join subcategory_v1 sc "
-        "on sc.subcategid = b.subcategid";
-
     mmDBWrapper::loadBaseCurrencySettings(m_db.get());
-
     wxSQLite3ResultSet q1 = m_db.get()->ExecuteQuery(sql);
-
-    bool autoExecuteManual = false;
-    bool autoExecuteSilent = false;
-    bool requireExecution = false;
     while (q1.NextRow())
     {
         mmBDTransactionHolder th;
-
         th.bdID_           = q1.GetInt(wxT("BDID"));
         th.nextOccurDate_  = mmGetStorageStringAsDate(q1.GetString(wxT("NEXTOCCURRENCEDATE")));
         
         th.nextOccurStr_   = mmGetDateForDisplay(m_db.get(), th.nextOccurDate_);
-        int repeats        = q1.GetInt(wxT("REPEATS"));
         th.payeeID_        = q1.GetInt(wxT("PAYEEID"));
         th.transType_      = q1.GetString(wxT("TRANSCODE"));
         th.accountID_      = q1.GetInt(wxT("ACCOUNTID"));
@@ -752,64 +733,22 @@
 		th.subcategID_	   = q1.GetInt(wxT("SUBCATEGID"));
 		th.subcategoryStr_ = q1.GetString(wxT("SUBCATEGNAME"));
 
+        // DeMultiplex the Auto Executable fields from the db entry: REPEATS
+        int repeats        = q1.GetInt(wxT("REPEATS"));
         autoExecuteManual = false;
         autoExecuteSilent = false;
-        // DeMultiplex the Auto Executable fields.
         if (repeats >= BD_REPEATS_MULTIPLEX_BASE)    // Auto Execute User Acknowlegement required
         {
             autoExecuteManual = true;
             repeats -= BD_REPEATS_MULTIPLEX_BASE;
         }
+
         if (repeats >= BD_REPEATS_MULTIPLEX_BASE)    // Auto Execute Silent mode
         {
             autoExecuteManual = false;               // Can only be manual or auto. Not both   
             autoExecuteSilent = true;
             repeats -= BD_REPEATS_MULTIPLEX_BASE;
         }
-        if (repeats == 0)
-        {
-           th.repeatsStr_ = _("None");
-        }
-        else if (repeats == 1)
-        {
-           th.repeatsStr_ = _("Weekly");
-        }
-        else if (repeats == 2)
-        {
-           th.repeatsStr_ = _("Bi-Weekly");
-        }
-        else if (repeats == 3)
-        {
-           th.repeatsStr_ = _("Monthly");
-        }
-        else if (repeats == 4)
-        {
-           th.repeatsStr_ = _("Bi-Monthly");
-        }
-        else if (repeats == 5)
-        {
-           th.repeatsStr_ = _("Quarterly");
-        }
-        else if (repeats == 6)
-        {
-           th.repeatsStr_ = _("Half-Yearly");
-        }
-        else if (repeats == 7)
-        {
-           th.repeatsStr_ = _("Yearly");
-        }
-        else if (repeats == 8)
-        {
-           th.repeatsStr_ = _("Four Months");
-        }
-        else if (repeats == 9)
-        {
-           th.repeatsStr_ = _("Four Weeks");
-        }
-        else if (repeats == 10)
-        {
-           th.repeatsStr_ = _("Daily");
-        }
 
         wxDateTime today = wxDateTime::Now();
         wxTimeSpan ts = th.nextOccurDate_.Subtract(today);
@@ -820,14 +759,9 @@
         if (hoursRemaining_ > 0)
             th.daysRemaining_ += 1;
 
-        if (th.daysRemaining_ > 0)
+        if (th.daysRemaining_ < 1)
         {
-            th.daysRemainingStr_ = wxString::Format(wxT("%d"), th.daysRemaining_) + _(" days remaining");
-        }
-        else
-        {
             requireExecution = true;
-            th.daysRemainingStr_ = wxString::Format(wxT("%d"), abs(th.daysRemaining_)) + _(" days overdue!");
         }
 
         mmex::formatDoubleToCurrencyEdit(th.amt_, th.transAmtString_);
@@ -846,19 +780,49 @@
 
         if (autoExecuteManual && requireExecution )
         {
-            wxMessageBox(_("Manual Auto Execution of Repeat Transactions will occur.\n\nWaiting Implementation"),_(" Auto Repeat Transactions"));
-            if (activeHomePage_)
-                createHomePage(); // Update home page details only if it is being displayed
+            mmBDDialog repeatTransactionsDlg(m_db.get(), m_core.get(), th.bdID_ ,false ,true , this, SYMBOL_BDDIALOG_IDNAME , _(" Auto Repeat Transactions"));
+            if ( repeatTransactionsDlg.ShowModal() == wxID_OK )
+            {
+                if (activeHomePage_)
+                    createHomePage(); // Update home page details only if it is being displayed
+            }
         }
 
         if (autoExecuteSilent && requireExecution)
         {
-            wxMessageBox(_("Silent Auto Execution of Repeat Transactions will occur.\n\nWaiting Implementation"),_(" Auto Repeat Transactions"));
+            boost::shared_ptr<mmBankTransaction> pTransaction;
+            boost::shared_ptr<mmBankTransaction> pTemp(new mmBankTransaction(m_core.get()->db_));
+            pTransaction = pTemp;
+
+            boost::shared_ptr<mmCurrency> pCurrencyPtr = m_core.get()->accountList_.getCurrencyWeakPtr(th.accountID_).lock();
+            wxASSERT(pCurrencyPtr);
+
+            pTransaction->accountID_ = th.accountID_;
+            pTransaction->toAccountID_ = th.toAccountID_;
+            pTransaction->payee_ = m_core.get()->payeeList_.getPayeeSharedPtr(th.payeeID_);
+            pTransaction->transType_ = th.transType_;
+            pTransaction->amt_ = th.amt_;
+            pTransaction->status_ = q1.GetString(wxT("STATUS"));
+            pTransaction->transNum_ = q1.GetString(wxT("TRANSACTIONNUMBER"));
+            pTransaction->notes_ = th.notesStr_;
+            pTransaction->category_ = m_core.get()->categoryList_.getCategorySharedPtr(th.categID_, th.subcategID_);
+            pTransaction->date_ = th.nextOccurDate_;
+            pTransaction->toAmt_ = th.toAmt_;
+
+            boost::shared_ptr<mmSplitTransactionEntries> split(new mmSplitTransactionEntries());
+            split->loadFromBDDB(m_core.get(),th.bdID_);
+		    *pTransaction->splitEntries_.get() = *split.get();
+
+            pTransaction->updateAllData(m_core.get(), th.accountID_, pCurrencyPtr);
+            m_core.get()->bTransactionList_.addTransaction(m_core.get(), pTransaction);
+            mmDBWrapper::completeBDInSeries(m_db.get(), th.bdID_);
+
             if (activeHomePage_)
+            {
                 createHomePage(); // Update home page details only if it is being displayed
+            }
         }
     }
-
     q1.Finalize();
 }
 //----------------------------------------------------------------------------


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

Revision: 1207
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1207&view=rev
Author:   stef145g
Date:     2011-03-26 02:11:35 +0000 (Sat, 26 Mar 2011)

Log Message:
-----------
Remove Item: Tools -> Stock Investments

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2011-03-26 01:09:50 UTC (rev 1206)
+++ trunk/mmex/src/mmex.cpp	2011-03-26 02:11:35 UTC (rev 1207)
@@ -887,7 +887,7 @@
     menuBar_->FindItem(wxID_PREFERENCES)->Enable(enable);
     if (mmIniOptions::enableRepeatingTransactions_)
         menuBar_->FindItem(MENU_BILLSDEPOSITS)->Enable(enable);
-    menuBar_->FindItem(MENU_STOCKS)->Enable(enable);
+//    menuBar_->FindItem(MENU_STOCKS)->Enable(enable);
     menuBar_->FindItem(MENU_CURRENCY)->Enable(enable);
     if (mmIniOptions::enableAssets_)
         menuBar_->FindItem(MENU_ASSETS)->Enable(enable);
@@ -2746,9 +2746,9 @@
        menuTools->Append(menuItemBillsDeposits); 
     }
 
-    wxMenuItem* menuItemStocks = new wxMenuItem(menuTools, MENU_STOCKS, _("&Stock Investments"), _("Stock Investments"));
-    menuItemStocks->SetBitmap(wxBitmap(stock_curve_xpm));
-    menuTools->Append(menuItemStocks);
+//    wxMenuItem* menuItemStocks = new wxMenuItem(menuTools, MENU_STOCKS, _("&Stock Investments"), _("Stock Investments"));
+//    menuItemStocks->SetBitmap(wxBitmap(stock_curve_xpm));
+//    menuTools->Append(menuItemStocks);
 
     if (mmIniOptions::enableAssets_)
     {


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

Revision: 1215
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1215&view=rev
Author:   stef145g
Date:     2011-04-02 00:06:33 +0000 (Sat, 02 Apr 2011)

Log Message:
-----------
Fix menus if MMEX has been opened without an active database

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2011-03-31 12:31:14 UTC (rev 1214)
+++ trunk/mmex/src/mmex.cpp	2011-04-02 00:06:33 UTC (rev 1215)
@@ -879,22 +879,30 @@
     menuBar_->FindItem(MENU_ACCTEDIT)->Enable(enable);
     if (mmIniOptions::enableDeleteAccount_)
         menuBar_->FindItem(MENU_ACCTDELETE)->Enable(enable);
+
     menuBar_->FindItem(MENU_ORGCATEGS)->Enable(enable);
     menuBar_->FindItem(MENU_ORGPAYEE)->Enable(enable);
+    menuBar_->FindItem(MENU_CATEGORY_RELOCATION)->Enable(enable);
+    menuBar_->FindItem(MENU_PAYEE_RELOCATION)->Enable(enable);
+    menuBar_->FindItem(MENU_CUSTOM_SQL_REPORT_NEW)->Enable(enable);
+    menuBar_->FindItem(MENU_CUSTOM_SQL_REPORT_EDIT)->Enable(enable);
+    menuBar_->FindItem(MENU_CUSTOM_SQL_REPORT_DELETE)->Enable(enable);
+    menuBar_->FindItem(MENU_CONVERT_ENC_DB)->Enable(enable);
+
     menuBar_->FindItem(MENU_IMPORT)->Enable(enable);
     menuBar_->FindItem(MENU_PRINT_PREVIEW)->Enable(enable);
     menuBar_->FindItem(MENU_PRINT)->Enable(enable);
     menuBar_->FindItem(wxID_PREFERENCES)->Enable(enable);
     if (mmIniOptions::enableRepeatingTransactions_)
         menuBar_->FindItem(MENU_BILLSDEPOSITS)->Enable(enable);
-//    menuBar_->FindItem(MENU_STOCKS)->Enable(enable);
+//  menuBar_->FindItem(MENU_STOCKS)->Enable(enable);
     menuBar_->FindItem(MENU_CURRENCY)->Enable(enable);
     if (mmIniOptions::enableAssets_)
         menuBar_->FindItem(MENU_ASSETS)->Enable(enable);
     if (mmIniOptions::enableBudget_)
         menuBar_->FindItem(MENU_BUDGETSETUPDIALOG)->Enable(enable);
     menuBar_->FindItem(MENU_TRANSACTIONREPORT)->Enable(enable);
-    
+
     if (mmIniOptions::enableAddAccount_)
         toolBar_->EnableTool(MENU_NEWACCT, enable);
     toolBar_->EnableTool(MENU_ACCTLIST, enable);
@@ -2323,7 +2331,10 @@
 
 void mmGUIFrame::OnItemRightClick(wxTreeEvent& event)
 {
-    showTreePopupMenu(event.GetItem(), event.GetPoint());
+    if (menuBar_->FindItem(MENU_ORGCATEGS)->IsEnabled() )
+        showTreePopupMenu(event.GetItem(), event.GetPoint());
+    else
+        wxMessageBox(_("MMEX has been opened without an active database."),_("MMEX: Menu Popup Error"),wxICON_EXCLAMATION);
 }
 //----------------------------------------------------------------------------
 


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

Revision: 1320
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1320&view=rev
Author:   stef145g
Date:     2011-06-11 03:33:55 +0000 (Sat, 11 Jun 2011)

Log Message:
-----------
Tidy up the wizards, and improve help details on the wizard pages.

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2011-06-10 12:43:39 UTC (rev 1319)
+++ trunk/mmex/src/mmex.cpp	2011-06-11 03:33:55 UTC (rev 1320)
@@ -520,12 +520,17 @@
                    wxDEFAULT_DIALOG_STYLE), m_core(core)
 {
     page1 = new wxWizardPageSimple(this);
+    wxString displayMsg;
+    displayMsg << _("The next pages will help you create a new database.") << wxT("\n\n")
+               << _("Your database file is stored with an extension of .mmb.")<< wxT("\n\n")
+               << _("Make sure to make backups of this file and to store it ")<< wxT("\n")
+               << _("carefully as it contains important financial information.")<< wxT("\n\n")
+               
+               << _("The database can later be encrypted if required, by using")<< wxT("\n")
+               << _("the option: 'Save database as' and changing the file type")<< wxT("\n")
+               << _("before saving.");
+    new wxStaticText(page1, wxID_ANY,displayMsg);
 
-    new wxStaticText(page1, wxID_ANY,
-             _("The next pages will help you create a new database.\n\nYour database file is stored with an extension of .mmb.\n\nMake sure to make backups of this file \nand to store it carefully as it contains important \nfinancial information."
-             )
-        );
-
     wxNewDatabaseWizardPage1* page2 = new wxNewDatabaseWizardPage1(this);
 
     // set the page order using a convenience function - could also use
@@ -4140,50 +4145,34 @@
         currName = parent_->m_core->currencyList_.getCurrencySharedPtr(currencyID_)->currencyName_;
     }
 
-    itemButtonCurrency_ = new wxButton( this, 
-        ID_DIALOG_OPTIONS_BUTTON_CURRENCY, currName, wxDefaultPosition, wxDefaultSize, 0 );
+    itemButtonCurrency_ = new wxButton( this, ID_DIALOG_OPTIONS_BUTTON_CURRENCY, currName, wxDefaultPosition, wxSize(130,-1), 0 );
 
-
     wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
 
-    mainSizer->Add(
-        new wxStaticText(this, wxID_ANY,
-        _("Base Currency for account")),
-        0,
-        wxALL,
-        5
-        );
+    mainSizer->Add( new wxStaticText(this, wxID_ANY, _("Base Currency for account")), 0, wxALL, 5 );
+    mainSizer->Add( itemButtonCurrency_, 0 /* No stretching */, wxALL, 5 /* Border size */ );
 
-    mainSizer->Add(
-        itemButtonCurrency_,
-        0, // No stretching
-        wxALL,
-        5 // Border
-        );
+    wxString helpMsg;
+    helpMsg << _("Specify the base (or default) currency to be used for the") << wxT("\n")
+            << _("database. The base currency can later be changed by using") << wxT("\n")
+            << _("the options dialog. New accounts, will use this currency by") << wxT("\n")
+            << _("default, and can be changed when editing account details.") << wxT("\n");
+    mainSizer->Add( new wxStaticText(this, wxID_ANY, helpMsg), 0, wxALL, 5);
 
-    mainSizer->Add(
-        new wxStaticText(this, wxID_ANY,
-        _("\nSpecify the base (or default) currency to be used \nwith the database. You can change the \ncurrency associated with each account if needed.\n")), 0,
-        wxALL,
-        5);
 
-
     wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL);
     mainSizer->Add(itemBoxSizer5, 0, wxALIGN_LEFT|wxALL, 5);
 
-    wxStaticText* itemStaticText6 = new wxStaticText( this, wxID_STATIC, _("User Name"), 
-        wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText* itemStaticText6 = new wxStaticText( this, wxID_STATIC, _("User Name"));
     itemBoxSizer5->Add(itemStaticText6, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
 
-    itemUserName_ = new wxTextCtrl( this, ID_DIALOG_OPTIONS_TEXTCTRL_USERNAME, _T(""), 
-        wxDefaultPosition, wxDefaultSize, 0 );
+    itemUserName_ = new wxTextCtrl( this, ID_DIALOG_OPTIONS_TEXTCTRL_USERNAME, _T(""), wxDefaultPosition, wxSize(130,-1), 0 );
     itemBoxSizer5->Add(itemUserName_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    mainSizer->Add(
-        new wxStaticText(this, wxID_ANY,
-        _("(Optional)Specify your name. Mainly used for reporting and in printing reports.\n")), 0,
-        wxALL,
-        5);
+    helpMsg.Empty();
+    helpMsg << _("(Optional) Specify a title or your name.") << wxT("\n")
+            << _("Used as a database title for displayed and printed reports.");
+    mainSizer->Add( new wxStaticText(this, wxID_ANY, helpMsg), 0, wxALL, 5);
 
     SetSizer(mainSizer);
     mainSizer->Fit(this);
@@ -4194,9 +4183,7 @@
 {
     if ( currencyID_ == -1)
     {
-        wxMessageBox(_("Base Currency Not Set"), 
-            _("Error"),
-            wxICON_WARNING | wxOK, this);
+        wxMessageBox(_("Base Currency Not Set"), _("New Database"), wxICON_WARNING | wxOK, this);
 
         return false;
     }
@@ -4210,33 +4197,18 @@
 wxAddAccountPage1::wxAddAccountPage1(mmAddAccountWizard* parent) : 
     wxWizardPageSimple(parent), parent_(parent)
 {
-    textAccountName_ = new wxTextCtrl(this, wxID_ANY, 
-        wxGetEmptyString(), wxDefaultPosition, wxDefaultSize, 0 );
+    textAccountName_ = new wxTextCtrl(this, wxID_ANY, wxGetEmptyString(), wxDefaultPosition, wxSize(130,-1), 0 );
 
     wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
+    mainSizer->Add(new wxStaticText(this, wxID_ANY, _("Name of the Account")), 0, wxALL, 5 );
+    mainSizer->Add( textAccountName_, 0 /* No stretching */, wxALL, 5 /* Border Size */);
 
-    mainSizer->Add(
-        new wxStaticText(this, wxID_ANY,
-        _("Name of the Account")),
-        0,
-        wxALL,
-        5
-        );
+    wxString helpMsg;
+    helpMsg << _("Specify a descriptive name for the account.") << wxT("\n")
+            << _("This is generally the name of a financial institution") << wxT("\n")
+            << _("where the account is held. For example: 'ABC Bank'.");
+    mainSizer->Add(new wxStaticText(this, wxID_ANY, helpMsg ), 0, wxALL, 5);
 
-    mainSizer->Add(
-        textAccountName_,
-        0, // No stretching
-        wxALL,
-        5 // Border
-        );
-
-    mainSizer->Add(
-        new wxStaticText(this, wxID_ANY,
-        _("\nSpecify a descriptive name of the account. This most commonly \nis the name of the financial institution where the account is held. \nFor example 'ABC Bank'.")), 0,
-        wxALL,
-        5);
-
-
     SetSizer(mainSizer);
     mainSizer->Fit(this);
 }
@@ -4246,10 +4218,7 @@
 {
     if ( textAccountName_->GetValue().empty())
     {
-        wxMessageBox(_("Account Name Invalid"), 
-            _("Error"),
-            wxICON_WARNING | wxOK, this);
-
+        wxMessageBox(_("Account Name Invalid"), _("New Account"), wxICON_WARNING | wxOK, this);
         return false;
     }
     parent_->accountName_ = textAccountName_->GetValue().Trim();
@@ -4267,45 +4236,26 @@
         _("Investment"),
         _("Term"),
     };
-    itemChoiceType_ = new wxChoice( this, wxID_ANY, 
-        wxDefaultPosition, wxDefaultSize, 3, itemAcctTypeStrings, 0 );
+    itemChoiceType_ = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 3, itemAcctTypeStrings, 0 );
     itemChoiceType_->SetSelection(0); // Checking
     itemChoiceType_->SetToolTip(_("Specify the type of account to be created."));
 
     wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);
 
-    mainSizer->Add(
-        new wxStaticText(this, wxID_ANY,
-        _("Type of Account")),
-        0,
-        wxALL,
-        5
-        );
+    mainSizer->Add( new wxStaticText(this, wxID_ANY, _("Type of Account")), 0, wxALL, 5 );
+    mainSizer->Add( itemChoiceType_, 0 /* No stretching*/, wxALL, 5 /* Border Size */);
 
-    mainSizer->Add(
-        itemChoiceType_,
-        0, // No stretching
-        wxALL,
-        5 // Border
-        );
-
-    mainSizer->Add(
-        new wxStaticText(this, wxID_ANY,
+    mainSizer->Add( new wxStaticText(this, wxID_ANY,
         _("\nSelect the type of account you want to create:\n\nGeneral bank accounts cover a wide variety of account\ntypes like Checking, Savings and Credit card type accounts.")), 0,
-        wxALL,
-        5);
+        wxALL, 5);
 
-    mainSizer->Add(
-        new wxStaticText(this, wxID_ANY,
+    mainSizer->Add( new wxStaticText(this, wxID_ANY,
         _("\nInvestment accounts are specialized accounts that only \nhave stock/mutual fund investments associated with them.\n")), 0,
-        wxALL,
-        5);
+        wxALL, 5);
 
-    mainSizer->Add(
-        new wxStaticText(this, wxID_ANY,
+    mainSizer->Add( new wxStaticText(this, wxID_ANY,
         _("Term accounts are specialized bank accounts. Intended for asset\ntype accounts such as Term Deposits and Bonds. These accounts\ncan have regular money coming in and out, being outside the\ngeneral income stream.")), 0,
-        wxALL,
-        5);
+        wxALL, 5);
 
     SetSizer(mainSizer);
     mainSizer->Fit(this);
@@ -4324,7 +4274,10 @@
     int currencyID = parent_->m_core->currencyList_.getBaseCurrencySettings();
     if (currencyID == -1)
     {
-        mmShowErrorMessage(this, _("Base Account Currency Not set.\nSet that first using tools->options menu and then add a new account"), _("Error"));
+        wxString errorMsg;
+        errorMsg << _("Base Account Currency Not set.") << wxT("\n")
+                 << _("Set that first using Tools->Options menu and then add a new account.");
+        wxMessageBox( errorMsg, _("New Account"), wxICON_WARNING | wxOK, this);
         return false;
     }
 
@@ -4344,7 +4297,9 @@
     pAccount->accountName_ = parent_->accountName_;
     pAccount->initialBalance_ = 0;
     pAccount->currency_ = parent_->m_core->currencyList_.getCurrencySharedPtr(currencyID);
-    parent_->acctID_ = parent_->m_core->accountList_.addAccount(pAccount);
+    // prevent same account being added multiple times in case of using 'Back' and 'Next' in wizard.
+    if ( ! parent_->m_core->accountList_.accountExists(pAccount->accountName_))
+        parent_->acctID_ = parent_->m_core->accountList_.addAccount(pAccount);
 
     return true;
 }


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

Revision: 1335
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1335&view=rev
Author:   stef145g
Date:     2011-06-18 01:19:07 +0000 (Sat, 18 Jun 2011)

Log Message:
-----------
Correcting messages and strings - better for translation

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2011-06-17 14:54:20 UTC (rev 1334)
+++ trunk/mmex/src/mmex.cpp	2011-06-18 01:19:07 UTC (rev 1335)
@@ -3123,7 +3123,7 @@
     wxFileName oldFileName(fileName_); // opened db's file
 
     if (newFileName == oldFileName) { // on case-sensitive FS uses case-sensitive comparison
-        wxMessageDialog dlg(this, _("Can't copy file to itself"), _("Error"), wxICON_ERROR);
+        wxMessageDialog dlg(this, _("Can't copy file to itself"), _("Save database file as"), wxICON_WARNING);
         dlg.ShowModal();
         return;
     }
@@ -3202,8 +3202,7 @@
 {
     if (mmDBWrapper::getNumAccounts(m_db.get()) == 0)
     {
-        mmShowErrorMessage(0, _("No Account available! Cannot Import! Create a new account first!"), 
-            _("Error"));
+        wxMessageBox(_("No account available to import"),_("Universal CSV Import"), wxICON_WARNING );
         return;
     }
 
@@ -3242,8 +3241,13 @@
             menuBar_->FindItem(MENU_VIEW_TERMACCOUNTS)->Check(true);
             if (firstTermAccount)
             {
-                wxMessageBox(_("Term Account views have been temporarly turned on.\nTo maintain this view, change the defaults by using:\n\nTools -> Options\nView Options\n\nThis message will not be displayed in future."),
-                             _("Initial Term Account Activation"),wxICON_INFORMATION);
+                wxString msgStr;
+                msgStr << _("Term Account views have been temporarly turned on.") << wxT("\n")
+                       << _("To maintain this view, change the defaults by using:") << wxT("\n\n")
+                       << _("Tools -> Options") << wxT("\n")
+                       << _("View Options") << wxT("\n\n")
+                       << _("This message will not be displayed in future.");
+                wxMessageBox(msgStr, _("Initial Term Account Activation"),wxICON_INFORMATION);
             }
         } else
             updateNavTreeControl(); 
@@ -3522,7 +3526,7 @@
     wxString site = wxT("http://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml");
 
     if (!m_core) {
-       mmShowErrorMessage(this, _("No database!"), _("Update Currency Rate"));
+       wxMessageBox(_("No database!"), _("Update Currency Rate"), wxICON_WARNING);
        return;
     }
 
@@ -3531,20 +3535,20 @@
     wxInputStream* in_stream = url.GetInputStream();
 
     if (!in_stream) {
-        mmShowErrorMessage(this, _("Unable to connect!"), _("Update Currency Rate"));
+        wxMessageBox(_("Unable to connect!"), _("Update Currency Rate"), wxICON_WARNING);
         return;
     }
     
     wxXmlDocument doc;
 
     if(!doc.Load(*in_stream)) {
-        mmShowErrorMessage(this, _("Cannot get data from WWW!"), _("Update Currency Rate"));
+        wxMessageBox(_("Cannot get data from WWW!"), _("Update Currency Rate"), wxICON_WARNING);
         return;
     }
 
     // decode received XML data
     if(doc.GetRoot()->GetName() != wxT("gesmes:Envelope")) {
-        mmShowErrorMessage(this, _("Incorrect XML data (#1)!"), _("Update Currency Rate"));
+        wxMessageBox(_("Incorrect XML data (#1)!"), _("Update Currency Rate"), wxICON_WARNING);
         return;
     }
 
@@ -3553,36 +3557,36 @@
     while(root_child) {
         if(root_child->GetName() == wxT("gesmes:subject")) {
             if(root_child->GetNodeContent() != wxT("Reference rates")) {
-                mmShowErrorMessage(this, _("Incorrect XML data (#2)!"), _("Update Currency Rate"));
+                wxMessageBox(_("Incorrect XML data (#2)!"), _("Update Currency Rate"), wxICON_WARNING);
                 return;
             }
         } else if (root_child->GetName() == wxT("gesmes:Sender")) {
             wxXmlNode *sender_child = root_child->GetChildren();
 
             if(!sender_child) {
-                mmShowErrorMessage(this, _("Incorrect XML data (#3)!"), _("Update Currency Rate"));
+                wxMessageBox(_("Incorrect XML data (#3)!"), _("Update Currency Rate"), wxICON_WARNING);
                 return;
             }
 
             if(sender_child->GetName() != wxT("gesmes:name")) {
-                mmShowErrorMessage(this, _("Incorrect XML data (#4)!"), _("Update Currency Rate"));
+                wxMessageBox(_("Incorrect XML data (#4)!"), _("Update Currency Rate"), wxICON_WARNING);
                 return;
             }
 
             if(sender_child->GetNodeContent() != wxT("European Central Bank")) {
-                mmShowErrorMessage(this, _("Incorrect XML data (#5)!"), _("Update Currency Rate"));
+                wxMessageBox(_("Incorrect XML data (#5)!"), _("Update Currency Rate"), wxICON_WARNING);
                 return;
             }            
         } else if (root_child->GetName() == wxT("Cube")) {
             wxXmlNode *cube_lv1_child = root_child->GetChildren();
 
             if(!cube_lv1_child) {
-                mmShowErrorMessage(this, _("Incorrect XML data (#6)!"), _("Update Currency Rate"));
+                wxMessageBox(_("Incorrect XML data (#6)!"), _("Update Currency Rate"), wxICON_WARNING);
                 return;
             }
 
             if(cube_lv1_child->GetName() != wxT("Cube")) {
-                mmShowErrorMessage(this, _("Incorrect XML data (#7)!"), _("Update Currency Rate"));
+                wxMessageBox(_("Incorrect XML data (#7)!"), _("Update Currency Rate"), wxICON_WARNING);
                 return;
             }
 
@@ -3625,7 +3629,7 @@
     }
 
     if(base_rate == 0) {
-        mmShowErrorMessage(this, _("Could not find base currency symbol!"), _("Update Currency Rate"));
+        wxMessageBox(_("Could not find base currency symbol!"), _("Update Currency Rate"), wxICON_WARNING);
         return;
     }
 
@@ -3815,7 +3819,7 @@
 		homePanel->Layout();		
 	} else {
 		wxMessageBox(_("No investment accounts found. You can create one using the Accounts menu."),
-			     _("Investment Accounts"));
+                     _("Investment Accounts"));
 	}
 }
 //----------------------------------------------------------------------------
@@ -3845,7 +3849,7 @@
 {
     if (m_core->accountList_.accounts_.size() == 0)
     {
-        mmShowErrorMessage(0, _("No Account available!"), _("Error"));
+        wxMessageBox(_("No account available to edit!"), _("Accounts"), wxICON_WARNING);
         return;
     }
   
@@ -3873,7 +3877,6 @@
                 wxCommandEvent ev(wxEVT_COMMAND_MENU_SELECTED, MENU_ACCTLIST);
                 GetEventHandler()->AddPendingEvent(ev);
             }
-            
         }
     }
 }
@@ -3883,7 +3886,7 @@
 {
     if (m_core->accountList_.accounts_.size() == 0)
     {
-        mmShowErrorMessage(0, _("No Account available!"), _("Error"));
+        wxMessageBox(_("No account available to delete!"), _("Accounts"), wxICON_WARNING);
         return;
     }
 
@@ -3903,10 +3906,8 @@
         int acctID = arrAcctID[choice];
 
         wxString deletingAccountName = _("Are you sure you want to delete\n") + m_core->accountList_.accounts_[choice]->acctType_ +
-                                       _(" account: ") + m_core->accountList_.accounts_[choice]->accountName_ + _(" ?");
-        wxMessageDialog msgDlg(this, deletingAccountName,
-//          _("Do you really want to delete the account?")  
-            _("Confirm Account Deletion"),
+                                       _(" account: ") + m_core->accountList_.accounts_[choice]->accountName_ + wxT(" ?");
+        wxMessageDialog msgDlg(this, deletingAccountName, _("Confirm Account Deletion"),
             wxYES_NO | wxNO_DEFAULT | wxICON_EXCLAMATION);
         if (msgDlg.ShowModal() == wxID_YES)
         {
@@ -4000,9 +4001,10 @@
     relocateCategoryDialog* dlg = new relocateCategoryDialog(m_core.get(), m_db.get(), this);
     if (dlg->ShowModal() == wxID_OK)
     {
-        wxString msgStr = _("Category Relocation Completed.\n\n" );
-        msgStr << dlg->updatedCategoriesCount() << _(" records have been updated in the database.\n");
-        msgStr << _("\nMMEX must be shutdown and restarted for all the changes to be seen.");
+        wxString msgStr;
+        msgStr << _("Category Relocation Completed.") << wxT("\n\n")
+               << dlg->updatedCategoriesCount() << _(" records have been updated in the database.") << wxT("\n\n")
+               << _("MMEX must be shutdown and restarted for all the changes to be seen.");
         wxMessageBox(msgStr,_("Category Relocation Result"));
     }
 }
@@ -4013,9 +4015,10 @@
     relocatePayeeDialog* dlg = new relocatePayeeDialog(m_core.get(), m_db.get(), this);
     if (dlg->ShowModal() == wxID_OK)
     {
-        wxString msgStr = _("Payee Relocation Completed.\n\n" );
-        msgStr << dlg->updatedPayeesCount() << _(" records have been updated in the database.\n");
-        msgStr << _("\nMMEX must be shutdown and restarted for all the changes to be seen.");
+        wxString msgStr;
+        msgStr << _("Payee Relocation Completed.") << wxT("\n\n")
+               << dlg->updatedPayeesCount() << _(" records have been updated in the database.") << wxT("\n\n")
+               << _("MMEX must be shutdown and restarted for all the changes to be seen.");
         wxMessageBox(msgStr,_("Payee Relocation Result"));
     }
 }
@@ -4099,7 +4102,7 @@
 
         if (! custRepIndex_->currentReportFileName(false).IsEmpty())
         {
-            msg = wxString() << _("Do you want to delete the SQL file as well?\n"); 
+            msg = wxString() << _("Do you want to delete the SQL file as well?") << wxT("\n"); 
             if ( wxMessageBox(msg, custRepIndex_->UserDialogHeading(), wxYES_NO|wxNO_DEFAULT|wxICON_QUESTION) == wxYES)
             {
                 if (wxFileExists(custRepIndex_->currentReportFileName()))
@@ -4246,17 +4249,24 @@
     mainSizer->Add( new wxStaticText(this, wxID_ANY, _("Type of Account")), 0, wxALL, 5 );
     mainSizer->Add( itemChoiceType_, 0 /* No stretching*/, wxALL, 5 /* Border Size */);
 
-    mainSizer->Add( new wxStaticText(this, wxID_ANY,
-        _("\nSelect the type of account you want to create:\n\nGeneral bank accounts cover a wide variety of account\ntypes like Checking, Savings and Credit card type accounts.")), 0,
-        wxALL, 5);
+    wxString textMsg;
+    textMsg << wxT("\n") 
+            << _("Select the type of account you want to create:") << wxT("\n\n")
+            << _("General bank accounts cover a wide variety of account") << wxT("\n")
+            << _("types like Checking, Savings and Credit card type accounts.");
+    mainSizer->Add( new wxStaticText(this, wxID_ANY,textMsg), 0, wxALL, 5);
 
-    mainSizer->Add( new wxStaticText(this, wxID_ANY,
-        _("\nInvestment accounts are specialized accounts that only \nhave stock/mutual fund investments associated with them.\n")), 0,
-        wxALL, 5);
+    textMsg = wxT("\n");
+    textMsg << _("Investment accounts are specialized accounts that only") << wxT("\n")
+            << _("have stock/mutual fund investments associated with them.");
+    mainSizer->Add( new wxStaticText(this, wxID_ANY,textMsg), 0, wxALL, 5);
 
-    mainSizer->Add( new wxStaticText(this, wxID_ANY,
-        _("Term accounts are specialized bank accounts. Intended for asset\ntype accounts such as Term Deposits and Bonds. These accounts\ncan have regular money coming in and out, being outside the\ngeneral income stream.")), 0,
-        wxALL, 5);
+    textMsg = wxT("\n");
+    textMsg << _("Term accounts are specialized bank accounts. Intended for asset") << wxT("\n")
+            << _("type accounts such as Term Deposits and Bonds. These accounts") << wxT("\n")
+            << _("can have regular money coming in and out, being outside the") << wxT("\n")
+            << _("general income stream.");
+    mainSizer->Add( new wxStaticText(this, wxID_ANY,textMsg), 0, wxALL, 5);
 
     SetSizer(mainSizer);
     mainSizer->Fit(this);


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

Revision: 1389
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1389&view=rev
Author:   stef145g
Date:     2011-07-16 08:30:22 +0000 (Sat, 16 Jul 2011)

Log Message:
-----------
Changed format of backup file name to include extent. Backup file format: name.ext_yyyy-mm-dd.bak

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2011-07-15 22:10:12 UTC (rev 1388)
+++ trunk/mmex/src/mmex.cpp	2011-07-16 08:30:22 UTC (rev 1389)
@@ -2870,7 +2870,7 @@
         {
             wxFileName fn(fileName);
             wxString fileDate = wxT("_")+ wxDateTime().Today().FormatISODate();
-            wxString bkupName = fn.GetPath() + wxT("/") + fn.GetName() + fileDate + wxT(".bak");
+            wxString bkupName = fn.GetPath() + wxT("/") + fn.GetName() + wxT(".") + fn.GetExt() + fileDate + wxT(".bak");
             if (backupUpdate == wxT("FALSE"))
             {
                 if ( ! wxFileExists(bkupName) )


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

Revision: 1397
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1397&view=rev
Author:   stef145g
Date:     2011-07-25 02:53:18 +0000 (Mon, 25 Jul 2011)

Log Message:
-----------
Fix: Bugs-3340636: MMEX Hangs when switching DB (Mac only?) - Ensure displaying home page before shutting down database.

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2011-07-24 11:03:09 UTC (rev 1396)
+++ trunk/mmex/src/mmex.cpp	2011-07-25 02:53:18 UTC (rev 1397)
@@ -3044,6 +3044,10 @@
         fileName += wxT(".mmb");
     }
     
+    // Ensure database is in a steady state first
+    refreshRequested_ = true;
+    createHomePage();
+
     openFile(fileName, true);
 }
 //----------------------------------------------------------------------------
@@ -3057,7 +3061,12 @@
                                        this
                                       );
   
-    if (!fileName.empty()) {
+    if (!fileName.empty())
+    {
+        // Ensure database is in a steady state first
+        refreshRequested_ = true;
+        createHomePage();
+
         openFile(fileName, false);
     }
 }
@@ -3127,6 +3136,10 @@
         return;
     }
 
+    // Ensure database is in a steady state first
+    refreshRequested_ = true;
+    createHomePage();
+
     bool encrypt = dlg.GetFilterIndex() != 0; // emb -> Encrypted mMB
     wxFileName newFileName(dlg.GetPath());
     fixFileExt(newFileName, encrypt ? wxT("emb") : wxT("mmb"));


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

Revision: 1414
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1414&view=rev
Author:   stef145g
Date:     2011-07-31 01:36:32 +0000 (Sun, 31 Jul 2011)

Log Message:
-----------
Fix NavTree selection using Home button

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2011-07-30 19:17:26 UTC (rev 1413)
+++ trunk/mmex/src/mmex.cpp	2011-07-31 01:36:32 UTC (rev 1414)
@@ -3394,6 +3394,9 @@
 void mmGUIFrame::OnAccountList(wxCommandEvent& /*event*/)
 {
     createHomePage();
+    homePageAccountSelect_ = true;
+    navTreeCtrl_->SelectItem(navTreeCtrl_->GetRootItem());
+    homePageAccountSelect_ = false;
 }
 //----------------------------------------------------------------------------
 


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

Revision: 1428
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1428&view=rev
Author:   stef145g
Date:     2011-08-13 03:35:13 +0000 (Sat, 13 Aug 2011)

Log Message:
-----------
Bug Fix: Fix same Financial Year Check since months converted to numbers

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2011-08-12 11:46:43 UTC (rev 1427)
+++ trunk/mmex/src/mmex.cpp	2011-08-13 03:35:13 UTC (rev 1428)
@@ -1085,7 +1085,7 @@
 
 bool mmGUIFrame::financialYearIsDifferent()
 {
-    return (mmOptions::financialYearStartDayString_ != wxT("1") || mmOptions::financialYearStartMonthString_ != wxT("Jan"));
+    return (mmOptions::financialYearStartDayString_ != wxT("1") || mmOptions::financialYearStartMonthString_ != wxT("1"));
 }
 
 void mmGUIFrame::updateNavTreeControl(bool expandTermAccounts)


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

Revision: 1437
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1437&view=rev
Author:   stef145g
Date:     2011-08-19 13:46:18 +0000 (Fri, 19 Aug 2011)

Log Message:
-----------
Renamed Transaction Filter to Transaction Report Filter

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2011-08-19 13:39:26 UTC (rev 1436)
+++ trunk/mmex/src/mmex.cpp	2011-08-19 13:46:18 UTC (rev 1437)
@@ -2784,7 +2784,7 @@
     menuTools->AppendSeparator();
 
     wxMenuItem* menuItemTransactions = new wxMenuItem(menuTools, MENU_TRANSACTIONREPORT, 
-		_("&Transaction Filter..."), _("Transaction Filter"));
+		_("&Transaction Report Filter..."), _("Transaction Report Filter"));
 	menuItemTransactions->SetBitmap(wxBitmap(filter_xpm));
     menuTools->Append(menuItemTransactions);
 
@@ -2919,7 +2919,7 @@
     toolBar_->AddTool(MENU_ORGPAYEE, _("Organize Payees"), toolBarBitmaps[6], _("Show Organize Payees Dialog"));
     toolBar_->AddTool(MENU_CURRENCY, _("Organize Currency"), toolBarBitmaps[7], _("Show Organize Currency Dialog"));
 	toolBar_->AddSeparator();
-    toolBar_->AddTool(MENU_TRANSACTIONREPORT, _("Transaction Filter"), toolBarBitmaps[8], _("Transaction Filter"));
+    toolBar_->AddTool(MENU_TRANSACTIONREPORT, _("Transaction Report Filter"), toolBarBitmaps[8], _("Transaction Report Filter"));
 	toolBar_->AddSeparator();
     toolBar_->AddTool(MENU_CUSTOM_SQL_REPORT_NEW, _("Custom SQL Manager"), toolBarBitmaps[9], _("Create new Custom SQL Reports"));
     


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

Revision: 1465
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1465&view=rev
Author:   stef145g
Date:     2011-09-29 04:17:19 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
Fix Bug-3396004 Cash Flow - Specific Accounts, failure to display results

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2011-09-25 22:47:38 UTC (rev 1464)
+++ trunk/mmex/src/mmex.cpp	2011-09-29 04:17:19 UTC (rev 1465)
@@ -2238,13 +2238,15 @@
         else if (iData->getString() == wxT("Cash Flow - Specific Accounts"))
         {
             OnCashFlowSpecificAccounts();
-            navTreeCtrl_->Unselect(); // Deselect item in navTreeCtrl_, to enable re-selection
+            refreshRequested_ = true;    // Prevent home page being recreated when deselecting
+            navTreeCtrl_->UnselectAll(); // item in navTreeCtrl_ to enable re-selection.
         }
         else if (iData->getString() == wxT("Transaction Report"))
         {
-           wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TRANSACTIONREPORT);
-           AddPendingEvent(evt);
-           navTreeCtrl_->Unselect(); // Deselect item in navTreeCtrl_, to enable re-selection
+            wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TRANSACTIONREPORT);
+            AddPendingEvent(evt);
+            refreshRequested_ = true;    // Prevent home page being recreated when deselecting
+            navTreeCtrl_->UnselectAll(); // item in navTreeCtrl_ to enable re-selection.
         }
 //      Moved to act when using right mouse button instead.
 //      else if (iData->getString() == wxT("Budgeting"))

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

Revision: 1494
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1494&view=rev
Author:   vomikan
Date:     2011-10-22 08:25:06 +0000 (Sat, 22 Oct 2011)
Log Message:
-----------
Currency rate updater modified

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2011-10-18 10:11:43 UTC (rev 1493)
+++ trunk/mmex/src/mmex.cpp	2011-10-22 08:25:06 UTC (rev 1494)
@@ -3849,11 +3849,21 @@
     }
 
     // update currency rates
+    
+	wxString msg = _("Currency rate updated");
+	msg << wxT("\n\n");
+    for (int idx = 0; idx < (int)m_core->currencyList_.currencies_.size(); idx++) 
+    {
+        wxString currencySymbol  = m_core->currencyList_.currencies_[idx]->currencySymbol_;
+        
+        for(i=0; i<(int)currency_name.GetCount(); i++) 
+        {
+            if(currency_name[i] == currencySymbol) 
+            {
+                double rate = m_core->currencyList_.currencies_[idx]->baseConv_ ;
+                if (rate != rate_ptr[i])
+                msg << currencySymbol << wxT(" : ") << rate << wxT(" -> ") << rate_ptr[i] << wxT("\n");
 
-    for (int idx = 0; idx < (int)m_core->currencyList_.currencies_.size(); idx++) {
-        wxString currencySymbol  = m_core->currencyList_.currencies_[idx]->currencySymbol_;
-        for(i=0; i<(int)currency_name.GetCount(); i++) {
-            if(currency_name[i] == currencySymbol) {
                 m_core->currencyList_.currencies_[idx]->baseConv_ = rate_ptr[i];
                 m_core->currencyList_.updateCurrency(m_core->currencyList_.currencies_[idx]);
             }
@@ -3862,7 +3872,9 @@
 
     delete[] rate_ptr;
 
-    wxMessageDialog msgDlg(this, _("Currency rate updated"), _("Update Currency Rate"));
+    wxMessageDialog msgDlg(this, msg, _("Currency rate updated"));
+    
+    //fileviewer(wxT(""), this).ShowModal();
     msgDlg.ShowModal();
 
     createHomePage();

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

Revision: 1710
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1710&view=rev
Author:   stef145g
Date:     2012-01-29 08:16:28 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Options update: Set view menu items same as saved options.

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-01-29 06:42:00 UTC (rev 1709)
+++ trunk/mmex/src/mmex.cpp	2012-01-29 08:16:28 UTC (rev 1710)
@@ -3688,6 +3688,16 @@
         // enable or disable online update currency rate
         menuItemOnlineUpdateCurRate_->Enable(systemOptions.GetUpdateCurrencyRateSetting());
 
+        //set the View Menu Option items the same as the options saved.
+        menuBar_->FindItem(MENU_VIEW_BANKACCOUNTS)->Check(mmIniOptions::expandBankHome_);
+        menuBar_->FindItem(MENU_VIEW_TERMACCOUNTS)->Check(mmIniOptions::expandTermHome_);
+        menuBar_->FindItem(MENU_VIEW_STOCKACCOUNTS)->Check(mmIniOptions::expandStocksHome_);
+        menuBar_->FindItem(MENU_VIEW_BUDGET_FINANCIAL_YEARS)->Check(mmIniOptions::budgetFinancialYears_);
+        menuBar_->FindItem(MENU_VIEW_BUDGET_TRANSFER_TOTAL)->Check(mmIniOptions::budgetIncludeTransfers_);
+        menuBar_->FindItem(MENU_VIEW_BUDGET_SETUP_SUMMARY)->Check(mmIniOptions::budgetSetupWithoutSummaries_);
+        menuBar_->FindItem(MENU_VIEW_BUDGET_CATEGORY_SUMMARY)->Check(mmIniOptions::budgetSummaryWithoutCategories_);
+        menuBar_->FindItem(MENU_IGNORE_FUTURE_TRANSACTIONS)->Check(mmIniOptions::ignoreFutureTransactions_);
+
         int messageIcon = wxICON_INFORMATION;
         wxString sysMsg = wxString() << _("MMEX Options have been updated.") << wxT("\n\n");
         if (systemOptions.RequiresRestart())

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

Revision: 1729
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1729&view=rev
Author:   stef145g
Date:     2012-02-05 07:28:45 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
correct backup update when switching files

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-02-05 05:01:58 UTC (rev 1728)
+++ trunk/mmex/src/mmex.cpp	2012-02-05 07:28:45 UTC (rev 1729)
@@ -713,11 +713,10 @@
     }
 
     /// Update the database according to user requirements
-    wxString currentDatabaseName = mmDBWrapper::getLastDbPath(m_inidb.get());
-    wxString backupUpdate =  mmDBWrapper::getINISettingValue(m_inidb.get(), wxT("BACKUPDB_UPDATE"), wxT("FALSE"));
-    if ((backupUpdate == wxT("TRUE")) && mmOptions::databaseUpdated_)
+    if (mmOptions::databaseUpdated_ && 
+       (mmDBWrapper::getINISettingValue(m_inidb.get(), wxT("BACKUPDB_UPDATE"), wxT("FALSE")) == wxT("TRUE")))
     {
-        BackupDatabase(currentDatabaseName, true);
+        BackupDatabase(fileName_, true);
     }
 
     if (m_inidb) {
@@ -3139,6 +3138,14 @@
     {
         m_db->Close();
         m_db.reset();
+
+        /// Update the database according to user requirements
+        if (mmOptions::databaseUpdated_ && 
+           (mmDBWrapper::getINISettingValue(m_inidb.get(), wxT("BACKUPDB_UPDATE"), wxT("FALSE")) == wxT("TRUE")))
+        {
+            BackupDatabase(fileName_, true);
+            mmOptions::databaseUpdated_ = false;
+        }
     }
 
     wxFileName checkExt(fileName);
@@ -3160,8 +3167,7 @@
         && passwordCheckPassed)
     {
         /* Do a backup before opening */
-        wxString backupDBState = mmDBWrapper::getINISettingValue(m_inidb.get(), wxT("BACKUPDB"), wxT("FALSE"));
-        if (backupDBState == wxT("TRUE"))
+        if (mmDBWrapper::getINISettingValue(m_inidb.get(), wxT("BACKUPDB"), wxT("FALSE")) == wxT("TRUE"))
         {
             BackupDatabase(fileName);
         }

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

Revision: 1734
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1734&view=rev
Author:   guanlisheng
Date:     2012-02-05 10:49:15 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
cleanup

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-02-05 10:27:44 UTC (rev 1733)
+++ trunk/mmex/src/mmex.cpp	2012-02-05 10:49:15 UTC (rev 1734)
@@ -704,14 +704,9 @@
     /* Delete the GUI */
     cleanupHomePanel(false);
 
-    if (m_core) {
-        m_core.reset();
-    }
+    if (m_core)  m_core.reset();
+    if (m_db) m_db->Close();
 
-    if (m_db) {
-        m_db->Close();
-    }
-
     /// Update the database according to user requirements
     if (mmOptions::databaseUpdated_ && 
        (mmDBWrapper::getINISettingValue(m_inidb.get(), wxT("BACKUPDB_UPDATE"), wxT("FALSE")) == wxT("TRUE")))
@@ -719,9 +714,7 @@
         BackupDatabase(fileName_, true);
     }
 
-    if (m_inidb) {
-        m_inidb->Close();
-    }
+    if (m_inidb) m_inidb->Close();
 }
 //----------------------------------------------------------------------------
 // process all events waiting in the event queue if any.

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

Revision: 1745
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1745&view=rev
Author:   guanlisheng
Date:     2012-02-06 05:43:31 +0000 (Mon, 06 Feb 2012)
Log Message:
-----------
cleanup

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-02-06 02:53:22 UTC (rev 1744)
+++ trunk/mmex/src/mmex.cpp	2012-02-06 05:43:31 UTC (rev 1745)
@@ -454,8 +454,8 @@
 class mmTreeItemData : public wxTreeItemData
 {
 public:
-    mmTreeItemData(int id, bool isBudget);
-    mmTreeItemData(const wxString& string);
+    mmTreeItemData(int id, bool isBudget): id_(id), isString_(false), isBudgetingNode_(isBudget) {}
+    mmTreeItemData(const wxString& string): id_(), isString_(true), isBudgetingNode_(false), stringData_(string) {}
 
     int getData() const { return id_; }
     wxString getString() const { return stringData_; }
@@ -470,23 +470,6 @@
 };
 //----------------------------------------------------------------------------
 
-mmTreeItemData::mmTreeItemData(int id, bool isBudget) :
-    id_(id), 
-    isString_(false), 
-    isBudgetingNode_(isBudget) 
-{
-}
-//----------------------------------------------------------------------------
-
-mmTreeItemData::mmTreeItemData(const wxString& string) :
-    id_(), 
-    isString_(true), 
-    isBudgetingNode_(false),
-    stringData_(string)
-{
-}
-//----------------------------------------------------------------------------
-
 mmAddAccountWizard::mmAddAccountWizard(wxFrame *frame, mmCoreDB* core) :
     wxWizard(frame,wxID_ANY,_("Add Account Wizard"),
     wxBitmap(addacctwiz_xpm),wxDefaultPosition,

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

Revision: 1746
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1746&view=rev
Author:   guanlisheng
Date:     2012-02-06 05:47:38 +0000 (Mon, 06 Feb 2012)
Log Message:
-----------
cleanup

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-02-06 05:43:31 UTC (rev 1745)
+++ trunk/mmex/src/mmex.cpp	2012-02-06 05:47:38 UTC (rev 1746)
@@ -778,10 +778,7 @@
 //----------------------------------------------------------------------------
 void mmGUIFrame::setHomePageActive(bool active)
 {
-    if (active)
-        activeHomePage_ = true;
-    else
-        activeHomePage_ = false;
+    activeHomePage_ = active;
 }
 
 //----------------------------------------------------------------------------

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

Revision: 1781
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1781&view=rev
Author:   stef145g
Date:     2012-02-12 06:23:08 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
Update url on MMEX Start Page.

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-02-11 12:53:20 UTC (rev 1780)
+++ trunk/mmex/src/mmex.cpp	2012-02-12 06:23:08 UTC (rev 1781)
@@ -4127,8 +4127,8 @@
     }
     else if (rc == 3)
     {
-        wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_REPORTISSUES);
-        AddPendingEvent(evt);
+        wxString url = wxT("http://www.codelathe.com/mmex/index.php");
+        wxLaunchDefaultBrowser(url);
     }
     else if (rc == 4)
     {

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

Revision: 1783
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1783&view=rev
Author:   stef145g
Date:     2012-02-12 09:56:28 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
Update Version Check Information

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-02-12 07:02:51 UTC (rev 1782)
+++ trunk/mmex/src/mmex.cpp	2012-02-12 09:56:28 UTC (rev 1783)
@@ -66,6 +66,7 @@
 #include "customreportindex.h"
 #include "customreportdialog.h"
 #include "recentfiles.h"
+#include <boost/version.hpp>
 //----------------------------------------------------------------------------
 
 /* Include XPM Support */
@@ -3795,17 +3796,35 @@
     
     page = mySysToken.GetNextToken();                       // the system
     page = mySysToken.GetNextToken().Trim(false).Trim();    // the version  
+    
+    // Set up system information
+    wxString versionDetails = wxString()
+        << wxT("MMEX: ")     << mmex::getProgramVersion()       << wxT("\n")
+        << _("System: ")     << wxPlatformInfo::Get().GetOperatingSystemIdName() << wxT("\n\n")
+        << wxVERSION_STRING  << wxT("\n")
+        << wxT("Boost C++ ") << (BOOST_VERSION/100000)          << wxT('.') 
+                             << (BOOST_VERSION / 100 % 1000)    << wxT('.') 
+                             << (BOOST_VERSION % 100)           << wxT("\n")
+        << wxT("SQLite3: ")  << wxSQLite3Database::GetVersion() << wxT("\n")
+        << wxT("wxSQLite3: 3.0.0 by Ulrich Telle")              << wxT("\n\n");
 
+    int style = wxOK|wxCANCEL;
     if (IsUpdateAvailable(page))
     {
-        mmShowErrorMessage(this, _("New update available!"), _("Check Update"));
-        wxString url = wxT("http://www.codelathe.com/mmex");
-        wxLaunchDefaultBrowser(url);
-    }
+        versionDetails << _("New update available!");
+        style = wxICON_EXCLAMATION|style;
+    } 
     else
     {
-        mmShowErrorMessage(this, _("You have the latest version installed!"), _("Check Update"));
+        versionDetails << _("You have the latest version installed!");
+        style = wxICON_INFORMATION|style;
     }
+
+    versionDetails << wxT("\n\n") << _("Proceed to website: http://www.codelathe.com/mmex");
+    if (wxMessageBox(versionDetails, _("MMEX System Information Check"), style) == wxOK)
+    {
+        wxLaunchDefaultBrowser(wxT("http://www.codelathe.com/mmex"));
+    }
 }
 //----------------------------------------------------------------------------
 

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

Revision: 1784
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1784&view=rev
Author:   stef145g
Date:     2012-02-12 10:04:47 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
update

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-02-12 09:56:28 UTC (rev 1783)
+++ trunk/mmex/src/mmex.cpp	2012-02-12 10:04:47 UTC (rev 1784)
@@ -3820,10 +3820,11 @@
         style = wxICON_INFORMATION|style;
     }
 
-    versionDetails << wxT("\n\n") << _("Proceed to website: http://www.codelathe.com/mmex");
+    wxString urlString = wxT("http://www.codelathe.com/mmex");
+    versionDetails << wxT("\n\n") << _("Proceed to website: ") << urlString;
     if (wxMessageBox(versionDetails, _("MMEX System Information Check"), style) == wxOK)
     {
-        wxLaunchDefaultBrowser(wxT("http://www.codelathe.com/mmex"));
+        wxLaunchDefaultBrowser(urlString);
     }
 }
 //----------------------------------------------------------------------------

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

Revision: 1792
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1792&view=rev
Author:   guanlisheng
Date:     2012-02-14 09:16:18 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
typo

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-02-14 09:07:27 UTC (rev 1791)
+++ trunk/mmex/src/mmex.cpp	2012-02-14 09:16:18 UTC (rev 1792)
@@ -2905,7 +2905,7 @@
     menuTools->Append(menuItemPayee); 
 
     wxMenuItem* menuItemCurrency = new wxMenuItem(menuTools, MENU_CURRENCY, 
-        _("Or&ganize Currency..."), _("Organize Currency"));
+        _("Organize Currency..."), _("Organize Currency"));
     menuItemCurrency->SetBitmap(wxBitmap(money_dollar_xpm));
     menuTools->Append(menuItemCurrency);
 

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

Revision: 1859
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1859&view=rev
Author:   stef145g
Date:     2012-02-22 00:11:23 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
Fix: Home page selection after Transaction report and CashFlow Specific Account Report

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-02-21 14:57:46 UTC (rev 1858)
+++ trunk/mmex/src/mmex.cpp	2012-02-22 00:11:23 UTC (rev 1859)
@@ -884,7 +884,6 @@
                 {
                     if (activeHomePage_)
                     {
-                        refreshRequested_ = true;
                         createHomePage(); // Update home page details only if it is being displayed
                     }
                 }
@@ -925,7 +924,6 @@
 
             if (activeHomePage_)
             {
-                refreshRequested_ = true;
                 createHomePage(); // Update home page details only if it is being displayed
             }
         }
@@ -1711,11 +1709,7 @@
     {
         if (iData->getString() == wxT("Home Page"))
         {
-            if (!refreshRequested_)
-            {
-                refreshRequested_ = true;
-                createHomePage();
-            }
+            createHomePage();
             return;
         }
 
@@ -2321,23 +2315,16 @@
         }
         else if (iData->getString() == wxT("Cash Flow - Specific Accounts"))
         {
+            navTreeCtrl_->UnselectAll();    // item in navTreeCtrl_ to enable re-selection.
+            processPendingEvents();         // Clear event buffer before activating report.
             OnCashFlowSpecificAccounts();
-            refreshRequested_ = true;    // Prevent home page being recreated when deselecting
-            navTreeCtrl_->UnselectAll(); // item in navTreeCtrl_ to enable re-selection.
         }
         else if (iData->getString() == wxT("Transaction Report"))
         {
             wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TRANSACTIONREPORT);
-            AddPendingEvent(evt);
-            refreshRequested_ = true;    // Prevent home page being recreated when deselecting
-            navTreeCtrl_->UnselectAll(); // item in navTreeCtrl_ to enable re-selection.
+            AddPendingEvent(evt);           // Events will be processed in due course.
+            navTreeCtrl_->UnselectAll();    // item in navTreeCtrl_ to enable re-selection.
         }
-//      Moved to act when using right mouse button instead.
-//      else if (iData->getString() == wxT("Budgeting"))
-//      {
-//          wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_BUDGETSETUPDIALOG);
-//          AddPendingEvent(evt);
-//      }
         else if (iData->getString() == wxT("Bills & Deposits"))
         {
             wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_BILLSDEPOSITS);
@@ -3387,8 +3374,7 @@
     // Ensure database is in a steady state first
     if (!activeHomePage_)
     {
-        refreshRequested_ = true;
-        createHomePage();
+        createHomePage();   // Display Home page when not being displayed.
     }
 
     bool encrypt = dlg.GetFilterIndex() != 0; // emb -> Encrypted mMB

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

Revision: 1863
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1863&view=rev
Author:   guanlisheng
Date:     2012-02-23 13:07:54 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
format

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-02-23 12:52:44 UTC (rev 1862)
+++ trunk/mmex/src/mmex.cpp	2012-02-23 13:07:54 UTC (rev 1863)
@@ -1794,7 +1794,7 @@
             wxDateTime dtEnd = prevMonthEnd;
             wxDateTime dtBegin = prevMonthEnd.Subtract(wxDateSpan::Days(numDays));
             wxString title = _("Categories - Last Calendar Month");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(),false,dtBegin,dtEnd,title,0);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 0);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -1805,7 +1805,7 @@
             wxDateTime dtEnd = today;
             wxDateTime dtBegin = today.Subtract(wxDateSpan::Month());
             wxString title = _("Categories - Last 30 Days");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(),false,dtBegin,dtEnd,title,0);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 0);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -1816,7 +1816,7 @@
             wxDateTime dtBegin = prevMonthEnd;
             wxDateTime dtEnd = wxDateTime::Now();
             wxString title = _("Categories - Current Month");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(),false,dtBegin,dtEnd,title,0);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 0);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -1831,7 +1831,7 @@
             wxDateTime dtEnd = prevYearEnd;
             wxDateTime dtBegin = prevYearEnd.Subtract(wxDateSpan::Year());
             wxString title = _("Categories - Last Year");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(),false,dtBegin,dtEnd,title,0);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 0);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -1856,8 +1856,7 @@
             wxDateTime dtEnd = refDate;
             wxDateTime dtBegin = refDate.Subtract(wxDateSpan::Year());
             wxString title = _("Categories - Last Financial Year");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, 
-                title, 0);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 0);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -1866,8 +1865,7 @@
             wxDateTime dtBegin = wxDateTime(getUserDefinedFinancialYear(true));
             wxDateTime dtEnd   = wxDateTime::Now();
             wxString title = _("Categories - Current Financial Year");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, 
-                title, 0);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 0);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -1876,8 +1874,7 @@
             wxDateTime dtEnd =  wxDateTime::Now();
             wxDateTime dtBegin =  wxDateTime::Now();
             wxString title = _("Where the Money Comes From");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), true, dtBegin, dtEnd, 
-                title, 1);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), true, dtBegin, dtEnd, title, 1);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -1894,8 +1891,7 @@
             wxDateTime dtEnd = prevMonthEnd;
             wxDateTime dtBegin = prevMonthEnd.Subtract(wxDateSpan::Days(numDays));
             wxString title = _("Where the Money Comes From - Last Calendar Month");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, 
-                title, 1);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 1);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -1906,8 +1902,7 @@
             wxDateTime dtEnd = today;
             wxDateTime dtBegin = today.Subtract(wxDateSpan::Month());
             wxString title = _("Where the Money Comes From - Last 30 days");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd,
-                title, 1);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 1);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -1918,8 +1913,7 @@
             wxDateTime dtBegin = prevMonthEnd;
             wxDateTime dtEnd = wxDateTime::Now();
             wxString title = _("Where the Money Comes From - Current Month");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd,
-               title, 1);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 1);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -1934,7 +1928,7 @@
             wxDateTime dtEnd = prevYearEnd;
             wxDateTime dtBegin = prevYearEnd.Subtract(wxDateSpan::Year());
             wxString title = _("Where the Money Comes From - Last year");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(),false,dtBegin,dtEnd,title,1);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 1);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -1949,7 +1943,7 @@
             wxDateTime dtEnd = today;
             wxDateTime dtBegin = yearBegin;
             wxString title = _("Where the Money Comes From - Current Year");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(),false,dtBegin,dtEnd,title,1);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 1);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -1959,7 +1953,7 @@
             wxDateTime dtEnd = refDate;
             wxDateTime dtBegin = refDate.Subtract(wxDateSpan::Year());
             wxString title = _("Where the Money Comes From - Last Financial Year");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(),false,dtBegin,dtEnd,title,1);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 1);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -1969,7 +1963,7 @@
             wxDateTime dtBegin = wxDateTime(getUserDefinedFinancialYear(true));
 
             wxString title = _("Where the Money Comes From - Current Financial Year");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(),false,dtBegin,dtEnd,title,1);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 1);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -1978,7 +1972,7 @@
             wxDateTime dtEnd = wxDateTime::Now();
             wxDateTime dtBegin = wxDateTime::Now();
             wxString title = _("Where the Money Goes");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(),true,dtBegin,dtEnd,title,2);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), true, dtBegin, dtEnd, title, 2);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -1995,7 +1989,7 @@
             wxDateTime dtEnd = prevMonthEnd;
             wxDateTime dtBegin = prevMonthEnd.Subtract(wxDateSpan::Days(numDays));
             wxString title = _("Where the Money Goes - Last Calendar Month");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(),false,dtBegin,dtEnd,title,2);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 2);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -2006,7 +2000,7 @@
             wxDateTime dtEnd = today;
             wxDateTime dtBegin = today.Subtract(wxDateSpan::Month());
             wxString title = _("Where the Money Goes - Last 30 Days");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(),false,dtBegin,dtEnd,title, 2);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 2);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -2017,7 +2011,7 @@
             wxDateTime dtBegin = prevMonthEnd;
             wxDateTime dtEnd = wxDateTime::Now();
             wxString title = _("Where the Money Goes - Current Month");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(),false,dtBegin,dtEnd,title, 2);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 2);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -2032,7 +2026,7 @@
             wxDateTime dtEnd = prevYearEnd;
             wxDateTime dtBegin = prevYearEnd.Subtract(wxDateSpan::Year());
             wxString title = _("Where the Money Goes - Last Year");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(),false,dtBegin,dtEnd,title,2);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 2);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -2047,7 +2041,7 @@
             wxDateTime dtEnd = today;
             wxDateTime dtBegin = yearBegin;
             wxString title = _("Where the Money Goes - Current Year");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(),false,dtBegin,dtEnd,title,2);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 2);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -2057,7 +2051,7 @@
             wxDateTime dtEnd = refDate;
             wxDateTime dtBegin = refDate.Subtract(wxDateSpan::Year());
             wxString title = _("Where the Money Goes - Last Financial Year");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(),false,dtBegin,dtEnd,title,2);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 2);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -2066,7 +2060,7 @@
             wxDateTime dtEnd   = wxDateTime::Now();
             wxDateTime dtBegin = wxDateTime(getUserDefinedFinancialYear(true));
             wxString title = _("Where the Money Goes - Current Financial Year");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(),false,dtBegin,dtEnd,title,2);
+            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 2);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
@@ -2177,8 +2171,7 @@
         else if (iData->getString() == wxT("Payee Report"))
         {
             wxString title = _("Payee Report");
-            mmPrintableBase* rs = new mmReportPayeeExpenses(m_core.get(), true, wxDateTime::Now(),
-                wxDateTime::Now(), title);
+            mmPrintableBase* rs = new mmReportPayeeExpenses(m_core.get(), true, wxDateTime::Now(), wxDateTime::Now(), title);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }

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

Revision: 1870
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1870&view=rev
Author:   stef145g
Date:     2012-02-25 01:12:19 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
Deactivate web site menu item if not available in account.

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-02-24 21:39:46 UTC (rev 1869)
+++ trunk/mmex/src/mmex.cpp	2012-02-25 01:12:19 UTC (rev 1870)
@@ -2489,6 +2489,10 @@
                     }
                     menu.AppendSeparator();
                     menu.Append(MENU_TREEPOPUP_LAUNCHWEBSITE, _("&Launch Account Website"));
+                    // Enable menu item only if a website exists for the account.
+                    bool webStatus = !pAccount->website_.IsEmpty();
+                    menu.Enable(MENU_TREEPOPUP_LAUNCHWEBSITE, webStatus);
+
                     PopupMenu(&menu, pt);
                 }
             }

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

Revision: 1899
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1899&view=rev
Author:   vomikan
Date:     2012-02-28 14:06:11 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
cleanup

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-02-28 14:01:55 UTC (rev 1898)
+++ trunk/mmex/src/mmex.cpp	2012-02-28 14:06:11 UTC (rev 1899)
@@ -4604,14 +4604,12 @@
     wxWizardPageSimple(parent), 
     parent_(parent)
 {
-    wxString itemAcctTypeStrings[] =  
-    {
-        _("Checking/Savings"),      // ACCOUNT_TYPE_BANK 
-        _("Investment"),            // ACCOUNT_TYPE_STOCK
-        _("Term"),                  // ACCOUNT_TYPE_TERM
-    };
-    itemChoiceType_ = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 3, itemAcctTypeStrings, 0 );
-    itemChoiceType_->SetSelection(0); // Checking
+    wxArrayString itemAcctTypeStrings;   
+    itemAcctTypeStrings.Add(_("Checking/Savings"));      // ACCOUNT_TYPE_BANK 
+    itemAcctTypeStrings.Add(_("Investment"));            // ACCOUNT_TYPE_STOCK
+    itemAcctTypeStrings.Add(_("Term"));                  // ACCOUNT_TYPE_TERM
+
+    itemChoiceType_ = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, itemAcctTypeStrings);
     itemChoiceType_->SetToolTip(_("Specify the type of account to be created."));
 
     wxBoxSizer *mainSizer = new wxBoxSizer(wxVERTICAL);

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

Revision: 1901
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1901&view=rev
Author:   stef145g
Date:     2012-03-04 03:14:19 +0000 (Sun, 04 Mar 2012)
Log Message:
-----------
Updated Menu Option details

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-03-02 23:19:45 UTC (rev 1900)
+++ trunk/mmex/src/mmex.cpp	2012-03-04 03:14:19 UTC (rev 1901)
@@ -2507,7 +2507,7 @@
             //CSV Files //
             //QIF Files //
         //Import >       //
-            //Universal CSV Files //
+            //CSV Files //
             //QIF Files           //
         //Accounts Visible//
             //All      //
@@ -2527,12 +2527,12 @@
             if ( (iData->getString() != wxT("Term Accounts")) && (iData->getString() != wxT("Stocks")) )
             {
                 wxMenu *exportTo = new wxMenu;
-                exportTo->Append(MENU_TREEPOPUP_ACCOUNT_EXPORT2CSV, _("&CSV Files"));
-                exportTo->Append(MENU_TREEPOPUP_ACCOUNT_EXPORT2QIF, _("&QIF Files"));
+                exportTo->Append(MENU_TREEPOPUP_ACCOUNT_EXPORT2CSV, _("&CSV Files..."));
+                exportTo->Append(MENU_TREEPOPUP_ACCOUNT_EXPORT2QIF, _("&QIF Files..."));
                 menu->AppendSubMenu(exportTo,  _("&Export"));
                 wxMenu *importFrom = new wxMenu;
-                importFrom->Append(MENU_TREEPOPUP_ACCOUNT_IMPORTUNIVCSV, _("&Universal CSV Files"));
-                importFrom->Append(MENU_TREEPOPUP_ACCOUNT_IMPORTQIF, _("&QIF Files"));
+                importFrom->Append(MENU_TREEPOPUP_ACCOUNT_IMPORTUNIVCSV, _("&CSV Files..."));
+                importFrom->Append(MENU_TREEPOPUP_ACCOUNT_IMPORTQIF, _("&QIF Files..."));
                 menu->AppendSubMenu(importFrom,  _("&Import"));
                 menu->AppendSeparator();
             }
@@ -2720,14 +2720,14 @@
     menu_file->AppendSeparator();
 
     wxMenu* exportMenu = new wxMenu;
-    exportMenu->Append(MENU_EXPORT_CSV, _("&CSV Files"), _("Export to CSV"));
-    exportMenu->Append(MENU_EXPORT_QIF, _("&QIF Files"), _("Export to QIF"));
+    exportMenu->Append(MENU_EXPORT_CSV, _("&CSV Files..."), _("Export to CSV"));
+    exportMenu->Append(MENU_EXPORT_QIF, _("&QIF Files..."), _("Export to QIF"));
     exportMenu->Append(MENU_EXPORT_HTML, _("&Report to HTML"), _("Export to HTML"));
     menu_file->Append(MENU_EXPORT, _("&Export"), exportMenu);
 
     wxMenu* importMenu = new wxMenu;
-    importMenu->Append(MENU_IMPORT_UNIVCSV, _("&Universal CSV Files"), _("Import from any CSV file"));
-    importMenu->Append(MENU_IMPORT_QIF, _("&QIF Files"), _("Import from QIF"));
+    importMenu->Append(MENU_IMPORT_UNIVCSV, _("&CSV Files..."), _("Import from any CSV file"));
+    importMenu->Append(MENU_IMPORT_QIF, _("&QIF Files..."), _("Import from QIF"));
     menu_file->Append(MENU_IMPORT, _("&Import"), importMenu);
 
     menu_file->AppendSeparator();
@@ -2958,8 +2958,8 @@
 
     if (mmIniOptions::instance().enableReportIssues_)
     {
-       wxMenuItem* menuItemReportIssues = new wxMenuItem(menuTools, MENU_REPORTISSUES, 
-          _("&Report Issues or Feedback"), _("Send email through the mailing list to report issues with the software."));
+       wxMenuItem* menuItemReportIssues = new wxMenuItem(menuTools, MENU_REPORTISSUES,
+          _("Visit MMEX Forum or &Report New Issues."), _("Visit the MMEX forum. See existing user comments, or report new issues with the software."));
        menuItemReportIssues->SetBitmap(wxBitmap(issues_xpm));
        menuHelp->Append(menuItemReportIssues);
     }
@@ -2967,7 +2967,7 @@
     if (mmIniOptions::instance().enableBeNotifiedForNewReleases_)
     {
        wxMenuItem* menuItemNotify = new wxMenuItem(menuTools, MENU_ANNOUNCEMENTMAILING, 
-          _("Be &notified of new releases"), _("Sign up for the announcement mailing list"));
+          _("Register/View Release &Notifications."), _("Sign up to Notification Mailing List or View existing announcements."));
        menuItemNotify->SetBitmap(wxBitmap(notify_xpm));
        menuHelp->Append(menuItemNotify); 
     }

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

Revision: 1907
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1907&view=rev
Author:   guanlisheng
Date:     2012-03-05 03:20:23 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
format

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-03-04 09:37:48 UTC (rev 1906)
+++ trunk/mmex/src/mmex.cpp	2012-03-05 03:20:23 UTC (rev 1907)
@@ -1706,32 +1706,28 @@
             createHomePage();
             return;
         }
-
-        if (iData->getString() == NAVTREECTRL_HELP)
+        else if (iData->getString() == NAVTREECTRL_HELP)
         {
             helpFileIndex_ = mmex::HTML_INDEX;
             menuPrintingEnable(true);
             createHelpPage();
             return;
         }
-
-        if (iData->getString() == NAVTREECTRL_CUSTOM_REPORTS)
+        else if (iData->getString() == NAVTREECTRL_CUSTOM_REPORTS)
         {
             helpFileIndex_ = mmex::HTML_CUSTOM_SQL;
             menuPrintingEnable(true);
             createHelpPage();
             return;
         }
-
-        if (iData->getString() == NAVTREECTRL_INVESTMENT)
+        else if (iData->getString() == NAVTREECTRL_INVESTMENT)
         {
             helpFileIndex_ = mmex::HTML_INVESTMENT;
             menuPrintingEnable(true);
             createHelpPage();
             return;
         }
-
-        if (iData->getString() == NAVTREECTRL_BUDGET)
+        else if (iData->getString() == NAVTREECTRL_BUDGET)
         {
             helpFileIndex_ = mmex::HTML_BUDGET;
             menuPrintingEnable(true);

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

Revision: 1910
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1910&view=rev
Author:   guanlisheng
Date:     2012-03-05 05:28:18 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
format

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-03-05 05:20:32 UTC (rev 1909)
+++ trunk/mmex/src/mmex.cpp	2012-03-05 05:28:18 UTC (rev 1910)
@@ -1568,20 +1568,16 @@
     /* Because Windows generates 2 events when selecting the navTree, and Linux
        does not, we need to be able to control when the event is actually executed.
        This ensures that only one event activates the account for all systems. */
-    if (homePageAccountSelect_)
-    {
-        return;
-    }
+    if (homePageAccountSelect_) return;
 
     menuPrintingEnable(false);
     wxTreeItemId id = event.GetItem();
-    if (!id)
-        return;
+    if (!id) return;
+
     mmTreeItemData* iData = dynamic_cast<mmTreeItemData*>(navTreeCtrl_->GetItemData(id));
     selectedItemData_ = iData;
     
-    if (!iData)
-        return;
+    if (!iData) return;
 
     if (!iData->isStringData())
     {
@@ -1592,23 +1588,26 @@
             Freeze();
             wxTreeItemId idparent = navTreeCtrl_->GetItemParent(id);
             mmTreeItemData* iParentData = dynamic_cast<mmTreeItemData*>(navTreeCtrl_->GetItemData(idparent));
-            if (iParentData->getString() == wxT("Budget Performance")) {
+            if (iParentData->getString() == wxT("Budget Performance")) 
+            {
                 wxProgressDialog proDlg(_("Budget Performance"), reportWaitingMsg, 100, this);
                 mmPrintableBase* rs = new mmReportBudgetingPerformance(m_core.get(), this, data);
                 proDlg.Update(70);
                 menuPrintingEnable(true);
                 createReportsPage(rs);
                 proDlg.Update(95);
-
-            } else if (iParentData->getString() == wxT("Budget Setup Performance")) {
+            } 
+            else if (iParentData->getString() == wxT("Budget Setup Performance")) 
+            {
                 wxProgressDialog proDlg(_("Budget Category Summary"), reportWaitingMsg, 100, this);
                 mmPrintableBase* rs = new mmReportBudgetCategorySummary(m_core.get(), this, data);
                 proDlg.Update(70);
                 menuPrintingEnable(true);
                 createReportsPage(rs);
                 proDlg.Update(95);
-
-            } else {
+            } 
+            else 
+            {
                 wxProgressDialog proDlg(_("Budget Setup"), reportWaitingMsg, 100, this);
                 createBudgetingPage(data);
                 proDlg.Update(95);

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

Revision: 1911
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1911&view=rev
Author:   guanlisheng
Date:     2012-03-05 05:30:58 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
format

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-03-05 05:28:18 UTC (rev 1910)
+++ trunk/mmex/src/mmex.cpp	2012-03-05 05:30:58 UTC (rev 1911)
@@ -4712,16 +4712,10 @@
         createHomePage();
     }
 
-    if (progress)
-    {
-        progress->Update(40);
-    }
+    if (progress) progress->Update(40);
     openFile(dbFileName, newDatabase);
 
-    if (progress)
-    {
-        progress->Update(95);
-    }
+    if (progress) progress->Update(95);
     recentFiles_->updateRecentList(dbFileName);
 
     if (progress)

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

Revision: 1912
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1912&view=rev
Author:   guanlisheng
Date:     2012-03-05 05:32:35 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
format

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-03-05 05:30:58 UTC (rev 1911)
+++ trunk/mmex/src/mmex.cpp	2012-03-05 05:32:35 UTC (rev 1912)
@@ -432,13 +432,13 @@
 
 mmGUIApp::SQLiteInit::SQLiteInit()
 {
-        wxSQLite3Database::InitializeSQLite();
+    wxSQLite3Database::InitializeSQLite();
 }
 //----------------------------------------------------------------------------
 
 mmGUIApp::SQLiteInit::~SQLiteInit()
 {
-        wxSQLite3Database::ShutdownSQLite();
+    wxSQLite3Database::ShutdownSQLite();
 }
 //----------------------------------------------------------------------------
 

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

Revision: 1913
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1913&view=rev
Author:   guanlisheng
Date:     2012-03-05 05:44:07 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
format

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-03-05 05:32:35 UTC (rev 1912)
+++ trunk/mmex/src/mmex.cpp	2012-03-05 05:44:07 UTC (rev 1913)
@@ -3710,7 +3710,8 @@
     // we will get latest currency rate data from European Central Bank
     wxString site = wxT("http://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml");
 
-    if (!m_core) {
+    if (!m_core) 
+    {
        wxMessageBox(_("No database!"), _("Update Currency Rate"), wxICON_WARNING);
        return;
     }
@@ -3719,58 +3720,73 @@
 
     wxInputStream* in_stream = url.GetInputStream();
 
-    if (!in_stream) {
+    if (!in_stream) 
+    {
         wxMessageBox(_("Unable to connect!"), _("Update Currency Rate"), wxICON_WARNING);
         return;
     }
     
     wxXmlDocument doc;
 
-    if(!doc.Load(*in_stream)) {
+    if(!doc.Load(*in_stream)) 
+    {
         wxMessageBox(_("Cannot get data from WWW!"), _("Update Currency Rate"), wxICON_WARNING);
         return;
     }
 
     // decode received XML data
-    if(doc.GetRoot()->GetName() != wxT("gesmes:Envelope")) {
+    if(doc.GetRoot()->GetName() != wxT("gesmes:Envelope")) 
+    {
         wxMessageBox(_("Incorrect XML data (#1)!"), _("Update Currency Rate"), wxICON_WARNING);
         return;
     }
 
     wxXmlNode *root_child = doc.GetRoot()->GetChildren();
 
-    while(root_child) {
-        if(root_child->GetName() == wxT("gesmes:subject")) {
-            if(root_child->GetNodeContent() != wxT("Reference rates")) {
+    while(root_child) 
+    {
+        if(root_child->GetName() == wxT("gesmes:subject")) 
+        {
+            if(root_child->GetNodeContent() != wxT("Reference rates")) 
+            {
                 wxMessageBox(_("Incorrect XML data (#2)!"), _("Update Currency Rate"), wxICON_WARNING);
                 return;
             }
-        } else if (root_child->GetName() == wxT("gesmes:Sender")) {
+        } 
+        else if (root_child->GetName() == wxT("gesmes:Sender")) 
+        {
             wxXmlNode *sender_child = root_child->GetChildren();
 
-            if(!sender_child) {
+            if(!sender_child) 
+            {
                 wxMessageBox(_("Incorrect XML data (#3)!"), _("Update Currency Rate"), wxICON_WARNING);
                 return;
             }
 
-            if(sender_child->GetName() != wxT("gesmes:name")) {
+            if(sender_child->GetName() != wxT("gesmes:name")) 
+            {
                 wxMessageBox(_("Incorrect XML data (#4)!"), _("Update Currency Rate"), wxICON_WARNING);
                 return;
             }
 
-            if(sender_child->GetNodeContent() != wxT("European Central Bank")) {
+            if(sender_child->GetNodeContent() != wxT("European Central Bank")) 
+            {
                 wxMessageBox(_("Incorrect XML data (#5)!"), _("Update Currency Rate"), wxICON_WARNING);
                 return;
             }            
-        } else if (root_child->GetName() == wxT("Cube")) {
+        } 
+        else if (root_child->GetName() == wxT("Cube")) 
+        {
             wxXmlNode *cube_lv1_child = root_child->GetChildren();
 
-            if(!cube_lv1_child) {
+            if(!cube_lv1_child) 
+            {
                 wxMessageBox(_("Incorrect XML data (#6)!"), _("Update Currency Rate"), wxICON_WARNING);
                 return;
             }
 
-            if(cube_lv1_child->GetName() != wxT("Cube")) {
+            if(cube_lv1_child->GetName() != wxT("Cube")) 
+            {
                 wxMessageBox(_("Incorrect XML data (#7)!"), _("Update Currency Rate"), wxICON_WARNING);
                 return;
             }
@@ -3781,7 +3797,8 @@
             currency_name.Add(wxT("EUR"));
             currency_rate.Add(wxT("1.0"));
 
-            while(cube_lv2_child) {
+            while(cube_lv2_child) 
+            {
                 wxString name = cube_lv2_child->GetPropVal(wxT("currency"), wxGetEmptyString());
                 wxString rate = cube_lv2_child->GetPropVal(wxT("rate"), wxT("1"));
 
@@ -3801,19 +3818,21 @@
     wxString base_symbol = mmDBWrapper::getCurrencySymbol(m_core->db_.get(), currencyID);
     base_rate = 0;
 
-    for(i=0; i<(int)currency_rate.GetCount(); i++) {
-        if(currency_rate[i].ToDouble(&rate_value) == false) {
+    for(i=0; i<(int)currency_rate.GetCount(); i++) 
+    {
+        if(currency_rate[i].ToDouble(&rate_value) == false) 
+        {
             rate_ptr[i] = 1.0;
-        } else {
+        } else 
+        {
             rate_ptr[i] = rate_value;
-
-            if(currency_name[i] == base_symbol) {
+            if(currency_name[i] == base_symbol)
                 base_rate = rate_value;
-            }
         }
     }
 
-    if(base_rate == 0) {
+    if(base_rate == 0) 
+    {
         wxMessageBox(_("Could not find base currency symbol!"), _("Update Currency Rate"), wxICON_WARNING);
         return;
     }
@@ -3823,9 +3842,8 @@
     // currency Z / currency Y = Z / Y
     // Therefore, if currency X is EUR and currency Y is the base currency, 
     // currency Y : currency Z = base_rate / rate of Z : 1
-    for(i=0; i<(int)currency_rate.GetCount(); i++) {
+    for(i=0; i<(int)currency_rate.GetCount(); i++) 
         rate_ptr[i] = base_rate / rate_ptr[i];
-    }
 
     // update currency rates
     
@@ -3962,37 +3980,27 @@
 
 void mmGUIFrame::OnPrintPageReport(wxCommandEvent& WXUNUSED(event))
 {
-    if (!printer_)
-        return;
+    if (!printer_) return;
 
     mmReportsPanel* rp = dynamic_cast<mmReportsPanel*>(panelCurrent_);
     mmHelpPanel* hp = dynamic_cast<mmHelpPanel*>(panelCurrent_);
     if (rp)
-    {
         printer_ ->PrintText(rp->getReportText());
-    }
-     else if (hp)
-    {
+    else if (hp)
         printer_ ->PrintFile(mmex::getPathDoc((mmex::EDocFile)helpFileIndex_));
-    }
 }
 //----------------------------------------------------------------------------
 
 void mmGUIFrame::OnPrintPagePreview(wxCommandEvent& WXUNUSED(event))
 { 
-    if (!printer_)
-        return;
+    if (!printer_) return;
 
     mmReportsPanel* rp = dynamic_cast<mmReportsPanel*>(panelCurrent_);
     mmHelpPanel* hp = dynamic_cast<mmHelpPanel*>(panelCurrent_);
     if (rp)
-    {
         printer_ ->PreviewText(rp->getReportText());
-    }
     else if (hp)
-    {
         printer_ ->PreviewFile(mmex::getPathDoc((mmex::EDocFile)helpFileIndex_));
-    }
 }
 //----------------------------------------------------------------------------
 
@@ -4025,9 +4033,7 @@
     else if (rc == 4)
     {
         wxFileName fname(mmDBWrapper::getLastDbPath(m_inidb.get()));
-        if (fname.IsOk()) {
-            openFile(fname.GetFullPath(), false);
-        }
+        if (fname.IsOk()) openFile(fname.GetFullPath(), false);
     }
     else if (rc == -1)
     {
@@ -4090,9 +4096,7 @@
 void mmGUIFrame::OnGotoStocksAccount(wxCommandEvent& WXUNUSED(event))
 {
     if (gotoAccountID_ != -1)    
-    {
         createStocksAccountPage(gotoAccountID_);
-    }
 }
 
 //----------------------------------------------------------------------------
@@ -4113,9 +4117,7 @@
 void mmGUIFrame::OnGotoAccount(wxCommandEvent& WXUNUSED(event))
 {
     if (gotoAccountID_ != -1)    
-    {
         createCheckingAccountPage(gotoAccountID_);
-    }
 }
 
 //----------------------------------------------------------------------------
@@ -4246,7 +4248,7 @@
 
 void mmGUIFrame::OnViewToolbarUpdateUI(wxUpdateUIEvent &event)
 {
-    if(    m_mgr.GetPane(wxT("toolbar")).IsShown())
+    if(m_mgr.GetPane(wxT("toolbar")).IsShown())
         event.Check(true);
     else
         event.Check(false);
@@ -4255,7 +4257,7 @@
 
 void mmGUIFrame::OnViewLinksUpdateUI(wxUpdateUIEvent &event)
 {
-    if(    m_mgr.GetPane(wxT("Navigation")).IsShown())
+    if(m_mgr.GetPane(wxT("Navigation")).IsShown())
         event.Check(true);
     else
         event.Check(false);
@@ -4359,8 +4361,7 @@
     }
     wxEndBusyCursor();
 
-    if (dialogStatus == wxID_OK)
-        updateNavTreeControl();
+    if (dialogStatus == wxID_OK) updateNavTreeControl();
 
     dlg->Destroy();  
 }
@@ -4459,9 +4460,7 @@
     currencyID_ = parent_->m_core->currencyList_.getBaseCurrencySettings();
     wxString currName = _("Set Currency");
     if (currencyID_ != -1)
-    {
         currName = parent_->m_core->currencyList_.getCurrencySharedPtr(currencyID_)->currencyName_;
-    }
 
     itemButtonCurrency_ = new wxButton( this, ID_DIALOG_OPTIONS_BUTTON_CURRENCY, currName, wxDefaultPosition, wxSize(130,-1), 0 );
 

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

Revision: 1914
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1914&view=rev
Author:   guanlisheng
Date:     2012-03-05 05:48:12 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
format

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-03-05 05:44:07 UTC (rev 1913)
+++ trunk/mmex/src/mmex.cpp	2012-03-05 05:48:12 UTC (rev 1914)
@@ -3705,7 +3705,6 @@
 {
     wxArrayString   currency_name, currency_rate;
     double          *rate_ptr, rate_value, base_rate;
-    int             i;
     
     // we will get latest currency rate data from European Central Bank
     wxString site = wxT("http://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml");
@@ -3818,7 +3817,7 @@
     wxString base_symbol = mmDBWrapper::getCurrencySymbol(m_core->db_.get(), currencyID);
     base_rate = 0;
 
-    for(i=0; i<(int)currency_rate.GetCount(); i++) 
+    for(int i=0; i<(int)currency_rate.GetCount(); i++) 
     {
         if(currency_rate[i].ToDouble(&rate_value) == false) 
         {
@@ -3842,7 +3841,7 @@
     // currency Z / currency Y = Z / Y
     // Therefore, if currency X is EUR and currency Y is the base currency, 
     // currency Y : currency Z = base_rate / rate of Z : 1
-    for(i=0; i<(int)currency_rate.GetCount(); i++) 
+    for(int i=0; i<(int)currency_rate.GetCount(); i++) 
         rate_ptr[i] = base_rate / rate_ptr[i];
 
     // update currency rates
@@ -3853,7 +3852,7 @@
     {
         wxString currencySymbol  = m_core->currencyList_.currencies_[idx]->currencySymbol_;
         
-        for(i=0; i<(int)currency_name.GetCount(); i++) 
+        for(int i=0; i<(int)currency_name.GetCount(); i++) 
         {
             if(currency_name[i] == currencySymbol) 
             {

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

Revision: 1915
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1915&view=rev
Author:   guanlisheng
Date:     2012-03-05 05:57:55 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
format

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-03-05 05:48:12 UTC (rev 1914)
+++ trunk/mmex/src/mmex.cpp	2012-03-05 05:57:55 UTC (rev 1915)
@@ -2526,7 +2526,6 @@
 
     //Restore settings
     mmDBWrapper::setINISettingValue(m_inidb.get(), wxT("VIEWACCOUNTS"), vAccts);
-
 }
 //----------------------------------------------------------------------------
 
@@ -2543,7 +2542,6 @@
 
     //Restore settings
     mmDBWrapper::setINISettingValue(m_inidb.get(), wxT("VIEWACCOUNTS"), vAccts);
-
 }
 //----------------------------------------------------------------------------
 
@@ -2560,7 +2558,6 @@
 
     //Restore settings
     mmDBWrapper::setINISettingValue(m_inidb.get(), wxT("VIEWACCOUNTS"), vAccts);
-
 }
 
 //----------------------------------------------------------------------------
@@ -2988,10 +2985,7 @@
 
 void mmGUIFrame::createDataStore(const wxString& fileName, const wxString& pwd, bool openingNew)
 {
-    if (m_core)
-    {
-        m_core.reset();
-    }
+    if (m_core) m_core.reset();
 
     if (m_db)
     {
@@ -3132,9 +3126,12 @@
     m_topCategories.Clear();
     mmIniOptions::instance().loadInfoOptions(m_db.get());
 
-    if (m_db) {
+    if (m_db) 
+    {
         fileName_ = fileName;
-    } else {
+    } 
+    else 
+    {
         fileName_.Clear();
         password_.Clear();
     }
@@ -3151,7 +3148,8 @@
 {
     createDataStore(fileName, password, openingNew);
   
-    if (m_db) {
+    if (m_db) 
+    {
         menuEnableItems(true);
         menuPrintingEnable(false);
         autoRepeatTransactionsTimer_.Start(REPEAT_TRANS_DELAY_TIME, wxTIMER_ONE_SHOT); 
@@ -3159,7 +3157,8 @@
     
     updateNavTreeControl();
 
-    if (!refreshRequested_) {
+    if (!refreshRequested_) 
+    {
         refreshRequested_ = true;
         /* Currency Options might have changed so refresh */
         wxCommandEvent ev(wxEVT_COMMAND_MENU_SELECTED, MENU_ACCTLIST);
@@ -3181,15 +3180,13 @@
                      wxFD_SAVE | wxFD_OVERWRITE_PROMPT
                     );
 
-    if(dlg.ShowModal() != wxID_OK) {
-      return;
-    }
+    if(dlg.ShowModal() != wxID_OK) 
+        return;
 
     wxString fileName = dlg.GetPath();
     
-    if (!fileName.EndsWith(wxT(".mmb"))) {
+    if (!fileName.EndsWith(wxT(".mmb"))) 
         fileName += wxT(".mmb");
-    }
 
     SetDatabaseFile(fileName, true);
 }
@@ -3259,7 +3256,8 @@
 {
     wxASSERT(m_db);
 
-    if (fileName_.empty()) {
+    if (fileName_.empty()) 
+    {
         wxASSERT(false);
         return;
     }
@@ -3272,15 +3270,10 @@
                      wxFD_SAVE | wxFD_OVERWRITE_PROMPT
                     );
 
-    if (dlg.ShowModal() != wxID_OK) {
-        return;
-    }
+    if (dlg.ShowModal() != wxID_OK) return;
 
     // Ensure database is in a steady state first
-    if (!activeHomePage_)
-    {
-        createHomePage();   // Display Home page when not being displayed.
-    }
+    if (!activeHomePage_) createHomePage();   // Display Home page when not being displayed.
 
     bool encrypt = dlg.GetFilterIndex() != 0; // emb -> Encrypted mMB
     wxFileName newFileName(dlg.GetPath());
@@ -3288,25 +3281,27 @@
 
     wxFileName oldFileName(fileName_); // opened db's file
 
-    if (newFileName == oldFileName) { // on case-sensitive FS uses case-sensitive comparison
+    if (newFileName == oldFileName) // on case-sensitive FS uses case-sensitive comparison
+    {
         wxMessageDialog dlg(this, _("Can't copy file to itself"), _("Save database file as"), wxICON_WARNING);
         dlg.ShowModal();
         return;
     }
 
     // prepare to copy
-
     wxString new_password;
     bool rekey = encrypt ^ m_db->IsEncrypted();
 
     if (encrypt)
     {
-        if (rekey) {
+        if (rekey) 
+        {
             new_password = wxGetPasswordFromUser(_("Enter password for new database"));
-            if (new_password.empty()) {
+            if (new_password.empty()) 
                 return;
-            }
-        } else {
+        } 
+        else 
+        {
             new_password = password_;
         }
     }
@@ -3319,9 +3314,8 @@
       m_db.reset();
     }
 
-    if (!wxCopyFile(oldFileName.GetFullPath(), newFileName.GetFullPath(), true)) { // true -> overwrite if file exists
+    if (!wxCopyFile(oldFileName.GetFullPath(), newFileName.GetFullPath(), true))  // true -> overwrite if file exists
         return;
-    }
     
     if (rekey) // encrypt or reset encryption
     {
@@ -3344,7 +3338,7 @@
 
 void mmGUIFrame::OnExportToQIF(wxCommandEvent& /*event*/)
 {
-   mmExportQIF(m_core.get(), m_db.get());
+    mmExportQIF(m_core.get(), m_db.get());
 }
 //----------------------------------------------------------------------------
 
@@ -3448,7 +3442,8 @@
 
 void mmGUIFrame::OnBudgetSetupDialog(wxCommandEvent& /*event*/)
 {
-    if (m_db) {
+    if (m_db) 
+    {
         mmBudgetYearDialog(m_db.get(), this).ShowModal();
         createHomePage();
         updateNavTreeControl();    

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

Revision: 1916
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1916&view=rev
Author:   guanlisheng
Date:     2012-03-05 06:13:28 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
format & cleanup

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-03-05 05:57:55 UTC (rev 1915)
+++ trunk/mmex/src/mmex.cpp	2012-03-05 06:13:28 UTC (rev 1916)
@@ -1624,12 +1624,8 @@
               if ((acctType == ACCOUNT_TYPE_BANK) || acctType == ACCOUNT_TYPE_TERM)
               {
                  gotoAccountID_ = data;
-                 if (gotoAccountID_ != -1)    
-                 {
-                    createCheckingAccountPage(gotoAccountID_);
-                 }
+                 if (gotoAccountID_ != -1) createCheckingAccountPage(gotoAccountID_);
                  navTreeCtrl_->SetFocus();
-
               }
               else
               {
@@ -2095,9 +2091,7 @@
             
             wxDateTime today = wxDateTime::Now();
             int year = today.GetYear();
-            if (today.GetMonth() < dtBegin.GetMonth() ) {
-                year -- ;
-            }
+            if (today.GetMonth() < dtBegin.GetMonth()) year --;
             mmPrintableBase* rs = new mmReportIncExpensesOverFinancialPeriod(this, m_core.get(), year);
             menuPrintingEnable(true);
             createReportsPage(rs);
@@ -2282,17 +2276,9 @@
       if (pAccount)
       {
          wxString website = pAccount->website_;
-         if (!website.IsEmpty())
-         {
-            wxLaunchDefaultBrowser(website);  
-         }
+         if (!website.IsEmpty()) wxLaunchDefaultBrowser(website);  
          return;
       }
-      else
-      {
-         /* cannot find accountid */
-         wxASSERT(true);
-      }
    }
 }
 //----------------------------------------------------------------------------
@@ -2316,11 +2302,6 @@
                 }
            }
         }
-        else
-        {
-            /* cannot find accountid */
-            wxASSERT(true);
-        }
     }
 }
 //----------------------------------------------------------------------------
@@ -2344,11 +2325,6 @@
               }
            }
         }
-        else
-        {
-            /* cannot find accountid */
-            wxASSERT(true);
-        }
     }
 }
 //----------------------------------------------------------------------------
@@ -2378,11 +2354,6 @@
               }
            } 
         }
-        else
-        {
-            /* cannot find accountid */
-            wxASSERT(true);
-        }
     }
 }
 //----------------------------------------------------------------------------
@@ -2431,11 +2402,6 @@
                     PopupMenu(&menu, pt);
                 }
             }
-            else
-            {
-                /* cannot find accountid */
-                wxASSERT(true);
-            }
         }
     }
     else 
@@ -2965,9 +2931,7 @@
     toolBar_->AddTool(MENU_OPEN, _("Open"), toolBarBitmaps[1], _("Open Database"));
     toolBar_->AddSeparator();
     if (mmIniOptions::instance().enableAddAccount_)
-    {
-      toolBar_->AddTool(MENU_NEWACCT, _("New Account"), toolBarBitmaps[3], _("New Account"));
-    }
+        toolBar_->AddTool(MENU_NEWACCT, _("New Account"), toolBarBitmaps[3], _("New Account"));
     toolBar_->AddTool(MENU_ACCTLIST, _("Account List"), toolBarBitmaps[4], _("Show Account List"));
     toolBar_->AddSeparator();
     toolBar_->AddTool(MENU_ORGCATEGS, _("Organize Categories"), toolBarBitmaps[5], _("Show Organize Categories Dialog"));
@@ -3027,10 +2991,7 @@
 
         m_db = mmDBWrapper::Open(fileName, password);
         // if the database pointer has been reset, the password is possibly incorrect
-        if (!m_db)
-        {
-            return ;
-        }
+        if (!m_db) return;
 
         // we need to check the db whether it is the right version
         if (!mmDBWrapper::checkDBVersion(m_db.get()))
@@ -3203,9 +3164,7 @@
                                       );
   
     if (!fileName.empty())
-    {
         SetDatabaseFile(fileName);
-    }
 }
 //----------------------------------------------------------------------------
 
@@ -3405,8 +3364,11 @@
                        << _("This message will not be displayed in future.");
                 wxMessageBox(msgStr, _("Initial Term Account Activation"),wxICON_INFORMATION);
             }
-        } else
+        } 
+        else
+        {
             updateNavTreeControl(); 
+        }
      }
     
     if (!refreshRequested_)
@@ -3653,13 +3615,12 @@
     wxString mySys =  wxPlatformInfo::Get().GetOperatingSystemFamilyName();
 
     wxStringTokenizer mySysToken;
-    if (mySys == wxT("Windows")) {
+    if (mySys == wxT("Windows")) 
         mySysToken.SetString(winSys,wxT(":"));
-    } else if (mySys == wxT("Unix")) {
+    else if (mySys == wxT("Unix"))
         mySysToken.SetString(unixSys,wxT(":"));
-    } else if (mySys == wxT("Macintosh")) {
+    else if (mySys == wxT("Macintosh"))
         mySysToken.SetString(macSys,wxT(":"));
-    }
     
     page = mySysToken.GetNextToken();                       // the system
     page = mySysToken.GetNextToken().Trim(false).Trim();    // the version  
@@ -3690,9 +3651,7 @@
     wxString urlString = wxT("http://www.codelathe.com/mmex");
     versionDetails << wxT("\n\n") << _("Proceed to website: ") << urlString;
     if (wxMessageBox(versionDetails, _("MMEX System Information Check"), style) == wxOK)
-    {
         wxLaunchDefaultBrowser(urlString);
-    }
 }
 //----------------------------------------------------------------------------
 
@@ -4582,7 +4541,7 @@
     wxString acctTypeStr = ACCOUNT_TYPE_BANK;
     if (acctType == 1)
         acctTypeStr = ACCOUNT_TYPE_STOCK;
-    if (acctType == 2)
+    else if (acctType == 2)
         acctTypeStr = ACCOUNT_TYPE_TERM;
 
     int currencyID = parent_->m_core->currencyList_.getBaseCurrencySettings();

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

Revision: 1917
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1917&view=rev
Author:   guanlisheng
Date:     2012-03-05 06:15:28 +0000 (Mon, 05 Mar 2012)
Log Message:
-----------
format & cleanup

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-03-05 06:13:28 UTC (rev 1916)
+++ trunk/mmex/src/mmex.cpp	2012-03-05 06:15:28 UTC (rev 1917)
@@ -1481,8 +1481,7 @@
 
     wxDateTime today = wxDateTime::Now();
     int year = today.GetYear();
-    if (today.GetMonth() < monthNum) 
-        year -- ;
+    if (today.GetMonth() < monthNum) year -- ;
 
     long dayNum; 
     wxString dayNumStr = mmOptions::instance().financialYearStartDayString_;
@@ -2078,9 +2077,7 @@
 
             wxDateTime today = wxDateTime::Now();
             int year = today.GetYear()-1;
-            if (today.GetMonth() < dtBegin.GetMonth() ) {
-                year -- ;
-            }
+            if (today.GetMonth() < dtBegin.GetMonth()) year -- ;
             mmPrintableBase* rs = new mmReportIncExpensesOverFinancialPeriod(this, m_core.get(), year);
             menuPrintingEnable(true);
             createReportsPage(rs);

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

Revision: 1962
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1962&view=rev
Author:   guanlisheng
Date:     2012-03-08 14:47:59 +0000 (Thu, 08 Mar 2012)
Log Message:
-----------
stop warning

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-03-08 14:28:08 UTC (rev 1961)
+++ trunk/mmex/src/mmex.cpp	2012-03-08 14:47:59 UTC (rev 1962)
@@ -537,7 +537,10 @@
                       ) : 
     wxFrame(0, -1, title, pos, size), 
     gotoAccountID_(-1), 
+    homePageAccountSelect_(false),
     refreshRequested_(),
+    autoRepeatTransactionsTimer_(this, AUTO_REPEAT_TRANSACTIONS_TIMER_ID),
+    activeHomePage_(false),
     panelCurrent_(),
     homePanel(),
     navTreeCtrl_(),
@@ -545,14 +548,11 @@
     toolBar_(),
     selectedItemData_(),
     menuItemOnlineUpdateCurRate_(),
+    helpFileIndex_(mmex::HTML_INDEX),
     activeTermAccounts_(false),
-    autoRepeatTransactionsTimer_(this, AUTO_REPEAT_TRANSACTIONS_TIMER_ID),
-    activeHomePage_(false),
-    homePageAccountSelect_(false),
     expandedReportNavTree_(true),
-    expandedBudgetingNavTree_(true),
     expandedCustomSqlReportNavTree_(false),
-    helpFileIndex_(mmex::HTML_INDEX)
+    expandedBudgetingNavTree_(true)
 {
     // tell wxAuiManager to manage this frame
     m_mgr.SetManagedWindow(this);

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

Revision: 1971
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1971&view=rev
Author:   stef145g
Date:     2012-03-10 00:29:16 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
Update Mailing List URL. Fix message when no internet access for Check Update.

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-03-10 00:22:46 UTC (rev 1970)
+++ trunk/mmex/src/mmex.cpp	2012-03-10 00:29:16 UTC (rev 1971)
@@ -3547,6 +3547,18 @@
 
 void mmGUIFrame::OnCheckUpdate(wxCommandEvent& /*event*/)
 {
+    // Set up system information
+    wxString versionDetails = wxString()
+        << wxT("MMEX: ")     << mmex::getProgramVersion()       << wxT("\n")
+        << _("System: ")     << wxPlatformInfo::Get().GetOperatingSystemIdName() << wxT("\n\n")
+        << wxVERSION_STRING  << wxT("\n")
+        << wxT("Boost C++ ") << (BOOST_VERSION/100000)          << wxT('.') 
+                             << (BOOST_VERSION / 100 % 1000)    << wxT('.') 
+                             << (BOOST_VERSION % 100)           << wxT("\n")
+        << wxT("SQLite3: ")  << wxSQLite3Database::GetVersion() << wxT("\n")
+        << wxT("wxSQLite3: 3.0.0 by Ulrich Telle")              << wxT("\n\n");
+
+    // Access current version details page
     wxString site = wxT("http://www.codelathe.com/mmex/version.html");
     wxURL url(site);
 
@@ -3554,7 +3566,8 @@
     boost::scoped_ptr<wxInputStream> in_stream(url.GetInputStream());
     if (!in_stream)
     {
-        mmShowErrorMessage(this, _("Unable to connect!"), _("Check Update"));
+        versionDetails << _("Unable to connect!");
+        wxMessageBox(versionDetails, _("MMEX System Information Check"));
         return;
     }
     in_stream->Read(buf, 1024);
@@ -3588,17 +3601,7 @@
     page = mySysToken.GetNextToken();                       // the system
     page = mySysToken.GetNextToken().Trim(false).Trim();    // the version  
     
-    // Set up system information
-    wxString versionDetails = wxString()
-        << wxT("MMEX: ")     << mmex::getProgramVersion()       << wxT("\n")
-        << _("System: ")     << wxPlatformInfo::Get().GetOperatingSystemIdName() << wxT("\n\n")
-        << wxVERSION_STRING  << wxT("\n")
-        << wxT("Boost C++ ") << (BOOST_VERSION/100000)          << wxT('.') 
-                             << (BOOST_VERSION / 100 % 1000)    << wxT('.') 
-                             << (BOOST_VERSION % 100)           << wxT("\n")
-        << wxT("SQLite3: ")  << wxSQLite3Database::GetVersion() << wxT("\n")
-        << wxT("wxSQLite3: 3.0.0 by Ulrich Telle")              << wxT("\n\n");
-
+    // set up display information.
     int style = wxOK|wxCANCEL;
     if (IsUpdateAvailable(page))
     {
@@ -3804,7 +3807,10 @@
 
 void mmGUIFrame::OnBeNotified(wxCommandEvent& /*event*/)
 {
-    wxString url = wxT("http://groups.google.com/group/mmlist");
+    // New site location
+    //  wxString url = wxT("http://groups.google.com/group/mmlist");
+    wxString url = wxT("https://groups.google.com/forum/?fromgroups#!forum/mmlist");
+
     wxLaunchDefaultBrowser(url);
 }
 //----------------------------------------------------------------------------

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

Revision: 1975
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1975&view=rev
Author:   stef145g
Date:     2012-03-10 02:55:00 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
Add Progress bar to Category report

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-03-10 02:51:57 UTC (rev 1974)
+++ trunk/mmex/src/mmex.cpp	2012-03-10 02:55:00 UTC (rev 1975)
@@ -1678,9 +1678,12 @@
         }
         else if (iData->getString() == wxT("Categories - Over Time"))
         {
+            wxProgressDialog proDlg(_("Category Report"), _("Category Report being generated... Please wait."), 100, this);
             mmPrintableBase* rs = new mmReportCategoryOverTimePerformance(m_core.get());
+            proDlg.Update(70);
             menuPrintingEnable(true);
             createReportsPage(rs);
+            proDlg.Update(95);
         }
         else if (iData->getString() == wxT("Categories - Month"))
         {

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

Revision: 2027
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2027&view=rev
Author:   stef145g
Date:     2012-03-17 20:58:08 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
Updated reports to display Current month and Current Month to Date

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-03-17 20:42:23 UTC (rev 2026)
+++ trunk/mmex/src/mmex.cpp	2012-03-17 20:58:08 UTC (rev 2027)
@@ -1143,7 +1143,10 @@
     wxTreeItemId categsOverTimeCalMonth = navTreeCtrl_->AppendItem(categsOverTime, _("Last Calendar Month"), 4, 4);
     navTreeCtrl_->SetItemData(categsOverTimeCalMonth, new mmTreeItemData(wxT("Where the Money Goes - Month")));
 
-    wxTreeItemId categsOverTimeCurrentMonth = navTreeCtrl_->AppendItem(categsOverTime, _("Current Month"), 4, 4);
+    wxString currentMonthMsg = _("Current Month");
+    if (mmIniOptions::instance().ignoreFutureTransactions_) currentMonthMsg = _("Current Month to Date");
+
+    wxTreeItemId categsOverTimeCurrentMonth = navTreeCtrl_->AppendItem(categsOverTime, currentMonthMsg, 4, 4);
     navTreeCtrl_->SetItemData(categsOverTimeCurrentMonth, new mmTreeItemData(wxT("Where the Money Goes - Current Month")));
 
     wxTreeItemId categsOverTimeLast30 = navTreeCtrl_->AppendItem(categsOverTime, _("Last 30 Days"), 4, 4);
@@ -1171,7 +1174,7 @@
     wxTreeItemId posCategsCalMonth = navTreeCtrl_->AppendItem(posCategs, _("Last Calendar Month"), 4, 4);
     navTreeCtrl_->SetItemData(posCategsCalMonth, new mmTreeItemData(wxT("Where the Money Comes From - Month")));
 
-    wxTreeItemId posCategsCurrentMonth = navTreeCtrl_->AppendItem(posCategs, _("Current Month"), 4, 4);
+    wxTreeItemId posCategsCurrentMonth = navTreeCtrl_->AppendItem(posCategs, currentMonthMsg, 4, 4);
     navTreeCtrl_->SetItemData(posCategsCurrentMonth, new mmTreeItemData(wxT("Where the Money Comes From - Current Month")));
 
     wxTreeItemId posCategsTimeLast30 = navTreeCtrl_->AppendItem(posCategs, _("Last 30 Days"), 4, 4);
@@ -1199,7 +1202,7 @@
     wxTreeItemId categsCalMonth = navTreeCtrl_->AppendItem(categs, _("Last Calendar Month"), 4, 4);
     navTreeCtrl_->SetItemData(categsCalMonth, new mmTreeItemData(wxT("Categories - Month")));
 
-    wxTreeItemId categsCurrentMonth = navTreeCtrl_->AppendItem(categs, _("Current Month"), 4, 4);
+    wxTreeItemId categsCurrentMonth = navTreeCtrl_->AppendItem(categs, currentMonthMsg, 4, 4);
     navTreeCtrl_->SetItemData(categsCurrentMonth, new mmTreeItemData(wxT("Categories - Current Month")));
 
     wxTreeItemId categsTimeLast30 = navTreeCtrl_->AppendItem(categs, _("Last 30 Days"), 4, 4);
@@ -1227,7 +1230,7 @@
     wxTreeItemId payeesOverTimeCalMonth = navTreeCtrl_->AppendItem(payeesOverTime, _("Last Calendar Month"), 4, 4);
     navTreeCtrl_->SetItemData(payeesOverTimeCalMonth, new mmTreeItemData(wxT("Payee Report - Month")));
 
-    wxTreeItemId payeesOverTimeCurrentMonth = navTreeCtrl_->AppendItem(payeesOverTime, _("Current Month"), 4, 4);
+    wxTreeItemId payeesOverTimeCurrentMonth = navTreeCtrl_->AppendItem(payeesOverTime, currentMonthMsg, 4, 4);
     navTreeCtrl_->SetItemData(payeesOverTimeCurrentMonth, new mmTreeItemData(wxT("Payee Report - Current Month")));
 
     wxTreeItemId payeesOverTimeLast30 = navTreeCtrl_->AppendItem(payeesOverTime, _("Last 30 Days"), 4, 4);
@@ -1255,7 +1258,7 @@
     wxTreeItemId incexpOverTimeCalMonth = navTreeCtrl_->AppendItem(incexpOverTime, _("Last Calendar Month"), 4, 4);
     navTreeCtrl_->SetItemData(incexpOverTimeCalMonth, new mmTreeItemData(wxT("Income vs Expenses - Month")));
 
-    wxTreeItemId incexpOverTimeCurrentMonth = navTreeCtrl_->AppendItem(incexpOverTime, _("Current Month"), 4, 4);
+    wxTreeItemId incexpOverTimeCurrentMonth = navTreeCtrl_->AppendItem(incexpOverTime, currentMonthMsg, 4, 4);
     navTreeCtrl_->SetItemData(incexpOverTimeCurrentMonth, new mmTreeItemData(wxT("Income vs Expenses - Current Month")));
 
     wxTreeItemId incexpOverTimeLast30 = navTreeCtrl_->AppendItem(incexpOverTime, _("Last 30 Days"), 4, 4);
@@ -1719,8 +1722,13 @@
             wxDateTime today = wxDateTime::Now();
             wxDateTime prevMonthEnd = today.Subtract(wxDateSpan::Days(today.GetDay()));
             wxDateTime dtBegin = prevMonthEnd;
-            wxDateTime dtEnd = wxDateTime::Now();
+            wxDateTime dtEnd = wxDateTime::Now().GetLastMonthDay();
             wxString title = _("Categories - Current Month");
+            if (mmIniOptions::instance().ignoreFutureTransactions_)
+            {
+                title = _("Categories - Current Month to Date");
+                dtEnd = wxDateTime::Now();
+            }
             mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 0);
             menuPrintingEnable(true);
             createReportsPage(rs);
@@ -1816,8 +1824,13 @@
             wxDateTime today = wxDateTime::Now();
             wxDateTime prevMonthEnd = today.Subtract(wxDateSpan::Days(today.GetDay()));
             wxDateTime dtBegin = prevMonthEnd;
-            wxDateTime dtEnd = wxDateTime::Now();
+            wxDateTime dtEnd = wxDateTime::Now().GetLastMonthDay();
             wxString title = _("Where the Money Comes From - Current Month");
+            if (mmIniOptions::instance().ignoreFutureTransactions_)
+            {
+                title = _("Where the Money Comes From - Current Month to Date");
+                dtEnd  = wxDateTime::Now();
+            }
             mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 1);
             menuPrintingEnable(true);
             createReportsPage(rs);
@@ -1914,8 +1927,13 @@
             wxDateTime today = wxDateTime::Now();
             wxDateTime prevMonthEnd = today.Subtract(wxDateSpan::Days(today.GetDay()));
             wxDateTime dtBegin = prevMonthEnd;
-            wxDateTime dtEnd = wxDateTime::Now();
+            wxDateTime dtEnd = wxDateTime::Now().GetLastMonthDay();
             wxString title = _("Where the Money Goes - Current Month");
+            if (mmIniOptions::instance().ignoreFutureTransactions_)
+            {
+                title = _("Where the Money Goes - Current Month to Date");
+                dtEnd  = wxDateTime::Now();
+            }
             mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 2);
             menuPrintingEnable(true);
             createReportsPage(rs);
@@ -2018,8 +2036,13 @@
             wxDateTime today = wxDateTime::Now();
             wxDateTime prevMonthEnd = today.Subtract(wxDateSpan::Days(today.GetDay()));
             wxDateTime dtBegin = prevMonthEnd;
-            wxDateTime dtEnd = wxDateTime::Now();
+            wxDateTime dtEnd = wxDateTime::Now().GetLastMonthDay();
             wxString title = _("Income vs Expenses - Current Month");
+            if (mmIniOptions::instance().ignoreFutureTransactions_)
+            {
+                title = _("Income vs Expenses - Current Month to Date");
+                dtEnd  = wxDateTime::Now();
+            }
             mmPrintableBase* rs = new mmReportIncomeExpenses(m_core.get(), false, dtBegin, dtEnd, title);
             menuPrintingEnable(true);
             createReportsPage(rs);
@@ -2113,10 +2136,15 @@
             wxDateTime today = wxDateTime::Now();
             wxDateTime prevMonthEnd = today.Subtract(wxDateSpan::Days(today.GetDay()));
             wxDateTime dtBegin = prevMonthEnd;
-            wxDateTime dtEnd = wxDateTime::Now();
+            wxDateTime dtEnd = wxDateTime::Now().GetLastMonthDay();
             dtBegin.Add(wxDateSpan::Day());
 
             wxString title = _("Payees - Current Month");
+            if (mmIniOptions::instance().ignoreFutureTransactions_)
+            {
+                title = _("Payees - Current Month to Date");
+                dtEnd  = wxDateTime::Now();
+            }
             mmPrintableBase* rs = new mmReportPayeeExpenses(m_core.get(), false, dtBegin, dtEnd, title);
             menuPrintingEnable(true);
             createReportsPage(rs);

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

Revision: 2073
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2073&view=rev
Author:   stef145g
Date:     2012-03-23 11:53:00 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
Fix: Solution to "The MMEX window disappears from view..." http://www.codelathe.com/forum/viewtopic.php?f=5&t=1627

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-03-22 14:47:07 UTC (rev 2072)
+++ trunk/mmex/src/mmex.cpp	2012-03-23 11:53:00 UTC (rev 2073)
@@ -902,6 +902,9 @@
     m_perspective = m_mgr.SavePerspective();
     mmDBWrapper::setINISettingValue(m_inidb.get(), wxT("AUIPERSPECTIVE"), m_perspective);
 
+    // prevent values being saved while window is in an iconised state.
+    if (this->IsIconized()) this->Restore();
+
     int valx = 0;
     int valy = 0;
     int valw = 0;

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

Revision: 2075
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2075&view=rev
Author:   vomikan
Date:     2012-03-23 12:10:37 +0000 (Fri, 23 Mar 2012)
Log Message:
-----------
Visit web site for more information function moved.

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-03-23 12:08:02 UTC (rev 2074)
+++ trunk/mmex/src/mmex.cpp	2012-03-23 12:10:37 UTC (rev 2075)
@@ -3983,8 +3983,8 @@
     }
     else if (rc == 3)
     {
-        wxString url = wxT("http://www.codelathe.com/mmex/index.php");
-        wxLaunchDefaultBrowser(url);
+        //wxString url = wxT("http://www.codelathe.com/mmex/index.php");
+        //wxLaunchDefaultBrowser(url);
     }
     else if (rc == 4)
     {

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

Revision: 2172
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2172&view=rev
Author:   vomikan
Date:     2012-04-14 18:19:51 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
cleanup

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-04-14 10:54:05 UTC (rev 2171)
+++ trunk/mmex/src/mmex.cpp	2012-04-14 18:19:51 UTC (rev 2172)
@@ -115,7 +115,7 @@
 #include "../resources/money_dollar.xpm"
 #include "../resources/user_edit.xpm"
 #include "../resources/wrench.xpm"
-// 
+//
 #include "../resources/customsql.xpm"
 #include "../resources/termaccount.xpm"
 #include "../resources/savings_acc_closed.xpm"
@@ -243,7 +243,7 @@
     app.getLocale().Init(wxLANGUAGE_ENGLISH);
 
     /* Initialize Image Handlers */
-    wxImage::AddHandler(new wxICOHandler()); 
+    wxImage::AddHandler(new wxICOHandler());
     wxImage::AddHandler(new wxJPEGHandler());
     wxImage::AddHandler(new wxPNGHandler());
 
@@ -251,7 +251,7 @@
     wxSQLite3Database inidb;
 
     inidb.Open(mmex::getPathUser(mmex::SETTINGS));
-    
+
     mmDBWrapper::verifyINIDB(&inidb);
 
     /* Load Colors from Database */
@@ -269,13 +269,13 @@
     wxString originY = wxT("50");
     wxString sizeW = wxT("800");
     wxString sizeH = wxT("600");
-    wxString valxStr = mmDBWrapper::getINISettingValue(&inidb, wxT("ORIGINX"), originX); 
+    wxString valxStr = mmDBWrapper::getINISettingValue(&inidb, wxT("ORIGINX"), originX);
     wxString valyStr = mmDBWrapper::getINISettingValue(&inidb, wxT("ORIGINY"), originY);
     wxString valWStr = mmDBWrapper::getINISettingValue(&inidb, wxT("SIZEW"),  sizeW);
     wxString valHStr = mmDBWrapper::getINISettingValue(&inidb, wxT("SIZEH"),  sizeH);
 
     long valx = 0;
-    long valy = 0; 
+    long valy = 0;
     long valw = 0;
     long valh = 0;
 
@@ -362,7 +362,7 @@
     EVT_MENU(MENU_VIEW_STOCKACCOUNTS, mmGUIFrame::OnViewStockAccounts)
     EVT_MENU(MENU_CATEGORY_RELOCATION, mmGUIFrame::OnCategoryRelocation)
     EVT_MENU(MENU_PAYEE_RELOCATION, mmGUIFrame::OnPayeeRelocation)
-    
+
     // Added for easier ability to test new feature.
     // May be taken out in future after being added to Options Dialog.
     EVT_MENU(MENU_IGNORE_FUTURE_TRANSACTIONS, mmGUIFrame::OnIgnoreFutureTransactions)
@@ -401,10 +401,10 @@
     EVT_MENU(MENU_CUSTOM_SQL_REPORT_DELETE, mmGUIFrame::OnDeleteCustomSqlReport)
     EVT_MENU(MENU_TREEPOPUP_CUSTOM_SQL_REPORT_EDIT, mmGUIFrame::OnPopupEditCustomSqlReport)
     EVT_MENU(MENU_TREEPOPUP_CUSTOM_SQL_REPORT_DELETE, mmGUIFrame::OnPopupDeleteCustomSqlReport)
-    
+
     /*Automatic processing of repeat transactions*/
     EVT_TIMER(AUTO_REPEAT_TRANSACTIONS_TIMER_ID, mmGUIFrame::OnAutoRepeatTransactionsTimer)
-    
+
     /* Recent Files */
     EVT_MENU(MENU_RECENT_FILES_1, mmGUIFrame::OnRecentFiles_1)
     EVT_MENU(MENU_RECENT_FILES_2, mmGUIFrame::OnRecentFiles_2)
@@ -478,11 +478,11 @@
                    wxDEFAULT_DIALOG_STYLE), m_core(core)
 {
 /****************** Message to be displayed******************
-    
+
     The next pages will help you create a new database.
 
     Your database file is stored with an extension of .mmb.
-    
+
     As this file contains important financial information,
     we recommended creating daily backups with the Options
     setting: 'Backup before opening', and store your backups
@@ -531,12 +531,12 @@
 }
 //----------------------------------------------------------------------------
 
-mmGUIFrame::mmGUIFrame(const wxString& title, 
-                       const wxPoint& pos, 
+mmGUIFrame::mmGUIFrame(const wxString& title,
+                       const wxPoint& pos,
                        const wxSize& size
-                      ) : 
-    wxFrame(0, -1, title, pos, size), 
-    gotoAccountID_(-1), 
+                      ) :
+    wxFrame(0, -1, title, pos, size),
+    gotoAccountID_(-1),
     homePageAccountSelect_(false),
     refreshRequested_(),
     autoRepeatTransactionsTimer_(this, AUTO_REPEAT_TRANSACTIONS_TIMER_ID),
@@ -587,8 +587,8 @@
 
     // Save default perspective
     m_perspective = m_mgr.SavePerspective();
-    
-    wxString auiPerspective = mmDBWrapper::getINISettingValue(m_inidb.get(), 
+
+    wxString auiPerspective = mmDBWrapper::getINISettingValue(m_inidb.get(),
         wxT("AUIPERSPECTIVE"), m_perspective);
 
     m_mgr.LoadPerspective(auiPerspective);
@@ -598,12 +598,12 @@
 
     // enable or disable online update currency rate
     wxString enableCurrencyUpd = mmDBWrapper::getINISettingValue(m_inidb.get(), INIDB_UPDATE_CURRENCY_RATE, wxT("FALSE"));
-    if(enableCurrencyUpd == wxT("TRUE")) 
+    if(enableCurrencyUpd == wxT("TRUE"))
     {
         if (menuItemOnlineUpdateCurRate_)
             menuItemOnlineUpdateCurRate_->Enable(true);
-    } 
-    else 
+    }
+    else
     {
         if (menuItemOnlineUpdateCurRate_)
             menuItemOnlineUpdateCurRate_->Enable(false);
@@ -614,7 +614,7 @@
     bool from_scratch = showBeginApp == wxT("TRUE");
 
     wxFileName dbpath = from_scratch ? wxGetEmptyString() : mmDBWrapper::getLastDbPath(m_inidb.get());
- 
+
     if (from_scratch || !dbpath.IsOk()) {
         menuEnableItems(false);
         createHomePage();
@@ -651,7 +651,7 @@
     if (m_db) m_db->Close();
 
     /// Update the database according to user requirements
-    if (mmOptions::instance().databaseUpdated_ && 
+    if (mmOptions::instance().databaseUpdated_ &&
        (mmDBWrapper::getINISettingValue(m_inidb.get(), wxT("BACKUPDB_UPDATE"), wxT("FALSE")) == wxT("TRUE")))
     {
         BackupDatabase(fileName_, true);
@@ -747,7 +747,7 @@
     bool autoExecuteSilent;
     bool requireExecution;
 
-    static const char sql[] = 
+    static const char sql[] =
     "select "
         "b.BDID, "
         "b.ACCOUNTID, b.TOACCOUNTID, "
@@ -770,7 +770,7 @@
         mmBDTransactionHolder th;
         th.id_           = q1.GetInt(wxT("BDID"));
         th.nextOccurDate_  = mmGetStorageStringAsDate(q1.GetString(wxT("NEXTOCCURRENCEDATE")));
-        
+
         th.nextOccurStr_   = mmGetDateForDisplay(m_db.get(), th.nextOccurDate_);
         th.payeeID_        = q1.GetInt(wxT("PAYEEID"));
         th.transType_      = q1.GetString(wxT("TRANSCODE"));
@@ -800,7 +800,7 @@
 
         if (repeats >= BD_REPEATS_MULTIPLEX_BASE)    // Auto Execute Silent mode
         {
-            autoExecuteManual = false;               // Can only be manual or auto. Not both   
+            autoExecuteManual = false;               // Can only be manual or auto. Not both
             autoExecuteSilent = true;
             repeats -= BD_REPEATS_MULTIPLEX_BASE;
         }
@@ -890,7 +890,7 @@
 }
 //----------------------------------------------------------------------------
 
-/* 
+/*
         Save our settings to ini db.
 */
 void mmGUIFrame::saveConfigFile()
@@ -909,9 +909,9 @@
     int valy = 0;
     int valw = 0;
     int valh = 0;
-    
+
     this->GetPosition(&valx, &valy);
-    this->GetSize(&valw, &valh);    
+    this->GetSize(&valw, &valh);
 
     wxString valxs = wxString::Format(wxT("%d"), valx);
     wxString valys = wxString::Format(wxT("%d"), valy);
@@ -919,7 +919,7 @@
     wxString valhs = wxString::Format(wxT("%d"), valh);
 
     m_inidb.get()->Begin();
-    mmDBWrapper::setINISettingValue(m_inidb.get(), wxT("ORIGINX"), valxs); 
+    mmDBWrapper::setINISettingValue(m_inidb.get(), wxT("ORIGINX"), valxs);
     mmDBWrapper::setINISettingValue(m_inidb.get(), wxT("ORIGINY"), valys);
     mmDBWrapper::setINISettingValue(m_inidb.get(), wxT("SIZEW"), valws);
     mmDBWrapper::setINISettingValue(m_inidb.get(), wxT("SIZEH"), valhs);
@@ -988,15 +988,15 @@
 {
 #if defined (__WXGTK__) || defined (__WXMAC__)
     // Under GTK, row lines look ugly
-    navTreeCtrl_ = new wxTreeCtrl( this, ID_NAVTREECTRL, 
+    navTreeCtrl_ = new wxTreeCtrl( this, ID_NAVTREECTRL,
         wxDefaultPosition, wxSize(100, 100));
 #else
-    navTreeCtrl_ = new wxTreeCtrl( this, ID_NAVTREECTRL, 
+    navTreeCtrl_ = new wxTreeCtrl( this, ID_NAVTREECTRL,
         wxDefaultPosition, wxSize(100, 100), wxTR_SINGLE | wxTR_HAS_BUTTONS | wxTR_ROW_LINES );
 #endif
 
     navTreeCtrl_->SetBackgroundColour(mmColors::navTreeBkColor);
-    
+
     wxSize imageSize(16, 16);
     wxImageList* imageList_ = new wxImageList( imageSize.GetWidth(), imageSize.GetHeight() );
     imageList_->Add(wxBitmap(house_xpm));
@@ -1016,7 +1016,7 @@
 
     navTreeCtrl_->AssignImageList(imageList_);
 
-    homePanel = new wxPanel( this, ID_PANEL, 
+    homePanel = new wxPanel( this, ID_PANEL,
         wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxTR_SINGLE | wxNO_BORDER);
 
     m_mgr.AddPane(navTreeCtrl_, wxAuiPaneInfo().
@@ -1055,7 +1055,7 @@
     wxTreeItemId termAccount;
     if ( hasActiveTermAccounts() )
     {
-    //  Positioning for new type of accounts: Term Accounts        
+    //  Positioning for new type of accounts: Term Accounts
         termAccount = navTreeCtrl_->AppendItem(root, _("Term Accounts"), 9, 9);
         navTreeCtrl_->SetItemData(termAccount, new mmTreeItemData(wxT("Term Accounts")));
         navTreeCtrl_->SetItemBold(termAccount, true);
@@ -1142,7 +1142,7 @@
 
     wxTreeItemId categsOverTime = navTreeCtrl_->AppendItem(reports, _("Where the Money Goes"), 4, 4);
     navTreeCtrl_->SetItemData(categsOverTime, new mmTreeItemData(wxT("Where the Money Goes")));
-    
+
     wxTreeItemId categsOverTimeCalMonth = navTreeCtrl_->AppendItem(categsOverTime, _("Last Calendar Month"), 4, 4);
     navTreeCtrl_->SetItemData(categsOverTimeCalMonth, new mmTreeItemData(wxT("Where the Money Goes - Month")));
 
@@ -1154,7 +1154,7 @@
 
     wxTreeItemId categsOverTimeLast30 = navTreeCtrl_->AppendItem(categsOverTime, _("Last 30 Days"), 4, 4);
     navTreeCtrl_->SetItemData(categsOverTimeLast30, new mmTreeItemData(wxT("Where the Money Goes - 30 Days")));
-    
+
     wxTreeItemId categsOverTimeLastYear = navTreeCtrl_->AppendItem(categsOverTime, _("Last Year"), 4, 4);
     navTreeCtrl_->SetItemData(categsOverTimeLastYear, new mmTreeItemData(wxT("Where the Money Goes - Last Year")));
 
@@ -1182,13 +1182,13 @@
 
     wxTreeItemId posCategsTimeLast30 = navTreeCtrl_->AppendItem(posCategs, _("Last 30 Days"), 4, 4);
     navTreeCtrl_->SetItemData(posCategsTimeLast30, new mmTreeItemData(wxT("Where the Money Comes From - 30 Days")));
-    
+
     wxTreeItemId posCategsTimeLastYear = navTreeCtrl_->AppendItem(posCategs, _("Last Year"), 4, 4);
     navTreeCtrl_->SetItemData(posCategsTimeLastYear, new mmTreeItemData(wxT("Where the Money Comes From - Last Year")));
 
     wxTreeItemId posCategsTimeCurrentYear = navTreeCtrl_->AppendItem(posCategs, _("Current Year"), 4, 4);
     navTreeCtrl_->SetItemData(posCategsTimeCurrentYear, new mmTreeItemData(wxT("Where the Money Comes From - Current Year")));
- 
+
     if (financialYearIsDifferent())
     {
         wxTreeItemId posCategsTimeLastFinancialYear = navTreeCtrl_->AppendItem(posCategs, _("Last Financial Year"), 4, 4);
@@ -1201,7 +1201,7 @@
 
     wxTreeItemId categs = navTreeCtrl_->AppendItem(reports, _("Categories"), 4, 4);
     navTreeCtrl_->SetItemData(categs, new mmTreeItemData(wxT("Categories - Over Time")));
-    
+
     wxTreeItemId categsCalMonth = navTreeCtrl_->AppendItem(categs, _("Last Calendar Month"), 4, 4);
     navTreeCtrl_->SetItemData(categsCalMonth, new mmTreeItemData(wxT("Categories - Month")));
 
@@ -1210,7 +1210,7 @@
 
     wxTreeItemId categsTimeLast30 = navTreeCtrl_->AppendItem(categs, _("Last 30 Days"), 4, 4);
     navTreeCtrl_->SetItemData(categsTimeLast30, new mmTreeItemData(wxT("Categories - 30 Days")));
-    
+
     wxTreeItemId categsTimeLastYear = navTreeCtrl_->AppendItem(categs, _("Last Year"), 4, 4);
     navTreeCtrl_->SetItemData(categsTimeLastYear, new mmTreeItemData(wxT("Categories - Last Year")));
 
@@ -1238,7 +1238,7 @@
 
     wxTreeItemId payeesOverTimeLast30 = navTreeCtrl_->AppendItem(payeesOverTime, _("Last 30 Days"), 4, 4);
     navTreeCtrl_->SetItemData(payeesOverTimeLast30, new mmTreeItemData(wxT("Payee Report - 30 Days")));
-    
+
     wxTreeItemId payeesOverTimeLastYear = navTreeCtrl_->AppendItem(payeesOverTime, _("Last Year"), 4, 4);
     navTreeCtrl_->SetItemData(payeesOverTimeLastYear, new mmTreeItemData(wxT("Payee Report - Last Year")));
 
@@ -1266,7 +1266,7 @@
 
     wxTreeItemId incexpOverTimeLast30 = navTreeCtrl_->AppendItem(incexpOverTime, _("Last 30 Days"), 4, 4);
     navTreeCtrl_->SetItemData(incexpOverTimeLast30, new mmTreeItemData(wxT("Income vs Expenses - 30 Days")));
-    
+
     wxTreeItemId incexpOverTimeLastYear = navTreeCtrl_->AppendItem(incexpOverTime, _("Last Year"), 4, 4);
     navTreeCtrl_->SetItemData(incexpOverTimeLastYear, new mmTreeItemData(wxT("Income vs Expenses - Last Year")));
 
@@ -1290,14 +1290,14 @@
     navTreeCtrl_->SetItemData(transactionList, new mmTreeItemData(wxT("Transaction Report")));
 
     ///////////////////////////////////////////////////////////////////
-    
+
     if (m_db && mmIniOptions::instance().enableBudget_)
     {
         static const char sql[] =
         "select BUDGETYEARID, BUDGETYEARNAME "
         "from BUDGETYEAR_V1 "
         "order by BUDGETYEARNAME";
-        
+
         wxTreeItemId budgetPerformance;
         wxTreeItemId budgetSetupPerformance;
 
@@ -1315,27 +1315,27 @@
 
             int id = q1.GetInt(wxT("BUDGETYEARID"));
             const wxString name = q1.GetString(wxT("BUDGETYEARNAME"));
-      
+
             wxTreeItemId bYear = navTreeCtrl_->AppendItem(budgeting, name, 3, 3);
             navTreeCtrl_->SetItemData(bYear, new mmTreeItemData(id, true));
-            
-            // Only add YEARS for Budget Performance 
+
+            // Only add YEARS for Budget Performance
             if (name.length() < 5)
             {
                 wxTreeItemId bYearData = navTreeCtrl_->AppendItem(budgetPerformance, name, 4, 4);
                 navTreeCtrl_->SetItemData(bYearData, new mmTreeItemData(id, true));
-            }    
+            }
             wxTreeItemId bYearSetupData = navTreeCtrl_->AppendItem(budgetSetupPerformance, name, 4, 4);
             navTreeCtrl_->SetItemData(bYearSetupData, new mmTreeItemData(id, true));
         }
 
         q1.Finalize();
-  
-        //TODO: Set up as a permanent user option 
+
+        //TODO: Set up as a permanent user option
         if (expandedBudgetingNavTree_)
             navTreeCtrl_->Expand(budgeting);
     }
-        
+
     ///////////////////////////////////////////////////////////////////
     wxTreeItemId cashFlow = navTreeCtrl_->AppendItem(reports, _("Cash Flow"), 4, 4);
     navTreeCtrl_->SetItemData(cashFlow, new mmTreeItemData(wxT("Cash Flow")));
@@ -1388,10 +1388,10 @@
             {
                 int selectedImage = 1;
                 if (pCA->status_ == mmAccount::MMEX_Closed)
-                    selectedImage = 11; 
+                    selectedImage = 11;
                 else if (pCA->favoriteAcct_)
-                    selectedImage = 10; 
-                
+                    selectedImage = 10;
+
                 wxTreeItemId tacct = navTreeCtrl_->AppendItem(accounts, pCA->name_, selectedImage, selectedImage);
                 navTreeCtrl_->SetItemData(tacct, new mmTreeItemData(pCA->id_, false));
             }
@@ -1399,16 +1399,16 @@
         // Term Accounts
         else if (account->acctType_ == ACCOUNT_TYPE_TERM)
         {
-           const mmAccount* pTA = account; 
+           const mmAccount* pTA = account;
             if ((vAccts == wxT("Open") && pTA->status_ == mmAccount::MMEX_Open) ||
                 (vAccts == wxT("Favorites") && pTA->favoriteAcct_) ||
                 (vAccts == wxT("ALL")))
             {
                 int selectedImage = 9;
                 if (pTA->status_ == mmAccount::MMEX_Closed)
-                    selectedImage = 13; 
+                    selectedImage = 13;
                 else if (pTA->favoriteAcct_)
-                    selectedImage = 12; 
+                    selectedImage = 12;
 
                 wxTreeItemId tacct = navTreeCtrl_->AppendItem(termAccount, pTA->name_, selectedImage, selectedImage);
                 navTreeCtrl_->SetItemData(tacct, new mmTreeItemData(pTA->id_, false));
@@ -1437,7 +1437,7 @@
         menuBar_->FindItem(MENU_VIEW_TERMACCOUNTS)->Enable(true);
         if (mmIniOptions::instance().expandTermTree_ || expandTermAccounts)
             navTreeCtrl_->Expand(termAccount);
-    } else 
+    } else
         menuBar_->FindItem(MENU_VIEW_TERMACCOUNTS)->Enable(false);
 
 }
@@ -1455,14 +1455,14 @@
     int year = today.GetYear();
     if (today.GetMonth() < monthNum) year -- ;
 
-    long dayNum; 
+    long dayNum;
     wxString dayNumStr = mmOptions::instance().financialYearStartDayString_;
     dayNumStr.ToLong(&dayNum);
-    if ( (dayNum < 1) || (dayNum > 31 ) ) {
+    if ((dayNum < 1) || (dayNum > 31 )) {
         dayNum = 1;
-    } else if ( ( (monthNum == wxDateTime::Feb) && (dayNum > 28) ) || 
-        ( ((monthNum == wxDateTime::Sep) || (monthNum == wxDateTime::Apr) || 
-           (monthNum == wxDateTime::Jun) || (monthNum == wxDateTime::Nov)) && (dayNum > 29) ) )
+    } else if (((monthNum == wxDateTime::Feb) && (dayNum > 28)) ||
+        (((monthNum == wxDateTime::Sep) || (monthNum == wxDateTime::Apr) ||
+           (monthNum == wxDateTime::Jun) || (monthNum == wxDateTime::Nov)) && (dayNum > 29)))
     {
         dayNum = 1;
     }
@@ -1500,7 +1500,7 @@
     bool result = false;
     if (tk1 == wxT("Custom") && tk2 == wxT("Report") && indexStr.IsNumber())
     {
-        long index; 
+        long index;
         indexStr.ToLong(&index);
         customSqlReportID = index;
         result = true;
@@ -1525,7 +1525,7 @@
 {
     wxTreeItemId id = event.GetItem();
     mmTreeItemData* iData = dynamic_cast<mmTreeItemData*>(navTreeCtrl_->GetItemData(id));
-     
+
     if (iData->getString() == NAVTREECTRL_REPORTS)
         expandedReportNavTree_ = false;
     else if (iData->getString() == NAVTREECTRL_CUSTOM_REPORTS)
@@ -1547,7 +1547,7 @@
 
     mmTreeItemData* iData = dynamic_cast<mmTreeItemData*>(navTreeCtrl_->GetItemData(id));
     selectedItemData_ = iData;
-    
+
     if (!iData) return;
 
     if (!iData->isStringData())
@@ -1559,7 +1559,7 @@
             Freeze();
             wxTreeItemId idparent = navTreeCtrl_->GetItemParent(id);
             mmTreeItemData* iParentData = dynamic_cast<mmTreeItemData*>(navTreeCtrl_->GetItemData(idparent));
-            if (iParentData->getString() == wxT("Budget Performance")) 
+            if (iParentData->getString() == wxT("Budget Performance"))
             {
                 wxProgressDialog proDlg(_("Budget Performance"), reportWaitingMsg, 100, this);
                 mmPrintableBase* rs = new mmReportBudgetingPerformance(m_core.get(), this, data);
@@ -1567,8 +1567,8 @@
                 menuPrintingEnable(true);
                 createReportsPage(rs);
                 proDlg.Update(95);
-            } 
-            else if (iParentData->getString() == wxT("Budget Setup Performance")) 
+            }
+            else if (iParentData->getString() == wxT("Budget Setup Performance"))
             {
                 wxProgressDialog proDlg(_("Budget Category Summary"), reportWaitingMsg, 100, this);
                 mmPrintableBase* rs = new mmReportBudgetCategorySummary(m_core.get(), this, data);
@@ -1576,8 +1576,8 @@
                 menuPrintingEnable(true);
                 createReportsPage(rs);
                 proDlg.Update(95);
-            } 
-            else 
+            }
+            else
             {
                 wxProgressDialog proDlg(_("Budget Setup"), reportWaitingMsg, 100, this);
                 createBudgetingPage(data);
@@ -1587,7 +1587,7 @@
         }
         else
         {
-           boost::shared_ptr<mmAccount> pAccount = m_core->getAccountSharedPtr(data); 
+           boost::shared_ptr<mmAccount> pAccount = m_core->getAccountSharedPtr(data);
            if (pAccount)
            {
               wxString acctType = pAccount->acctType_;
@@ -1617,7 +1617,7 @@
             }
         }
     }
-    else 
+    else
     {
         if (iData->getString() == wxT("Home Page"))
         {
@@ -1659,7 +1659,7 @@
         //========================================================================
         int customSqlReportID;      // Define before all the if...else statements
         //========================================================================
-        
+
         if (iData->getString() == wxT("Summary of Accounts"))
         {
             mmPrintableBase* rs = new mmReportSummary(m_core.get(), this);
@@ -2080,7 +2080,7 @@
         else if (iData->getString() == wxT("Income vs Expenses - Current Financial Year"))
         {
             wxDateTime dtBegin = wxDateTime(getUserDefinedFinancialYear());
-            
+
             wxDateTime today = wxDateTime::Now();
             int year = today.GetYear();
             if (today.GetMonth() < dtBegin.GetMonth()) year --;
@@ -2111,7 +2111,7 @@
                 numDays = wxDateTime::GetNumberOfDays((wxDateTime::Month)(wxDateTime::Dec));
             else
                 numDays = wxDateTime::GetNumberOfDays((wxDateTime::Month)(cm-1));
-            
+
             wxDateTime prevMonthEnd = today.Subtract(wxDateSpan::Days(today.GetDay()));
             wxDateTime dtEnd = prevMonthEnd;
             wxDateTime dtBegin = prevMonthEnd.Subtract(wxDateSpan::Days(numDays));
@@ -2128,7 +2128,7 @@
             wxDateTime prevMonthEnd = today;
             wxDateTime dtEnd = today;
             wxDateTime dtBegin = today.Subtract(wxDateSpan::Days(30));
-    
+
             wxString title = _("Payees - Last 30 Days");
             mmPrintableBase* rs = new mmReportPayeeExpenses(m_core.get(), false, dtBegin, dtEnd, title);
             menuPrintingEnable(true);
@@ -2228,7 +2228,7 @@
             menuPrintingEnable(true);
             createReportsPage(report);
         }
- 
+
         else if (iData->getString() == wxT("Cash Flow - With Term Accounts"))
         {
             mmReportCashFlow* report = new mmReportCashFlow(m_core.get(), this);
@@ -2268,12 +2268,12 @@
 {
    if (selectedItemData_)
    {
-      int data = selectedItemData_->getData(); 
-      boost::shared_ptr<mmAccount> pAccount = m_core->getAccountSharedPtr(data); 
+      int data = selectedItemData_->getData();
+      boost::shared_ptr<mmAccount> pAccount = m_core->getAccountSharedPtr(data);
       if (pAccount)
       {
          wxString website = pAccount->website_;
-         if (!website.IsEmpty()) wxLaunchDefaultBrowser(website);  
+         if (!website.IsEmpty()) wxLaunchDefaultBrowser(website);
          return;
       }
    }
@@ -2285,7 +2285,7 @@
     if (selectedItemData_)
     {
         int data = selectedItemData_->getData();
-        boost::shared_ptr<mmAccount> pAccount = m_core->getAccountSharedPtr(data); 
+        boost::shared_ptr<mmAccount> pAccount = m_core->getAccountSharedPtr(data);
         if (pAccount)
         {
            wxString acctType = pAccount->acctType_;
@@ -2308,7 +2308,7 @@
     if (selectedItemData_)
     {
         int data = selectedItemData_->getData();
-        boost::shared_ptr<mmAccount> pAccount = m_core->getAccountSharedPtr(data); 
+        boost::shared_ptr<mmAccount> pAccount = m_core->getAccountSharedPtr(data);
         if (pAccount)
         {
            wxString acctType = pAccount->acctType_;
@@ -2318,7 +2318,7 @@
               if ( dlg.ShowModal() == wxID_OK )
               {
                  createHomePage();
-                 updateNavTreeControl();      
+                 updateNavTreeControl();
               }
            }
         }
@@ -2331,25 +2331,25 @@
     if (selectedItemData_)
     {
         int data = selectedItemData_->getData();
-        boost::shared_ptr<mmAccount> pAccount = m_core->getAccountSharedPtr(data); 
+        boost::shared_ptr<mmAccount> pAccount = m_core->getAccountSharedPtr(data);
         if (pAccount)
         {
-           wxMessageDialog msgDlg(this, 
+           wxMessageDialog msgDlg(this,
               _("Do you really want to delete the account?"),
               _("Confirm Account Deletion"),
               wxYES_NO | wxNO_DEFAULT | wxICON_EXCLAMATION);
            if (msgDlg.ShowModal() == wxID_YES)
            {
               m_core->deleteAccount(pAccount->id_);
-              m_core->bTransactionList_.deleteTransactions(pAccount->id_);  
+              m_core->bTransactionList_.deleteTransactions(pAccount->id_);
               updateNavTreeControl();
               if (!refreshRequested_)
               {
                   refreshRequested_ = true;
                   wxCommandEvent ev(wxEVT_COMMAND_MENU_SELECTED, MENU_ACCTLIST);
-                  GetEventHandler()->AddPendingEvent(ev); 
+                  GetEventHandler()->AddPendingEvent(ev);
               }
-           } 
+           }
         }
     }
 }
@@ -2368,13 +2368,13 @@
 {
     mmTreeItemData* iData = dynamic_cast<mmTreeItemData*>(navTreeCtrl_->GetItemData(id));
     selectedItemData_ = iData;
-    
+
     if (!iData->isStringData())
     {
         int data = iData->getData();
         if (!iData->isBudgetingNode())
         {
-            boost::shared_ptr<mmAccount> pAccount = m_core->getAccountSharedPtr(data); 
+            boost::shared_ptr<mmAccount> pAccount = m_core->getAccountSharedPtr(data);
             if (pAccount)
             {
                 wxString acctType = pAccount->acctType_;
@@ -2401,10 +2401,10 @@
             }
         }
     }
-    else 
+    else
     {
-        if (iData->getString() == wxT("Bank Accounts") || 
-            iData->getString() == wxT("Term Accounts") || 
+        if (iData->getString() == wxT("Bank Accounts") ||
+            iData->getString() == wxT("Term Accounts") ||
             iData->getString() == wxT("Stocks"))
         { // Create for Bank Term & Stock Accounts
 
@@ -2413,7 +2413,7 @@
         //New Account    //
         //Delete Account //
         //Edit Account   //
-        //Export >       //  
+        //Export >       //
             //CSV Files //
             //QIF Files //
         //Import >       //
@@ -2481,7 +2481,7 @@
     //Get current settings for view accounts
     wxString vAccts = mmDBWrapper::getINISettingValue(m_inidb.get(), wxT("VIEWACCOUNTS"), wxT("ALL"));
 
-    //Set view ALL 
+    //Set view ALL
     mmDBWrapper::setINISettingValue(m_inidb.get(), wxT("VIEWACCOUNTS"), wxT("ALL"));
 
     //Refresh Navigation Panel
@@ -2497,7 +2497,7 @@
     //Get current settings for view accounts
     wxString vAccts = mmDBWrapper::getINISettingValue(m_inidb.get(), wxT("VIEWACCOUNTS"), wxT("ALL"));
 
-    //Set view ALL 
+    //Set view ALL
     mmDBWrapper::setINISettingValue(m_inidb.get(), wxT("VIEWACCOUNTS"), wxT("Favorites"));
 
     //Refresh Navigation Panel
@@ -2513,7 +2513,7 @@
     //Get current settings for view accounts
     wxString vAccts = mmDBWrapper::getINISettingValue(m_inidb.get(), wxT("VIEWACCOUNTS"), wxT("ALL"));
 
-    //Set view ALL 
+    //Set view ALL
     mmDBWrapper::setINISettingValue(m_inidb.get(), wxT("VIEWACCOUNTS"), wxT("Open"));
 
     //Refresh Navigation Panel
@@ -2528,9 +2528,9 @@
 {
     wxSizer *sizer = cleanupHomePanel();
 
-    panelCurrent_ = new mmBudgetingPanel(m_db.get(), m_inidb.get(), m_core.get(), this, budgetYearID, 
+    panelCurrent_ = new mmBudgetingPanel(m_db.get(), m_inidb.get(), m_core.get(), this, budgetYearID,
         homePanel, ID_PANEL3, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
-    
+
     sizer->Add(panelCurrent_, 1, wxGROW|wxALL, 1);
 
     homePanel->Layout();
@@ -2540,26 +2540,26 @@
 void mmGUIFrame::createHomePage()
 {
     wxSizer *sizer = cleanupHomePanel();
-    
+
     if (panelCurrent_)
     {
         //panelCurrent_->DestroyChildren();
         //panelCurrent_->SetSizer(NULL);
         panelCurrent_  = 0;
     }
-    panelCurrent_ = new mmHomePagePanel(this, 
-        m_db.get(), 
+    panelCurrent_ = new mmHomePagePanel(this,
+        m_db.get(),
         m_inidb.get(),
-        m_core.get(), 
+        m_core.get(),
         m_topCategories,
-        homePanel, 
-        ID_PANEL3, 
-        wxDefaultPosition, 
-        wxDefaultSize, 
+        homePanel,
+        ID_PANEL3,
+        wxDefaultPosition,
+        wxDefaultSize,
         wxNO_BORDER|wxTAB_TRAVERSAL);
-    
+
     sizer->Add(panelCurrent_, 1, wxGROW|wxALL, 1);
-     
+
     homePanel->Layout();
     refreshRequested_ = false;
 }
@@ -2568,12 +2568,12 @@
 void mmGUIFrame::createReportsPage(mmPrintableBase* rs)
 {
     wxSizer *sizer = cleanupHomePanel();
-       
-    panelCurrent_ = new mmReportsPanel(this, m_db.get(), rs, homePanel, ID_PANEL3, 
+
+    panelCurrent_ = new mmReportsPanel(this, m_db.get(), rs, homePanel, ID_PANEL3,
         wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL);
-    
+
     sizer->Add(panelCurrent_, 1, wxGROW|wxALL, 1);
-     
+
     homePanel->Layout();
 }
 //----------------------------------------------------------------------------
@@ -2581,12 +2581,12 @@
 void mmGUIFrame::createHelpPage()
 {
     wxSizer *sizer = cleanupHomePanel();
-       
-    panelCurrent_ = new mmHelpPanel(this, m_db.get(), homePanel, ID_PANEL3, 
+
+    panelCurrent_ = new mmHelpPanel(this, m_db.get(), homePanel, ID_PANEL3,
         wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL);
-    
+
     sizer->Add(panelCurrent_, 1, wxGROW|wxALL, 1);
-     
+
     homePanel->Layout();
 }
 //----------------------------------------------------------------------------
@@ -2620,7 +2620,7 @@
 
     menuRecentFiles_ = new wxMenu;
     menu_file->Append(MENU_RECENT_FILES, _("&Recent Files..."), menuRecentFiles_);
-    // Note: menuRecentFiles_ will be constructed by the class: RecentDatabaseFiles::setMenuFileItems() 
+    // Note: menuRecentFiles_ will be constructed by the class: RecentDatabaseFiles::setMenuFileItems()
     wxMenuItem* menuClearRecentFiles = new wxMenuItem(menu_file, MENU_RECENT_FILES_CLEAR,_("&Clear Recent Files"));
     menuClearRecentFiles->SetBitmap(toolBarBitmaps[9]);
     menu_file->Append(menuClearRecentFiles);
@@ -2638,20 +2638,20 @@
     menu_file->Append(MENU_IMPORT, _("&Import"), importMenu);
 
     menu_file->AppendSeparator();
-    
-    wxMenuItem* menuItemPrintSetup = new wxMenuItem(menu_file, MENU_PRINT_PAGE_SETUP, 
+
+    wxMenuItem* menuItemPrintSetup = new wxMenuItem(menu_file, MENU_PRINT_PAGE_SETUP,
         _("Page Set&up..."), _("Setup page printing options"));
     menuItemPrintSetup->SetBitmap(toolBarBitmaps[7]);
-    menu_file->Append(menuItemPrintSetup); 
-     
+    menu_file->Append(menuItemPrintSetup);
+
     wxMenu* printPreviewMenu = new wxMenu;
-    printPreviewMenu->Append(MENU_PRINT_PREVIEW_REPORT, 
+    printPreviewMenu->Append(MENU_PRINT_PREVIEW_REPORT,
         _("Current &View"), _("Preview current report"));
 
     menu_file->Append(MENU_PRINT_PREVIEW, _("Print Pre&view..."), printPreviewMenu);
 
     wxMenu* printMenu = new wxMenu;
-    wxMenuItem* menuItemPrintView = new wxMenuItem(printMenu, MENU_PRINT_REPORT, 
+    wxMenuItem* menuItemPrintView = new wxMenuItem(printMenu, MENU_PRINT_REPORT,
         _("Current &View"), _("Print current report"));
     printMenu->Append(menuItemPrintView);
 
@@ -2659,30 +2659,30 @@
 
     menu_file->AppendSeparator();
 
-    wxMenuItem* menuItemQuit = new wxMenuItem(menu_file, wxID_EXIT, 
+    wxMenuItem* menuItemQuit = new wxMenuItem(menu_file, wxID_EXIT,
         _("E&xit\tAlt-X"), _("Quit this program"));
     menuItemQuit->SetBitmap(wxBitmap(exit_xpm));
     menu_file->Append(menuItemQuit);
-   
+
     // Create the required menu items
     wxMenu *menuView = new wxMenu;
-    wxMenuItem* menuItemToolbar = new wxMenuItem(menuView, MENU_VIEW_TOOLBAR, 
+    wxMenuItem* menuItemToolbar = new wxMenuItem(menuView, MENU_VIEW_TOOLBAR,
         _("&Toolbar"), _("Show/Hide the toolbar"), wxITEM_CHECK);
-    wxMenuItem* menuItemLinks = new wxMenuItem(menuView, MENU_VIEW_LINKS, 
+    wxMenuItem* menuItemLinks = new wxMenuItem(menuView, MENU_VIEW_LINKS,
         _("&Navigation"), _("Show/Hide the Navigation tree control"), wxITEM_CHECK);
-    wxMenuItem* menuItemBankAccount = new wxMenuItem(menuView, MENU_VIEW_BANKACCOUNTS, 
+    wxMenuItem* menuItemBankAccount = new wxMenuItem(menuView, MENU_VIEW_BANKACCOUNTS,
         _("&Bank Accounts"), _("Show/Hide Bank Accounts on Summary page"), wxITEM_CHECK);
-    wxMenuItem* menuItemTermAccount = new wxMenuItem(menuView, MENU_VIEW_TERMACCOUNTS, 
+    wxMenuItem* menuItemTermAccount = new wxMenuItem(menuView, MENU_VIEW_TERMACCOUNTS,
         _("Term &Accounts"), _("Show/Hide Term Accounts on Summary page"), wxITEM_CHECK);
-    wxMenuItem* menuItemStockAccount = new wxMenuItem(menuView, MENU_VIEW_STOCKACCOUNTS, 
+    wxMenuItem* menuItemStockAccount = new wxMenuItem(menuView, MENU_VIEW_STOCKACCOUNTS,
         _("&Stock Accounts"), _("Show/Hide Stock Accounts on Summary page"), wxITEM_CHECK);
     wxMenuItem* menuItemBudgetFinancialYears = new wxMenuItem(menuView, MENU_VIEW_BUDGET_FINANCIAL_YEARS,
         _("Budgets: As &Financial Years"), _("Display Budgets in Financial Year Format"), wxITEM_CHECK);
     wxMenuItem* menuItemBudgetTransferTotal = new wxMenuItem(menuView, MENU_VIEW_BUDGET_TRANSFER_TOTAL,
         _("Budgets: &Include Transfers in Totals"), _("Include the transfer transactions in the Budget Totals"), wxITEM_CHECK);
-    wxMenuItem* menuItemBudgetSetupWithoutSummary = new wxMenuItem(menuView, MENU_VIEW_BUDGET_SETUP_SUMMARY, 
+    wxMenuItem* menuItemBudgetSetupWithoutSummary = new wxMenuItem(menuView, MENU_VIEW_BUDGET_SETUP_SUMMARY,
         _("Budget Setup: &Without Summaries"), _("Display the Budget Setup without category summaries"), wxITEM_CHECK);
-    wxMenuItem* menuItemBudgetCategorySummary = new wxMenuItem(menuView, MENU_VIEW_BUDGET_CATEGORY_SUMMARY, 
+    wxMenuItem* menuItemBudgetCategorySummary = new wxMenuItem(menuView, MENU_VIEW_BUDGET_CATEGORY_SUMMARY,
         _("Budget Summary: Include &Categories"), _("Include the categories in the Budget Category Summary"), wxITEM_CHECK);
     wxMenuItem* menuItemIgnoreFutureTransactions = new wxMenuItem(menuView, MENU_IGNORE_FUTURE_TRANSACTIONS,
         _("Ignore F&uture Transactions"), _("Ignore Future transactions"), wxITEM_CHECK);
@@ -2715,34 +2715,34 @@
 
     if (mmIniOptions::instance().enableAddAccount_)
     {
-        wxMenuItem* menuItemNewAcct = new wxMenuItem(menuAccounts, MENU_NEWACCT, 
+        wxMenuItem* menuItemNewAcct = new wxMenuItem(menuAccounts, MENU_NEWACCT,
             _("New &Account"), _("New Account"));
         menuItemNewAcct->SetBitmap(toolBarBitmaps[3]);
-        menuAccounts->Append(menuItemNewAcct); 
+        menuAccounts->Append(menuItemNewAcct);
     }
 
-    wxMenuItem* menuItemAcctList = new wxMenuItem(menuAccounts, MENU_ACCTLIST, 
+    wxMenuItem* menuItemAcctList = new wxMenuItem(menuAccounts, MENU_ACCTLIST,
         _("Account &List"), _("Show Account List"));
     menuItemAcctList->SetBitmap(toolBarBitmaps[4]);
 
-    wxMenuItem* menuItemAcctEdit = new wxMenuItem(menuAccounts, MENU_ACCTEDIT, 
+    wxMenuItem* menuItemAcctEdit = new wxMenuItem(menuAccounts, MENU_ACCTEDIT,
         _("&Edit Account"), _("Edit Account"));
     menuItemAcctEdit->SetBitmap(toolBarBitmaps[8]);
 
     if (mmIniOptions::instance().enableDeleteAccount_)
     {
-        wxMenuItem* menuItemAcctDelete = new wxMenuItem(menuAccounts, MENU_ACCTDELETE, 
+        wxMenuItem* menuItemAcctDelete = new wxMenuItem(menuAccounts, MENU_ACCTDELETE,
             _("&Delete Account"), _("Delete Account from database"));
         menuItemAcctDelete->SetBitmap(toolBarBitmaps[9]);
-        menuAccounts->Append(menuItemAcctDelete); 
+        menuAccounts->Append(menuItemAcctDelete);
     }
 
-    menuAccounts->Append(menuItemAcctList); 
-    menuAccounts->Append(menuItemAcctEdit); 
-    
+    menuAccounts->Append(menuItemAcctList);
+    menuAccounts->Append(menuItemAcctEdit);
+
     // Tools Menu
     wxMenu *menuTools = new wxMenu;
-    
+
     wxMenuItem* menuItemCateg = new wxMenuItem(menuTools,
         MENU_ORGCATEGS, _("Organize &Categories..."), _("Organize Categories"));
     menuItemCateg->SetBitmap(wxBitmap(categoryedit_xpm));
@@ -2751,15 +2751,15 @@
     wxMenuItem* menuItemPayee = new wxMenuItem(menuTools,
         MENU_ORGPAYEE, _("Organize &Payees..."), _("Organize Payees"));
     menuItemPayee->SetBitmap(wxBitmap(user_edit_xpm));
-    menuTools->Append(menuItemPayee); 
+    menuTools->Append(menuItemPayee);
 
-    wxMenuItem* menuItemCurrency = new wxMenuItem(menuTools, MENU_CURRENCY, 
+    wxMenuItem* menuItemCurrency = new wxMenuItem(menuTools, MENU_CURRENCY,
         _("Organize Currency..."), _("Organize Currency"));
     menuItemCurrency->SetBitmap(wxBitmap(money_dollar_xpm));
     menuTools->Append(menuItemCurrency);
 
     wxMenu *menuRelocation = new wxMenu;
-    wxMenuItem* menuItemCategoryRelocation = new wxMenuItem(menuRelocation, 
+    wxMenuItem* menuItemCategoryRelocation = new wxMenuItem(menuRelocation,
         MENU_CATEGORY_RELOCATION,_("&Categories..."),_("Reassign all categories to another category"));
        menuItemCategoryRelocation->SetBitmap(wxBitmap(wrench_xpm));
     wxMenuItem* menuItemPayeeRelocation = new wxMenuItem(menuRelocation,
@@ -2770,21 +2770,21 @@
     menuTools->AppendSubMenu(menuRelocation,_("Relocation of..."),_("Relocate Categories && Payees"));
 
     menuTools->AppendSeparator();
-    
+
     if (mmIniOptions::instance().enableBudget_)
     {
-        wxMenuItem* menuItemBudgeting = new wxMenuItem(menuTools, MENU_BUDGETSETUPDIALOG, 
+        wxMenuItem* menuItemBudgeting = new wxMenuItem(menuTools, MENU_BUDGETSETUPDIALOG,
             _("&Budget Setup"), _("Budget Setup"));
         menuItemBudgeting->SetBitmap(wxBitmap(calendar_xpm));
-        menuTools->Append(menuItemBudgeting); 
+        menuTools->Append(menuItemBudgeting);
     }
 
     if (mmIniOptions::instance().enableRepeatingTransactions_)
     {
-        wxMenuItem* menuItemBillsDeposits = new wxMenuItem(menuTools, MENU_BILLSDEPOSITS, 
+        wxMenuItem* menuItemBillsDeposits = new wxMenuItem(menuTools, MENU_BILLSDEPOSITS,
             _("&Repeating Transactions"), _("Bills && Deposits"));
         menuItemBillsDeposits->SetBitmap(wxBitmap(clock_xpm));
-        menuTools->Append(menuItemBillsDeposits); 
+        menuTools->Append(menuItemBillsDeposits);
     }
 
     if (mmIniOptions::instance().enableAssets_)
@@ -2796,7 +2796,7 @@
 
     menuTools->AppendSeparator();
 
-    wxMenuItem* menuItemTransactions = new wxMenuItem(menuTools, MENU_TRANSACTIONREPORT, 
+    wxMenuItem* menuItemTransactions = new wxMenuItem(menuTools, MENU_TRANSACTIONREPORT,
         _("&Transaction Report Filter..."), _("Transaction Report Filter"));
     menuItemTransactions->SetBitmap(wxBitmap(filter_xpm));
     menuTools->Append(menuItemTransactions);
@@ -2805,12 +2805,12 @@
 
     // Create the head menu
     wxMenu *menuCustomSqlReports = new wxMenu;
-    // create the menu items 
-    wxMenuItem* menuItemCustomReportNew = new wxMenuItem(menuCustomSqlReports, 
+    // create the menu items
+    wxMenuItem* menuItemCustomReportNew = new wxMenuItem(menuCustomSqlReports,
         MENU_CUSTOM_SQL_REPORT_NEW, _("New..."),_("Create a new SQL report"));
-    wxMenuItem* menuItemCustomReportEdit = new wxMenuItem(menuCustomSqlReports, 
+    wxMenuItem* menuItemCustomReportEdit = new wxMenuItem(menuCustomSqlReports,
         MENU_CUSTOM_SQL_REPORT_EDIT, _("Edit..."),_("Edit an existing SQL report"));
-    wxMenuItem* menuItemCustomReportDelete = new wxMenuItem(menuCustomSqlReports, 
+    wxMenuItem* menuItemCustomReportDelete = new wxMenuItem(menuCustomSqlReports,
         MENU_CUSTOM_SQL_REPORT_DELETE, _("Delete..."),_("Remove a file from the Custom SQL Reports menu"));
     // Add menu items to the Custom SQL Reports menu
     menuCustomSqlReports->Append(menuItemCustomReportNew);
@@ -2821,34 +2821,34 @@
 
     menuTools->AppendSeparator();
 
-    wxMenuItem* menuItemOptions = new wxMenuItem(menuTools, wxID_PREFERENCES, 
+    wxMenuItem* menuItemOptions = new wxMenuItem(menuTools, wxID_PREFERENCES,
           _("&Options..."), _("Show the Options Dialog"));
     menuItemOptions->SetBitmap(wxBitmap(wrench_xpm));
     menuTools->Append(menuItemOptions);
 
     menuTools->AppendSeparator();
 
-    wxMenuItem* menuItemConvertDB = new wxMenuItem(menuTools, MENU_CONVERT_ENC_DB, 
-        _("Convert Encrypted &DB"), 
+    wxMenuItem* menuItemConvertDB = new wxMenuItem(menuTools, MENU_CONVERT_ENC_DB,
+        _("Convert Encrypted &DB"),
         _("Convert Encrypted DB to Non-Encrypted DB"));
     menuTools->Append(menuItemConvertDB);
 
     menuTools->AppendSeparator();
 
-    menuItemOnlineUpdateCurRate_ = new wxMenuItem(menuTools, MENU_ONLINE_UPD_CURRENCY_RATE, 
-        _("Online &Update Currency Rate"), 
+    menuItemOnlineUpdateCurRate_ = new wxMenuItem(menuTools, MENU_ONLINE_UPD_CURRENCY_RATE,
+        _("Online &Update Currency Rate"),
         _("Online update currency rate"));
     menuTools->Append(menuItemOnlineUpdateCurRate_);
 
     // Help Menu
     wxMenu *menuHelp = new wxMenu;
 
-    wxMenuItem* menuItemHelp = new wxMenuItem(menuTools, wxID_HELP, 
+    wxMenuItem* menuItemHelp = new wxMenuItem(menuTools, wxID_HELP,
          _("&Help\tCtrl-F1"), _("Show the Help file"));
     menuItemHelp->SetBitmap(wxBitmap(help_xpm));
     menuHelp->Append(menuItemHelp);
 
-    wxMenuItem* menuItemAppStart = new wxMenuItem(menuTools, MENU_SHOW_APPSTART, 
+    wxMenuItem* menuItemAppStart = new wxMenuItem(menuTools, MENU_SHOW_APPSTART,
          _("&Show App Start Dialog"), _("App Start Dialog"));
     menuItemAppStart->SetBitmap(wxBitmap(appstart_xpm));
     menuHelp->Append(menuItemAppStart);
@@ -2857,7 +2857,7 @@
 
     if (mmIniOptions::instance().enableCheckForUpdates_)
     {
-       wxMenuItem* menuItemCheck = new wxMenuItem(menuTools, MENU_CHECKUPDATE, 
+       wxMenuItem* menuItemCheck = new wxMenuItem(menuTools, MENU_CHECKUPDATE,
           _("Check for &Updates"), _("Check For Updates"));
        menuItemCheck->SetBitmap(wxBitmap(checkupdate_xpm));
        menuHelp->Append(menuItemCheck);
@@ -2873,18 +2873,18 @@
 
     if (mmIniOptions::instance().enableBeNotifiedForNewReleases_)
     {
-       wxMenuItem* menuItemNotify = new wxMenuItem(menuTools, MENU_ANNOUNCEMENTMAILING, 
+       wxMenuItem* menuItemNotify = new wxMenuItem(menuTools, MENU_ANNOUNCEMENTMAILING,
           _("Register/View Release &Notifications."), _("Sign up to Notification Mailing List or View existing announcements."));
        menuItemNotify->SetBitmap(wxBitmap(notify_xpm));
-       menuHelp->Append(menuItemNotify); 
+       menuHelp->Append(menuItemNotify);
     }
-        
-    wxMenuItem* menuItemFacebook = new wxMenuItem(menuTools, MENU_FACEBOOK, 
+
+    wxMenuItem* menuItemFacebook = new wxMenuItem(menuTools, MENU_FACEBOOK,
                                                 _("Visit us on Facebook"), _("Visit us on Facebook"));
     menuItemFacebook->SetBitmap(wxBitmap(facebook_xpm));
-    menuHelp->Append(menuItemFacebook); 
-    
-    wxMenuItem* menuItemAbout = new wxMenuItem(menuTools, wxID_ABOUT, 
+    menuHelp->Append(menuItemFacebook);
+
+    wxMenuItem* menuItemAbout = new wxMenuItem(menuTools, wxID_ABOUT,
        _("&About..."), _("Show about dialog"));
     menuItemAbout->SetBitmap(wxBitmap(about_xpm));
     menuHelp->Append(menuItemAbout);
@@ -2938,7 +2938,7 @@
     toolBar_->AddTool(MENU_TRANSACTIONREPORT, _("Transaction Report Filter"), toolBarBitmaps[8], _("Transaction Report Filter"));
     toolBar_->AddSeparator();
     toolBar_->AddTool(MENU_CUSTOM_SQL_REPORT_NEW, _("Custom SQL Manager"), toolBarBitmaps[9], _("Create new Custom SQL Reports"));
-    
+
     // after adding the buttons to the toolbar, must call Realize() to reflect changes
     toolBar_->Realize();
 }
@@ -2954,7 +2954,7 @@
         m_db.reset();
 
         /// Update the database according to user requirements
-        if (mmOptions::instance().databaseUpdated_ && 
+        if (mmOptions::instance().databaseUpdated_ &&
            (mmDBWrapper::getINISettingValue(m_inidb.get(), wxT("BACKUPDB_UPDATE"), wxT("FALSE")) == wxT("TRUE")))
         {
             BackupDatabase(fileName_, true);
@@ -2994,7 +2994,7 @@
         if (!mmDBWrapper::checkDBVersion(m_db.get()))
         {
             wxString note = mmex::getProgramName() + _(" - No File opened ");
-            this->SetTitle(note);   
+            this->SetTitle(note);
             wxMessageBox(_("Sorry. The Database version is too old or Database password is incorrect"),
                         dialogErrorMessageHeading, wxICON_EXCLAMATION);
 
@@ -3042,13 +3042,13 @@
     else // open of existing database failed
     {
         wxString note = mmex::getProgramName() + _(" - No File opened ");
-        this->SetTitle(note);   
-        
+        this->SetTitle(note);
+
         wxString msgStr = _("Cannot locate previously opened database.\n");
         if (!passwordCheckPassed)
             msgStr = _("Password not entered for encrypted Database.\n");
 
-        wxMessageDialog msgDlg(this, msgStr + _("Do you want to browse to locate another file?"), 
+        wxMessageDialog msgDlg(this, msgStr + _("Do you want to browse to locate another file?"),
                                 dialogErrorMessageHeading, wxYES_NO | wxYES_DEFAULT);
         if (msgDlg.ShowModal() == wxID_YES)
         {
@@ -3066,8 +3066,8 @@
 
 void mmGUIFrame::openDataBase(const wxString& fileName)
 {
-    wxProgressDialog dlg(_("Please Wait"), 
-        _("Opening Database File && Verifying Integrity"), 100, this, 
+    wxProgressDialog dlg(_("Please Wait"),
+        _("Opening Database File && Verifying Integrity"), 100, this,
         wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_SMOOTH );
 
     mmDBWrapper::initDB(m_db.get(), &dlg);
@@ -3084,11 +3084,11 @@
     m_topCategories.Clear();
     mmIniOptions::instance().loadInfoOptions(m_db.get());
 
-    if (m_db) 
+    if (m_db)
     {
         fileName_ = fileName;
-    } 
-    else 
+    }
+    else
     {
         fileName_.Clear();
         password_.Clear();
@@ -3105,22 +3105,22 @@
 void mmGUIFrame::openFile(const wxString& fileName, bool openingNew, const wxString &password)
 {
     createDataStore(fileName, password, openingNew);
-  
-    if (m_db) 
+
+    if (m_db)
     {
         menuEnableItems(true);
         menuPrintingEnable(false);
-        autoRepeatTransactionsTimer_.Start(REPEAT_TRANS_DELAY_TIME, wxTIMER_ONE_SHOT); 
+        autoRepeatTransactionsTimer_.Start(REPEAT_TRANS_DELAY_TIME, wxTIMER_ONE_SHOT);
     }
-    
+
     updateNavTreeControl();
 
-    if (!refreshRequested_) 
+    if (!refreshRequested_)
     {
         refreshRequested_ = true;
         /* Currency Options might have changed so refresh */
         wxCommandEvent ev(wxEVT_COMMAND_MENU_SELECTED, MENU_ACCTLIST);
-        GetEventHandler()->AddPendingEvent(ev); 
+        GetEventHandler()->AddPendingEvent(ev);
     }
 
     if (!m_db)
@@ -3130,20 +3130,20 @@
 void mmGUIFrame::OnNew(wxCommandEvent& /*event*/)
 {
     autoRepeatTransactionsTimer_.Stop();
-    wxFileDialog dlg(this, 
-                     _("Choose database file to create"), 
-                     wxEmptyString, 
-                     wxEmptyString, 
-                     wxT("MMB Files(*.mmb)|*.mmb"), 
+    wxFileDialog dlg(this,
+                     _("Choose database file to create"),
+                     wxEmptyString,
+                     wxEmptyString,
+                     wxT("MMB Files(*.mmb)|*.mmb"),
                      wxFD_SAVE | wxFD_OVERWRITE_PROMPT
                     );
 
-    if(dlg.ShowModal() != wxID_OK) 
+    if(dlg.ShowModal() != wxID_OK)
         return;
 
     wxString fileName = dlg.GetPath();
-    
-    if (!fileName.EndsWith(wxT(".mmb"))) 
+
+    if (!fileName.EndsWith(wxT(".mmb")))
         fileName += wxT(".mmb");
 
     SetDatabaseFile(fileName, true);
@@ -3153,13 +3153,13 @@
 void mmGUIFrame::OnOpen(wxCommandEvent& /*event*/)
 {
     autoRepeatTransactionsTimer_.Stop();
-    wxString fileName = wxFileSelector(_("Choose database file to open"), 
-                                       wxEmptyString, wxEmptyString, wxEmptyString, 
-                                       wxT("MMB Files(*.mmb)|*.mmb|Encrypted MMB files (*.emb)|*.emb"), 
+    wxString fileName = wxFileSelector(_("Choose database file to open"),
+                                       wxEmptyString, wxEmptyString, wxEmptyString,
+                                       wxT("MMB Files(*.mmb)|*.mmb|Encrypted MMB files (*.emb)|*.emb"),
                                        wxFD_FILE_MUST_EXIST,
                                        this
                                       );
-  
+
     if (!fileName.empty()) {
         SetDatabaseFile(fileName);
         mmGUIFrame::saveConfigFile();
@@ -3169,33 +3169,33 @@
 
 void mmGUIFrame::OnConvertEncryptedDB(wxCommandEvent& /*event*/)
 {
-    wxString encFileName = wxFileSelector(_("Choose Encrypted database file to open"), 
-                                          wxEmptyString, wxEmptyString, wxEmptyString, 
-                                          wxT("Encrypted MMB files (*.emb)|*.emb"), 
-                                          wxFD_FILE_MUST_EXIST, 
+    wxString encFileName = wxFileSelector(_("Choose Encrypted database file to open"),
+                                          wxEmptyString, wxEmptyString, wxEmptyString,
+                                          wxT("Encrypted MMB files (*.emb)|*.emb"),
+                                          wxFD_FILE_MUST_EXIST,
                                           this
                                          );
 
     if (encFileName.empty())
         return;
-    
+
     wxString password = wxGetPasswordFromUser(_("Enter password for database"));
     if (password.empty())
         return;
-        
-    wxFileDialog dlg(this, 
-                     _("Choose database file to Save As"), 
-                     wxEmptyString, 
-                     wxEmptyString, 
-                     wxT("MMB Files(*.mmb)|*.mmb"), 
+
+    wxFileDialog dlg(this,
+                     _("Choose database file to Save As"),
+                     wxEmptyString,
+                     wxEmptyString,
+                     wxT("MMB Files(*.mmb)|*.mmb"),
                      wxFD_SAVE | wxFD_OVERWRITE_PROMPT
                     );
 
     if(dlg.ShowModal() != wxID_OK)
         return;
-        
+
     wxString fileName = dlg.GetPath();
-    
+
     if (!dlg.GetPath().EndsWith(wxT(".mmb")))
         fileName += wxT(".mmb");
 
@@ -3214,7 +3214,7 @@
 {
     wxASSERT(m_db);
 
-    if (fileName_.empty()) 
+    if (fileName_.empty())
     {
         wxASSERT(false);
         return;
@@ -3252,13 +3252,13 @@
 
     if (encrypt)
     {
-        if (rekey) 
+        if (rekey)
         {
             new_password = wxGetPasswordFromUser(_("Enter password for new database"));
-            if (new_password.empty()) 
+            if (new_password.empty())
                 return;
-        } 
-        else 
+        }
+        else
         {
             new_password = password_;
         }
@@ -3274,7 +3274,7 @@
 
     if (!wxCopyFile(oldFileName.GetFullPath(), newFileName.GetFullPath(), true))  // true -> overwrite if file exists
         return;
-    
+
     if (rekey) // encrypt or reset encryption
     {
         wxSQLite3Database dbx;
@@ -3282,7 +3282,7 @@
         dbx.ReKey(new_password); // empty password resets encryption
         dbx.Close();
     }
-    
+
     password_.clear();
     openFile(newFileName.GetFullPath(), false, new_password);
 }
@@ -3335,7 +3335,7 @@
     Close(TRUE);
 }
 //----------------------------------------------------------------------------
-    
+
 void mmGUIFrame::OnNewAccount(wxCommandEvent& /*event*/)
 {
     mmAddAccountWizard* wizard = new mmAddAccountWizard(this, m_core.get());
@@ -3349,14 +3349,14 @@
         dlg.ShowModal();
         if (dlg.termAccountActivated() )
         {
-            updateNavTreeControl(true); 
+            updateNavTreeControl(true);
             menuBar_->FindItem(MENU_VIEW_TERMACCOUNTS)->Check(true);
             if (firstTermAccount)
             {
             /***************Message to display *************************
                 Term Account views have been temporarly turned on.
                 To maintain this view, change the defaults by using:
-    
+
                 Tools -> Options
                 View Options
 
@@ -3369,23 +3369,23 @@
                        << _("This message will not be displayed in future.");
                 wxMessageBox(msgStr, _("Initial Term Account Activation"),wxICON_INFORMATION);
             }
-        } 
+        }
         else
         {
-            updateNavTreeControl(); 
+            updateNavTreeControl();
         }
      }
-    
+
     if (!refreshRequested_)
     {
         refreshRequested_ = true;
         /* Currency Options might have changed so refresh */
         wxCommandEvent ev(wxEVT_COMMAND_MENU_SELECTED, MENU_ACCTLIST);
-        GetEventHandler()->AddPendingEvent(ev); 
+        GetEventHandler()->AddPendingEvent(ev);
     }
 }
 //----------------------------------------------------------------------------
-    
+
 void mmGUIFrame::OnAccountList(wxCommandEvent& /*event*/)
 {
     createHomePage();
@@ -3400,7 +3400,7 @@
     mmCategDialog(m_core.get(), this, false).ShowModal();
 }
 //----------------------------------------------------------------------------
- 
+
 void mmGUIFrame::OnOrgPayees(wxCommandEvent& /*event*/)
 {
     mmPayeeDialog(this, m_core.get(), false).ShowModal();
@@ -3409,11 +3409,11 @@
 
 void mmGUIFrame::OnBudgetSetupDialog(wxCommandEvent& /*event*/)
 {
-    if (m_db) 
+    if (m_db)
     {
         mmBudgetYearDialog(m_db.get(), this).ShowModal();
         createHomePage();
-        updateNavTreeControl();    
+        updateNavTreeControl();
     }
 }
 //----------------------------------------------------------------------------
@@ -3424,7 +3424,7 @@
 
     if (m_core.get()->getNumAccounts() == 0) return;
 
-    std::vector< boost::shared_ptr<mmBankTransaction> >* trans 
+    std::vector< boost::shared_ptr<mmBankTransaction> >* trans
         = new std::vector< boost::shared_ptr<mmBankTransaction> >;
 
     mmFilterTransactionsDialog* dlg= new mmFilterTransactionsDialog(trans, m_core.get(), this);
@@ -3453,7 +3453,7 @@
     {
         const mmAccount* account = it->get();
 
-        if (account->acctType_ == ACCOUNT_TYPE_BANK || (withTermAccounts && account->acctType_ == ACCOUNT_TYPE_TERM)) 
+        if (account->acctType_ == ACCOUNT_TYPE_BANK || (withTermAccounts && account->acctType_ == ACCOUNT_TYPE_TERM))
             accountArray.Add(account->name_);
     }
 
@@ -3477,7 +3477,7 @@
         {
             selections->Add(accountArray.Item(arraySel[i]));
         }
-        
+
         // mmReportCashFlow is a mmPrintableBase
         mmReportCashFlow* report = new mmReportCashFlow(m_core.get(), this, selections);
 
@@ -3534,10 +3534,10 @@
     createHelpPage();
 }
 //----------------------------------------------------------------------------
- 
+
 bool mmGUIFrame::IsUpdateAvailable(wxString page)
 {
-    wxStringTokenizer tkz(page, wxT('.'), wxTOKEN_RET_EMPTY_ALL);  
+    wxStringTokenizer tkz(page, wxT('.'), wxTOKEN_RET_EMPTY_ALL);
     int numTokens = (int)tkz.CountTokens();
     if (numTokens != 4)
     {
@@ -3545,7 +3545,7 @@
         wxLaunchDefaultBrowser(url);
         return false;
     }
-    
+
     wxString maj = tkz.GetNextToken();
     wxString min = tkz.GetNextToken();
     wxString cust = tkz.GetNextToken();
@@ -3553,9 +3553,9 @@
 
     // get current version
     wxString currentV = mmex::getProgramVersion();
-    wxStringTokenizer tkz1(currentV, wxT('.'), wxTOKEN_RET_EMPTY_ALL);  
+    wxStringTokenizer tkz1(currentV, wxT('.'), wxTOKEN_RET_EMPTY_ALL);
     numTokens = (int)tkz1.CountTokens();
-    
+
     wxString majC = tkz1.GetNextToken();
     wxString minC = tkz1.GetNextToken();
     wxString custC = tkz1.GetNextToken();
@@ -3594,8 +3594,8 @@
         << wxT("MMEX: ")     << mmex::getProgramVersion()       << wxT("\n")
         << _("System: ")     << wxPlatformInfo::Get().GetOperatingSystemIdName() << wxT("\n\n")
         << wxVERSION_STRING  << wxT("\n")
-        << wxT("Boost C++ ") << (BOOST_VERSION/100000)          << wxT('.') 
-                             << (BOOST_VERSION / 100 % 1000)    << wxT('.') 
+        << wxT("Boost C++ ") << (BOOST_VERSION/100000)          << wxT('.')
+                             << (BOOST_VERSION / 100 % 1000)    << wxT('.')
                              << (BOOST_VERSION % 100)           << wxT("\n")
         << wxT("SQLite3: ")  << wxSQLite3Database::GetVersion() << wxT("\n")
         << wxT("wxSQLite3: 3.0.0 by Ulrich Telle")              << wxT("\n\n");
@@ -3625,7 +3625,7 @@
     **************************************************************************/
     wxStringTokenizer sysTokens(page,wxT("-"));
     // Ignored the first token. Added for compatibility for pre 0.9.8.0
-    wxString oldSys  = sysTokens.GetNextToken(); 
+    wxString oldSys  = sysTokens.GetNextToken();
     wxString winSys  = sysTokens.GetNextToken().Trim(false);
     wxString unixSys = sysTokens.GetNextToken().Trim(false);
     wxString macSys  = sysTokens.GetNextToken().Trim(false);
@@ -3633,23 +3633,23 @@
     wxString mySys =  wxPlatformInfo::Get().GetOperatingSystemFamilyName();
 
     wxStringTokenizer mySysToken;
-    if (mySys == wxT("Windows")) 
+    if (mySys == wxT("Windows"))
         mySysToken.SetString(winSys,wxT(":"));
     else if (mySys == wxT("Unix"))
         mySysToken.SetString(unixSys,wxT(":"));
     else if (mySys == wxT("Macintosh"))
         mySysToken.SetString(macSys,wxT(":"));
-    
+
     page = mySysToken.GetNextToken();                       // the system
-    page = mySysToken.GetNextToken().Trim(false).Trim();    // the version  
-    
+    page = mySysToken.GetNextToken().Trim(false).Trim();    // the version
+
     // set up display information.
     int style = wxOK|wxCANCEL;
     if (IsUpdateAvailable(page))
     {
         versionDetails << _("New update available!");
         style = wxICON_EXCLAMATION|style;
-    } 
+    }
     else
     {
         versionDetails << _("You have the latest version installed!");
@@ -3667,11 +3667,11 @@
 {
     wxArrayString   currency_name, currency_rate;
     double          *rate_ptr, rate_value, base_rate;
-    
+
     // we will get latest currency rate data from European Central Bank
     wxString site = wxT("http://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml");
 
-    if (!m_core) 
+    if (!m_core)
     {
        wxMessageBox(_("No database!"), _("Update Currency Rate"), wxICON_WARNING);
        return;
@@ -3681,22 +3681,22 @@
 
     wxInputStream* in_stream = url.GetInputStream();
 
-    if (!in_stream) 
+    if (!in_stream)
     {
         wxMessageBox(_("Unable to connect!"), _("Update Currency Rate"), wxICON_WARNING);
         return;
     }
-    
+
     wxXmlDocument doc;
 
-    if(!doc.Load(*in_stream)) 
+    if(!doc.Load(*in_stream))
     {
         wxMessageBox(_("Cannot get data from WWW!"), _("Update Currency Rate"), wxICON_WARNING);
         return;
     }
 
     // decode received XML data
-    if(doc.GetRoot()->GetName() != wxT("gesmes:Envelope")) 
+    if(doc.GetRoot()->GetName() != wxT("gesmes:Envelope"))
     {
         wxMessageBox(_("Incorrect XML data (#1)!"), _("Update Currency Rate"), wxICON_WARNING);
         return;
@@ -3704,49 +3704,49 @@
 
     wxXmlNode *root_child = doc.GetRoot()->GetChildren();
 
-    while(root_child) 
+    while(root_child)
     {
-        if(root_child->GetName() == wxT("gesmes:subject")) 
+        if(root_child->GetName() == wxT("gesmes:subject"))
         {
-            if(root_child->GetNodeContent() != wxT("Reference rates")) 
+            if(root_child->GetNodeContent() != wxT("Reference rates"))
             {
                 wxMessageBox(_("Incorrect XML data (#2)!"), _("Update Currency Rate"), wxICON_WARNING);
                 return;
             }
-        } 
-        else if (root_child->GetName() == wxT("gesmes:Sender")) 
+        }
+        else if (root_child->GetName() == wxT("gesmes:Sender"))
         {
             wxXmlNode *sender_child = root_child->GetChildren();
 
-            if(!sender_child) 
+            if(!sender_child)
             {
                 wxMessageBox(_("Incorrect XML data (#3)!"), _("Update Currency Rate"), wxICON_WARNING);
                 return;
             }
 
-            if(sender_child->GetName() != wxT("gesmes:name")) 
+            if(sender_child->GetName() != wxT("gesmes:name"))
             {
                 wxMessageBox(_("Incorrect XML data (#4)!"), _("Update Currency Rate"), wxICON_WARNING);
                 return;
             }
 
-            if(sender_child->GetNodeContent() != wxT("European Central Bank")) 
+            if(sender_child->GetNodeContent() != wxT("European Central Bank"))
             {
                 wxMessageBox(_("Incorrect XML data (#5)!"), _("Update Currency Rate"), wxICON_WARNING);
                 return;
-            }            
-        } 
-        else if (root_child->GetName() == wxT("Cube")) 
+            }
+        }
+        else if (root_child->GetName() == wxT("Cube"))
         {
             wxXmlNode *cube_lv1_child = root_child->GetChildren();
 
-            if(!cube_lv1_child) 
+            if(!cube_lv1_child)
             {
                 wxMessageBox(_("Incorrect XML data (#6)!"), _("Update Currency Rate"), wxICON_WARNING);
                 return;
             }
 
-            if(cube_lv1_child->GetName() != wxT("Cube")) 
+            if(cube_lv1_child->GetName() != wxT("Cube"))
             {
                 wxMessageBox(_("Incorrect XML data (#7)!"), _("Update Currency Rate"), wxICON_WARNING);
                 return;
@@ -3754,23 +3754,23 @@
 
             wxXmlNode *cube_lv2_child = cube_lv1_child->GetChildren();
 
-            // set default base currency and its rate            
+            // set default base currency and its rate
             currency_name.Add(wxT("EUR"));
             currency_rate.Add(wxT("1.0"));
 
-            while(cube_lv2_child) 
+            while(cube_lv2_child)
             {
                 wxString name = cube_lv2_child->GetPropVal(wxT("currency"), wxGetEmptyString());
                 wxString rate = cube_lv2_child->GetPropVal(wxT("rate"), wxT("1"));
 
                 currency_name.Add(name);
                 currency_rate.Add(rate);
-                
+
                 cube_lv2_child = cube_lv2_child->GetNext();
             }
         }
         root_child = root_child->GetNext();
-    }    
+    }
 
     // Get base currency and the adjust currency rate for each currency
     rate_ptr = new double[currency_rate.GetCount()];
@@ -3779,12 +3779,12 @@
     wxString base_symbol = mmDBWrapper::getCurrencySymbol(m_core->db_.get(), currencyID);
     base_rate = 0;
 
-    for(int i=0; i<(int)currency_rate.GetCount(); i++) 
+    for(int i=0; i<(int)currency_rate.GetCount(); i++)
     {
-        if(currency_rate[i].ToDouble(&rate_value) == false) 
+        if(currency_rate[i].ToDouble(&rate_value) == false)
         {
             rate_ptr[i] = 1.0;
-        } else 
+        } else
         {
             rate_ptr[i] = rate_value;
             if(currency_name[i] == base_symbol)
@@ -3792,7 +3792,7 @@
         }
     }
 
-    if(base_rate == 0) 
+    if(base_rate == 0)
     {
         wxMessageBox(_("Could not find base currency symbol!"), _("Update Currency Rate"), wxICON_WARNING);
         return;
@@ -3801,22 +3801,22 @@
     // Note:
     // Suppose currency Y / currency X = Y / X and currency Z / currency X = Z / X, then
     // currency Z / currency Y = Z / Y
-    // Therefore, if currency X is EUR and currency Y is the base currency, 
+    // Therefore, if currency X is EUR and currency Y is the base currency,
     // currency Y : currency Z = base_rate / rate of Z : 1
-    for(int i=0; i<(int)currency_rate.GetCount(); i++) 
+    for(int i=0; i<(int)currency_rate.GetCount(); i++)
         rate_ptr[i] = base_rate / rate_ptr[i];
 
     // update currency rates
-    
+
     wxString msg = _("Currency rate updated");
     msg << wxT("\n\n");
-    for (int idx = 0; idx < (int)m_core->currencyList_.currencies_.size(); idx++) 
+    for (int idx = 0; idx < (int)m_core->currencyList_.currencies_.size(); idx++)
     {
         wxString currencySymbol  = m_core->currencyList_.currencies_[idx]->currencySymbol_;
-        
-        for(int i=0; i<(int)currency_name.GetCount(); i++) 
+
+        for(int i=0; i<(int)currency_name.GetCount(); i++)
         {
-            if(currency_name[i] == currencySymbol) 
+            if(currency_name[i] == currencySymbol)
             {
                 double rate = m_core->currencyList_.currencies_[idx]->baseConv_ ;
                 if (rate != rate_ptr[i])
@@ -3831,7 +3831,7 @@
     delete[] rate_ptr;
 
     wxMessageDialog msgDlg(this, msg, _("Currency rate updated"));
-    
+
     //fileviewer(wxT(""), this).ShowModal();
     msgDlg.ShowModal();
 
@@ -3864,7 +3864,7 @@
 }
 
 //----------------------------------------------------------------------------
-    
+
 void mmGUIFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
     mmAboutDialog(m_inidb.get(), this).ShowModal();
@@ -3894,7 +3894,7 @@
     wxPoint topLeft(leftMargin, topMargin);
     wxPoint bottomRight(rightMargin, bottomMargin);
 
-    wxPageSetupDialogData* pinterData = printer_->GetPageSetupData();  
+    wxPageSetupDialogData* pinterData = printer_->GetPageSetupData();
     pinterData->SetMarginTopLeft(topLeft);
     pinterData->SetMarginBottomRight(bottomRight);
 
@@ -3909,10 +3909,10 @@
     {
         printer_->PageSetup();
 
-        wxPageSetupDialogData* printerDialogData = printer_->GetPageSetupData();  
+        wxPageSetupDialogData* printerDialogData = printer_->GetPageSetupData();
         wxPoint topLeft = printerDialogData->GetMarginTopLeft();
         wxPoint bottomRight = printerDialogData->GetMarginBottomRight();
-        
+
         wxPrintData* printerData = printer_->GetPrintData();
         int pageOrientation = printerData->GetOrientation();
         wxPaperSize paperID = printerData->GetPaperId();
@@ -3931,10 +3931,10 @@
         wxString bottomMargin = wxString() << bottomRight.y ;
         mmDBWrapper::setINISettingValue( m_inidb.get(), wxT("PRINTER_BORTTOM_MARGIN"), bottomMargin);
 
-        wxString orientation = wxString() << pageOrientation; 
+        wxString orientation = wxString() << pageOrientation;
         mmDBWrapper::setINISettingValue( m_inidb.get(), wxT("PRINTER_PAGE_ORIENTATION"), orientation);
 
-        wxString pageID = wxString() << paperID; 
+        wxString pageID = wxString() << paperID;
         mmDBWrapper::setINISettingValue( m_inidb.get(), wxT("PRINTER_PAGE_ID"), pageID);
 
         m_inidb.get()->Commit();
@@ -3956,7 +3956,7 @@
 //----------------------------------------------------------------------------
 
 void mmGUIFrame::OnPrintPagePreview(wxCommandEvent& WXUNUSED(event))
-{ 
+{
     if (!printer_) return;
 
     mmReportsPanel* rp = dynamic_cast<mmReportsPanel*>(panelCurrent_);
@@ -4021,7 +4021,7 @@
     mmReportsPanel* rp = dynamic_cast<mmReportsPanel*>(panelCurrent_);
     if (rp)
     {
-        wxString fileName = wxFileSelector(wxT("Choose HTML file to Export"), 
+        wxString fileName = wxFileSelector(wxT("Choose HTML file to Export"),
             wxEmptyString, wxEmptyString, wxEmptyString, wxT("*.html"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
         if ( !fileName.empty() )
         {
@@ -4037,10 +4037,10 @@
 void mmGUIFrame::OnBillsDeposits(wxCommandEvent& WXUNUSED(event))
 {
     wxSizer *sizer = cleanupHomePanel();
-    
-    panelCurrent_ = new mmBillsDepositsPanel(m_db.get(), m_inidb.get(), m_core.get(), homePanel, ID_PANEL3, 
+
+    panelCurrent_ = new mmBillsDepositsPanel(m_db.get(), m_inidb.get(), m_core.get(), homePanel, ID_PANEL3,
         wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL);
-    
+
     sizer->Add(panelCurrent_, 1, wxGROW|wxALL, 1);
 
     homePanel->Layout();
@@ -4050,9 +4050,9 @@
 void mmGUIFrame::createStocksAccountPage(int accountID)
 {
     wxSizer *sizer = cleanupHomePanel();
-    
+
     panelCurrent_ = new mmStocksPanel(m_db.get(), m_inidb.get(), m_core.get(),
-                                        accountID, homePanel, ID_PANEL3, 
+                                        accountID, homePanel, ID_PANEL3,
                                         wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL
                                        );
 
@@ -4063,7 +4063,7 @@
 //----------------------------------------------------------------------------
 void mmGUIFrame::OnGotoStocksAccount(wxCommandEvent& WXUNUSED(event))
 {
-    if (gotoAccountID_ != -1)    
+    if (gotoAccountID_ != -1)
         createStocksAccountPage(gotoAccountID_);
 }
 
@@ -4071,9 +4071,9 @@
 void mmGUIFrame::createCheckingAccountPage(int accountID)
 {
     wxSizer *sizer = cleanupHomePanel();
-    
-    panelCurrent_ = new mmCheckingPanel(m_core.get(), m_inidb.get(),  
-                                        accountID, homePanel, ID_PANEL3, 
+
+    panelCurrent_ = new mmCheckingPanel(m_core.get(), m_inidb.get(),
+                                        accountID, homePanel, ID_PANEL3,
                                         wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL
                                        );
 
@@ -4084,7 +4084,7 @@
 //----------------------------------------------------------------------------
 void mmGUIFrame::OnGotoAccount(wxCommandEvent& WXUNUSED(event))
 {
-    if (gotoAccountID_ != -1)    
+    if (gotoAccountID_ != -1)
         createCheckingAccountPage(gotoAccountID_);
 }
 
@@ -4117,7 +4117,7 @@
         wxMessageBox(_("No account available to edit!"), _("Accounts"), wxICON_WARNING);
         return;
     }
-  
+
     wxArrayString as;
     int num = (int)m_core->accountList_.accounts_.size();
     boost::scoped_array<int> arrAcctID(new int[num]);
@@ -4130,7 +4130,7 @@
         as.Add(account->name_);
         arrAcctID[idx ++] = account->id_;
     }
- 
+
     wxSingleChoiceDialog scd(this, _("Choose Account to Edit"), _("Accounts"), as);
     if (scd.ShowModal() == wxID_OK)
     {
@@ -4139,7 +4139,7 @@
         mmNewAcctDialog dlg(m_core.get(), false, acctID, this);
         if ( dlg.ShowModal() == wxID_OK )
         {
-            updateNavTreeControl();      
+            updateNavTreeControl();
             if (!refreshRequested_)
             {
                 refreshRequested_ = true;
@@ -4171,7 +4171,7 @@
         as.Add(account->name_);
         arrAcctID[idx ++] = account->id_;
     }
-  
+
     wxSingleChoiceDialog scd (this, _("Choose Account to Delete"), _("Accounts"), as);
     if (scd.ShowModal() == wxID_OK)
     {
@@ -4192,7 +4192,7 @@
             {
                 refreshRequested_ = true;
                 wxCommandEvent ev(wxEVT_COMMAND_MENU_SELECTED, MENU_ACCTLIST);
-                GetEventHandler()->AddPendingEvent(ev); 
+                GetEventHandler()->AddPendingEvent(ev);
             }
         }
     }
@@ -4313,25 +4313,25 @@
 
 void mmGUIFrame::RunCustomSqlDialog(bool forEdit)
 {
-    //Use Shared pointer to ensure object gets destroyed if SQL Script errors hijack the object. 
-    boost::shared_ptr<mmCustomSQLDialog> dlg( new mmCustomSQLDialog(custRepIndex_, this, forEdit ));   
+    //Use Shared pointer to ensure object gets destroyed if SQL Script errors hijack the object.
+    boost::shared_ptr<mmCustomSQLDialog> dlg( new mmCustomSQLDialog(custRepIndex_, this, forEdit ));
     int dialogStatus = dlg->ShowModal();
     wxBeginBusyCursor(wxHOURGLASS_CURSOR);
     while (dialogStatus == wxID_MORE)
     {
-        if (dlg->sqlQuery() != wxT(""))   
-        {   
+        if (dlg->sqlQuery() != wxT(""))
+        {
             mmCustomSQLReport* csr = new mmCustomSQLReport(m_core.get(), dlg->sqlReportTitle(), dlg->sqlQuery());
             menuPrintingEnable(true);
             createReportsPage(csr);
-        } 
+        }
         dialogStatus = dlg->ShowModal();
     }
     wxEndBusyCursor();
 
     if (dialogStatus == wxID_OK) updateNavTreeControl();
 
-    dlg->Destroy();  
+    dlg->Destroy();
 }
 
 //----------------------------------------------------------------------------
@@ -4383,7 +4383,7 @@
 void mmGUIFrame::DeleteCustomSqlReport()
 {
     wxString msg = wxString() << _("Delete the Custom Report Title:")
-                              << wxT("\n\n")  
+                              << wxT("\n\n")
                               << custRepIndex_->currentReportTitle();
     if ( wxMessageBox(msg ,custRepIndex_->UserDialogHeading(),wxYES_NO|wxICON_QUESTION) == wxYES )
     {
@@ -4391,7 +4391,7 @@
 
         if (! custRepIndex_->currentReportFileName(false).IsEmpty())
         {
-            msg = wxString() << _("Do you want to delete the SQL file as well?") << wxT("\n"); 
+            msg = wxString() << _("Do you want to delete the SQL file as well?") << wxT("\n");
             if ( wxMessageBox(msg, custRepIndex_->UserDialogHeading(), wxYES_NO|wxNO_DEFAULT|wxICON_QUESTION) == wxYES)
             {
                 if (wxFileExists(custRepIndex_->currentReportFileName()))
@@ -4420,9 +4420,9 @@
 }
 //----------------------------------------------------------------------------
 
-wxNewDatabaseWizardPage1::wxNewDatabaseWizardPage1(mmNewDatabaseWizard* parent) : 
-    wxWizardPageSimple(parent), 
-    parent_(parent), 
+wxNewDatabaseWizardPage1::wxNewDatabaseWizardPage1(mmNewDatabaseWizard* parent) :
+    wxWizardPageSimple(parent),
+    parent_(parent),
     currencyID_(-1)
 {
     currencyID_ = parent_->m_core->currencyList_.getBaseCurrencySettings();
@@ -4477,13 +4477,13 @@
         return false;
     }
     userName = itemUserName_->GetValue().Trim();
-    mmDBWrapper::setInfoSettingValue(parent_->m_core->db_.get(), wxT("USERNAME"), userName); 
+    mmDBWrapper::setInfoSettingValue(parent_->m_core->db_.get(), wxT("USERNAME"), userName);
 
     return true;
 }
 //----------------------------------------------------------------------------
 
-wxAddAccountPage1::wxAddAccountPage1(mmAddAccountWizard* parent) : 
+wxAddAccountPage1::wxAddAccountPage1(mmAddAccountWizard* parent) :
     wxWizardPageSimple(parent), parent_(parent)
 {
     textAccountName_ = new wxTextCtrl(this, wxID_ANY, wxGetEmptyString(), wxDefaultPosition, wxSize(130,-1), 0 );
@@ -4493,7 +4493,7 @@
     mainSizer->Add( textAccountName_, 0 /* No stretching */, wxALL, 5 /* Border Size */);
 
     wxString helpMsg;
-    helpMsg << _("Specify a descriptive name for the account.") << wxT("\n")
+    helpMsg  << wxT("\n") << _("Specify a descriptive name for the account.") << wxT("\n")
             << _("This is generally the name of a financial institution\nwhere the account is held. For example: 'ABC Bank'.");
     mainSizer->Add(new wxStaticText(this, wxID_ANY, helpMsg ), 0, wxALL, 5);
 
@@ -4514,12 +4514,12 @@
 }
 //----------------------------------------------------------------------------
 
-wxAddAccountPage2::wxAddAccountPage2(mmAddAccountWizard *parent) : 
-    wxWizardPageSimple(parent), 
+wxAddAccountPage2::wxAddAccountPage2(mmAddAccountWizard *parent) :
+    wxWizardPageSimple(parent),
     parent_(parent)
 {
-    wxArrayString itemAcctTypeStrings;   
-    itemAcctTypeStrings.Add(_("Checking/Savings"));      // ACCOUNT_TYPE_BANK 
+    wxArrayString itemAcctTypeStrings;
+    itemAcctTypeStrings.Add(_("Checking/Savings"));      // ACCOUNT_TYPE_BANK
     itemAcctTypeStrings.Add(_("Investment"));            // ACCOUNT_TYPE_STOCK
     itemAcctTypeStrings.Add(_("Term"));                  // ACCOUNT_TYPE_TERM
 
@@ -4532,7 +4532,7 @@
     mainSizer->Add( itemChoiceType_, 0 /* No stretching*/, wxALL, 5 /* Border Size */);
 
     wxString textMsg;
-    textMsg << wxT("\n") 
+    textMsg << wxT("\n")
             << _("Select the type of account you want to create:") << wxT("\n\n")
             << _("General bank accounts cover a wide variety of account\ntypes like Checking, Savings and Credit card type accounts.");
     mainSizer->Add( new wxStaticText(this, wxID_ANY,textMsg), 0, wxALL, 5);
@@ -4607,7 +4607,7 @@
 */
 mmGUIApp::mmGUIApp()
 {
-#ifndef __MINGW32__ 
+#ifndef __MINGW32__
     wxHandleFatalExceptions(); // tell the library to call OnFatalException()
 #endif
 }
@@ -4621,8 +4621,8 @@
     try
     {
         wxApp::HandleEvent(handler, func, event);
-    } 
-    catch (wxSQLite3Exception &e) 
+    }
+    catch (wxSQLite3Exception &e)
     {
         wxLogError(e.GetMessage());
     }
@@ -4641,11 +4641,11 @@
     try
     {
         ok = wxApp::OnInit() && OnInitImpl(*this);
-    } 
+    }
     catch (wxSQLite3Exception &e)
     {
         wxLogError(e.GetMessage());
-    } 
+    }
     catch (std::exception &e)
     {
         wxString msg(e.what(), wxConvCurrent);
@@ -4655,7 +4655,7 @@
     return ok;
 }
 //----------------------------------------------------------------------------
-    
+
 void mmGUIApp::OnFatalException()
 {
     reportFatalException(wxDebugReport::Context_Exception);

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

Revision: 2207
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2207&view=rev
Author:   vomikan
Date:     2012-04-27 14:23:27 +0000 (Fri, 27 Apr 2012)
Log Message:
-----------
begin....commit for currency update

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-04-26 16:11:28 UTC (rev 2206)
+++ trunk/mmex/src/mmex.cpp	2012-04-27 14:23:27 UTC (rev 2207)
@@ -3801,18 +3801,20 @@
     // currency Z / currency Y = Z / Y
     // Therefore, if currency X is EUR and currency Y is the base currency,
     // currency Y : currency Z = base_rate / rate of Z : 1
-    for(int i=0; i<(int)currency_rate.GetCount(); i++)
+    for(int i = 0; i<(int)currency_rate.GetCount(); i++)
         rate_ptr[i] = base_rate / rate_ptr[i];
 
     // update currency rates
 
     wxString msg = _("Currency rate updated");
     msg << wxT("\n\n");
+
+    m_db->Begin();
     for (int idx = 0; idx < (int)m_core->currencyList_.currencies_.size(); idx++)
     {
         wxString currencySymbol  = m_core->currencyList_.currencies_[idx]->currencySymbol_;
 
-        for(int i=0; i<(int)currency_name.GetCount(); i++)
+        for(int i = 0; i<(int)currency_name.GetCount(); i++)
         {
             if(currency_name[i] == currencySymbol)
             {
@@ -3825,6 +3827,7 @@
             }
         } // for i loop
     }
+    m_db->Commit();
 
     delete[] rate_ptr;
 

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

Revision: 2208
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2208&view=rev
Author:   stef145g
Date:     2012-04-27 16:06:45 +0000 (Fri, 27 Apr 2012)
Log Message:
-----------
Removing progress bar to verify database integrity as too quick to be helpful.

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-04-27 14:23:27 UTC (rev 2207)
+++ trunk/mmex/src/mmex.cpp	2012-04-27 16:06:45 UTC (rev 2208)
@@ -3063,14 +3063,16 @@
 
 void mmGUIFrame::openDataBase(const wxString& fileName)
 {
-    wxProgressDialog dlg(_("Please Wait"),
-        _("Opening Database File && Verifying Integrity"), 100, this,
-        wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_SMOOTH );
+    //wxProgressDialog dlg(_("Please Wait"),
+    //    _("Opening Database File && Verifying Integrity"), 100, this,
+    //    wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_SMOOTH );
 
-    mmDBWrapper::initDB(m_db.get(), &dlg);
-    dlg.Update(100);
-    dlg.Destroy();
+    //mmDBWrapper::initDB(m_db.get(), &dlg);
+    //dlg.Update(100);
+    //dlg.Destroy();
 
+    mmDBWrapper::initDB(m_db.get(), 0);
+
     wxString title = mmex::getProgramName() + wxT(" : ") + fileName;
 
     if (mmex::isPortableMode())

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

Revision: 2285
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2285&view=rev
Author:   vomikan
Date:     2012-05-09 12:59:00 +0000 (Wed, 09 May 2012)
Log Message:
-----------
new currency updater

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-05-09 12:41:13 UTC (rev 2284)
+++ trunk/mmex/src/mmex.cpp	2012-05-09 12:59:00 UTC (rev 2285)
@@ -64,6 +64,7 @@
 #include "customreportindex.h"
 #include "customreportdialog.h"
 #include <boost/version.hpp>
+#include "mmyahoo.h"
 //----------------------------------------------------------------------------
 
 /* Include XPM Support */
@@ -132,6 +133,8 @@
 #include <boost/scoped_array.hpp>
 #include <string>
 //----------------------------------------------------------------------------
+#include "mmex_db_view.h"
+#include <boost/foreach.hpp>
 
 namespace
 {
@@ -3602,22 +3605,11 @@
 
     // Access current version details page
     wxString site = wxT("http://www.codelathe.com/mmex/version.html");
-    wxURL url(site);
 
-    unsigned char buf[1024];
-    boost::scoped_ptr<wxInputStream> in_stream(url.GetInputStream());
-    if (!in_stream)
-    {
-        versionDetails << _("Unable to connect!");
-        wxMessageBox(versionDetails, _("MMEX System Information Check"));
+    wxString page;
+    if (site_content(site, page) != 0)
         return;
-    }
-    in_stream->Read(buf, 1024);
-    //size_t bytes_read=in_stream->LastRead();
-    in_stream.reset();
-    buf[53] = '\0';
-
-    wxString page = wxString::FromAscii((const char *)buf);
+        
     /*************************************************************************
         Expected format of the string from the internet. Version: 0.9.8.0
         page = wxT("x.x.x.x - Win: w.w.w.w - Unix: u.u.u.u - Mac: m.m.m.m");
@@ -3657,7 +3649,7 @@
     }
 
     wxString urlString = wxT("http://www.codelathe.com/mmex");
-    versionDetails << wxT("\n\n") << _("Proceed to website: ") << urlString;
+    versionDetails << wxT("\n\n") << _("Proceed to website: ") << urlString << wxT("     ");
     if (wxMessageBox(versionDetails, _("MMEX System Information Check"), style) == wxOK)
         wxLaunchDefaultBrowser(urlString);
 }
@@ -3665,177 +3657,106 @@
 
 void mmGUIFrame::OnOnlineUpdateCurRate(wxCommandEvent& /*event*/)
 {
-    wxArrayString   currency_name, currency_rate;
-    double          *rate_ptr, rate_value, base_rate;
-
-    // we will get latest currency rate data from European Central Bank
-    wxString site = wxT("http://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml");
-
-    if (!m_core)
-    {
-       wxMessageBox(_("No database!"), _("Update Currency Rate"), wxICON_WARNING);
-       return;
-    }
-
-    wxURL url(site);
-
-    wxInputStream* in_stream = url.GetInputStream();
-
-    if (!in_stream)
-    {
-        wxMessageBox(_("Unable to connect!"), _("Update Currency Rate"), wxICON_WARNING);
+    std::vector<DB_View_CURRENCYFORMATS_V1::Data> all_currency = CURRENCYFORMATS_V1.all(m_core->db_.get());
+    if (all_currency.empty())
         return;
-    }
 
-    wxXmlDocument doc;
+    wxString site;
+    wxSortedArrayString symbols_array;
+    int currencyID = mmDBWrapper::getBaseCurrencySettings(m_core->db_.get());
+    wxString base_symbol = mmDBWrapper::getCurrencySymbol(m_core->db_.get(), currencyID);
 
-    if(!doc.Load(*in_stream))
+    if(base_symbol.IsEmpty())
     {
-        wxMessageBox(_("Cannot get data from WWW!"), _("Update Currency Rate"), wxICON_WARNING);
+        wxMessageBox(_("Could not find base currency symbol!"), _("Update Currency Rate"), wxICON_WARNING);
         return;
     }
 
-    // decode received XML data
-    if(doc.GetRoot()->GetName() != wxT("gesmes:Envelope"))
+    BOOST_FOREACH(const DB_View_CURRENCYFORMATS_V1::Data &currency, all_currency)
     {
-        wxMessageBox(_("Incorrect XML data (#1)!"), _("Update Currency Rate"), wxICON_WARNING);
-        return;
-    }
-
-    wxXmlNode *root_child = doc.GetRoot()->GetChildren();
-
-    while(root_child)
-    {
-        if(root_child->GetName() == wxT("gesmes:subject"))
-        {
-            if(root_child->GetNodeContent() != wxT("Reference rates"))
-            {
-                wxMessageBox(_("Incorrect XML data (#2)!"), _("Update Currency Rate"), wxICON_WARNING);
-                return;
+        wxString currency_symbol = currency.CURRENCY_SYMBOL.Upper();
+        if (!currency_symbol.IsEmpty()) {
+            if (wxNOT_FOUND == symbols_array.Index(currency_symbol) &&
+                    base_symbol != currency_symbol) {
+                symbols_array.Add(currency_symbol);
+                site << currency.CURRENCY_SYMBOL.Upper() << base_symbol << wxT("=X+");
             }
         }
-        else if (root_child->GetName() == wxT("gesmes:Sender"))
-        {
-            wxXmlNode *sender_child = root_child->GetChildren();
+    }
+    site.RemoveLast(1);
 
-            if(!sender_child)
-            {
-                wxMessageBox(_("Incorrect XML data (#3)!"), _("Update Currency Rate"), wxICON_WARNING);
-                return;
-            }
+    mmYahoo* yahoo_ = new mmYahoo(m_inidb.get(), m_core->db_.get());
 
-            if(sender_child->GetName() != wxT("gesmes:name"))
-            {
-                wxMessageBox(_("Incorrect XML data (#4)!"), _("Update Currency Rate"), wxICON_WARNING);
-                return;
-            }
+    //Sample:
+    //http://finance.yahoo.com/d/quotes.csv?s=EURUSD=X+RUBUSD=X&f=sl1n&e=.csv
+    site = wxString() << wxT("http://") << yahoo_->Server_
+            << wxT("/d/quotes.csv?s=") << site;
+    site << wxT("&f=") << yahoo_->CSVColumns_ << wxT("&e=.csv");
 
-            if(sender_child->GetNodeContent() != wxT("European Central Bank"))
-            {
-                wxMessageBox(_("Incorrect XML data (#5)!"), _("Update Currency Rate"), wxICON_WARNING);
-                return;
-            }
-        }
-        else if (root_child->GetName() == wxT("Cube"))
-        {
-            wxXmlNode *cube_lv1_child = root_child->GetChildren();
+    wxString rates;
+    if (site_content(site, rates) != 0)
+        return;
 
-            if(!cube_lv1_child)
-            {
-                wxMessageBox(_("Incorrect XML data (#6)!"), _("Update Currency Rate"), wxICON_WARNING);
-                return;
-            }
+    wxString CurrencySymbol, dName;
+    double dRate = 0;
 
-            if(cube_lv1_child->GetName() != wxT("Cube"))
-            {
-                wxMessageBox(_("Incorrect XML data (#7)!"), _("Update Currency Rate"), wxICON_WARNING);
-                return;
-            }
+    std::map<wxString, std::pair<double, wxString> > currency_data;
 
-            wxXmlNode *cube_lv2_child = cube_lv1_child->GetChildren();
+    // Break it up into lines
+    wxStringTokenizer tkz(rates, wxT("\r\n"));
 
-            // set default base currency and its rate
-            currency_name.Add(wxT("EUR"));
-            currency_rate.Add(wxT("1.0"));
+    while (tkz.HasMoreTokens())
+    {
+        wxString csvline = tkz.GetNextToken();
 
-            while(cube_lv2_child)
+        /*** Grab the relevant bits (for now only the symbol and the current price) */
+        wxStringTokenizer csvsimple(csvline,wxT("\","),wxTOKEN_STRTOK);
+        if (csvsimple.HasMoreTokens())
+        {
+            CurrencySymbol = csvsimple.GetNextToken();
+            if (csvsimple.HasMoreTokens())
             {
-                wxString name = cube_lv2_child->GetPropVal(wxT("currency"), wxGetEmptyString());
-                wxString rate = cube_lv2_child->GetPropVal(wxT("rate"), wxT("1"));
-
-                currency_name.Add(name);
-                currency_rate.Add(rate);
-
-                cube_lv2_child = cube_lv2_child->GetNext();
+                csvsimple.GetNextToken().ToDouble(&dRate);
+                if (csvsimple.HasMoreTokens())
+                    dName = csvsimple.GetNextToken();
             }
         }
-        root_child = root_child->GetNext();
+        currency_data.insert(std::make_pair(CurrencySymbol, std::make_pair(dRate, dName)));
     }
 
-    // Get base currency and the adjust currency rate for each currency
-    rate_ptr = new double[currency_rate.GetCount()];
+    CURRENCYFORMATS_V1.begin(m_core->db_.get());
 
-    int currencyID = mmDBWrapper::getBaseCurrencySettings(m_core->db_.get());
-    wxString base_symbol = mmDBWrapper::getCurrencySymbol(m_core->db_.get(), currencyID);
-    base_rate = 0;
-
-    for(int i=0; i<(int)currency_rate.GetCount(); i++)
+    wxString msg = wxT("");
+    BOOST_FOREACH(DB_View_CURRENCYFORMATS_V1::Data &currency, all_currency)
     {
-        if(currency_rate[i].ToDouble(&rate_value) == false)
-        {
-            rate_ptr[i] = 1.0;
-        } else
-        {
-            rate_ptr[i] = rate_value;
-            if(currency_name[i] == base_symbol)
-                base_rate = rate_value;
-        }
-    }
+        wxString currency_symbol = currency.CURRENCY_SYMBOL.Upper();
+        if (!currency_symbol.IsEmpty() && base_symbol != currency_symbol) {
+            wxString currency_symbols_pair = currency_symbol + base_symbol + wxT("=X");
 
-    if(base_rate == 0)
-    {
-        wxMessageBox(_("Could not find base currency symbol!"), _("Update Currency Rate"), wxICON_WARNING);
-        return;
-    }
+            std::pair<double, wxString> data = currency_data[currency_symbols_pair];
 
-    // Note:
-    // Suppose currency Y / currency X = Y / X and currency Z / currency X = Z / X, then
-    // currency Z / currency Y = Z / Y
-    // Therefore, if currency X is EUR and currency Y is the base currency,
-    // currency Y : currency Z = base_rate / rate of Z : 1
-    for(int i = 0; i<(int)currency_rate.GetCount(); i++)
-        rate_ptr[i] = base_rate / rate_ptr[i];
+            double rate = data.first;
 
-    // update currency rates
+            msg << currency_symbol << wxT(" : ") << currency.BASECONVRATE << wxT("\t -> \t") << rate << wxT("\n");
 
-    wxString msg = _("Currency rate updated");
-    msg << wxT("\n\n");
+            if (rate > 0.000001)
+                currency.BASECONVRATE = rate;
 
-    m_db->Begin();
-    for (int idx = 0; idx < (int)m_core->currencyList_.currencies_.size(); idx++)
-    {
-        wxString currencySymbol  = m_core->currencyList_.currencies_[idx]->currencySymbol_;
-
-        for(int i = 0; i<(int)currency_name.GetCount(); i++)
-        {
-            if(currency_name[i] == currencySymbol)
-            {
-                double rate = m_core->currencyList_.currencies_[idx]->baseConv_ ;
-                if (rate != rate_ptr[i])
-                msg << currencySymbol << wxT(" : ") << rate << wxT(" -> ") << rate_ptr[i] << wxT("\n");
-
-                m_core->currencyList_.currencies_[idx]->baseConv_ = rate_ptr[i];
-                m_core->currencyList_.updateCurrency(m_core->currencyList_.currencies_[idx]);
+            // store into db
+            if (currency.save(m_core->db_.get())) {
+                for (int idx = 0; idx < (int)m_core->currencyList_.currencies_.size(); idx++)
+                {
+                    wxString currencySymbol  = m_core->currencyList_.currencies_[idx]->currencySymbol_;
+                    if (currencySymbol == currency_symbol)
+                        m_core->currencyList_.currencies_[idx]->baseConv_ = rate;
+                }
             }
-        } // for i loop
+        }
     }
-    m_db->Commit();
 
-    delete[] rate_ptr;
+    CURRENCYFORMATS_V1.commit(m_core->db_.get());
 
     wxMessageDialog msgDlg(this, msg, _("Currency rate updated"));
-
-    //fileviewer(wxT(""), this).ShowModal();
     msgDlg.ShowModal();
 
     createHomePage();

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

Revision: 2288
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2288&view=rev
Author:   guanlisheng
Date:     2012-05-09 14:00:17 +0000 (Wed, 09 May 2012)
Log Message:
-----------
cleanup

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-05-09 13:21:10 UTC (rev 2287)
+++ trunk/mmex/src/mmex.cpp	2012-05-09 14:00:17 UTC (rev 2288)
@@ -131,7 +131,6 @@
 #include <wx/xml/xml.h>
 //----------------------------------------------------------------------------
 #include <boost/scoped_array.hpp>
-#include <string>
 //----------------------------------------------------------------------------
 #include "mmex_db_view.h"
 #include <boost/foreach.hpp>

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

Revision: 2295
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2295&view=rev
Author:   guanlisheng
Date:     2012-05-10 02:08:15 +0000 (Thu, 10 May 2012)
Log Message:
-----------
decoupling

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-05-10 02:01:30 UTC (rev 2294)
+++ trunk/mmex/src/mmex.cpp	2012-05-10 02:08:15 UTC (rev 2295)
@@ -27,7 +27,6 @@
 #include "assetspanel.h"
 #include "univcsvdialog.h"
 #include "htmlbuilder.h"
-#include "reportbase.h"
 #include "reportsummary.h"
 #include "reportcategexp.h"
 #include "reportpayee.h"
@@ -135,6 +134,8 @@
 #include "mmex_db_view.h"
 #include <boost/foreach.hpp>
 
+class mmPrintableBase;
+
 namespace
 {
 

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

Revision: 2366
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2366&view=rev
Author:   guanlisheng
Date:     2012-05-23 03:27:38 +0000 (Wed, 23 May 2012)
Log Message:
-----------


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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-05-23 02:33:46 UTC (rev 2365)
+++ trunk/mmex/src/mmex.cpp	2012-05-23 03:27:38 UTC (rev 2366)
@@ -291,6 +291,10 @@
 
     inidb.Close();
 
+#if defined (__WXMAC__) || defined (__WXOSX__)
+    wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), 1);
+#endif
+
     mmGUIFrame *frame = new mmGUIFrame(mmex::getProgramName(), wxPoint(valx, valy), wxSize(valw, valh));
     bool ok = frame->Show();
     wxASSERT(ok);

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

Revision: 2367
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2367&view=rev
Author:   guanlisheng
Date:     2012-05-23 05:57:03 +0000 (Wed, 23 May 2012)
Log Message:
-----------


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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-05-23 03:27:38 UTC (rev 2366)
+++ trunk/mmex/src/mmex.cpp	2012-05-23 05:57:03 UTC (rev 2367)
@@ -292,8 +292,12 @@
     inidb.Close();
 
 #if defined (__WXMAC__) || defined (__WXOSX__)
+#if wxCHECK_VERSION(2,9,0)
     wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), 1);
+#else
+    wxSystemOptions::SetOption(wxMAC_ALWAYS_USE_GENERIC_LISTCTRL, 1);
 #endif
+#endif
 
     mmGUIFrame *frame = new mmGUIFrame(mmex::getProgramName(), wxPoint(valx, valy), wxSize(valw, valh));
     bool ok = frame->Show();

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

Revision: 2375
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2375&view=rev
Author:   vomikan
Date:     2012-05-23 09:38:23 +0000 (Wed, 23 May 2012)
Log Message:
-----------
cleanup

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-05-23 09:34:42 UTC (rev 2374)
+++ trunk/mmex/src/mmex.cpp	2012-05-23 09:38:23 UTC (rev 2375)
@@ -127,7 +127,7 @@
 #include <wx/debugrpt.h>
 #include <wx/sysopt.h>
 #include <wx/wizard.h>
-#include <wx/xml/xml.h>
+
 //----------------------------------------------------------------------------
 #include <boost/scoped_array.hpp>
 //----------------------------------------------------------------------------
@@ -3618,7 +3618,7 @@
             wxMessageBox(_("Unable to connect!"), update_check_heading, wxICON_WARNING);
         return;
     }
-    
+
 //  Included for future testing
 //  page = wxT("x.x.x.x - Win: w.w.w.w - Unix: u.u.u.u - Mac: m.m.m.m");
 //  page = wxT("9.9.9.9 - Win: 0.9.9.0 - Unix: 0.9.9.0 - Mac: 0.9.9.0");

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

Revision: 2378
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2378&view=rev
Author:   guanlisheng
Date:     2012-05-24 00:44:55 +0000 (Thu, 24 May 2012)
Log Message:
-----------
format & cleanup

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-05-24 00:28:51 UTC (rev 2377)
+++ trunk/mmex/src/mmex.cpp	2012-05-24 00:44:55 UTC (rev 2378)
@@ -584,9 +584,7 @@
     recentFiles_ = new RecentDatabaseFiles(m_inidb.get(), menuRecentFiles_);
 
     // add the toolbars to the manager
-    m_mgr.AddPane(toolBar_, wxAuiPaneInfo().
-        Name(wxT("toolbar")).Caption(wxT("Toolbar")).ToolbarPane().Top().
-        LeftDockable(false).RightDockable(false));
+    m_mgr.AddPane(toolBar_, wxAuiPaneInfo().Name(wxT("toolbar")).Caption(wxT("Toolbar")).ToolbarPane().Top().LeftDockable(false).RightDockable(false));
 
     // change look and feel of wxAuiManager
     m_mgr.GetArtProvider()->SetMetric(16, 0);
@@ -595,8 +593,7 @@
     // Save default perspective
     m_perspective = m_mgr.SavePerspective();
 
-    wxString auiPerspective = mmDBWrapper::getINISettingValue(m_inidb.get(),
-        wxT("AUIPERSPECTIVE"), m_perspective);
+    wxString auiPerspective = mmDBWrapper::getINISettingValue(m_inidb.get(), wxT("AUIPERSPECTIVE"), m_perspective);
 
     m_mgr.LoadPerspective(auiPerspective);
 
@@ -622,14 +619,16 @@
 
     wxFileName dbpath = from_scratch ? wxGetEmptyString() : mmDBWrapper::getLastDbPath(m_inidb.get());
 
-    if (from_scratch || !dbpath.IsOk()) {
+    if (from_scratch || !dbpath.IsOk()) 
+    {
         menuEnableItems(false);
         createHomePage();
         updateNavTreeControl();
         showBeginAppDialog(dbpath.GetFullName().IsEmpty());
-    } else {
-        if (!openFile(dbpath.GetFullPath(), false))
-            showBeginAppDialog(true);
+    } 
+    else 
+    {
+        if (!openFile(dbpath.GetFullPath(), false)) showBeginAppDialog(true);
     }
 }
 //----------------------------------------------------------------------------
@@ -2567,8 +2566,7 @@
 {
     wxSizer *sizer = cleanupHomePanel();
 
-    panelCurrent_ = new mmReportsPanel(this, m_db.get(), rs, homePanel, ID_PANEL3,
-        wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL);
+    panelCurrent_ = new mmReportsPanel(this, m_db.get(), rs, homePanel, ID_PANEL3, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL);
 
     sizer->Add(panelCurrent_, 1, wxGROW|wxALL, 1);
 

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

Revision: 2413
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2413&view=rev
Author:   guanlisheng
Date:     2012-05-25 08:45:52 +0000 (Fri, 25 May 2012)
Log Message:
-----------
format

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-05-25 06:18:36 UTC (rev 2412)
+++ trunk/mmex/src/mmex.cpp	2012-05-25 08:45:52 UTC (rev 2413)
@@ -217,7 +217,7 @@
 /*
     See also: wxStackWalker, wxDebugReportUpload.
 */
-void reportFatalException(wxDebugReport::Context ctx)
+void reportFatalException(const wxDebugReport::Context& ctx)
 {
     wxDebugReportCompress rep;
 

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

Revision: 2418
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2418&view=rev
Author:   stef145g
Date:     2012-05-27 01:34:54 +0000 (Sun, 27 May 2012)
Log Message:
-----------
Fix: Warnings for wxWidgets 2.8.x and 2.9.X 

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-05-26 20:18:09 UTC (rev 2417)
+++ trunk/mmex/src/mmex.cpp	2012-05-27 01:34:54 UTC (rev 2418)
@@ -3869,7 +3869,12 @@
     pinterData->SetMarginBottomRight(bottomRight);
 
     wxPrintData* printerData = printer_->GetPrintData();
+    // fix warning for wxWidgets 2.9.3
+#if wxCHECK_VERSION(2,9,0)
+    printerData->SetOrientation((wxPrintOrientation)pageOrientation);
+#else // use code for wxWidgets 2.8.x  
     printerData->SetOrientation(pageOrientation);
+#endif
     printerData->SetPaperId( (wxPaperSize)paperID );
 }
 

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

Revision: 2422
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2422&view=rev
Author:   guanlisheng
Date:     2012-05-27 11:49:44 +0000 (Sun, 27 May 2012)
Log Message:
-----------
cleanup

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-05-27 11:15:30 UTC (rev 2421)
+++ trunk/mmex/src/mmex.cpp	2012-05-27 11:49:44 UTC (rev 2422)
@@ -291,14 +291,6 @@
 
     inidb.Close();
 
-#if defined (__WXMAC__) || defined (__WXOSX__)
-#if wxCHECK_VERSION(2,9,0)
-    wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), 1);
-#else
-    wxSystemOptions::SetOption(wxMAC_ALWAYS_USE_GENERIC_LISTCTRL, 1);
-#endif
-#endif
-
     mmGUIFrame *frame = new mmGUIFrame(mmex::getProgramName(), wxPoint(valx, valy), wxSize(valw, valh));
     bool ok = frame->Show();
     wxASSERT(ok);

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

Revision: 2454
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2454&view=rev
Author:   guanlisheng
Date:     2012-05-29 13:42:29 +0000 (Tue, 29 May 2012)
Log Message:
-----------


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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-05-29 13:32:14 UTC (rev 2453)
+++ trunk/mmex/src/mmex.cpp	2012-05-29 13:42:29 UTC (rev 2454)
@@ -134,6 +134,8 @@
 #include "mmex_db_view.h"
 #include <boost/foreach.hpp>
 
+#define _MM_EX_MMEX_CPP_REVISION_ID    "$Revision$"
+
 class mmPrintableBase;
 
 namespace
@@ -555,6 +557,9 @@
 {
     // tell wxAuiManager to manage this frame
     m_mgr.SetManagedWindow(this);
+    CreateStatusBar();
+    wxStatusBar *sb = GetStatusBar();
+    if (sb) sb->SetStatusText(wxT(_MM_EX_MMEX_CPP_REVISION_ID));
 
     SetIcon(mmex::getProgramIcon());
     SetMinSize(wxSize(800,600));

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

Revision: 2464
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2464&view=rev
Author:   vomikan
Date:     2012-05-30 07:00:20 +0000 (Wed, 30 May 2012)
Log Message:
-----------
worning fix for wx2.9.3

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-05-30 06:31:37 UTC (rev 2463)
+++ trunk/mmex/src/mmex.cpp	2012-05-30 07:00:20 UTC (rev 2464)
@@ -3498,15 +3498,15 @@
         menuBar_->FindItem(MENU_VIEW_BUDGET_CATEGORY_SUMMARY)->Check(mmIniOptions::instance().budgetSummaryWithoutCategories_);
         menuBar_->FindItem(MENU_IGNORE_FUTURE_TRANSACTIONS)->Check(mmIniOptions::instance().ignoreFutureTransactions_);
 
-        int messageIcon = wxICON_INFORMATION;
+        int style = wxICON_INFORMATION|wxOK;
         wxString sysMsg = wxString() << _("MMEX Options have been updated.") << wxT("\n\n");
         if (systemOptions.RequiresRestart())
         {
-            messageIcon = wxICON_WARNING;
+            style = wxICON_WARNING|wxOK;
             sysMsg << _("Recommendation: Shut down and restart MMEX.") << wxT("\n")
                    << _("This will allow all MMEX option updates to take effect.");
         }
-        wxMessageBox(sysMsg, _("New MMEX Options"), messageIcon);
+        wxMessageBox(sysMsg, _("New MMEX Options"), style);
 
         createHomePage();
         updateNavTreeControl();

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

Revision: 2524
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2524&view=rev
Author:   guanlisheng
Date:     2012-06-04 05:44:09 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------
wxConfig

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-06-04 03:54:18 UTC (rev 2523)
+++ trunk/mmex/src/mmex.cpp	2012-06-04 05:44:09 UTC (rev 2524)
@@ -265,30 +265,16 @@
     /* Load MMEX Custom Settings */
     mmIniOptions::instance().loadOptions(&inidb);
 
+    wxConfigBase *config = wxConfigBase::Get();
     /* Was App Maximized? */
-    wxString isMaxStrDef = ("FALSE");
-    wxString isMaxStr = mmDBWrapper::getINISettingValue(&inidb, ("ISMAXIMIZED"), isMaxStrDef);
+    bool isMax = config->ReadBool("ISMAXIMIZED", false);
 
     /* Load Dimensions of Window */
-    wxString originX = ("50");
-    wxString originY = ("50");
-    wxString sizeW = ("800");
-    wxString sizeH = ("600");
-    wxString valxStr = mmDBWrapper::getINISettingValue(&inidb, ("ORIGINX"), originX);
-    wxString valyStr = mmDBWrapper::getINISettingValue(&inidb, ("ORIGINY"), originY);
-    wxString valWStr = mmDBWrapper::getINISettingValue(&inidb, ("SIZEW"),  sizeW);
-    wxString valHStr = mmDBWrapper::getINISettingValue(&inidb, ("SIZEH"),  sizeH);
+    long valx = config->ReadLong("ORIGINX", 50);
+    long valy = config->ReadLong("ORIGINY", 50);
+    long valw = config->ReadLong("SIZEW", 800);
+    long valh = config->ReadLong("SIZEH", 600);
 
-    long valx = 0;
-    long valy = 0;
-    long valw = 0;
-    long valh = 0;
-
-    valxStr.ToLong(&valx);
-    valyStr.ToLong(&valy);
-    valWStr.ToLong(&valw);
-    valHStr.ToLong(&valh);
-
     mmSelectLanguage(0, &inidb, false);
 
     inidb.Close();
@@ -297,9 +283,7 @@
     bool ok = frame->Show();
     wxASSERT(ok);
 
-    if (isMaxStr == ("TRUE")) {
-        frame->Maximize(true);
-    }
+    frame->Maximize(isMax);
 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned FALSE here, the
@@ -913,18 +897,12 @@
     this->GetPosition(&valx, &valy);
     this->GetSize(&valw, &valh);
 
-    wxString valxs = wxString::Format(("%d"), valx);
-    wxString valys = wxString::Format(("%d"), valy);
-    wxString valws = wxString::Format(("%d"), valw);
-    wxString valhs = wxString::Format(("%d"), valh);
-
-    m_inidb.get()->Begin();
-    mmDBWrapper::setINISettingValue(m_inidb.get(), ("ORIGINX"), valxs);
-    mmDBWrapper::setINISettingValue(m_inidb.get(), ("ORIGINY"), valys);
-    mmDBWrapper::setINISettingValue(m_inidb.get(), ("SIZEW"), valws);
-    mmDBWrapper::setINISettingValue(m_inidb.get(), ("SIZEH"), valhs);
-    mmDBWrapper::setINISettingValue(m_inidb.get(), ("ISMAXIMIZED"), this->IsMaximized() ? ("TRUE") : ("FALSE"));
-    m_inidb.get()->Commit();
+    wxConfigBase *config = wxConfigBase::Get();
+    config->Write("ORIGINX", valx);
+    config->Write("ORIGINY", valx);
+    config->Write("SIZEW", valw);
+    config->Write("SIZEH", valh);
+    config->Write("ISMAXIMIZED", this->IsMaximized());
 }
 //----------------------------------------------------------------------------
 

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

Revision: 2526
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2526&view=rev
Author:   guanlisheng
Date:     2012-06-04 06:41:13 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------
wxconfig

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-06-04 06:12:00 UTC (rev 2525)
+++ trunk/mmex/src/mmex.cpp	2012-06-04 06:41:13 UTC (rev 2526)
@@ -571,13 +571,9 @@
     m_mgr.GetArtProvider()->SetMetric(16, 0);
     m_mgr.GetArtProvider()->SetMetric(3, 1);
 
-    // Save default perspective
-    m_perspective = m_mgr.SavePerspective();
+    wxConfigBase *config = wxConfigBase::Get();
+    m_mgr.LoadPerspective(config->Read("AUIPERSPECTIVE"));
 
-    wxString auiPerspective = mmDBWrapper::getINISettingValue(m_inidb.get(), ("AUIPERSPECTIVE"), m_perspective);
-
-    m_mgr.LoadPerspective(auiPerspective);
-
     // "commit" all changes made to wxAuiManager
     m_mgr.Update();
 
@@ -882,22 +878,18 @@
     wxFileName fname(fileName_);
     mmDBWrapper::setLastDbPath(m_inidb.get(), fname.GetFullPath());
 
+    wxConfigBase *config = wxConfigBase::Get();
     /* Aui Settings */
-    m_perspective = m_mgr.SavePerspective();
-    mmDBWrapper::setINISettingValue(m_inidb.get(), ("AUIPERSPECTIVE"), m_perspective);
+    config->Write("AUIPERSPECTIVE", m_mgr.SavePerspective());
 
     // prevent values being saved while window is in an iconised state.
     if (this->IsIconized()) this->Restore();
 
-    int valx = 0;
-    int valy = 0;
-    int valw = 0;
-    int valh = 0;
+    int valx = 0, valy = 0, valw = 0, valh = 0;
 
     this->GetPosition(&valx, &valy);
     this->GetSize(&valw, &valh);
 
-    wxConfigBase *config = wxConfigBase::Get();
     config->Write("ORIGINX", valx);
     config->Write("ORIGINY", valx);
     config->Write("SIZEW", valw);

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

Revision: 2531
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2531&view=rev
Author:   vomikan
Date:     2012-06-05 12:28:44 +0000 (Tue, 05 Jun 2012)
Log Message:
-----------
added wxFileConfig for portable mode

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-06-05 11:19:51 UTC (rev 2530)
+++ trunk/mmex/src/mmex.cpp	2012-06-05 12:28:44 UTC (rev 2531)
@@ -265,7 +265,11 @@
     /* Load MMEX Custom Settings */
     mmIniOptions::instance().loadOptions(&inidb);
 
-    wxConfigBase *config = wxConfigBase::Get();
+    wxFileConfig *config = new wxFileConfig("", "",
+        mmex::GetSharedDir().GetPathWithSep()+ mmex::GetAppName() + ".conf",
+        "", wxCONFIG_USE_LOCAL_FILE|wxCONFIG_USE_SUBDIR );   
+    wxConfigBase::Set(config);
+
     /* Was App Maximized? */
     bool isMax = config->ReadBool("ISMAXIMIZED", false);
 
@@ -3308,6 +3312,8 @@
 void mmGUIFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     autoRepeatTransactionsTimer_.Stop();
+    delete wxConfigBase::Set((wxConfigBase *) NULL);
+    this->Destroy();
     Close(TRUE);
 }
 //----------------------------------------------------------------------------

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

Revision: 2551
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2551&view=rev
Author:   vomikan
Date:     2012-06-09 12:01:36 +0000 (Sat, 09 Jun 2012)
Log Message:
-----------
printer settings to wxConfigBase

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-06-09 11:45:22 UTC (rev 2550)
+++ trunk/mmex/src/mmex.cpp	2012-06-09 12:01:36 UTC (rev 2551)
@@ -3800,24 +3800,16 @@
 
 void mmGUIFrame::restorePrinterValues()
 {
-    // Startup Default Settings
+    wxConfigBase *config = wxConfigBase::Get();
+
     wxString paperID_String     = wxString() << wxPAPER_A4;
     wxString pageOrientationStr = wxString() << wxPORTRAIT;
-
-    long leftMargin;
-    long rightMargin;
-    long topMargin;
-    long bottomMargin;
-    long paperID;
-    long pageOrientation;
-
-    mmDBWrapper::getINISettingValue( m_inidb.get(), ("PRINTER_LEFT_MARGIN"), ("20") ).ToLong(&leftMargin);
-    mmDBWrapper::getINISettingValue( m_inidb.get(), ("PRINTER_RIGHT_MARGIN"), ("20")).ToLong(&rightMargin);
-    mmDBWrapper::getINISettingValue( m_inidb.get(), ("PRINTER_TOP_MARGIN"), ("20")).ToLong(&topMargin);
-    mmDBWrapper::getINISettingValue( m_inidb.get(), ("PRINTER_BORTTOM_MARGIN"), ("20")).ToLong(&bottomMargin);
-    mmDBWrapper::getINISettingValue( m_inidb.get(), ("PRINTER_PAGE_ORIENTATION"), pageOrientationStr).ToLong(&pageOrientation);
-    mmDBWrapper::getINISettingValue( m_inidb.get(), ("PRINTER_PAGE_ID"), paperID_String).ToLong(&paperID);
-
+    long leftMargin = config->ReadLong(("PRINTER_LEFT_MARGIN"), 20);
+    long rightMargin = config->ReadLong(("PRINTER_RIGHT_MARGIN"), 20);
+    long topMargin = config->ReadLong(("PRINTER_TOP_MARGIN"), 20);
+    long bottomMargin = config->ReadLong(("PRINTER_BOTTOM_MARGIN"), 20);
+    long paperID = config->ReadLong(("PRINTER_PAGE_ID"), wxPAPER_A4);
+    long pageOrientation = config->ReadLong(("PRINTER_PAGE_ORIENTATION"), wxPORTRAIT);
     wxPoint topLeft(leftMargin, topMargin);
     wxPoint bottomRight(rightMargin, bottomMargin);
 
@@ -3839,6 +3831,8 @@
 {
     if (printer_)
     {
+        wxConfigBase *config = wxConfigBase::Get();
+
         printer_->PageSetup();
 
         wxPageSetupDialogData* printerDialogData = printer_->GetPageSetupData();
@@ -3846,30 +3840,16 @@
         wxPoint bottomRight = printerDialogData->GetMarginBottomRight();
 
         wxPrintData* printerData = printer_->GetPrintData();
-        int pageOrientation = printerData->GetOrientation();
+        long pageOrientation = printerData->GetOrientation();
         wxPaperSize paperID = printerData->GetPaperId();
-
-        m_inidb.get()->Begin();
-
-        wxString leftMargin = wxString() << topLeft.x ;
-        mmDBWrapper::setINISettingValue( m_inidb.get(), ("PRINTER_LEFT_MARGIN"), leftMargin);
-
-        wxString rightMargin = wxString() << bottomRight.x;
-        mmDBWrapper::setINISettingValue( m_inidb.get(), ("PRINTER_RIGHT_MARGIN"), rightMargin);
-
-        wxString topMargin = wxString() << topLeft.y ;
-        mmDBWrapper::setINISettingValue( m_inidb.get(), ("PRINTER_TOP_MARGIN"), topMargin);
-
-        wxString bottomMargin = wxString() << bottomRight.y ;
-        mmDBWrapper::setINISettingValue( m_inidb.get(), ("PRINTER_BORTTOM_MARGIN"), bottomMargin);
-
-        wxString orientation = wxString() << pageOrientation;
-        mmDBWrapper::setINISettingValue( m_inidb.get(), ("PRINTER_PAGE_ORIENTATION"), orientation);
-
         wxString pageID = wxString() << paperID;
-        mmDBWrapper::setINISettingValue( m_inidb.get(), ("PRINTER_PAGE_ID"), pageID);
 
-        m_inidb.get()->Commit();
+        config->Write("PRINTER_LEFT_MARGIN", (long)topLeft.x);
+        config->Write("PRINTER_RIGHT_MARGIN", (long)bottomRight.x);
+        config->Write("PRINTER_TOP_MARGIN", (long)topLeft.y);
+        config->Write("PRINTER_BOTTOM_MARGIN", (long)bottomRight.y);
+        config->Write("PRINTER_PAGE_ORIENTATION", pageOrientation);
+        config->Write("PRINTER_PAGE_ID", pageID);
     }
 }
 //----------------------------------------------------------------------------

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

Revision: 2554
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2554&view=rev
Author:   vomikan
Date:     2012-06-09 13:36:46 +0000 (Sat, 09 Jun 2012)
Log Message:
-----------
fix

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-06-09 13:24:41 UTC (rev 2553)
+++ trunk/mmex/src/mmex.cpp	2012-06-09 13:36:46 UTC (rev 2554)
@@ -620,6 +620,7 @@
 
 void mmGUIFrame::cleanup()
 {
+    wxConfigBase *config = wxConfigBase::Get();
     printer_.reset();
     if (recentFiles_) delete recentFiles_;
     if (!fileName_.IsEmpty())   saveConfigFile();
@@ -634,7 +635,7 @@
 
     /// Update the database according to user requirements
     if (mmOptions::instance().databaseUpdated_ &&
-       (mmDBWrapper::getINISettingValue(m_inidb.get(), ("BACKUPDB_UPDATE"), ("FALSE")) == ("TRUE")))
+       (config->ReadBool("BACKUPDB_UPDATE", false)))
     {
         BackupDatabase(fileName_, true);
     }
@@ -2895,6 +2896,7 @@
 
 bool mmGUIFrame::createDataStore(const wxString& fileName, const wxString& pwd, bool openingNew)
 {
+    wxConfigBase *config = wxConfigBase::Get();
     if (m_core) m_core.reset();
 
     if (m_db)
@@ -2904,7 +2906,7 @@
 
         /// Update the database according to user requirements
         if (mmOptions::instance().databaseUpdated_ &&
-           (mmDBWrapper::getINISettingValue(m_inidb.get(), ("BACKUPDB_UPDATE"), ("FALSE")) == ("TRUE")))
+           (config->ReadBool("BACKUPDB_UPDATE", false)))
         {
             BackupDatabase(fileName_, true);
             mmOptions::instance().databaseUpdated_ = false;

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

Revision: 2574
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2574&view=rev
Author:   stef145g
Date:     2012-06-12 11:16:33 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------
Fix: Accessing of Transaction Report causing crash

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-06-12 10:52:52 UTC (rev 2573)
+++ trunk/mmex/src/mmex.cpp	2012-06-12 11:16:33 UTC (rev 2574)
@@ -2207,9 +2207,10 @@
         }
         else if (iData->getString() == ("Transaction Report"))
         {
+            navTreeCtrl_->UnselectAll();    // item in navTreeCtrl_ to enable re-selection.
+            processPendingEvents();         // Clear event buffer before activating report.
             wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TRANSACTIONREPORT);
             AddPendingEvent(evt);           // Events will be processed in due course.
-            navTreeCtrl_->UnselectAll();    // item in navTreeCtrl_ to enable re-selection.
         }
         else if (iData->getString() == ("Bills & Deposits"))
         {

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

Revision: 2597
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2597&view=rev
Author:   vomikan
Date:     2012-06-14 13:15:27 +0000 (Thu, 14 Jun 2012)
Log Message:
-----------
last used file update

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-06-13 21:41:46 UTC (rev 2596)
+++ trunk/mmex/src/mmex.cpp	2012-06-14 13:15:27 UTC (rev 2597)
@@ -4579,8 +4579,9 @@
     wxProgressDialog *progress = NULL;
     if (! newDatabase)
     {
-        progress = new wxProgressDialog( _("Setting new Database file"), _("Please wait while the new database is being loaded."), 100, this);
-        progress->Update(20);
+        progress = new wxProgressDialog( _("Setting new Database file"),
+            _("Please wait while the new database is being loaded."), 100, this);
+        progress->Update(33);
     }
 
     // Ensure database is in a steady state first
@@ -4590,29 +4591,26 @@
         createHomePage();
     }
 
-    if (progress) progress->Update(40);
-    bool opened_ok = openFile(dbFileName, newDatabase);
-    if (opened_ok)
+    if (progress) progress->Update(65);
+
+    if (openFile(dbFileName, newDatabase))
     {
-        if (progress) progress->Update(95);
+        if (progress) progress->Update(80);
         
         history_->AddFileToHistory(dbFileName);
-        //history_->AddFilesToMenu(menuRecentFiles_);
+        config->Write("LASTFILENAME", dbFileName);
         history_->Save(*config);
+        if (progress) progress->Update(100);
     }
-
-    if (progress)
+    else
     {
-        progress->Update(100);
-        progress->Destroy();
-    }
-
-    if (!opened_ok)
-    {
         createHomePage();
+        if (progress) progress->Update(90);
         updateNavTreeControl();
+        if (progress) progress->Update(100);
         showBeginAppDialog(true);
     }
+
 }
 
 void mmGUIFrame::BackupDatabase(const wxString& filename, bool updateRequired)

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

Revision: 2621
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2621&view=rev
Author:   vomikan
Date:     2012-06-16 16:46:19 +0000 (Sat, 16 Jun 2012)
Log Message:
-----------
Rev translation

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-06-16 16:25:48 UTC (rev 2620)
+++ trunk/mmex/src/mmex.cpp	2012-06-16 16:46:19 UTC (rev 2621)
@@ -534,7 +534,10 @@
     m_mgr.SetManagedWindow(this);
     CreateStatusBar();
     wxStatusBar *sb = GetStatusBar();
-    if (sb) sb->SetStatusText(_MM_EX_REVISION_ID);
+    wxString mmex_revision = _MM_EX_REVISION_ID;
+    mmex_revision.Replace("$", "");
+    mmex_revision.Replace("Rev:", _("Revision:"));
+    if (sb) sb->SetStatusText(mmex_revision);
 
     SetIcon(mmex::getProgramIcon());
     SetMinSize(wxSize(800,200));

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

Revision: 2622
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2622&view=rev
Author:   stef145g
Date:     2012-06-16 17:52:46 +0000 (Sat, 16 Jun 2012)
Log Message:
-----------
Fix: Lock-up when switching or opening other database files.

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-06-16 16:46:19 UTC (rev 2621)
+++ trunk/mmex/src/mmex.cpp	2012-06-16 17:52:46 UTC (rev 2622)
@@ -4593,25 +4593,26 @@
     }
 
     if (progress) progress->Update(65);
-
     if (openFile(dbFileName, newDatabase))
     {
         if (progress) progress->Update(80);
-        
         history_->AddFileToHistory(dbFileName);
         config->Write("LASTFILENAME", dbFileName);
         history_->Save(*config);
-        if (progress) progress->Update(100);
     }
     else
     {
         createHomePage();
         if (progress) progress->Update(90);
         updateNavTreeControl();
-        if (progress) progress->Update(100);
         showBeginAppDialog(true);
     }
 
+    if (progress)
+    {
+        progress->Update(100);
+        progress->Destroy();
+    }
 }
 
 void mmGUIFrame::BackupDatabase(const wxString& filename, bool updateRequired)

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

Revision: 2628
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2628&view=rev
Author:   vomikan
Date:     2012-06-17 18:22:19 +0000 (Sun, 17 Jun 2012)
Log Message:
-----------
update

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-06-17 17:52:31 UTC (rev 2627)
+++ trunk/mmex/src/mmex.cpp	2012-06-17 18:22:19 UTC (rev 2628)
@@ -3914,7 +3914,7 @@
     {
         /* Do Nothing in this case */
     }
-    else if (rc == appStartDialog(APP_CLOSE))
+    else if (rc == appStartDialog(APP_CLOSE) && fromScratch)
     {
         Close();
     }

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

Revision: 2652
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2652&view=rev
Author:   vomikan
Date:     2012-06-22 21:07:52 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
cleanup

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-06-22 03:13:44 UTC (rev 2651)
+++ trunk/mmex/src/mmex.cpp	2012-06-22 21:07:52 UTC (rev 2652)
@@ -355,7 +355,7 @@
     EVT_MENU(MENU_TREEPOPUP_IMPORT_QIF, mmGUIFrame::OnPopupImportQIFile)
 
     EVT_TREE_ITEM_RIGHT_CLICK(ID_NAVTREECTRL, mmGUIFrame::OnItemRightClick)
-    EVT_TREE_SEL_CHANGED(ID_NAVTREECTRL, mmGUIFrame::OnSelChanged)
+    EVT_TREE_SEL_CHANGING(ID_NAVTREECTRL, mmGUIFrame::OnSelChanged)
     EVT_TREE_ITEM_EXPANDED(ID_NAVTREECTRL, mmGUIFrame::OnTreeItemExpanded)
     EVT_TREE_ITEM_COLLAPSED(ID_NAVTREECTRL,mmGUIFrame::OnTreeItemCollapsed)
 
@@ -739,27 +739,27 @@
     while (q1.NextRow())
     {
         mmBDTransactionHolder th;
-        th.id_           = q1.GetInt(("BDID"));
-        th.nextOccurDate_  = mmGetStorageStringAsDate(q1.GetString(("NEXTOCCURRENCEDATE")));
+        th.id_           = q1.GetInt("BDID");
+        th.nextOccurDate_  = mmGetStorageStringAsDate(q1.GetString("NEXTOCCURRENCEDATE"));
 
         th.nextOccurStr_   = mmGetDateForDisplay(m_db.get(), th.nextOccurDate_);
-        th.payeeID_        = q1.GetInt(("PAYEEID"));
-        th.transType_      = q1.GetString(("TRANSCODE"));
-        th.accountID_      = q1.GetInt(("ACCOUNTID"));
-        th.toAccountID_    = q1.GetInt(("TOACCOUNTID"));
+        th.payeeID_        = q1.GetInt("PAYEEID");
+        th.transType_      = q1.GetString("TRANSCODE");
+        th.accountID_      = q1.GetInt("ACCOUNTID");
+        th.toAccountID_    = q1.GetInt("TOACCOUNTID");
 
         th.accountName_     = m_core.get()->getAccountName(th.accountID_);
-        th.amt_            = q1.GetDouble(("TRANSAMOUNT"));
-        th.toAmt_          = q1.GetDouble(("TOTRANSAMOUNT"));
-        th.notes_       = q1.GetString(("NOTES"));
-        th.categID_           = q1.GetInt(("CATEGID"));
-        th.categoryStr_       = q1.GetString(("CATEGNAME"));
-        th.subcategID_       = q1.GetInt(("SUBCATEGID"));
-        th.subcategoryStr_ = q1.GetString(("SUBCATEGNAME"));
+        th.amt_            = q1.GetDouble("TRANSAMOUNT");
+        th.toAmt_          = q1.GetDouble("TOTRANSAMOUNT");
+        th.notes_       = q1.GetString("NOTES");
+        th.categID_           = q1.GetInt("CATEGID");
+        th.categoryStr_       = q1.GetString("CATEGNAME");
+        th.subcategID_       = q1.GetInt("SUBCATEGID");
+        th.subcategoryStr_ = q1.GetString("SUBCATEGNAME");
 
         // DeMultiplex the Auto Executable fields from the db entry: REPEATS
-        int repeats        = q1.GetInt(("REPEATS"));
-        int numRepeats     = q1.GetInt(("NUMOCCURRENCES"));
+        int repeats        = q1.GetInt("REPEATS");
+        int numRepeats     = q1.GetInt("NUMOCCURRENCES");
 
         autoExecuteManual = false;
         autoExecuteSilent = false;
@@ -835,8 +835,8 @@
                 pTransaction->payee_ = m_core.get()->getPayeeSharedPtr(th.payeeID_);
                 pTransaction->transType_ = th.transType_;
                 pTransaction->amt_ = th.amt_;
-                pTransaction->status_ = q1.GetString(("STATUS"));
-                pTransaction->transNum_ = q1.GetString(("TRANSACTIONNUMBER"));
+                pTransaction->status_ = q1.GetString("STATUS");
+                pTransaction->transNum_ = q1.GetString("TRANSACTIONNUMBER");
                 pTransaction->notes_ = th.notes_;
                 pTransaction->category_ = m_core.get()->getCategorySharedPtr(th.categID_, th.subcategID_);
                 pTransaction->date_ = th.nextOccurDate_;
@@ -975,12 +975,12 @@
         wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxTR_SINGLE | wxNO_BORDER);
 
     m_mgr.AddPane(navTreeCtrl_, wxAuiPaneInfo().
-        Name(("Navigation")).Caption(_("Navigation")).
+        Name("Navigation").Caption(_("Navigation")).
         BestSize(wxSize(200,100)).MinSize(wxSize(100,100)).
         Left());
 
     m_mgr.AddPane(homePanel, wxAuiPaneInfo().
-        Name(("Home")).Caption(("Home")).
+        Name("Home").Caption("Home").
         CenterPane().PaneBorder(false));
 }
 //----------------------------------------------------------------------------
@@ -998,13 +998,13 @@
     //navTreeCtrl_->SetBackgroundColour(mmColors::navTreeBkColor);
 
     wxTreeItemId root = navTreeCtrl_->AddRoot(_("Home Page"), 0, 0);
-    navTreeCtrl_->SetItemData(root, new mmTreeItemData(("Home Page")));
+    navTreeCtrl_->SetItemData(root, new mmTreeItemData("Home Page"));
     navTreeCtrl_->SetItemBold(root, true);
     navTreeCtrl_->SetFocus();
 
 
     wxTreeItemId accounts = navTreeCtrl_->AppendItem(root, _("Bank Accounts"), 1, 1);
-    navTreeCtrl_->SetItemData(accounts, new mmTreeItemData(("Bank Accounts")));
+    navTreeCtrl_->SetItemData(accounts, new mmTreeItemData("Bank Accounts"));
     navTreeCtrl_->SetItemBold(accounts, true);
 
     wxTreeItemId termAccount;
@@ -1012,26 +1012,26 @@
     {
     //  Positioning for new type of accounts: Term Accounts
         termAccount = navTreeCtrl_->AppendItem(root, _("Term Accounts"), 9, 9);
-        navTreeCtrl_->SetItemData(termAccount, new mmTreeItemData(("Term Accounts")));
+        navTreeCtrl_->SetItemData(termAccount, new mmTreeItemData("Term Accounts"));
         navTreeCtrl_->SetItemBold(termAccount, true);
     }
 
     wxTreeItemId stocks;
     stocks = navTreeCtrl_->AppendItem(root, _("Stocks"), 6, 6);
-    navTreeCtrl_->SetItemData(stocks, new mmTreeItemData(("Stocks")));
+    navTreeCtrl_->SetItemData(stocks, new mmTreeItemData("Stocks"));
     navTreeCtrl_->SetItemBold(stocks, true);
 
     if (mmIniOptions::instance().enableAssets_)
     {
         wxTreeItemId assets = navTreeCtrl_->AppendItem(root, _("Assets"), 7, 7);
-        navTreeCtrl_->SetItemData(assets, new mmTreeItemData(("Assets")));
+        navTreeCtrl_->SetItemData(assets, new mmTreeItemData("Assets"));
         navTreeCtrl_->SetItemBold(assets, true);
     }
 
     if (mmIniOptions::instance().enableRepeatingTransactions_)
     {
        wxTreeItemId bills = navTreeCtrl_->AppendItem(root, _("Repeating Transactions"), 2, 2);
-       navTreeCtrl_->SetItemData(bills, new mmTreeItemData(("Bills & Deposits")));
+       navTreeCtrl_->SetItemData(bills, new mmTreeItemData("Bills & Deposits"));
        navTreeCtrl_->SetItemBold(bills, true);
     }
 
@@ -1039,7 +1039,7 @@
     if (mmIniOptions::instance().enableBudget_)
     {
         budgeting = navTreeCtrl_->AppendItem(root, _("Budget Setup"), 3, 3);
-        navTreeCtrl_->SetItemData(budgeting, new mmTreeItemData(("Budgeting")));
+        navTreeCtrl_->SetItemData(budgeting, new mmTreeItemData("Budgeting"));
         navTreeCtrl_->SetItemBold(budgeting, true);
     }
 
@@ -1084,165 +1084,165 @@
     /* ================================================================================================= */
 
     wxTreeItemId reportsSummary = navTreeCtrl_->AppendItem(reports, _("Summary of Accounts"), 4, 4);
-    navTreeCtrl_->SetItemData(reportsSummary, new mmTreeItemData(("Summary of Accounts")));
+    navTreeCtrl_->SetItemData(reportsSummary, new mmTreeItemData("Summary of Accounts"));
 
     wxTreeItemId reportsStocks = navTreeCtrl_->AppendItem(reportsSummary, _("Stocks"), 4, 4);
-    navTreeCtrl_->SetItemData(reportsStocks, new mmTreeItemData(("Summary of Stocks")));
+    navTreeCtrl_->SetItemData(reportsStocks, new mmTreeItemData("Summary of Stocks"));
 
     if (mmIniOptions::instance().enableAssets_)
     {
         wxTreeItemId reportsAssets = navTreeCtrl_->AppendItem(reportsSummary, _("Assets"), 4, 4);
-        navTreeCtrl_->SetItemData(reportsAssets, new mmTreeItemData(("Summary of Assets")));
+        navTreeCtrl_->SetItemData(reportsAssets, new mmTreeItemData("Summary of Assets"));
     }
 
     wxTreeItemId categsOverTime = navTreeCtrl_->AppendItem(reports, _("Where the Money Goes"), 4, 4);
-    navTreeCtrl_->SetItemData(categsOverTime, new mmTreeItemData(("Where the Money Goes")));
+    navTreeCtrl_->SetItemData(categsOverTime, new mmTreeItemData("Where the Money Goes"));
 
     wxTreeItemId categsOverTimeCalMonth = navTreeCtrl_->AppendItem(categsOverTime, _("Last Calendar Month"), 4, 4);
-    navTreeCtrl_->SetItemData(categsOverTimeCalMonth, new mmTreeItemData(("Where the Money Goes - Month")));
+    navTreeCtrl_->SetItemData(categsOverTimeCalMonth, new mmTreeItemData("Where the Money Goes - Month"));
 
     wxString currentMonthMsg = _("Current Month");
     if (mmIniOptions::instance().ignoreFutureTransactions_) currentMonthMsg = _("Current Month to Date");
 
     wxTreeItemId categsOverTimeCurrentMonth = navTreeCtrl_->AppendItem(categsOverTime, currentMonthMsg, 4, 4);
-    navTreeCtrl_->SetItemData(categsOverTimeCurrentMonth, new mmTreeItemData(("Where the Money Goes - Current Month")));
+    navTreeCtrl_->SetItemData(categsOverTimeCurrentMonth, new mmTreeItemData("Where the Money Goes - Current Month"));
 
     wxTreeItemId categsOverTimeLast30 = navTreeCtrl_->AppendItem(categsOverTime, _("Last 30 Days"), 4, 4);
-    navTreeCtrl_->SetItemData(categsOverTimeLast30, new mmTreeItemData(("Where the Money Goes - 30 Days")));
+    navTreeCtrl_->SetItemData(categsOverTimeLast30, new mmTreeItemData("Where the Money Goes - 30 Days"));
 
     wxTreeItemId categsOverTimeLastYear = navTreeCtrl_->AppendItem(categsOverTime, _("Last Year"), 4, 4);
-    navTreeCtrl_->SetItemData(categsOverTimeLastYear, new mmTreeItemData(("Where the Money Goes - Last Year")));
+    navTreeCtrl_->SetItemData(categsOverTimeLastYear, new mmTreeItemData("Where the Money Goes - Last Year"));
 
     wxTreeItemId categsOverTimeCurrentYear = navTreeCtrl_->AppendItem(categsOverTime, _("Current Year"), 4, 4);
-    navTreeCtrl_->SetItemData(categsOverTimeCurrentYear, new mmTreeItemData(("Where the Money Goes - Current Year")));
+    navTreeCtrl_->SetItemData(categsOverTimeCurrentYear, new mmTreeItemData("Where the Money Goes - Current Year"));
 
     if (financialYearIsDifferent())
     {
         wxTreeItemId categsOverTimeLastFinancialYear = navTreeCtrl_->AppendItem(categsOverTime, _("Last Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(categsOverTimeLastFinancialYear, new mmTreeItemData(("Where the Money Goes - Last Financial Year")));
+        navTreeCtrl_->SetItemData(categsOverTimeLastFinancialYear, new mmTreeItemData("Where the Money Goes - Last Financial Year"));
 
         wxTreeItemId categsOverTimeCurrentFinancialYear = navTreeCtrl_->AppendItem(categsOverTime, _("Current Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(categsOverTimeCurrentFinancialYear, new mmTreeItemData(("Where the Money Goes - Current Financial Year")));
+        navTreeCtrl_->SetItemData(categsOverTimeCurrentFinancialYear, new mmTreeItemData("Where the Money Goes - Current Financial Year"));
     }
     ///////////////////////////////////////////////////////////
 
     wxTreeItemId posCategs = navTreeCtrl_->AppendItem(reports, _("Where the Money Comes From"), 4, 4);
-    navTreeCtrl_->SetItemData(posCategs, new mmTreeItemData(("Where the Money Comes From")));
+    navTreeCtrl_->SetItemData(posCategs, new mmTreeItemData("Where the Money Comes From"));
 
     wxTreeItemId posCategsCalMonth = navTreeCtrl_->AppendItem(posCategs, _("Last Calendar Month"), 4, 4);
-    navTreeCtrl_->SetItemData(posCategsCalMonth, new mmTreeItemData(("Where the Money Comes From - Month")));
+    navTreeCtrl_->SetItemData(posCategsCalMonth, new mmTreeItemData("Where the Money Comes From - Month"));
 
     wxTreeItemId posCategsCurrentMonth = navTreeCtrl_->AppendItem(posCategs, currentMonthMsg, 4, 4);
-    navTreeCtrl_->SetItemData(posCategsCurrentMonth, new mmTreeItemData(("Where the Money Comes From - Current Month")));
+    navTreeCtrl_->SetItemData(posCategsCurrentMonth, new mmTreeItemData("Where the Money Comes From - Current Month"));
 
     wxTreeItemId posCategsTimeLast30 = navTreeCtrl_->AppendItem(posCategs, _("Last 30 Days"), 4, 4);
-    navTreeCtrl_->SetItemData(posCategsTimeLast30, new mmTreeItemData(("Where the Money Comes From - 30 Days")));
+    navTreeCtrl_->SetItemData(posCategsTimeLast30, new mmTreeItemData("Where the Money Comes From - 30 Days"));
 
     wxTreeItemId posCategsTimeLastYear = navTreeCtrl_->AppendItem(posCategs, _("Last Year"), 4, 4);
-    navTreeCtrl_->SetItemData(posCategsTimeLastYear, new mmTreeItemData(("Where the Money Comes From - Last Year")));
+    navTreeCtrl_->SetItemData(posCategsTimeLastYear, new mmTreeItemData("Where the Money Comes From - Last Year"));
 
     wxTreeItemId posCategsTimeCurrentYear = navTreeCtrl_->AppendItem(posCategs, _("Current Year"), 4, 4);
-    navTreeCtrl_->SetItemData(posCategsTimeCurrentYear, new mmTreeItemData(("Where the Money Comes From - Current Year")));
+    navTreeCtrl_->SetItemData(posCategsTimeCurrentYear, new mmTreeItemData("Where the Money Comes From - Current Year"));
 
     if (financialYearIsDifferent())
     {
         wxTreeItemId posCategsTimeLastFinancialYear = navTreeCtrl_->AppendItem(posCategs, _("Last Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(posCategsTimeLastFinancialYear, new mmTreeItemData(("Where the Money Comes From - Last Financial Year")));
+        navTreeCtrl_->SetItemData(posCategsTimeLastFinancialYear, new mmTreeItemData("Where the Money Comes From - Last Financial Year"));
 
         wxTreeItemId posCategsTimeCurrentFinancialYear = navTreeCtrl_->AppendItem(posCategs, _("Current Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(posCategsTimeCurrentFinancialYear, new mmTreeItemData(("Where the Money Comes From - Current Financial Year")));
+        navTreeCtrl_->SetItemData(posCategsTimeCurrentFinancialYear, new mmTreeItemData("Where the Money Comes From - Current Financial Year"));
     }
     ///////////////////////////////////////////////////////////
 
     wxTreeItemId categs = navTreeCtrl_->AppendItem(reports, _("Categories"), 4, 4);
-    navTreeCtrl_->SetItemData(categs, new mmTreeItemData(("Categories - Over Time")));
+    navTreeCtrl_->SetItemData(categs, new mmTreeItemData("Categories - Over Time"));
 
     wxTreeItemId categsCalMonth = navTreeCtrl_->AppendItem(categs, _("Last Calendar Month"), 4, 4);
-    navTreeCtrl_->SetItemData(categsCalMonth, new mmTreeItemData(("Categories - Month")));
+    navTreeCtrl_->SetItemData(categsCalMonth, new mmTreeItemData("Categories - Month"));
 
     wxTreeItemId categsCurrentMonth = navTreeCtrl_->AppendItem(categs, currentMonthMsg, 4, 4);
-    navTreeCtrl_->SetItemData(categsCurrentMonth, new mmTreeItemData(("Categories - Current Month")));
+    navTreeCtrl_->SetItemData(categsCurrentMonth, new mmTreeItemData("Categories - Current Month"));
 
     wxTreeItemId categsTimeLast30 = navTreeCtrl_->AppendItem(categs, _("Last 30 Days"), 4, 4);
-    navTreeCtrl_->SetItemData(categsTimeLast30, new mmTreeItemData(("Categories - 30 Days")));
+    navTreeCtrl_->SetItemData(categsTimeLast30, new mmTreeItemData("Categories - 30 Days"));
 
     wxTreeItemId categsTimeLastYear = navTreeCtrl_->AppendItem(categs, _("Last Year"), 4, 4);
-    navTreeCtrl_->SetItemData(categsTimeLastYear, new mmTreeItemData(("Categories - Last Year")));
+    navTreeCtrl_->SetItemData(categsTimeLastYear, new mmTreeItemData("Categories - Last Year"));
 
     wxTreeItemId categsTimeCurrentYear = navTreeCtrl_->AppendItem(categs, _("Current Year"), 4, 4);
-    navTreeCtrl_->SetItemData(categsTimeCurrentYear, new mmTreeItemData(("Categories - Current Year")));
+    navTreeCtrl_->SetItemData(categsTimeCurrentYear, new mmTreeItemData("Categories - Current Year"));
 
     if (financialYearIsDifferent())
     {
         wxTreeItemId categsTimeLastFinancialYear = navTreeCtrl_->AppendItem(categs, _("Last Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(categsTimeLastFinancialYear, new mmTreeItemData(("Categories - Last Financial Year")));
+        navTreeCtrl_->SetItemData(categsTimeLastFinancialYear, new mmTreeItemData("Categories - Last Financial Year"));
 
         wxTreeItemId categsTimeCurrentFinancialYear = navTreeCtrl_->AppendItem(categs, _("Current Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(categsTimeCurrentFinancialYear, new mmTreeItemData(("Categories - Current Financial Year")));
+        navTreeCtrl_->SetItemData(categsTimeCurrentFinancialYear, new mmTreeItemData("Categories - Current Financial Year"));
     }
     ///////////////////////////////////////////////////////////
 
     wxTreeItemId payeesOverTime = navTreeCtrl_->AppendItem(reports, _("Payees"), 4, 4);
-    navTreeCtrl_->SetItemData(payeesOverTime, new mmTreeItemData(("Payee Report")));
+    navTreeCtrl_->SetItemData(payeesOverTime, new mmTreeItemData("Payee Report"));
 
     wxTreeItemId payeesOverTimeCalMonth = navTreeCtrl_->AppendItem(payeesOverTime, _("Last Calendar Month"), 4, 4);
-    navTreeCtrl_->SetItemData(payeesOverTimeCalMonth, new mmTreeItemData(("Payee Report - Month")));
+    navTreeCtrl_->SetItemData(payeesOverTimeCalMonth, new mmTreeItemData("Payee Report - Month"));
 
     wxTreeItemId payeesOverTimeCurrentMonth = navTreeCtrl_->AppendItem(payeesOverTime, currentMonthMsg, 4, 4);
-    navTreeCtrl_->SetItemData(payeesOverTimeCurrentMonth, new mmTreeItemData(("Payee Report - Current Month")));
+    navTreeCtrl_->SetItemData(payeesOverTimeCurrentMonth, new mmTreeItemData("Payee Report - Current Month"));
 
     wxTreeItemId payeesOverTimeLast30 = navTreeCtrl_->AppendItem(payeesOverTime, _("Last 30 Days"), 4, 4);
-    navTreeCtrl_->SetItemData(payeesOverTimeLast30, new mmTreeItemData(("Payee Report - 30 Days")));
+    navTreeCtrl_->SetItemData(payeesOverTimeLast30, new mmTreeItemData("Payee Report - 30 Days"));
 
     wxTreeItemId payeesOverTimeLastYear = navTreeCtrl_->AppendItem(payeesOverTime, _("Last Year"), 4, 4);
-    navTreeCtrl_->SetItemData(payeesOverTimeLastYear, new mmTreeItemData(("Payee Report - Last Year")));
+    navTreeCtrl_->SetItemData(payeesOverTimeLastYear, new mmTreeItemData("Payee Report - Last Year"));
 
     wxTreeItemId payeesOverTimeCurrentYear = navTreeCtrl_->AppendItem(payeesOverTime, _("Current Year"), 4, 4);
-    navTreeCtrl_->SetItemData(payeesOverTimeCurrentYear, new mmTreeItemData(("Payee Report - Current Year")));
+    navTreeCtrl_->SetItemData(payeesOverTimeCurrentYear, new mmTreeItemData("Payee Report - Current Year"));
 
     if (financialYearIsDifferent())
     {
         wxTreeItemId payeesOverTimeLastFinancialYear = navTreeCtrl_->AppendItem(payeesOverTime, _("Last Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(payeesOverTimeLastFinancialYear, new mmTreeItemData(("Payee Report - Last Financial Year")));
+        navTreeCtrl_->SetItemData(payeesOverTimeLastFinancialYear, new mmTreeItemData("Payee Report - Last Financial Year"));
 
         wxTreeItemId payeesOverTimeCurrentFinancialYear = navTreeCtrl_->AppendItem(payeesOverTime, _("Current Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(payeesOverTimeCurrentFinancialYear, new mmTreeItemData(("Payee Report - Current Financial Year")));
+        navTreeCtrl_->SetItemData(payeesOverTimeCurrentFinancialYear, new mmTreeItemData("Payee Report - Current Financial Year"));
     }
     ///////////////////////////////////////////////////////////////////
 
     wxTreeItemId incexpOverTime = navTreeCtrl_->AppendItem(reports, _("Income vs Expenses"), 4, 4);
-    navTreeCtrl_->SetItemData(incexpOverTime, new mmTreeItemData(("Income vs Expenses")));
+    navTreeCtrl_->SetItemData(incexpOverTime, new mmTreeItemData("Income vs Expenses"));
 
     wxTreeItemId incexpOverTimeCalMonth = navTreeCtrl_->AppendItem(incexpOverTime, _("Last Calendar Month"), 4, 4);
-    navTreeCtrl_->SetItemData(incexpOverTimeCalMonth, new mmTreeItemData(("Income vs Expenses - Month")));
+    navTreeCtrl_->SetItemData(incexpOverTimeCalMonth, new mmTreeItemData("Income vs Expenses - Month"));
 
     wxTreeItemId incexpOverTimeCurrentMonth = navTreeCtrl_->AppendItem(incexpOverTime, currentMonthMsg, 4, 4);
-    navTreeCtrl_->SetItemData(incexpOverTimeCurrentMonth, new mmTreeItemData(("Income vs Expenses - Current Month")));
+    navTreeCtrl_->SetItemData(incexpOverTimeCurrentMonth, new mmTreeItemData("Income vs Expenses - Current Month"));
 
     wxTreeItemId incexpOverTimeLast30 = navTreeCtrl_->AppendItem(incexpOverTime, _("Last 30 Days"), 4, 4);
-    navTreeCtrl_->SetItemData(incexpOverTimeLast30, new mmTreeItemData(("Income vs Expenses - 30 Days")));
+    navTreeCtrl_->SetItemData(incexpOverTimeLast30, new mmTreeItemData("Income vs Expenses - 30 Days"));
 
     wxTreeItemId incexpOverTimeLastYear = navTreeCtrl_->AppendItem(incexpOverTime, _("Last Year"), 4, 4);
-    navTreeCtrl_->SetItemData(incexpOverTimeLastYear, new mmTreeItemData(("Income vs Expenses - Last Year")));
+    navTreeCtrl_->SetItemData(incexpOverTimeLastYear, new mmTreeItemData("Income vs Expenses - Last Year"));
 
     wxTreeItemId incexpOverTimeCurrentYear = navTreeCtrl_->AppendItem(incexpOverTime, _("Current Year"), 4, 4);
-    navTreeCtrl_->SetItemData(incexpOverTimeCurrentYear, new mmTreeItemData(("Income vs Expenses - Current Year")));
+    navTreeCtrl_->SetItemData(incexpOverTimeCurrentYear, new mmTreeItemData("Income vs Expenses - Current Year"));
 
     if (financialYearIsDifferent())
     {
         wxTreeItemId incexpOverTimeLastFinancialYear = navTreeCtrl_->AppendItem(incexpOverTime, _("Last Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(incexpOverTimeLastFinancialYear, new mmTreeItemData(("Income vs Expenses - Last Financial Year")));
+        navTreeCtrl_->SetItemData(incexpOverTimeLastFinancialYear, new mmTreeItemData("Income vs Expenses - Last Financial Year"));
 
         wxTreeItemId incexpOverTimeCurrentFinancialYear = navTreeCtrl_->AppendItem(incexpOverTime, _("Current Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(incexpOverTimeCurrentFinancialYear, new mmTreeItemData(("Income vs Expenses - Current Financial Year")));
+        navTreeCtrl_->SetItemData(incexpOverTimeCurrentFinancialYear, new mmTreeItemData("Income vs Expenses - Current Financial Year"));
     }
 
     wxTreeItemId incexpmonthly = navTreeCtrl_->AppendItem(incexpOverTime, _("Income vs Expenses - All Time"), 4, 4);
-    navTreeCtrl_->SetItemData(incexpmonthly, new mmTreeItemData(("Income vs Expenses - All Time")));
+    navTreeCtrl_->SetItemData(incexpmonthly, new mmTreeItemData("Income vs Expenses - All Time"));
 
     //////////////////////////////////////////////////////////////////
     wxTreeItemId transactionList = navTreeCtrl_->AppendItem(reports, _("Transaction Report"), 4, 4);
-    navTreeCtrl_->SetItemData(transactionList, new mmTreeItemData(("Transaction Report")));
+    navTreeCtrl_->SetItemData(transactionList, new mmTreeItemData("Transaction Report"));
 
     ///////////////////////////////////////////////////////////////////
 
@@ -1262,10 +1262,10 @@
         {
             if (!i) { // first loop only
                 budgetPerformance = navTreeCtrl_->AppendItem(reports, _("Budget Performance"), 4, 4);
-                navTreeCtrl_->SetItemData(budgetPerformance, new mmTreeItemData(("Budget Performance")));
+                navTreeCtrl_->SetItemData(budgetPerformance, new mmTreeItemData("Budget Performance"));
 
                 budgetSetupPerformance = navTreeCtrl_->AppendItem(reports, _("Budget Category Summary"), 4, 4);
-                navTreeCtrl_->SetItemData(budgetSetupPerformance, new mmTreeItemData(("Budget Setup Performance")));
+                navTreeCtrl_->SetItemData(budgetSetupPerformance, new mmTreeItemData("Budget Setup Performance"));
             }
 
             int id = q1.GetInt(("BUDGETYEARID"));
@@ -1293,7 +1293,7 @@
 
     ///////////////////////////////////////////////////////////////////
     wxTreeItemId cashFlow = navTreeCtrl_->AppendItem(reports, _("Cash Flow"), 4, 4);
-    navTreeCtrl_->SetItemData(cashFlow, new mmTreeItemData(("Cash Flow")));
+    navTreeCtrl_->SetItemData(cashFlow, new mmTreeItemData("Cash Flow"));
 
     wxTreeItemId cashflowWithBankAccounts = navTreeCtrl_->AppendItem(cashFlow, _("Cash Flow - With Bank Accounts"), 4, 4);
     navTreeCtrl_->SetItemData(cashflowWithBankAccounts, new mmTreeItemData(("Cash Flow - With Bank Accounts")));
@@ -2324,7 +2324,9 @@
     if (menuBar_->FindItem(MENU_ORGCATEGS)->IsEnabled() )
         showTreePopupMenu(event.GetItem(), event.GetPoint());
     else
-        wxMessageBox(_("MMEX has been opened without an active database."),_("MMEX: Menu Popup Error"),wxICON_EXCLAMATION);
+        wxMessageBox(_("MMEX has been opened without an active database."),
+            _("MMEX: Menu Popup Error"), wxOK|wxICON_EXCLAMATION);
+    event.Skip();
 }
 //----------------------------------------------------------------------------
 
@@ -3005,14 +3007,6 @@
 
 void mmGUIFrame::openDataBase(const wxString& fileName)
 {
-    //wxProgressDialog dlg(_("Please Wait"),
-    //    _("Opening Database File && Verifying Integrity"), 100, this,
-    //    wxPD_AUTO_HIDE | wxPD_APP_MODAL | wxPD_SMOOTH );
-
-    //mmDBWrapper::initDB(m_db.get(), &dlg);
-    //dlg.Update(100);
-    //dlg.Destroy();
-
     mmDBWrapper::initDB(m_db.get(), 0);
 
     wxString title = mmex::getProgramName() + (" : ") + fileName;
@@ -3076,7 +3070,7 @@
                      _("Choose database file to create"),
                      wxEmptyString,
                      wxEmptyString,
-                     ("MMB Files(*.mmb)|*.mmb"),
+                     _("MMB Files(*.mmb)|*.mmb"),
                      wxFD_SAVE | wxFD_OVERWRITE_PROMPT
                     );
 
@@ -3097,7 +3091,7 @@
     autoRepeatTransactionsTimer_.Stop();
     wxString fileName = wxFileSelector(_("Choose database file to open"),
                                        wxEmptyString, wxEmptyString, wxEmptyString,
-                                       ("MMB Files(*.mmb)|*.mmb|Encrypted MMB files (*.emb)|*.emb"),
+                                       _("MMB Files(*.mmb)|*.mmb|Encrypted MMB files (*.emb)|*.emb"),
                                        wxFD_FILE_MUST_EXIST,
                                        this
                                       );
@@ -3113,7 +3107,7 @@
 {
     wxString encFileName = wxFileSelector(_("Choose Encrypted database file to open"),
                                           wxEmptyString, wxEmptyString, wxEmptyString,
-                                          ("Encrypted MMB files (*.emb)|*.emb"),
+                                          _("Encrypted MMB files (*.emb)|*.emb"),
                                           wxFD_FILE_MUST_EXIST,
                                           this
                                          );
@@ -3129,7 +3123,7 @@
                      _("Choose database file to Save As"),
                      wxEmptyString,
                      wxEmptyString,
-                     ("MMB Files(*.mmb)|*.mmb"),
+                     _("MMB Files(*.mmb)|*.mmb"),
                      wxFD_SAVE | wxFD_OVERWRITE_PROMPT
                     );
 
@@ -3138,7 +3132,7 @@
 
     wxString fileName = dlg.GetPath();
 
-    if (!dlg.GetPath().EndsWith((".mmb")))
+    if (!dlg.GetPath().EndsWith(".mmb"))
         fileName += (".mmb");
 
     wxCopyFile(encFileName, fileName);
@@ -3166,7 +3160,7 @@
                      _("Save database file as"),
                      wxEmptyString,
                      wxEmptyString,
-                     ("MMB Files(*.mmb)|*.mmb|Encrypted MMB files (*.emb)|*.emb"),
+                     _("MMB Files(*.mmb)|*.mmb|Encrypted MMB files (*.emb)|*.emb"),
                      wxFD_SAVE | wxFD_OVERWRITE_PROMPT
                     );
 
@@ -3177,7 +3171,7 @@
 
     bool encrypt = dlg.GetFilterIndex() != 0; // emb -> Encrypted mMB
     wxFileName newFileName(dlg.GetPath());
-    fixFileExt(newFileName, encrypt ? ("emb") : ("mmb"));
+    fixFileExt(newFileName, encrypt ? "emb" : "mmb");
 
     wxFileName oldFileName(fileName_); // opened db's file
 
@@ -3257,7 +3251,7 @@
 {
     if (m_core.get()->getNumAccounts() == 0)
     {
-        wxMessageBox(_("No account available to import"),_("Universal CSV Import"), wxOK|wxICON_WARNING );
+        wxMessageBox(_("No account available to import"), _("Universal CSV Import"), wxOK|wxICON_WARNING );
         return;
     }
 
@@ -3540,7 +3534,7 @@
                              << (BOOST_VERSION / 100 % 1000)    << ('.')
                              << (BOOST_VERSION % 100)           << ("\n")
         << ("SQLite3: ")  << wxSQLite3Database::GetVersion() << ("\n")
-        << ("wxSQLite3: 3.0.0 by Ulrich Telle")              << ("\n\n");
+        << ("wxSQLite3: 3.0.0") << ("\n\n");
 
     // Access current version details page
     wxString site = ("http://www.codelathe.com/mmex/version.html");
@@ -3932,11 +3926,11 @@
     mmReportsPanel* rp = dynamic_cast<mmReportsPanel*>(panelCurrent_);
     if (rp)
     {
-        wxString fileName = wxFileSelector(("Choose HTML file to Export"),
-            wxEmptyString, wxEmptyString, wxEmptyString, ("*.html"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+        wxString fileName = wxFileSelector(_("Choose HTML file to Export"),
+            wxEmptyString, wxEmptyString, wxEmptyString, "*.html", wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
         if ( !fileName.empty() )
         {
-            correctEmptyFileExt(("html"),fileName);
+            correctEmptyFileExt("html", fileName);
             wxFileOutputStream output( fileName );
             wxTextOutputStream text( output );
             text << rp->getReportText();
@@ -4116,21 +4110,21 @@
 
 void mmGUIFrame::OnViewToolbar(wxCommandEvent &event)
 {
-    m_mgr.GetPane(("toolbar")).Show(event.IsChecked());
+    m_mgr.GetPane("toolbar").Show(event.IsChecked());
     m_mgr.Update();
 }
 //----------------------------------------------------------------------------
 
 void mmGUIFrame::OnViewLinks(wxCommandEvent &event)
 {
-    m_mgr.GetPane(("Navigation")).Show(event.IsChecked());
+    m_mgr.GetPane("Navigation").Show(event.IsChecked());
     m_mgr.Update();
 }
 //----------------------------------------------------------------------------
 
 void mmGUIFrame::OnViewToolbarUpdateUI(wxUpdateUIEvent &event)
 {
-    if(m_mgr.GetPane(("toolbar")).IsShown())
+    if(m_mgr.GetPane("toolbar").IsShown())
         event.Check(true);
     else
         event.Check(false);
@@ -4139,7 +4133,7 @@
 
 void mmGUIFrame::OnViewLinksUpdateUI(wxUpdateUIEvent &event)
 {
-    if(m_mgr.GetPane(("Navigation")).IsShown())
+    if(m_mgr.GetPane("Navigation").IsShown())
         event.Check(true);
     else
         event.Check(false);
@@ -4148,7 +4142,7 @@
 
 void mmGUIFrame::OnViewBankAccounts(wxCommandEvent &event)
 {
-    m_mgr.GetPane(("Bank Accounts")).Show(event.IsChecked());
+    m_mgr.GetPane("Bank Accounts").Show(event.IsChecked());
     m_mgr.Update();
 
     if (!refreshRequested_)
@@ -4161,7 +4155,7 @@
 
 void mmGUIFrame::OnViewTermAccounts(wxCommandEvent &event)
 {
-    m_mgr.GetPane(("Term Accounts")).Show(event.IsChecked());
+    m_mgr.GetPane("Term Accounts").Show(event.IsChecked());
     m_mgr.Update();
 
     if (!refreshRequested_)
@@ -4174,7 +4168,7 @@
 //----------------------------------------------------------------------------
 void mmGUIFrame::OnViewStockAccounts(wxCommandEvent &event)
 {
-    m_mgr.GetPane(("Stock Accounts")).Show(event.IsChecked());
+    m_mgr.GetPane("Stock Accounts").Show(event.IsChecked());
     m_mgr.Update();
 
     if (!refreshRequested_)
@@ -4186,7 +4180,7 @@
 
 void mmGUIFrame::OnIgnoreFutureTransactions(wxCommandEvent &event)
 {
-    m_mgr.GetPane(("Ignore Future Transactions")).Show(event.IsChecked());
+    m_mgr.GetPane("Ignore Future Transactions").Show(event.IsChecked());
     mmIniOptions::instance().ignoreFutureTransactions_ = !mmIniOptions::instance().ignoreFutureTransactions_;
     if (!refreshRequested_)
     {
@@ -4232,7 +4226,7 @@
     int dialogStatus = dlg->ShowModal();
     while (dialogStatus == wxID_MORE)
     {
-        if (dlg->sqlQuery() != (""))
+        if (dlg->sqlQuery() != "")
         {
             wxProgressDialog* progressBar = new wxProgressDialog(_("Report printing in progress"),
                 wxEmptyString, 100, NULL, wxPD_AUTO_HIDE|wxPD_CAN_ABORT);
@@ -4512,7 +4506,6 @@
     return homePanel->GetSizer();
 }
 //----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
 
 /*
     wxHandleFatalExceptions implemented for some compilers\platforms only.
@@ -4543,7 +4536,7 @@
     }
     catch (const std::exception &e)
     {
-        wxLogError(wxString::Format(("%s"), e.what()));
+        wxLogError(wxString::Format("%s", e.what()));
     }
 }
 //----------------------------------------------------------------------------
@@ -4562,7 +4555,7 @@
     }
     catch (const std::exception &e)
     {
-        wxLogError(wxString::Format(("%s"), e.what()));
+        wxLogError(wxString::Format("%s", e.what()));
     }
 
     return ok;

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

Revision: 3068
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3068&view=rev
Author:   vomikan
Date:     2012-10-19 21:58:05 +0000 (Fri, 19 Oct 2012)
Log Message:
-----------
bug fix. base currency rate should be 1 ufter update

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-10-19 11:29:49 UTC (rev 3067)
+++ trunk/mmex/src/mmex.cpp	2012-10-19 21:58:05 UTC (rev 3068)
@@ -3537,8 +3537,8 @@
     for (int idx = 0; idx < (int)m_core->currencyList_.currencies_.size(); idx++)
     {
         const wxString symbol = m_core->currencyList_.currencies_[idx]->currencySymbol_.Upper();
-        if (symbol != base_symbol)
-            site << symbol << base_symbol << wxT("=X+");
+
+		site << symbol << base_symbol << wxT("=X+");
     }
     if (site.Right(1).Contains(wxT("+"))) site.RemoveLast(1);
     site = wxString::Format(wxT("http://download.finance.yahoo.com/d/quotes.csv?s=%s&f=sl1n&e=.csv"), site.c_str());
@@ -3587,7 +3587,7 @@
     for (int idx = 0; idx < (int)m_core->currencyList_.currencies_.size(); idx++)
     {
         const wxString currency_symbol = m_core->currencyList_.currencies_[idx]->currencySymbol_.Upper();
-        if (!currency_symbol.IsEmpty() && base_symbol != currency_symbol)
+        if (!currency_symbol.IsEmpty())
         {
             wxString currency_symbols_pair = currency_symbol + base_symbol + wxT("=X");
             std::pair<double, wxString> data = currency_data[currency_symbols_pair];

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

Revision: 3074
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3074&view=rev
Author:   vomikan
Date:     2012-10-20 14:03:56 +0000 (Sat, 20 Oct 2012)
Log Message:
-----------
fix

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-10-20 12:14:52 UTC (rev 3073)
+++ trunk/mmex/src/mmex.cpp	2012-10-20 14:03:56 UTC (rev 3074)
@@ -2190,8 +2190,8 @@
               wxYES_NO | wxNO_DEFAULT | wxICON_EXCLAMATION);
            if (msgDlg.ShowModal() == wxID_YES)
            {
+              m_core->bTransactionList_.deleteTransactions(pAccount->id_);
               m_core->accountList_.RemoveAccount(pAccount->id_);
-              m_core->bTransactionList_.deleteTransactions(pAccount->id_);
               updateNavTreeControl();
               if (!refreshRequested_)
               {
@@ -3205,7 +3205,7 @@
     if (wizard->acctID_ != -1)
     {
         bool firstTermAccount = !hasActiveTermAccounts();
-        mmNewAcctDialog dlg(m_core.get(), false, wizard->acctID_, this);
+        mmNewAcctDialog dlg(m_core.get(), true, wizard->acctID_, this);
         dlg.ShowModal();
         if (dlg.termAccountActivated() )
         {

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

Revision: 3090
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3090&view=rev
Author:   vomikan
Date:     2012-10-28 09:07:30 +0000 (Sun, 28 Oct 2012)
Log Message:
-----------
fix

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-10-27 23:28:40 UTC (rev 3089)
+++ trunk/mmex/src/mmex.cpp	2012-10-28 09:07:30 UTC (rev 3090)
@@ -3538,7 +3538,7 @@
     {
         const wxString symbol = m_core->currencyList_.currencies_[idx]->currencySymbol_.Upper();
 
-		site << symbol << base_symbol << wxT("=X+");
+        site << symbol << base_symbol << wxT("=X+");
     }
     if (site.Right(1).Contains(wxT("+"))) site.RemoveLast(1);
     site = wxString::Format(wxT("http://download.finance.yahoo.com/d/quotes.csv?s=%s&f=sl1n&e=.csv"), site.c_str());
@@ -3742,7 +3742,7 @@
     }
     else if (end_mod == wxID_NEW)
     {
-        wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_OPEN);
+        wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_NEW);
         AddPendingEvent(evt);
     }
 }

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

Revision: 3091
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3091&view=rev
Author:   vomikan
Date:     2012-10-28 10:37:55 +0000 (Sun, 28 Oct 2012)
Log Message:
-----------
fix for Language chooser if started from scratch

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-10-28 09:07:30 UTC (rev 3090)
+++ trunk/mmex/src/mmex.cpp	2012-10-28 10:37:55 UTC (rev 3091)
@@ -493,6 +493,12 @@
 
     custRepIndex_ = new customSQLReportIndex();
 
+    // decide if we need to show app start dialog
+    bool from_scratch = m_inisettings->GetBoolSetting(wxT("SHOWBEGINAPP"), true);
+
+    wxFileName dbpath = mmDBWrapper::getLastDbPath(m_inisettings);
+    if (from_scratch && !dbpath.IsOk()) mmSelectLanguage(this, m_inisettings, true);
+
     /* Create the Controls for the frame */
     createMenu();
     createToolBar();
@@ -528,11 +534,7 @@
             menuItemOnlineUpdateCurRate_->Enable(false);
     }
 
-    // decide if we need to show app start dialog
-    bool from_scratch = m_inisettings->GetBoolSetting(wxT("SHOWBEGINAPP"), true);
-
-    wxFileName dbpath = from_scratch ? wxGetEmptyString() : mmDBWrapper::getLastDbPath(m_inisettings);
-
+    if (from_scratch) dbpath  = wxGetEmptyString();
     if (from_scratch || !dbpath.IsOk()) {
         menuEnableItems(false);
         createHomePage();

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

Revision: 3100
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3100&view=rev
Author:   stef145g
Date:     2012-10-29 00:28:07 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
Correct wxSQLite error: Unknown label. SQL query changed to select all fields.

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-10-28 14:28:25 UTC (rev 3099)
+++ trunk/mmex/src/mmex.cpp	2012-10-29 00:28:07 UTC (rev 3100)
@@ -666,7 +666,7 @@
     bool requireExecution;
 
     m_core->currencyList_.LoadBaseCurrencySettings();
-    wxSQLite3ResultSet q1 = m_db.get()->ExecuteQuery(SELECT_ALL_FROM_BILLSDEPOSITS_V1);
+    wxSQLite3ResultSet q1 = m_db.get()->ExecuteQuery(wxT("select * from BILLSDEPOSITS_V1"));
     while (q1.NextRow())
     {
         mmBDTransactionHolder th;

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

Revision: 3104
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3104&view=rev
Author:   vomikan
Date:     2012-11-04 10:46:51 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
revert

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-11-04 10:42:35 UTC (rev 3103)
+++ trunk/mmex/src/mmex.cpp	2012-11-04 10:46:51 UTC (rev 3104)
@@ -666,7 +666,7 @@
     bool requireExecution;
 
     m_core->currencyList_.LoadBaseCurrencySettings();
-    wxSQLite3ResultSet q1 = m_db.get()->ExecuteQuery(wxT("select * from BILLSDEPOSITS_V1"));
+    wxSQLite3ResultSet q1 = m_db.get()->ExecuteQuery(SELECT_ALL_FROM_BILLSDEPOSITS_V1);
     while (q1.NextRow())
     {
         mmBDTransactionHolder th;

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

Revision: 3193
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3193&view=rev
Author:   vomikan
Date:     2012-12-13 11:57:07 +0000 (Thu, 13 Dec 2012)
Log Message:
-----------
update

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-12-13 11:37:29 UTC (rev 3192)
+++ trunk/mmex/src/mmex.cpp	2012-12-13 11:57:07 UTC (rev 3193)
@@ -3869,12 +3869,13 @@
 void mmGUIFrame::OnCurrency(wxCommandEvent& /*event*/)
 {
     mmMainCurrencyDialog(m_core.get(),this, false).ShowModal();
+    createHomePage();    
 }
 //----------------------------------------------------------------------------
 
 void mmGUIFrame::OnWizardCancel(wxWizardEvent& event)
 {
-     event.Veto();
+    event.Veto();
 }
 //----------------------------------------------------------------------------
 

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

Revision: 3244
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3244&view=rev
Author:   stef145g
Date:     2012-12-23 01:40:39 +0000 (Sun, 23 Dec 2012)
Log Message:
-----------
Fix

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-12-23 00:26:23 UTC (rev 3243)
+++ trunk/mmex/src/mmex.cpp	2012-12-23 01:40:39 UTC (rev 3244)
@@ -4515,7 +4515,7 @@
         backupFile = wxFindNextFile();
     }
 
-    int max =  m_core->iniSettings_->GetIntSetting(wxT("MAX_BACKUP_FILES"), 4);
+    int max =  m_inisettings->GetIntSetting(wxT("MAX_BACKUP_FILES"), 4);
     if (backupFileArray.Count() > (size_t)max)
     {
         backupFileArray.Sort(true);

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

Revision: 3261
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3261&view=rev
Author:   vomikan
Date:     2012-12-29 09:11:29 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
Bug fix for WXWIN. Not checked with WXGTK.

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-12-29 09:02:02 UTC (rev 3260)
+++ trunk/mmex/src/mmex.cpp	2012-12-29 09:11:29 UTC (rev 3261)
@@ -2093,14 +2093,10 @@
         }
         else if (iData->getString() == wxT("Cash Flow - Specific Accounts"))
         {
-            navTreeCtrl_->UnselectAll();    // item in navTreeCtrl_ to enable re-selection.
-            processPendingEvents();         // Clear event buffer before activating report.
             OnCashFlowSpecificAccounts();
         }
         else if (iData->getString() == wxT("Transaction Report"))
         {
-            navTreeCtrl_->UnselectAll();    // item in navTreeCtrl_ to enable re-selection.
-            processPendingEvents();         // Clear event buffer before activating report.
             wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TRANSACTIONREPORT);
             AddPendingEvent(evt);           // Events will be processed in due course.
         }
@@ -2211,10 +2207,13 @@
 
 void mmGUIFrame::OnItemRightClick(wxTreeEvent& event)
 {
-    if (menuBar_->FindItem(MENU_ORGCATEGS)->IsEnabled() )
-        showTreePopupMenu(event.GetItem(), event.GetPoint());
+    wxTreeItemId id = event.GetItem();
+	if (menuBar_->FindItem(MENU_ORGCATEGS)->IsEnabled() )
+        showTreePopupMenu(id, event.GetPoint());
     else
         wxMessageBox(_("MMEX has been opened without an active database."),_("MMEX: Menu Popup Error"), wxOK|wxICON_EXCLAMATION);
+
+	navTreeCtrl_ ->SelectItem(id);
 }
 //----------------------------------------------------------------------------
 

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

Revision: 3329
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3329&view=rev
Author:   vomikan
Date:     2013-01-11 09:27:58 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
fix 

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-01-11 06:44:54 UTC (rev 3328)
+++ trunk/mmex/src/mmex.cpp	2013-01-11 09:27:58 UTC (rev 3329)
@@ -1331,6 +1331,10 @@
 
 void mmGUIFrame::CreateCustomReport(int index)
 {
+    this->SetEvtHandlerEnabled(false);
+    homePageAccountSelect_ = true; // prevent Navigation tree code execution.
+    wxBeginBusyCursor(wxHOURGLASS_CURSOR);
+    
     if (custRepIndex_->reportFileName(index) != wxT(""))
     {
         wxString sScript;
@@ -1344,6 +1348,10 @@
             createReportsPage(csr);
         }
     }
+    processPendingEvents();         // clear out pending events
+    this->SetEvtHandlerEnabled(true); 
+    homePageAccountSelect_ = false; // restore Navigation tree code execution.
+    wxEndBusyCursor();
 }
 
 bool mmGUIFrame::IsCustomSQLReportSelected( int& customSqlReportID, mmTreeItemData* iData )
@@ -4072,27 +4080,28 @@
 void mmGUIFrame::RunCustomSqlDialog(wxString customSqlReportSelectedItem)
 {
     //Use Shared pointer to ensure object gets destroyed if SQL Script errors hijack the object.
-    //boost::shared_ptr<mmCustomSQLDialog> dlg( new mmCustomSQLDialog(custRepIndex_, customSqlReportSelectedItem, this ));
-    mmCustomSQLDialog* dlg = new mmCustomSQLDialog(custRepIndex_, customSqlReportSelectedItem, this);
+    boost::shared_ptr<mmCustomSQLDialog> dlg( new mmCustomSQLDialog(custRepIndex_, customSqlReportSelectedItem, this ));
+    //mmCustomSQLDialog* dlg = new mmCustomSQLDialog(custRepIndex_, customSqlReportSelectedItem, this);
     customSqlReportSelectedItem;
-    int dialogStatus = dlg->ShowModal();
-    wxBeginBusyCursor(wxHOURGLASS_CURSOR);
+    int dialogStatus = wxID_MORE;
+    this->SetEvtHandlerEnabled(false);
     while (dialogStatus == wxID_MORE)
     {
         if (dlg->sScript() != wxT(""))
         {
+            wxBeginBusyCursor(wxHOURGLASS_CURSOR);
             mmCustomSQLReport* csr = new mmCustomSQLReport(this,
                 m_core.get(), dlg->sReportTitle(), dlg->sScript(), dlg->sSctiptType());
             menuPrintingEnable(true);
             createReportsPage(csr);
-
+            wxEndBusyCursor();
         }
         dialogStatus = dlg->ShowModal();
     }
-    wxEndBusyCursor();
+    processPendingEvents();         // clear out pending events
+    this->SetEvtHandlerEnabled(true); 
+    //dlg->Destroy();
 
-    dlg->Destroy();
-
     if (dialogStatus == wxID_OK) updateNavTreeControl();
 }
 

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

Revision: 3335
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3335&view=rev
Author:   vomikan
Date:     2013-01-11 17:49:14 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
fix for tools panel size

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-01-11 17:00:04 UTC (rev 3334)
+++ trunk/mmex/src/mmex.cpp	2013-01-11 17:49:14 UTC (rev 3335)
@@ -504,10 +504,14 @@
     createControls();
     recentFiles_ = new RecentDatabaseFiles(m_inisettings, menuRecentFiles_);
 
+    // Load perspective
+    wxString auiPerspective = m_inisettings->GetStringSetting(wxT("AUIPERSPECTIVE"), m_perspective);
+    m_mgr.LoadPerspective(auiPerspective);
+
     // add the toolbars to the manager
     m_mgr.AddPane(toolBar_, wxAuiPaneInfo().
         Name(wxT("toolbar")).Caption(wxT("Toolbar")).ToolbarPane().Top().
-        LeftDockable(false).RightDockable(false));
+        LeftDockable(false).RightDockable(false).MinSize(1000,-1));
 
     // change look and feel of wxAuiManager
     m_mgr.GetArtProvider()->SetMetric(16, 0);
@@ -515,8 +519,7 @@
 
     // Save default perspective
     m_perspective = m_mgr.SavePerspective();
-    wxString auiPerspective = m_inisettings->GetStringSetting(wxT("AUIPERSPECTIVE"), m_perspective);
-    m_mgr.LoadPerspective(auiPerspective);
+    m_inisettings->SetStringSetting(wxT("AUIPERSPECTIVE"), m_perspective);
 
     // "commit" all changes made to wxAuiManager
     m_mgr.Update();
@@ -1333,7 +1336,7 @@
     this->SetEvtHandlerEnabled(false);
     homePageAccountSelect_ = true; // prevent Navigation tree code execution.
     wxBeginBusyCursor(wxHOURGLASS_CURSOR);
-    
+
     if (custRepIndex_->reportFileName(index) != wxT(""))
     {
         wxString sScript;
@@ -1348,7 +1351,7 @@
         }
     }
     processPendingEvents();         // clear out pending events
-    this->SetEvtHandlerEnabled(true); 
+    this->SetEvtHandlerEnabled(true);
     homePageAccountSelect_ = false; // restore Navigation tree code execution.
     wxEndBusyCursor();
 }
@@ -4101,7 +4104,7 @@
         dialogStatus = dlg->ShowModal();
     }
     processPendingEvents();         // clear out pending events
-    this->SetEvtHandlerEnabled(true); 
+    this->SetEvtHandlerEnabled(true);
     //dlg->Destroy();
 
     if (dialogStatus == wxID_OK) updateNavTreeControl();

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

Revision: 3366
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3366&view=rev
Author:   vomikan
Date:     2013-01-16 20:03:47 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
update

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-01-16 14:49:55 UTC (rev 3365)
+++ trunk/mmex/src/mmex.cpp	2013-01-16 20:03:47 UTC (rev 3366)
@@ -3694,6 +3694,8 @@
 
     // get current version
     wxString currentV = mmex::getProgramVersion();
+    currentV = currentV.SubString(0, currentV.Find(wxT("DEV"))-1).Trim();
+    
     wxStringTokenizer tkz1(currentV, wxT('.'), wxTOKEN_RET_EMPTY_ALL);
     numTokens = (int)tkz1.CountTokens();
 
@@ -3739,44 +3741,24 @@
 
     // Access current version details page
     wxString site = wxT("http://www.codelathe.com/mmex/version.html");
-    wxURL url(site);
-
-    unsigned char buf[1024];
-    boost::scoped_ptr<wxInputStream> in_stream(url.GetInputStream());
-    if (!in_stream)
+ 
+    wxString page;
+    int err_code = site_content(site, page);
+    if (err_code != wxURL_NOERR)
     {
-        versionDetails << _("Unable to connect!");
+        versionDetails << page;
         wxMessageBox(versionDetails, _("MMEX System Information Check"));
         return;
     }
-    in_stream->Read(buf, 1024);
-    //size_t bytes_read=in_stream->LastRead();
-    in_stream.reset();
-    buf[53] = '\0';
 
-    wxString page = wxString::FromAscii((const char *)buf);
     /*************************************************************************
         Expected format of the string from the internet. Version: 0.9.8.0
         page = wxT("x.x.x.x - Win: w.w.w.w - Unix: u.u.u.u - Mac: m.m.m.m");
         string length = 53 characters
     **************************************************************************/
-    wxStringTokenizer sysTokens(page,wxT("-"));
-    // Ignored the first token. Added for compatibility for pre 0.9.8.0
-    wxString oldSys  = sysTokens.GetNextToken();
-    wxString winSys  = sysTokens.GetNextToken().Trim(false);
-    wxString unixSys = sysTokens.GetNextToken().Trim(false);
-    wxString macSys  = sysTokens.GetNextToken().Trim(false);
-
-    wxString mySys =  wxPlatformInfo::Get().GetOperatingSystemFamilyName();
-
-    wxStringTokenizer mySysToken;
-    if (mySys == wxT("Windows"))
-        mySysToken.SetString(winSys,wxT(":"));
-    else if (mySys == wxT("Unix"))
-        mySysToken.SetString(unixSys,wxT(":"));
-    else if (mySys == wxT("Macintosh"))
-        mySysToken.SetString(macSys,wxT(":"));
-
+    page = page.SubString(page.find(wxPlatformInfo::Get().GetOperatingSystemFamilyName().substr(0, 3)), 53);
+    page.Replace(wxT("-"), wxT(":"));
+    wxStringTokenizer mySysToken(page, wxT(":"));
     page = mySysToken.GetNextToken();                       // the system
     page = mySysToken.GetNextToken().Trim(false).Trim();    // the version
 

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

Revision: 3433
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3433&view=rev
Author:   vomikan
Date:     2013-02-03 21:17:03 +0000 (Sun, 03 Feb 2013)
Log Message:
-----------
update

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-02-03 20:36:17 UTC (rev 3432)
+++ trunk/mmex/src/mmex.cpp	2013-02-03 21:17:03 UTC (rev 3433)
@@ -1694,13 +1694,14 @@
         int customSqlReportID;      // Define before all the if...else statements
         //========================================================================
 
-        if (iData->getString() == wxT("Summary of Accounts"))
+        wxString sData = iData->getString();
+        if (sData == wxT("Summary of Accounts"))
         {
             mmPrintableBase* rs = new mmReportSummary(m_core.get(), this);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Summary of Stocks"))
+        else if (sData == wxT("Summary of Stocks"))
         {
             mmPrintableBase* rs = new mmReportSummaryStocks(m_core.get(), m_db.get());
             menuPrintingEnable(true);
@@ -1710,13 +1711,13 @@
         {
             CreateCustomReport(customSqlReportID);
         }
-        else if (iData->getString() == wxT("Summary of Assets"))
+        else if (sData == wxT("Summary of Assets"))
         {
             mmPrintableBase* rs = new mmReportSummaryAssets(m_core.get(), m_db.get());
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Categories - Over Time"))
+        else if (sData == wxT("Categories - Over Time"))
         {
             wxProgressDialog proDlg(_("Category Report"), _("Category Report being generated... Please wait."), 100, this);
             mmPrintableBase* rs = new mmReportCategoryOverTimePerformance(m_core.get());
@@ -1725,7 +1726,7 @@
             createReportsPage(rs);
             proDlg.Update(95);
         }
-        else if (iData->getString() == wxT("Categories - Month"))
+        else if (sData == wxT("Categories - Month"))
         {
             wxDateTime today = wxDateTime::Now();
             wxDateTime::Month cm = today.GetMonth();
@@ -1743,84 +1744,69 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Categories - 30 Days"))
+        else if (sData.StartsWith(wxT("Categories - ")))
         {
+            wxString title = wxGetTranslation(sData);
             wxDateTime today = wxDateTime::Now();
-            wxDateTime prevMonthEnd = today;
-            wxDateTime dtEnd = today;
-            wxDateTime dtBegin = today.Subtract(wxDateSpan::Month());
-            wxString title = _("Categories - Last 30 Days");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 0);
-            menuPrintingEnable(true);
-            createReportsPage(rs);
-        }
-        else if (iData->getString() == wxT("Categories - Current Month"))
-        {
-            wxDateTime today = wxDateTime::Now();
-            wxDateTime prevMonthEnd = today.Subtract(wxDateSpan::Days(today.GetDay()));
-            wxDateTime dtBegin = prevMonthEnd;
-            wxDateTime dtEnd = wxDateTime::Now().GetLastMonthDay();
-            wxString title = _("Categories - Current Month");
-            if (mmIniOptions::instance().ignoreFutureTransactions_)
+
+            wxDateTime dtBegin;
+            wxDateTime dtEnd;
+            if (sData == wxT("Categories - 30 Days"))
             {
-                title = _("Categories - Current Month to Date");
-                dtEnd = wxDateTime::Now();
+                wxDateTime prevMonthEnd = today;
+                dtEnd = today;
+                dtBegin = today.Subtract(wxDateSpan::Month());
             }
+            else if (sData == wxT("Categories - Current Month"))
+            {
+                wxDateTime prevMonthEnd = today.Subtract(wxDateSpan::Days(today.GetDay()));
+                dtBegin = prevMonthEnd;
+                dtEnd = wxDateTime::Now().GetLastMonthDay();
+                if (mmIniOptions::instance().ignoreFutureTransactions_)
+                {
+                    title = _("Categories - Current Month to Date");
+                    dtEnd = wxDateTime::Now();
+                }
+            }
+            else if (sData == wxT("Categories - Last Year"))
+            {
+                int year = today.GetYear() - 1;
+                wxDateTime prevYearEnd = wxDateTime(today);
+                prevYearEnd.SetYear(year);
+                prevYearEnd.SetMonth(wxDateTime::Dec);
+                prevYearEnd.SetDay(31);
+                dtEnd = prevYearEnd;
+                dtBegin = prevYearEnd.Subtract(wxDateSpan::Year());
+            }
+            else if (sData == wxT("Categories - Current Year"))
+            {
+                int year = today.GetYear() - 1;
+                wxDateTime yearBegin = wxDateTime(today);
+                yearBegin.SetYear(year);
+                yearBegin.SetMonth(wxDateTime::Dec);
+                yearBegin.SetDay(31);
+                dtEnd = today;
+                dtBegin = yearBegin;
+            }
+            else if (sData == wxT("Categories - Last Financial Year"))
+            {
+                wxDateTime refDate = wxDateTime(getUserDefinedFinancialYear(true));
+                dtEnd = refDate;
+                dtBegin = refDate.Subtract(wxDateSpan::Year());
+
+            }
+            else if (sData == wxT("Categories - Current Financial Year"))
+            {
+                dtBegin = wxDateTime(getUserDefinedFinancialYear(true));
+                dtEnd   = wxDateTime::Now();
+            }
+
             mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 0);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Categories - Last Year"))
+        else if (sData == wxT("Where the Money Comes From"))
         {
-            wxDateTime today = wxDateTime::Now();
-            int year = today.GetYear() - 1;
-            wxDateTime prevYearEnd = wxDateTime(today);
-            prevYearEnd.SetYear(year);
-            prevYearEnd.SetMonth(wxDateTime::Dec);
-            prevYearEnd.SetDay(31);
-            wxDateTime dtEnd = prevYearEnd;
-            wxDateTime dtBegin = prevYearEnd.Subtract(wxDateSpan::Year());
-            wxString title = _("Categories - Last Year");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 0);
-            menuPrintingEnable(true);
-            createReportsPage(rs);
-        }
-        else if (iData->getString() == wxT("Categories - Current Year"))
-        {
-            wxDateTime today = wxDateTime::Now();
-            int year = today.GetYear() - 1;
-            wxDateTime yearBegin = wxDateTime(today);
-            yearBegin.SetYear(year);
-            yearBegin.SetMonth(wxDateTime::Dec);
-            yearBegin.SetDay(31);
-            wxDateTime dtEnd = today;
-            wxDateTime dtBegin = yearBegin;
-            wxString title = _("Categories - Current Year");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd,title,0);
-            menuPrintingEnable(true);
-            createReportsPage(rs);
-        }
-        else if (iData->getString() == wxT("Categories - Last Financial Year"))
-        {
-            wxDateTime refDate = wxDateTime(getUserDefinedFinancialYear(true));
-            wxDateTime dtEnd = refDate;
-            wxDateTime dtBegin = refDate.Subtract(wxDateSpan::Year());
-            wxString title = _("Categories - Last Financial Year");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 0);
-            menuPrintingEnable(true);
-            createReportsPage(rs);
-        }
-        else if (iData->getString() == wxT("Categories - Current Financial Year"))
-        {
-            wxDateTime dtBegin = wxDateTime(getUserDefinedFinancialYear(true));
-            wxDateTime dtEnd   = wxDateTime::Now();
-            wxString title = _("Categories - Current Financial Year");
-            mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get(), false, dtBegin, dtEnd, title, 0);
-            menuPrintingEnable(true);
-            createReportsPage(rs);
-        }
-        else if (iData->getString() == wxT("Where the Money Comes From"))
-        {
             wxDateTime dtEnd =  wxDateTime::Now();
             wxDateTime dtBegin =  wxDateTime::Now();
             wxString title = _("Where the Money Comes From");
@@ -1828,7 +1814,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Where the Money Comes From - Month"))
+        else if (sData == wxT("Where the Money Comes From - Month"))
         {
             wxDateTime today = wxDateTime::Now();
             wxDateTime::Month cm = today.GetMonth();
@@ -1845,7 +1831,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Where the Money Comes From - 30 Days"))
+        else if (sData == wxT("Where the Money Comes From - 30 Days"))
         {
             wxDateTime today = wxDateTime::Now();
             wxDateTime prevMonthEnd = today;
@@ -1856,7 +1842,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Where the Money Comes From - Current Month"))
+        else if (sData == wxT("Where the Money Comes From - Current Month"))
         {
             wxDateTime today = wxDateTime::Now();
             wxDateTime prevMonthEnd = today.Subtract(wxDateSpan::Days(today.GetDay()));
@@ -1872,7 +1858,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Where the Money Comes From - Last Year"))
+        else if (sData == wxT("Where the Money Comes From - Last Year"))
         {
             wxDateTime today = wxDateTime::Now();
             int year = today.GetYear() - 1;
@@ -1887,7 +1873,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Where the Money Comes From - Current Year"))
+        else if (sData == wxT("Where the Money Comes From - Current Year"))
         {
             wxDateTime today = wxDateTime::Now();
             int year = today.GetYear() - 1;
@@ -1902,7 +1888,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Where the Money Comes From - Last Financial Year"))
+        else if (sData == wxT("Where the Money Comes From - Last Financial Year"))
         {
             wxDateTime refDate = wxDateTime(getUserDefinedFinancialYear(true));
             wxDateTime dtEnd = refDate;
@@ -1912,7 +1898,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Where the Money Comes From - Current Financial Year"))
+        else if (sData == wxT("Where the Money Comes From - Current Financial Year"))
         {
             wxDateTime dtEnd   = wxDateTime::Now();
             wxDateTime dtBegin = wxDateTime(getUserDefinedFinancialYear(true));
@@ -1922,7 +1908,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Where the Money Goes"))
+        else if (sData == wxT("Where the Money Goes"))
         {
             wxDateTime dtEnd = wxDateTime::Now();
             wxDateTime dtBegin = wxDateTime::Now();
@@ -1931,7 +1917,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Where the Money Goes - Month"))
+        else if (sData == wxT("Where the Money Goes - Month"))
         {
             wxDateTime today = wxDateTime::Now();
             wxDateTime::Month cm = today.GetMonth();
@@ -1948,7 +1934,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Where the Money Goes - 30 Days"))
+        else if (sData == wxT("Where the Money Goes - 30 Days"))
         {
             wxDateTime today = wxDateTime::Now();
             wxDateTime prevMonthEnd = today;
@@ -1959,7 +1945,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Where the Money Goes - Current Month"))
+        else if (sData == wxT("Where the Money Goes - Current Month"))
         {
             wxDateTime today = wxDateTime::Now();
             wxDateTime prevMonthEnd = today.Subtract(wxDateSpan::Days(today.GetDay()));
@@ -1975,7 +1961,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Where the Money Goes - Last Year"))
+        else if (sData == wxT("Where the Money Goes - Last Year"))
         {
             wxDateTime today = wxDateTime::Now();
             int year = today.GetYear() - 1;
@@ -1990,7 +1976,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Where the Money Goes - Current Year"))
+        else if (sData == wxT("Where the Money Goes - Current Year"))
         {
             wxDateTime today = wxDateTime::Now();
             int year = today.GetYear() - 1;
@@ -2005,7 +1991,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Where the Money Goes - Last Financial Year"))
+        else if (sData == wxT("Where the Money Goes - Last Financial Year"))
         {
             wxDateTime refDate = (getUserDefinedFinancialYear(true));
             wxDateTime dtEnd = refDate;
@@ -2015,7 +2001,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Where the Money Goes - Current Financial Year"))
+        else if (sData == wxT("Where the Money Goes - Current Financial Year"))
         {
             wxDateTime dtEnd   = wxDateTime::Now();
             wxDateTime dtBegin = wxDateTime(getUserDefinedFinancialYear(true));
@@ -2024,7 +2010,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Transaction Statistics"))
+        else if (sData == wxT("Transaction Statistics"))
         {
             wxDateTime today = wxDateTime::Now();
             int year = today.GetYear()-1;
@@ -2032,7 +2018,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Income vs Expenses"))
+        else if (sData == wxT("Income vs Expenses"))
         {
             wxDateTime today = wxDateTime::Now();
             int year = today.GetYear();
@@ -2040,7 +2026,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Income vs Expenses - Month"))
+        else if (sData == wxT("Income vs Expenses - Month"))
         {
             wxDateTime today = wxDateTime::Now();
             wxDateTime::Month cm = today.GetMonth();
@@ -2057,7 +2043,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Income vs Expenses - 30 Days"))
+        else if (sData == wxT("Income vs Expenses - 30 Days"))
         {
             wxDateTime today = wxDateTime::Now();
             wxDateTime prevMonthEnd = today;
@@ -2068,7 +2054,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Income vs Expenses - Current Month"))
+        else if (sData == wxT("Income vs Expenses - Current Month"))
         {
             wxDateTime today = wxDateTime::Now();
             wxDateTime prevMonthEnd = today.Subtract(wxDateSpan::Days(today.GetDay()));
@@ -2084,7 +2070,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Income vs Expenses - Last Year"))
+        else if (sData == wxT("Income vs Expenses - Last Year"))
         {
             wxDateTime today = wxDateTime::Now();
             int year = today.GetYear()-1;
@@ -2092,7 +2078,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Income vs Expenses - Current Year"))
+        else if (sData == wxT("Income vs Expenses - Current Year"))
         {
             wxDateTime today = wxDateTime::Now();
             int year = today.GetYear();
@@ -2100,7 +2086,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Income vs Expenses - Last Financial Year"))
+        else if (sData == wxT("Income vs Expenses - Last Financial Year"))
         {
             wxDateTime dtBegin = wxDateTime(getUserDefinedFinancialYear());
 
@@ -2111,7 +2097,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Income vs Expenses - Current Financial Year"))
+        else if (sData == wxT("Income vs Expenses - Current Financial Year"))
         {
             wxDateTime dtBegin = wxDateTime(getUserDefinedFinancialYear());
 
@@ -2122,21 +2108,21 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Income vs Expenses - All Time"))
+        else if (sData == wxT("Income vs Expenses - All Time"))
         {
             wxString title = _("Income vs Expenses - All Time");
             mmPrintableBase* rs = new mmReportIncomeExpenses(m_core.get(), true, wxDateTime::Now(), wxDateTime::Now(), title);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Payee Report"))
+        else if (sData == wxT("Payee Report"))
         {
             wxString title = _("Payee Report");
             mmPrintableBase* rs = new mmReportPayeeExpenses(m_core.get(), true, wxDateTime::Now(), wxDateTime::Now(), title);
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Payee Report - Month"))
+        else if (sData == wxT("Payee Report - Month"))
         {
             wxDateTime today = wxDateTime::Now();
             wxDateTime::Month cm = today.GetMonth();
@@ -2156,7 +2142,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Payee Report - 30 Days"))
+        else if (sData == wxT("Payee Report - 30 Days"))
         {
             wxDateTime today = wxDateTime::Now();
             wxDateTime prevMonthEnd = today;
@@ -2168,7 +2154,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Payee Report - Current Month"))
+        else if (sData == wxT("Payee Report - Current Month"))
         {
             wxDateTime today = wxDateTime::Now();
             wxDateTime prevMonthEnd = today.Subtract(wxDateSpan::Days(today.GetDay()));
@@ -2186,7 +2172,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Payee Report - Last Year"))
+        else if (sData == wxT("Payee Report - Last Year"))
         {
             wxDateTime today = wxDateTime::Now();
             int year = today.GetYear() - 1;
@@ -2203,7 +2189,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Payee Report - Current Year"))
+        else if (sData == wxT("Payee Report - Current Year"))
         {
             wxDateTime today = wxDateTime::Now();
             int year = today.GetYear() - 1;
@@ -2220,7 +2206,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Payee Report - Last Financial Year"))
+        else if (sData == wxT("Payee Report - Last Financial Year"))
         {
             wxDateTime refDate = wxDateTime(getUserDefinedFinancialYear());
             refDate.Subtract(wxDateSpan::Day());
@@ -2233,7 +2219,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Payee Report - Current Financial Year"))
+        else if (sData == wxT("Payee Report - Current Financial Year"))
         {
             wxDateTime dtEnd   = wxDateTime::Now();
             wxDateTime dtBegin = wxDateTime(getUserDefinedFinancialYear());
@@ -2243,7 +2229,7 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (iData->getString() == wxT("Cash Flow"))
+        else if (sData == wxT("Cash Flow"))
         {
             mmReportCashFlow* report = new mmReportCashFlow(m_core.get(), this);
 
@@ -2253,7 +2239,7 @@
             menuPrintingEnable(true);
             createReportsPage(report);
         }
-        else if (iData->getString() == wxT("Cash Flow - With Bank Accounts"))
+        else if (sData == wxT("Cash Flow - With Bank Accounts"))
         {
             mmReportCashFlow* report = new mmReportCashFlow(m_core.get(), this);
 
@@ -2263,7 +2249,7 @@
             createReportsPage(report);
         }
 
-        else if (iData->getString() == wxT("Cash Flow - With Term Accounts"))
+        else if (sData == wxT("Cash Flow - With Term Accounts"))
         {
             mmReportCashFlow* report = new mmReportCashFlow(m_core.get(), this);
 
@@ -2272,21 +2258,21 @@
             menuPrintingEnable(true);
             createReportsPage(report);
         }
-        else if (iData->getString() == wxT("Cash Flow - Specific Accounts"))
+        else if (sData == wxT("Cash Flow - Specific Accounts"))
         {
             OnCashFlowSpecificAccounts();
         }
-        else if (iData->getString() == wxT("Transaction Report"))
+        else if (sData == wxT("Transaction Report"))
         {
             wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TRANSACTIONREPORT);
             AddPendingEvent(evt);           // Events will be processed in due course.
         }
-        else if (iData->getString() == wxT("Bills & Deposits"))
+        else if (sData == wxT("Bills & Deposits"))
         {
             wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_BILLSDEPOSITS);
             AddPendingEvent(evt);
         }
-        else if (iData->getString() == wxT("Assets"))
+        else if (sData == wxT("Assets"))
         {
             wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_ASSETS);
             AddPendingEvent(evt);

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

Revision: 3435
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3435&view=rev
Author:   vomikan
Date:     2013-02-04 07:44:40 +0000 (Mon, 04 Feb 2013)
Log Message:
-----------
update

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-02-04 07:31:33 UTC (rev 3434)
+++ trunk/mmex/src/mmex.cpp	2013-02-04 07:44:40 UTC (rev 3435)
@@ -1182,30 +1182,30 @@
     navTreeCtrl_->SetItemData(categsOverTime, new mmTreeItemData(wxT("Where the Money Goes")));
 
     wxTreeItemId categsOverTimeCalMonth = navTreeCtrl_->AppendItem(categsOverTime, _("Last Calendar Month"), 4, 4);
-    navTreeCtrl_->SetItemData(categsOverTimeCalMonth, new mmTreeItemData(wxT("Where the Money Goes - Last Calendar Month")));
+    navTreeCtrl_->SetItemData(categsOverTimeCalMonth, new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Last Calendar Month")));
 
     wxString currentMonthMsg = _("Current Month");
     if (mmIniOptions::instance().ignoreFutureTransactions_) currentMonthMsg = _("Current Month to Date");
 
     wxTreeItemId categsOverTimeCurrentMonth = navTreeCtrl_->AppendItem(categsOverTime, currentMonthMsg, 4, 4);
-    navTreeCtrl_->SetItemData(categsOverTimeCurrentMonth, new mmTreeItemData(wxT("Where the Money Goes - Current Month")));
+    navTreeCtrl_->SetItemData(categsOverTimeCurrentMonth, new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Current Month")));
 
     wxTreeItemId categsOverTimeLast30 = navTreeCtrl_->AppendItem(categsOverTime, _("Last 30 Days"), 4, 4);
-    navTreeCtrl_->SetItemData(categsOverTimeLast30, new mmTreeItemData(wxT("Where the Money Goes - 30 Days")));
+    navTreeCtrl_->SetItemData(categsOverTimeLast30, new mmTreeItemData(wxTRANSLATE("Where the Money Goes - 30 Days")));
 
     wxTreeItemId categsOverTimeLastYear = navTreeCtrl_->AppendItem(categsOverTime, _("Last Year"), 4, 4);
-    navTreeCtrl_->SetItemData(categsOverTimeLastYear, new mmTreeItemData(wxT("Where the Money Goes - Last Year")));
+    navTreeCtrl_->SetItemData(categsOverTimeLastYear, new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Last Year")));
 
     wxTreeItemId categsOverTimeCurrentYear = navTreeCtrl_->AppendItem(categsOverTime, _("Current Year"), 4, 4);
-    navTreeCtrl_->SetItemData(categsOverTimeCurrentYear, new mmTreeItemData(wxT("Where the Money Goes - Current Year")));
+    navTreeCtrl_->SetItemData(categsOverTimeCurrentYear, new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Current Year")));
 
     if (financialYearIsDifferent())
     {
         wxTreeItemId categsOverTimeLastFinancialYear = navTreeCtrl_->AppendItem(categsOverTime, _("Last Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(categsOverTimeLastFinancialYear, new mmTreeItemData(wxT("Where the Money Goes - Last Financial Year")));
+        navTreeCtrl_->SetItemData(categsOverTimeLastFinancialYear, new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Last Financial Year")));
 
         wxTreeItemId categsOverTimeCurrentFinancialYear = navTreeCtrl_->AppendItem(categsOverTime, _("Current Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(categsOverTimeCurrentFinancialYear, new mmTreeItemData(wxT("Where the Money Goes - Current Financial Year")));
+        navTreeCtrl_->SetItemData(categsOverTimeCurrentFinancialYear, new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Current Financial Year")));
     }
     ///////////////////////////////////////////////////////////
 
@@ -1213,27 +1213,27 @@
     navTreeCtrl_->SetItemData(posCategs, new mmTreeItemData(wxT("Where the Money Comes From")));
 
     wxTreeItemId posCategsCalMonth = navTreeCtrl_->AppendItem(posCategs, _("Last Calendar Month"), 4, 4);
-    navTreeCtrl_->SetItemData(posCategsCalMonth, new mmTreeItemData(wxT("Where the Money Comes From - Month")));
+    navTreeCtrl_->SetItemData(posCategsCalMonth, new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Month")));
 
     wxTreeItemId posCategsCurrentMonth = navTreeCtrl_->AppendItem(posCategs, currentMonthMsg, 4, 4);
-    navTreeCtrl_->SetItemData(posCategsCurrentMonth, new mmTreeItemData(wxT("Where the Money Comes From - Current Month")));
+    navTreeCtrl_->SetItemData(posCategsCurrentMonth, new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Current Month")));
 
     wxTreeItemId posCategsTimeLast30 = navTreeCtrl_->AppendItem(posCategs, _("Last 30 Days"), 4, 4);
-    navTreeCtrl_->SetItemData(posCategsTimeLast30, new mmTreeItemData(wxT("Where the Money Comes From - 30 Days")));
+    navTreeCtrl_->SetItemData(posCategsTimeLast30, new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - 30 Days")));
 
     wxTreeItemId posCategsTimeLastYear = navTreeCtrl_->AppendItem(posCategs, _("Last Year"), 4, 4);
-    navTreeCtrl_->SetItemData(posCategsTimeLastYear, new mmTreeItemData(wxT("Where the Money Comes From - Last Year")));
+    navTreeCtrl_->SetItemData(posCategsTimeLastYear, new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Last Year")));
 
     wxTreeItemId posCategsTimeCurrentYear = navTreeCtrl_->AppendItem(posCategs, _("Current Year"), 4, 4);
-    navTreeCtrl_->SetItemData(posCategsTimeCurrentYear, new mmTreeItemData(wxT("Where the Money Comes From - Current Year")));
+    navTreeCtrl_->SetItemData(posCategsTimeCurrentYear, new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Current Year")));
 
     if (financialYearIsDifferent())
     {
         wxTreeItemId posCategsTimeLastFinancialYear = navTreeCtrl_->AppendItem(posCategs, _("Last Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(posCategsTimeLastFinancialYear, new mmTreeItemData(wxT("Where the Money Comes From - Last Financial Year")));
+        navTreeCtrl_->SetItemData(posCategsTimeLastFinancialYear, new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Last Financial Year")));
 
         wxTreeItemId posCategsTimeCurrentFinancialYear = navTreeCtrl_->AppendItem(posCategs, _("Current Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(posCategsTimeCurrentFinancialYear, new mmTreeItemData(wxT("Where the Money Comes From - Current Financial Year")));
+        navTreeCtrl_->SetItemData(posCategsTimeCurrentFinancialYear, new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Current Financial Year")));
     }
     ///////////////////////////////////////////////////////////
 
@@ -1241,27 +1241,27 @@
     navTreeCtrl_->SetItemData(categs, new mmTreeItemData(wxT("Categories - Over Time")));
 
     wxTreeItemId categsCalMonth = navTreeCtrl_->AppendItem(categs, _("Last Calendar Month"), 4, 4);
-    navTreeCtrl_->SetItemData(categsCalMonth, new mmTreeItemData(wxT("Categories - Last Calendar Month")));
+    navTreeCtrl_->SetItemData(categsCalMonth, new mmTreeItemData(wxTRANSLATE("Categories - Last Calendar Month")));
 
     wxTreeItemId categsCurrentMonth = navTreeCtrl_->AppendItem(categs, currentMonthMsg, 4, 4);
-    navTreeCtrl_->SetItemData(categsCurrentMonth, new mmTreeItemData(wxT("Categories - Current Month")));
+    navTreeCtrl_->SetItemData(categsCurrentMonth, new mmTreeItemData(wxTRANSLATE("Categories - Current Month")));
 
     wxTreeItemId categsTimeLast30 = navTreeCtrl_->AppendItem(categs, _("Last 30 Days"), 4, 4);
-    navTreeCtrl_->SetItemData(categsTimeLast30, new mmTreeItemData(wxT("Categories - 30 Days")));
+    navTreeCtrl_->SetItemData(categsTimeLast30, new mmTreeItemData(wxTRANSLATE("Categories - 30 Days")));
 
     wxTreeItemId categsTimeLastYear = navTreeCtrl_->AppendItem(categs, _("Last Year"), 4, 4);
-    navTreeCtrl_->SetItemData(categsTimeLastYear, new mmTreeItemData(wxT("Categories - Last Year")));
+    navTreeCtrl_->SetItemData(categsTimeLastYear, new mmTreeItemData(wxTRANSLATE("Categories - Last Year")));
 
     wxTreeItemId categsTimeCurrentYear = navTreeCtrl_->AppendItem(categs, _("Current Year"), 4, 4);
-    navTreeCtrl_->SetItemData(categsTimeCurrentYear, new mmTreeItemData(wxT("Categories - Current Year")));
+    navTreeCtrl_->SetItemData(categsTimeCurrentYear, new mmTreeItemData(wxTRANSLATE("Categories - Current Year")));
 
     if (financialYearIsDifferent())
     {
         wxTreeItemId categsTimeLastFinancialYear = navTreeCtrl_->AppendItem(categs, _("Last Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(categsTimeLastFinancialYear, new mmTreeItemData(wxT("Categories - Last Financial Year")));
+        navTreeCtrl_->SetItemData(categsTimeLastFinancialYear, new mmTreeItemData(wxTRANSLATE("Categories - Last Financial Year")));
 
         wxTreeItemId categsTimeCurrentFinancialYear = navTreeCtrl_->AppendItem(categs, _("Current Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(categsTimeCurrentFinancialYear, new mmTreeItemData(wxT("Categories - Current Financial Year")));
+        navTreeCtrl_->SetItemData(categsTimeCurrentFinancialYear, new mmTreeItemData(wxTRANSLATE("Categories - Current Financial Year")));
     }
     ///////////////////////////////////////////////////////////
 
@@ -1269,27 +1269,27 @@
     navTreeCtrl_->SetItemData(payeesOverTime, new mmTreeItemData(wxT("Payee Report")));
 
     wxTreeItemId payeesOverTimeCalMonth = navTreeCtrl_->AppendItem(payeesOverTime, _("Last Calendar Month"), 4, 4);
-    navTreeCtrl_->SetItemData(payeesOverTimeCalMonth, new mmTreeItemData(wxT("Payees - Last Calendar Month")));
+    navTreeCtrl_->SetItemData(payeesOverTimeCalMonth, new mmTreeItemData(wxTRANSLATE("Payees - Last Calendar Month")));
 
     wxTreeItemId payeesOverTimeCurrentMonth = navTreeCtrl_->AppendItem(payeesOverTime, currentMonthMsg, 4, 4);
-    navTreeCtrl_->SetItemData(payeesOverTimeCurrentMonth, new mmTreeItemData(wxT("Payees - Current Month")));
+    navTreeCtrl_->SetItemData(payeesOverTimeCurrentMonth, new mmTreeItemData(wxTRANSLATE("Payees - Current Month")));
 
     wxTreeItemId payeesOverTimeLast30 = navTreeCtrl_->AppendItem(payeesOverTime, _("Last 30 Days"), 4, 4);
-    navTreeCtrl_->SetItemData(payeesOverTimeLast30, new mmTreeItemData(wxT("Payees - Last 30 Days")));
+    navTreeCtrl_->SetItemData(payeesOverTimeLast30, new mmTreeItemData(wxTRANSLATE("Payees - Last 30 Days")));
 
     wxTreeItemId payeesOverTimeLastYear = navTreeCtrl_->AppendItem(payeesOverTime, _("Last Year"), 4, 4);
-    navTreeCtrl_->SetItemData(payeesOverTimeLastYear, new mmTreeItemData(wxT("Payees - Last Year")));
+    navTreeCtrl_->SetItemData(payeesOverTimeLastYear, new mmTreeItemData(wxTRANSLATE("Payees - Last Year")));
 
     wxTreeItemId payeesOverTimeCurrentYear = navTreeCtrl_->AppendItem(payeesOverTime, _("Current Year"), 4, 4);
-    navTreeCtrl_->SetItemData(payeesOverTimeCurrentYear, new mmTreeItemData(wxT("Payees - Current Year")));
+    navTreeCtrl_->SetItemData(payeesOverTimeCurrentYear, new mmTreeItemData(wxTRANSLATE("Payees - Current Year")));
 
     if (financialYearIsDifferent())
     {
         wxTreeItemId payeesOverTimeLastFinancialYear = navTreeCtrl_->AppendItem(payeesOverTime, _("Last Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(payeesOverTimeLastFinancialYear, new mmTreeItemData(wxT("Payees - Last Financial Year")));
+        navTreeCtrl_->SetItemData(payeesOverTimeLastFinancialYear, new mmTreeItemData(wxTRANSLATE("Payees - Last Financial Year")));
 
         wxTreeItemId payeesOverTimeCurrentFinancialYear = navTreeCtrl_->AppendItem(payeesOverTime, _("Current Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(payeesOverTimeCurrentFinancialYear, new mmTreeItemData(wxT("Payees - Current Financial Year")));
+        navTreeCtrl_->SetItemData(payeesOverTimeCurrentFinancialYear, new mmTreeItemData(wxTRANSLATE("Payees - Current Financial Year")));
     }
     ///////////////////////////////////////////////////////////////////
 
@@ -1297,31 +1297,31 @@
     navTreeCtrl_->SetItemData(incexpOverTime, new mmTreeItemData(wxT("Income vs Expenses")));
 
     wxTreeItemId incexpOverTimeCalMonth = navTreeCtrl_->AppendItem(incexpOverTime, _("Last Calendar Month"), 4, 4);
-    navTreeCtrl_->SetItemData(incexpOverTimeCalMonth, new mmTreeItemData(wxT("Income vs Expenses - Last Calendar Month")));
+    navTreeCtrl_->SetItemData(incexpOverTimeCalMonth, new mmTreeItemData(wxTRANSLATE("Income vs Expenses - Last Calendar Month")));
 
     wxTreeItemId incexpOverTimeCurrentMonth = navTreeCtrl_->AppendItem(incexpOverTime, currentMonthMsg, 4, 4);
-    navTreeCtrl_->SetItemData(incexpOverTimeCurrentMonth, new mmTreeItemData(wxT("Income vs Expenses - Current Month")));
+    navTreeCtrl_->SetItemData(incexpOverTimeCurrentMonth, new mmTreeItemData(wxTRANSLATE("Income vs Expenses - Current Month")));
 
     wxTreeItemId incexpOverTimeLast30 = navTreeCtrl_->AppendItem(incexpOverTime, _("Last 30 Days"), 4, 4);
-    navTreeCtrl_->SetItemData(incexpOverTimeLast30, new mmTreeItemData(wxT("Income vs Expenses - 30 Days")));
+    navTreeCtrl_->SetItemData(incexpOverTimeLast30, new mmTreeItemData(wxTRANSLATE("Income vs Expenses - 30 Days")));
 
     wxTreeItemId incexpOverTimeLastYear = navTreeCtrl_->AppendItem(incexpOverTime, _("Last Year"), 4, 4);
-    navTreeCtrl_->SetItemData(incexpOverTimeLastYear, new mmTreeItemData(wxT("Income vs Expenses - Last Year")));
+    navTreeCtrl_->SetItemData(incexpOverTimeLastYear, new mmTreeItemData(wxTRANSLATE("Income vs Expenses - Last Year")));
 
     wxTreeItemId incexpOverTimeCurrentYear = navTreeCtrl_->AppendItem(incexpOverTime, _("Current Year"), 4, 4);
-    navTreeCtrl_->SetItemData(incexpOverTimeCurrentYear, new mmTreeItemData(wxT("Income vs Expenses - Current Year")));
+    navTreeCtrl_->SetItemData(incexpOverTimeCurrentYear, new mmTreeItemData(wxTRANSLATE("Income vs Expenses - Current Year")));
 
     if (financialYearIsDifferent())
     {
         wxTreeItemId incexpOverTimeLastFinancialYear = navTreeCtrl_->AppendItem(incexpOverTime, _("Last Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(incexpOverTimeLastFinancialYear, new mmTreeItemData(wxT("Income vs Expenses - Last Financial Year")));
+        navTreeCtrl_->SetItemData(incexpOverTimeLastFinancialYear, new mmTreeItemData(wxTRANSLATE("Income vs Expenses - Last Financial Year")));
 
         wxTreeItemId incexpOverTimeCurrentFinancialYear = navTreeCtrl_->AppendItem(incexpOverTime, _("Current Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(incexpOverTimeCurrentFinancialYear, new mmTreeItemData(wxT("Income vs Expenses - Current Financial Year")));
+        navTreeCtrl_->SetItemData(incexpOverTimeCurrentFinancialYear, new mmTreeItemData(wxTRANSLATE("Income vs Expenses - Current Financial Year")));
     }
 
     wxTreeItemId incexpmonthly = navTreeCtrl_->AppendItem(incexpOverTime, _("Income vs Expenses - All Time"), 4, 4);
-    navTreeCtrl_->SetItemData(incexpmonthly, new mmTreeItemData(wxT("Income vs Expenses - All Time")));
+    navTreeCtrl_->SetItemData(incexpmonthly, new mmTreeItemData(wxTRANSLATE("Income vs Expenses - All Time")));
 
     //////////////////////////////////////////////////////////////////
     wxTreeItemId transactionList = navTreeCtrl_->AppendItem(reports, _("Transaction Report"), 4, 4);

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

Revision: 3444
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3444&view=rev
Author:   stef145g
Date:     2013-02-08 11:54:07 +0000 (Fri, 08 Feb 2013)
Log Message:
-----------
Bug Fix: Crash when using startup dialog

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-02-08 11:26:49 UTC (rev 3443)
+++ trunk/mmex/src/mmex.cpp	2013-02-08 11:54:07 UTC (rev 3444)
@@ -707,12 +707,14 @@
     }
 
     if (from_scratch) dbpath  = wxGetEmptyString();
-    if (from_scratch || !dbpath.IsOk()) {
+    if (from_scratch || !dbpath.IsOk())
+    {
         menuEnableItems(false);
-        createHomePage();
         updateNavTreeControl();
         showBeginAppDialog(dbpath.GetFullName().IsEmpty());
-    } else {
+    }
+    else
+    {
         if (!openFile(dbpath.GetFullPath(), false))
             showBeginAppDialog(true);
     }

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

Revision: 3450
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3450&view=rev
Author:   vomikan
Date:     2013-02-09 14:32:18 +0000 (Sat, 09 Feb 2013)
Log Message:
-----------
cleanup

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-02-09 14:30:46 UTC (rev 3449)
+++ trunk/mmex/src/mmex.cpp	2013-02-09 14:32:18 UTC (rev 3450)
@@ -1882,14 +1882,6 @@
             menuPrintingEnable(true);
             createReportsPage(rs);
         }
-        else if (sData == wxT("Income vs Expenses"))
-        {
-            wxDateTime today = wxDateTime::Now();
-            int year = today.GetYear();
-            mmPrintableBase* rs = new mmReportIncExpensesOverTime(m_core.get(), year);
-            menuPrintingEnable(true);
-            createReportsPage(rs);
-        }
     }
 }
 //----------------------------------------------------------------------------

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

Revision: 3458
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3458&view=rev
Author:   vomikan
Date:     2013-02-10 21:19:13 +0000 (Sun, 10 Feb 2013)
Log Message:
-----------
bug #1120951 fix

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-02-10 09:53:18 UTC (rev 3457)
+++ trunk/mmex/src/mmex.cpp	2013-02-10 21:19:13 UTC (rev 3458)
@@ -680,8 +680,9 @@
 
     // add the toolbars to the manager
     m_mgr.AddPane(toolBar_, wxAuiPaneInfo().
-        Name(wxT("toolbar")).Caption(wxT("Toolbar")).ToolbarPane().Top().
-        LeftDockable(false).RightDockable(false).MinSize(1000,-1));
+        Name(wxT("toolbar")).Caption(_("Toolbar")).ToolbarPane().Top()
+        .LeftDockable(false).RightDockable(false).MinSize(1000,-1)
+        .Show(m_inisettings->GetBoolSetting(wxT("SHOWTOOLBAR"), true)));
 
     // change look and feel of wxAuiManager
     m_mgr.GetArtProvider()->SetMetric(16, 0);
@@ -3729,6 +3730,7 @@
 {
     m_mgr.GetPane(wxT("toolbar")).Show(event.IsChecked());
     m_mgr.Update();
+    m_inisettings->SetBoolSetting(wxT("SHOWTOOLBAR"), event.IsChecked());
 }
 //----------------------------------------------------------------------------
 

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

Revision: 3484
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3484&view=rev
Author:   stef145g
Date:     2013-02-15 11:34:14 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
Fix printing menu activation

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-02-15 08:34:53 UTC (rev 3483)
+++ trunk/mmex/src/mmex.cpp	2013-02-15 11:34:14 UTC (rev 3484)
@@ -1486,7 +1486,6 @@
                 , custRepIndex_->CurrentReportTitle()
                 , sScript
                 , custRepIndex_->CurrentReportFileType());
-            menuPrintingEnable(true);
             createReportsPage(csr);
         }
     }
@@ -1571,7 +1570,6 @@
                 //wxProgressDialog proDlg(_("Budget Performance"), reportWaitingMsg, 100, this);
                 mmPrintableBase* rs = new mmReportBudgetingPerformance(m_core.get(), this, data);
                 //proDlg.Update(70);
-                menuPrintingEnable(true);
                 createReportsPage(rs);
                 //proDlg.Update(95);
             }
@@ -1580,7 +1578,6 @@
                 //wxProgressDialog proDlg(_("Budget Category Summary"), reportWaitingMsg, 100, this);
                 mmPrintableBase* rs = new mmReportBudgetCategorySummary(m_core.get(), this, data);
                 //proDlg.Update(70);
-                menuPrintingEnable(true);
                 createReportsPage(rs);
                 //proDlg.Update(95);
             }
@@ -1631,28 +1628,24 @@
         else if (iData->getString() == NAVTREECTRL_HELP)
         {
             helpFileIndex_ = mmex::HTML_INDEX;
-            menuPrintingEnable(true);
             createHelpPage();
             return;
         }
         else if (iData->getString() == NAVTREECTRL_CUSTOM_REPORTS)
         {
             helpFileIndex_ = mmex::HTML_CUSTOM_SQL;
-            menuPrintingEnable(true);
             createHelpPage();
             return;
         }
         else if (iData->getString() == NAVTREECTRL_INVESTMENT)
         {
             helpFileIndex_ = mmex::HTML_INVESTMENT;
-            menuPrintingEnable(true);
             createHelpPage();
             return;
         }
         else if (iData->getString() == NAVTREECTRL_BUDGET)
         {
             helpFileIndex_ = mmex::HTML_BUDGET;
-            menuPrintingEnable(true);
             createHelpPage();
             return;
         }
@@ -1677,19 +1670,16 @@
         else if (sData == wxT("Summary of Accounts"))
         {
             mmPrintableBase* rs = new mmReportSummary(m_core.get(), this);
-            menuPrintingEnable(true);
             createReportsPage(rs);
         }
         else if (sData == wxT("Summary of Stocks"))
         {
             mmPrintableBase* rs = new mmReportSummaryStocks(m_core.get(), m_db.get());
-            menuPrintingEnable(true);
             createReportsPage(rs);
         }
         else if (sData == wxT("Summary of Assets"))
         {
             mmPrintableBase* rs = new mmReportSummaryAssets(m_core.get(), m_db.get());
-            menuPrintingEnable(true);
             createReportsPage(rs);
         }
         else if (sData == wxT("Where the Money Goes"))
@@ -1699,7 +1689,6 @@
             wxString title = _("Where the Money Goes");
             mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get()
                 , true, dtBegin, dtEnd, title, 2);
-            menuPrintingEnable(true);
             createReportsPage(rs);
         }
         else if (sData.StartsWith(wxT("Where the Money Goes -")))
@@ -1711,7 +1700,6 @@
 
             mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get()
                 , false, dtBegin, dtEnd, title, 2);
-            menuPrintingEnable(true);
             createReportsPage(rs);
         }
         else if (sData == wxT("Where the Money Comes From"))
@@ -1721,7 +1709,6 @@
             wxString title = _("Where the Money Comes From");
             mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get()
                 , true, dtBegin, dtEnd, title, 1);
-            menuPrintingEnable(true);
             createReportsPage(rs);
         }
         else if (sData.StartsWith(wxT("Where the Money Comes From - ")))
@@ -1733,7 +1720,6 @@
 
             mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get()
                 , false, dtBegin, dtEnd, title, 1);
-            menuPrintingEnable(true);
             createReportsPage(rs);
         }
         else if (sData == wxT("Categories - Over Time"))
@@ -1741,7 +1727,6 @@
             wxProgressDialog proDlg(_("Category Report"), _("Category Report being generated... Please wait."), 100, this);
             mmPrintableBase* rs = new mmReportCategoryOverTimePerformance(m_core.get());
             proDlg.Update(70);
-            menuPrintingEnable(true);
             createReportsPage(rs);
             proDlg.Update(95);
         }
@@ -1754,7 +1739,6 @@
 
             mmPrintableBase* rs = new mmReportCategoryExpenses(m_core.get()
                 , false, dtBegin, dtEnd, title, 0);
-            menuPrintingEnable(true);
             createReportsPage(rs);
         }
         else if (sData == wxT("Payee Report"))
@@ -1762,7 +1746,6 @@
             wxString title = _("Payee Report");
             mmPrintableBase* rs = new mmReportPayeeExpenses(m_core.get()
                 , true, wxDateTime::Now(), wxDateTime::Now(), title);
-            menuPrintingEnable(true);
             createReportsPage(rs);
         }
         else if (sData.StartsWith(wxT("Payees - ")))
@@ -1774,7 +1757,6 @@
 
             mmPrintableBase* rs = new mmReportPayeeExpenses(m_core.get()
                 , false, dtBegin, dtEnd, title);
-            menuPrintingEnable(true);
             createReportsPage(rs);
 
         }
@@ -1783,7 +1765,6 @@
             wxString title = _("Income vs Expenses - All Time");
             mmPrintableBase* rs = new mmReportIncomeExpenses(m_core.get()
                 , true, wxDateTime::Now(), wxDateTime::Now(), title);
-            menuPrintingEnable(true);
             createReportsPage(rs);
         }
         else if (sData == wxT("Income vs Expenses"))
@@ -1791,7 +1772,6 @@
             mmPrintableBase* rs = new mmReportIncExpensesOverTime(m_core.get()
                 , wxDateTime::Now().GetYear(), 10);
 
-            menuPrintingEnable(true);
             createReportsPage(rs);
         }
         else if (sData.StartsWith(wxT("Income vs Expenses - ")) && sData.Contains(wxT("Year")))
@@ -1811,7 +1791,6 @@
             {
                 rs = new mmReportIncExpensesOverTime(m_core.get(), year);
             }
-            menuPrintingEnable(true);
             createReportsPage(rs);
         }
         else if (sData.StartsWith(wxT("Income vs Expenses - ")))
@@ -1823,7 +1802,6 @@
 
             mmPrintableBase* rs = new mmReportIncomeExpenses(m_core.get()
                 , false, dtBegin, dtEnd, title);
-            menuPrintingEnable(true);
             createReportsPage(rs);
         }
         else if (sData == wxT("Cash Flow"))
@@ -1833,26 +1811,19 @@
             report->activateBankAccounts();
             if (hasActiveTermAccounts())  report->activateTermAccounts();
 
-            menuPrintingEnable(true);
             createReportsPage(report);
         }
         else if (sData == wxT("Cash Flow - With Bank Accounts"))
         {
             mmReportCashFlow* report = new mmReportCashFlow(m_core.get(), this);
-
             report->activateBankAccounts();
-
-            menuPrintingEnable(true);
             createReportsPage(report);
         }
 
         else if (sData == wxT("Cash Flow - With Term Accounts"))
         {
             mmReportCashFlow* report = new mmReportCashFlow(m_core.get(), this);
-
             report->activateTermAccounts();
-
-            menuPrintingEnable(true);
             createReportsPage(report);
         }
         else if (sData == wxT("Cash Flow - Specific Accounts"))
@@ -1879,7 +1850,6 @@
             wxDateTime today = wxDateTime::Now();
             int year = today.GetYear()-1;
             mmPrintableBase* rs = new mmReportTransactionStats(m_core.get(), year);
-            menuPrintingEnable(true);
             createReportsPage(rs);
         }
     }
@@ -2215,6 +2185,7 @@
     sizer->Add(panelCurrent_, 1, wxGROW|wxALL, 1);
 
     homePanel_->Layout();
+    menuPrintingEnable(true);
 }
 //----------------------------------------------------------------------------
 
@@ -2228,6 +2199,7 @@
     sizer->Add(panelCurrent_, 1, wxGROW|wxALL, 1);
 
     homePanel_->Layout();
+    menuPrintingEnable(true);
 }
 //----------------------------------------------------------------------------
 
@@ -3051,7 +3023,6 @@
     mmFilterTransactionsDialog* dlg= new mmFilterTransactionsDialog(m_core.get(), this);
     if (dlg->ShowModal() == wxID_OK)
     {
-
         std::vector< boost::shared_ptr<mmBankTransaction> >::const_iterator i;
         for (i = m_core.get()->bTransactionList_.transactions_.begin(); i != m_core.get()->bTransactionList_.transactions_.end(); i++ )
         {
@@ -3148,15 +3119,14 @@
                     }
                 }
 
-            (*trans).push_back(pBankTransaction);
+                (*trans).push_back(pBankTransaction);
+            }
         }
-    }
-    //}
-    //FIXME: TODO:
-    //std::sort((*trans).begin(), (*trans).end(), sortTransactionsByDate1);
 
+        //FIXME: TODO:
+        //std::sort((*trans).begin(), (*trans).end(), sortTransactionsByDate1);
+
         mmReportTransactions* rs = new mmReportTransactions(trans, m_core.get(), dlg->getAccountID(), dlg);
-        menuPrintingEnable(true);
         createReportsPage(rs);
     }
     else
@@ -3210,7 +3180,6 @@
         report->activateBankAccounts();
         if (this->hasActiveTermAccounts()) report->activateTermAccounts();
 
-        menuPrintingEnable(true);
         createReportsPage(report);
     }
 }
@@ -3256,7 +3225,6 @@
 void mmGUIFrame::OnHelp(wxCommandEvent& /*event*/)
 {
     helpFileIndex_ = mmex::HTML_INDEX;
-    menuPrintingEnable(true);
     createHelpPage();
 }
 //----------------------------------------------------------------------------
@@ -3860,7 +3828,6 @@
             wxBeginBusyCursor(wxHOURGLASS_CURSOR);
             mmCustomReport* csr = new mmCustomReport(this,
                 m_core.get(), dlg->sReportTitle(), dlg->sScript(), dlg->sSctiptType());
-            menuPrintingEnable(true);
             createReportsPage(csr);
             wxEndBusyCursor();
         }

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

Revision: 3520
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3520&view=rev
Author:   stef145g
Date:     2013-02-21 10:29:06 +0000 (Thu, 21 Feb 2013)
Log Message:
-----------
Fix "Save database as" function.

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-02-21 08:35:58 UTC (rev 3519)
+++ trunk/mmex/src/mmex.cpp	2013-02-21 10:29:06 UTC (rev 3520)
@@ -2828,8 +2828,9 @@
 
     if (m_db) // database must be closed before copying its file
     {
-      m_db->Close();
-      m_db.reset();
+        m_core.reset();
+        m_db->Close();
+        m_db.reset();
     }
 
     if (!wxCopyFile(oldFileName.GetFullPath(), newFileName.GetFullPath(), true))  // true -> overwrite if file exists

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

Revision: 3585
          http://sourceforge.net/p/moneymanagerex/code/3585
Author:   vomikan
Date:     2013-03-16 17:54:53 +0000 (Sat, 16 Mar 2013)
Log Message:
-----------
update

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-03-16 17:28:04 UTC (rev 3584)
+++ trunk/mmex/src/mmex.cpp	2013-03-16 17:54:53 UTC (rev 3585)
@@ -3141,7 +3141,7 @@
     }
 
 //  The transaction filter dialog will be destroyed by the report object when completed.
-//  dlg->Destroy();
+    //dlg->Destroy();
 }
 //----------------------------------------------------------------------------
 
@@ -3354,6 +3354,9 @@
         wxMessageDialog msgDlg(this, sMsg, _("Error"), wxICON_ERROR);
         msgDlg.ShowModal();
     }
+    wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_ACCOUNT_LIST);
+    //AddPendingEvent(evt);
+    OnAccountList(evt);
 }
 //----------------------------------------------------------------------------
 
@@ -3609,7 +3612,8 @@
 void mmGUIFrame::OnCurrency(wxCommandEvent& /*event*/)
 {
     mmMainCurrencyDialog(m_core.get(),this, false).ShowModal();
-    createHomePage();
+    wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_ACCOUNT_LIST);
+    OnAccountList(evt);
 }
 //----------------------------------------------------------------------------
 

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

Revision: 3589
          http://sourceforge.net/p/moneymanagerex/code/3589
Author:   omalleypat
Date:     2013-03-16 22:25:25 +0000 (Sat, 16 Mar 2013)
Log Message:
-----------
Fix auto-execute from new repeating types monthly on last day and monthly on last business day

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-03-16 22:15:58 UTC (rev 3588)
+++ trunk/mmex/src/mmex.cpp	2013-03-16 22:25:25 UTC (rev 3589)
@@ -912,7 +912,7 @@
 
         if (autoExecuteManual && requireExecution )
         {
-            if ( (repeats < 11) || (numRepeats > 0) )
+            if ( (repeats < 11) || (numRepeats > 0) || (repeats > 14) )
             {
                 mmBDDialog repeatTransactionsDlg(m_core.get(), th.id_ ,false ,true , this, SYMBOL_BDDIALOG_IDNAME , _(" Auto Repeat Transactions"));
                 if ( repeatTransactionsDlg.ShowModal() == wxID_OK )
@@ -927,7 +927,7 @@
 
         if (autoExecuteSilent && requireExecution)
         {
-            if ( (repeats < 11) || (numRepeats > 0) )
+            if ( (repeats < 11) || (numRepeats > 0) || (repeats > 14))
             {
                 boost::shared_ptr<mmBankTransaction> pTransaction;
                 boost::shared_ptr<mmBankTransaction> pTemp(new mmBankTransaction(m_core.get()->db_));

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

Revision: 3591
          http://sourceforge.net/p/moneymanagerex/code/3591
Author:   stef145g
Date:     2013-03-17 11:31:57 +0000 (Sun, 17 Mar 2013)
Log Message:
-----------
Enter all auto active, overdue repeat transactions, until the transactions are up to date.

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-03-17 10:56:52 UTC (rev 3590)
+++ trunk/mmex/src/mmex.cpp	2013-03-17 11:31:57 UTC (rev 3591)
@@ -837,11 +837,13 @@
 //----------------------------------------------------------------------------
 void mmGUIFrame::OnAutoRepeatTransactionsTimer(wxTimerEvent& /*event*/)
 {
-    bool autoExecuteManual; // Used when decoding: REPEATS
-    bool autoExecuteSilent;
-    bool requireExecution;
+    bool autoExecuteManual = false; // Used when decoding: REPEATS
+    bool autoExecuteSilent = false;
+    bool requireExecution  = false;
+    bool continueExecution = false;
 
     m_core->currencyList_.LoadBaseCurrencySettings();
+    m_db.get()->Begin();
     wxSQLite3ResultSet q1 = m_db.get()->ExecuteQuery(SELECT_ALL_FROM_BILLSDEPOSITS_V1);
     while (q1.NextRow())
     {
@@ -910,10 +912,11 @@
             th.payeeStr_ = toAccount;
         }
 
-        if (autoExecuteManual && requireExecution )
+        if (autoExecuteManual && requireExecution)
         {
             if ( (repeats < 11) || (numRepeats > 0) || (repeats > 14) )
             {
+                continueExecution = true;
                 mmBDDialog repeatTransactionsDlg(m_core.get(), th.id_ ,false ,true , this, SYMBOL_BDDIALOG_IDNAME , _(" Auto Repeat Transactions"));
                 if ( repeatTransactionsDlg.ShowModal() == wxID_OK )
                 {
@@ -922,6 +925,10 @@
                         createHomePage(); // Update home page details only if it is being displayed
                     }
                 }
+                else // stop repeat executions from occuring
+                {
+                    continueExecution = false;
+                }
             }
         }
 
@@ -929,6 +936,7 @@
         {
             if ( (repeats < 11) || (numRepeats > 0) || (repeats > 14))
             {
+                continueExecution = true;
                 boost::shared_ptr<mmBankTransaction> pTransaction;
                 boost::shared_ptr<mmBankTransaction> pTemp(new mmBankTransaction(m_core.get()->db_));
                 pTransaction = pTemp;
@@ -964,6 +972,12 @@
         }
     }
     q1.Finalize();
+    m_db.get()->Commit();
+
+    if (continueExecution)
+    {
+        autoRepeatTransactionsTimer_.Start(5, wxTIMER_ONE_SHOT);
+    }
 }
 //----------------------------------------------------------------------------
 

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

Revision: 3693
          http://sourceforge.net/p/moneymanagerex/code/3693
Author:   guanlisheng
Date:     2013-04-16 06:24:03 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
refactor

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-04-16 06:21:46 UTC (rev 3692)
+++ trunk/mmex/src/mmex.cpp	2013-04-16 06:24:03 UTC (rev 3693)
@@ -1223,12 +1223,12 @@
 
         wxTreeItemId categsOverTimeCurrentFinancialYear = navTreeCtrl_->AppendItem(categsOverTime, _("Current Financial Year"), 4, 4);
         navTreeCtrl_->SetItemData(categsOverTimeCurrentFinancialYear, new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Current Financial Year")
-                    ,new mmReportCategoryExpensesGoesCurrentFinancialYear(m_core.get())));
+                    , new mmReportCategoryExpensesGoesCurrentFinancialYear(m_core.get())));
     }
     ///////////////////////////////////////////////////////////
 
     wxTreeItemId posCategs = navTreeCtrl_->AppendItem(reports, _("Where the Money Comes From"), 4, 4);
-    navTreeCtrl_->SetItemData(posCategs, new mmTreeItemData(wxT("Where the Money Comes From")));
+    navTreeCtrl_->SetItemData(posCategs, new mmTreeItemData(wxT("Where the Money Comes From"), new mmReportCategoryExpensesComesCurrentMonth(m_core.get())));
 
     wxTreeItemId posCategsCalMonth = navTreeCtrl_->AppendItem(posCategs, _("Last Calendar Month"), 4, 4);
     navTreeCtrl_->SetItemData(posCategsCalMonth, new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Last Calendar Month"), new mmReportCategoryExpensesComesLastMonth(m_core.get())));

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

Revision: 3697
          http://sourceforge.net/p/moneymanagerex/code/3697
Author:   guanlisheng
Date:     2013-04-16 09:58:03 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
commet out old style nav

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-04-16 09:47:01 UTC (rev 3696)
+++ trunk/mmex/src/mmex.cpp	2013-04-16 09:58:03 UTC (rev 3697)
@@ -1685,6 +1685,11 @@
         {
             CreateCustomReport(customReportID);
         }
+        else
+        {
+            createReportsPage(iData->get_report());
+        }
+#if 0
         else if (sData == wxT("Summary of Accounts"))
         {
             createReportsPage(iData->get_report());
@@ -1817,6 +1822,7 @@
             mmPrintableBase* rs = new mmReportTransactionStats(m_core.get(), year);
             createReportsPage(rs);
         }
+#endif
     }
 }
 //----------------------------------------------------------------------------

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

Revision: 3700
          http://sourceforge.net/p/moneymanagerex/code/3700
Author:   vomikan
Date:     2013-04-16 14:08:56 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
cleanup

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-04-16 13:33:35 UTC (rev 3699)
+++ trunk/mmex/src/mmex.cpp	2013-04-16 14:08:56 UTC (rev 3700)
@@ -3590,7 +3590,6 @@
     }
 
     wxArrayString as;
-    int num = (int)m_core->accountList_.accounts_.size();
     std::vector<int> arrAcctID;
 
     std::pair<mmAccountList::const_iterator, mmAccountList::const_iterator> range = m_core->accountList_.range();

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

Revision: 3703
          http://sourceforge.net/p/moneymanagerex/code/3703
Author:   vomikan
Date:     2013-04-16 21:32:04 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
wxT() remove

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-04-16 21:13:37 UTC (rev 3702)
+++ trunk/mmex/src/mmex.cpp	2013-04-16 21:32:04 UTC (rev 3703)
@@ -148,7 +148,7 @@
     }
     catch (const std::exception &e)
     {
-        wxLogError(wxString::Format(wxT("%s"), e.what()));
+        wxLogError(wxString::Format("%s", e.what()));
     }
 }
 //----------------------------------------------------------------------------
@@ -182,13 +182,13 @@
     mmIniOptions::instance().loadOptions(pIniSettings);
 
     /* Was App Maximized? */
-    bool isMaxStr = pIniSettings->GetBoolSetting(wxT("ISMAXIMIZED"), false);
+    bool isMaxStr = pIniSettings->GetBoolSetting("ISMAXIMIZED", false);
 
     /* Load Dimensions of Window */
-    int valx = pIniSettings->GetIntSetting(wxT("ORIGINX"),50);
-    int valy = pIniSettings->GetIntSetting(wxT("ORIGINY"),50);
-    int valw = pIniSettings->GetIntSetting(wxT("SIZEW"),800);
-    int valh = pIniSettings->GetIntSetting(wxT("SIZEH"),600);
+    int valx = pIniSettings->GetIntSetting("ORIGINX",50);
+    int valy = pIniSettings->GetIntSetting("ORIGINY",50);
+    int valw = pIniSettings->GetIntSetting("SIZEW",800);
+    int valh = pIniSettings->GetIntSetting("SIZEH",600);
 
     mmSelectLanguage(0, pIniSettings, false);
 
@@ -228,7 +228,7 @@
     }
     catch (const std::exception &e)
     {
-        wxLogError(wxString::Format(wxT("%s"), e.what()));
+        wxLogError(wxString::Format("%s", e.what()));
     }
 
     return ok;
@@ -262,9 +262,9 @@
 */
     page1 = new wxWizardPageSimple(this);
     wxString displayMsg;
-    displayMsg << _("The next pages will help you create a new database.") << wxT("\n\n")
-               << _("Your database file is stored with an extension of .mmb.")<< wxT("\n\n")
-               << _("As this file contains important financial information,\nwe recommended creating daily backups with the Options\nsetting: 'Backup before opening', and store your backups\nin a separate location.")<< wxT("\n\n")
+    displayMsg << _("The next pages will help you create a new database.") << "\n\n"
+               << _("Your database file is stored with an extension of .mmb.")<< "\n\n"
+               << _("As this file contains important financial information,\nwe recommended creating daily backups with the Options\nsetting: 'Backup before opening', and store your backups\nin a separate location.")<< "\n\n"
                << _("The database can later be encrypted if required, by\nusing the option: 'Save database as' and changing the\nfile type before saving.");
     new wxStaticText(page1, wxID_ANY,displayMsg);
 
@@ -329,7 +329,7 @@
     default, and can be changed when editing account details.
 ***************************************************************/
     helpMsg << _("Specify the base (or default) currency to be used for the\ndatabase. The base currency can later be changed by using\nthe options dialog. New accounts, will use this currency by\ndefault, and can be changed when editing account details.")
-            << wxT("\n");
+            << "\n";
     mainSizer->Add( new wxStaticText(this, wxID_ANY, helpMsg), 0, wxALL, 5);
 
 
@@ -343,7 +343,7 @@
     itemBoxSizer5->Add(itemUserName_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
     helpMsg.Empty();
-    helpMsg << _("(Optional) Specify a title or your name.") << wxT("\n")
+    helpMsg << _("(Optional) Specify a title or your name.") << "\n"
             << _("Used as a database title for displayed and printed reports.");
     mainSizer->Add( new wxStaticText(this, wxID_ANY, helpMsg), 0, wxALL, 5);
 
@@ -361,7 +361,7 @@
         return false;
     }
     userName = itemUserName_->GetValue().Trim();
-    parent_->m_core->dbInfoSettings_->SetStringSetting(wxT("USERNAME"), userName);
+    parent_->m_core->dbInfoSettings_->SetStringSetting("USERNAME", userName);
 
     return true;
 }
@@ -445,7 +445,7 @@
     mainSizer->Add( textAccountName_, 0 /* No stretching */, wxALL, 5 /* Border Size */);
 
     wxString helpMsg;
-    helpMsg  << wxT("\n") << _("Specify a descriptive name for the account.") << wxT("\n")
+    helpMsg  << "\n" << _("Specify a descriptive name for the account.") << "\n"
             << _("This is generally the name of a financial institution\nwhere the account is held. For example: 'ABC Bank'.");
     mainSizer->Add(new wxStaticText(this, wxID_ANY, helpMsg ), 0, wxALL, 5);
 
@@ -472,16 +472,16 @@
     mainSizer->Add( itemChoiceType_, 0 /* No stretching*/, wxALL, 5 /* Border Size */);
 
     wxString textMsg;
-    textMsg << wxT("\n")
-            << _("Select the type of account you want to create:") << wxT("\n\n")
+    textMsg << "\n"
+            << _("Select the type of account you want to create:") << "\n\n"
             << _("General bank accounts cover a wide variety of account\ntypes like Checking, Savings and Credit card type accounts.");
     mainSizer->Add( new wxStaticText(this, wxID_ANY,textMsg), 0, wxALL, 5);
 
-    textMsg = wxT("\n");
+    textMsg = "\n";
     textMsg << _("Investment accounts are specialized accounts that only\nhave stock/mutual fund investments associated with them.");
     mainSizer->Add( new wxStaticText(this, wxID_ANY,textMsg), 0, wxALL, 5);
 
-    textMsg = wxT("\n");
+    textMsg = "\n";
     textMsg << _("Term accounts are specialized bank accounts. Intended for asset\ntype accounts such as Term Deposits and Bonds. These accounts\ncan have regular money coming in and out, being outside the\ngeneral income stream.");
     mainSizer->Add( new wxStaticText(this, wxID_ANY,textMsg), 0, wxALL, 5);
 
@@ -503,7 +503,7 @@
     if (currencyID == -1)
     {
         wxString errorMsg;
-        errorMsg << _("Base Account Currency Not set.") << wxT("\n")
+        errorMsg << _("Base Account Currency Not set.") << "\n"
                  << _("Set that first using Tools->Options menu and then add a new account.");
         wxMessageBox( errorMsg, _("New Account"), wxOK|wxICON_WARNING, this);
         return false;
@@ -655,14 +655,14 @@
     /* Setup Printer */
     printer_.reset(new wxHtmlEasyPrinting(mmex::getProgramName(), this));
     wxString printHeaderBase = mmex::getProgramName();
-    printer_-> SetHeader( printHeaderBase + wxT("(@PAGENUM@...>"), wxPAGE_ALL);
+    printer_-> SetHeader( printHeaderBase + "(@PAGENUM@...>", wxPAGE_ALL);
 
     restorePrinterValues();
 
     custRepIndex_ = new CustomReportIndex();
 
     // decide if we need to show app start dialog
-    bool from_scratch = m_inisettings->GetBoolSetting(wxT("SHOWBEGINAPP"), true);
+    bool from_scratch = m_inisettings->GetBoolSetting("SHOWBEGINAPP", true);
 
     wxFileName dbpath = mmDBWrapper::getLastDbPath(m_inisettings);
     if (from_scratch && !dbpath.IsOk()) mmSelectLanguage(this, m_inisettings, true);
@@ -674,14 +674,14 @@
     recentFiles_ = new RecentDatabaseFiles(m_inisettings, menuRecentFiles_);
 
     // Load perspective
-    wxString auiPerspective = m_inisettings->GetStringSetting(wxT("AUIPERSPECTIVE"), m_perspective);
+    wxString auiPerspective = m_inisettings->GetStringSetting("AUIPERSPECTIVE", m_perspective);
     m_mgr.LoadPerspective(auiPerspective);
 
     // add the toolbars to the manager
     m_mgr.AddPane(toolBar_, wxAuiPaneInfo().
-        Name(wxT("toolbar")).Caption(_("Toolbar")).ToolbarPane().Top()
+        Name("toolbar").Caption(_("Toolbar")).ToolbarPane().Top()
         .LeftDockable(false).RightDockable(false).MinSize(1000,-1)
-        .Show(m_inisettings->GetBoolSetting(wxT("SHOWTOOLBAR"), true)));
+        .Show(m_inisettings->GetBoolSetting("SHOWTOOLBAR", true)));
 
     // change look and feel of wxAuiManager
     m_mgr.GetArtProvider()->SetMetric(16, 0);
@@ -689,7 +689,7 @@
 
     // Save default perspective
     m_perspective = m_mgr.SavePerspective();
-    m_inisettings->SetStringSetting(wxT("AUIPERSPECTIVE"), m_perspective);
+    m_inisettings->SetStringSetting("AUIPERSPECTIVE", m_perspective);
 
     // "commit" all changes made to wxAuiManager
     m_mgr.Update();
@@ -746,7 +746,7 @@
     if (m_db)    m_db->Close();
 
     /// Update the database according to user requirements
-    if (mmOptions::instance().databaseUpdated_ && m_inisettings->GetBoolSetting(wxT("BACKUPDB_UPDATE"), false))
+    if (mmOptions::instance().databaseUpdated_ && m_inisettings->GetBoolSetting("BACKUPDB_UPDATE", false))
     {
         BackupDatabase(fileName_, true);
     }
@@ -846,27 +846,27 @@
     while (q1.NextRow())
     {
         mmBDTransactionHolder th;
-        th.id_             = q1.GetInt(wxT("BDID"));
-        th.nextOccurDate_  = mmGetStorageStringAsDate(q1.GetString(wxT("NEXTOCCURRENCEDATE")));
+        th.id_             = q1.GetInt("BDID");
+        th.nextOccurDate_  = mmGetStorageStringAsDate(q1.GetString("NEXTOCCURRENCEDATE"));
 
         th.nextOccurStr_   = mmGetDateForDisplay(th.nextOccurDate_);
-        th.payeeID_        = q1.GetInt(wxT("PAYEEID"));
-        th.transType_      = q1.GetString(wxT("TRANSCODE"));
-        th.accountID_      = q1.GetInt(wxT("ACCOUNTID"));
-        th.toAccountID_    = q1.GetInt(wxT("TOACCOUNTID"));
+        th.payeeID_        = q1.GetInt("PAYEEID");
+        th.transType_      = q1.GetString("TRANSCODE");
+        th.accountID_      = q1.GetInt("ACCOUNTID");
+        th.toAccountID_    = q1.GetInt("TOACCOUNTID");
 
         th.accountName_    = m_core.get()->accountList_.GetAccountName(th.accountID_);
-        th.amt_            = q1.GetDouble(wxT("TRANSAMOUNT"));
-        th.toAmt_          = q1.GetDouble(wxT("TOTRANSAMOUNT"));
-        th.notes_          = q1.GetString(wxT("NOTES"));
-        th.categID_        = q1.GetInt(wxT("CATEGID"));
+        th.amt_            = q1.GetDouble("TRANSAMOUNT");
+        th.toAmt_          = q1.GetDouble("TOTRANSAMOUNT");
+        th.notes_          = q1.GetString("NOTES");
+        th.categID_        = q1.GetInt("CATEGID");
         th.categoryStr_    = m_core.get()->categoryList_.GetCategoryName(th.categID_);
-        th.subcategID_     = q1.GetInt(wxT("SUBCATEGID"));
+        th.subcategID_     = q1.GetInt("SUBCATEGID");
         th.subcategoryStr_ = m_core.get()->categoryList_.GetSubCategoryName(th.categID_, th.subcategID_);
 
         // DeMultiplex the Auto Executable fields from the db entry: REPEATS
-        int repeats        = q1.GetInt(wxT("REPEATS"));
-        int numRepeats     = q1.GetInt(wxT("NUMOCCURRENCES"));
+        int repeats        = q1.GetInt("REPEATS");
+        int numRepeats     = q1.GetInt("NUMOCCURRENCES");
 
         autoExecuteManual = false;
         autoExecuteSilent = false;
@@ -947,8 +947,8 @@
                 pTransaction->payee_ = m_core.get()->payeeList_.GetPayeeSharedPtr(th.payeeID_);
                 pTransaction->transType_ = th.transType_;
                 pTransaction->amt_ = th.amt_;
-                pTransaction->status_ = q1.GetString(wxT("STATUS"));
-                pTransaction->transNum_ = q1.GetString(wxT("TRANSACTIONNUMBER"));
+                pTransaction->status_ = q1.GetString("STATUS");
+                pTransaction->transNum_ = q1.GetString("TRANSACTIONNUMBER");
                 pTransaction->notes_ = th.notes_;
                 pTransaction->category_ = m_core.get()->categoryList_.GetCategorySharedPtr(th.categID_, th.subcategID_);
                 pTransaction->date_ = th.nextOccurDate_;
@@ -987,25 +987,25 @@
     if (! fileName_.IsEmpty())
     {
         wxFileName fname(fileName_);
-        m_inisettings->SetStringSetting(wxT("LASTFILENAME"), fname.GetFullPath());
+        m_inisettings->SetStringSetting("LASTFILENAME", fname.GetFullPath());
     }
 
     /* Aui Settings */
-    m_inisettings->SetStringSetting(wxT("AUIPERSPECTIVE"), m_mgr.SavePerspective());
+    m_inisettings->SetStringSetting("AUIPERSPECTIVE", m_mgr.SavePerspective());
 
     // prevent values being saved while window is in an iconised state.
     if (this->IsIconized()) this->Restore();
 
     int value_x = 0, value_y = 0;
     this->GetPosition(&value_x, &value_y);
-    m_inisettings->SetIntSetting(wxT("ORIGINX"), value_x);
-    m_inisettings->SetIntSetting(wxT("ORIGINY"), value_y);
+    m_inisettings->SetIntSetting("ORIGINX", value_x);
+    m_inisettings->SetIntSetting("ORIGINY", value_y);
 
     int value_w = 0, value_h = 0;
     this->GetSize(&value_w, &value_h);
-    m_inisettings->SetIntSetting(wxT("SIZEW"), value_w);
-    m_inisettings->SetIntSetting(wxT("SIZEH"), value_h);
-    m_inisettings->SetIntSetting(wxT("ISMAXIMIZED"), this->IsMaximized());
+    m_inisettings->SetIntSetting("SIZEW", value_w);
+    m_inisettings->SetIntSetting("SIZEH", value_h);
+    m_inisettings->SetIntSetting("ISMAXIMIZED", this->IsMaximized());
 }
 //----------------------------------------------------------------------------
 
@@ -1073,12 +1073,12 @@
         wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxTR_SINGLE | wxNO_BORDER);
 
     m_mgr.AddPane(navTreeCtrl_, wxAuiPaneInfo().
-        Name(wxT("Navigation")).Caption(_("Navigation")).
+        Name("Navigation").Caption(_("Navigation")).
         BestSize(wxSize(200,100)).MinSize(wxSize(100,100)).
         Left());
 
     m_mgr.AddPane(homePanel_, wxAuiPaneInfo().
-        Name(wxT("Home")).Caption(wxT("Home")).
+        Name("Home").Caption("Home").
         CenterPane().PaneBorder(false));
 }
 //----------------------------------------------------------------------------
@@ -1097,13 +1097,13 @@
     //navTreeCtrl_->SetBackgroundColour(mmColors::navTreeBkColor);
 
     wxTreeItemId root = navTreeCtrl_->AddRoot(_("Home Page"), 0, 0);
-    navTreeCtrl_->SetItemData(root, new mmTreeItemData(wxT("Home Page")));
+    navTreeCtrl_->SetItemData(root, new mmTreeItemData("Home Page"));
     navTreeCtrl_->SetItemBold(root, true);
     navTreeCtrl_->SetFocus();
 
 
     wxTreeItemId accounts = navTreeCtrl_->AppendItem(root, _("Bank Accounts"), 9, 9);
-    navTreeCtrl_->SetItemData(accounts, new mmTreeItemData(wxT("Bank Accounts")));
+    navTreeCtrl_->SetItemData(accounts, new mmTreeItemData("Bank Accounts"));
     navTreeCtrl_->SetItemBold(accounts, true);
 
     wxTreeItemId termAccount;
@@ -1111,26 +1111,26 @@
     {
     //  Positioning for new type of accounts: Term Accounts
         termAccount = navTreeCtrl_->AppendItem(root, _("Term Accounts"), 12, 12);
-        navTreeCtrl_->SetItemData(termAccount, new mmTreeItemData(wxT("Term Accounts")));
+        navTreeCtrl_->SetItemData(termAccount, new mmTreeItemData("Term Accounts"));
         navTreeCtrl_->SetItemBold(termAccount, true);
     }
 
     wxTreeItemId stocks;
     stocks = navTreeCtrl_->AppendItem(root, _("Stocks"), 15, 15);
-    navTreeCtrl_->SetItemData(stocks, new mmTreeItemData(wxT("Stocks")));
+    navTreeCtrl_->SetItemData(stocks, new mmTreeItemData("Stocks"));
     navTreeCtrl_->SetItemBold(stocks, true);
 
     if (mmIniOptions::instance().enableAssets_)
     {
         wxTreeItemId assets = navTreeCtrl_->AppendItem(root, _("Assets"), 7, 7);
-        navTreeCtrl_->SetItemData(assets, new mmTreeItemData(wxT("Assets")));
+        navTreeCtrl_->SetItemData(assets, new mmTreeItemData("Assets"));
         navTreeCtrl_->SetItemBold(assets, true);
     }
 
     if (mmIniOptions::instance().enableRepeatingTransactions_)
     {
        wxTreeItemId bills = navTreeCtrl_->AppendItem(root, _("Repeating Transactions"), 2, 2);
-       navTreeCtrl_->SetItemData(bills, new mmTreeItemData(wxT("Bills & Deposits")));
+       navTreeCtrl_->SetItemData(bills, new mmTreeItemData("Bills & Deposits"));
        navTreeCtrl_->SetItemBold(bills, true);
     }
 
@@ -1138,7 +1138,7 @@
     if (mmIniOptions::instance().enableBudget_)
     {
         budgeting = navTreeCtrl_->AppendItem(root, _("Budget Setup"), 3, 3);
-        navTreeCtrl_->SetItemData(budgeting, new mmTreeItemData(wxT("Budgeting")));
+        navTreeCtrl_->SetItemData(budgeting, new mmTreeItemData("Budgeting"));
         navTreeCtrl_->SetItemBold(budgeting, true);
     }
 
@@ -1171,7 +1171,7 @@
                 customSqlReportItem = navTreeCtrl_->AppendItem(customSqlReports,reportTitle, 8, 8);
                 customSqlReportRootItem = customSqlReportItem;
             }
-            reportNumberStr.Printf(wxT("Custom_Report_%d"), ++reportNumber);
+            reportNumberStr.Printf("Custom_Report_%d", ++reportNumber);
             navTreeCtrl_->SetItemData(customSqlReportItem, new mmTreeItemData(reportNumberStr));
             reportTitle = custRepIndex_->NextReportTitle();
         }
@@ -1183,19 +1183,19 @@
     /* ================================================================================================= */
 
     wxTreeItemId reportsSummary = navTreeCtrl_->AppendItem(reports, _("Summary of Accounts"), 4, 4);
-    navTreeCtrl_->SetItemData(reportsSummary, new mmTreeItemData(wxT("Summary of Accounts"), new mmReportSummary(m_core.get(), this)));
+    navTreeCtrl_->SetItemData(reportsSummary, new mmTreeItemData("Summary of Accounts", new mmReportSummary(m_core.get(), this)));
 
     wxTreeItemId reportsStocks = navTreeCtrl_->AppendItem(reportsSummary, _("Stocks"), 4, 4);
-    navTreeCtrl_->SetItemData(reportsStocks, new mmTreeItemData(wxT("Summary of Stocks"), new mmReportSummaryStocks(m_core.get())));
+    navTreeCtrl_->SetItemData(reportsStocks, new mmTreeItemData("Summary of Stocks", new mmReportSummaryStocks(m_core.get())));
 
     if (mmIniOptions::instance().enableAssets_)
     {
         wxTreeItemId reportsAssets = navTreeCtrl_->AppendItem(reportsSummary, _("Assets"), 4, 4);
-        navTreeCtrl_->SetItemData(reportsAssets, new mmTreeItemData(wxT("Summary of Assets"), new mmReportSummaryAssets(m_core.get())));
+        navTreeCtrl_->SetItemData(reportsAssets, new mmTreeItemData("Summary of Assets", new mmReportSummaryAssets(m_core.get())));
     }
 
     wxTreeItemId categsOverTime = navTreeCtrl_->AppendItem(reports, _("Where the Money Goes"), 4, 4);
-    navTreeCtrl_->SetItemData(categsOverTime, new mmTreeItemData(wxT("Where the Money Goes"), new mmReportCategoryExpensesGoes(m_core.get())));
+    navTreeCtrl_->SetItemData(categsOverTime, new mmTreeItemData("Where the Money Goes", new mmReportCategoryExpensesGoes(m_core.get())));
 
     wxTreeItemId categsOverTimeCalMonth = navTreeCtrl_->AppendItem(categsOverTime, _("Last Calendar Month"), 4, 4);
     navTreeCtrl_->SetItemData(categsOverTimeCalMonth, new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Last Calendar Month"), new mmReportCategoryExpensesGoesLastMonth(m_core.get())));
@@ -1228,7 +1228,7 @@
     ///////////////////////////////////////////////////////////
 
     wxTreeItemId posCategs = navTreeCtrl_->AppendItem(reports, _("Where the Money Comes From"), 4, 4);
-    navTreeCtrl_->SetItemData(posCategs, new mmTreeItemData(wxT("Where the Money Comes From"), new mmReportCategoryExpensesComesCurrentMonth(m_core.get())));
+    navTreeCtrl_->SetItemData(posCategs, new mmTreeItemData("Where the Money Comes From", new mmReportCategoryExpensesComesCurrentMonth(m_core.get())));
 
     wxTreeItemId posCategsCalMonth = navTreeCtrl_->AppendItem(posCategs, _("Last Calendar Month"), 4, 4);
     navTreeCtrl_->SetItemData(posCategsCalMonth, new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Last Calendar Month"), new mmReportCategoryExpensesComesLastMonth(m_core.get())));
@@ -1258,7 +1258,7 @@
     ///////////////////////////////////////////////////////////
 
     wxTreeItemId categs = navTreeCtrl_->AppendItem(reports, _("Categories"), 4, 4);
-    navTreeCtrl_->SetItemData(categs, new mmTreeItemData(wxT("Categories - Over Time")));
+    navTreeCtrl_->SetItemData(categs, new mmTreeItemData("Categories - Over Time"));
 
     wxTreeItemId categsCalMonth = navTreeCtrl_->AppendItem(categs, _("Last Calendar Month"), 4, 4);
     navTreeCtrl_->SetItemData(categsCalMonth, new mmTreeItemData(wxTRANSLATE("Categories - Last Calendar Month"), new mmReportCategoryOverTimePerformance(m_core.get())));
@@ -1288,7 +1288,7 @@
     ///////////////////////////////////////////////////////////
 
     wxTreeItemId payeesOverTime = navTreeCtrl_->AppendItem(reports, _("Payees"), 4, 4);
-    navTreeCtrl_->SetItemData(payeesOverTime, new mmTreeItemData(wxT("Payee Report")));
+    navTreeCtrl_->SetItemData(payeesOverTime, new mmTreeItemData("Payee Report"));
 
     wxTreeItemId payeesOverTimeCalMonth = navTreeCtrl_->AppendItem(payeesOverTime, _("Last Calendar Month"), 4, 4);
     navTreeCtrl_->SetItemData(payeesOverTimeCalMonth, new mmTreeItemData(wxTRANSLATE("Payees - Last Calendar Month"), new mmReportPayeeExpensesLastMonth(m_core.get())));
@@ -1318,7 +1318,7 @@
     ///////////////////////////////////////////////////////////////////
 
     wxTreeItemId incexpOverTime = navTreeCtrl_->AppendItem(reports, _("Income vs Expenses"), 4, 4);
-    navTreeCtrl_->SetItemData(incexpOverTime, new mmTreeItemData(wxT("Income vs Expenses")));
+    navTreeCtrl_->SetItemData(incexpOverTime, new mmTreeItemData("Income vs Expenses"));
 
     wxTreeItemId incexpOverTimeCalMonth = navTreeCtrl_->AppendItem(incexpOverTime, _("Last Calendar Month"), 4, 4);
     navTreeCtrl_->SetItemData(incexpOverTimeCalMonth, new mmTreeItemData(wxTRANSLATE("Income vs Expenses - Last Calendar Month")));
@@ -1349,7 +1349,7 @@
 
     //////////////////////////////////////////////////////////////////
     wxTreeItemId transactionList = navTreeCtrl_->AppendItem(reports, _("Transaction Report"), 4, 4);
-    navTreeCtrl_->SetItemData(transactionList, new mmTreeItemData(wxT("Transaction Report")));
+    navTreeCtrl_->SetItemData(transactionList, new mmTreeItemData("Transaction Report"));
 
     ///////////////////////////////////////////////////////////////////
 
@@ -1365,14 +1365,14 @@
         {
             if (!i) { // first loop only
                 budgetPerformance = navTreeCtrl_->AppendItem(reports, _("Budget Performance"), 4, 4);
-                navTreeCtrl_->SetItemData(budgetPerformance, new mmTreeItemData(wxT("Budget Performance")));
+                navTreeCtrl_->SetItemData(budgetPerformance, new mmTreeItemData("Budget Performance"));
 
                 budgetSetupPerformance = navTreeCtrl_->AppendItem(reports, _("Budget Category Summary"), 4, 4);
-                navTreeCtrl_->SetItemData(budgetSetupPerformance, new mmTreeItemData(wxT("Budget Setup Performance")));
+                navTreeCtrl_->SetItemData(budgetSetupPerformance, new mmTreeItemData("Budget Setup Performance"));
             }
 
-            int id = q1.GetInt(wxT("BUDGETYEARID"));
-            const wxString name = q1.GetString(wxT("BUDGETYEARNAME"));
+            int id = q1.GetInt("BUDGETYEARID");
+            const wxString name = q1.GetString("BUDGETYEARNAME");
 
             wxTreeItemId bYear = navTreeCtrl_->AppendItem(budgeting, name, 3, 3);
             navTreeCtrl_->SetItemData(bYear, new mmTreeItemData(id, true));
@@ -1396,27 +1396,27 @@
 
     ///////////////////////////////////////////////////////////////////
     wxTreeItemId cashFlow = navTreeCtrl_->AppendItem(reports, _("Cash Flow"), 4, 4);
-    navTreeCtrl_->SetItemData(cashFlow, new mmTreeItemData(wxT("Cash Flow")));
+    navTreeCtrl_->SetItemData(cashFlow, new mmTreeItemData("Cash Flow"));
 
     wxTreeItemId cashflowWithBankAccounts = navTreeCtrl_->AppendItem(cashFlow, _("Cash Flow - With Bank Accounts"), 4, 4);
-    navTreeCtrl_->SetItemData(cashflowWithBankAccounts, new mmTreeItemData(wxT("Cash Flow - With Bank Accounts")));
+    navTreeCtrl_->SetItemData(cashflowWithBankAccounts, new mmTreeItemData("Cash Flow - With Bank Accounts"));
 
     if ( hasActiveTermAccounts() )
     {
         wxTreeItemId cashflowWithTermAccounts = navTreeCtrl_->AppendItem(cashFlow, _("Cash Flow - With Term Accounts"), 4, 4);
-        navTreeCtrl_->SetItemData(cashflowWithTermAccounts, new mmTreeItemData(wxT("Cash Flow - With Term Accounts")));
+        navTreeCtrl_->SetItemData(cashflowWithTermAccounts, new mmTreeItemData("Cash Flow - With Term Accounts"));
     }
 
     wxTreeItemId cashflowSpecificAccounts = navTreeCtrl_->AppendItem(cashFlow, _("Cash Flow - Specific Accounts"), 4, 4);
-    navTreeCtrl_->SetItemData(cashflowSpecificAccounts, new mmTreeItemData(wxT("Cash Flow - Specific Accounts")));
+    navTreeCtrl_->SetItemData(cashflowSpecificAccounts, new mmTreeItemData("Cash Flow - Specific Accounts"));
 
 
     wxTreeItemId cashflowSpecificAccountsDaily = navTreeCtrl_->AppendItem(cashFlow, _("Daily Cash Flow - Specific Accounts"), 4, 4);
-    navTreeCtrl_->SetItemData(cashflowSpecificAccountsDaily, new mmTreeItemData(wxT("Daily Cash Flow - Specific Accounts")));
+    navTreeCtrl_->SetItemData(cashflowSpecificAccountsDaily, new mmTreeItemData("Daily Cash Flow - Specific Accounts"));
 
     ///////////////////////////////////////////////////////
     wxTreeItemId transactionStats = navTreeCtrl_->AppendItem(reports, _("Transaction Statistics"), 4, 4);
-    navTreeCtrl_->SetItemData(transactionStats, new mmTreeItemData(wxT("Transaction Statistics")));
+    navTreeCtrl_->SetItemData(transactionStats, new mmTreeItemData("Transaction Statistics"));
 
      ///////////////////////////////////////////////////////////////////
 
@@ -1434,7 +1434,7 @@
 
     /* Load Nav Tree Control */
 
-    wxString vAccts = m_inisettings->GetStringSetting(wxT("VIEWACCOUNTS"), wxT("ALL"));
+    wxString vAccts = m_inisettings->GetStringSetting("VIEWACCOUNTS", "ALL");
 
     std::pair<mmAccountList::const_iterator, mmAccountList::const_iterator> range = m_core->accountList_.range();
     for (mmAccountList::const_iterator it = range.first; it != range.second; ++ it)
@@ -1444,9 +1444,9 @@
         if (account->acctType_ == ACCOUNT_TYPE_BANK)
         {
             const mmAccount* pCA = account;
-            if ((vAccts == wxT("Open") && pCA->status_ == mmAccount::MMEX_Open) ||
-                (vAccts == wxT("Favorites") && pCA->favoriteAcct_) ||
-                (vAccts == wxT("ALL")))
+            if ((vAccts == "Open" && pCA->status_ == mmAccount::MMEX_Open) ||
+                (vAccts == "Favorites" && pCA->favoriteAcct_) ||
+                (vAccts == "ALL"))
             {
                 int selectedImage = mmIniOptions::instance().account_image_id(m_core.get(), pCA->id_);
                 wxTreeItemId tacct = navTreeCtrl_->AppendItem(accounts, pCA->name_, selectedImage, selectedImage);
@@ -1457,9 +1457,9 @@
         else if (account->acctType_ == ACCOUNT_TYPE_TERM)
         {
            const mmAccount* pTA = account;
-            if ((vAccts == wxT("Open") && pTA->status_ == mmAccount::MMEX_Open) ||
-                (vAccts == wxT("Favorites") && pTA->favoriteAcct_) ||
-                (vAccts == wxT("ALL")))
+            if ((vAccts == "Open" && pTA->status_ == mmAccount::MMEX_Open) ||
+                (vAccts == "Favorites" && pTA->favoriteAcct_) ||
+                (vAccts == "ALL"))
             {
                 int selectedImage = mmIniOptions::instance().account_image_id(m_core.get(), pTA->id_);
                 wxTreeItemId tacct = navTreeCtrl_->AppendItem(termAccount, pTA->name_, selectedImage, selectedImage);
@@ -1470,9 +1470,9 @@
         else //if (account->acctType_ == ACCOUNT_TYPE_STOCK)
         {
             const mmAccount* pIA = account;
-            if ((vAccts == wxT("Open") && pIA->status_ == mmAccount::MMEX_Open) ||
-                (vAccts == wxT("Favorites") && pIA->favoriteAcct_) ||
-                (vAccts == wxT("ALL")))
+            if ((vAccts == "Open" && pIA->status_ == mmAccount::MMEX_Open) ||
+                (vAccts == "Favorites" && pIA->favoriteAcct_) ||
+                (vAccts == "ALL"))
             {
                 int selectedImage = mmIniOptions::instance().account_image_id(m_core.get(), pIA->id_);
                 wxTreeItemId tacct = navTreeCtrl_->AppendItem(stocks, pIA->name_, selectedImage, selectedImage);
@@ -1502,7 +1502,7 @@
     homePageAccountSelect_ = true; // prevent Navigation tree code execution.
     wxBeginBusyCursor(wxHOURGLASS_CURSOR);
 
-    if (custRepIndex_->ReportFileName(index) != wxT(""))
+    if (custRepIndex_->ReportFileName(index) != "")
     {
         wxString sScript;
         if (custRepIndex_->GetReportFileData(sScript) )
@@ -1528,7 +1528,7 @@
     wxString sItemName = iData->getString();
     if (wxNOT_FOUND != sItemName.Index(wxT("Custom_Report_")))
     {
-        sItemName.Replace(wxT("Custom_Report_"), wxT(""));
+        sItemName.Replace("Custom_Report_", "");
         long index;
         result = sItemName.ToLong(&index);
         if (result) customSqlReportID = index;
@@ -1591,13 +1591,13 @@
 
             wxTreeItemId idparent = navTreeCtrl_->GetItemParent(id);
             mmTreeItemData* iParentData = dynamic_cast<mmTreeItemData*>(navTreeCtrl_->GetItemData(idparent));
-            if (iParentData->getString() == wxT("Budget Performance"))
+            if (iParentData->getString() == "Budget Performance")
             {
                 int year = data;
                 mmPrintableBase* rs = new mmReportBudgetingPerformance(m_core.get(), this, year);
                 createReportsPage(rs);
             }
-            else if (iParentData->getString() == wxT("Budget Setup Performance"))
+            else if (iParentData->getString() == "Budget Setup Performance")
             {
                 mmPrintableBase* rs = new mmReportBudgetCategorySummary(m_core.get(), this, year);
                 createReportsPage(rs);
@@ -1639,7 +1639,7 @@
     }
     else
     {
-        if (iData->getString() == wxT("Home Page"))
+        if (iData->getString() == "Home Page")
         {
             createHomePage();
             return;
@@ -1690,71 +1690,71 @@
             createReportsPage(iData->get_report());
         }
 #if 0
-        else if (sData == wxT("Summary of Accounts"))
+        else if (sData == "Summary of Accounts")
         {
             createReportsPage(iData->get_report());
         }
-        else if (sData == wxT("Summary of Stocks"))
+        else if (sData == "Summary of Stocks")
         {
             createReportsPage(iData->get_report());
         }
-        else if (sData == wxT("Summary of Assets"))
+        else if (sData == "Summary of Assets")
         {
             createReportsPage(iData->get_report());
         }
-        else if (sData == wxT("Where the Money Goes"))
+        else if (sData == "Where the Money Goes")
         {
             createReportsPage(iData->get_report());
         }
-        else if (sData.StartsWith(wxT("Where the Money Goes -")))
+        else if (sData.StartsWith("Where the Money Goes -"))
         {
             createReportsPage(iData->get_report());
         }
-        else if (sData == wxT("Where the Money Comes From"))
+        else if (sData == "Where the Money Comes From")
         {
             createReportsPage(iData->get_report());
         }
-        else if (sData.StartsWith(wxT("Where the Money Comes From - ")))
+        else if (sData.StartsWith("Where the Money Comes From - "))
         {
             createReportsPage(iData->get_report());
         }
-        else if (sData == wxT("Categories - Over Time"))
+        else if (sData == "Categories - Over Time")
         {
             createReportsPage(iData->get_report());
         }
-        else if (sData.StartsWith(wxT("Categories - ")))
+        else if (sData.StartsWith("Categories - "))
         {
             createReportsPage(iData->get_report());
         }
-        else if (sData == wxT("Payee Report"))
+        else if (sData == "Payee Report")
         {
             createReportsPage(iData->get_report());
         }
-        else if (sData.StartsWith(wxT("Payees - ")))
+        else if (sData.StartsWith("Payees - "))
         {
             createReportsPage(iData->get_report());
         }
-        else if (sData == wxT("Income vs Expenses - All Time"))
+        else if (sData == "Income vs Expenses - All Time")
         {
             mmPrintableBase* rs = new mmReportIncomeExpensesAllTime(m_core.get());
             createReportsPage(rs);
         }
-        else if (sData == wxT("Income vs Expenses"))
+        else if (sData == "Income vs Expenses")
         {
             mmPrintableBase* rs = new mmReportIncExpensesOverTime(m_core.get()
                 , wxDateTime::Now().GetYear(), 10);
 
             createReportsPage(rs);
         }
-        else if (sData.StartsWith(wxT("Income vs Expenses - ")) && sData.Contains(wxT("Year")))
+        else if (sData.StartsWith("Income vs Expenses - ") && sData.Contains("Year"))
         {
             mmPrintableBase* rs;
             GetDateRange(dtBegin, dtEnd, sData);
 
             int year = wxDateTime::Now().GetYear();
-            if (sData.Contains(wxT("Last"))) year --;
+            if (sData.Contains("Last")) year --;
 
-            if (sData.Contains(wxT("Financial")))
+            if (sData.Contains("Financial"))
             {
                 if (wxDateTime::Now().GetMonth() < dtBegin.GetMonth()) year -- ;
                 rs = new mmReportIncExpensesOverFinancialPeriod(m_core.get(), year);
@@ -1765,12 +1765,12 @@
             }
             createReportsPage(rs);
         }
-        else if (sData.StartsWith(wxT("Income vs Expenses - ")))
+        else if (sData.StartsWith("Income vs Expenses - "))
         {
             mmPrintableBase* rs = new mmReportIncomeExpensesCurrentMonth(m_core.get());
             createReportsPage(rs);
         }
-        else if (sData == wxT("Cash Flow"))
+        else if (sData == "Cash Flow")
         {
             mmReportCashFlow* report = new mmReportCashFlow(m_core.get(), this, 0);
 
@@ -1779,43 +1779,43 @@
 
             createReportsPage(report);
         }
-        else if (sData == wxT("Cash Flow - With Bank Accounts"))
+        else if (sData == "Cash Flow - With Bank Accounts")
         {
             mmReportCashFlow* report = new mmReportCashFlow(m_core.get(), this, 0);
             report->activateBankAccounts();
             createReportsPage(report);
         }
 
-        else if (sData == wxT("Cash Flow - With Term Accounts"))
+        else if (sData == "Cash Flow - With Term Accounts")
         {
             mmReportCashFlow* report = new mmReportCashFlow(m_core.get(), this, 0);
             report->activateTermAccounts();
             createReportsPage(report);
         }
-        else if (sData == wxT("Cash Flow - Specific Accounts"))
+        else if (sData == "Cash Flow - Specific Accounts")
         {
             OnCashFlowSpecificAccounts(0);
         }
-        else if (sData == wxT("Daily Cash Flow - Specific Accounts"))
+        else if (sData == "Daily Cash Flow - Specific Accounts")
         {
             OnCashFlowSpecificAccounts(1);
         }
-        else if (sData == wxT("Transaction Report"))
+        else if (sData == "Transaction Report")
         {
             wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TRANSACTIONREPORT);
             AddPendingEvent(evt);           // Events will be processed in due course.
         }
-        else if (sData == wxT("Bills & Deposits"))
+        else if (sData == "Bills & Deposits")
         {
             wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_BILLSDEPOSITS);
             AddPendingEvent(evt);
         }
-        else if (sData == wxT("Assets"))
+        else if (sData == "Assets")
         {
             wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_ASSETS);
             AddPendingEvent(evt);
         }
-        else if (sData == wxT("Transaction Statistics"))
+        else if (sData == "Transaction Statistics")
         {
             wxDateTime today = wxDateTime::Now();
             int year = today.GetYear()-1;
@@ -1940,9 +1940,9 @@
     }
     else
     {
-        if (iData->getString() == wxT("Bank Accounts") ||
-            iData->getString() == wxT("Term Accounts") ||
-            iData->getString() == wxT("Stocks"))
+        if (iData->getString() == "Bank Accounts" ||
+            iData->getString() == "Term Accounts" ||
+            iData->getString() == "Stocks")
         { // Create for Bank Term & Stock Accounts
 
          //wxMenu menu;
@@ -1971,7 +1971,7 @@
             // menu->AppendSeparator();
 
             // Create only for Bank Accounts
-            if ( (iData->getString() != wxT("Term Accounts")) && (iData->getString() != wxT("Stocks")) )
+            if ( (iData->getString() != "Term Accounts") && (iData->getString() != "Stocks") )
             {
                 wxMenu *exportTo = new wxMenu;
                 exportTo->Append(MENU_TREEPOPUP_ACCOUNT_EXPORT2CSV, _("&CSV Files..."));
@@ -1996,13 +1996,13 @@
             // Bring up popup menu to edit or delete the correct Custom Report
             customSqlReportSelectedItem_ = iData->getString();
             wxString field = customSqlReportSelectedItem_.Mid(6,8);
-            if (field == wxT("_Report_"))
+            if (field == "_Report_")
             {
                 wxMenu* customReportMenu = new wxMenu;
                 customReportMenu->Append(wxID_EDIT, _("Edit Custom Report"));
                 PopupMenu(&*customReportMenu, pt);
             }
-            else if (iData->getString() == wxT("Budgeting"))
+            else if (iData->getString() == "Budgeting")
             {
                 wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_BUDGETSETUPDIALOG);
                 AddPendingEvent(evt);
@@ -2015,47 +2015,47 @@
 void mmGUIFrame::OnViewAllAccounts(wxCommandEvent&)
 {
     //Get current settings for view accounts
-    wxString vAccts = m_inisettings->GetStringSetting(wxT("VIEWACCOUNTS"), wxT("ALL"));
+    wxString vAccts = m_inisettings->GetStringSetting("VIEWACCOUNTS", "ALL");
 
     //Set view ALL
-    m_inisettings->SetStringSetting(wxT("VIEWACCOUNTS"), wxT("ALL"));
+    m_inisettings->SetStringSetting("VIEWACCOUNTS", "ALL");
     //Refresh Navigation Panel
     mmGUIFrame::updateNavTreeControl();
 
     //Restore settings
-    m_inisettings->SetStringSetting(wxT("VIEWACCOUNTS"), vAccts);
+    m_inisettings->SetStringSetting("VIEWACCOUNTS", vAccts);
 }
 //----------------------------------------------------------------------------
 
 void mmGUIFrame::OnViewFavoriteAccounts(wxCommandEvent&)
 {
     //Get current settings for view accounts
-    wxString vAccts = m_inisettings->GetStringSetting(wxT("VIEWACCOUNTS"), wxT("ALL"));
+    wxString vAccts = m_inisettings->GetStringSetting("VIEWACCOUNTS", "ALL");
 
     //Set view ALL
-    m_inisettings->SetStringSetting(wxT("VIEWACCOUNTS"), wxT("Favorites"));
+    m_inisettings->SetStringSetting("VIEWACCOUNTS", "Favorites");
 
     //Refresh Navigation Panel
     mmGUIFrame::updateNavTreeControl();
 
     //Restore settings
-    m_inisettings->SetStringSetting(wxT("VIEWACCOUNTS"), vAccts);
+    m_inisettings->SetStringSetting("VIEWACCOUNTS", vAccts);
 }
 //----------------------------------------------------------------------------
 
 void mmGUIFrame::OnViewOpenAccounts(wxCommandEvent&)
 {
     //Get current settings for view accounts
-    wxString vAccts = m_inisettings->GetStringSetting(wxT("VIEWACCOUNTS"), wxT("ALL"));
+    wxString vAccts = m_inisettings->GetStringSetting("VIEWACCOUNTS", "ALL");
 
     //Set view ALL
-    m_inisettings->SetStringSetting(wxT("VIEWACCOUNTS"), wxT("Open"));
+    m_inisettings->SetStringSetting("VIEWACCOUNTS", "Open");
 
     //Refresh Navigation Panel
     mmGUIFrame::updateNavTreeControl();
 
     //Restore settings
-    m_inisettings->SetStringSetting(wxT("VIEWACCOUNTS"), vAccts);
+    m_inisettings->SetStringSetting("VIEWACCOUNTS", vAccts);
 }
 //----------------------------------------------------------------------------
 
@@ -2511,7 +2511,7 @@
 
         /// Update the database according to user requirements
         if (mmOptions::instance().databaseUpdated_ &&
-            m_inisettings->GetBoolSetting(wxT("BACKUPDB_UPDATE"), false))
+            m_inisettings->GetBoolSetting("BACKUPDB_UPDATE", false))
         {
             BackupDatabase(fileName_, true);
             mmOptions::instance().databaseUpdated_ = false;
@@ -2521,7 +2521,7 @@
     wxFileName checkExt(fileName);
     wxString password;
     bool passwordCheckPassed = true;
-    if (checkExt.GetExt().Lower() == wxT("emb") && wxFileName::FileExists(fileName))
+    if (checkExt.GetExt().Lower() == "emb" && wxFileName::FileExists(fileName))
     {
         password = !pwd.empty() ? pwd : wxGetPasswordFromUser(_("Enter database's password"));
         if (password.IsEmpty())
@@ -2537,7 +2537,7 @@
         && passwordCheckPassed)
     {
         /* Do a backup before opening */
-        if (m_inisettings->GetBoolSetting(wxT("BACKUPDB"), false))
+        if (m_inisettings->GetBoolSetting("BACKUPDB", false))
         {
             BackupDatabase(fileName);
         }
@@ -2618,9 +2618,9 @@
 
 void mmGUIFrame::openDataBase(const wxString& fileName)
 {
-    wxString title = mmex::getProgramName() + wxT(" : ") + fileName;
+    wxString title = mmex::getProgramName() + " : " + fileName;
     if (mmex::isPortableMode())
-        title << wxT(" [") << _("portable mode") << wxT(']');
+        title << " [" << _("portable mode") << ']';
 
     SetTitle(title);
     m_topCategories.Clear();
@@ -2671,7 +2671,7 @@
                      _("Choose database file to create"),
                      wxEmptyString,
                      wxEmptyString,
-                     wxT("MMB Files(*.mmb)|*.mmb"),
+                     "MMB Files(*.mmb|*.mmb)",
                      wxFD_SAVE | wxFD_OVERWRITE_PROMPT
                     );
 
@@ -2680,8 +2680,8 @@
 
     wxString fileName = dlg.GetPath();
 
-    if (!fileName.EndsWith(wxT(".mmb")))
-        fileName += wxT(".mmb");
+    if (!fileName.EndsWith(".mmb"))
+        fileName += ".mmb";
 
     SetDatabaseFile(fileName, true);
 }
@@ -2692,7 +2692,7 @@
     autoRepeatTransactionsTimer_.Stop();
     wxString fileName = wxFileSelector(_("Choose database file to open"),
                                        wxEmptyString, wxEmptyString, wxEmptyString,
-                                       wxT("MMB Files(*.mmb)|*.mmb|Encrypted MMB files (*.emb)|*.emb"),
+                                       "MMB Files(*.mmb|*.mmb|Encrypted MMB files (*.emb)|*.emb)",
                                        wxFD_FILE_MUST_EXIST,
                                        this
                                       );
@@ -2709,7 +2709,7 @@
 {
     wxString encFileName = wxFileSelector(_("Choose Encrypted database file to open"),
                                           wxEmptyString, wxEmptyString, wxEmptyString,
-                                          wxT("Encrypted MMB files (*.emb)|*.emb"),
+                                          "Encrypted MMB files (*.emb|*.emb)",
                                           wxFD_FILE_MUST_EXIST,
                                           this
                                          );
@@ -2725,7 +2725,7 @@
                      _("Choose database file to Save As"),
                      wxEmptyString,
                      wxEmptyString,
-                     wxT("MMB Files(*.mmb)|*.mmb"),
+                     "MMB Files(*.mmb|*.mmb)",
                      wxFD_SAVE | wxFD_OVERWRITE_PROMPT
                     );
 
@@ -2734,8 +2734,8 @@
 
     wxString fileName = dlg.GetPath();
 
-    if (!dlg.GetPath().EndsWith(wxT(".mmb")))
-        fileName += wxT(".mmb");
+    if (!dlg.GetPath().EndsWith(".mmb"))
+        fileName += ".mmb";
 
     wxCopyFile(encFileName, fileName);
 
@@ -2762,7 +2762,7 @@
                      _("Save database file as"),
                      wxEmptyString,
                      wxEmptyString,
-                     wxT("MMB Files(*.mmb)|*.mmb|Encrypted MMB files (*.emb)|*.emb"),
+                     "MMB Files(*.mmb)|*.mmb|Encrypted MMB files (*.emb)|*.emb",
                      wxFD_SAVE | wxFD_OVERWRITE_PROMPT
                     );
 
@@ -2773,7 +2773,7 @@
 
     bool encrypt = dlg.GetFilterIndex() != 0; // emb -> Encrypted mMB
     wxFileName newFileName(dlg.GetPath());
-    fixFileExt(newFileName, encrypt ? wxT("emb") : wxT("mmb"));
+    fixFileExt(newFileName, encrypt ? "emb" : "mmb");
 
     wxFileName oldFileName(fileName_); // opened db's file
 
@@ -2913,9 +2913,9 @@
                 This message will not be displayed in future.
             ************************************************************/
                 wxString msgStr;
-                msgStr << _("Term Account views have been temporarly turned on.") << wxT("\n")
+                msgStr << _("Term Account views have been temporarly turned on.") << "\n"
                        << _("To maintain this view, change the defaults by using:\n\nTools -> Options\nView Options")
-                       << wxT("\n\n")
+                       << "\n\n"
                        << _("This message will not be displayed in future.");
                 wxMessageBox(msgStr, _("Initial Term Account Activation"), wxOK|wxICON_INFORMATION);
             }
@@ -3074,7 +3074,7 @@
                         ignoreSubCateg = dlg->getExpandStatus();
                     if (!pBankTransaction->containsCategory(categID, subcategID, ignoreSubCateg))
                     {
-                        pBankTransaction->reportCategAmountStr_ = wxT("");
+                        pBankTransaction->reportCategAmountStr_ = "";
                         continue;
                     }
 
@@ -3171,11 +3171,11 @@
         menuBar_->FindItem(MENU_IGNORE_FUTURE_TRANSACTIONS)->Check(mmIniOptions::instance().ignoreFutureTransactions_);
 
         int messageIcon = wxOK|wxICON_INFORMATION;
-        wxString sysMsg = wxString() << _("MMEX Options have been updated.") << wxT("\n\n");
+        wxString sysMsg = wxString() << _("MMEX Options have been updated.") << "\n\n";
         if (systemOptions.RequiresRestart())
         {
             messageIcon = wxOK|wxICON_WARNING;
-            sysMsg << _("Recommendation: Shut down and restart MMEX.") << wxT("\n")
+            sysMsg << _("Recommendation: Shut down and restart MMEX.") << "\n"
                    << _("This will allow all MMEX option updates to take effect.");
         }
         wxMessageBox(sysMsg, _("New MMEX Options"), messageIcon);
@@ -3195,11 +3195,11 @@
 
 bool mmGUIFrame::IsUpdateAvailable(wxString page)
 {
-    wxStringTokenizer tkz(page, wxT('.'), wxTOKEN_RET_EMPTY_ALL);
+    wxStringTokenizer tkz(page, '.', wxTOKEN_RET_EMPTY_ALL);
     int numTokens = (int)tkz.CountTokens();
     if (numTokens != 4)
     {
-        wxString url = wxT("http://www.codelathe.com/mmex");
+        wxString url = "http://www.codelathe.com/mmex";
         wxLaunchDefaultBrowser(url);
         return false;
     }
@@ -3211,9 +3211,9 @@
 
     // get current version
     wxString currentV = mmex::getProgramVersion();
-    currentV = currentV.SubString(0, currentV.Find(wxT("DEV"))-1).Trim();
+    currentV = currentV.SubString(0, currentV.Find("DEV")-1).Trim();
 
-    wxStringTokenizer tkz1(currentV, wxT('.'), wxTOKEN_RET_EMPTY_ALL);
+    wxStringTokenizer tkz1(currentV, '.', wxTOKEN_RET_EMPTY_ALL);
     numTokens = (int)tkz1.CountTokens();
 
     wxString majC = tkz1.GetNextToken();
@@ -3252,12 +3252,12 @@
 {
     // Set up system information
     wxString versionDetails = wxString()
-        << _("Version: ")<< mmex::getProgramVersion() << wxT("\n\n")
-        << mmex::getProgramDescription() << wxT("\n")
-        << wxT("\n");
+        << _("Version: ")<< mmex::getProgramVersion() << "\n\n"
+        << mmex::getProgramDescription() << "\n"
+        << "\n";
 
     // Access current version details page
-    wxString site = wxT("http://www.codelathe.com/mmex/version.html");
+    wxString site = "http://www.codelathe.com/mmex/version.html";
 
     wxString page;
     int err_code = site_content(site, page);
@@ -3270,12 +3270,12 @@
 
     /*************************************************************************
         Expected format of the string from the internet. Version: 0.9.8.0
-        page = wxT("x.x.x.x - Win: w.w.w.w - Unix: u.u.u.u - Mac: m.m.m.m");
+        page = "x.x.x.x - Win: w.w.w.w - Unix: u.u.u.u - Mac: m.m.m.m";
         string length = 53 characters
     **************************************************************************/
     page = page.SubString(page.find(wxPlatformInfo::Get().GetOperatingSystemFamilyName().substr(0, 3)), 53);
-    page.Replace(wxT("-"), wxT(":"));
-    wxStringTokenizer mySysToken(page, wxT(":"));
+    page.Replace("-", ":");
+    wxStringTokenizer mySysToken(page, ":");
     page = mySysToken.GetNextToken();                       // the system
     page = mySysToken.GetNextToken().Trim(false).Trim();    // the version
 
@@ -3292,8 +3292,8 @@
         style = wxICON_INFORMATION|style;
     }
 
-    wxString urlString = wxT("http://www.codelathe.com/mmex");
-    versionDetails << wxT("\n\n") << _("Proceed to website: ") << urlString;
+    wxString urlString = "http://www.codelathe.com/mmex";
+    versionDetails << "\n\n" << _("Proceed to website: ") << urlString;
     if (wxMessageBox(versionDetails, _("MMEX System Information Check"), style) == wxOK)
         wxLaunchDefaultBrowser(urlString);
 }
@@ -3301,7 +3301,7 @@
 
 void mmGUIFrame::OnOnlineUpdateCurRate(wxCommandEvent& /*event*/)
 {
-    wxString sMsg = wxT("");
+    wxString sMsg = "";
     if (m_core.get()->currencyList_.OnlineUpdateCurRate(sMsg))
     {
         wxMessageDialog msgDlg(this, sMsg, _("Currency rate updated"));
@@ -3328,8 +3328,8 @@
 void mmGUIFrame::OnBeNotified(wxCommandEvent& /*event*/)
 {
     // New site location
-    //  wxString url = wxT("http://groups.google.com/group/mmlist");
-    wxString url = wxT("https://groups.google.com/forum/?fromgroups#!forum/mmlist");
+    //  wxString url = "http://groups.google.com/group/mmlist";
+    wxString url = "https://groups.google.com/forum/?fromgroups#!forum/mmlist";
 
     wxLaunchDefaultBrowser(url);
 }
@@ -3337,7 +3337,7 @@
 
 void mmGUIFrame::OnFacebook(wxCommandEvent& /*event*/)
 {
-    wxString url = wxT("http://www.facebook.com/pages/Money-Manager-Ex/242286559144586");
+    wxString url = "http://www.facebook.com/pages/Money-Manager-Ex/242286559144586";
     wxLaunchDefaultBrowser(url);
 }
 
@@ -3352,12 +3352,12 @@
 void mmGUIFrame::restorePrinterValues()
 {
     // Startup Default Settings
-    int leftMargin      = m_inisettings->GetIntSetting(wxT("PRINTER_LEFT_MARGIN"), 20);
-    int rightMargin     = m_inisettings->GetIntSetting(wxT("PRINTER_RIGHT_MARGIN"), 20);
-    int topMargin       = m_inisettings->GetIntSetting(wxT("PRINTER_TOP_MARGIN"), 20);
-    int bottomMargin    = m_inisettings->GetIntSetting(wxT("PRINTER_BOTTOM_MARGIN"), 20);
-    int pageOrientation = m_inisettings->GetIntSetting(wxT("PRINTER_PAGE_ORIENTATION"), wxPORTRAIT);
-    int paperID         = m_inisettings->GetIntSetting(wxT("PRINTER_PAGE_ID"), wxPAPER_A4);
+    int leftMargin      = m_inisettings->GetIntSetting("PRINTER_LEFT_MARGIN", 20);
+    int rightMargin     = m_inisettings->GetIntSetting("PRINTER_RIGHT_MARGIN", 20);
+    int topMargin       = m_inisettings->GetIntSetting("PRINTER_TOP_MARGIN", 20);
+    int bottomMargin    = m_inisettings->GetIntSetting("PRINTER_BOTTOM_MARGIN", 20);
+    int pageOrientation = m_inisettings->GetIntSetting("PRINTER_PAGE_ORIENTATION", wxPORTRAIT);
+    int paperID         = m_inisettings->GetIntSetting("PRINTER_PAGE_ID", wxPAPER_A4);
 
     wxPoint topLeft(leftMargin, topMargin);
     wxPoint bottomRight(rightMargin, bottomMargin);
@@ -3390,12 +3390,12 @@
         int pageOrientation = printerData->GetOrientation();
         wxPaperSize paperID = printerData->GetPaperId();
 
-        m_inisettings->SetIntSetting(wxT("PRINTER_LEFT_MARGIN"), topLeft.x);
-        m_inisettings->SetIntSetting(wxT("PRINTER_RIGHT_MARGIN"), bottomRight.x);
-        m_inisettings->SetIntSetting(wxT("PRINTER_TOP_MARGIN"), topLeft.y);
-        m_inisettings->SetIntSetting(wxT("PRINTER_BOTTOM_MARGIN"), bottomRight.y);
-        m_inisettings->SetIntSetting(wxT("PRINTER_PAGE_ORIENTATION"), pageOrientation);
-        m_inisettings->SetIntSetting(wxT("PRINTER_PAGE_ID"), paperID);
+        m_inisettings->SetIntSetting("PRINTER_LEFT_MARGIN", topLeft.x);
+        m_inisettings->SetIntSetting("PRINTER_RIGHT_MARGIN", bottomRight.x);
+        m_inisettings->SetIntSetting("PRINTER_TOP_MARGIN", topLeft.y);
+        m_inisettings->SetIntSetting("PRINTER_BOTTOM_MARGIN", bottomRight.y);
+        m_inisettings->SetIntSetting("PRINTER_PAGE_ORIENTATION", pageOrientation);
+        m_inisettings->SetIntSetting("PRINTER_PAGE_ID", paperID);
     }
 }
 //----------------------------------------------------------------------------
@@ -3471,11 +3471,11 @@
     mmReportsPanel* rp = dynamic_cast<mmReportsPanel*>(panelCurrent_);
     if (rp)
     {
-        wxString fileName = wxFileSelector(wxT("Choose HTML file to Export"),
-            wxEmptyString, wxEmptyString, wxEmptyString, wxT("*.html"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+        wxString fileName = wxFileSelector("Choose HTML file to Export",
+            wxEmptyString, wxEmptyString, wxEmptyString, "*.html", wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
         if ( !fileName.empty() )
         {
-            correctEmptyFileExt(wxT("html"),fileName);
+            correctEmptyFileExt("html",fileName);
             wxFileOutputStream output( fileName );
             wxTextOutputStream text( output );
             text << rp->getReportText();
@@ -3649,7 +3649,7 @@
         int acctID = arrAcctID[choice];
 
         wxString deletingAccountName = _("Are you sure you want to delete\n") + m_core->accountList_.accounts_[choice]->acctType_ +
-                                       _(" account: ") + m_core->accountList_.accounts_[choice]->name_ + wxT(" ?");
+                                       _(" account: ") + m_core->accountList_.accounts_[choice]->name_ + " ?";
         wxMessageDialog msgDlg(this, deletingAccountName, _("Confirm Account Deletion"),
             wxYES_NO | wxNO_DEFAULT | wxICON_EXCLAMATION);
         if (msgDlg.ShowModal() == wxID_YES)
@@ -3668,22 +3668,22 @@
 
 void mmGUIFrame::OnViewToolbar(wxCommandEvent &event)
 {
-    m_mgr.GetPane(wxT("toolbar")).Show(event.IsChecked());
+    m_mgr.GetPane("toolbar").Show(event.IsChecked());
     m_mgr.Update();
-    m_inisettings->SetBoolSetting(wxT("SHOWTOOLBAR"), event.IsChecked());
+    m_inisettings->SetBoolSetting("SHOWTOOLBAR", event.IsChecked());
 }
 //----------------------------------------------------------------------------
 
 void mmGUIFrame::OnViewLinks(wxCommandEvent &event)
 {
-    m_mgr.GetPane(wxT("Navigation")).Show(event.IsChecked());
+    m_mgr.GetPane("Navigation").Show(event.IsChecked());
     m_mgr.Update();
 }
 //----------------------------------------------------------------------------
 
 void mmGUIFrame::OnViewToolbarUpdateUI(wxUpdateUIEvent &event)
 {
-    if(m_mgr.GetPane(wxT("toolbar")).IsShown())
+    if(m_mgr.GetPane("toolbar").IsShown())
         event.Check(true);
     else
         event.Check(false);
@@ -3692,7 +3692,7 @@
 
 void mmGUIFrame::OnViewLinksUpdateUI(wxUpdateUIEvent &event)
 {
-    if(m_mgr.GetPane(wxT("Navigation")).IsShown())
+    if(m_mgr.GetPane("Navigation").IsShown())
         event.Check(true);
     else
         event.Check(false);
@@ -3701,7 +3701,7 @@
 
 void mmGUIFrame::OnViewBankAccounts(wxCommandEvent &event)
 {
-    m_mgr.GetPane(wxT("Bank Accounts")).Show(event.IsChecked());
+    m_mgr.GetPane("Bank Accounts").Show(event.IsChecked());
     m_mgr.Update();
 
     if (!refreshRequested_)
@@ -3714,7 +3714,7 @@
 
 void mmGUIFrame::OnViewTermAccounts(wxCommandEvent &event)
 {
-    m_mgr.GetPane(wxT("Term Accounts")).Show(event.IsChecked());
+    m_mgr.GetPane("Term Accounts").Show(event.IsChecked());
     m_mgr.Update();
 
     if (!refreshRequested_)
@@ -3728,7 +3728,7 @@
 
 void mmGUIFrame::OnViewStockAccounts(wxCommandEvent &event)
 {
-    m_mgr.GetPane(wxT("Stock Accounts")).Show(event.IsChecked());
+    m_mgr.GetPane("Stock Accounts").Show(event.IsChecked());
     m_mgr.Update();
 
     if (!refreshRequested_)
@@ -3741,7 +3741,7 @@
 
 void mmGUIFrame::OnIgnoreFutureTransactions(wxCommandEvent &event)
 {
-    m_mgr.GetPane(wxT("Ignore Future Transactions")).Show(event.IsChecked());
+    m_mgr.GetPane("Ignore Future Transactions").Show(event.IsChecked());
     mmIniOptions::instance().ignoreFutureTransactions_ = !mmIniOptions::instance().ignoreFutureTransactions_;
     if (!refreshRequested_)
     {
@@ -3758,10 +3758,10 @@
     if (dlg->ShowModal() == wxID_OK)
     {
         wxString msgStr;
-        msgStr << _("Category Relocation Completed.") << wxT("\n\n")
+        msgStr << _("Category Relocation Completed.") << "\n\n"
                << wxString::Format( _("Records have been updated in the database: %s"),
-                    dlg->updatedCategoriesCount().c_str())
-               << wxT("\n\n")
+                    dlg->updatedCategoriesCount())
+               << "\n\n"
                << _("MMEX must be shutdown and restarted for all the changes to be seen.");
         wxMessageBox(msgStr,_("Category Relocation Result"));
         mmOptions::instance().databaseUpdated_ = true;
@@ -3776,10 +3776,10 @@
     if (dlg->ShowModal() == wxID_OK)
     {
         wxString msgStr;
-        msgStr << _("Payee Relocation Completed.") << wxT("\n\n")
+        msgStr << _("Payee Relocation Completed.") << "\n\n"
             << wxString::Format(_("Records have been updated in the database: %s"),
-                dlg->updatedPayeesCount().c_str())
-            << wxT("\n\n");
+                dlg->updatedPayeesCount())
+            << "\n\n";
         wxMessageBox(msgStr, _("Payee Relocation Result"));
         mmOptions::instance().databaseUpdated_ = true;
     }
@@ -3796,7 +3796,7 @@
     int dialogStatus = wxID_MORE;
     while (dialogStatus == wxID_MORE)
     {
-        if (dlg->sScript() != wxT(""))
+        if (dlg->sScript() != "")
         {
             wxBeginBusyCursor(wxHOURGLASS_CURSOR);
             mmCustomReport* csr = new mmCustomReport(this,
@@ -3875,10 +3875,10 @@
     wxFileName fn(filename);
     if (!fn.IsOk()) return;
 
-    wxString backupType = wxT("_start_");
-    if (updateRequired) backupType = wxT("_update_");
+    wxString backupType = "_start_";
+    if (updateRequired) backupType = "_update_";
 
-    wxString backupName = filename + backupType + wxDateTime().Today().FormatISODate() + wxT(".") + fn.GetExt();
+    wxString backupName = filename + backupType + wxDateTime().Today().FormatISODate() + "." + fn.GetExt();
     if (updateRequired) // Create or update the backup file.
     {
         wxCopyFile(filename, backupName, true);
@@ -3894,7 +3894,7 @@
 
     // Get the list of created backup files for the given filename.
     wxArrayString backupFileArray;
-    wxString fileSearch = filename + backupType + wxT("*.") + fn.GetExt();
+    wxString fileSearch = filename + backupType + "*." + fn.GetExt();
     wxString backupFile = wxFindFirstFile(fileSearch);
     while (!backupFile.empty())
     {
@@ -3902,7 +3902,7 @@
         backupFile = wxFindNextFile();
     }
 
-    int max =  m_inisettings->GetIntSetting(wxT("MAX_BACKUP_FILES"), 4);
+    int max =  m_inisettings->GetIntSetting("MAX_BACKUP_FILES", 4);
     if (backupFileArray.Count() > (size_t)max)
     {
         backupFileArray.Sort(true);

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

Revision: 3726
          http://sourceforge.net/p/moneymanagerex/code/3726
Author:   guanlisheng
Date:     2013-04-18 06:52:38 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
mmReportIncExpensesOverTime

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-04-18 06:39:31 UTC (rev 3725)
+++ trunk/mmex/src/mmex.cpp	2013-04-18 06:52:38 UTC (rev 3726)
@@ -1318,7 +1318,7 @@
     ///////////////////////////////////////////////////////////////////
 
     wxTreeItemId incexpOverTime = navTreeCtrl_->AppendItem(reports, _("Income vs Expenses"), 4, 4);
-    navTreeCtrl_->SetItemData(incexpOverTime, new mmTreeItemData("Income vs Expenses"));
+    navTreeCtrl_->SetItemData(incexpOverTime, new mmTreeItemData("Income vs Expenses", new mmReportIncExpensesOverTime(m_core.get(), wxDateTime::Now().GetYear(), 10)));
 
     wxTreeItemId incexpOverTimeCalMonth = navTreeCtrl_->AppendItem(incexpOverTime, _("Last Calendar Month"), 4, 4);
     navTreeCtrl_->SetItemData(incexpOverTimeCalMonth, new mmTreeItemData(wxTRANSLATE("Income vs Expenses - Last Calendar Month")));
@@ -1741,8 +1741,7 @@
         }
         else if (sData == "Income vs Expenses")
         {
-            mmPrintableBase* rs = new mmReportIncExpensesOverTime(m_core.get()
-                , wxDateTime::Now().GetYear(), 10);
+            mmPrintableBase* rs = new mmReportIncExpensesOverTime(m_core.get(), wxDateTime::Now().GetYear(), 10);
 
             createReportsPage(rs);
         }

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

Revision: 3727
          http://sourceforge.net/p/moneymanagerex/code/3727
Author:   guanlisheng
Date:     2013-04-18 07:00:13 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
mmReportTransactionStats

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-04-18 06:52:38 UTC (rev 3726)
+++ trunk/mmex/src/mmex.cpp	2013-04-18 07:00:13 UTC (rev 3727)
@@ -1416,7 +1416,7 @@
 
     ///////////////////////////////////////////////////////
     wxTreeItemId transactionStats = navTreeCtrl_->AppendItem(reports, _("Transaction Statistics"), 4, 4);
-    navTreeCtrl_->SetItemData(transactionStats, new mmTreeItemData("Transaction Statistics"));
+    navTreeCtrl_->SetItemData(transactionStats, new mmTreeItemData("Transaction Statistics", new mmReportTransactionStats(m_core.get(), wxDateTime::Now().GetYear() - 1)));
 
      ///////////////////////////////////////////////////////////////////
 
@@ -1814,13 +1814,6 @@
             wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_ASSETS);
             AddPendingEvent(evt);
         }
-        else if (sData == "Transaction Statistics")
-        {
-            wxDateTime today = wxDateTime::Now();
-            int year = today.GetYear()-1;
-            mmPrintableBase* rs = new mmReportTransactionStats(m_core.get(), year);
-            createReportsPage(rs);
-        }
 #endif
     }
 }

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

Revision: 3739
          http://sourceforge.net/p/moneymanagerex/code/3739
Author:   vomikan
Date:     2013-04-20 12:06:43 +0000 (Sat, 20 Apr 2013)
Log Message:
-----------
formating

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-04-20 10:34:59 UTC (rev 3738)
+++ trunk/mmex/src/mmex.cpp	2013-04-20 12:06:43 UTC (rev 3739)
@@ -1244,11 +1244,15 @@
         , new mmReportSummaryAssets(m_core.get())));
     }
 
-    wxTreeItemId categsOverTime = navTreeCtrl_->AppendItem(reports, _("Where the Money Goes"), 4, 4);
+    /* ================================================================================================= */
+
+    wxTreeItemId categsOverTime = navTreeCtrl_->AppendItem(reports
+        , _("Where the Money Goes"), 4, 4);
     navTreeCtrl_->SetItemData(categsOverTime, new mmTreeItemData("Where the Money Goes"
         , new mmReportCategoryExpensesGoes(m_core.get())));
 
-    wxTreeItemId categsOverTimeCalMonth = navTreeCtrl_->AppendItem(categsOverTime, _("Last Calendar Month"), 4, 4);
+    wxTreeItemId categsOverTimeCalMonth = navTreeCtrl_->AppendItem(categsOverTime
+        , _("Last Calendar Month"), 4, 4);
     navTreeCtrl_->SetItemData(categsOverTimeCalMonth
         , new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Last Calendar Month")
         , new mmReportCategoryExpensesGoesLastMonth(m_core.get())));
@@ -1261,7 +1265,8 @@
         , new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Current Month")
         , new mmReportCategoryExpensesGoesCurrentMonth(m_core.get())));
 
-    wxTreeItemId categsOverTimeLast30 = navTreeCtrl_->AppendItem(categsOverTime, _("Last 30 Days"), 4, 4);
+    wxTreeItemId categsOverTimeLast30 = navTreeCtrl_->AppendItem(categsOverTime
+        , _("Last 30 Days"), 4, 4);
     navTreeCtrl_->SetItemData(categsOverTimeLast30
         , new mmTreeItemData(wxTRANSLATE("Where the Money Goes - 30 Days")
         , new mmReportCategoryExpensesGoesLast30Days(m_core.get())));
@@ -1271,78 +1276,122 @@
         , new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Last Year")
         , new mmReportCategoryExpensesGoesLastYear(m_core.get())));
 
-    wxTreeItemId categsOverTimeCurrentYear = navTreeCtrl_->AppendItem(categsOverTime, _("Current Year"), 4, 4);
-    navTreeCtrl_->SetItemData(categsOverTimeCurrentYear, new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Current Year"), new mmReportCategoryExpensesGoesCurrentYear(m_core.get())));
+    wxTreeItemId categsOverTimeCurrentYear = navTreeCtrl_->AppendItem(categsOverTime
+        , _("Current Year"), 4, 4);
+    navTreeCtrl_->SetItemData(categsOverTimeCurrentYear
+        , new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Current Year")
+        , new mmReportCategoryExpensesGoesCurrentYear(m_core.get())));
 
     if (financialYearIsDifferent())
     {
-        wxTreeItemId categsOverTimeLastFinancialYear = navTreeCtrl_->AppendItem(categsOverTime, _("Last Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(categsOverTimeLastFinancialYear, new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Last Financial Year")
-                    , new mmReportCategoryExpensesGoesLastFinancialYear(m_core.get())));
+        wxTreeItemId categsOverTimeLastFinancialYear = navTreeCtrl_->AppendItem(categsOverTime
+            , _("Last Financial Year"), 4, 4);
+        navTreeCtrl_->SetItemData(categsOverTimeLastFinancialYear
+            , new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Last Financial Year")
+            , new mmReportCategoryExpensesGoesLastFinancialYear(m_core.get())));
 
-        wxTreeItemId categsOverTimeCurrentFinancialYear = navTreeCtrl_->AppendItem(categsOverTime, _("Current Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(categsOverTimeCurrentFinancialYear, new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Current Financial Year")
-                    , new mmReportCategoryExpensesGoesCurrentFinancialYear(m_core.get())));
+        wxTreeItemId categsOverTimeCurrentFinancialYear = navTreeCtrl_->AppendItem(categsOverTime
+            , _("Current Financial Year"), 4, 4);
+        navTreeCtrl_->SetItemData(categsOverTimeCurrentFinancialYear
+            , new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Current Financial Year")
+            , new mmReportCategoryExpensesGoesCurrentFinancialYear(m_core.get())));
     }
     ///////////////////////////////////////////////////////////
 
     wxTreeItemId posCategs = navTreeCtrl_->AppendItem(reports, _("Where the Money Comes From"), 4, 4);
-    navTreeCtrl_->SetItemData(posCategs, new mmTreeItemData("Where the Money Comes From", new mmReportCategoryExpensesComesCurrentMonth(m_core.get())));
+    navTreeCtrl_->SetItemData(posCategs
+        , new mmTreeItemData("Where the Money Comes From"
+        , new mmReportCategoryExpensesComesCurrentMonth(m_core.get())));
 
-    wxTreeItemId posCategsCalMonth = navTreeCtrl_->AppendItem(posCategs, _("Last Calendar Month"), 4, 4);
-    navTreeCtrl_->SetItemData(posCategsCalMonth, new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Last Calendar Month"), new mmReportCategoryExpensesComesLastMonth(m_core.get())));
+    wxTreeItemId posCategsCalMonth = navTreeCtrl_->AppendItem(posCategs
+        , _("Last Calendar Month"), 4, 4);
+    navTreeCtrl_->SetItemData(posCategsCalMonth
+        , new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Last Calendar Month")
+        , new mmReportCategoryExpensesComesLastMonth(m_core.get())));
 
     wxTreeItemId posCategsCurrentMonth = navTreeCtrl_->AppendItem(posCategs, currentMonthMsg, 4, 4);
-    navTreeCtrl_->SetItemData(posCategsCurrentMonth, new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Current Month"), new mmReportCategoryExpensesComesCurrentMonth(m_core.get())));
+    navTreeCtrl_->SetItemData(posCategsCurrentMonth
+        , new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Current Month")
+        , new mmReportCategoryExpensesComesCurrentMonth(m_core.get())));
 
-    wxTreeItemId posCategsTimeLast30 = navTreeCtrl_->AppendItem(posCategs, _("Last 30 Days"), 4, 4);
-    navTreeCtrl_->SetItemData(posCategsTimeLast30, new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - 30 Days"), new mmReportCategoryExpensesComesLast30Days(m_core.get())));
+    wxTreeItemId posCategsTimeLast30 = navTreeCtrl_->AppendItem(posCategs
+        , _("Last 30 Days"), 4, 4);
+    navTreeCtrl_->SetItemData(posCategsTimeLast30
+        , new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - 30 Days")
+        , new mmReportCategoryExpensesComesLast30Days(m_core.get())));
 
-    wxTreeItemId posCategsTimeLastYear = navTreeCtrl_->AppendItem(posCategs, _("Last Year"), 4, 4);
-    navTreeCtrl_->SetItemData(posCategsTimeLastYear, new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Last Year"), new mmReportCategoryExpensesComesLastYear(m_core.get())));
+    wxTreeItemId posCategsTimeLastYear = navTreeCtrl_->AppendItem(posCategs
+        , _("Last Year"), 4, 4);
+    navTreeCtrl_->SetItemData(posCategsTimeLastYear
+        , new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Last Year")
+        , new mmReportCategoryExpensesComesLastYear(m_core.get())));
 
-    wxTreeItemId posCategsTimeCurrentYear = navTreeCtrl_->AppendItem(posCategs, _("Current Year"), 4, 4);
-    navTreeCtrl_->SetItemData(posCategsTimeCurrentYear, new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Current Year"), new mmReportCategoryExpensesComesCurrentYear(m_core.get())));
+    wxTreeItemId posCategsTimeCurrentYear = navTreeCtrl_->AppendItem(posCategs
+        , _("Current Year"), 4, 4);
+    navTreeCtrl_->SetItemData(posCategsTimeCurrentYear
+        , new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Current Year")
+        , new mmReportCategoryExpensesComesCurrentYear(m_core.get())));
 
     if (financialYearIsDifferent())
     {
-        wxTreeItemId posCategsTimeLastFinancialYear = navTreeCtrl_->AppendItem(posCategs, _("Last Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(posCategsTimeLastFinancialYear, new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Last Financial Year")
-                    , new mmReportCategoryExpensesComesLastFinancialYear(m_core.get())));
+        wxTreeItemId posCategsTimeLastFinancialYear = navTreeCtrl_->AppendItem(posCategs
+            , _("Last Financial Year"), 4, 4);
+        navTreeCtrl_->SetItemData(posCategsTimeLastFinancialYear
+            , new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Last Financial Year")
+            , new mmReportCategoryExpensesComesLastFinancialYear(m_core.get())));
 
-        wxTreeItemId posCategsTimeCurrentFinancialYear = navTreeCtrl_->AppendItem(posCategs, _("Current Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(posCategsTimeCurrentFinancialYear, new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Current Financial Year")
-                    , new mmReportCategoryExpensesComesCurrentFinancialYear(m_core.get())));
+        wxTreeItemId posCategsTimeCurrentFinancialYear = navTreeCtrl_->AppendItem(posCategs
+            , _("Current Financial Year"), 4, 4);
+        navTreeCtrl_->SetItemData(posCategsTimeCurrentFinancialYear
+            , new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Current Financial Year")
+            , new mmReportCategoryExpensesComesCurrentFinancialYear(m_core.get())));
     }
     ///////////////////////////////////////////////////////////
 
     wxTreeItemId categs = navTreeCtrl_->AppendItem(reports, _("Categories"), 4, 4);
-    navTreeCtrl_->SetItemData(categs, new mmTreeItemData("Categories - Over Time"));
+    navTreeCtrl_->SetItemData(categs
+        , new mmTreeItemData("Categories - Over Time"));
 
-    wxTreeItemId categsCalMonth = navTreeCtrl_->AppendItem(categs, _("Last Calendar Month"), 4, 4);
-    navTreeCtrl_->SetItemData(categsCalMonth, new mmTreeItemData(wxTRANSLATE("Categories - Last Calendar Month"), new mmReportCategoryOverTimePerformance(m_core.get())));
+    wxTreeItemId categsCalMonth = navTreeCtrl_->AppendItem(categs
+        , _("Last Calendar Month"), 4, 4);
+    navTreeCtrl_->SetItemData(categsCalMonth
+        , new mmTreeItemData(wxTRANSLATE("Categories - Last Calendar Month")
+        , new mmReportCategoryExpensesCategoriesLastMonth(m_core.get())));
 
     wxTreeItemId categsCurrentMonth = navTreeCtrl_->AppendItem(categs, currentMonthMsg, 4, 4);
-    navTreeCtrl_->SetItemData(categsCurrentMonth, new mmTreeItemData(wxTRANSLATE("Categories - Current Month"), new mmReportCategoryExpensesCategoriesCurrentMonth(m_core.get())));
+    navTreeCtrl_->SetItemData(categsCurrentMonth
+        , new mmTreeItemData(wxTRANSLATE("Categories - Current Month")
+        , new mmReportCategoryExpensesCategoriesCurrentMonth(m_core.get())));
 
     wxTreeItemId categsTimeLast30 = navTreeCtrl_->AppendItem(categs, _("Last 30 Days"), 4, 4);
-    navTreeCtrl_->SetItemData(categsTimeLast30, new mmTreeItemData(wxTRANSLATE("Categories - 30 Days"), new mmReportCategoryExpensesCategoriesLast30Days(m_core.get())));
+    navTreeCtrl_->SetItemData(categsTimeLast30
+        , new mmTreeItemData(wxTRANSLATE("Categories - 30 Days")
+        , new mmReportCategoryExpensesCategoriesLast30Days(m_core.get())));
 
     wxTreeItemId categsTimeLastYear = navTreeCtrl_->AppendItem(categs, _("Last Year"), 4, 4);
-    navTreeCtrl_->SetItemData(categsTimeLastYear, new mmTreeItemData(wxTRANSLATE("Categories - Last Year"), new mmReportCategoryExpensesCategoriesLastYear(m_core.get())));
+    navTreeCtrl_->SetItemData(categsTimeLastYear
+        , new mmTreeItemData(wxTRANSLATE("Categories - Last Year")
+        , new mmReportCategoryExpensesCategoriesLastYear(m_core.get())));
 
-    wxTreeItemId categsTimeCurrentYear = navTreeCtrl_->AppendItem(categs, _("Current Year"), 4, 4);
-    navTreeCtrl_->SetItemData(categsTimeCurrentYear, new mmTreeItemData(wxTRANSLATE("Categories - Current Year"), new mmReportCategoryExpensesCategoriesCurrentYear(m_core.get())));
+    wxTreeItemId categsTimeCurrentYear = navTreeCtrl_->AppendItem(categs
+        , _("Current Year"), 4, 4);
+    navTreeCtrl_->SetItemData(categsTimeCurrentYear
+        , new mmTreeItemData(wxTRANSLATE("Categories - Current Year")
+        , new mmReportCategoryExpensesCategoriesCurrentYear(m_core.get())));
 
     if (financialYearIsDifferent())
     {
-        wxTreeItemId categsTimeLastFinancialYear = navTreeCtrl_->AppendItem(categs, _("Last Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(categsTimeLastFinancialYear, new mmTreeItemData(wxTRANSLATE("Categories - Last Financial Year")
-                    , new mmReportCategoryExpensesCategoriesLastFinancialYear(m_core.get())));
+        wxTreeItemId categsTimeLastFinancialYear = navTreeCtrl_->AppendItem(categs
+            , _("Last Financial Year"), 4, 4);
+        navTreeCtrl_->SetItemData(categsTimeLastFinancialYear
+            , new mmTreeItemData(wxTRANSLATE("Categories - Last Financial Year")
+            , new mmReportCategoryExpensesCategoriesLastFinancialYear(m_core.get())));
 
-        wxTreeItemId categsTimeCurrentFinancialYear = navTreeCtrl_->AppendItem(categs, _("Current Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(categsTimeCurrentFinancialYear, new mmTreeItemData(wxTRANSLATE("Categories - Current Financial Year")
-                    , new mmReportCategoryExpensesCategoriesCurrentFinancialYear(m_core.get())));
+        wxTreeItemId categsTimeCurrentFinancialYear = navTreeCtrl_->AppendItem(categs
+            , _("Current Financial Year"), 4, 4);
+        navTreeCtrl_->SetItemData(categsTimeCurrentFinancialYear
+            , new mmTreeItemData(wxTRANSLATE("Categories - Current Financial Year")
+            , new mmReportCategoryExpensesCategoriesCurrentFinancialYear(m_core.get())));
     }
     ///////////////////////////////////////////////////////////
 

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

Revision: 3747
          http://sourceforge.net/p/moneymanagerex/code/3747
Author:   vomikan
Date:     2013-04-20 22:08:07 +0000 (Sat, 20 Apr 2013)
Log Message:
-----------
update

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-04-20 22:02:16 UTC (rev 3746)
+++ trunk/mmex/src/mmex.cpp	2013-04-20 22:08:07 UTC (rev 3747)
@@ -1245,7 +1245,7 @@
     }
 
     /* ================================================================================================= */
-
+    bool ignoreFuture = mmIniOptions::instance().ignoreFutureTransactions_;
     wxTreeItemId categsOverTime = navTreeCtrl_->AppendItem(reports
         , _("Where the Money Goes"), 4, 4);
     navTreeCtrl_->SetItemData(categsOverTime, new mmTreeItemData("Where the Money Goes"
@@ -1257,14 +1257,23 @@
         , new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Last Calendar Month")
         , new mmReportCategoryExpensesGoesLastMonth(m_core.get())));
 
-    wxString currentMonthMsg = _("Current Month");
-    if (mmIniOptions::instance().ignoreFutureTransactions_) currentMonthMsg = _("Current Month to Date");
+    if (ignoreFuture)
+    {
+        wxTreeItemId categsOverTimeCurrentMonth = navTreeCtrl_->AppendItem(categsOverTime
+            , _("Current Month to Date"), 4, 4);
+        navTreeCtrl_->SetItemData(categsOverTimeCurrentMonth
+            , new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Current Month")
+            , new mmReportCategoryExpensesGoesCurrentMonthToDate(m_core.get())));
+    }
+    else
+    {
+        wxTreeItemId categsOverTimeCurrentMonth = navTreeCtrl_->AppendItem(categsOverTime
+            , _("Current Month"), 4, 4);
+        navTreeCtrl_->SetItemData(categsOverTimeCurrentMonth
+            , new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Current Month")
+            , new mmReportCategoryExpensesGoesCurrentMonth(m_core.get())));
+    }
 
-    wxTreeItemId categsOverTimeCurrentMonth = navTreeCtrl_->AppendItem(categsOverTime, currentMonthMsg, 4, 4);
-    navTreeCtrl_->SetItemData(categsOverTimeCurrentMonth
-        , new mmTreeItemData(wxTRANSLATE("Where the Money Goes - Current Month")
-        , new mmReportCategoryExpensesGoesCurrentMonth(m_core.get())));
-
     wxTreeItemId categsOverTimeLast30 = navTreeCtrl_->AppendItem(categsOverTime
         , _("Last 30 Days"), 4, 4);
     navTreeCtrl_->SetItemData(categsOverTimeLast30
@@ -1298,7 +1307,8 @@
     }
     ///////////////////////////////////////////////////////////
 
-    wxTreeItemId posCategs = navTreeCtrl_->AppendItem(reports, _("Where the Money Comes From"), 4, 4);
+    wxTreeItemId posCategs = navTreeCtrl_->AppendItem(reports
+        , _("Where the Money Comes From"), 4, 4);
     navTreeCtrl_->SetItemData(posCategs
         , new mmTreeItemData("Where the Money Comes From"
         , new mmReportCategoryExpensesComesCurrentMonth(m_core.get())));
@@ -1309,10 +1319,22 @@
         , new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Last Calendar Month")
         , new mmReportCategoryExpensesComesLastMonth(m_core.get())));
 
-    wxTreeItemId posCategsCurrentMonth = navTreeCtrl_->AppendItem(posCategs, currentMonthMsg, 4, 4);
-    navTreeCtrl_->SetItemData(posCategsCurrentMonth
-        , new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Current Month")
-        , new mmReportCategoryExpensesComesCurrentMonth(m_core.get())));
+    if (ignoreFuture)
+    {
+        wxTreeItemId posCategsCurrentMonth = navTreeCtrl_->AppendItem(posCategs
+            , _("Current Month to Date"), 4, 4);
+        navTreeCtrl_->SetItemData(posCategsCurrentMonth
+            , new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Current Month")
+            , new mmReportCategoryExpensesComesCurrentMonthToDate(m_core.get())));
+    }
+    else
+    {
+        wxTreeItemId posCategsCurrentMonth = navTreeCtrl_->AppendItem(posCategs
+            , _("Current Month to Date"), 4, 4);
+        navTreeCtrl_->SetItemData(posCategsCurrentMonth
+            , new mmTreeItemData(wxTRANSLATE("Where the Money Comes From - Current Month")
+            , new mmReportCategoryExpensesComesCurrentMonth(m_core.get())));
+    }
 
     wxTreeItemId posCategsTimeLast30 = navTreeCtrl_->AppendItem(posCategs
         , _("Last 30 Days"), 4, 4);
@@ -1358,10 +1380,22 @@
         , new mmTreeItemData(wxTRANSLATE("Categories - Last Calendar Month")
         , new mmReportCategoryExpensesCategoriesLastMonth(m_core.get())));
 
-    wxTreeItemId categsCurrentMonth = navTreeCtrl_->AppendItem(categs, currentMonthMsg, 4, 4);
-    navTreeCtrl_->SetItemData(categsCurrentMonth
-        , new mmTreeItemData(wxTRANSLATE("Categories - Current Month")
-        , new mmReportCategoryExpensesCategoriesCurrentMonth(m_core.get())));
+    if (ignoreFuture)
+    {
+        wxTreeItemId categsCurrentMonth = navTreeCtrl_->AppendItem(categs
+            , _("Current Month to Date"), 4, 4);
+        navTreeCtrl_->SetItemData(categsCurrentMonth
+            , new mmTreeItemData(wxTRANSLATE("Categories - Current Month to Date")
+            , new mmReportCategoryExpensesCategoriesCurrentMonthToDate(m_core.get())));
+    }
+    else
+    {
+        wxTreeItemId categsCurrentMonth = navTreeCtrl_->AppendItem(categs
+            , _("Current Month to Date"), 4, 4);
+        navTreeCtrl_->SetItemData(categsCurrentMonth
+            , new mmTreeItemData(wxTRANSLATE("Categories - Current Month")
+            , new mmReportCategoryExpensesCategoriesCurrentMonth(m_core.get())));
+    }
 
     wxTreeItemId categsTimeLast30 = navTreeCtrl_->AppendItem(categs, _("Last 30 Days"), 4, 4);
     navTreeCtrl_->SetItemData(categsTimeLast30
@@ -1404,10 +1438,22 @@
         , new mmTreeItemData(wxTRANSLATE("Payees - Last Calendar Month")
         , new mmReportPayeeExpensesLastMonth(m_core.get())));
 
-    wxTreeItemId payeesOverTimeCurrentMonth = navTreeCtrl_->AppendItem(payeesOverTime, currentMonthMsg, 4, 4);
-    navTreeCtrl_->SetItemData(payeesOverTimeCurrentMonth
-        , new mmTreeItemData(wxTRANSLATE("Payees - Current Month")
-        , new mmReportPayeeExpensesCurrentMonth(m_core.get())));
+    if (ignoreFuture)
+    {
+        wxTreeItemId payeesOverTimeCurrentMonth = navTreeCtrl_->AppendItem(payeesOverTime
+            , _("Current Month to Date"), 4, 4);
+        navTreeCtrl_->SetItemData(payeesOverTimeCurrentMonth
+            , new mmTreeItemData(wxTRANSLATE("Payees - Current Month to Date")
+            , new mmReportPayeeExpensesCurrentMonthToDate(m_core.get())));
+    }
+    else
+    {
+        wxTreeItemId payeesOverTimeCurrentMonth = navTreeCtrl_->AppendItem(payeesOverTime
+            , _("Current Month"), 4, 4);
+        navTreeCtrl_->SetItemData(payeesOverTimeCurrentMonth
+            , new mmTreeItemData(wxTRANSLATE("Payees - Current Month")
+            , new mmReportPayeeExpensesCurrentMonth(m_core.get())));
+    }
 
     wxTreeItemId payeesOverTimeLast30 = navTreeCtrl_->AppendItem(payeesOverTime
         , _("Last 30 Days"), 4, 4);
@@ -1450,9 +1496,20 @@
     navTreeCtrl_->SetItemData(incexpOverTimeCalMonth
         , new mmTreeItemData(wxTRANSLATE("Income vs Expenses - Last Calendar Month")));
 
-    wxTreeItemId incexpOverTimeCurrentMonth = navTreeCtrl_->AppendItem(incexpOverTime, currentMonthMsg, 4, 4);
-    navTreeCtrl_->SetItemData(incexpOverTimeCurrentMonth
-        , new mmTreeItemData(wxTRANSLATE("Income vs Expenses - Current Month")));
+    if (ignoreFuture)
+    {
+        wxTreeItemId incexpOverTimeCurrentMonth = navTreeCtrl_->AppendItem(incexpOverTime
+            , _("Current Month to Date"), 4, 4);
+        navTreeCtrl_->SetItemData(incexpOverTimeCurrentMonth
+            , new mmTreeItemData(wxTRANSLATE("Income vs Expenses - Current Month to Date")));
+    }
+    else
+    {
+        wxTreeItemId incexpOverTimeCurrentMonth = navTreeCtrl_->AppendItem(incexpOverTime
+            , _("Current Month"), 4, 4);
+        navTreeCtrl_->SetItemData(incexpOverTimeCurrentMonth
+            , new mmTreeItemData(wxTRANSLATE("Income vs Expenses - Current Month")));
+    }
 
     wxTreeItemId incexpOverTimeLast30 = navTreeCtrl_->AppendItem(incexpOverTime, _("Last 30 Days"), 4, 4);
     navTreeCtrl_->SetItemData(incexpOverTimeLast30

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

Revision: 3750
          http://sourceforge.net/p/moneymanagerex/code/3750
Author:   stef145g
Date:     2013-04-21 07:29:57 +0000 (Sun, 21 Apr 2013)
Log Message:
-----------
Restore access to "Repeating Transactions" and "Assets"

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-04-21 01:23:09 UTC (rev 3749)
+++ trunk/mmex/src/mmex.cpp	2013-04-21 07:29:57 UTC (rev 3750)
@@ -1856,10 +1856,21 @@
             createHelpPage();
             return;
         }
+        else if (iData->getString() == "Assets")
+        {
+            wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_ASSETS);
+            AddPendingEvent(evt);
+            return;
+        }
+        else if (iData->getString() == "Bills & Deposits")
+        {
+            wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_BILLSDEPOSITS);
+            AddPendingEvent(evt);
+            return;
+        }
 
         if (!m_core || !m_db)
             return;
-
         //========================================================================
         int customReportID;      // Define before all the if...else statements
         //========================================================================

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

Revision: 3759
          http://sourceforge.net/p/moneymanagerex/code/3759
Author:   guanlisheng
Date:     2013-04-22 09:41:51 +0000 (Mon, 22 Apr 2013)
Log Message:
-----------
income

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-04-22 09:38:10 UTC (rev 3758)
+++ trunk/mmex/src/mmex.cpp	2013-04-22 09:41:51 UTC (rev 3759)
@@ -1528,15 +1528,15 @@
 
     wxTreeItemId incexpOverTimeCurrentYear = navTreeCtrl_->AppendItem(incexpOverTime, _("Current Year"), 4, 4);
     navTreeCtrl_->SetItemData(incexpOverTimeCurrentYear
-        , new mmTreeItemData(wxTRANSLATE("Income vs Expenses - Current Year"), new mmReportPayeeExpensesCurrentYear(m_core.get())));
+        , new mmTreeItemData(wxTRANSLATE("Income vs Expenses - Current Year"), new mmReportIncomeExpensesCurrentYear(m_core.get())));
 
     if (financialYearIsDifferent())
     {
         wxTreeItemId incexpOverTimeLastFinancialYear = navTreeCtrl_->AppendItem(incexpOverTime, _("Last Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(incexpOverTimeLastFinancialYear, new mmTreeItemData(wxTRANSLATE("Income vs Expenses - Last Financial Year"), new mmReportPayeeExpensesLastFinancialYear(m_core.get(), day, month)));
+        navTreeCtrl_->SetItemData(incexpOverTimeLastFinancialYear, new mmTreeItemData(wxTRANSLATE("Income vs Expenses - Last Financial Year"), new mmReportIncomeExpensesLastFinancialYear(m_core.get(), day, month)));
 
         wxTreeItemId incexpOverTimeCurrentFinancialYear = navTreeCtrl_->AppendItem(incexpOverTime, _("Current Financial Year"), 4, 4);
-        navTreeCtrl_->SetItemData(incexpOverTimeCurrentFinancialYear, new mmTreeItemData(wxTRANSLATE("Income vs Expenses - Current Financial Year"), new mmReportPayeeExpensesCurrentFinancialYear(m_core.get(), day, month)));
+        navTreeCtrl_->SetItemData(incexpOverTimeCurrentFinancialYear, new mmTreeItemData(wxTRANSLATE("Income vs Expenses - Current Financial Year"), new mmReportIncomeExpensesCurrentFinancialYear(m_core.get(), day, month)));
     }
 
     //////////////////////////////////////////////////////////////////

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

Revision: 3763
          http://sourceforge.net/p/moneymanagerex/code/3763
Author:   guanlisheng
Date:     2013-04-22 14:44:35 +0000 (Mon, 22 Apr 2013)
Log Message:
-----------
Categories - Over Time

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-04-22 14:35:54 UTC (rev 3762)
+++ trunk/mmex/src/mmex.cpp	2013-04-22 14:44:35 UTC (rev 3763)
@@ -1374,7 +1374,7 @@
     wxTreeItemId categs = navTreeCtrl_->AppendItem(reports, _("Categories"), 4, 4);
     navTreeCtrl_->SetItemData(categs
         , new mmTreeItemData(wxTRANSLATE("Categories - Over Time")
-        , new mmReportCategoryExpensesCategories(m_core.get())));
+        , new mmReportCategoryOverTimePerformance(m_core.get()))); // TODO mmReportCategoryExpensesCategories
 
     wxTreeItemId categsCalMonth = navTreeCtrl_->AppendItem(categs
         , _("Last Calendar Month"), 4, 4);

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

Revision: 3779
          http://sourceforge.net/p/moneymanagerex/code/3779
Author:   guanlisheng
Date:     2013-04-27 09:21:33 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
Cleanup

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-04-27 09:14:05 UTC (rev 3778)
+++ trunk/mmex/src/mmex.cpp	2013-04-27 09:21:33 UTC (rev 3779)
@@ -187,12 +187,6 @@
 
     mmSelectLanguage(0, pIniSettings, false);
 
-
-//removed by omalleypat - can't compile in wxWidgets 2.9
-//#if defined (__WXMAC__) || defined (__WXOSX__)
-//wxSystemOptions::SetOption(wxMAC_ALWAYS_USE_GENERIC_LISTCTRL,1);
-//#endif
-
     mmGUIFrame *frame = new mmGUIFrame(mmex::getProgramName(), wxPoint(valx, valy), wxSize(valw, valh), pIniSettings);
     bool ok = frame->Show();
     wxASSERT(ok);
@@ -1881,7 +1875,6 @@
         wxDateTime dtBegin, dtEnd;
         wxString sData = iData->getString();
         wxString title = wxGetTranslation(sData);
-//        bool bIgnoreFuture = mmIniOptions::instance().ignoreFutureTransactions_;
 
         if ( IsCustomReportSelected(customReportID, iData) )
         {

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

Revision: 3806
          http://sourceforge.net/p/moneymanagerex/code/3806
Author:   guanlisheng
Date:     2013-04-30 03:17:03 +0000 (Tue, 30 Apr 2013)
Log Message:
-----------
cleanup

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-04-30 02:54:21 UTC (rev 3805)
+++ trunk/mmex/src/mmex.cpp	2013-04-30 03:17:03 UTC (rev 3806)
@@ -1893,11 +1893,6 @@
             wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_BILLSDEPOSITS);
             AddPendingEvent(evt);
         }
-        else if (sData == "Assets")
-        {
-            wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_ASSETS);
-            AddPendingEvent(evt);
-        }
         else
         {
             createReportsPage(iData->get_report());

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

Revision: 3807
          http://sourceforge.net/p/moneymanagerex/code/3807
Author:   guanlisheng
Date:     2013-04-30 03:23:19 +0000 (Tue, 30 Apr 2013)
Log Message:
-----------
fix memory leak issue

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-04-30 03:17:03 UTC (rev 3806)
+++ trunk/mmex/src/mmex.cpp	2013-04-30 03:23:19 UTC (rev 3807)
@@ -1692,6 +1692,7 @@
                 , sScript
                 , custRepIndex_->CurrentReportFileType());
             createReportsPage(csr);
+			delete csr; // CEHCK
         }
     }
     processPendingEvents();         // clear out pending events
@@ -1776,11 +1777,13 @@
                 int year = data;
                 mmPrintableBase* rs = new mmReportBudgetingPerformance(m_core.get(), this, year);
                 createReportsPage(rs);
+				delete rs; // CHECK
             }
             else if (iParentData->getString() == "Budget Setup Performance")
             {
                 mmPrintableBase* rs = new mmReportBudgetCategorySummary(m_core.get(), this, year);
                 createReportsPage(rs);
+				delete rs; // CHECK
             }
             else
             {
@@ -3173,6 +3176,7 @@
 
         mmReportTransactions* rs = new mmReportTransactions(trans, m_core.get(), dlg->getAccountID(), dlg);
         createReportsPage(rs);
+		delete rs; // CHECK
     }
 }
 //----------------------------------------------------------------------------
@@ -3216,6 +3220,7 @@
         if (this->hasActiveTermAccounts()) report->activateTermAccounts();
 
         createReportsPage(report);
+		delete report; // CHECK
     }
 }
 //----------------------------------------------------------------------------
@@ -3869,6 +3874,7 @@
             mmCustomReport* csr = new mmCustomReport(this,
                 m_core.get(), dlg->sReportTitle(), dlg->sScript(), dlg->sSctiptType());
             createReportsPage(csr);
+			delete csr; // CHECK
             wxEndBusyCursor();
         }
         dialogStatus = dlg->ShowModal();

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

Revision: 3936
          http://sourceforge.net/p/moneymanagerex/code/3936
Author:   guanlisheng
Date:     2013-05-19 08:39:24 +0000 (Sun, 19 May 2013)
Log Message:
-----------
memory leak

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-05-19 07:06:50 UTC (rev 3935)
+++ trunk/mmex/src/mmex.cpp	2013-05-19 08:39:24 UTC (rev 3936)
@@ -3832,6 +3832,7 @@
         wxMessageBox(msgStr, _("Payee Relocation Result"));
         mmOptions::instance().databaseUpdated_ = true;
     }
+	delete dlg;
     homePanel_->Layout();
 }
 //----------------------------------------------------------------------------

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

Revision: 3939
          http://sourceforge.net/p/moneymanagerex/code/3939
Author:   guanlisheng
Date:     2013-05-20 09:17:46 +0000 (Mon, 20 May 2013)
Log Message:
-----------
use std::vector to replace raw C array

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-05-19 18:03:21 UTC (rev 3938)
+++ trunk/mmex/src/mmex.cpp	2013-05-20 09:17:46 UTC (rev 3939)
@@ -3682,7 +3682,7 @@
 
     wxArrayString as;
     int num = (int)m_core->accountList_.accounts_.size();
-    int* arrAcctID = new int[num];
+    std::vector<int> arrAcctID;
 
     int idx = 0;
     for (const auto& account: m_core->accountList_.accounts_)
@@ -3709,7 +3709,6 @@
             updateNavTreeControl();
         }
     }
-    delete[] arrAcctID;
     updateNavTreeControl();
     createHomePage();
 }

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

Revision: 3940
          http://sourceforge.net/p/moneymanagerex/code/3940
Author:   guanlisheng
Date:     2013-05-20 09:31:26 +0000 (Mon, 20 May 2013)
Log Message:
-----------
use less pointer

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-05-20 09:17:46 UTC (rev 3939)
+++ trunk/mmex/src/mmex.cpp	2013-05-20 09:31:26 UTC (rev 3940)
@@ -3820,18 +3820,17 @@
 
 void mmGUIFrame::OnPayeeRelocation(wxCommandEvent& /*event*/)
 {
-    relocatePayeeDialog* dlg = new relocatePayeeDialog(m_core.get(), this);
-    if (dlg->ShowModal() == wxID_OK)
+    relocatePayeeDialog dlg(m_core.get(), this);
+    if (dlg.ShowModal() == wxID_OK)
     {
         wxString msgStr;
         msgStr << _("Payee Relocation Completed.") << "\n\n"
             << wxString::Format(_("Records have been updated in the database: %s"),
-                dlg->updatedPayeesCount())
+                dlg.updatedPayeesCount())
             << "\n\n";
         wxMessageBox(msgStr, _("Payee Relocation Result"));
         mmOptions::instance().databaseUpdated_ = true;
     }
-	delete dlg;
     homePanel_->Layout();
 }
 //----------------------------------------------------------------------------
@@ -3839,22 +3838,21 @@
 void mmGUIFrame::RunCustomSqlDialog(wxString customReportSelectedItem)
 {
     this->SetEvtHandlerEnabled(false);
-    //Use Shared pointer to ensure mmCustomSQLDialog object gets destroyed.
-    std::shared_ptr<mmCustomSQLDialog> dlg( new mmCustomSQLDialog(custRepIndex_, customReportSelectedItem, this ));
+    mmCustomSQLDialog dlg(custRepIndex_, customReportSelectedItem, this);
 
     int dialogStatus = wxID_MORE;
     while (dialogStatus == wxID_MORE)
     {
-        if (dlg->sScript() != "")
+        if (dlg.sScript() != "")
         {
             wxBeginBusyCursor(wxHOURGLASS_CURSOR);
             mmCustomReport* csr = new mmCustomReport(this,
-                m_core.get(), dlg->sReportTitle(), dlg->sScript(), dlg->sSctiptType());
+                m_core.get(), dlg.sReportTitle(), dlg.sScript(), dlg.sSctiptType());
             createReportsPage(csr);
 			delete csr; // CHECK
             wxEndBusyCursor();
         }
-        dialogStatus = dlg->ShowModal();
+        dialogStatus = dlg.ShowModal();
     }
     processPendingEvents();         // clear out pending events
     if (dialogStatus == wxID_OK) updateNavTreeControl();

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

Revision: 3942
          http://sourceforge.net/p/moneymanagerex/code/3942
Author:   guanlisheng
Date:     2013-05-20 09:40:53 +0000 (Mon, 20 May 2013)
Log Message:
-----------
use less pointer

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-05-20 09:39:34 UTC (rev 3941)
+++ trunk/mmex/src/mmex.cpp	2013-05-20 09:40:53 UTC (rev 3942)
@@ -2938,18 +2938,17 @@
 
 void mmGUIFrame::OnExportToQIF(wxCommandEvent& /*event*/)
 {
-    mmQIFExportDialog* dlg = new mmQIFExportDialog(m_core.get(), this);
-    dlg->ShowModal();
-    dlg->Destroy();
+    mmQIFExportDialog dlg(m_core.get(), this);
+    dlg.ShowModal();
 }
 //----------------------------------------------------------------------------
 
 void mmGUIFrame::OnImportQIF(wxCommandEvent& /*event*/)
 {
 
-    mmQIFImportDialog* dlg = new mmQIFImportDialog(m_core.get(), this);
-    dlg->ShowModal();
-    int account_id = dlg->get_last_imported_acc();
+    mmQIFImportDialog dlg(m_core.get(), this);
+    dlg.ShowModal();
+    int account_id = dlg.get_last_imported_acc();
     refreshRequested_ = true;
     updateNavTreeControl();
     if (account_id > 0)
@@ -2959,7 +2958,6 @@
         wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_GOTOACCOUNT);
         this->GetEventHandler()->AddPendingEvent(evt);
     }
-    dlg->Destroy();
 }
 //----------------------------------------------------------------------------
 

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

Revision: 3962
          http://sourceforge.net/p/moneymanagerex/code/3962
Author:   stef145g
Date:     2013-05-23 11:11:55 +0000 (Thu, 23 May 2013)
Log Message:
-----------
Remove Compiler warning

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2013-05-23 10:21:24 UTC (rev 3961)
+++ trunk/mmex/src/mmex.cpp	2013-05-23 11:11:55 UTC (rev 3962)
@@ -3679,7 +3679,7 @@
     }
 
     wxArrayString as;
-    int num = (int)m_core->accountList_.accounts_.size();
+    //int num = (int)m_core->accountList_.accounts_.size();
     std::vector<int> arrAcctID;
 
     int idx = 0;

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