[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[2552] trunk/mmex/src

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

Revision: 2552
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2552&view=rev
Author:   vomikan
Date:     2012-06-09 12:11:49 +0000 (Sat, 09 Jun 2012)
Log Message:
-----------
->wxConfigBase

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

Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp	2012-06-09 12:01:36 UTC (rev 2551)
+++ trunk/mmex/src/mmex.cpp	2012-06-09 12:11:49 UTC (rev 2552)
@@ -1343,7 +1343,6 @@
 
     /* Load Nav Tree Control */
 
-    //wxString vAccts = mmDBWrapper::getINISettingValue(m_inidb.get(), ("VIEWACCOUNTS"), ("ALL"));
     wxConfigBase *config = wxConfigBase::Get();
     wxString vAccts = config->Read("VIEWACCOUNTS", "ALL");
 

Modified: trunk/mmex/src/mmhomepagepanel.cpp
===================================================================
--- trunk/mmex/src/mmhomepagepanel.cpp	2012-06-09 12:01:36 UTC (rev 2551)
+++ trunk/mmex/src/mmhomepagepanel.cpp	2012-06-09 12:11:49 UTC (rev 2552)
@@ -124,6 +124,7 @@
 /* Checking Accounts */
 void mmHomePagePanel::displayCheckingAccounts(mmHTMLBuilder& hb, double& tBalance, double& tIncome, double& tExpenses, const wxDateTime& dtBegin, const wxDateTime& dtEnd)
 {
+    wxConfigBase *config = wxConfigBase::Get();
     // Only Show the account titles if we want to display Bank accounts.
     if ( frame_->expandedBankAccounts() ) 
         displaySummaryHeader(hb, _("Bank Account"));
@@ -131,7 +132,7 @@
     double tRecBalance = 0.0;
 
     // Get account balances and display accounts if we want them displayed 
-    wxString vAccts = mmDBWrapper::getINISettingValue(inidb_, ("VIEWACCOUNTS"), ("ALL"));
+    wxString vAccts = config->Read ("VIEWACCOUNTS", "ALL");
     std::pair<mmAccountList::const_iterator, mmAccountList::const_iterator> range = core_->rangeAccount();
     for (mmAccountList::const_iterator it = range.first; it != range.second; ++ it)
     {
@@ -184,6 +185,7 @@
 /* Term Accounts */
 void mmHomePagePanel::displayTermAccounts(mmHTMLBuilder& hb, double& tBalance, double& tIncome, double& tExpenses, const wxDateTime& dtBegin, const wxDateTime& dtEnd)
 {
+    wxConfigBase *config = wxConfigBase::Get();
     double tTermBalance = 0.0;
     double tRecBalance  = 0.0;
 
@@ -192,7 +194,7 @@
         displaySummaryHeader(hb, _("Term Account"));
 
     // Get account balances and add to totals, and display accounts if we want them displayed 
-    wxString vAccts = mmDBWrapper::getINISettingValue(inidb_, ("VIEWACCOUNTS"), ("ALL"));
+    wxString vAccts = config->Read("VIEWACCOUNTS", "ALL");
     std::pair<mmAccountList::const_iterator, mmAccountList::const_iterator> range = core_->rangeAccount(); 
     for (mmAccountList::const_iterator it = range.first; it != range.second; ++ it)
     {

Modified: trunk/mmex/src/optionsdialog.cpp
===================================================================
--- trunk/mmex/src/optionsdialog.cpp	2012-06-09 12:01:36 UTC (rev 2551)
+++ trunk/mmex/src/optionsdialog.cpp	2012-06-09 12:11:49 UTC (rev 2552)
@@ -339,7 +339,7 @@
         wxDefaultPosition, wxDefaultSize, itemChoiceViewAccountTranslatedStrings);
     accountStaticBoxSizer->Add(choiceVisible_, 1, wxGROW|wxALL, 5);
 
-    wxString vAccts = mmDBWrapper::getINISettingValue(inidb_, ("VIEWACCOUNTS"), VIEW_ACCOUNTS_ALL_STR);
+    wxString vAccts = config->Read("VIEWACCOUNTS", VIEW_ACCOUNTS_ALL_STR);
     row_id_ = 0;
     wxArrayString itemChoiceViewAccountStrings = viewAccountStrings(false, vAccts, row_id_);
     choiceVisible_->SetSelection(row_id_);
@@ -961,7 +961,7 @@
     int selection = choiceVisible_->GetSelection();
     int row_id_ = 0;
     wxArrayString viewAcct = viewAccountStrings(false, wxEmptyString, row_id_);
-    mmDBWrapper::setINISettingValue(inidb_, ("VIEWACCOUNTS"), viewAcct[selection]);
+    config->Write("VIEWACCOUNTS", viewAcct[selection]);
 }
 
 void mmOptionsDialog::SaveViewTransactionOptions()

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