From: <oma...@us...> - 2009-11-09 20:44:55
|
Revision: 750 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=750&view=rev Author: omalleypat Date: 2009-11-09 20:44:47 +0000 (Mon, 09 Nov 2009) Log Message: ----------- Tooltip was set to wrong control Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2009-11-09 10:45:40 UTC (rev 749) +++ trunk/mmex/src/optionsdialog.cpp 2009-11-09 20:44:47 UTC (rev 750) @@ -732,7 +732,7 @@ } itemBoxSizerMisc->Add(itemCheckBoxOnlineCurrencyUpd, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - itemCheckBoxBackup->SetToolTip(_("Enable or disable get data from European Central Bank to update currency rate")); + itemCheckBoxOnlineCurrencyUpd->SetToolTip(_("Enable or disable get data from European Central Bank to update currency rate")); // ------------------------------------------- This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2011-06-08 14:14:09
|
Revision: 1314 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1314&view=rev Author: stef145g Date: 2011-06-08 14:14:00 +0000 (Wed, 08 Jun 2011) Log Message: ----------- Update Options layout for transaction dialog settings Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2011-06-08 14:10:19 UTC (rev 1313) +++ trunk/mmex/src/optionsdialog.cpp 2011-06-08 14:14:00 UTC (rev 1314) @@ -787,41 +787,40 @@ itemBoxSizerMisc->Add(itemStaticBoxSizerNewTransactionSettings, 0, wxGROW|wxALL, 5); // Default Payee - wxStaticText* itemStaticText52 = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Default Payee:")); - itemStaticBoxSizerNewTransactionSettings->Add(itemStaticText52, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - - wxString itemChoiceDefaultTransPayeeStrings[] = + wxStaticText* payeeStaticText = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Default Payee:")); +// itemStaticBoxSizerNewTransactionSettings->Add(payeeStaticText, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + + wxString itemChoiceDefaultTransPayeeStrings[] = { _("None"), _("Last Used"), }; wxChoice* itemChoiceDefaultTransPayee = new wxChoice( itemPanelMisc, ID_DIALOG_OPTIONS_DEFAULT_TRANSACTION_PAYEE, - wxDefaultPosition, wxSize(100, -1), 2, itemChoiceDefaultTransPayeeStrings, 0 ); + wxDefaultPosition, wxSize(90, -1), 2, itemChoiceDefaultTransPayeeStrings, 0 ); itemChoiceDefaultTransPayee->SetSelection(mmIniOptions::transPayeeSelectionNone_); - itemStaticBoxSizerNewTransactionSettings->Add(itemChoiceDefaultTransPayee, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); +// itemStaticBoxSizerNewTransactionSettings->Add(itemChoiceDefaultTransPayee, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); // Default Category - wxStaticText* itemStaticText53 = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Default Category:")); - itemStaticBoxSizerNewTransactionSettings->Add(itemStaticText53, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - - - wxString itemChoiceDefaultTransCategoryStrings[] = + wxStaticText* categoryStaticText = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Default Category:")); +// itemStaticBoxSizerNewTransactionSettings->Add(categoryStaticText, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + + wxString itemChoiceDefaultTransCategoryStrings[] = { _("None"), _("Last used for payee"), }; wxChoice* itemChoiceDefaultTransCategory = new wxChoice( itemPanelMisc, ID_DIALOG_OPTIONS_DEFAULT_TRANSACTION_CATEGORY, - wxDefaultPosition, wxSize(100, -1), 2, itemChoiceDefaultTransCategoryStrings, 0 ); + wxDefaultPosition, wxSize(120, -1), 2, itemChoiceDefaultTransCategoryStrings, 0 ); itemChoiceDefaultTransCategory->SetSelection(mmIniOptions::transCategorySelectionNone_); - itemStaticBoxSizerNewTransactionSettings->Add(itemChoiceDefaultTransCategory, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); +// itemStaticBoxSizerNewTransactionSettings->Add(itemChoiceDefaultTransCategory, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); // Default Status - wxStaticText* itemStaticText51 = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Default Status:")); - itemStaticBoxSizerNewTransactionSettings->Add(itemStaticText51, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - - wxString itemChoiceDefaultTransStatusStrings[] = + wxStaticText* statusStaticText = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Default Status:")); +// itemStaticBoxSizerNewTransactionSettings->Add(statusStaticText, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + + wxString itemChoiceDefaultTransStatusStrings[] = { _("None"), _("Reconciled"), @@ -830,11 +829,20 @@ _("Duplicate"), }; - wxChoice* itemChoiceDefaultTransStatus = new wxChoice( itemPanelMisc, - ID_DIALOG_OPTIONS_DEFAULT_TRANSACTION_STATUS, wxDefaultPosition, wxSize(100, -1), 5, itemChoiceDefaultTransStatusStrings, 0 ); + wxChoice* itemChoiceDefaultTransStatus = new wxChoice( itemPanelMisc, ID_DIALOG_OPTIONS_DEFAULT_TRANSACTION_STATUS, + wxDefaultPosition, wxSize(90, -1), 5, itemChoiceDefaultTransStatusStrings, 0 ); itemChoiceDefaultTransStatus->SetSelection(mmIniOptions::transStatusReconciled_); - itemStaticBoxSizerNewTransactionSettings->Add(itemChoiceDefaultTransStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); +// itemStaticBoxSizerNewTransactionSettings->Add(itemChoiceDefaultTransStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxFlexGridSizer* newTransflexGridSizer = new wxFlexGridSizer(2,3,0,0); + itemStaticBoxSizerNewTransactionSettings->Add(newTransflexGridSizer); + newTransflexGridSizer->Add(payeeStaticText,0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT, 5); + newTransflexGridSizer->Add(categoryStaticText,0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT, 5); + newTransflexGridSizer->Add(statusStaticText,0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT, 5); + newTransflexGridSizer->Add(itemChoiceDefaultTransPayee,0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + newTransflexGridSizer->Add(itemChoiceDefaultTransCategory,0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + newTransflexGridSizer->Add(itemChoiceDefaultTransStatus,0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + //---------------------------------------------- wxStaticBox* itemStaticBoxBackupSetting = new wxStaticBox(itemPanelMisc, wxID_ANY, _("Database Backup Settings")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2011-06-12 11:57:41
|
Revision: 1323 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1323&view=rev Author: stef145g Date: 2011-06-12 11:57:34 +0000 (Sun, 12 Jun 2011) Log Message: ----------- Fix layout to look good on Windows and Mac Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2011-06-11 04:23:19 UTC (rev 1322) +++ trunk/mmex/src/optionsdialog.cpp 2011-06-12 11:57:34 UTC (rev 1323) @@ -360,7 +360,7 @@ itemPanel3->SetSizer(itemBoxSizer4); wxListbook* newBook = new wxListbook( itemPanel3, ID_DIALOG_OPTIONS_LISTBOOK, - wxDefaultPosition, wxDefaultSize, wxLB_DEFAULT ); + wxDefaultPosition, wxDefaultSize, wxLB_LEFT ); // --------------------------------------------------------------------------------------------------- // General Panel @@ -787,8 +787,7 @@ itemBoxSizerMisc->Add(itemStaticBoxSizerNewTransactionSettings, 0, wxGROW|wxALL, 5); // Default Payee - wxStaticText* payeeStaticText = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Default Payee:")); -// itemStaticBoxSizerNewTransactionSettings->Add(payeeStaticText, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + wxStaticText* payeeStaticText = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Default Payee:"),wxDefaultPosition, wxSize(100, -1)); wxString itemChoiceDefaultTransPayeeStrings[] = { @@ -797,13 +796,11 @@ }; wxChoice* itemChoiceDefaultTransPayee = new wxChoice( itemPanelMisc, ID_DIALOG_OPTIONS_DEFAULT_TRANSACTION_PAYEE, - wxDefaultPosition, wxSize(90, -1), 2, itemChoiceDefaultTransPayeeStrings, 0 ); + wxDefaultPosition, wxDefaultSize, 2, itemChoiceDefaultTransPayeeStrings, 0 ); itemChoiceDefaultTransPayee->SetSelection(mmIniOptions::transPayeeSelectionNone_); -// itemStaticBoxSizerNewTransactionSettings->Add(itemChoiceDefaultTransPayee, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); // Default Category - wxStaticText* categoryStaticText = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Default Category:")); -// itemStaticBoxSizerNewTransactionSettings->Add(categoryStaticText, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + wxStaticText* categoryStaticText = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Default Category:"),wxDefaultPosition, wxSize(140, -1)); wxString itemChoiceDefaultTransCategoryStrings[] = { @@ -812,13 +809,11 @@ }; wxChoice* itemChoiceDefaultTransCategory = new wxChoice( itemPanelMisc, ID_DIALOG_OPTIONS_DEFAULT_TRANSACTION_CATEGORY, - wxDefaultPosition, wxSize(120, -1), 2, itemChoiceDefaultTransCategoryStrings, 0 ); + wxDefaultPosition, wxDefaultSize, 2, itemChoiceDefaultTransCategoryStrings); itemChoiceDefaultTransCategory->SetSelection(mmIniOptions::transCategorySelectionNone_); -// itemStaticBoxSizerNewTransactionSettings->Add(itemChoiceDefaultTransCategory, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); // Default Status - wxStaticText* statusStaticText = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Default Status:")); -// itemStaticBoxSizerNewTransactionSettings->Add(statusStaticText, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + wxStaticText* statusStaticText = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Default Status:"), wxDefaultPosition, wxSize(100, -1)); wxString itemChoiceDefaultTransStatusStrings[] = { @@ -830,9 +825,8 @@ }; wxChoice* itemChoiceDefaultTransStatus = new wxChoice( itemPanelMisc, ID_DIALOG_OPTIONS_DEFAULT_TRANSACTION_STATUS, - wxDefaultPosition, wxSize(90, -1), 5, itemChoiceDefaultTransStatusStrings, 0 ); + wxDefaultPosition, wxDefaultSize, 5, itemChoiceDefaultTransStatusStrings ); itemChoiceDefaultTransStatus->SetSelection(mmIniOptions::transStatusReconciled_); -// itemStaticBoxSizerNewTransactionSettings->Add(itemChoiceDefaultTransStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxFlexGridSizer* newTransflexGridSizer = new wxFlexGridSizer(2,3,0,0); itemStaticBoxSizerNewTransactionSettings->Add(newTransflexGridSizer); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2011-06-17 14:54:26
|
Revision: 1334 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1334&view=rev Author: stef145g Date: 2011-06-17 14:54:20 +0000 (Fri, 17 Jun 2011) Log Message: ----------- Widen user name field Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2011-06-17 12:25:50 UTC (rev 1333) +++ trunk/mmex/src/optionsdialog.cpp 2011-06-17 14:54:20 UTC (rev 1334) @@ -475,7 +475,7 @@ wxString userName = mmDBWrapper::getInfoSettingValue(db_, wxT("USERNAME"), wxT("")); wxTextCtrl* textUN = new wxTextCtrl( itemPanelGeneral, ID_DIALOG_OPTIONS_TEXTCTRL_USERNAME, - userName, wxDefaultPosition, wxDefaultSize, 0 ); + userName, wxDefaultPosition, wxSize(130,-1), 0 ); textUN->SetToolTip(_("Specify the User Name")); itemStaticBoxSizerUN->Add(textUN, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-09-13 17:33:39
|
Revision: 1452 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1452&view=rev Author: vomikan Date: 2011-09-13 17:10:24 +0000 (Tue, 13 Sep 2011) Log Message: ----------- minor changes Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2011-09-13 16:14:24 UTC (rev 1451) +++ trunk/mmex/src/optionsdialog.cpp 2011-09-13 17:10:24 UTC (rev 1452) @@ -405,7 +405,7 @@ wxStaticText* itemStaticText41 = new wxStaticText( itemPanelGeneral, wxID_STATIC, _("Date Format"), wxDefaultPosition, wxDefaultSize, 0 ); itemStaticBoxSizer9->Add(itemStaticText41, 0, - wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxGROW, 5); wxString itemChoice7Strings[TOTAL_DATEFORMAT] = { @@ -480,7 +480,7 @@ wxString userName = mmDBWrapper::getInfoSettingValue(db_, wxT("USERNAME"), wxT("")); wxTextCtrl* textUN = new wxTextCtrl( itemPanelGeneral, ID_DIALOG_OPTIONS_TEXTCTRL_USERNAME, - userName, wxDefaultPosition, wxSize(130,-1), 0 ); + userName, wxDefaultPosition, wxSize(500,-1), 0 ); textUN->SetToolTip(_("Specify the User Name")); itemStaticBoxSizerUN->Add(textUN, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); @@ -526,7 +526,7 @@ choiceVisible_ = new wxChoice( itemPanelViews, ID_DIALOG_OPTIONS_VIEW_ACCOUNTS, wxDefaultPosition, - wxSize(100, -1), 3, itemChoiceViewAccountStrings, 0 ); + wxDefaultSize, 3, itemChoiceViewAccountStrings, 0 ); itemStaticBoxSizer10->Add(choiceVisible_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxString vAccts = mmDBWrapper::getINISettingValue(inidb_, @@ -566,7 +566,7 @@ }; choiceTransVisible_ = new wxChoice( itemPanelViews, ID_DIALOG_OPTIONS_VIEW_TRANS, wxDefaultPosition, - wxSize(165, -1), sizeof(itemChoiceViewTransStrings)/sizeof(*itemChoiceViewTransStrings), itemChoiceViewTransStrings, 0 ); + wxDefaultSize, sizeof(itemChoiceViewTransStrings)/sizeof(*itemChoiceViewTransStrings), itemChoiceViewTransStrings, 0 ); itemStaticBoxSizerTransView->Add(choiceTransVisible_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxString vTrans = mmDBWrapper::getINISettingValue(inidb_, wxT("VIEWTRANSACTIONS"), wxT("View All Transactions")); @@ -792,7 +792,7 @@ itemBoxSizerMisc->Add(itemStaticBoxSizerNewTransactionSettings, 0, wxGROW|wxALL, 5); // Default Payee - wxStaticText* payeeStaticText = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Default Payee:"),wxDefaultPosition, wxSize(100, -1)); + wxStaticText* payeeStaticText = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Default Payee:"),wxDefaultPosition, wxDefaultSize); wxString itemChoiceDefaultTransPayeeStrings[] = { @@ -805,7 +805,7 @@ itemChoiceDefaultTransPayee->SetSelection(mmIniOptions::transPayeeSelectionNone_); // Default Category - wxStaticText* categoryStaticText = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Default Category:"),wxDefaultPosition, wxSize(140, -1)); + wxStaticText* categoryStaticText = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Default Category:"),wxDefaultPosition, wxDefaultSize); wxString itemChoiceDefaultTransCategoryStrings[] = { @@ -818,7 +818,7 @@ itemChoiceDefaultTransCategory->SetSelection(mmIniOptions::transCategorySelectionNone_); // Default Status - wxStaticText* statusStaticText = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Default Status:"), wxDefaultPosition, wxSize(100, -1)); + wxStaticText* statusStaticText = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Default Status:"), wxDefaultPosition, wxDefaultSize); wxString itemChoiceDefaultTransStatusStrings[] = { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2011-09-17 13:34:31
|
Revision: 1456 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1456&view=rev Author: stef145g Date: 2011-09-17 13:34:25 +0000 (Sat, 17 Sep 2011) Log Message: ----------- Fix dialog width Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2011-09-17 04:00:27 UTC (rev 1455) +++ trunk/mmex/src/optionsdialog.cpp 2011-09-17 13:34:25 UTC (rev 1456) @@ -480,9 +480,9 @@ wxString userName = mmDBWrapper::getInfoSettingValue(db_, wxT("USERNAME"), wxT("")); wxTextCtrl* textUN = new wxTextCtrl( itemPanelGeneral, ID_DIALOG_OPTIONS_TEXTCTRL_USERNAME, - userName, wxDefaultPosition, wxSize(500,-1), 0 ); - textUN->SetToolTip(_("Specify the User Name")); - itemStaticBoxSizerUN->Add(textUN, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + userName, wxDefaultPosition, wxSize(275,-1), 0 ); + textUN->SetToolTip(_("Specify the User Name, or a title for the database")); + itemStaticBoxSizerUN->Add(textUN, 0, wxALIGN_RIGHT|wxLEFT,15); // ------------------------------------------ wxStaticBox* itemStaticBoxSizer1881Static = new wxStaticBox(itemPanelGeneral, wxID_ANY, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-10-17 14:44:44
|
Revision: 1489 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1489&view=rev Author: vomikan Date: 2011-10-17 14:44:37 +0000 (Mon, 17 Oct 2011) Log Message: ----------- New style, vertical, more compact Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2011-10-16 12:09:52 UTC (rev 1488) +++ trunk/mmex/src/optionsdialog.cpp 2011-10-17 14:44:37 UTC (rev 1489) @@ -398,14 +398,14 @@ wxStaticBox* itemStaticBoxSizer9Static = new wxStaticBox(itemPanelGeneral, wxID_ANY, _("View Settings")); - wxStaticBoxSizer* itemStaticBoxSizer9 = new wxStaticBoxSizer(itemStaticBoxSizer9Static, - wxHORIZONTAL); - itemBoxSizer20->Add(itemStaticBoxSizer9, 0, wxALIGN_LEFT|wxGROW|wxALL, 5); - + wxStaticBoxSizer* itemStaticBoxSizer9 = new wxStaticBoxSizer(itemStaticBoxSizer9Static, wxVERTICAL); + wxFlexGridSizer* itemFlexBoxSizer99 = new wxFlexGridSizer(2,2,5,5); + itemBoxSizer20->Add(itemStaticBoxSizer9, 0, wxALIGN_LEFT|wxGROW|wxALL, 0); + itemStaticBoxSizer9->Add(itemFlexBoxSizer99); + wxStaticText* itemStaticText41 = new wxStaticText( itemPanelGeneral, wxID_STATIC, _("Date Format"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticBoxSizer9->Add(itemStaticText41, 0, - wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxGROW, 5); + itemFlexBoxSizer99->Add(itemStaticText41, 0, wxALIGN_CENTER|wxALL, 0); wxString itemChoice7Strings[TOTAL_DATEFORMAT] = { @@ -434,21 +434,18 @@ choiceDateFormat_ = new wxComboBox( itemPanelGeneral, ID_DIALOG_OPTIONS_DATE_FORMAT, wxT(""), wxDefaultPosition, wxSize(120, -1), TOTAL_DATEFORMAT, itemChoice7Strings, 0 ); - itemStaticBoxSizer9->Add(choiceDateFormat_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemFlexBoxSizer99->Add(choiceDateFormat_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); choiceDateFormat_->SetToolTip(_("Specify the date format for display")); choiceDateFormat_->SetValue(FormatDate2DisplayDate(selection)); - - wxButton* itemButtonDF = new wxButton( itemPanelGeneral, - ID_DIALOG_OPTIONS_BUTTON_DATEFORMAT, _("Set"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticBoxSizer9->Add(itemButtonDF, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); - wxStaticText* itemStaticText411 = new wxStaticText( itemPanelGeneral, ID_DIALOG_OPTIONS_STATIC_SAMPLE_DATE, _("Sample Date"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticBoxSizer9->Add(itemStaticText411, 0, - wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemFlexBoxSizer99->Add(itemStaticText411, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 0); itemStaticText411->SetLabel(mmGetDateForDisplay(db_, wxDateTime::Now())); + wxButton* itemButtonDF = new wxButton( itemPanelGeneral, + ID_DIALOG_OPTIONS_BUTTON_DATEFORMAT, _("Set"), wxDefaultPosition, wxDefaultSize, 0 ); + itemFlexBoxSizer99->Add(itemButtonDF, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); // ------------------------------------------ wxStaticBox* itemStaticBoxSizer18Static = new wxStaticBox(itemPanelGeneral, wxID_ANY, @@ -475,14 +472,14 @@ wxStaticText* itemStaticTextUN = new wxStaticText( itemPanelGeneral, wxID_STATIC, _("User Name"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticBoxSizerUN->Add(itemStaticTextUN, 0, - wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemStaticBoxSizerUN->Add(itemStaticTextUN, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxString userName = mmDBWrapper::getInfoSettingValue(db_, wxT("USERNAME"), wxT("")); + wxTextCtrl* textUN = new wxTextCtrl( itemPanelGeneral, ID_DIALOG_OPTIONS_TEXTCTRL_USERNAME, - userName, wxDefaultPosition, wxSize(275,-1), 0 ); - textUN->SetToolTip(_("Specify the User Name, or a title for the database")); - itemStaticBoxSizerUN->Add(textUN, 0, wxALIGN_RIGHT|wxLEFT,15); + userName, wxDefaultPosition, wxDefaultSize, 0 ); + textUN->SetToolTip(_("Specify the User Name")); + itemStaticBoxSizerUN->Add(textUN, 1, wxALIGN_LEFT|wxGROW|wxALL, 5); // ------------------------------------------ wxStaticBox* itemStaticBoxSizer1881Static = new wxStaticBox(itemPanelGeneral, wxID_ANY, @@ -497,9 +494,8 @@ itemStaticBoxSizerLang->Add(itemButtonLanguage, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); itemButtonLanguage->SetToolTip(_("Specify the language to use")); - - // --------------------------------------------------------------------------------------------------- + // Views Panel wxPanel* itemPanelViews = new wxPanel( newBook, ID_BOOK_PANELVIEWS, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); @@ -545,7 +541,7 @@ wxStaticBox* itemStaticBoxSizerTransViewStatic = new wxStaticBox(itemPanelViews, wxID_ANY, _("Transaction View Options")); wxStaticBoxSizer* itemStaticBoxSizerTransView = new wxStaticBoxSizer(itemStaticBoxSizerTransViewStatic, - wxHORIZONTAL); + wxVERTICAL); itemBoxSizer7->Add(itemStaticBoxSizerTransView, 0, wxGROW|wxALL, 5); wxStaticText* itemStaticTextTransText = new wxStaticText( itemPanelViews, @@ -662,7 +658,7 @@ // Home Page Options wxStaticBox* itemStaticBoxSizerHomePageOption = new wxStaticBox(itemPanelViews, wxID_ANY, _("Home Page Options: Expand Section")); - wxStaticBoxSizer* itemStaticBoxSizerHomePage = new wxStaticBoxSizer(itemStaticBoxSizerHomePageOption, wxHORIZONTAL); + wxStaticBoxSizer* itemStaticBoxSizerHomePage = new wxStaticBoxSizer(itemStaticBoxSizerHomePageOption, wxVERTICAL); itemBoxSizer7->Add(itemStaticBoxSizerHomePage, 0, wxGROW|wxALL, 5); // Check boxes for Home Page Options @@ -758,26 +754,28 @@ //---------------------------------------------- wxStaticBox* itemStaticBoxFinancialYearSetting = new wxStaticBox(itemPanelMisc, wxID_ANY, _("Financial Year Settings")); - wxStaticBoxSizer* itemStaticBoxSizerFinancialYear = new wxStaticBoxSizer(itemStaticBoxFinancialYearSetting, wxHORIZONTAL); + wxStaticBoxSizer* itemStaticBoxSizerFinancialYear = new wxStaticBoxSizer(itemStaticBoxFinancialYearSetting, wxVERTICAL); + wxFlexGridSizer* transflexGridSizerMisc = new wxFlexGridSizer(3,2,0,0); itemBoxSizerMisc->Add(itemStaticBoxSizerFinancialYear, 0, wxGROW|wxALL, 5); - + itemStaticBoxSizerFinancialYear->Add(transflexGridSizerMisc); + wxStaticText* itemStaticTextFYSDay = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Start Day"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticBoxSizerFinancialYear->Add(itemStaticTextFYSDay, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + 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 ); textFPSDay->SetToolTip(_("Specify Day for start of financial year")); - itemStaticBoxSizerFinancialYear->Add(textFPSDay, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + transflexGridSizerMisc->Add(textFPSDay, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); wxStaticText* itemStaticTextSmonth = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Start Month"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticBoxSizerFinancialYear->Add(itemStaticTextSmonth, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + transflexGridSizerMisc->Add(itemStaticTextSmonth, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); const wxString financialMonthsSelection[12] = { _("Jan"), _("Feb"), _("Mar"), _("Apr"), _("May"), _("Jun"), _("Jul"), _("Aug"), _("Sep"), _("Oct"), _("Nov"), _("Dec") }; monthSelection_ = new wxChoice( itemPanelMisc, ID_DIALOG_OPTIONS_FINANCIAL_YEAR_START_MONTH, wxDefaultPosition, wxSize(100, -1), 12, financialMonthsSelection, 0 ); - itemStaticBoxSizerFinancialYear->Add(monthSelection_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + transflexGridSizerMisc->Add(monthSelection_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxString financialPeriodStartMonth = mmDBWrapper::getInfoSettingValue(db_, wxT("FINANCIAL_YEAR_START_MONTH"), wxT("7")); long monthItem; financialPeriodStartMonth.ToLong(&monthItem); @@ -833,20 +831,20 @@ wxDefaultPosition, wxDefaultSize, 5, itemChoiceDefaultTransStatusStrings ); itemChoiceDefaultTransStatus->SetSelection(mmIniOptions::transStatusReconciled_); - wxFlexGridSizer* newTransflexGridSizer = new wxFlexGridSizer(2,3,0,0); + wxFlexGridSizer* newTransflexGridSizer = new wxFlexGridSizer(3,2,0,0); itemStaticBoxSizerNewTransactionSettings->Add(newTransflexGridSizer); newTransflexGridSizer->Add(payeeStaticText,0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT, 5); - newTransflexGridSizer->Add(categoryStaticText,0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT, 5); - newTransflexGridSizer->Add(statusStaticText,0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT, 5); newTransflexGridSizer->Add(itemChoiceDefaultTransPayee,0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + newTransflexGridSizer->Add(categoryStaticText,0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT, 5); newTransflexGridSizer->Add(itemChoiceDefaultTransCategory,0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + newTransflexGridSizer->Add(statusStaticText,0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT|wxRIGHT, 5); newTransflexGridSizer->Add(itemChoiceDefaultTransStatus,0, wxALIGN_CENTER_VERTICAL|wxALL, 5); //---------------------------------------------- wxStaticBox* itemStaticBoxBackupSetting = new wxStaticBox(itemPanelMisc, wxID_ANY, _("Database Backup Settings")); wxStaticBoxSizer* itemStaticBoxSizerBackup = - new wxStaticBoxSizer(itemStaticBoxBackupSetting, wxHORIZONTAL); + new wxStaticBoxSizer(itemStaticBoxBackupSetting, wxVERTICAL); itemBoxSizerMisc->Add(itemStaticBoxSizerBackup, 0, wxGROW|wxALL, 5); wxString backupDBState = mmDBWrapper::getINISettingValue(inidb_, wxT("BACKUPDB"), wxT("FALSE")); @@ -869,7 +867,7 @@ itemCheckBoxBackupUpdate->SetToolTip(_("For same day, select to update the backup before opening the database.")); //---------------------------------------------- - wxBoxSizer* itemBoxSizerStockURL = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* itemBoxSizerStockURL = new wxBoxSizer(wxVERTICAL); itemBoxSizerMisc->Add(itemBoxSizerStockURL, 0, wxGROW|wxALIGN_LEFT|wxALL, 5); wxStaticText* itemStaticTextURL = new wxStaticText( itemPanelMisc, wxID_STATIC, @@ -878,8 +876,8 @@ wxString stockURL = mmDBWrapper::getInfoSettingValue(db_, wxT("STOCKURL"), mmex::DEFSTOCKURL); wxTextCtrl* itemTextCtrURL = new wxTextCtrl( itemPanelMisc, ID_DIALOG_OPTIONS_TEXTCTRL_STOCKURL, stockURL, - wxDefaultPosition, wxSize(250, -1), 0 ); - itemBoxSizerStockURL->Add(itemTextCtrURL, 1, wxGROW|wxALIGN_TOP|wxALL, 5); + wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizerStockURL->Add(itemTextCtrURL, 1, wxGROW|wxALIGN_LEFT|wxALL, 5); itemTextCtrURL->SetToolTip(_("Clear the field to Reset the value to system default.")); wxString useOriginalDate = mmDBWrapper::getINISettingValue(inidb_, wxT("USEORIGDATEONCOPYPASTE"), wxT("FALSE")); @@ -902,7 +900,7 @@ wxString enableCurrencyUpd = mmDBWrapper::getINISettingValue(inidb_, wxT("UPDATECURRENCYRATE"), wxT("FALSE")); wxCheckBox* itemCheckBoxOnlineCurrencyUpd = new wxCheckBox( itemPanelMisc, - ID_DIALOG_OPTIONS_UPD_CURRENCY, _("Enable online currency update (Get data from European Central Bank)"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); + ID_DIALOG_OPTIONS_UPD_CURRENCY, _("Enable online currency update \n(Get data from European Central Bank)"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE ); itemCheckBoxOnlineCurrencyUpd->SetValue(FALSE); if(enableCurrencyUpd == wxT("TRUE")) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <vo...@us...> - 2011-12-10 17:57:18
|
Revision: 1565 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1565&view=rev Author: vomikan Date: 2011-12-10 17:57:12 +0000 (Sat, 10 Dec 2011) Log Message: ----------- Spin Ctrl for financial year start day Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2011-12-10 17:01:14 UTC (rev 1564) +++ trunk/mmex/src/optionsdialog.cpp 2011-12-10 17:57:12 UTC (rev 1565) @@ -23,6 +23,8 @@ #include <wx/colordlg.h> #include <wx/combobox.h> #include "mmgraphgenerator.h" +#include <wx/spinctrl.h> +#include <limits> enum ViewEnum { @@ -139,12 +141,13 @@ db_->ExecuteUpdate("delete from INFOTABLE_V1 where INFONAME = \"STOCKURL\";"); } - wxTextCtrl* fysDay = (wxTextCtrl*)FindWindow(ID_DIALOG_OPTIONS_FINANCIAL_YEAR_START_DAY); - wxString fysDayVal = fysDay->GetValue(); - if (wxAtoi(fysDayVal)<31){ + //Find Financial Year Start Day field + wxSpinCtrl* fysDay = (wxSpinCtrl*)FindWindow(ID_DIALOG_OPTIONS_FINANCIAL_YEAR_START_DAY); + //Get integer value then convert it to string value + wxString fysDayVal = wxString::Format(wxT("%d"),fysDay->GetValue()); + //Put it ot DB mmDBWrapper::setInfoSettingValue(db_, wxT("FINANCIAL_YEAR_START_DAY"), fysDayVal); mmOptions::financialYearStartDayString_ = fysDayVal; - } } mmOptionsDialog::mmOptionsDialog( mmCoreDB* core, wxSQLite3Database* inidb, @@ -795,23 +798,21 @@ wxFlexGridSizer* transflexGridSizerMisc = new wxFlexGridSizer(3,2,0,0); 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, wxALIGN_RIGHT, intValidator ); - textFPSDay->SetToolTip(_("Specify Day for start of financial year")); + int d = wxAtoi(financialPeriodStartDay); + //wxTextCtrl* textFPSDay = new wxTextCtrl( itemPanelMisc, ID_DIALOG_OPTIONS_FINANCIAL_YEAR_START_DAY, + // financialPeriodStartDay, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT, intValidator() ); + //textFPSDay->SetToolTip(_("Specify Day for start of financial year")); + //textFPSDay->SetMaxLength(2); + wxSpinCtrl *textFPSDay = new wxSpinCtrl( itemPanelMisc, ID_DIALOG_OPTIONS_FINANCIAL_YEAR_START_DAY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 31, d); + textFPSDay->SetToolTip(_("Specify Day for start of financial year")); + + + transflexGridSizerMisc->Add(textFPSDay, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); wxStaticText* itemStaticTextSmonth = new wxStaticText( itemPanelMisc, wxID_STATIC, _("Start Month"), wxDefaultPosition, wxDefaultSize, 0 ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-01-01 15:27:16
|
Revision: 1582 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1582&view=rev Author: vomikan Date: 2012-01-01 15:27:10 +0000 (Sun, 01 Jan 2012) Log Message: ----------- new type of color settings Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2012-01-01 12:58:20 UTC (rev 1581) +++ trunk/mmex/src/optionsdialog.cpp 2012-01-01 15:27:10 UTC (rev 1582) @@ -740,48 +740,62 @@ itemBoxSizer8->Add(itemButtonColorDefault, 0, wxALIGN_LEFT|wxALL, 5); itemButtonColorDefault->SetToolTip(_("Restore Default Colors")); - wxFlexGridSizer* itemGridSizer2 = new wxFlexGridSizer(2, 2, 0, 0); + wxFlexGridSizer* itemGridSizer2 = new wxFlexGridSizer(2, 2, 10, 10); itemBoxSizer8->Add(itemGridSizer2, 0, wxALL); + wxStaticText* itemButtonColorLabel = new wxStaticText( itemPanelColors, wxID_STATIC, _("Nav Tree"), wxDefaultPosition, wxDefaultSize, 0 ); wxButton* itemButtonColorNavTreeCtrl = new wxButton( itemPanelColors, ID_DIALOG_OPTIONS_BUTTON_COLOR_NAVTREE, _("Nav Tree"), wxDefaultPosition, wxDefaultSize, 0 ); - itemGridSizer2->Add(itemButtonColorNavTreeCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemGridSizer2->Add(itemButtonColorLabel, 0, wxALIGN_CENTER, 0); + itemGridSizer2->Add(itemButtonColorNavTreeCtrl, 0, wxALIGN_CENTER, 0); itemButtonColorNavTreeCtrl->SetToolTip(_("Specify the color for the nav tree")); itemButtonColorNavTreeCtrl->SetBackgroundColour(mmColors::navTreeBkColor); + wxStaticText* itemButtonColorListBackgroundLabel = new wxStaticText( itemPanelColors, wxID_STATIC, _("List Background"), wxDefaultPosition, wxDefaultSize, 0 ); wxButton* itemButtonColorListBackground = new wxButton( itemPanelColors, ID_DIALOG_OPTIONS_BUTTON_COLOR_LISTBACK, _("List Background"), wxDefaultPosition, wxDefaultSize, 0 ); - itemGridSizer2->Add(itemButtonColorListBackground, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemGridSizer2->Add(itemButtonColorListBackgroundLabel, 0, wxALIGN_CENTER, 0); + itemGridSizer2->Add(itemButtonColorListBackground, 0, wxALIGN_CENTER, 0); itemButtonColorListBackground->SetToolTip(_("Specify the color for the list background")); itemButtonColorListBackground->SetBackgroundColour(mmColors::listBackColor); + wxStaticText* itemButtonColorListAlt0Label = new wxStaticText( itemPanelColors, wxID_STATIC, _("List Row 0"), wxDefaultPosition, wxDefaultSize, 0 ); wxButton* itemButtonColorListAlt0 = new wxButton( itemPanelColors, ID_DIALOG_OPTIONS_BUTTON_COLOR_ALT0, _("List Row 0"), wxDefaultPosition, wxDefaultSize, 0 ); - itemGridSizer2->Add(itemButtonColorListAlt0, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemGridSizer2->Add(itemButtonColorListAlt0Label, 0, wxALIGN_CENTER, 0); + itemGridSizer2->Add(itemButtonColorListAlt0, 0, wxALIGN_CENTER, 0); itemButtonColorListAlt0->SetToolTip(_("Specify the color for the list row 0")); itemButtonColorListAlt0->SetBackgroundColour(mmColors::listAlternativeColor0); + wxStaticText* itemButtonColorListAlt1Label = new wxStaticText( itemPanelColors, wxID_STATIC, _("List Row 1"), wxDefaultPosition, wxDefaultSize, 0 ); wxButton* itemButtonColorListAlt1 = new wxButton( itemPanelColors, ID_DIALOG_OPTIONS_BUTTON_COLOR_ALT1, _("List Row 1"), wxDefaultPosition, wxDefaultSize, 0 ); - itemGridSizer2->Add(itemButtonColorListAlt1, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemGridSizer2->Add(itemButtonColorListAlt1Label, 0, wxALIGN_CENTER, 0); + itemGridSizer2->Add(itemButtonColorListAlt1, 0, wxALIGN_CENTER, 0); itemButtonColorListAlt1->SetToolTip(_("Specify the color for the list row 1")); itemButtonColorListAlt1->SetBackgroundColour(mmColors::listAlternativeColor1); - wxButton* itemButtonColorListBorder = new wxButton( itemPanelColors, + wxStaticText* itemButtonColorListBorderLabel = new wxStaticText( itemPanelColors, wxID_STATIC, _("List Border"), wxDefaultPosition, wxDefaultSize, 0 ); + wxButton* itemButtonColorListBorder = new wxButton( itemPanelColors, ID_DIALOG_OPTIONS_BUTTON_COLOR_LISTBORDER, _("List Border"), wxDefaultPosition, wxDefaultSize, 0 ); - itemGridSizer2->Add(itemButtonColorListBorder, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemGridSizer2->Add(itemButtonColorListBorderLabel, 0, wxALIGN_CENTER, 0); + itemGridSizer2->Add(itemButtonColorListBorder, 0, wxALIGN_CENTER, 0); itemButtonColorListBorder->SetToolTip(_("Specify the color for the list Border")); itemButtonColorListBorder->SetBackgroundColour(mmColors::listBorderColor); + wxStaticText* itemButtonColorListDetailsLabel = new wxStaticText( itemPanelColors, wxID_STATIC, _("List Details"), wxDefaultPosition, wxDefaultSize, 0 ); wxButton* itemButtonColorListDetails = new wxButton( itemPanelColors, ID_DIALOG_OPTIONS_BUTTON_COLOR_LISTDETAILS, _("List Details"), wxDefaultPosition, wxDefaultSize, 0 ); - itemGridSizer2->Add(itemButtonColorListDetails, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemGridSizer2->Add(itemButtonColorListDetailsLabel, 0, wxALIGN_CENTER_HORIZONTAL, 0); + itemGridSizer2->Add(itemButtonColorListDetails, 0, wxALIGN_CENTER, 0); itemButtonColorListDetails->SetToolTip(_("Specify the color for the list details")); itemButtonColorListDetails->SetBackgroundColour(mmColors::listDetailsPanelColor); + wxStaticText* itemButtonColorFutureDatesLabel = new wxStaticText( itemPanelColors, wxID_STATIC, _("Future Transactions"), wxDefaultPosition, wxDefaultSize, 0 ); wxButton* itemButtonColorFutureDates = new wxButton( itemPanelColors, ID_DIALOG_OPTIONS_BUTTON_COLOR_FUTUREDATES, _("Future Transactions"), wxDefaultPosition, wxDefaultSize, 0 ); - itemGridSizer2->Add(itemButtonColorFutureDates, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); + itemGridSizer2->Add(itemButtonColorFutureDatesLabel, 0, wxALIGN_CENTER, 0); + itemGridSizer2->Add(itemButtonColorFutureDates, 0, wxALIGN_CENTER, 0); itemButtonColorFutureDates->SetToolTip(_("Specify the color for future transactions")); itemButtonColorFutureDates->SetBackgroundColour(mmColors::listFutureDateColor); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-02-17 17:30:40
|
Revision: 1808 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1808&view=rev Author: vomikan Date: 2012-02-17 17:30:31 +0000 (Fri, 17 Feb 2012) Log Message: ----------- more compact design Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2012-02-17 03:42:15 UTC (rev 1807) +++ trunk/mmex/src/optionsdialog.cpp 2012-02-17 17:30:31 UTC (rev 1808) @@ -591,7 +591,7 @@ // Navigation Tree Expansion Options wxStaticBox* navTreeOptionsStaticBox = new wxStaticBox(viewsPanel, wxID_ANY, _("Navigation Tree Expansion Options")); navTreeOptionsStaticBox->SetFont(staticBoxFontSetting); - wxStaticBoxSizer* navTreeOptionsStaticBoxSizer = new wxStaticBoxSizer(navTreeOptionsStaticBox, wxVERTICAL); //wxHORIZONTAL); + wxStaticBoxSizer* navTreeOptionsStaticBoxSizer = new wxStaticBoxSizer(navTreeOptionsStaticBox, wxHORIZONTAL); //wxHORIZONTAL); viewsPanelSizer->Add(navTreeOptionsStaticBoxSizer, 0, wxGROW|wxALL, 5); // Expand Bank Tree @@ -611,7 +611,7 @@ // Home Page Expansion Options wxStaticBox* homePageStaticBox = new wxStaticBox(viewsPanel, wxID_ANY, _("Home Page Expansion Options")); homePageStaticBox->SetFont(staticBoxFontSetting); - wxStaticBoxSizer* homePageStaticBoxSizer = new wxStaticBoxSizer(homePageStaticBox, wxHORIZONTAL); + wxStaticBoxSizer* homePageStaticBoxSizer = new wxStaticBoxSizer(homePageStaticBox, wxVERTICAL); viewsPanelSizer->Add(homePageStaticBoxSizer, 0, wxGROW|wxALL, 5); // Expand Bank Home This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-02-18 15:12:52
|
Revision: 1837 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1837&view=rev Author: guanlisheng Date: 2012-02-18 15:12:46 +0000 (Sat, 18 Feb 2012) Log Message: ----------- typo Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2012-02-18 15:00:27 UTC (rev 1836) +++ trunk/mmex/src/optionsdialog.cpp 2012-02-18 15:12:46 UTC (rev 1837) @@ -114,7 +114,7 @@ wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) - : core_(core), inidb_(inidb), db_(core_->db_.get()), restartRequired_(false) + : core_(core), inidb_(inidb), db_(core->db_.get()), restartRequired_(false) { Create(parent, id, caption, pos, size, style); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-03-06 12:19:23
|
Revision: 1937 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1937&view=rev Author: guanlisheng Date: 2012-03-06 12:19:17 +0000 (Tue, 06 Mar 2012) Log Message: ----------- format Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2012-03-06 12:13:56 UTC (rev 1936) +++ trunk/mmex/src/optionsdialog.cpp 2012-03-06 12:19:17 UTC (rev 1937) @@ -29,12 +29,13 @@ #include <limits> enum -{ ID_BOOK_PANEL_EXP_IMP = wxID_HIGHEST + 1, - ID_DIALOG_OPTIONS_RADIOBUTTON_DELIMITER_USER4, - ID_DIALOG_OPTIONS_RADIOBUTTON_DELIMITER_COMMA4, - ID_DIALOG_OPTIONS_RADIOBUTTON_DELIMITER_SEMICOLON4, - ID_DIALOG_OPTIONS_RADIOBUTTON_DELIMITER_TAB4, - ID_DIALOG_OPTIONS_TEXTCTRL_DELIMITER4, +{ + ID_BOOK_PANEL_EXP_IMP = wxID_HIGHEST + 1, + ID_DIALOG_OPTIONS_RADIOBUTTON_DELIMITER_USER4, + ID_DIALOG_OPTIONS_RADIOBUTTON_DELIMITER_COMMA4, + ID_DIALOG_OPTIONS_RADIOBUTTON_DELIMITER_SEMICOLON4, + ID_DIALOG_OPTIONS_RADIOBUTTON_DELIMITER_TAB4, + ID_DIALOG_OPTIONS_TEXTCTRL_DELIMITER4, }; enum ViewEnum @@ -196,9 +197,7 @@ for(int i=0; i<TOTAL_DATEFORMAT; i++) { if(strDate == itemChoice7Strings[i]) - { return DateFormat[i]; - } } return strDate; @@ -255,9 +254,7 @@ for(int i=0; i<TOTAL_DATEFORMAT; i++) { if(strDate == DateFormat[i]) - { return itemChoice7Strings[i]; - } } return wxT(""); @@ -339,9 +336,7 @@ wxString currName = _("Set Currency"); if (currencyId_ != -1) - { currName = core_->getCurrencyName(currencyId_); - } wxButton* baseCurrencyButton = new wxButton(generalPanel, ID_DIALOG_OPTIONS_BUTTON_CURRENCY, currName, wxDefaultPosition, wxSize(150, -1), 0); baseCurrencyButton->SetToolTip(_("Sets the default currency for the database.")); @@ -413,7 +408,7 @@ int day = wxAtoi(financialPeriodStartDay); wxSpinCtrl *textFPSDay = new wxSpinCtrl(generalPanel, ID_DIALOG_OPTIONS_FINANCIAL_YEAR_START_DAY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 31, day); - textFPSDay->SetToolTip(_("Specify Day for start of financial year")); + textFPSDay->SetToolTip(_("Specify Day for start of financial year")); financialYearStaticBoxSizerGrid->Add(textFPSDay, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); @@ -857,27 +852,19 @@ wxRadioButton* delimiterRadioButtonU4 = new wxRadioButton(importExportPanel, ID_DIALOG_OPTIONS_RADIOBUTTON_DELIMITER_USER4, _("User Defined"), wxDefaultPosition, wxDefaultSize, 0); wxRadioButton* delimiterRadioButtonC4 = new wxRadioButton(importExportPanel, ID_DIALOG_OPTIONS_RADIOBUTTON_DELIMITER_COMMA4, _("Comma"), wxDefaultPosition, wxDefaultSize, 0); - if (delimiter == wxT(",")) - { - delimiterRadioButtonC4 ->SetValue(true); - } + if (delimiter == wxT(",")) delimiterRadioButtonC4 ->SetValue(true); + wxRadioButton* delimiterRadioButtonS4 = new wxRadioButton(importExportPanel, ID_DIALOG_OPTIONS_RADIOBUTTON_DELIMITER_SEMICOLON4, _("Semicolon"), wxDefaultPosition, wxDefaultSize, 0); - if (delimiter == wxT(";")) - { - delimiterRadioButtonS4 ->SetValue(true); - } + if (delimiter == wxT(";")) delimiterRadioButtonS4 ->SetValue(true); + wxRadioButton* delimiterRadioButtonT4 = new wxRadioButton(importExportPanel, ID_DIALOG_OPTIONS_RADIOBUTTON_DELIMITER_TAB4, _("TAB"), wxDefaultPosition, wxDefaultSize, 0); - if (delimiter == wxT("\t")) - { - delimiterRadioButtonT4 ->SetValue(true); - } + if (delimiter == wxT("\t")) delimiterRadioButtonT4 ->SetValue(true); + wxTextCtrl* textDelimiter4 = new wxTextCtrl( importExportPanel, ID_DIALOG_OPTIONS_TEXTCTRL_DELIMITER4, delimiter, wxDefaultPosition, wxDefaultSize, 0); textDelimiter4->SetToolTip(_("Specify the delimiter to use when importing/exporting CSV files")); textDelimiter4->SetMaxLength(2); if (delimiter == wxT("\t") || delimiter == wxT(",") || delimiter == wxT(";")) - { textDelimiter4->Enable(false); - } radioButtonSizer->Add(delimiterRadioButtonC4, 0, wxALIGN_LEFT|wxALL, 5); radioButtonSizer->Add(delimiterRadioButtonS4, 0, wxALIGN_LEFT|wxALL, 5); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-03-07 18:11:01
|
Revision: 1949 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1949&view=rev Author: vomikan Date: 2012-03-07 18:10:50 +0000 (Wed, 07 Mar 2012) Log Message: ----------- refactoring Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2012-03-07 15:43:47 UTC (rev 1948) +++ trunk/mmex/src/optionsdialog.cpp 2012-03-07 18:10:50 UTC (rev 1949) @@ -364,10 +364,12 @@ financialYearStaticBoxSizerGrid->Add(itemStaticTextSmonth, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - const wxString financialMonthsSelection[12] = { _("Jan"), _("Feb"), _("Mar"), _("Apr"), _("May"), _("Jun"), - _("Jul"), _("Aug"), _("Sep"), _("Oct"), _("Nov"), _("Dec") }; + wxArrayString financialMonthsSelection; + for(int i=0; i<12; i++) { + financialMonthsSelection.Add(mmGetNiceShortMonthName(i)); + }; monthSelection_ = new wxChoice(generalPanel, ID_DIALOG_OPTIONS_FINANCIAL_YEAR_START_MONTH, - wxDefaultPosition, wxSize(100, -1), 12, financialMonthsSelection, 0); + wxDefaultPosition, wxSize(100, -1), financialMonthsSelection); financialYearStaticBoxSizerGrid->Add(monthSelection_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxString financialPeriodStartMonth = mmDBWrapper::getInfoSettingValue(db_, wxT("FINANCIAL_YEAR_START_MONTH"), wxT("7")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-03-07 18:23:20
|
Revision: 1950 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1950&view=rev Author: vomikan Date: 2012-03-07 18:23:10 +0000 (Wed, 07 Mar 2012) Log Message: ----------- refactoring Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2012-03-07 18:10:50 UTC (rev 1949) +++ trunk/mmex/src/optionsdialog.cpp 2012-03-07 18:23:10 UTC (rev 1950) @@ -58,7 +58,6 @@ VIEW_TRANS_90, VIEW_TRANS_LASTMONTH, VIEW_TRANS_LAST_3MONTHS, - VIEW_TRANS_MAX // number of elements, must be last }; enum HtmlFontEnum @@ -443,22 +442,21 @@ transOptionStaticBoxSizer->Add(transVisibleStaticText, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - const wxString itemChoiceViewTransStrings[VIEW_TRANS_MAX] = - { - _("View All Transactions"), - _("View Reconciled"), - _("Vlew All - Except Reconciled"), - _("View UnReconciled"), - _("View Today"), - _("View Current Month"), - _("View Last 30 days"), - _("View Last 90 days"), - _("View Last Month"), - _("View Last 3 Months"), - }; + wxArrayString itemChoiceViewTransStrings; + itemChoiceViewTransStrings.Add(_("View All Transactions")); + itemChoiceViewTransStrings.Add(_("View Reconciled")); + itemChoiceViewTransStrings.Add(_("Vlew All - Except Reconciled")); + itemChoiceViewTransStrings.Add(_("View UnReconciled")); + itemChoiceViewTransStrings.Add(_("View Today")); + itemChoiceViewTransStrings.Add(_("View Current Month")); + itemChoiceViewTransStrings.Add(_("View Last 30 days")); + itemChoiceViewTransStrings.Add(_("View Last 90 days")); + itemChoiceViewTransStrings.Add(_("View Last Month")); + itemChoiceViewTransStrings.Add(_("View Last 3 Months")); + choiceTransVisible_ = new wxChoice(viewsPanel, ID_DIALOG_OPTIONS_VIEW_TRANS, wxDefaultPosition, wxDefaultSize, - sizeof(itemChoiceViewTransStrings)/sizeof(*itemChoiceViewTransStrings), itemChoiceViewTransStrings, 0); + itemChoiceViewTransStrings); transOptionStaticBoxSizer->Add(choiceTransVisible_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxString vTrans = mmDBWrapper::getINISettingValue(inidb_, wxT("VIEWTRANSACTIONS"), VIEW_TRANS_ALL_STR); @@ -692,28 +690,25 @@ wxStaticText* payeeStaticText = new wxStaticText(othersPanel, wxID_STATIC, _("Default Payee:"), wxDefaultPosition, wxSize(90, -1)); // sets size for associated text - wxString itemChoiceDefaultTransPayeeStrings[] = - { - _("None"), - _("Last Used"), - }; + wxArrayString itemChoiceDefaultTransPayeeStrings; + itemChoiceDefaultTransPayeeStrings.Add(_("None")); + itemChoiceDefaultTransPayeeStrings.Add(_("Last Used")); wxChoice* defaultPayeeChoice = new wxChoice(othersPanel, ID_DIALOG_OPTIONS_DEFAULT_TRANSACTION_PAYEE, - wxDefaultPosition, wxSize(140, -1), 2, itemChoiceDefaultTransPayeeStrings, 0); // sets size for associated choice + wxDefaultPosition, wxSize(140, -1), itemChoiceDefaultTransPayeeStrings); defaultPayeeChoice->SetSelection(mmIniOptions::instance().transPayeeSelectionNone_); // Default Category wxStaticText* categoryStaticText = new wxStaticText(othersPanel, wxID_STATIC, _("Default Category:"), wxDefaultPosition, payeeStaticText->GetSize()); - wxString itemChoiceDefaultTransCategoryStrings[] = - { - _("None"), - _("Last used for payee"), - }; + wxArrayString itemChoiceDefaultTransCategoryStrings; + itemChoiceDefaultTransCategoryStrings.Add(_("None")); + itemChoiceDefaultTransCategoryStrings.Add(_("Last used for payee")); + wxChoice* defaultCategoryChoice = new wxChoice(othersPanel, ID_DIALOG_OPTIONS_DEFAULT_TRANSACTION_CATEGORY, - wxDefaultPosition, defaultPayeeChoice->GetSize(), 2, itemChoiceDefaultTransCategoryStrings); + wxDefaultPosition, defaultPayeeChoice->GetSize(), itemChoiceDefaultTransCategoryStrings); defaultCategoryChoice->SetSelection(mmIniOptions::instance().transCategorySelectionNone_); // Default Status This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2012-03-10 00:22:52
|
Revision: 1970 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1970&view=rev Author: stef145g Date: 2012-03-10 00:22:46 +0000 (Sat, 10 Mar 2012) Log Message: ----------- Fix: Compiler warnings. Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2012-03-09 21:38:06 UTC (rev 1969) +++ trunk/mmex/src/optionsdialog.cpp 2012-03-10 00:22:46 UTC (rev 1970) @@ -150,7 +150,7 @@ wxArrayString DateFormat = DateFormats(); wxArrayString itemChoice7Strings = itemChoiceStrings(); - for(int i=0; i<DateFormat.Count(); i++) + for(size_t i=0; i<DateFormat.Count(); i++) { if(strDate == itemChoice7Strings[i]) return DateFormat[i]; @@ -164,7 +164,7 @@ wxArrayString DateFormat = DateFormats(); wxArrayString itemChoice7Strings = itemChoiceStrings(); - for(int i=0; i<DateFormat.Count(); i++) + for(size_t i=0; i<DateFormat.Count(); i++) { if(strDate == DateFormat[i]) return itemChoice7Strings[i]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-03-10 21:30:52
|
Revision: 1995 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1995&view=rev Author: vomikan Date: 2012-03-10 21:30:46 +0000 (Sat, 10 Mar 2012) Log Message: ----------- min size for window added Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2012-03-10 20:32:50 UTC (rev 1994) +++ trunk/mmex/src/optionsdialog.cpp 2012-03-10 21:30:46 UTC (rev 1995) @@ -253,6 +253,7 @@ **********************************************************************************************/ wxPanel* generalPanel = new wxPanel(newBook, ID_BOOK_PANELGENERAL, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); + SetMinSize(wxSize(500,600)); wxBoxSizer* generalPanelSizer = new wxBoxSizer(wxVERTICAL); generalPanel->SetSizer(generalPanelSizer); @@ -456,7 +457,7 @@ itemChoiceViewTransStrings.Add(_("View Last Month")); itemChoiceViewTransStrings.Add(_("View Last 3 Months")); - choiceTransVisible_ = new wxChoice(viewsPanel, ID_DIALOG_OPTIONS_VIEW_TRANS, wxDefaultPosition, wxDefaultSize, + choiceTransVisible_ = new wxChoice(viewsPanel, ID_DIALOG_OPTIONS_VIEW_TRANS, wxDefaultPosition, wxSize(220,-1), itemChoiceViewTransStrings); transOptionStaticBoxSizer->Add(choiceTransVisible_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); @@ -689,32 +690,32 @@ // Default Payee wxStaticText* payeeStaticText = new wxStaticText(othersPanel, wxID_STATIC, - _("Default Payee:"), wxDefaultPosition, wxSize(90, -1)); // sets size for associated text + _("Default Payee:"), wxDefaultPosition, wxDefaultSize); - wxArrayString itemChoiceDefaultTransPayeeStrings; - itemChoiceDefaultTransPayeeStrings.Add(_("None")); - itemChoiceDefaultTransPayeeStrings.Add(_("Last Used")); + wxArrayString defaultTransPayee_; + defaultTransPayee_.Add(_("None")); + defaultTransPayee_.Add(_("Last Used")); wxChoice* defaultPayeeChoice = new wxChoice(othersPanel, ID_DIALOG_OPTIONS_DEFAULT_TRANSACTION_PAYEE, - wxDefaultPosition, wxSize(140, -1), itemChoiceDefaultTransPayeeStrings); + wxDefaultPosition, wxSize(140, -1), defaultTransPayee_); defaultPayeeChoice->SetSelection(mmIniOptions::instance().transPayeeSelectionNone_); // Default Category wxStaticText* categoryStaticText = new wxStaticText(othersPanel, wxID_STATIC, - _("Default Category:"), wxDefaultPosition, payeeStaticText->GetSize()); + _("Default Category:"), wxDefaultPosition, wxDefaultSize); - wxArrayString itemChoiceDefaultTransCategoryStrings; + wxArrayString defaultTransCategory_; - itemChoiceDefaultTransCategoryStrings.Add(_("None")); - itemChoiceDefaultTransCategoryStrings.Add(_("Last used for payee")); + defaultTransCategory_.Add(_("None")); + defaultTransCategory_.Add(_("Last used for payee")); wxChoice* defaultCategoryChoice = new wxChoice(othersPanel, ID_DIALOG_OPTIONS_DEFAULT_TRANSACTION_CATEGORY, - wxDefaultPosition, defaultPayeeChoice->GetSize(), itemChoiceDefaultTransCategoryStrings); + wxDefaultPosition, defaultPayeeChoice->GetSize(), defaultTransCategory_); defaultCategoryChoice->SetSelection(mmIniOptions::instance().transCategorySelectionNone_); // Default Status wxStaticText* statusStaticText = new wxStaticText(othersPanel, wxID_STATIC, - _("Default Status:"), wxDefaultPosition, payeeStaticText->GetSize()); + _("Default Status:"), wxDefaultPosition, defaultPayeeChoice->GetSize()); wxArrayString choiceStatusStrings; choiceStatusStrings.Add(_("None")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-03-20 07:48:22
|
Revision: 2050 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2050&view=rev Author: vomikan Date: 2012-03-20 07:48:11 +0000 (Tue, 20 Mar 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2012-03-20 07:23:26 UTC (rev 2049) +++ trunk/mmex/src/optionsdialog.cpp 2012-03-20 07:48:11 UTC (rev 2050) @@ -196,6 +196,8 @@ wxArrayString mmOptionsDialog::viewAccountStrings(bool translated, wxString input_string, int& row_id_) { wxArrayString itemChoiceViewAccountStrings; + row_id_ = 0; + if (translated) { itemChoiceViewAccountStrings.Add(_("All")); itemChoiceViewAccountStrings.Add(_("Open")); @@ -221,6 +223,7 @@ wxArrayString mmOptionsDialog::viewTransactionsStrings(bool translated, wxString input_string, int& row_id_) { + row_id_ = 0; wxArrayString itemChoiceTranslatedViewTransStrings; itemChoiceTranslatedViewTransStrings.Add(_("View All Transactions")); @@ -462,19 +465,25 @@ // Transaction View options wxStaticBox* transOptionStaticBox = new wxStaticBox(viewsPanel, wxID_ANY, _("Transaction View Options")); transOptionStaticBox->SetFont(staticBoxFontSetting); + + wxBoxSizer* transOptionStaticBoxSizer = new wxStaticBoxSizer(transOptionStaticBox, wxHORIZONTAL); viewsPanelSizer->Add(transOptionStaticBoxSizer, 0, wxGROW|wxALL, 5); + wxFlexGridSizer* dateFormatSettingStaticBoxSizerGrid2 = new wxFlexGridSizer(1,2,0,5); + transOptionStaticBoxSizer->Add(dateFormatSettingStaticBoxSizerGrid2); + + wxStaticText* transVisibleStaticText = new wxStaticText(viewsPanel, wxID_STATIC, _("Transactions Visible"), wxDefaultPosition, wxDefaultSize, 0); - transOptionStaticBoxSizer->Add(transVisibleStaticText, 0, + dateFormatSettingStaticBoxSizerGrid2->Add(transVisibleStaticText, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); wxArrayString itemChoiceViewTransStrings = viewTransactionsStrings(true, wxEmptyString, row_id_); choiceTransVisible_ = new wxChoice(viewsPanel, ID_DIALOG_OPTIONS_VIEW_TRANS, wxDefaultPosition, wxSize(220,-1), itemChoiceViewTransStrings); - transOptionStaticBoxSizer->Add(choiceTransVisible_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + dateFormatSettingStaticBoxSizerGrid2->Add(choiceTransVisible_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxString vTrans = mmDBWrapper::getINISettingValue(inidb_, wxT("VIEWTRANSACTIONS"), VIEW_TRANS_ALL_STR); wxArrayString itemChoiceViewTransactionsString = viewTransactionsStrings(false, vTrans, row_id_); @@ -1097,7 +1106,7 @@ int row_id_ =0; wxArrayString ViewTransaction = viewTransactionsStrings(false, wxEmptyString, row_id_); mmDBWrapper::setINISettingValue(inidb_, wxT("VIEWTRANSACTIONS"), ViewTransaction[selection]); - wxSafeShowMessage(wxT("write"), ViewTransaction[selection]); + //wxSafeShowMessage(wxT("write"), ViewTransaction[selection]); } void mmOptionsDialog::SaveFinancialYearStart() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-03-22 10:32:18
|
Revision: 2065 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2065&view=rev Author: vomikan Date: 2012-03-22 10:32:07 +0000 (Thu, 22 Mar 2012) Log Message: ----------- number of view options restricted Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2012-03-22 10:31:09 UTC (rev 2064) +++ trunk/mmex/src/optionsdialog.cpp 2012-03-22 10:32:07 UTC (rev 2065) @@ -424,20 +424,25 @@ wxStaticBox* transOptionStaticBox = new wxStaticBox(viewsPanel, wxID_ANY, _("Transaction View Options")); transOptionStaticBox->SetFont(staticBoxFontSetting); - wxBoxSizer* transOptionStaticBoxSizer = new wxStaticBoxSizer(transOptionStaticBox, wxHORIZONTAL); viewsPanelSizer->Add(transOptionStaticBoxSizer, 0, wxGROW|wxALL, 5); wxFlexGridSizer* dateFormatSettingStaticBoxSizerGrid2 = new wxFlexGridSizer(1,2,0,5); transOptionStaticBoxSizer->Add(dateFormatSettingStaticBoxSizerGrid2); - wxStaticText* transVisibleStaticText = new wxStaticText(viewsPanel, wxID_STATIC, _("Transactions Visible"), wxDefaultPosition, wxDefaultSize, 0); dateFormatSettingStaticBoxSizerGrid2->Add(transVisibleStaticText, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - wxArrayString itemChoiceViewTransStrings = viewTransactionsStrings(true, wxEmptyString, row_id_); + wxArrayString itemChoiceViewTransStrings; + itemChoiceViewTransStrings.Add(_("View All Transactions")); + itemChoiceViewTransStrings.Add(_("View Today")); + itemChoiceViewTransStrings.Add(_("View Current Month")); + itemChoiceViewTransStrings.Add(_("View Last 30 days")); + itemChoiceViewTransStrings.Add(_("View Last 90 days")); + itemChoiceViewTransStrings.Add(_("View Last Month")); + itemChoiceViewTransStrings.Add(_("View Last 3 Months")); choiceTransVisible_ = new wxChoice(viewsPanel, ID_DIALOG_OPTIONS_VIEW_TRANS, wxDefaultPosition, wxSize(220,-1), itemChoiceViewTransStrings); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-03-25 17:36:40
|
Revision: 2089 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2089&view=rev Author: vomikan Date: 2012-03-25 17:36:34 +0000 (Sun, 25 Mar 2012) Log Message: ----------- fix for default font size Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2012-03-25 07:11:02 UTC (rev 2088) +++ trunk/mmex/src/optionsdialog.cpp 2012-03-25 17:36:34 UTC (rev 2089) @@ -476,7 +476,7 @@ choiceFontSize_ = new wxChoice(viewsPanel, ID_DIALOG_OPTIONS_FONT_SIZE, wxDefaultPosition, wxSize(85, -1), itemChoiceHTMLFontSize); - int vFontSize = -1 + wxAtoi(mmDBWrapper::getINISettingValue(inidb_, wxT("HTMLFONTSIZE"), wxT("Font Size on the reports"))); + int vFontSize = -1 + wxAtoi(mmDBWrapper::getINISettingValue(inidb_, wxT("HTMLFONTSIZE"), wxT("3"))); choiceFontSize_->SetSelection(vFontSize); choiceFontSize_->SetToolTip(_("Specify which font size is used on the report tables")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2012-04-04 12:43:09
|
Revision: 2103 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2103&view=rev Author: stef145g Date: 2012-04-04 12:43:00 +0000 (Wed, 04 Apr 2012) Log Message: ----------- Addition of new date format for database Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2012-04-04 06:24:45 UTC (rev 2102) +++ trunk/mmex/src/optionsdialog.cpp 2012-04-04 12:43:00 UTC (rev 2103) @@ -150,6 +150,7 @@ DateFormat.Add(wxT("%d.%m.%y")); DateFormat.Add(wxT("%d.%m.%Y")); DateFormat.Add(wxT("%d,%m,%y")); + DateFormat.Add(wxT("%d/%m'%Y")); DateFormat.Add(wxT("%d/%m %Y")); DateFormat.Add(wxT("%m/%d/%y")); DateFormat.Add(wxT("%m/%d/%Y")); @@ -177,6 +178,7 @@ itemChoice7Strings.Add(wxT("DD.MM.YY")); itemChoice7Strings.Add(wxT("DD.MM.YYYY")); itemChoice7Strings.Add(wxT("DD,MM,YY")); + itemChoice7Strings.Add(wxT("DD/MM'YYYY")); itemChoice7Strings.Add(wxT("DD/MM YYYY")); itemChoice7Strings.Add(wxT("MM/DD/YY")); itemChoice7Strings.Add(wxT("MM/DD/YYYY")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-05-06 05:55:44
|
Revision: 2256 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2256&view=rev Author: vomikan Date: 2012-05-06 05:55:37 +0000 (Sun, 06 May 2012) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2012-05-06 04:30:53 UTC (rev 2255) +++ trunk/mmex/src/optionsdialog.cpp 2012-05-06 05:55:37 UTC (rev 2256) @@ -6,12 +6,12 @@ it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -28,12 +28,12 @@ #include <wx/statline.h> #include <limits> -enum -{ +enum +{ ID_BOOK_PANEL_EXP_IMP = wxID_HIGHEST + 1, ID_DIALOG_OPTIONS_RADIOBUTTON_DELIMITER_USER4, ID_DIALOG_OPTIONS_RADIOBUTTON_DELIMITER_COMMA4, - ID_DIALOG_OPTIONS_RADIOBUTTON_DELIMITER_SEMICOLON4, + ID_DIALOG_OPTIONS_RADIOBUTTON_DELIMITER_SEMICOLON4, ID_DIALOG_OPTIONS_RADIOBUTTON_DELIMITER_TAB4, ID_DIALOG_OPTIONS_TEXTCTRL_DELIMITER4, }; @@ -44,7 +44,7 @@ EVT_BUTTON(ID_DIALOG_OPTIONS_BUTTON_CURRENCY, mmOptionsDialog::OnCurrency) EVT_BUTTON(ID_DIALOG_OPTIONS_BUTTON_DATEFORMAT, mmOptionsDialog::OnDateFormatChanged) EVT_BUTTON(ID_DIALOG_OPTIONS_BUTTON_LANGUAGE, mmOptionsDialog::OnLanguageChanged) - + /// Colour Changing events EVT_BUTTON(ID_DIALOG_OPTIONS_BUTTON_COLOR_NAVTREE, mmOptionsDialog::OnNavTreeColorChanged) EVT_BUTTON(ID_DIALOG_OPTIONS_BUTTON_COLOR_ALT0, mmOptionsDialog::OnAlt0Changed) @@ -77,21 +77,21 @@ } mmOptionsDialog::mmOptionsDialog( mmCoreDB* core, wxSQLite3Database* inidb, - wxWindow* parent, wxWindowID id, - const wxString& caption, + wxWindow* parent, wxWindowID id, + const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) : core_(core), inidb_(inidb), db_(core->db_.get()), restartRequired_(false) { Create(parent, id, caption, pos, size, style); } -bool mmOptionsDialog::Create( wxWindow* parent, wxWindowID id, - const wxString& caption, const wxPoint& pos, +bool mmOptionsDialog::Create( wxWindow* parent, wxWindowID id, + const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) { SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS); wxDialog::Create( parent, id, caption, pos, size, style ); - + /// initialize the colour variables navTreeBkColor_ = mmColors::navTreeBkColor; listAlternativeColor0_ = mmColors::listAlternativeColor0; @@ -114,7 +114,7 @@ wxArrayString mmOptionsDialog::viewAccountStrings(bool translated, wxString input_string, int& row_id_) { wxArrayString itemChoiceViewAccountStrings; - + if (translated) { itemChoiceViewAccountStrings.Add(_("All")); itemChoiceViewAccountStrings.Add(_("Open")); @@ -124,17 +124,17 @@ itemChoiceViewAccountStrings.Add(VIEW_ACCOUNTS_OPEN_STR); itemChoiceViewAccountStrings.Add(VIEW_ACCOUNTS_FAVORITES_STR); } - if (!input_string.IsEmpty()) + if (!input_string.IsEmpty()) { - for(size_t i = 0; i < itemChoiceViewAccountStrings.Count(); i++) - { - if(input_string == itemChoiceViewAccountStrings[i]) { - row_id_ = i; - break; - } - } + for(size_t i = 0; i < itemChoiceViewAccountStrings.Count(); i++) + { + if(input_string == itemChoiceViewAccountStrings[i]) { + row_id_ = i; + break; + } + } } - + return itemChoiceViewAccountStrings; } @@ -147,7 +147,7 @@ m_imageList->Add(wxBitmap(main_setup_xpm)); m_imageList->Add(wxBitmap(preferences_other_xpm)); m_imageList->Add(wxBitmap(export_import_xpm)); - + wxBoxSizer* mainDialogSizer = new wxBoxSizer(wxVERTICAL); this->SetSizer(mainDialogSizer); @@ -163,7 +163,7 @@ General Panel **********************************************************************************************/ wxPanel* generalPanel = new wxPanel(newBook, ID_BOOK_PANELGENERAL, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); - + SetMinSize(wxSize(500,600)); wxBoxSizer* generalPanelSizer = new wxBoxSizer(wxVERTICAL); generalPanel->SetSizer(generalPanelSizer); @@ -195,7 +195,7 @@ languageStaticBox->SetFont(staticBoxFontSetting); wxStaticBoxSizer* languageStaticBoxSizer = new wxStaticBoxSizer(languageStaticBox, wxHORIZONTAL); generalPanelSizer->Add(languageStaticBoxSizer, 0, wxALIGN_LEFT|wxGROW|wxALL, 5); - + currentLanguage_ = mmDBWrapper::getINISettingValue(inidb_, LANGUAGE_PARAMETER); wxButton* languageButton = new wxButton(generalPanel, ID_DIALOG_OPTIONS_BUTTON_LANGUAGE, currentLanguage_.Left(1).Upper() + currentLanguage_.SubString(1,currentLanguage_.Len()), @@ -209,7 +209,7 @@ wxStaticBoxSizer* currencyStaticBoxSizer = new wxStaticBoxSizer(currencyStaticBox, wxHORIZONTAL); currencyStaticBox->SetFont(staticBoxFontSetting); generalPanelSizer->Add(currencyStaticBoxSizer, 0, wxALIGN_LEFT|wxGROW|wxALL, 5); - + wxStaticText* baseCurrencyText = new wxStaticText(generalPanel, wxID_STATIC, _("Base Currency"), wxDefaultPosition, wxDefaultSize, 0); currencyStaticBoxSizer->Add(baseCurrencyText, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); @@ -229,9 +229,9 @@ wxFlexGridSizer* dateFormatSettingStaticBoxSizerGrid = new wxFlexGridSizer(2,2,0,5); generalPanelSizer->Add(dateFormatStaticBoxSizer, 0, wxALIGN_LEFT|wxGROW|wxALL, 5); dateFormatStaticBoxSizer->Add(dateFormatSettingStaticBoxSizerGrid); - - wxArrayString itemChoice7Strings = itemChoiceStrings(); - + + wxArrayString itemChoice7Strings = itemChoiceStrings(); + choiceDateFormat_ = new wxComboBox(generalPanel, ID_DIALOG_OPTIONS_DATE_FORMAT, wxT(""), wxDefaultPosition, wxSize(140, -1), itemChoice7Strings); dateFormatSettingStaticBoxSizerGrid->Add(choiceDateFormat_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); @@ -257,18 +257,18 @@ wxFlexGridSizer* financialYearStaticBoxSizerGrid = new wxFlexGridSizer(3,2,0,0); generalPanelSizer->Add(financialYearStaticBoxSizer, 0, wxGROW|wxALL, 5); financialYearStaticBoxSizer->Add(financialYearStaticBoxSizerGrid); - + wxStaticText* itemStaticTextFYSDay = new wxStaticText(generalPanel, wxID_STATIC, _("Start Day"), wxDefaultPosition, wxDefaultSize, 0 ); financialYearStaticBoxSizerGrid->Add(itemStaticTextFYSDay, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); wxString financialPeriodStartDay = mmDBWrapper::getInfoSettingValue(db_, wxT("FINANCIAL_YEAR_START_DAY"), wxT("1")); - int day = wxAtoi(financialPeriodStartDay); + int day = wxAtoi(financialPeriodStartDay); wxSpinCtrl *textFPSDay = new wxSpinCtrl(generalPanel, ID_DIALOG_OPTIONS_FINANCIAL_YEAR_START_DAY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 1, 31, day); textFPSDay->SetToolTip(_("Specify Day for start of financial year")); - + financialYearStaticBoxSizerGrid->Add(textFPSDay, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); wxStaticText* itemStaticTextSmonth = new wxStaticText(generalPanel, wxID_STATIC, _("Start Month"), @@ -284,11 +284,11 @@ wxDefaultPosition, wxSize(100, -1), financialMonthsSelection); financialYearStaticBoxSizerGrid->Add(monthSelection_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); wxString financialPeriodStartMonth = mmDBWrapper::getInfoSettingValue(db_, wxT("FINANCIAL_YEAR_START_MONTH"), wxT("7")); - + int monthItem = wxAtoi(financialPeriodStartMonth); monthSelection_->SetSelection(monthItem - 1); monthSelection_->SetToolTip(_("Specify month for start of financial year")); - + // Backup Settings wxStaticBox* backupStaticBox = new wxStaticBox(generalPanel, wxID_ANY, _("Database Backup")); backupStaticBox->SetFont(staticBoxFontSetting); @@ -326,16 +326,16 @@ int row_id_ = 0; wxArrayString itemChoiceViewAccountTranslatedStrings = viewAccountStrings(true, wxEmptyString, row_id_); - + choiceVisible_ = new wxChoice(viewsPanel, ID_DIALOG_OPTIONS_VIEW_ACCOUNTS, wxDefaultPosition, wxDefaultSize, itemChoiceViewAccountTranslatedStrings); accountStaticBoxSizer->Add(choiceVisible_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - + wxString vAccts = mmDBWrapper::getINISettingValue(inidb_, wxT("VIEWACCOUNTS"), VIEW_ACCOUNTS_ALL_STR); row_id_ = 0; wxArrayString itemChoiceViewAccountStrings = viewAccountStrings(false, vAccts, row_id_); choiceVisible_->SetSelection(row_id_); - + choiceVisible_->SetToolTip(_("Specify which accounts are visible")); // Transaction View options @@ -353,7 +353,7 @@ dateFormatSettingStaticBoxSizerGrid2->Add(transVisibleStaticText, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - wxArrayString itemChoiceViewTransStrings; + wxArrayString itemChoiceViewTransStrings; itemChoiceViewTransStrings.Add(_("View All Transactions")); itemChoiceViewTransStrings.Add(_("View Today")); itemChoiceViewTransStrings.Add(_("View Current Month")); @@ -381,7 +381,7 @@ fontSizeOptionStaticBoxSizer->Add(reportFontSizeStaticText, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - wxArrayString itemChoiceHTMLFontSize; + wxArrayString itemChoiceHTMLFontSize; itemChoiceHTMLFontSize.Add(wxT("XSmall")); itemChoiceHTMLFontSize.Add(wxT("Small")); @@ -390,7 +390,7 @@ itemChoiceHTMLFontSize.Add(wxT("XLarge")); itemChoiceHTMLFontSize.Add(wxT("XXLarge")); itemChoiceHTMLFontSize.Add(wxT("Huge")); - + choiceFontSize_ = new wxChoice(viewsPanel, ID_DIALOG_OPTIONS_FONT_SIZE, wxDefaultPosition, wxSize(85, -1), itemChoiceHTMLFontSize); @@ -419,7 +419,7 @@ expandTermCheckBox->SetValue(GetIniDatabaseCheckboxValue(wxT("EXPAND_TERM_TREE"),false)); expandTermCheckBox->SetToolTip(_("Expand Term Accounts in Trew View when tree is refreshed")); navTreeOptionsStaticBoxSizer->Add(expandTermCheckBox, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - + // Home Page Expansion Options wxStaticBox* homePageStaticBox = new wxStaticBox(viewsPanel, wxID_ANY, _("Home Page Expansion Options")); homePageStaticBox->SetFont(staticBoxFontSetting); @@ -522,7 +522,7 @@ listBorderButton->SetBackgroundColour(mmColors::listBorderColor); colourPanelSizerGrid->Add(listBorderSaticText, 0, wxALIGN_LEFT, 5); colourPanelSizerGrid->Add(listBorderButton, 0, wxALIGN_LEFT, 5); - + wxStaticText* listDetailsStaticText = new wxStaticText( colourPanel, wxID_STATIC, _("List Details")); wxButton* listDetailsButton = new wxButton( colourPanel, ID_DIALOG_OPTIONS_BUTTON_COLOR_LISTDETAILS, _("List Details"), wxDefaultPosition, navTreeButton->GetSize(), 0); @@ -530,7 +530,7 @@ listDetailsButton->SetBackgroundColour(mmColors::listDetailsPanelColor); colourPanelSizerGrid->Add(listDetailsStaticText, 0, wxALIGN_LEFT, 5); colourPanelSizerGrid->Add(listDetailsButton, 0, wxALIGN_LEFT, 5); - + wxStaticText* futureTransStaticText = new wxStaticText( colourPanel, wxID_STATIC, _("Future Transactions")); wxButton* futureTransButton = new wxButton( colourPanel, ID_DIALOG_OPTIONS_BUTTON_COLOR_FUTUREDATES, _("Future Transactions"), wxDefaultPosition, navTreeButton->GetSize(), 0); @@ -543,14 +543,14 @@ _("Restore Defaults"), wxDefaultPosition, wxDefaultSize, 0); restoreDefaultButton->SetToolTip(_("Restore Default Colors")); colourPanelSizer->Add(restoreDefaultButton, 0, wxALIGN_LEFT|wxALL, 5); - + /********************************************************************************************* Others Panel **********************************************************************************************/ wxPanel* othersPanel = new wxPanel(newBook, ID_BOOK_PANELMISC, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); wxBoxSizer* othersPanelSizer = new wxBoxSizer(wxVERTICAL); othersPanel->SetSizer(othersPanelSizer); - + // New transaction dialog settings wxStaticBox* transSettingsStaticBox = new wxStaticBox(othersPanel, wxID_ANY, _("New Transaction Dialog Settings")); transSettingsStaticBox->SetFont(staticBoxFontSetting); @@ -565,7 +565,7 @@ wxArrayString defaultValues_; defaultValues_.Add(_("None")); defaultValues_.Add(_("Last Used")); - + wxChoice* defaultDateChoice = new wxChoice(othersPanel, ID_DIALOG_OPTIONS_DEFAULT_TRANSACTION_DATE, wxDefaultPosition, wxSize(140, -1), defaultValues_); defaultDateChoice->SetSelection(mmIniOptions::instance().transDateDefault_); @@ -577,14 +577,14 @@ wxChoice* defaultPayeeChoice = new wxChoice(othersPanel, ID_DIALOG_OPTIONS_DEFAULT_TRANSACTION_PAYEE, wxDefaultPosition, wxSize(140, -1), defaultValues_); defaultPayeeChoice->SetSelection(mmIniOptions::instance().transPayeeSelectionNone_); - + // Default Category wxStaticText* categoryStaticText = new wxStaticText(othersPanel, wxID_STATIC, _("Default Category:"), wxDefaultPosition, wxDefaultSize); defaultValues_[1]=(_("Last used for payee")); - + wxChoice* defaultCategoryChoice = new wxChoice(othersPanel, ID_DIALOG_OPTIONS_DEFAULT_TRANSACTION_CATEGORY, wxDefaultPosition, defaultPayeeChoice->GetSize(), defaultValues_); defaultCategoryChoice->SetSelection(mmIniOptions::instance().transCategorySelectionNone_); @@ -618,7 +618,7 @@ //---------------------------------------------- //a bit more space visual appearance othersPanelSizer->AddSpacer(10); - + wxBoxSizer* itemBoxSizerStockURL = new wxBoxSizer(wxVERTICAL); othersPanelSizer->Add(itemBoxSizerStockURL, 0, wxGROW|wxALIGN_LEFT|wxALL, 0); @@ -638,7 +638,7 @@ cbUseOrgDateCopyPaste_->SetValue(GetIniDatabaseCheckboxValue(INIDB_USE_ORG_DATE_COPYPASTE, false)); cbUseOrgDateCopyPaste_->SetToolTip(_("Select whether to use the original transaction date or current date when copying/pasting transactions")); othersPanelSizer->Add(cbUseOrgDateCopyPaste_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - + cbUseSound_ = new wxCheckBox(othersPanel, wxID_ANY, _("Use Transaction Sound"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE); cbUseSound_->SetValue(GetIniDatabaseCheckboxValue(INIDB_USE_TRANSACTION_SOUND,true)); cbUseSound_->SetToolTip(_("Select whether to use sounds when entering transactions")); @@ -653,16 +653,16 @@ Import/Export Panel **********************************************************************************************/ wxPanel* importExportPanel = new wxPanel(newBook, ID_BOOK_PANEL_EXP_IMP, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); - + wxBoxSizer* importExportPanelSizer = new wxBoxSizer(wxVERTICAL); importExportPanel->SetSizer(importExportPanelSizer); wxStaticBox* importExportStaticBox = new wxStaticBox(importExportPanel, wxID_ANY, _("Import/Export Settings")); importExportStaticBox->SetFont(staticBoxFontSetting); wxStaticBoxSizer* importExportStaticBoxSizer = new wxStaticBoxSizer(importExportStaticBox, wxVERTICAL); - + importExportPanelSizer->Add(importExportStaticBoxSizer, 0, wxALIGN_LEFT|wxGROW|wxALL, 5); - + wxStaticText* csvDelimiterStaticText = new wxStaticText(importExportPanel, wxID_STATIC, _("CSV Delimiter"), wxDefaultPosition, wxDefaultSize, 0); importExportStaticBoxSizer->Add(csvDelimiterStaticText, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); @@ -673,7 +673,7 @@ importExportStaticBoxSizer->AddSpacer(5); wxString delimiter = mmDBWrapper::getInfoSettingValue(db_, wxT("DELIMITER"), mmex::DEFDELIMTER); - + wxRadioButton* delimiterRadioButtonU4 = new wxRadioButton(importExportPanel, ID_DIALOG_OPTIONS_RADIOBUTTON_DELIMITER_USER4, _("User Defined"), wxDefaultPosition, wxDefaultSize, 0); wxRadioButton* delimiterRadioButtonC4 = new wxRadioButton(importExportPanel, ID_DIALOG_OPTIONS_RADIOBUTTON_DELIMITER_COMMA4, _("Comma"), wxDefaultPosition, wxDefaultSize, 0); if (delimiter == wxT(",")) delimiterRadioButtonC4 ->SetValue(true); @@ -725,12 +725,12 @@ **********************************************************************************************/ wxStaticLine* panelSeparatorLine = new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); mainDialogSizer->Add(panelSeparatorLine,0,wxGROW|wxLEFT|wxRIGHT, 10); - + wxPanel* buttonPanel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); wxBoxSizer* buttonPanelSizer = new wxBoxSizer(wxHORIZONTAL); buttonPanel->SetSizer(buttonPanelSizer); mainDialogSizer->Add(buttonPanel, 0, wxALIGN_RIGHT|wxALL, 5); - + wxButton* itemButtonOK = new wxButton(buttonPanel, wxID_OK, _("&OK")); wxButton* itemButtonCancel = new wxButton(buttonPanel, wxID_CANCEL, _("&Cancel")); buttonPanelSizer->Add(itemButtonOK, 0, wxALIGN_RIGHT|wxRIGHT, 5); @@ -754,7 +754,7 @@ void mmOptionsDialog::OnCurrency(wxCommandEvent& /*event*/) { int currencyID = mmDBWrapper::getBaseCurrencySettings(db_); - + if (mmMainCurrencyDialog::Execute(core_, this, currencyID) && currencyID != -1) { wxString currName = core_->getCurrencyName(currencyID); @@ -763,7 +763,7 @@ currencyId_ = currencyID; wxMessageDialog msgDlg(this, _("Remember to update currency rate"), _("Important note")); - msgDlg.ShowModal(); + msgDlg.ShowModal(); } } @@ -950,7 +950,7 @@ { wxString dbState = wxT("FALSE"); bool result = false; - + if (defaultState) { dbState = wxT("TRUE"); @@ -1012,12 +1012,12 @@ wxSpinCtrl* fysDay = (wxSpinCtrl*)FindWindow(ID_DIALOG_OPTIONS_FINANCIAL_YEAR_START_DAY); wxString fysDayVal = wxString::Format(wxT("%d"),fysDay->GetValue()); mmOptions::instance().financialYearStartDayString_ = fysDayVal; - mmDBWrapper::setInfoSettingValue(db_, wxT("FINANCIAL_YEAR_START_DAY"), fysDayVal); + mmDBWrapper::setInfoSettingValue(db_, wxT("FINANCIAL_YEAR_START_DAY"), fysDayVal); //Save Financial Year Start Month wxString fysMonthVal = wxString() << monthSelection_->GetSelection() + 1; mmOptions::instance().financialYearStartMonthString_ = fysMonthVal; - mmDBWrapper::setInfoSettingValue(db_, wxT("FINANCIAL_YEAR_START_MONTH"), fysMonthVal); + mmDBWrapper::setInfoSettingValue(db_, wxT("FINANCIAL_YEAR_START_MONTH"), fysMonthVal); } void mmOptionsDialog::SaveStocksUrl() @@ -1026,8 +1026,8 @@ wxString stockURL = url->GetValue(); if (!stockURL.IsEmpty()) { - mmDBWrapper::setInfoSettingValue(db_, wxT("STOCKURL"), stockURL); - } + mmDBWrapper::setInfoSettingValue(db_, wxT("STOCKURL"), stockURL); + } else { // Clear database record: Allows value to reset to system default. @@ -1058,7 +1058,7 @@ { wxTextCtrl* stun = (wxTextCtrl*)FindWindow(ID_DIALOG_OPTIONS_TEXTCTRL_USERNAME); mmIniOptions::instance().userNameString_ = stun->GetValue(); - mmDBWrapper::setInfoSettingValue(db_, wxT("USERNAME"), mmIniOptions::instance().userNameString_); + mmDBWrapper::setInfoSettingValue(db_, wxT("USERNAME"), mmIniOptions::instance().userNameString_); wxButton *languageButton = (wxButton*)FindWindow(ID_DIALOG_OPTIONS_BUTTON_LANGUAGE); mmDBWrapper::setINISettingValue(inidb_, LANGUAGE_PARAMETER, languageButton->GetLabel().Lower()); @@ -1067,7 +1067,7 @@ mmDBWrapper::setBaseCurrencySettings(db_, currencyId_); mmDBWrapper::setInfoSettingValue(db_, wxT("DATEFORMAT"), dateFormat_); SaveFinancialYearStart(); - + wxCheckBox* itemCheckBox = (wxCheckBox*)FindWindow(ID_DIALOG_OPTIONS_CHK_BACKUP); SetIniDatabaseCheckboxValue(wxT("BACKUPDB"), itemCheckBox->GetValue() ); @@ -1144,27 +1144,27 @@ wxChoice* itemChoice = (wxChoice*)FindWindow(ID_DIALOG_OPTIONS_DEFAULT_TRANSACTION_PAYEE); mmIniOptions::instance().transPayeeSelectionNone_ = itemChoice->GetSelection(); mmDBWrapper::setINISettingValue(inidb_, wxT("TRANSACTION_PAYEE_NONE"), - wxString::Format(wxT("%d"), (int)mmIniOptions::instance().transPayeeSelectionNone_)); - + wxString::Format(wxT("%d"), (int)mmIniOptions::instance().transPayeeSelectionNone_)); + itemChoice = (wxChoice*)FindWindow(ID_DIALOG_OPTIONS_DEFAULT_TRANSACTION_CATEGORY); mmIniOptions::instance().transCategorySelectionNone_ = itemChoice->GetSelection(); mmDBWrapper::setINISettingValue(inidb_, wxT("TRANSACTION_CATEGORY_NONE"), - wxString::Format(wxT("%d"), (int)mmIniOptions::instance().transCategorySelectionNone_)); - + wxString::Format(wxT("%d"), (int)mmIniOptions::instance().transCategorySelectionNone_)); + itemChoice = (wxChoice*)FindWindow(ID_DIALOG_OPTIONS_DEFAULT_TRANSACTION_STATUS); mmIniOptions::instance().transStatusReconciled_ = itemChoice->GetSelection(); mmDBWrapper::setINISettingValue(inidb_, wxT("TRANSACTION_STATUS_RECONCILED"), - wxString::Format(wxT("%d"), (int)mmIniOptions::instance().transStatusReconciled_)); + wxString::Format(wxT("%d"), (int)mmIniOptions::instance().transStatusReconciled_)); itemChoice = (wxChoice*)FindWindow(ID_DIALOG_OPTIONS_DEFAULT_TRANSACTION_DATE); mmIniOptions::instance().transDateDefault_ = itemChoice->GetSelection(); mmDBWrapper::setINISettingValue(inidb_, wxT("TRANSACTION_DATE_DEFAULT"), - wxString::Format(wxT("%d"), (int)mmIniOptions::instance().transDateDefault_)); - + wxString::Format(wxT("%d"), (int)mmIniOptions::instance().transDateDefault_)); + SaveStocksUrl(); - + SetIniDatabaseCheckboxValue(INIDB_USE_ORG_DATE_COPYPASTE, cbUseOrgDateCopyPaste_->GetValue()); - + SetIniDatabaseCheckboxValue(INIDB_USE_TRANSACTION_SOUND, cbUseSound_->GetValue()); SetIniDatabaseCheckboxValue(INIDB_UPDATE_CURRENCY_RATE, cbEnableCurrencyUpd_->GetValue()); @@ -1174,7 +1174,7 @@ { wxTextCtrl* st = (wxTextCtrl*)FindWindow(ID_DIALOG_OPTIONS_TEXTCTRL_DELIMITER4); wxString delim = st->GetValue(); - if (!delim.IsEmpty()) mmDBWrapper::setInfoSettingValue(db_, wxT("DELIMITER"), delim); + if (!delim.IsEmpty()) mmDBWrapper::setInfoSettingValue(db_, wxT("DELIMITER"), delim); } bool mmOptionsDialog::GetUpdateCurrencyRateSetting() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-05-06 20:08:13
|
Revision: 2259 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2259&view=rev Author: vomikan Date: 2012-05-06 20:08:07 +0000 (Sun, 06 May 2012) Log Message: ----------- revert changes for New Transaction Dialog buttons Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2012-05-06 13:06:44 UTC (rev 2258) +++ trunk/mmex/src/optionsdialog.cpp 2012-05-06 20:08:07 UTC (rev 2259) @@ -580,7 +580,7 @@ defaultValues_.Add(_("Last Used")); wxChoice* defaultDateChoice = new wxChoice(othersPanel, ID_DIALOG_OPTIONS_DEFAULT_TRANSACTION_DATE, - wxDefaultPosition, wxSize(180, -1), defaultValues_); + wxDefaultPosition, wxSize(140, -1), defaultValues_); defaultDateChoice->SetSelection(mmIniOptions::instance().transDateDefault_); newTransflexGridSizer->Add(dateStaticText, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); newTransflexGridSizer->Add(defaultDateChoice, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-05-10 11:11:44
|
Revision: 2306 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2306&view=rev Author: vomikan Date: 2012-05-10 11:11:34 +0000 (Thu, 10 May 2012) Log Message: ----------- added indicator if some color changed Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2012-05-10 10:44:10 UTC (rev 2305) +++ trunk/mmex/src/optionsdialog.cpp 2012-05-10 11:11:34 UTC (rev 2306) @@ -785,6 +785,7 @@ { int id = event.GetId(); + wxString label; wxColour col; wxColourData data; data.SetChooseFull(true); @@ -848,42 +849,51 @@ wxASSERT(false); } bn->SetBackgroundColour(col); - bn->SetLabel(col.GetAsString(wxC2S_HTML_SYNTAX)); + label = bn->GetLabel()+wxT("*"); + label.Replace(wxT("****"), wxT("***")); + bn->SetLabel(label); } } void mmOptionsDialog::OnRestoreDefaultColors(wxCommandEvent& /*event*/) { // set the new colours to the default colours - navTreeBkColor_ = wxColour(255, 255, 255); + navTreeBkColor_ = wxColour(wxT("WHITE")); listAlternativeColor0_ = wxColour(225, 237, 251); - listAlternativeColor1_ = wxColour(255, 255, 255); - listBackColor_ = wxColour(255, 255, 255); - listBorderColor_ = wxColour(0, 0, 0); + listAlternativeColor1_ = wxColour(wxT("WHITE")); + listBackColor_ = wxColour(wxT("WHITE")); + listBorderColor_ = wxColour(wxT("BLACK")); listDetailsPanelColor_ = wxColour(244, 247, 251); listFutureDateColor_ = wxColour(116, 134, 168); // Display the original colours to the user wxButton* bn1 = (wxButton*)FindWindow(ID_DIALOG_OPTIONS_BUTTON_COLOR_NAVTREE); bn1->SetBackgroundColour(navTreeBkColor_); + bn1->SetLabel(_("Nav Tree")); wxButton* bn2 = (wxButton*)FindWindow(ID_DIALOG_OPTIONS_BUTTON_COLOR_ALT0); bn2->SetBackgroundColour(listAlternativeColor0_); + bn2->SetLabel(_("List Row 0")); wxButton* bn3 = (wxButton*)FindWindow(ID_DIALOG_OPTIONS_BUTTON_COLOR_ALT1); bn3->SetBackgroundColour(listAlternativeColor1_); + bn3->SetLabel(_("List Row 1")); wxButton* bn4 = (wxButton*)FindWindow(ID_DIALOG_OPTIONS_BUTTON_COLOR_LISTBACK); bn4->SetBackgroundColour(listBackColor_); + bn4->SetLabel(_("List Background")); wxButton* bn5 = (wxButton*)FindWindow(ID_DIALOG_OPTIONS_BUTTON_COLOR_LISTBORDER); bn5->SetBackgroundColour(listBorderColor_); + bn5->SetLabel(_("List Border")); wxButton* bn6 = (wxButton*)FindWindow(ID_DIALOG_OPTIONS_BUTTON_COLOR_LISTDETAILS); bn6->SetBackgroundColour(listDetailsPanelColor_); + bn6->SetLabel(_("List Details")); wxButton* bn7 = (wxButton*)FindWindow(ID_DIALOG_OPTIONS_BUTTON_COLOR_FUTUREDATES); bn7->SetBackgroundColour(listFutureDateColor_); + bn7->SetLabel(_("Future Transactions")); } void mmOptionsDialog::SetIniDatabaseCheckboxValue(wxString dbField, bool dbState) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-05-10 11:46:01
|
Revision: 2307 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2307&view=rev Author: vomikan Date: 2012-05-10 11:45:55 +0000 (Thu, 10 May 2012) Log Message: ----------- fix for wxASSERT(false) Modified Paths: -------------- trunk/mmex/src/optionsdialog.cpp Modified: trunk/mmex/src/optionsdialog.cpp =================================================================== --- trunk/mmex/src/optionsdialog.cpp 2012-05-10 11:11:34 UTC (rev 2306) +++ trunk/mmex/src/optionsdialog.cpp 2012-05-10 11:45:55 UTC (rev 2307) @@ -846,6 +846,7 @@ listFutureDateColor_ = col; break; } + default: wxASSERT(false); } bn->SetBackgroundColour(col); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |