From: <gua...@us...> - 2013-09-19 13:22:45
|
Revision: 4514 http://sourceforge.net/p/moneymanagerex/code/4514 Author: guanlisheng Date: 2013-09-19 13:22:38 +0000 (Thu, 19 Sep 2013) Log Message: ----------- cleanup Modified Paths: -------------- trunk/src/util.cpp Modified: trunk/src/util.cpp =================================================================== --- trunk/src/util.cpp 2013-09-19 05:34:03 UTC (rev 4513) +++ trunk/src/util.cpp 2013-09-19 13:22:38 UTC (rev 4514) @@ -98,7 +98,6 @@ const wxString langPath = mmex::getPathShared(mmex::LANG_DIR); wxLocale &locale = wxGetApp().getLocale(); - bool verbose = forced_show_dlg; if (wxDir::Exists(langPath)) { @@ -106,7 +105,7 @@ } else { - if (verbose) + if (forced_show_dlg) { //TODO fix string for proper translation wxString s = "Directory of language files does not exist:\n\""; @@ -128,7 +127,7 @@ } } - lang = selectLanguageDlg(parent, langPath, verbose); + lang = selectLanguageDlg(parent, langPath, forced_show_dlg); if (save_setting && !lang.empty()) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sie...@us...> - 2013-11-03 05:42:28
|
Revision: 5084 http://sourceforge.net/p/moneymanagerex/code/5084 Author: siena123 Date: 2013-11-03 05:42:18 +0000 (Sun, 03 Nov 2013) Log Message: ----------- Feature-Request[181] - TODO Modified Paths: -------------- trunk/src/util.cpp Modified: trunk/src/util.cpp =================================================================== --- trunk/src/util.cpp 2013-11-03 05:28:04 UTC (rev 5083) +++ trunk/src/util.cpp 2013-11-03 05:42:18 UTC (rev 5084) @@ -342,6 +342,7 @@ int site_content(const wxString& sSite, wxString& sOutput) { + // TODO - use wxURL::SetProxy or wxURL::SetDefaultProxy wxURL url(sSite); int err_code = url.GetError(); if (err_code == wxURL_NOERR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-11-03 08:53:36
|
Revision: 5088 http://sourceforge.net/p/moneymanagerex/code/5088 Author: vomikan Date: 2013-11-03 08:53:33 +0000 (Sun, 03 Nov 2013) Log Message: ----------- simplification for mmParseDisplayStringToDate(wxDateTime& date, wxString sDate, wxString sDateMask) Modified Paths: -------------- trunk/src/util.cpp Modified: trunk/src/util.cpp =================================================================== --- trunk/src/util.cpp 2013-11-03 08:41:10 UTC (rev 5087) +++ trunk/src/util.cpp 2013-11-03 08:53:33 UTC (rev 5088) @@ -194,33 +194,15 @@ sDateMask = mmOptions::instance().dateFormat_; wxString s = "/"; - //For correct date parsing, adjust separator format to: %x/%x/%x - sDateMask.Replace("`", s); - sDateMask.Replace("' ", s); - sDateMask.Replace("/ ", s); - sDateMask.Replace("'", s); - sDateMask.Replace("-", s); - sDateMask.Replace(".", s); - sDateMask.Replace(",", s); - sDateMask.Replace(" ", s); + //For correct date parsing, adjust separator format to: %x/%x/% + sDateMask.Replace("' ", "'"); + sDate.Replace("' ", "'"); + for (const auto& c : "`'/-., ") + { + sDateMask.Replace(c, s); + sDate.Replace(c, s); + } - sDate.Replace("`", s); - sDate.Replace("' ", s); - sDate.Replace("/ ", s); - sDate.Replace("'", s); - sDate.Replace("-", s); - sDate.Replace(".", s); - sDate.Replace(",", s); - sDate.Replace(" ", s); - - //Bad idea to change date mask here. - //some dates may be wrong parsed, for example: - // 1/1/2001 & 01/01/01 - /*if (sDate.Len()<9) - sDateMask.Replace("%Y", "%y"); - else - sDateMask.Replace("%y", "%Y");*/ - wxStringTokenizer token(sDate, s); double a,b,c; wxString t = token.GetNextToken().Trim(); @@ -342,7 +324,6 @@ int site_content(const wxString& sSite, wxString& sOutput) { - // TODO - use wxURL::SetProxy or wxURL::SetDefaultProxy wxURL url(sSite); int err_code = url.GetError(); if (err_code == wxURL_NOERR) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sie...@us...> - 2013-11-11 00:09:00
|
Revision: 5183 http://sourceforge.net/p/moneymanagerex/code/5183 Author: siena123 Date: 2013-11-11 00:08:57 +0000 (Mon, 11 Nov 2013) Log Message: ----------- cleanup - TODO Modified Paths: -------------- trunk/src/util.cpp Modified: trunk/src/util.cpp =================================================================== --- trunk/src/util.cpp 2013-11-11 00:02:05 UTC (rev 5182) +++ trunk/src/util.cpp 2013-11-11 00:08:57 UTC (rev 5183) @@ -108,10 +108,9 @@ { if (forced_show_dlg) { - //TODO fix string for proper translation - wxString s = "Directory of language files does not exist:\n\""; + wxString s = wxTRANSLATE("Directory of language files does not exist:\n\""); s << langPath << '\"'; - wxMessageDialog dlg(parent, s, "Error", wxOK|wxICON_ERROR); + wxMessageDialog dlg(parent, wxGetTranslation(s), "Error", wxOK | wxICON_ERROR); dlg.ShowModal(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-11-16 09:22:53
|
Revision: 5245 http://sourceforge.net/p/moneymanagerex/code/5245 Author: vomikan Date: 2013-11-16 09:22:49 +0000 (Sat, 16 Nov 2013) Log Message: ----------- string for transalation fix Modified Paths: -------------- trunk/src/util.cpp Modified: trunk/src/util.cpp =================================================================== --- trunk/src/util.cpp 2013-11-16 09:04:25 UTC (rev 5244) +++ trunk/src/util.cpp 2013-11-16 09:22:49 UTC (rev 5245) @@ -108,9 +108,9 @@ { if (forced_show_dlg) { - wxString s = wxTRANSLATE("Directory of language files does not exist:\n\""); - s << langPath << '\"'; - wxMessageDialog dlg(parent, wxGetTranslation(s), "Error", wxOK | wxICON_ERROR); + wxMessageDialog dlg(parent + , wxString::Format(_("Directory of language files does not exist:\n%s"), langPath) + , _("Error"), wxOK | wxICON_ERROR); dlg.ShowModal(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-11-16 10:07:36
|
Revision: 5247 http://sourceforge.net/p/moneymanagerex/code/5247 Author: vomikan Date: 2013-11-16 10:07:33 +0000 (Sat, 16 Nov 2013) Log Message: ----------- code ordering Modified Paths: -------------- trunk/src/util.cpp Modified: trunk/src/util.cpp =================================================================== --- trunk/src/util.cpp 2013-11-16 09:23:15 UTC (rev 5246) +++ trunk/src/util.cpp 2013-11-16 10:07:33 UTC (rev 5247) @@ -76,19 +76,6 @@ fileName << "." << ext; } -// --------------------------------------------------------------------------- -//void mmPlayTransactionSound(wxSQLite3Database* db_) -//{ -// wxString useSound = mmDBWrapper::getINISettingValue(db_, INIDB_USE_TRANSACTION_SOUND, "TRUE"); -// -// if (useSound == "TRUE") -// { -// wxSound registerSound(mmex::getPathResource(mmex::TRANS_SOUND)); -// if (registerSound.IsOk()) -// registerSound.Play(wxSOUND_ASYNC); -// } -//} - /* locale.AddCatalog(lang) calls wxLogWarning and returns true for corrupted .mo file, so I should use locale.IsLoaded(lang) also. @@ -140,22 +127,6 @@ return lang; } -wxString mmGetNiceDateSimpleString(const wxDateTime &dt) -{ - wxString dateFmt = mmOptions::instance().dateFormat_; - dateFmt.Replace("%Y%m%d", "%Y %m %d"); - dateFmt.Replace(".", " "); - dateFmt.Replace(",", " "); - dateFmt.Replace("/", " "); - dateFmt.Replace("-", " "); - dateFmt.Replace("%d", wxString::Format("%d", dt.GetDay())); - dateFmt.Replace("%Y", wxString::Format("%d", dt.GetYear())); - dateFmt.Replace("%y", wxString::Format("%d", dt.GetYear()).Mid(2,2)); - dateFmt.Replace("%m", wxGetTranslation(wxDateTime::GetEnglishMonthName(dt.GetMonth()))); - - return dateFmt; -} - void mmShowErrorMessage(wxWindow *parent , const wxString &message, const wxString &messageheader) { @@ -182,58 +153,6 @@ return label; } -wxString mmGetDateForDisplay(const wxDateTime &dt) -{ - return dt.Format(mmOptions::instance().dateFormat_); -} - -bool mmParseDisplayStringToDate(wxDateTime& date, wxString sDate, wxString sDateMask) -{ - if (sDateMask.IsEmpty()) - sDateMask = mmOptions::instance().dateFormat_; - wxString s = "/"; - - //For correct date parsing, adjust separator format to: %x/%x/% - sDateMask.Replace("' ", "'"); - sDate.Replace("' ", "'"); - for (const auto& c : "`'/-., ") - { - sDateMask.Replace(c, s); - sDate.Replace(c, s); - } - - wxStringTokenizer token(sDate, s); - double a,b,c; - wxString t = token.GetNextToken().Trim(); - t.ToDouble(&a); - t = token.GetNextToken().Trim(); - t.ToDouble(&b); - t = token.GetNextToken().Trim(); - t.ToDouble(&c); - - bool bResult = true; - - if (((a>999) || (b>999) || (c>999)) && (sDateMask.Contains("%y"))) - return false; - if ((a<100) && (b<100) && (c<100) && (sDateMask.Contains("%Y"))) - return false; - - sDate = wxString()<<a<<s<<b<<s<<c; - if (!date.ParseFormat(sDate, sDateMask, wxDateTime::Now())) - bResult = false; - date = date.GetDateOnly(); - return bResult; -} - -wxDateTime mmGetStorageStringAsDate(const wxString& str) -{ - wxDateTime dt = wxDateTime::Now(); - if (!str.IsEmpty()) dt.ParseDate(str); - if (!dt.IsValid()) dt = wxDateTime::Now(); - if (dt.GetYear()<100) dt.Add(wxDateSpan::Years(2000)); - return dt; -} - void mmLoadColorsFromDatabase() { mmColors::listAlternativeColor0 = Model_Setting::instance().GetColourSetting("LISTALT0", wxColour(225,237,251)); @@ -278,36 +197,7 @@ } //*--------------------------------------------------------------------------*// -std::map<wxString,wxString> date_formats_map() -{ - std::map<wxString, wxString> date_formats; - date_formats["%d/%m/%y"]="DD/MM/YY"; - date_formats["%d/%m/%Y"]="DD/MM/YYYY"; - date_formats["%d-%m-%y"]="DD-MM-YY"; - date_formats["%d-%m-%Y"]="DD-MM-YYYY"; - date_formats["%d.%m.%y"]="DD.MM.YY"; - date_formats["%d.%m.%Y"]="DD.MM.YYYY"; - date_formats["%d,%m,%y"]="DD,MM,YY"; - date_formats["%d/%m'%Y"]="DD/MM'YYYY"; - date_formats["%d/%m %Y"]="DD/MM YYYY"; - date_formats["%m/%d/%y"]="MM/DD/YY"; - date_formats["%m/%d/%Y"]="MM/DD/YYYY"; - date_formats["%m-%d-%y"]="MM-DD-YY"; - date_formats["%m-%d-%Y"]="MM-DD-YYYY"; - date_formats["%m/%d'%y"]="MM/DD'YY"; - date_formats["%m/%d'%Y"]="MM/DD'YYYY"; - date_formats["%y/%m/%d"]="YY/MM/DD"; - date_formats["%y-%m-%d"]="YY-MM-DD"; - date_formats["%Y/%m/%d"]="YYYY/MM/DD"; - date_formats["%Y-%m-%d"]="YYYY-MM-DD"; - date_formats["%Y.%m.%d"]="YYYY.MM.DD"; - date_formats["%Y%m%d"]="YYYYMMDD"; - return date_formats; -} - -//*--------------------------------------------------------------------------*// - int site_content(const wxString& sSite, wxString& sOutput) { wxString proxyName = Model_Setting::instance().GetStringSetting("PROXYIP", ""); @@ -397,6 +287,76 @@ return db; } +//* Date Functions----------------------------------------------------------*// + +wxString mmGetNiceDateSimpleString(const wxDateTime &dt) +{ + wxString dateFmt = mmOptions::instance().dateFormat_; + dateFmt.Replace("%Y%m%d", "%Y %m %d"); + dateFmt.Replace(".", " "); + dateFmt.Replace(",", " "); + dateFmt.Replace("/", " "); + dateFmt.Replace("-", " "); + dateFmt.Replace("%d", wxString::Format("%d", dt.GetDay())); + dateFmt.Replace("%Y", wxString::Format("%d", dt.GetYear())); + dateFmt.Replace("%y", wxString::Format("%d", dt.GetYear()).Mid(2,2)); + dateFmt.Replace("%m", wxGetTranslation(wxDateTime::GetEnglishMonthName(dt.GetMonth()))); + + return dateFmt; +} + +wxString mmGetDateForDisplay(const wxDateTime &dt) +{ + return dt.Format(mmOptions::instance().dateFormat_); +} + +bool mmParseDisplayStringToDate(wxDateTime& date, wxString sDate, wxString sDateMask) +{ + if (sDateMask.IsEmpty()) + sDateMask = mmOptions::instance().dateFormat_; + wxString s = "/"; + + //For correct date parsing, adjust separator format to: %x/%x/% + sDateMask.Replace("' ", "'"); + sDate.Replace("' ", "'"); + for (const auto& c : "`'/-., ") + { + sDateMask.Replace(c, s); + sDate.Replace(c, s); + } + + wxStringTokenizer token(sDate, s); + double a,b,c; + wxString t = token.GetNextToken().Trim(); + t.ToDouble(&a); + t = token.GetNextToken().Trim(); + t.ToDouble(&b); + t = token.GetNextToken().Trim(); + t.ToDouble(&c); + + bool bResult = true; + + if (((a>999) || (b>999) || (c>999)) && (sDateMask.Contains("%y"))) + return false; + if ((a<100) && (b<100) && (c<100) && (sDateMask.Contains("%Y"))) + return false; + + sDate = wxString()<<a<<s<<b<<s<<c; + if (!date.ParseFormat(sDate, sDateMask, wxDateTime::Now())) + bResult = false; + date = date.GetDateOnly(); + return bResult; +} + +wxDateTime mmGetStorageStringAsDate(const wxString& str) +{ + wxDateTime dt = wxDateTime::Now(); + if (!str.IsEmpty()) dt.ParseDate(str); + if (!dt.IsValid()) dt = wxDateTime::Now(); + if (dt.GetYear()<100) dt.Add(wxDateSpan::Years(2000)); + return dt; +} + wxDateTime getUserDefinedFinancialYear(bool prevDayRequired) { long monthNum; @@ -429,3 +389,31 @@ financialYear.Subtract(wxDateSpan::Day()); return financialYear; } + +std::map<wxString,wxString> date_formats_map() +{ + std::map<wxString, wxString> date_formats; + date_formats["%d/%m/%y"]="DD/MM/YY"; + date_formats["%d/%m/%Y"]="DD/MM/YYYY"; + date_formats["%d-%m-%y"]="DD-MM-YY"; + date_formats["%d-%m-%Y"]="DD-MM-YYYY"; + date_formats["%d.%m.%y"]="DD.MM.YY"; + date_formats["%d.%m.%Y"]="DD.MM.YYYY"; + date_formats["%d,%m,%y"]="DD,MM,YY"; + date_formats["%d/%m'%Y"]="DD/MM'YYYY"; + date_formats["%d/%m %Y"]="DD/MM YYYY"; + date_formats["%m/%d/%y"]="MM/DD/YY"; + date_formats["%m/%d/%Y"]="MM/DD/YYYY"; + date_formats["%m-%d-%y"]="MM-DD-YY"; + date_formats["%m-%d-%Y"]="MM-DD-YYYY"; + date_formats["%m/%d'%y"]="MM/DD'YY"; + date_formats["%m/%d'%Y"]="MM/DD'YYYY"; + date_formats["%y/%m/%d"]="YY/MM/DD"; + date_formats["%y-%m-%d"]="YY-MM-DD"; + date_formats["%Y/%m/%d"]="YYYY/MM/DD"; + date_formats["%Y-%m-%d"]="YYYY-MM-DD"; + date_formats["%Y.%m.%d"]="YYYY.MM.DD"; + date_formats["%Y%m%d"]="YYYYMMDD"; + + return date_formats; +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-11-17 07:37:03
|
Revision: 5258 http://sourceforge.net/p/moneymanagerex/code/5258 Author: vomikan Date: 2013-11-17 07:36:58 +0000 (Sun, 17 Nov 2013) Log Message: ----------- Today not Now for dates Modified Paths: -------------- trunk/src/util.cpp Modified: trunk/src/util.cpp =================================================================== --- trunk/src/util.cpp 2013-11-17 03:41:03 UTC (rev 5257) +++ trunk/src/util.cpp 2013-11-17 07:36:58 UTC (rev 5258) @@ -328,9 +328,9 @@ wxDateTime mmGetStorageStringAsDate(const wxString& str) { - wxDateTime dt = wxDateTime::Now(); + wxDateTime dt = wxDateTime::Today(); if (!str.IsEmpty()) dt.ParseDate(str); - if (!dt.IsValid()) dt = wxDateTime::Now(); + if (!dt.IsValid()) dt = wxDateTime::Today(); if (dt.GetYear()<100) dt.Add(wxDateSpan::Years(2000)); return dt; } @@ -343,7 +343,7 @@ if (monthNum > 0) //Test required for compatability with previous version monthNum --; - wxDateTime today = wxDateTime::Now(); + wxDateTime today = wxDateTime::Today(); int year = today.GetYear(); if (today.GetMonth() < monthNum) year -- ; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-11-28 11:34:03
|
Revision: 5386 http://sourceforge.net/p/moneymanagerex/code/5386 Author: vomikan Date: 2013-11-28 11:34:01 +0000 (Thu, 28 Nov 2013) Log Message: ----------- fix Modified Paths: -------------- trunk/src/util.cpp Modified: trunk/src/util.cpp =================================================================== --- trunk/src/util.cpp 2013-11-28 02:52:55 UTC (rev 5385) +++ trunk/src/util.cpp 2013-11-28 11:34:01 UTC (rev 5386) @@ -318,6 +318,7 @@ wxString regex = date_formats_regex()[sDateMask]; wxRegEx pattern(regex); + //wxLogDebug("%s %s %i %s", sDate, sDateMask, pattern.Matches(sDate), regex); if (pattern.Matches(sDate)) { date.ParseFormat(sDate, sDateMask, wxDateTime::Today()); @@ -403,29 +404,29 @@ const wxString dd = "(((0[1-9])|([1-2][0-9])|(3[0-1]))|([1-9]))"; const wxString mm = "(((0[1-9])|(1[0-2]))|([1-9]))"; const wxString yy = "([0-9]{2})"; - const wxString yyyy = "(([0-9]{2})|(((19)|([2]([0]{1})))([0-9]{2})))"; + const wxString yyyy = "(((19)|([2]([0]{1})))([0-9]{2}))"; std::map<wxString, wxString> date_regex; - date_regex["%d/%m/%y"] = wxString::Format("^%s\x2F%s\x2F%s$)", dd, mm, yy); - date_regex["%d/%m/%Y"] = wxString::Format("(^%s\x2F%s\x2F%s$)", dd, mm, yyyy); - date_regex["%d-%m-%y"] = wxString::Format("^%s-%s-%s$)", dd, mm, yy); - date_regex["%d-%m-%Y"] = wxString::Format("^%s-%s-%s$)", dd, mm, yyyy); - date_regex["%d.%m.%y"] = wxString::Format("^%s\x2E%s\x2E%s$)", dd, mm, yy); - date_regex["%d.%m.%Y"] = wxString::Format("^%s\x2E%s\x2E%s$)", dd, mm, yyyy); - date_regex["%d,%m,%y"] = wxString::Format("^%s,%s,%s$)", dd, mm, yyyy); - date_regex["%d/%m'%Y"] = wxString::Format("^%s\x2F%s'%s$)", dd, mm, yyyy); - date_regex["%d/%m %Y"] = wxString::Format("^%s\x2F%s %s$)", dd, mm, yyyy); - date_regex["%m/%d/%y"] = wxString::Format("^%s\x2F%s\x2F%s$)", mm, dd, yy); - date_regex["%m/%d/%Y"] = wxString::Format("^%s\x2F%s\x2F%s$)", mm, dd, yyyy); - date_regex["%m-%d-%y"] = wxString::Format("^%s-%s-%s$)", mm, dd, yy); - date_regex["%m-%d-%Y"] = wxString::Format("^%s-%s-%s$)", mm, dd, yyyy); - date_regex["%m/%d'%y"] = wxString::Format("^%s\x2F%s'%s$)", dd, mm, yy); - date_regex["%m/%d'%Y"] = wxString::Format("^%s\x2F%s-%s$)", mm, dd, yyyy); - date_regex["%y/%m/%d"] = wxString::Format("^%s\x2F%s\x2F%s$)", yy, mm, dd); - date_regex["%y-%m-%d"] = wxString::Format("^%s-%s-%s$)", dd, mm, yy); - date_regex["%Y/%m/%d"] = wxString::Format("^%s\x2F%s\x2F%s$)", yyyy, mm, dd); - date_regex["%Y-%m-%d"] = wxString::Format("^%s-%s-%s$)", yyyy, mm, dd); - date_regex["%Y.%m.%d"] = wxString::Format("^%s\x2E%s\x2E%s$)", yyyy, mm, dd); - date_regex["%Y %m %d"] = wxString::Format("^%s %s %s$)", yyyy, mm, dd); + date_regex["%d/%m/%y"] = wxString::Format("^%s/%s/%s$", dd, mm, yy); + date_regex["%d/%m/%Y"] = wxString::Format("^%s/%s/%s$", dd, mm, yyyy); + date_regex["%d-%m-%y"] = wxString::Format("^%s-%s-%s$", dd, mm, yy); + date_regex["%d-%m-%Y"] = wxString::Format("^%s-%s-%s$", dd, mm, yyyy); + date_regex["%d.%m.%y"] = wxString::Format("^%s\\x2E%s\\x2E%s$", dd, mm, yy); + date_regex["%d.%m.%Y"] = wxString::Format("^%s\\x2E%s\\x2E%s$", dd, mm, yyyy); + date_regex["%d,%m,%y"] = wxString::Format("^%s,%s,%s$", dd, mm, yyyy); + date_regex["%d/%m'%Y"] = wxString::Format("^%s/%s'%s$", dd, mm, yyyy); + date_regex["%d/%m %Y"] = wxString::Format("^%s/%s %s$", dd, mm, yyyy); + date_regex["%m/%d/%y"] = wxString::Format("^%s/%s/%s$", mm, dd, yy); + date_regex["%m/%d/%Y"] = wxString::Format("^%s/%s/%s$", mm, dd, yyyy); + date_regex["%m-%d-%y"] = wxString::Format("^%s-%s-%s$", mm, dd, yy); + date_regex["%m-%d-%Y"] = wxString::Format("^%s-%s-%s$", mm, dd, yyyy); + date_regex["%m/%d'%y"] = wxString::Format("^%s/%s'%s$", dd, mm, yy); + date_regex["%m/%d'%Y"] = wxString::Format("^%s/%s-%s$", mm, dd, yyyy); + date_regex["%y/%m/%d"] = wxString::Format("^%s/%s/%s$", yy, mm, dd); + date_regex["%y-%m-%d"] = wxString::Format("^%s-%s-%s$", dd, mm, yy); + date_regex["%Y/%m/%d"] = wxString::Format("^%s/%s/%s$", yyyy, mm, dd); + date_regex["%Y-%m-%d"] = wxString::Format("^%s-%s-%s$", yyyy, mm, dd); + date_regex["%Y.%m.%d"] = wxString::Format("^%s\\x2E%s\\x2E%s$", yyyy, mm, dd); + date_regex["%Y %m %d"] = wxString::Format("^%s %s %s$", yyyy, mm, dd); return date_regex; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2014-01-07 20:12:24
|
Revision: 5843 http://sourceforge.net/p/moneymanagerex/code/5843 Author: vomikan Date: 2014-01-07 20:12:22 +0000 (Tue, 07 Jan 2014) Log Message: ----------- cleanup Modified Paths: -------------- trunk/src/util.cpp Modified: trunk/src/util.cpp =================================================================== --- trunk/src/util.cpp 2014-01-07 20:10:45 UTC (rev 5842) +++ trunk/src/util.cpp 2014-01-07 20:12:22 UTC (rev 5843) @@ -20,7 +20,6 @@ #include "util.h" #include "mmex.h" -#include "import_export/univcsvdialog.h" #include "paths.h" #include "constants.h" #include "singleton.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2014-01-19 02:08:24
|
Revision: 5962 http://sourceforge.net/p/moneymanagerex/code/5962 Author: stef145g Date: 2014-01-19 02:08:20 +0000 (Sun, 19 Jan 2014) Log Message: ----------- Updated Info messages Modified Paths: -------------- trunk/src/util.cpp Modified: trunk/src/util.cpp =================================================================== --- trunk/src/util.cpp 2014-01-18 23:32:40 UTC (rev 5961) +++ trunk/src/util.cpp 2014-01-19 02:08:20 UTC (rev 5962) @@ -394,10 +394,10 @@ void mmMessageCategoryInvalid(wxButton *button) { - wxRichToolTip tip(_("Invalid Category Entered "), - _("No any categories selected for this transaction.") + wxRichToolTip tip(_("Invalid Category"), + _("Please use this button for category selection or") + "\n" - + _("Please, choose a category.") + + _("use the 'Split' checkbox for multiple categories.") + "\n"); tip.SetIcon(wxICON_WARNING); tip.ShowFor(button); @@ -406,13 +406,13 @@ void mmMessageAccountInvalid(wxComboBox *comboBox, bool transfer) { - const wxString errorHeader = _("Invalid Account "); - wxString errorMessage = _("Account not selected for this transaction."); - if (transfer) errorMessage = _("Specify which account the transfer is going to"); - + const wxString errorHeader = _("Invalid Account"); + wxString errorMessage = _("Please select the account for this transaction"); errorMessage += ( "\n" - + _("Please, choose an account.") + + _("using the dropdown button.") + "\n"); + if (transfer) errorMessage += _("The account specifies where the money is going."); + wxRichToolTip tip(errorHeader, errorMessage); tip.SetIcon(wxICON_WARNING); tip.ShowFor((wxWindow*) comboBox); @@ -420,10 +420,10 @@ void mmMessagePayeeInvalid(wxComboBox *comboBox) { - const wxString errorHeader = _("Invalid Payee "); - const wxString errorMessage = (_("Payee not selected for this transaction.") + const wxString errorHeader = _("Invalid Payee"); + const wxString errorMessage = (_("Please type in a new payee, or") + "\n" - + _("Please, choose a payee.") + + _("make a selection using the dropdown button.") + "\n"); wxRichToolTip tip(errorHeader, errorMessage); tip.SetIcon(wxICON_WARNING); This was sent by MMEX an easy to use, money management application. |
From: <vo...@us...> - 2014-01-19 10:37:35
|
Revision: 5966 http://sourceforge.net/p/moneymanagerex/code/5966 Author: vomikan Date: 2014-01-19 10:37:33 +0000 (Sun, 19 Jan 2014) Log Message: ----------- translation strings cleanup Modified Paths: -------------- trunk/src/util.cpp Modified: trunk/src/util.cpp =================================================================== --- trunk/src/util.cpp 2014-01-19 10:36:46 UTC (rev 5965) +++ trunk/src/util.cpp 2014-01-19 10:37:33 UTC (rev 5966) @@ -395,23 +395,26 @@ void mmMessageCategoryInvalid(wxButton *button) { wxRichToolTip tip(_("Invalid Category"), - _("Please use this button for category selection or") - + "\n" - + _("use the 'Split' checkbox for multiple categories.") + _("Please use this button for category selection\nor use the 'Split' checkbox for multiple categories.") + "\n"); tip.SetIcon(wxICON_WARNING); tip.ShowFor(button); - button->SetFocus(); } void mmMessageAccountInvalid(wxComboBox *comboBox, bool transfer) { const wxString errorHeader = _("Invalid Account"); - wxString errorMessage = _("Please select the account for this transaction"); - errorMessage += ( "\n" - + _("using the dropdown button.") - + "\n"); - if (transfer) errorMessage += _("The account specifies where the money is going."); + wxString errorMessage; + if (!transfer) + { + errorMessage = _("Please select the account for this transaction"); + } + else + { + errorMessage = _("Specify which account the transfer is going to"); + } + wxString errorTips = _("Type in account name or use the dropdown button"); + errorMessage = errorMessage + "\n\n" + errorTips + "\n"; wxRichToolTip tip(errorHeader, errorMessage); tip.SetIcon(wxICON_WARNING); @@ -421,9 +424,7 @@ void mmMessagePayeeInvalid(wxComboBox *comboBox) { const wxString errorHeader = _("Invalid Payee"); - const wxString errorMessage = (_("Please type in a new payee, or") - + "\n" - + _("make a selection using the dropdown button.") + const wxString errorMessage = (_("Please type in a new payee,\nor make a selection using the dropdown button.") + "\n"); wxRichToolTip tip(errorHeader, errorMessage); tip.SetIcon(wxICON_WARNING); This was sent by MMEX an easy to use, money management application. |