From: <vo...@us...> - 2012-02-25 07:52:09
|
Revision: 1872 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1872&view=rev Author: vomikan Date: 2012-02-25 07:52:03 +0000 (Sat, 25 Feb 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp trunk/mmex/src/billsdepositspanel.cpp trunk/mmex/src/stockspanel.cpp trunk/mmex/src/util.cpp trunk/mmex/src/util.h Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-02-25 07:05:31 UTC (rev 1871) +++ trunk/mmex/src/assetspanel.cpp 2012-02-25 07:52:03 UTC (rev 1872) @@ -376,7 +376,7 @@ else { stm -> SetLabel(wxT("")); - st->SetLabel(Tips(wxT("assets"))); + st->SetLabel(Tips(TIPS_ASSETS)); enableEditDeleteButtons(false); } } Modified: trunk/mmex/src/billsdepositspanel.cpp =================================================================== --- trunk/mmex/src/billsdepositspanel.cpp 2012-02-25 07:05:31 UTC (rev 1871) +++ trunk/mmex/src/billsdepositspanel.cpp 2012-02-25 07:52:03 UTC (rev 1872) @@ -665,7 +665,7 @@ } else { - st-> SetLabel(Tips(wxT("billsdeposits"))); + st-> SetLabel(Tips(TIPS_BILLS)); stm-> SetLabel(wxT("")); } } Modified: trunk/mmex/src/stockspanel.cpp =================================================================== --- trunk/mmex/src/stockspanel.cpp 2012-02-25 07:05:31 UTC (rev 1871) +++ trunk/mmex/src/stockspanel.cpp 2012-02-25 07:52:03 UTC (rev 1872) @@ -888,7 +888,7 @@ wxStaticText* stm = (wxStaticText*)FindWindow(ID_PANEL_STOCKS_STATIC_DETAILS_MINI); if (selectedIndex_ == -1) { - st->SetLabel(_("Using MMEX it is possible to track stocks/mutual funds investments.")); + st->SetLabel(Tips(TIPS_STOCK)); stm->SetLabel(wxT("")); } else Modified: trunk/mmex/src/util.cpp =================================================================== --- trunk/mmex/src/util.cpp 2012-02-25 07:05:31 UTC (rev 1871) +++ trunk/mmex/src/util.cpp 2012-02-25 07:52:03 UTC (rev 1872) @@ -945,8 +945,24 @@ wxString Tips(wxString type) { wxString tipsStr = wxEmptyString; - if (type == wxT("checkingpanel")) + if (type == TIPS_ASSETS) { + tipsStr = _("MMEX allows you to track fixed assets like cars, houses, land and others. Each asset can have its value appreciate by a certain rate per year, depreciate by a certain rate per year, or not change in value. The total assets are added to your total financial worth."); + } + else if (type == TIPS_STOCK) + { + tipsStr = _("Using MMEX it is possible to track stocks/mutual funds investments."); + } + else if (type == TIPS_BILLS) + { + wxArrayString tips; + tips.Add(_("MMEX allows regular payments to be set up as transactions. These transactions can also be regular deposits, or transfers that will occur at some future time. These transactions act a reminder that an event is about to occur, and appears on the Home Page 14 days before the transaction is due. ")); + tips.Add(_("Tip: These transactions can be set up to activate – allowing the user to adjust any values on the due date.")); + + tipsStr = tips[rand() % tips.GetCount()]; + } + else + { wxArrayString tips; tips.Add(_("Recommendation: Always backup your .mmb database file regularly.")); tips.Add(_("Recommendation: If upgrading to a new version of MMEX, make sure you backup your .mmb database file before doing so.")); @@ -973,22 +989,6 @@ tips.Add(_("Before going to a shop and buy something: take the time making a list of what you really need. In the shop buy what is in your list.")); tipsStr = tips[rand() % tips.GetCount()]; } - else if (type == wxT("assets")) - { - tipsStr = _("MMEX allows you to track fixed assets like cars, houses, land and others. Each asset can have its value appreciate by a certain rate per year, depreciate by a certain rate per year, or not change in value. The total assets are added to your total financial worth."); - } - else if (type == wxT("stocks")) - { - tipsStr = _("Using MMEX it is possible to track stocks/mutual funds investments."); - } - else if (type == wxT("billsdeposits")) - { - wxArrayString tips; - tips.Add(_("MMEX allows regular payments to be set up as transactions. These transactions can also be regular deposits, or transfers that will occur at some future time. These transactions act a reminder that an event is about to occur, and appears on the Home Page 14 days before the transaction is due. ")); - tips.Add(_("Tip: These transactions can be set up to activate – allowing the user to adjust any values on the due date.")); - - tipsStr = tips[rand() % tips.GetCount()]; - } return tipsStr; } Modified: trunk/mmex/src/util.h =================================================================== --- trunk/mmex/src/util.h 2012-02-25 07:05:31 UTC (rev 1871) +++ trunk/mmex/src/util.h 2012-02-25 07:52:03 UTC (rev 1872) @@ -75,6 +75,11 @@ const wxString INIDB_BUDGET_SUMMARY_WITHOUT_CATEG = wxT("BUDGET_SUMMARY_WITHOUT_CATEGORIES"); const wxString INIDB_IGNORE_FUTURE_TRANSACTIONS = wxT("IGNORE_FUTURE_TRANSACTIONS"); +const wxString TIPS_BANKS = wxT("checkingpanel"); +const wxString TIPS_BILLS = wxT("billsdeposits"); +const wxString TIPS_STOCK = wxT("investment"); +const wxString TIPS_ASSETS = wxT("assets"); + void mmShowErrorMessageInvalid( wxWindow *parent, const wxString &message ); void mmShowErrorMessage( wxWindow *parent, const wxString &message, const wxString &messageheader ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |