From: <vo...@us...> - 2009-11-01 10:36:02
|
Revision: 713 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=713&view=rev Author: vomikan Date: 2009-11-01 10:35:49 +0000 (Sun, 01 Nov 2009) Log Message: ----------- Addition submenu for Bank Accounts popup menu. + //Accounts Visible// + //All // + //Favorite // + //Open // Now you can temporary switch Accounts Visible parameter for current session only. Modified Paths: -------------- trunk/mmex/src/guiid.h trunk/mmex/src/mmex.cpp trunk/mmex/src/mmex.h Modified: trunk/mmex/src/guiid.h =================================================================== --- trunk/mmex/src/guiid.h 2009-11-01 07:40:45 UTC (rev 712) +++ trunk/mmex/src/guiid.h 2009-11-01 10:35:49 UTC (rev 713) @@ -409,6 +409,9 @@ MENU_TREEPOPUP_ACCOUNT_IMPORTQIF, MENU_TREEPOPUP_ACCOUNT_IMPORTUNIVCSV, MENU_TREEPOPUP_ACCOUNT_IMPORTMMNET, + MENU_TREEPOPUP_ACCOUNT_VIEWALL, + MENU_TREEPOPUP_ACCOUNT_VIEWFAVORITE, + MENU_TREEPOPUP_ACCOUNT_VIEWOPEN, }; //---------------------------------------------------------------------------- Modified: trunk/mmex/src/mmex.cpp =================================================================== --- trunk/mmex/src/mmex.cpp 2009-11-01 07:40:45 UTC (rev 712) +++ trunk/mmex/src/mmex.cpp 2009-11-01 10:35:49 UTC (rev 713) @@ -297,19 +297,7 @@ EVT_MENU(MENU_TRANSACTIONREPORT, mmGUIFrame::OnTransactionReport) /* Navigation Panel */ - /*Popup Menu for Bank Accounts*/ - //New Account // - //Delete Account // - //Edit Account // - //Export > // - //CSV Files // - //QIF Files // - //Import > // - //Universal CSV Files // - //QIF Files // - //MMEX CSV Files // - //MM.&NET CSV Files // EVT_MENU(MENU_TREEPOPUP_ACCOUNT_NEW, mmGUIFrame::OnNewAccount) EVT_MENU(MENU_TREEPOPUP_ACCOUNT_DELETE, mmGUIFrame::OnDeleteAccount) EVT_MENU(MENU_TREEPOPUP_ACCOUNT_EDIT, mmGUIFrame::OnEditAccount) @@ -320,6 +308,9 @@ EVT_MENU(MENU_TREEPOPUP_ACCOUNT_IMPORTCSV, mmGUIFrame::OnImportCSV) EVT_MENU(MENU_TREEPOPUP_ACCOUNT_IMPORTUNIVCSV, mmGUIFrame::OnImportUniversalCSV) EVT_MENU(MENU_TREEPOPUP_ACCOUNT_IMPORTMMNET, mmGUIFrame::OnImportCSVMMNET) + EVT_MENU(MENU_TREEPOPUP_ACCOUNT_VIEWALL, mmGUIFrame::OnViewAllAccounts) + EVT_MENU(MENU_TREEPOPUP_ACCOUNT_VIEWFAVORITE, mmGUIFrame::OnViewFavoriteAccounts) + EVT_MENU(MENU_TREEPOPUP_ACCOUNT_VIEWOPEN, mmGUIFrame::OnViewOpenAccounts) END_EVENT_TABLE() /*******************************************************/ @@ -1905,6 +1896,24 @@ { //wxMenu menu; + /*Popup Menu for Bank Accounts*/ + //New Account // + //Delete Account // + //Edit Account // + //Export > // + //CSV Files // + //QIF Files // + //Import > // + //Universal CSV Files // + //QIF Files // + //MMEX CSV Files // + //MM.&NET CSV Files // + //Accounts Visible// + //All // + //Favorite // + //Open // + + wxMenu *menu = new wxMenu; menu->Append(MENU_TREEPOPUP_ACCOUNT_NEW, _("New &Account")); menu->Append(MENU_TREEPOPUP_ACCOUNT_DELETE, _("&Delete Account")); @@ -1925,12 +1934,62 @@ 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); } } } +void mmGUIFrame::OnViewAllAccounts(wxCommandEvent&) +{ + //Get current settings for view accounts + wxString vAccts = mmDBWrapper::getINISettingValue(inidb_.get(), wxT("VIEWACCOUNTS"), wxT("ALL")); + //Set view ALL + mmDBWrapper::setINISettingValue(inidb_.get(), wxT("VIEWACCOUNTS"), wxT("ALL")); + + //Refresh Navigation Panel + mmGUIFrame::updateNavTreeControl(); + + //Restore settings + mmDBWrapper::setINISettingValue(inidb_.get(), wxT("VIEWACCOUNTS"), vAccts); + +} +void mmGUIFrame::OnViewFavoriteAccounts(wxCommandEvent&) +{ + //Get current settings for view accounts + wxString vAccts = mmDBWrapper::getINISettingValue(inidb_.get(), wxT("VIEWACCOUNTS"), wxT("ALL")); + + //Set view ALL + mmDBWrapper::setINISettingValue(inidb_.get(), wxT("VIEWACCOUNTS"), wxT("Favorites")); + + //Refresh Navigation Panel + mmGUIFrame::updateNavTreeControl(); + + //Restore settings + mmDBWrapper::setINISettingValue(inidb_.get(), wxT("VIEWACCOUNTS"), vAccts); + +} +void mmGUIFrame::OnViewOpenAccounts(wxCommandEvent&) +{ + //Get current settings for view accounts + wxString vAccts = mmDBWrapper::getINISettingValue(inidb_.get(), wxT("VIEWACCOUNTS"), wxT("ALL")); + + //Set view ALL + mmDBWrapper::setINISettingValue(inidb_.get(), wxT("VIEWACCOUNTS"), wxT("Open")); + + //Refresh Navigation Panel + mmGUIFrame::updateNavTreeControl(); + + //Restore settings + mmDBWrapper::setINISettingValue(inidb_.get(), wxT("VIEWACCOUNTS"), vAccts); + +} void mmGUIFrame::createCheckingAccountPage(int accountID) { wxSizer *sizer = cleanupHomePanel(); Modified: trunk/mmex/src/mmex.h =================================================================== --- trunk/mmex/src/mmex.h 2009-11-01 07:40:45 UTC (rev 712) +++ trunk/mmex/src/mmex.h 2009-11-01 10:35:49 UTC (rev 713) @@ -255,6 +255,10 @@ void OnWizardCancel(wxWizardEvent& event); + void OnViewAllAccounts(wxCommandEvent& event); + void OnViewFavoriteAccounts(wxCommandEvent& event); + void OnViewOpenAccounts(wxCommandEvent& event); + public: mmPanelBase* panelCurrent_; wxPanel* homePanel; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |