From: <vo...@us...> - 2012-06-07 10:47:16
|
Revision: 2536 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2536&view=rev Author: vomikan Date: 2012-06-07 10:47:06 +0000 (Thu, 07 Jun 2012) Log Message: ----------- fotn size moved to wxConfigBase Modified Paths: -------------- trunk/mmex/src/htmlbuilder.cpp trunk/mmex/src/htmlbuilder.h trunk/mmex/src/mmex.cpp trunk/mmex/src/optionsdialog.cpp trunk/mmex/src/util.cpp trunk/mmex/src/util.h Modified: trunk/mmex/src/htmlbuilder.cpp =================================================================== --- trunk/mmex/src/htmlbuilder.cpp 2012-06-07 07:41:50 UTC (rev 2535) +++ trunk/mmex/src/htmlbuilder.cpp 2012-06-07 10:47:06 UTC (rev 2536) @@ -25,7 +25,7 @@ color0 = ("bgcolor=\"") + mmColors::listAlternativeColor0.GetAsString(wxC2S_HTML_SYNTAX) + wxT ("\""); color1 = ("bgcolor=\"") + mmColors::listAlternativeColor1.GetAsString(wxC2S_HTML_SYNTAX) + wxT ("\""); // init font size from config - fontSize = wxT ("\"") + mmIniOptions::instance().fontSize_ + wxT ("\""); + font_size_ = mmIniOptions::instance().font_size_; } void mmHTMLBuilder::init() @@ -36,7 +36,7 @@ html += _("Report"); html += ("</title>\n</head><body bgcolor=\"") + mmColors::listBackColor.GetAsString(wxC2S_HTML_SYNTAX); html += ("\" text=\"#000000\" link=\"#0000cc\" vlink=\"#551a8b\" alink=\"#ff0000\">"); - html += wxString::Format(("<font size=%s>\n"), fontSize.c_str()); + html += wxString::Format(("<font size=\"%ld\">\n"), font_size_); //if I need more space on the top of home page and reports I will delete user name from settings if (mmIniOptions::instance().userNameString_ != wxT ("")) @@ -67,25 +67,21 @@ void mmHTMLBuilder::addHeader(int level, const wxString& header) { - long font_size; - if(!mmIniOptions::instance().fontSize_.ToLong(&font_size)) { font_size = 3; } - font_size = level + font_size; - if (font_size>7) font_size=7; - html += wxString::Format(("<font size=\"%ld\"><b>%s</b></font><br>\n"), font_size, header.c_str()); + long header_font_size = (long)level + font_size_; + if (header_font_size > 7) header_font_size = 7; + html += wxString::Format(("<font size=\"%ld\"><b>%s</b></font><br>\n"), header_font_size, header.c_str()); } void mmHTMLBuilder::addHeaderItalic(int level, const wxString& header) { - long font_size; - if(!mmIniOptions::instance().fontSize_.ToLong(&font_size)) { font_size = 3; } - font_size = level + font_size; - if (font_size>7) font_size=7; - html += wxString::Format(("<font size=\"%ld\"><i>%s</i></font><br>\n"), font_size, header.c_str()); + long header_font_size = (long)level + font_size_; + if (header_font_size > 7) header_font_size = 7; + html += wxString::Format(("<font size=\"%ld\"><i>%s</i></font><br>\n"), header_font_size, header.c_str()); } void mmHTMLBuilder::addParaText(const wxString& text) { - html += wxString::Format(("<p><font size=%s>%s</font></p>\n"), fontSize.c_str(), text.c_str()); + html += wxString::Format(("<p><font size=\"%ld\">%s</font></p>\n"), font_size_, text.c_str()); } void mmHTMLBuilder::addLineBreak() Modified: trunk/mmex/src/htmlbuilder.h =================================================================== --- trunk/mmex/src/htmlbuilder.h 2012-06-07 07:41:50 UTC (rev 2535) +++ trunk/mmex/src/htmlbuilder.h 2012-06-07 10:47:06 UTC (rev 2536) @@ -110,7 +110,7 @@ bool bgswitch; wxString color0; wxString color1; - wxString fontSize; + long font_size_; }; #endif Modified: trunk/mmex/src/mmex.cpp =================================================================== --- trunk/mmex/src/mmex.cpp 2012-06-07 07:41:50 UTC (rev 2535) +++ trunk/mmex/src/mmex.cpp 2012-06-07 10:47:06 UTC (rev 2536) @@ -243,6 +243,11 @@ { app.SetAppName(mmex::GetAppName()); + wxFileConfig *config = new wxFileConfig("", "", + mmex::GetSharedDir().GetPathWithSep()+ mmex::GetAppName() + ".conf", + "", wxCONFIG_USE_LOCAL_FILE|wxCONFIG_USE_SUBDIR ); + wxConfigBase::Set(config); + /* Setting Locale causes unexpected problems, so default to English Locale */ app.getLocale().Init(wxLANGUAGE_ENGLISH); @@ -261,11 +266,6 @@ /* Load MMEX Custom Settings */ mmIniOptions::instance().loadOptions(&inidb); - wxFileConfig *config = new wxFileConfig("", "", - mmex::GetSharedDir().GetPathWithSep()+ mmex::GetAppName() + ".conf", - "", wxCONFIG_USE_LOCAL_FILE|wxCONFIG_USE_SUBDIR ); - wxConfigBase::Set(config); - /* Load Colors from Database */ mmLoadColorsFromDatabase(); Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2012-06-07 07:41:50 UTC (rev 2535) +++ trunk/mmex/src/optionsdialog.cpp 2012-06-07 10:47:06 UTC (rev 2536) @@ -391,19 +391,18 @@ wxArrayString itemChoiceHTMLFontSize; - itemChoiceHTMLFontSize.Add(("XSmall")); - itemChoiceHTMLFontSize.Add(("Small")); - itemChoiceHTMLFontSize.Add(("Normal")); - itemChoiceHTMLFontSize.Add(("Large")); - itemChoiceHTMLFontSize.Add(("XLarge")); - itemChoiceHTMLFontSize.Add(("XXLarge")); - itemChoiceHTMLFontSize.Add(("Huge")); + itemChoiceHTMLFontSize.Add("XSmall"); + itemChoiceHTMLFontSize.Add("Small"); + itemChoiceHTMLFontSize.Add("Normal"); + itemChoiceHTMLFontSize.Add("Large"); + itemChoiceHTMLFontSize.Add("XLarge"); + itemChoiceHTMLFontSize.Add("XXLarge"); + itemChoiceHTMLFontSize.Add("Huge"); choiceFontSize_ = new wxChoice(viewsPanel, ID_DIALOG_OPTIONS_FONT_SIZE, wxDefaultPosition, wxSize(85, -1), itemChoiceHTMLFontSize); - int vFontSize = -1 + wxAtoi(mmDBWrapper::getINISettingValue(inidb_, ("HTMLFONTSIZE"), ("3"))); - choiceFontSize_->SetSelection(vFontSize); + choiceFontSize_->SetSelection((int)config->ReadLong("HTMLFONTSIZE", 3) -1); choiceFontSize_->SetToolTip(_("Specify which font size is used on the report tables")); fontSizeOptionStaticBoxSizer->Add(choiceFontSize_, 1, wxGROW|wxALL, 5); @@ -1044,10 +1043,10 @@ { SaveViewAccountOptions(); SaveViewTransactionOptions(); + wxConfigBase *config = wxConfigBase::Get(); - int size = choiceFontSize_->GetCurrentSelection() + 1; - mmIniOptions::instance().fontSize_ = wxString::Format(("%d"), size); - mmDBWrapper::setINISettingValue(inidb_, ("HTMLFONTSIZE"), mmIniOptions::instance().fontSize_); + mmIniOptions::instance().font_size_ = (long)choiceFontSize_->GetCurrentSelection() + 1; + config->Write("HTMLFONTSIZE", mmIniOptions::instance().font_size_); wxCheckBox* itemCheckBox = (wxCheckBox*)FindWindow(ID_DIALOG_OPTIONS_EXPAND_BANK_TREE); mmIniOptions::instance().expandBankTree_ = itemCheckBox->GetValue(); Modified: trunk/mmex/src/util.cpp =================================================================== --- trunk/mmex/src/util.cpp 2012-06-07 07:41:50 UTC (rev 2535) +++ trunk/mmex/src/util.cpp 2012-06-07 10:47:06 UTC (rev 2536) @@ -232,7 +232,7 @@ , enableReportIssues_ (true) , enableBeNotifiedForNewReleases_(true) , enableVisitWebsite_(true) - , fontSize_(("3")) + , font_size_(3) , enableCustomAboutDialog_(false) , disableCategoryModify_(false) , enableCustomTemplateDB_(false) @@ -303,7 +303,7 @@ if (mmDBWrapper::getINISettingValue(db, ("ENABLEBUDGET"), ("TRUE")) != ("TRUE")) enableBudget_ = false; if (mmDBWrapper::getINISettingValue(db, ("ENABLEGRAPHS"), ("TRUE")) != ("TRUE")) enableGraphs_ = false; - fontSize_ = mmDBWrapper::getINISettingValue(db, ("HTMLFONTSIZE"), ("3")); + font_size_ = config->ReadLong("HTMLFONTSIZE", 3); if (mmDBWrapper::getINISettingValue(db, ("EXPAND_BANK_HOME"), ("TRUE")) != ("TRUE")) expandBankHome_ = false; if (mmDBWrapper::getINISettingValue(db, ("EXPAND_TERM_HOME"), ("FALSE")) != ("FALSE")) expandTermHome_ = true; Modified: trunk/mmex/src/util.h =================================================================== --- trunk/mmex/src/util.h 2012-06-07 07:41:50 UTC (rev 2535) +++ trunk/mmex/src/util.h 2012-06-07 10:47:06 UTC (rev 2536) @@ -183,7 +183,7 @@ bool enableBeNotifiedForNewReleases_; bool enableVisitWebsite_; wxString logoName_; - wxString fontSize_; + long font_size_; bool enableCustomAboutDialog_; wxString aboutCompanyName_; bool disableCategoryModify_; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |