From: <vo...@us...> - 2012-07-23 14:38:44
|
Revision: 2800 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2800&view=rev Author: vomikan Date: 2012-07-23 14:38:33 +0000 (Mon, 23 Jul 2012) Log Message: ----------- accounts image selector function added Modified Paths: -------------- branches/0.9.9.0/mmex/src/mmex.cpp branches/0.9.9.0/mmex/src/util.cpp branches/0.9.9.0/mmex/src/util.h Modified: branches/0.9.9.0/mmex/src/mmex.cpp =================================================================== --- branches/0.9.9.0/mmex/src/mmex.cpp 2012-07-22 02:29:31 UTC (rev 2799) +++ branches/0.9.9.0/mmex/src/mmex.cpp 2012-07-23 14:38:33 UTC (rev 2800) @@ -69,68 +69,69 @@ #include <wx/debugrpt.h> #include <wx/sysopt.h> #include <wx/wizard.h> -//---------------------------------------------------------------------------- /* Include XPM Support */ -#include "../resources/new.xpm" -#include "../resources/open.xpm" -#include "../resources/save.xpm" -#include "../resources/addaccount.xpm" +#include "../resources/about.xpm" #include "../resources/accountlist.xpm" -#include "../resources/newacct.xpm" -#include "../resources/listview.xpm" -#include "../resources/homepagetree.xpm" -#include "../resources/budgeting.xpm" -#include "../resources/reporttree.xpm" -#include "../resources/billsdeposits.xpm" #include "../resources/accounttree.xpm" -#include "../resources/help.xpm" -#include "../resources/stock.xpm" -#include "../resources/print.xpm" -#include "../resources/printpreview.xpm" -#include "../resources/printsetup.xpm" -#include "../resources/saveas.xpm" -#include "../resources/exit.xpm" -#include "../resources/options.xpm" -#include "../resources/about.xpm" -#include "../resources/issues.xpm" -#include "../resources/assets.xpm" +#include "../resources/addaccount.xpm" #include "../resources/addacctwiz.xpm" -#include "../resources/notify.xpm" -#include "../resources/checkupdate.xpm" +#include "../resources/appstart.xpm" +#include "../resources/assets.xpm" +#include "../resources/billsdeposits.xpm" +#include "../resources/budgeting.xpm" +#include "../resources/calendar.xpm" +#include "../resources/car.xpm" #include "../resources/categories.xpm" -#include "../resources/payees.xpm" +#include "../resources/categoryedit.xpm" +#include "../resources/chartpiereport.xpm" +#include "../resources/checkupdate.xpm" +#include "../resources/clearlist.xpm" +#include "../resources/clock.xpm" #include "../resources/currency.xpm" -#include "../resources/appstart.xpm" -#include "../resources/edit_account.xpm" +#include "../resources/customsql.xpm" #include "../resources/delete_account.xpm" -#include "../resources/filter.xpm" -#include "../resources/facebook.xpm" -#include "../resources/clearlist.xpm" -#include "../resources/relocate_payees.xpm" -#include "../resources/relocate_categories.xpm" -#include "../resources/new_custom_sql.xpm" -#include "../resources/edit_custom_sql.xpm" #include "../resources/delete_custom_sql.xpm" +#include "../resources/edit_account.xpm" +#include "../resources/edit_custom_sql.xpm" #include "../resources/encrypt_db.xpm" -#include "../resources/update_currency.xpm" +#include "../resources/exit.xpm" +#include "../resources/facebook.xpm" +#include "../resources/filter.xpm" +#include "../resources/flag.xpm" +#include "../resources/help.xpm" +#include "../resources/homepagetree.xpm" #include "../resources/house.xpm" -#include "../resources/moneyaccount.xpm" -#include "../resources/stock_curve.xpm" -#include "../resources/chartpiereport.xpm" -#include "../resources/car.xpm" -#include "../resources/clock.xpm" -#include "../resources/calendar.xpm" -#include "../resources/categoryedit.xpm" +#include "../resources/issues.xpm" +#include "../resources/listview.xpm" #include "../resources/money_dollar.xpm" -#include "../resources/user_edit.xpm" -#include "../resources/wrench.xpm" -#include "../resources/customsql.xpm" -#include "../resources/termaccount.xpm" +#include "../resources/moneyaccount.xpm" +#include "../resources/new_custom_sql.xpm" +#include "../resources/new.xpm" +#include "../resources/newacct.xpm" +#include "../resources/notify.xpm" +#include "../resources/open.xpm" +#include "../resources/options.xpm" +#include "../resources/payees.xpm" +#include "../resources/print.xpm" +#include "../resources/printpreview.xpm" +#include "../resources/printsetup.xpm" +#include "../resources/relocate_categories.xpm" +#include "../resources/relocate_payees.xpm" +#include "../resources/reporttree.xpm" +#include "../resources/save.xpm" +#include "../resources/saveas.xpm" #include "../resources/savings_acc_closed.xpm" #include "../resources/savings_acc_favorite.xpm" +#include "../resources/stock_curve.xpm" +#include "../resources/stock.xpm" #include "../resources/term_acc_closed.xpm" #include "../resources/term_acc_favorite.xpm" +#include "../resources/termaccount.xpm" +#include "../resources/tipicon.xpm" +#include "../resources/update_currency.xpm" +#include "../resources/user_edit.xpm" +#include "../resources/wrench.xpm" //---------------------------------------------------------------------------- @@ -1010,11 +1011,17 @@ imageList_->Add(wxBitmap(wxImage(car_xpm).Scale(16, 16))); imageList_->Add(wxBitmap(wxImage(customsql_xpm).Scale(16, 16))); imageList_->Add(wxBitmap(wxImage(termaccount_xpm).Scale(16, 16))); // used for: term_account - imageList_->Add(wxBitmap(wxImage(savings_acc_favorite_xpm).Scale(16, 16))); + imageList_->Add(wxBitmap(wxImage(savings_acc_favorite_xpm).Scale(16, 16))); //10 imageList_->Add(wxBitmap(wxImage(savings_acc_closed_xpm).Scale(16, 16))); imageList_->Add(wxBitmap(wxImage(term_acc_favorite_xpm).Scale(16, 16))); imageList_->Add(wxBitmap(wxImage(term_acc_closed_xpm).Scale(16, 16))); + imageList_->Add(wxBitmap(wxImage(tipicon_xpm).Scale(16, 16))); + imageList_->Add(wxBitmap(wxImage(flag_xpm).Scale(16, 16))); + imageList_->Add(wxBitmap(wxImage(money_dollar_xpm).Scale(16, 16))); + imageList_->Add(wxBitmap(wxImage(accounttree_xpm).Scale(16, 16))); + imageList_->Add(wxBitmap(wxImage(about_xpm).Scale(16, 16))); + navTreeCtrl_->AssignImageList(imageList_); homePanel_ = new wxPanel( this, ID_PANEL, @@ -1387,12 +1394,8 @@ (vAccts == wxT("Favorites") && pCA->favoriteAcct_) || (vAccts == wxT("ALL"))) { - int selectedImage = 1; - if (pCA->status_ == mmAccount::MMEX_Closed) - selectedImage = 11; - else if (pCA->favoriteAcct_) - selectedImage = 10; - + int selectedImage = mmIniOptions::instance().account_image_id(m_core.get(), + m_db.get(), pCA->id_, pCA->status_, pCA->favoriteAcct_); wxTreeItemId tacct = navTreeCtrl_->AppendItem(accounts, pCA->name_, selectedImage, selectedImage); navTreeCtrl_->SetItemData(tacct, new mmTreeItemData(pCA->id_, false)); } @@ -1405,12 +1408,8 @@ (vAccts == wxT("Favorites") && pTA->favoriteAcct_) || (vAccts == wxT("ALL"))) { - int selectedImage = 9; - if (pTA->status_ == mmAccount::MMEX_Closed) - selectedImage = 13; - else if (pTA->favoriteAcct_) - selectedImage = 12; - + int selectedImage = mmIniOptions::instance().account_image_id(m_core.get(), + m_db.get(), pTA->id_, pTA->status_, pTA->favoriteAcct_); wxTreeItemId tacct = navTreeCtrl_->AppendItem(termAccount, pTA->name_, selectedImage, selectedImage); navTreeCtrl_->SetItemData(tacct, new mmTreeItemData(pTA->id_, false)); } @@ -1427,7 +1426,6 @@ navTreeCtrl_->SetItemData(tacct, new mmTreeItemData(pIA->id_, false)); } } - } if (mmIniOptions::instance().expandBankTree_) Modified: branches/0.9.9.0/mmex/src/util.cpp =================================================================== --- branches/0.9.9.0/mmex/src/util.cpp 2012-07-22 02:29:31 UTC (rev 2799) +++ branches/0.9.9.0/mmex/src/util.cpp 2012-07-23 14:38:33 UTC (rev 2800) @@ -988,3 +988,21 @@ return err_code; } +int mmIniOptions::account_image_id(mmCoreDB* core, wxSQLite3Database* db, int account_id, int status, bool favorite) +{ + double selectedImage = 1; + wxString image_num_str = mmDBWrapper::getInfoSettingValue(db, + wxString::Format(wxT("CHECK_IMAGE_ID_%d"), account_id), wxT("")); + if (!mmex::formatCurrencyToDouble(image_num_str, selectedImage)) + { + wxString acctType = core->accountList_.getAccountType(account_id); + + int k = acctType == wxT("Checking") ? 0 : 2; + if (status == mmAccount::MMEX_Closed) + selectedImage = 11 + k; + else if (favorite) + selectedImage = 10 + k; + } + return selectedImage; +} + Modified: branches/0.9.9.0/mmex/src/util.h =================================================================== --- branches/0.9.9.0/mmex/src/util.h 2012-07-22 02:29:31 UTC (rev 2799) +++ branches/0.9.9.0/mmex/src/util.h 2012-07-23 14:38:33 UTC (rev 2800) @@ -172,6 +172,7 @@ void loadOptions( wxSQLite3Database* db ); void loadInfoOptions( wxSQLite3Database* db ); void saveOptions( wxSQLite3Database* db ); + int account_image_id(mmCoreDB* core, wxSQLite3Database* db, int account_id, int status, bool favorite); bool enableAssets_; bool enableBudget_; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |