From: <vo...@us...> - 2011-11-27 20:29:32
|
Revision: 1538 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1538&view=rev Author: vomikan Date: 2011-11-27 20:29:26 +0000 (Sun, 27 Nov 2011) Log Message: ----------- buttons changed Modified Paths: -------------- trunk/mmex/src/categdialog.cpp trunk/mmex/src/categdialog.h trunk/mmex/src/customreportdialog.cpp trunk/mmex/src/guiid.h Modified: trunk/mmex/src/categdialog.cpp =================================================================== --- trunk/mmex/src/categdialog.cpp 2011-11-27 18:57:44 UTC (rev 1537) +++ trunk/mmex/src/categdialog.cpp 2011-11-27 20:29:26 UTC (rev 1538) @@ -24,13 +24,13 @@ IMPLEMENT_DYNAMIC_CLASS( mmCategDialog, wxDialog ) BEGIN_EVENT_TABLE( mmCategDialog, wxDialog ) - EVT_BUTTON(ID_DIALOG_CATEG_BUTTON_OK, mmCategDialog::OnOk) - EVT_BUTTON(ID_DIALOG_CATEG_BUTTON_ADD, mmCategDialog::OnAdd) - EVT_BUTTON(ID_DIALOG_CATEG_BUTTON_DELETE, mmCategDialog::OnDelete) - EVT_BUTTON(ID_DIALOG_CATEG_BUTTON_SELECT, mmCategDialog::OnBSelect) - EVT_BUTTON(ID_DIALOG_CATEG_BUTTON_EDIT, mmCategDialog::OnEdit) + EVT_BUTTON(wxID_OK, mmCategDialog::OnBSelect) + EVT_BUTTON(wxID_CANCEL, mmCategDialog::OnCancel) + EVT_BUTTON(wxID_ADD, mmCategDialog::OnAdd) + EVT_BUTTON(wxID_DELETE, mmCategDialog::OnDelete) + EVT_BUTTON(wxID_SELECTALL, mmCategDialog::OnBSelect) + EVT_BUTTON(wxID_EDIT, mmCategDialog::OnEdit) EVT_TREE_SEL_CHANGED(ID_DIALOG_CATEG_TREECTRL_CATS, mmCategDialog::OnSelChanged) - //EVT_TREE_ITEM_ACTIVATED(ID_DIALOG_CATEG_TREECTRL_CATS, mmCategDialog::OnDoubleClicked) END_EVENT_TABLE() mmCategDialog::mmCategDialog( ) @@ -115,10 +115,10 @@ treeCtrl_->SortChildren(root_); wxTextCtrl* textCtrl = (wxTextCtrl*)FindWindow(ID_DIALOG_CATEG_TEXTCTRL_CATNAME); - wxButton* addButton = (wxButton*)FindWindow(ID_DIALOG_CATEG_BUTTON_ADD); - wxButton* editButton = (wxButton*)FindWindow(ID_DIALOG_CATEG_BUTTON_EDIT); - wxButton* selectButton = (wxButton*)FindWindow(ID_DIALOG_CATEG_BUTTON_SELECT); - wxButton* deleteButton = (wxButton*)FindWindow(ID_DIALOG_CATEG_BUTTON_DELETE); + wxButton* addButton = (wxButton*)FindWindow(wxID_ADD); + wxButton* editButton = (wxButton*)FindWindow(wxID_EDIT); + wxButton* selectButton = (wxButton*)FindWindow(wxID_SELECTALL); + wxButton* deleteButton = (wxButton*)FindWindow(wxID_DELETE); treeCtrl_->SelectItem(selectedItemId_); @@ -158,17 +158,17 @@ wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer5, 0, wxGROW|wxALL, 5); - wxButton* itemButton7 = new wxButton( itemDialog1, ID_DIALOG_CATEG_BUTTON_ADD, + wxButton* itemButton7 = new wxButton( itemDialog1, wxID_ADD, _("&Add"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer5->Add(itemButton7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); itemButton7->SetToolTip(_("Add a new category")); - wxButton* itemButton71 = new wxButton( itemDialog1, ID_DIALOG_CATEG_BUTTON_EDIT, + wxButton* itemButton71 = new wxButton( itemDialog1, wxID_EDIT, _("&Edit"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer5->Add(itemButton71, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); itemButton71->SetToolTip(_("Edit the name of an existing category")); - wxButton* itemButton8 = new wxButton( itemDialog1, ID_DIALOG_CATEG_BUTTON_DELETE, + wxButton* itemButton8 = new wxButton( itemDialog1, wxID_DELETE, _("&Delete"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer5->Add(itemButton8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); itemButton8->SetToolTip(_("Delete an existing category. The category cannot be used by existing transactions.")); @@ -176,13 +176,13 @@ wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer9, 0, wxGROW|wxALL, 5); - wxButton* itemButton11 = new wxButton( itemDialog1, ID_DIALOG_CATEG_BUTTON_SELECT, + wxButton* itemButton11 = new wxButton( itemDialog1, wxID_SELECTALL, _("&Select"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer9->Add(itemButton11, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1); itemButton11->SetToolTip(_("Select the currently selected category as the selected category for the transaction")); //Some interfaces has no any close buttons, it may confuse user. Cancel button added - wxButton* itemCancelButton = new wxButton( itemDialog1, wxID_CANCEL, _("&Close")); + wxButton* itemCancelButton = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel")); itemBoxSizer9->Add(itemCancelButton); } @@ -336,9 +336,14 @@ void mmCategDialog::OnOk(wxCommandEvent& /*event*/) { - Close(TRUE); + EndModal(wxID_OK); } +void mmCategDialog::OnCancel(wxCommandEvent& /*event*/) +{ + EndModal(wxID_CANCEL); +} + void mmCategDialog::OnSelChanged(wxTreeEvent& event) { selectedItemId_ = event.GetItem(); @@ -358,10 +363,10 @@ subcategID = iData->getSubCategID(); } - wxButton* addButton = (wxButton*)FindWindow(ID_DIALOG_CATEG_BUTTON_ADD); - wxButton* editButton = (wxButton*)FindWindow(ID_DIALOG_CATEG_BUTTON_EDIT); - wxButton* selectButton = (wxButton*)FindWindow(ID_DIALOG_CATEG_BUTTON_SELECT); - wxButton* deleteButton = (wxButton*)FindWindow(ID_DIALOG_CATEG_BUTTON_DELETE); + wxButton* addButton = (wxButton*)FindWindow(wxID_ADD); + wxButton* editButton = (wxButton*)FindWindow(wxID_EDIT); + wxButton* selectButton = (wxButton*)FindWindow(wxID_SELECTALL); + wxButton* deleteButton = (wxButton*)FindWindow(wxID_DELETE); if (selectedItemId_ == root_) { textCtrl->SetValue(wxT("")); @@ -454,3 +459,4 @@ } } } + Modified: trunk/mmex/src/categdialog.h =================================================================== --- trunk/mmex/src/categdialog.h 2011-11-27 18:57:44 UTC (rev 1537) +++ trunk/mmex/src/categdialog.h 2011-11-27 20:29:26 UTC (rev 1538) @@ -66,9 +66,10 @@ long style = SYMBOL_CATEGDIALOG_STYLE ); void CreateControls(); - + // utility functions void OnOk(wxCommandEvent& event); + void OnCancel(wxCommandEvent& event); void OnAdd(wxCommandEvent& event); void OnDelete(wxCommandEvent& event); void OnBSelect(wxCommandEvent& event); @@ -92,7 +93,7 @@ public: int categID_; int subcategID_; - + void setFields(int categID, int subcategID) ; }; #endif Modified: trunk/mmex/src/customreportdialog.cpp =================================================================== --- trunk/mmex/src/customreportdialog.cpp 2011-11-27 18:57:44 UTC (rev 1537) +++ trunk/mmex/src/customreportdialog.cpp 2011-11-27 20:29:26 UTC (rev 1538) @@ -19,6 +19,8 @@ #include "customreportdialog.h" #include "paths.h" #include "util.h" +#include <wx/cshelp.h> +#include <wx/html/helpctrl.h> const int titleTextWidth = 350; // Determines width of Headings Textbox. const int sourceTextHeight = 200; // Determines height of Source Textbox. @@ -26,11 +28,12 @@ IMPLEMENT_DYNAMIC_CLASS( mmCustomSQLDialog, wxDialog ) BEGIN_EVENT_TABLE( mmCustomSQLDialog, wxDialog ) - EVT_BUTTON(DIALOG_CUSTOM_SQL_BTN_LOAD, mmCustomSQLDialog::OnLoad) - EVT_BUTTON(DIALOG_CUSTOM_SQL_BTN_SAVE, mmCustomSQLDialog::OnSave) + EVT_BUTTON(wxID_HELP, mmCustomSQLDialog::OnDialogContextHelp) + EVT_BUTTON(wxID_OPEN, mmCustomSQLDialog::OnLoad) + EVT_BUTTON(wxID_SAVE, mmCustomSQLDialog::OnSave) EVT_BUTTON(DIALOG_CUSTOM_SQL_BTN_QUERY, mmCustomSQLDialog::OnRun) - EVT_BUTTON(DIALOG_CUSTOM_SQL_BTN_CLEAR, mmCustomSQLDialog::OnClear) - EVT_BUTTON(DIALOG_CUSTOM_SQL_BTN_CLOSE, mmCustomSQLDialog::OnClose) + EVT_BUTTON(wxID_CLEAR, mmCustomSQLDialog::OnClear) + EVT_BUTTON(wxID_CLOSE, mmCustomSQLDialog::OnClose) EVT_CHECKBOX(DIALOG_CUSTOM_SQL_CHKBOX_HEADING_ONLY, mmCustomSQLDialog::OnCheckedHeading) EVT_CHECKBOX(DIALOG_CUSTOM_SQL_CHKBOX_SUB_REPORT, mmCustomSQLDialog::OnCheckedSubReport) EVT_TEXT( DIALOG_CUSTOM_SQL_TXTCTRL_REPORT_TITLE, mmCustomSQLDialog::OnTextChangeHeading) @@ -116,11 +119,11 @@ wxBoxSizer* buttonPanelSizer = new wxBoxSizer(wxHORIZONTAL); buttonPanel->SetSizer(buttonPanelSizer); - button_Load_ = new wxButton( buttonPanel, DIALOG_CUSTOM_SQL_BTN_LOAD, _("&Load"), wxDefaultPosition, wxDefaultSize, 0 ); + button_Load_ = new wxButton( buttonPanel, wxID_OPEN, _("&Open"), wxDefaultPosition, wxDefaultSize, 0 ); buttonPanelSizer->Add(button_Load_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); button_Load_->SetToolTip(_("Locate and load an SQL script file.")); - button_Save_ = new wxButton( buttonPanel, DIALOG_CUSTOM_SQL_BTN_SAVE, _("&Save"), wxDefaultPosition, wxDefaultSize, 0 ); + button_Save_ = new wxButton( buttonPanel, wxID_SAVE, _("&Save"), wxDefaultPosition, wxDefaultSize, 0 ); buttonPanelSizer->Add(button_Save_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); button_Save_->SetToolTip(_("Save Heading details to the Index File, and SQL script file as required.")); @@ -128,14 +131,18 @@ buttonPanelSizer->Add(button_Run_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); button_Run_->SetToolTip(_("Test script. Save before running. SQL errors will result in loss of script details.")); - wxButton* button_Clear = new wxButton( buttonPanel, DIALOG_CUSTOM_SQL_BTN_CLEAR, _("C&lear"), wxDefaultPosition, wxDefaultSize, 0 ); + wxButton* button_Clear = new wxButton( buttonPanel, wxID_CLEAR, _("&Clear"), wxDefaultPosition, wxDefaultSize, 0 ); buttonPanelSizer->Add(button_Clear, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); button_Clear->SetToolTip(_("Clear the SQL Source script area")); - wxButton* button_Close = new wxButton( buttonPanel, DIALOG_CUSTOM_SQL_BTN_CLOSE, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 ); + wxButton* button_Close = new wxButton( buttonPanel, wxID_CLOSE, _("&Close"), wxDefaultPosition, wxDefaultSize, 0 ); buttonPanelSizer->Add(button_Close, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); button_Close->SetToolTip(_("Save changes before closing. Changes without Saving will be lost.")); + //TODO: Help page + //wxButton* button_Help = new wxButton( buttonPanel, wxID_HELP, _("&Help"), wxDefaultPosition, wxDefaultSize, 0 ); + //buttonPanelSizer->Add(button_Help, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + button_Save_->Disable(); // Will be activated if text changes in either text field. if (edit_) @@ -350,7 +357,14 @@ } } +void mmCustomSQLDialog::OnDialogContextHelp(wxCommandEvent & event) +{ +// dlg(this); +// dlg.ShowModal(); +} + //mmCustomSQLDialog::~mmCustomSQLDialog() //{ // wxMessageBox(wxT("Testing that the dialog is being destroyed.\nGoodby.."),wxT("Custom SQL Dialog destructor...")); //} + Modified: trunk/mmex/src/guiid.h =================================================================== --- trunk/mmex/src/guiid.h 2011-11-27 18:57:44 UTC (rev 1537) +++ trunk/mmex/src/guiid.h 2011-11-27 20:29:26 UTC (rev 1538) @@ -98,11 +98,11 @@ MENU_CUSTOM_SQL_REPORT_DELETE, MENU_TREEPOPUP_CUSTOM_SQL_REPORT_EDIT, MENU_TREEPOPUP_CUSTOM_SQL_REPORT_DELETE, - DIALOG_CUSTOM_SQL_BTN_LOAD, - DIALOG_CUSTOM_SQL_BTN_SAVE, + //DIALOG_CUSTOM_SQL_BTN_LOAD, + //DIALOG_CUSTOM_SQL_BTN_SAVE, DIALOG_CUSTOM_SQL_BTN_QUERY, - DIALOG_CUSTOM_SQL_BTN_CLEAR, - DIALOG_CUSTOM_SQL_BTN_CLOSE, + //DIALOG_CUSTOM_SQL_BTN_CLEAR, + //DIALOG_CUSTOM_SQL_BTN_CLOSE, DIALOG_CUSTOM_SQL_TXTCTRL_SOURCE, DIALOG_CUSTOM_SQL_TXTCTRL_REPORT_TITLE, DIALOG_CUSTOM_SQL_CHKBOX_HEADING_ONLY, @@ -289,11 +289,11 @@ ID_DIALOG_CATEGORY, ID_DIALOG_CATEG_TEXTCTRL_CATNAME, ID_DIALOG_CATEG_TREECTRL_CATS, - ID_DIALOG_CATEG_BUTTON_ADD, - ID_DIALOG_CATEG_BUTTON_DELETE, - ID_DIALOG_CATEG_BUTTON_SELECT, - ID_DIALOG_CATEG_BUTTON_OK, - ID_DIALOG_CATEG_BUTTON_EDIT, + //ID_DIALOG_CATEG_BUTTON_ADD, + //ID_DIALOG_CATEG_BUTTON_DELETE, + //ID_DIALOG_CATEG_BUTTON_SELECT, + //ID_DIALOG_CATEG_BUTTON_OK, + //ID_DIALOG_CATEG_BUTTON_EDIT, /* Category and Payee Relocation */ ID_DIALOG_CATEG_SELECT_BUTTON_SOURCE, @@ -447,6 +447,7 @@ MENU_TREEPOPUP_ACCOUNT_VIEWOPEN, AUTO_REPEAT_TRANSACTIONS_TIMER_ID, + }; //---------------------------------------------------------------------------- #endif // _MM_EX_GUIID_H_ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |