From: <vo...@us...> - 2011-11-16 10:22:59
|
Revision: 1512 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1512&view=rev Author: vomikan Date: 2011-11-16 10:22:49 +0000 (Wed, 16 Nov 2011) Log Message: ----------- OK button added and validator for first financial start date Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2011-11-16 01:48:50 UTC (rev 1511) +++ trunk/mmex/src/optionsdialog.cpp 2011-11-16 10:22:49 UTC (rev 1512) @@ -135,8 +135,10 @@ wxTextCtrl* fysDay = (wxTextCtrl*)FindWindow(ID_DIALOG_OPTIONS_FINANCIAL_YEAR_START_DAY); wxString fysDayVal = fysDay->GetValue(); + if (wxAtoi(fysDayVal)<31){ mmDBWrapper::setInfoSettingValue(db_, wxT("FINANCIAL_YEAR_START_DAY"), fysDayVal); mmOptions::financialYearStartDayString_ = fysDayVal; + } } mmOptionsDialog::mmOptionsDialog( mmCoreDB* core, wxSQLite3Database* inidb, @@ -434,7 +436,7 @@ wxString selection = mmDBWrapper::getInfoSettingValue(db_, wxT("DATEFORMAT"), mmex::DEFDATEFORMAT); choiceDateFormat_ = new wxComboBox( itemPanelGeneral, ID_DIALOG_OPTIONS_DATE_FORMAT, wxT(""), wxDefaultPosition, - wxSize(120, -1), TOTAL_DATEFORMAT, itemChoice7Strings, 0 ); + wxSize(140, -1), TOTAL_DATEFORMAT, itemChoice7Strings, 0 ); itemFlexBoxSizer99->Add(choiceDateFormat_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); choiceDateFormat_->SetToolTip(_("Specify the date format for display")); choiceDateFormat_->SetValue(FormatDate2DisplayDate(selection)); @@ -760,12 +762,21 @@ itemBoxSizerMisc->Add(itemStaticBoxSizerFinancialYear, 0, wxGROW|wxALL, 5); itemStaticBoxSizerFinancialYear->Add(transflexGridSizerMisc); + //Validator + wxTextValidator intValidator(wxFILTER_INCLUDE_CHAR_LIST); + wxArrayString list; + wxString valid_chars(wxT("0123456789")); + size_t len = valid_chars.Length(); + for (size_t i=0; i<len; i++) + list.Add(wxString(valid_chars.GetChar(i))); + intValidator.SetIncludes(list); + wxStaticText* itemStaticTextFYSDay = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Start Day"), wxDefaultPosition, wxDefaultSize, 0 ); transflexGridSizerMisc->Add(itemStaticTextFYSDay, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); wxString financialPeriodStartDay = mmDBWrapper::getInfoSettingValue(db_, wxT("FINANCIAL_YEAR_START_DAY"), wxT("1")); wxTextCtrl* textFPSDay = new wxTextCtrl( itemPanelMisc, ID_DIALOG_OPTIONS_FINANCIAL_YEAR_START_DAY, - financialPeriodStartDay, wxDefaultPosition, wxDefaultSize, 0 ); + financialPeriodStartDay, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT, intValidator ); textFPSDay->SetToolTip(_("Specify Day for start of financial year")); transflexGridSizerMisc->Add(textFPSDay, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); @@ -909,9 +920,11 @@ } itemBoxSizerMisc->Add(itemCheckBoxOnlineCurrencyUpd, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemCheckBoxOnlineCurrencyUpd->SetToolTip(_("Enable or disable get data from European Central Bank to update currency rate")); + + //a bit more space needed for proper alignment + itemBoxSizerMisc->AddSpacer(40); - //---------------------------------------------- - + //---------------------------------------------- newBook->SetImageList(m_imageList); newBook->InsertPage(0, itemPanelGeneral, _("General"), true, 2); @@ -924,6 +937,20 @@ // resize dialog window Fit(); + + /********************************************************************************************** + Button Panel with OK Button + ***********************************************************************************************/ + wxPanel* itemPanel25 = new wxPanel( itemDialog1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); + itemBoxSizer2->Add(itemPanel25, 0, wxALIGN_RIGHT|wxBOTTOM, 5); + + wxStdDialogButtonSizer* itemStdDialogButtonSizer1 = new wxStdDialogButtonSizer; + itemPanel25->SetSizer(itemStdDialogButtonSizer1); + wxButton* itemButton27 = new wxButton( itemPanel25, wxID_OK, _("&OK")); + itemStdDialogButtonSizer1->Add(itemButton27); + + itemStdDialogButtonSizer1->Realize(); + } void mmOptionsDialog::OnCurrency(wxCommandEvent& /*event*/) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |