From: <vo...@us...> - 2013-04-13 18:12:59
|
Revision: 3668 http://sourceforge.net/p/moneymanagerex/code/3668 Author: vomikan Date: 2013-04-13 18:12:56 +0000 (Sat, 13 Apr 2013) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/aboutdialog.cpp trunk/mmex/src/constants.cpp trunk/mmex/src/constants.h trunk/mmex/src/mmex.cpp Modified: trunk/mmex/src/aboutdialog.cpp =================================================================== --- trunk/mmex/src/aboutdialog.cpp 2013-04-13 17:18:54 UTC (rev 3667) +++ trunk/mmex/src/aboutdialog.cpp 2013-04-13 18:12:56 UTC (rev 3668) @@ -79,11 +79,17 @@ wxString html = mmex::getProgramDescription(); html.Replace(wxT("======================================\n"), wxT("<hr>")); html.Replace(wxT("\n"), wxT("<br>")); - html << wxT("<br>") << wxT("\n"); + html << wxT("<br><hr>") << wxT("\n"); hb.addHeader(3, wxT("Money Manager Ex")); hb.addParaText(html); + hb.addLineBreak(); hb.addTableCellLink( mmex::getProgramFacebookSite() , _("Visit us on Facebook")); + hb.addLineBreak(); + hb.addTableCellLink( mmex::getProgramForum() + , _("Visit MMEX Forum")); + hb.addLineBreak(); + hb.end(); html = hb.getHTMLText(); about_text_ -> SetPage(html); Modified: trunk/mmex/src/constants.cpp =================================================================== --- trunk/mmex/src/constants.cpp 2013-04-13 17:18:54 UTC (rev 3667) +++ trunk/mmex/src/constants.cpp 2013-04-13 18:12:56 UTC (rev 3668) @@ -86,6 +86,10 @@ return wxT("http://codelathe.com/mmex"); } +wxString mmex::getProgramForum() +{ + return wxT("http://www.codelathe.com/forum"); +} wxString mmex::getProgramFacebookSite() { return wxT("http://www.facebook.com/pages/Money-Manager-Ex/242286559144586"); Modified: trunk/mmex/src/constants.h =================================================================== --- trunk/mmex/src/constants.h 2013-04-13 17:18:54 UTC (rev 3667) +++ trunk/mmex/src/constants.h 2013-04-13 18:12:56 UTC (rev 3668) @@ -53,6 +53,7 @@ wxString getProgramVersion(); wxString getProgramCopyright(); wxString getProgramWebSite(); +wxString getProgramForum(); wxString getProgramFacebookSite(); wxString getProgramDescription(); } // namespace mmex Modified: trunk/mmex/src/mmex.cpp =================================================================== --- trunk/mmex/src/mmex.cpp 2013-04-13 17:18:54 UTC (rev 3667) +++ trunk/mmex/src/mmex.cpp 2013-04-13 18:12:56 UTC (rev 3668) @@ -1184,20 +1184,28 @@ /* ================================================================================================= */ - wxTreeItemId reportsSummary = navTreeCtrl_->AppendItem(reports, _("Summary of Accounts"), 4, 4); - navTreeCtrl_->SetItemData(reportsSummary, new mmTreeItemData(wxT("Summary of Accounts"))); + wxTreeItemId reportsSummary = navTreeCtrl_->AppendItem(reports + , _("Summary of Accounts"), 4, 4); + navTreeCtrl_->SetItemData(reportsSummary + , new mmTreeItemData(wxT("Summary of Accounts"))); - wxTreeItemId reportsStocks = navTreeCtrl_->AppendItem(reportsSummary, _("Stocks"), 4, 4); - navTreeCtrl_->SetItemData(reportsStocks, new mmTreeItemData(wxT("Summary of Stocks"))); + wxTreeItemId reportsStocks = navTreeCtrl_->AppendItem(reportsSummary + , _("Stocks"), 4, 4); + navTreeCtrl_->SetItemData(reportsStocks + , new mmTreeItemData(wxT("Summary of Stocks"))); if (mmIniOptions::instance().enableAssets_) { - wxTreeItemId reportsAssets = navTreeCtrl_->AppendItem(reportsSummary, _("Assets"), 4, 4); - navTreeCtrl_->SetItemData(reportsAssets, new mmTreeItemData(wxT("Summary of Assets"))); + wxTreeItemId reportsAssets = navTreeCtrl_->AppendItem(reportsSummary + , _("Assets"), 4, 4); + navTreeCtrl_->SetItemData(reportsAssets + , new mmTreeItemData(wxT("Summary of Assets"))); } - wxTreeItemId categsOverTime = navTreeCtrl_->AppendItem(reports, _("Where the Money Goes"), 4, 4); - navTreeCtrl_->SetItemData(categsOverTime, new mmTreeItemData(wxT("Where the Money Goes"))); + 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(wxTRANSLATE("Where the Money Goes - Last Calendar Month"))); @@ -2234,7 +2242,8 @@ menu_file->Append(MENU_EXPORT, _("&Export"), exportMenu); wxMenu* importMenu = new wxMenu; - importMenu->Append(MENU_IMPORT_UNIVCSV, _("&CSV Files..."), _("Import from any CSV file")); + 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); @@ -2360,15 +2369,18 @@ menuTools->Append(menuItemCurrency); wxMenu *menuRelocation = new wxMenu; - wxMenuItem* menuItemCategoryRelocation = new wxMenuItem(menuRelocation, - MENU_CATEGORY_RELOCATION,_("&Categories..."),_("Reassign all categories to another category")); + wxMenuItem* menuItemCategoryRelocation = new wxMenuItem(menuRelocation + , MENU_CATEGORY_RELOCATION, _("&Categories...") + , _("Reassign all categories to another category")); menuItemCategoryRelocation->SetBitmap(wxBitmap(relocate_categories_xpm)); - wxMenuItem* menuItemPayeeRelocation = new wxMenuItem(menuRelocation, - MENU_PAYEE_RELOCATION,_("&Payees..."),_("Reassign all payees to another payee")); + wxMenuItem* menuItemPayeeRelocation = new wxMenuItem(menuRelocation + , MENU_PAYEE_RELOCATION, _("&Payees...") + , _("Reassign all payees to another payee")); menuItemPayeeRelocation->SetBitmap(wxBitmap(relocate_payees_xpm)); menuRelocation->Append(menuItemCategoryRelocation); menuRelocation->Append(menuItemPayeeRelocation); - menuTools->AppendSubMenu(menuRelocation,_("Relocation of..."),_("Relocate Categories && Payees")); + menuTools->AppendSubMenu(menuRelocation, _("Relocation of...") + , _("Relocate Categories && Payees")); menuTools->AppendSeparator(); @@ -2390,7 +2402,8 @@ if (mmIniOptions::instance().enableAssets_) { - wxMenuItem* menuItemAssets = new wxMenuItem(menuTools, MENU_ASSETS, _("&Assets"), _("Assets")); + wxMenuItem* menuItemAssets = new wxMenuItem(menuTools, MENU_ASSETS + , _("&Assets"), _("Assets")); menuItemAssets->SetBitmap(wxBitmap(car_xpm)); menuTools->Append(menuItemAssets); } @@ -2405,8 +2418,9 @@ menuTools->AppendSeparator(); // Create Item - wxMenuItem* menuItemCustomReportEdit = new wxMenuItem(menuTools, - wxID_EDIT, _("Custom Reports..."), _("Create or modify reports for the Reports section")); + wxMenuItem* menuItemCustomReportEdit = new wxMenuItem(menuTools + , wxID_EDIT, _("Custom Reports...") + , _("Create or modify reports for the Reports section")); menuItemCustomReportEdit->SetBitmap(wxBitmap(customsql_xpm)); // Add menu to Tools menu menuTools->Append(menuItemCustomReportEdit); @@ -2459,22 +2473,24 @@ if (mmIniOptions::instance().enableReportIssues_) { - 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.")); + wxMenuItem* menuItemReportIssues = new wxMenuItem(menuTools, MENU_REPORTISSUES + , _("Visit MMEX Forum") + , _("Visit the MMEX forum. See existing user comments, or report new issues with the software.")); menuItemReportIssues->SetBitmap(wxBitmap(issues_xpm)); menuHelp->Append(menuItemReportIssues); } if (mmIniOptions::instance().enableBeNotifiedForNewReleases_) { - wxMenuItem* menuItemNotify = new wxMenuItem(menuTools, MENU_ANNOUNCEMENTMAILING, - _("Register/View Release &Notifications."), _("Sign up to Notification Mailing List or View existing announcements.")); + 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); } wxMenuItem* menuItemFacebook = new wxMenuItem(menuTools, MENU_FACEBOOK, - _("Visit us on Facebook"), _("Visit us on Facebook")); + _("Visit us on Facebook"), _("Visit us on Facebook")); menuItemFacebook->SetBitmap(wxBitmap(facebook_xpm)); menuHelp->Append(menuItemFacebook); @@ -3376,7 +3392,7 @@ void mmGUIFrame::OnReportIssues(wxCommandEvent& /*event*/) { - wxString url = wxT("http://www.codelathe.com/forum"); + wxString url = mmex::getProgramForum(); wxLaunchDefaultBrowser(url); } //---------------------------------------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |