From: <kkk...@us...> - 2010-05-16 11:03:52
|
Revision: 935 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=935&view=rev Author: kkkvadim Date: 2010-05-16 11:03:46 +0000 (Sun, 16 May 2010) Log Message: ----------- - textCtrl->SetValue(wxGetEmptyString()); + textCtrl->Clear(); Modified Paths: -------------- trunk/mmex/src/payeedialog.cpp Modified: trunk/mmex/src/payeedialog.cpp =================================================================== --- trunk/mmex/src/payeedialog.cpp 2010-05-16 10:55:32 UTC (rev 934) +++ trunk/mmex/src/payeedialog.cpp 2010-05-16 11:03:46 UTC (rev 935) @@ -177,10 +177,8 @@ wxString payee = listBox_->GetStringSelection(); fillControls(); - if (!listBox_->IsEmpty()) { - if (!listBox_->SetStringSelection(payee)) { - listBox_->Select(0); - } + if (!listBox_->IsEmpty() && !listBox_->SetStringSelection(payee)) { + listBox_->Select(0); } OnSelChanged(event); @@ -201,8 +199,7 @@ void mmPayeeDialog::OnAdd(wxCommandEvent& event) { wxString text = wxGetTextFromUser(_("Enter the name of the payee to add:"), _("Add Payee"), textCtrl->GetValue()); - if (text == wxGetEmptyString()) - { + if (text.IsEmpty()) { //mmShowErrorMessage(this, _("Type a Payee Name in the Text Box and then press Add."), _("Error")); return; } @@ -213,7 +210,7 @@ else { m_core->payeeList_.addPayee(text); - textCtrl->SetValue(wxGetEmptyString()); + textCtrl->Clear(); fillControls(); listBox_->SetStringSelection(text); @@ -231,7 +228,7 @@ mmShowErrorMessage(this, _("Payee is in use"), _("Error")); return; } - textCtrl->SetValue(wxGetEmptyString()); + textCtrl->Clear(); fillControls(); OnSelChanged(event); } @@ -263,7 +260,7 @@ fillControls(); // Now we need to make sure that the edited name is selected after the dialog is closed - textCtrl->SetValue(wxGetEmptyString()); + textCtrl->Clear(); listBox_->SetStringSelection(newName); OnSelChanged(event); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-01-02 23:03:50
|
Revision: 1058 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1058&view=rev Author: vomikan Date: 2011-01-02 23:03:42 +0000 (Sun, 02 Jan 2011) Log Message: ----------- Added: back slashes before percent Modified Paths: -------------- trunk/mmex/src/payeedialog.cpp Modified: trunk/mmex/src/payeedialog.cpp =================================================================== --- trunk/mmex/src/payeedialog.cpp 2011-01-02 21:31:22 UTC (rev 1057) +++ trunk/mmex/src/payeedialog.cpp 2011-01-02 23:03:42 UTC (rev 1058) @@ -112,7 +112,7 @@ textCtrl = new wxTextCtrl( this, IDD_TEXTCTRL_PAYEENAME, wxGetEmptyString(), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer2->Add(textCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); - textCtrl->SetToolTip(_("Enter a search string. You can use % as a wildcard to match zero or more characters or _ to match a single character.")); + textCtrl->SetToolTip(_("Enter a search string. You can use \% as a wildcard to match zero or more characters or _ to match a single character.")); wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer5, 0, wxGROW|wxALL, 5); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-01-09 19:41:44
|
Revision: 1080 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1080&view=rev Author: vomikan Date: 2011-01-09 19:41:38 +0000 (Sun, 09 Jan 2011) Log Message: ----------- [Added] SetFocus() Modified Paths: -------------- trunk/mmex/src/payeedialog.cpp Modified: trunk/mmex/src/payeedialog.cpp =================================================================== --- trunk/mmex/src/payeedialog.cpp 2011-01-09 19:40:44 UTC (rev 1079) +++ trunk/mmex/src/payeedialog.cpp 2011-01-09 19:41:38 UTC (rev 1080) @@ -104,15 +104,14 @@ wxDefaultPosition, wxSize(100, 200), wxArrayString(), wxLB_SINGLE); itemBoxSizer3->Add(listBox_, 1, wxGROW|wxALL, 1); - wxStaticText* itemStaticTextName2 = new wxStaticText( this, wxID_STATIC, - _("Filter Payees: "), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer2->Add(itemStaticTextName2, 0, - wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxStaticText* itemStaticTextName2 = new wxStaticText( this, wxID_STATIC, _("Filter Payees: "), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer2->Add(itemStaticTextName2, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); textCtrl = new wxTextCtrl( this, IDD_TEXTCTRL_PAYEENAME, wxGetEmptyString(), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer2->Add(textCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); textCtrl->SetToolTip(_("Enter a search string. You can use \% as a wildcard to match zero or more characters or _ to match a single character.")); + textCtrl->SetFocus(); wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer5, 0, wxGROW|wxALL, 5); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2011-01-31 23:57:25
|
Revision: 1130 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1130&view=rev Author: stef145g Date: 2011-01-31 23:57:19 +0000 (Mon, 31 Jan 2011) Log Message: ----------- Fix code for translations Modified Paths: -------------- trunk/mmex/src/payeedialog.cpp Modified: trunk/mmex/src/payeedialog.cpp =================================================================== --- trunk/mmex/src/payeedialog.cpp 2011-01-31 11:22:52 UTC (rev 1129) +++ trunk/mmex/src/payeedialog.cpp 2011-01-31 23:57:19 UTC (rev 1130) @@ -229,7 +229,7 @@ deletePayeeErrMsg << wxT("\n\n") << _("Tip: Change all transactions using this Payee to another Payee\nusing the relocate command:") - << _("\n\n") << _("Tools -> Relocation of -> Payees"); + << wxT("\n\n") << _("Tools -> Relocation of -> Payees"); wxMessageBox(deletePayeeErrMsg,_("Organize Payees: Delete Error"),wxOK|wxICON_ERROR); return; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <oma...@us...> - 2011-06-04 01:16:52
|
Revision: 1307 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1307&view=rev Author: omalleypat Date: 2011-06-04 01:16:46 +0000 (Sat, 04 Jun 2011) Log Message: ----------- Payee Dialog: added ability to use up and down arrows to move within the listbox while the textctl has focus. For example, if you type A in the textctl and payees get filtered to Amazon and Apple, now you can simply press down to select Amazon right from the textctl Modified Paths: -------------- trunk/mmex/src/payeedialog.cpp Modified: trunk/mmex/src/payeedialog.cpp =================================================================== --- trunk/mmex/src/payeedialog.cpp 2011-06-02 13:00:48 UTC (rev 1306) +++ trunk/mmex/src/payeedialog.cpp 2011-06-04 01:16:46 UTC (rev 1307) @@ -144,7 +144,26 @@ void mmPayeeDialog::OnListKeyDown(wxKeyEvent &event) { - long keycode = event.GetKeyCode(); + + long keycode = event.GetKeyCode(); + + // Check to see if the up or down arrow is pressed while text control has focus + wxWindow *win = wxWindow::FindFocus(); + wxTextCtrl *text = wxDynamicCast(win, wxTextCtrl); + // if text, then text control has focus + if ( text && (keycode == WXK_DOWN) && ( listBox_->GetSelection() < listBox_->GetCount()-1) ) + { + listBox_->Select(listBox_->GetSelection()+1); + } + else if ( text && (keycode == WXK_UP) && ( listBox_->GetSelection() > 0) ) + { + listBox_->Select(listBox_->GetSelection()-1); + } + else + { + // text control doesn't have focus OR up/down not pressed OR up/down not possible + } + if(keycode == 13 && showSelectButton_) { wxCommandEvent event; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2011-06-08 12:43:51
|
Revision: 1312 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1312&view=rev Author: stef145g Date: 2011-06-08 12:43:42 +0000 (Wed, 08 Jun 2011) Log Message: ----------- correct up/down key payee selection when used for transactions Modified Paths: -------------- trunk/mmex/src/payeedialog.cpp Modified: trunk/mmex/src/payeedialog.cpp =================================================================== --- trunk/mmex/src/payeedialog.cpp 2011-06-08 12:18:42 UTC (rev 1311) +++ trunk/mmex/src/payeedialog.cpp 2011-06-08 12:43:42 UTC (rev 1312) @@ -29,12 +29,12 @@ { enum { - IDD_BUTTON_SELECT = wxID_OK, - IDD_TEXTCTRL_PAYEENAME = wxID_HIGHEST + 1, - IDD_LISTBOX_PAYEES, - IDD_BUTTON_ADD, - IDD_BUTTON_DELETE, - IDD_BUTTON_EDIT + IDD_BUTTON_SELECT = wxID_OK, + IDD_TEXTCTRL_PAYEENAME = wxID_HIGHEST + 1, + IDD_LISTBOX_PAYEES, + IDD_BUTTON_ADD, + IDD_BUTTON_DELETE, + IDD_BUTTON_EDIT }; } // namespace @@ -87,28 +87,23 @@ } void mmPayeeDialog::CreateControls() -{ +{ wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); SetSizer(itemBoxSizer2); - wxStaticText* itemStaticTextName = new wxStaticText( this, wxID_STATIC, - _("Find Payee: "), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer2->Add(itemStaticTextName, 0, - wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxStaticText* itemStaticTextName = new wxStaticText( this, wxID_STATIC, _("Find Payee: "), wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer2->Add(itemStaticTextName, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - - wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL); + wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW|wxALL, 5); - - listBox_ = new wxListBox( this, IDD_LISTBOX_PAYEES, - wxDefaultPosition, wxSize(100, 200), wxArrayString(), wxLB_SINGLE); + + listBox_ = new wxListBox( this, IDD_LISTBOX_PAYEES, wxDefaultPosition, wxSize(100, 200), wxArrayString(), wxLB_SINGLE); itemBoxSizer3->Add(listBox_, 1, wxGROW|wxALL, 1); wxStaticText* itemStaticTextName2 = new wxStaticText( this, wxID_STATIC, _("Filter Payees: "), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer2->Add(itemStaticTextName2, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer2->Add(itemStaticTextName2, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); - textCtrl = new wxTextCtrl( this, IDD_TEXTCTRL_PAYEENAME, - wxGetEmptyString(), wxDefaultPosition, wxDefaultSize, 0 ); + textCtrl = new wxTextCtrl( this, IDD_TEXTCTRL_PAYEENAME, wxGetEmptyString(), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer2->Add(textCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); textCtrl->SetToolTip(_("Enter a search string. You can use % as a wildcard to match zero or more characters or _ to match a single character.")); textCtrl->SetFocus(); @@ -116,14 +111,12 @@ wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer5, 0, wxGROW|wxALL, 5); - addButton = new wxButton( this, IDD_BUTTON_ADD, - _("&Add"), wxDefaultPosition, wxDefaultSize, 0 ); + addButton = new wxButton( this, IDD_BUTTON_ADD, _("&Add"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer5->Add(addButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); addButton->SetToolTip(_("Add a new payee name")); addButton->Disable(); - editButton = new wxButton( this, IDD_BUTTON_EDIT, - _("&Edit"), wxDefaultPosition, wxDefaultSize, 0 ); + editButton = new wxButton( this, IDD_BUTTON_EDIT, _("&Edit"), wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer5->Add(editButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); editButton->SetToolTip(_("Change the name of an existing payee")); editButton->Disable(); @@ -144,26 +137,28 @@ void mmPayeeDialog::OnListKeyDown(wxKeyEvent &event) { + long keycode = event.GetKeyCode(); - long keycode = event.GetKeyCode(); - - // Check to see if the up or down arrow is pressed while text control has focus - wxWindow *win = wxWindow::FindFocus(); + // Check to see if the up or down arrow is pressed while text control has focus + wxWindow *win = wxWindow::FindFocus(); wxTextCtrl *text = wxDynamicCast(win, wxTextCtrl); // if text, then text control has focus - if ( text && (keycode == WXK_DOWN) && ( listBox_->GetSelection() < listBox_->GetCount()-1) ) + if ( text && (keycode == WXK_DOWN) && ( listBox_->GetSelection() < (int)listBox_->GetCount()-1) ) { - listBox_->Select(listBox_->GetSelection()+1); + listBox_->Select(listBox_->GetSelection()+1); + wxCommandEvent event; + OnSelChanged(event); } else if ( text && (keycode == WXK_UP) && ( listBox_->GetSelection() > 0) ) - { - listBox_->Select(listBox_->GetSelection()-1); + { + listBox_->Select(listBox_->GetSelection()-1); + wxCommandEvent event; + OnSelChanged(event); } else { // text control doesn't have focus OR up/down not pressed OR up/down not possible } - if(keycode == 13 && showSelectButton_) { wxCommandEvent event; @@ -218,18 +213,17 @@ { wxString text = wxGetTextFromUser(_("Enter the name for the new payee:"), _("Organize Payees: Add Payee"), textCtrl->GetValue()); if (text.IsEmpty()) { - //mmShowErrorMessage(this, _("Type a Payee Name in the Text Box and then press Add."), _("Error")); return; } + if (m_core->payeeList_.payeeExists(text)) { wxMessageBox(_("Payee with same name exists"), _("Organize Payees: Add Payee"),wxOK|wxICON_ERROR); -// mmShowErrorMessage(this, _("Payee with same name exists"), _("Error")); } else { m_core->payeeList_.addPayee(text); - textCtrl->Clear(); + textCtrl->Clear(); fillControls(); listBox_->SetStringSelection(text); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-03-25 07:11:08
|
Revision: 2088 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2088&view=rev Author: vomikan Date: 2012-03-25 07:11:02 +0000 (Sun, 25 Mar 2012) Log Message: ----------- autoresizing Modified Paths: -------------- trunk/mmex/src/payeedialog.cpp Modified: trunk/mmex/src/payeedialog.cpp =================================================================== --- trunk/mmex/src/payeedialog.cpp 2012-03-25 05:36:36 UTC (rev 2087) +++ trunk/mmex/src/payeedialog.cpp 2012-03-25 07:11:02 UTC (rev 2088) @@ -93,7 +93,9 @@ wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW|wxALL, 5); - listBox_ = new wxListBox( this, IDD_LISTBOX_PAYEES, wxDefaultPosition, wxSize(100, 200), wxArrayString(), wxLB_SINGLE); + wxArrayString filtd = mmDBWrapper::filterPayees(core_->db_.get(), wxT("")); + int vertical_size_ = (filtd.GetCount()>10 ? 320 : 240); + listBox_ = new wxListBox( this, IDD_LISTBOX_PAYEES, wxDefaultPosition, wxSize(100, vertical_size_), wxArrayString(), wxLB_SINGLE); itemBoxSizer3->Add(listBox_, 1, wxGROW|wxALL, 1); wxStaticText* itemStaticTextName2 = new wxStaticText( this, wxID_STATIC, _("Filter Payees: "), wxDefaultPosition, wxDefaultSize, 0 ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2012-05-19 02:45:27
|
Revision: 2359 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2359&view=rev Author: stef145g Date: 2012-05-19 02:45:21 +0000 (Sat, 19 May 2012) Log Message: ----------- Fix: Rename button to Delete and allowing short cut key in Windows Modified Paths: -------------- trunk/mmex/src/payeedialog.cpp Modified: trunk/mmex/src/payeedialog.cpp =================================================================== --- trunk/mmex/src/payeedialog.cpp 2012-05-18 07:42:08 UTC (rev 2358) +++ trunk/mmex/src/payeedialog.cpp 2012-05-19 02:45:21 UTC (rev 2359) @@ -40,7 +40,7 @@ BEGIN_EVENT_TABLE( mmPayeeDialog, wxDialog ) EVT_BUTTON(wxID_ADD, mmPayeeDialog::OnAdd) - EVT_BUTTON(wxID_REMOVE, mmPayeeDialog::OnDelete) + EVT_BUTTON(wxID_DELETE, mmPayeeDialog::OnDelete) EVT_BUTTON(wxID_OK, mmPayeeDialog::OnBSelect) EVT_BUTTON(wxID_EDIT, mmPayeeDialog::OnEdit) EVT_LISTBOX(IDD_LISTBOX_PAYEES, mmPayeeDialog::OnSelChanged) @@ -109,7 +109,11 @@ wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer5, 0, wxGROW|wxALL, 5); - addButton = new wxButton( this, wxID_ADD, _("Add"), wxDefaultPosition, wxDefaultSize, 0 ); + wxString addBtnTitle = _("&Add"); +#ifdef __WXGTK__ + addBtnTitle = _("Add"); +#endif + addButton = new wxButton( this, wxID_ADD, addBtnTitle, wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer5->Add(addButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); addButton->SetToolTip(_("Add a new payee name")); addButton->Disable(); @@ -119,7 +123,7 @@ editButton->SetToolTip(_("Change the name of an existing payee")); editButton->Disable(); - deleteButton = new wxButton( this, wxID_REMOVE, _("Remove")); + deleteButton = new wxButton( this, wxID_DELETE, _("&Delete")); itemBoxSizer5->Add(deleteButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); deleteButton->SetToolTip(_("Delete the selected payee. The payee cannot be used by an existing transaction.")); deleteButton->Disable(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-10-07 11:39:48
|
Revision: 3038 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3038&view=rev Author: vomikan Date: 2012-10-07 11:39:41 +0000 (Sun, 07 Oct 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/payeedialog.cpp Modified: trunk/mmex/src/payeedialog.cpp =================================================================== --- trunk/mmex/src/payeedialog.cpp 2012-10-07 09:31:09 UTC (rev 3037) +++ trunk/mmex/src/payeedialog.cpp 2012-10-07 11:39:41 UTC (rev 3038) @@ -84,48 +84,52 @@ void mmPayeeDialog::CreateControls() { + const int border = 5; + wxSizerFlags flags, flagsExpand; + flags.Align(wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL).Border(wxALL, border); + flagsExpand.Align(wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL).Border(wxALL, border).Expand(); + wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); SetSizer(itemBoxSizer2); - wxStaticText* itemStaticTextName = new wxStaticText( this, wxID_STATIC, _("Find Payee: "), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer2->Add(itemStaticTextName, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + wxStaticText* itemStaticTextName = new wxStaticText( this, wxID_STATIC, _("Find Payee: ")); + itemBoxSizer2->Add(itemStaticTextName, flags); wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer2->Add(itemBoxSizer3, 1, wxGROW|wxALL, 5); + itemBoxSizer2->Add(itemBoxSizer3, flagsExpand); wxArrayString filtd = core_->payeeList_.FilterPayees(wxT("")); int vertical_size_ = (filtd.GetCount()>10 ? 320 : 240); listBox_ = new wxListBox( this, IDD_LISTBOX_PAYEES, wxDefaultPosition, wxSize(100, vertical_size_), wxArrayString(), wxLB_SINGLE); itemBoxSizer3->Add(listBox_, 1, wxGROW|wxALL, 1); - wxStaticText* itemStaticTextName2 = new wxStaticText( this, wxID_STATIC, _("Filter Payees: "), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer2->Add(itemStaticTextName2, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizer2->Add(new wxStaticText( this, wxID_STATIC, _("Filter Payees: ")), flags); - textCtrl = new wxTextCtrl( this, IDD_TEXTCTRL_PAYEENAME, wxGetEmptyString(), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer2->Add(textCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5); + textCtrl = new wxTextCtrl( this, IDD_TEXTCTRL_PAYEENAME, wxGetEmptyString()); + itemBoxSizer2->Add(textCtrl, flagsExpand); textCtrl->SetToolTip(_("Enter a search string. You can use % as a wildcard to match zero or more characters or _ to match a single character.")); textCtrl->SetFocus(); wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer2->Add(itemBoxSizer5, 0, wxGROW|wxALL, 5); + itemBoxSizer2->Add(itemBoxSizer5, flagsExpand); - addButton = new wxButton( this, wxID_ADD, _("Add"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer5->Add(addButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); + addButton = new wxButton( this, wxID_ADD); + itemBoxSizer5->Add(addButton, flags.Border(1)); addButton->SetToolTip(_("Add a new payee name")); addButton->Disable(); - editButton = new wxButton( this, wxID_EDIT, _("&Edit"), wxDefaultPosition, wxDefaultSize, 0 ); - itemBoxSizer5->Add(editButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); + editButton = new wxButton( this, wxID_EDIT); + itemBoxSizer5->Add(editButton, flags); editButton->SetToolTip(_("Change the name of an existing payee")); editButton->Disable(); - deleteButton = new wxButton( this, wxID_REMOVE, _("Remove")); - itemBoxSizer5->Add(deleteButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); + deleteButton = new wxButton( this, wxID_REMOVE); + itemBoxSizer5->Add(deleteButton, flags); deleteButton->SetToolTip(_("Delete the selected payee. The payee cannot be used by an existing transaction.")); deleteButton->Disable(); wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer2->Add(itemBoxSizer9, 0, wxGROW|wxALL, 5); + itemBoxSizer2->Add(itemBoxSizer9, flagsExpand); selectButton = new wxButton( this, wxID_OK, _("&Select")); itemBoxSizer9->Add(selectButton, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1); @@ -133,8 +137,8 @@ selectButton->Disable(); //Some interfaces has no any close buttons, it may confuse user. Cancel button added - wxButton* itemCancelButton = new wxButton( this, wxID_CANCEL, _("&Cancel")); - itemBoxSizer9->Add(itemCancelButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); + wxButton* itemCancelButton = new wxButton( this, wxID_CANCEL); + itemBoxSizer9->Add(itemCancelButton, flags); } void mmPayeeDialog::OnListKeyDown(wxKeyEvent &event) @@ -213,14 +217,15 @@ void mmPayeeDialog::OnAdd(wxCommandEvent& event) { - wxString text = wxGetTextFromUser(_("Enter the name for the new payee:"), _("Organize Payees: Add Payee"), textCtrl->GetValue()); + wxString text = wxGetTextFromUser(_("Enter the name for the new payee:") + , _("Organize Payees: Add Payee"), textCtrl->GetValue()); if (text.IsEmpty()) { return; } if (core_->payeeList_.PayeeExists(text)) { - wxMessageBox(_("Payee with same name exists"), _("Organize Payees: Add Payee"),wxOK|wxICON_ERROR); + wxMessageBox(_("Payee with same name exists"), _("Organize Payees: Add Payee"), wxOK|wxICON_ERROR); } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-10-20 09:16:53
|
Revision: 3072 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3072&view=rev Author: vomikan Date: 2012-10-20 09:16:46 +0000 (Sat, 20 Oct 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/payeedialog.cpp Modified: trunk/mmex/src/payeedialog.cpp =================================================================== --- trunk/mmex/src/payeedialog.cpp 2012-10-20 07:58:00 UTC (rev 3071) +++ trunk/mmex/src/payeedialog.cpp 2012-10-20 09:16:46 UTC (rev 3072) @@ -107,7 +107,6 @@ textCtrl = new wxTextCtrl( this, IDD_TEXTCTRL_PAYEENAME, wxGetEmptyString()); itemBoxSizer2->Add(textCtrl, flagsExpand); - textCtrl->SetToolTip(_("Enter a search string. You can use % as a wildcard to match zero or more characters or _ to match a single character.")); textCtrl->SetFocus(); wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL); @@ -115,17 +114,14 @@ addButton = new wxButton( this, wxID_ADD); itemBoxSizer5->Add(addButton, flags.Border(1)); - addButton->SetToolTip(_("Add a new payee name")); addButton->Disable(); editButton = new wxButton( this, wxID_EDIT); itemBoxSizer5->Add(editButton, flags); - editButton->SetToolTip(_("Change the name of an existing payee")); editButton->Disable(); deleteButton = new wxButton( this, wxID_REMOVE); itemBoxSizer5->Add(deleteButton, flags); - deleteButton->SetToolTip(_("Delete the selected payee. The payee cannot be used by an existing transaction.")); deleteButton->Disable(); wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxHORIZONTAL); @@ -133,12 +129,17 @@ selectButton = new wxButton( this, wxID_OK, _("&Select")); itemBoxSizer9->Add(selectButton, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1); - selectButton->SetToolTip(_("Select the currently selected payee as the selected payee for the transaction")); selectButton->Disable(); //Some interfaces has no any close buttons, it may confuse user. Cancel button added wxButton* itemCancelButton = new wxButton( this, wxID_CANCEL); itemBoxSizer9->Add(itemCancelButton, flags); + + textCtrl->SetToolTip(_("Enter a search string. You can use * as a wildcard to match zero or more characters or ? to match a single character.")); + addButton->SetToolTip(_("Add a new payee name")); + editButton->SetToolTip(_("Change the name of an existing payee")); + deleteButton->SetToolTip(_("Delete the selected payee. The payee cannot be used by an existing transaction.")); + selectButton->SetToolTip(_("Select the currently selected payee as the selected payee for the transaction")); } void mmPayeeDialog::OnListKeyDown(wxKeyEvent &event) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-11-18 10:42:13
|
Revision: 3143 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3143&view=rev Author: vomikan Date: 2012-11-18 10:42:06 +0000 (Sun, 18 Nov 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/payeedialog.cpp Modified: trunk/mmex/src/payeedialog.cpp =================================================================== --- trunk/mmex/src/payeedialog.cpp 2012-11-17 22:52:45 UTC (rev 3142) +++ trunk/mmex/src/payeedialog.cpp 2012-11-18 10:42:06 UTC (rev 3143) @@ -5,12 +5,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 @@ -46,16 +46,16 @@ EVT_LISTBOX(IDD_LISTBOX_PAYEES, mmPayeeDialog::OnSelChanged) EVT_LISTBOX_DCLICK(IDD_LISTBOX_PAYEES, mmPayeeDialog::OnDoubleClicked) EVT_TEXT(IDD_TEXTCTRL_PAYEENAME, mmPayeeDialog::OnTextCtrlChanged) - EVT_CHAR_HOOK(mmPayeeDialog::OnListKeyDown) + EVT_CHAR_HOOK(mmPayeeDialog::OnListKeyDown) END_EVENT_TABLE() -mmPayeeDialog::mmPayeeDialog(wxWindow *parent, mmCoreDB *core, bool showSelectButton) : - m_payee_id(-1), - core_(core), - showSelectButton_(showSelectButton) +mmPayeeDialog::mmPayeeDialog(wxWindow *parent, mmCoreDB *core, bool showSelectButton) : + m_payee_id(-1), + core_(core), + showSelectButton_(showSelectButton) { - do_create(parent); + do_create(parent); } void mmPayeeDialog::do_create(wxWindow* parent) @@ -64,7 +64,7 @@ long style = wxCAPTION | wxSYSTEM_MENU | wxCLOSE_BOX | wxRESIZE_BORDER | wxWANTS_CHARS; if (!wxDialog::Create(parent, wxID_ANY, _("Organize Payees"), wxDefaultPosition, wxDefaultSize, style)) { - return; + return; } CreateControls(); @@ -114,23 +114,23 @@ addButton = new wxButton( this, wxID_ADD); itemBoxSizer5->Add(addButton, flags.Border(1)); - addButton->Disable(); + addButton->Disable(); editButton = new wxButton( this, wxID_EDIT); itemBoxSizer5->Add(editButton, flags); editButton->Disable(); - + deleteButton = new wxButton( this, wxID_REMOVE); itemBoxSizer5->Add(deleteButton, flags); - deleteButton->Disable(); - + deleteButton->Disable(); + wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer9, flagsExpand); selectButton = new wxButton( this, wxID_OK, _("&Select")); itemBoxSizer9->Add(selectButton, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1); selectButton->Disable(); - + //Some interfaces has no any close buttons, it may confuse user. Cancel button added wxButton* itemCancelButton = new wxButton( this, wxID_CANCEL); itemBoxSizer9->Add(itemCancelButton, flags); @@ -145,7 +145,7 @@ void mmPayeeDialog::OnListKeyDown(wxKeyEvent &event) { long keycode = event.GetKeyCode(); - + // Check to see if the up or down arrow is pressed while text control has focus wxWindow *win = wxWindow::FindFocus(); wxTextCtrl *text = wxDynamicCast(win, wxTextCtrl); @@ -161,9 +161,9 @@ listBox_->Select(listBox_->GetSelection()-1); wxCommandEvent event; OnSelChanged(event); - } - else - { + } + else + { // text control doesn't have focus OR up/down not pressed OR up/down not possible } @@ -180,40 +180,40 @@ void mmPayeeDialog::fillControls() { - wxArrayString filtd = core_->payeeList_.FilterPayees(textCtrl->GetValue()); + wxArrayString filtd = core_->payeeList_.FilterPayees(textCtrl->GetValue()); - listBox_->Clear(); + listBox_->Clear(); - for (size_t i = 0; i < filtd.GetCount(); ++i) { - listBox_->Append(filtd.Item(i)); - } + for (size_t i = 0; i < filtd.GetCount(); ++i) { + listBox_->Append(filtd.Item(i)); + } } void mmPayeeDialog::OnTextCtrlChanged(wxCommandEvent& event) { - bool filter_ok = !textCtrl->GetValue().IsEmpty(); - addButton->Enable(filter_ok); - - wxString payee = listBox_->GetStringSelection(); - fillControls(); - - if (!listBox_->IsEmpty() && !listBox_->SetStringSelection(payee)) { - listBox_->Select(0); - } + bool filter_ok = !textCtrl->GetValue().IsEmpty(); + addButton->Enable(filter_ok); - OnSelChanged(event); + wxString payee = listBox_->GetStringSelection(); + fillControls(); + + if (!listBox_->IsEmpty() && !listBox_->SetStringSelection(payee)) { + listBox_->Select(0); + } + + OnSelChanged(event); } void mmPayeeDialog::OnSelChanged(wxCommandEvent& /*event*/) { - wxString payee = listBox_->GetStringSelection(); + wxString payee = listBox_->GetStringSelection(); - m_payee_id = payee.IsEmpty() ? -1 : core_->payeeList_.GetPayeeId(payee); - bool ok = m_payee_id != -1; + m_payee_id = payee.IsEmpty() ? -1 : core_->payeeList_.GetPayeeId(payee); + bool ok = m_payee_id != -1; - editButton->Enable(ok); - deleteButton->Enable(ok); - selectButton->Enable(ok && showSelectButton_); + editButton->Enable(ok); + deleteButton->Enable(ok); + selectButton->Enable(ok && showSelectButton_); } void mmPayeeDialog::OnAdd(wxCommandEvent& event) @@ -235,59 +235,63 @@ fillControls(); listBox_->SetStringSelection(text); - - // SetStringSelection does not emit event, so we need to do it manually. - // This is important because it is where m_payee_id gets set - OnSelChanged(event); + + // SetStringSelection does not emit event, so we need to do it manually. + // This is important because it is where m_payee_id gets set + OnSelChanged(event); } } - + void mmPayeeDialog::OnDelete(wxCommandEvent& event) { if (!core_->payeeList_.RemovePayee(m_payee_id)) { wxString deletePayeeErrMsg = _("Payee in use."); - deletePayeeErrMsg + deletePayeeErrMsg << wxT("\n\n") << _("Tip: Change all transactions using this Payee to another Payee\nusing the relocate command:") << wxT("\n\n") << _("Tools -> Relocation of -> Payees"); wxMessageBox(deletePayeeErrMsg,_("Organize Payees: Delete Error"),wxOK|wxICON_ERROR); return; } - textCtrl->Clear(); + textCtrl->Clear(); fillControls(); - OnSelChanged(event); + OnSelChanged(event); } - + void mmPayeeDialog::OnBSelect(wxCommandEvent& /*event*/) { - if (m_payee_id != -1) { - EndModal(wxID_OK); - } + if (m_payee_id != -1) { + EndModal(wxID_OK); + } } void mmPayeeDialog::OnDoubleClicked(wxCommandEvent& event) { - OnBSelect(event); + if (showSelectButton_) + OnBSelect(event); + else + OnEdit(event); + } void mmPayeeDialog::OnEdit(wxCommandEvent& event) { - wxString oldname = listBox_->GetStringSelection(); - - wxString mesg; - mesg.Printf(_("Enter a new name for %s"),oldname.c_str()); - wxString newName = wxGetTextFromUser(mesg, _("Edit Payee Name"), oldname); + wxString oldname = listBox_->GetStringSelection(); + + wxString mesg; + mesg.Printf(_("Enter a new name for %s"),oldname.c_str()); + wxString newName = wxGetTextFromUser(mesg, _("Edit Payee Name"), oldname); if (newName != wxGetEmptyString()) - { - core_->payeeList_.UpdatePayee(m_payee_id, newName); - core_->bTransactionList_.UpdateAllTransactionsForPayee(core_, m_payee_id); - editButton->Disable(); - fillControls(); - - // Now we need to make sure that the edited name is selected after the dialog is closed - textCtrl->Clear(); - listBox_->SetStringSelection(newName); - OnSelChanged(event); - } + { + core_->payeeList_.UpdatePayee(m_payee_id, newName); + core_->bTransactionList_.UpdateAllTransactionsForPayee(core_, m_payee_id); + editButton->Disable(); + fillControls(); + + // Now we need to make sure that the edited name is selected after the dialog is closed + textCtrl->Clear(); + listBox_->SetStringSelection(newName); + OnSelChanged(event); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-11-30 07:42:40
|
Revision: 3171 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3171&view=rev Author: vomikan Date: 2012-11-30 07:42:33 +0000 (Fri, 30 Nov 2012) Log Message: ----------- fix for wx-2.8 Modified Paths: -------------- trunk/mmex/src/payeedialog.cpp Modified: trunk/mmex/src/payeedialog.cpp =================================================================== --- trunk/mmex/src/payeedialog.cpp 2012-11-29 20:21:34 UTC (rev 3170) +++ trunk/mmex/src/payeedialog.cpp 2012-11-30 07:42:33 UTC (rev 3171) @@ -316,12 +316,14 @@ void mmPayeeDialog::OnCancel(wxCommandEvent& event) { + wxWindow *w = FindFocus(); + if (!textCtrl_->GetValue().IsEmpty()) { textCtrl_->Clear(); return; } - else if (!btnCancel_->HasFocus()) + else if (w && w->GetId() != btnCancel_->GetId()) { btnCancel_->SetFocus(); return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-12-16 21:50:56
|
Revision: 3218 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3218&view=rev Author: vomikan Date: 2012-12-16 21:50:50 +0000 (Sun, 16 Dec 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/payeedialog.cpp Modified: trunk/mmex/src/payeedialog.cpp =================================================================== --- trunk/mmex/src/payeedialog.cpp 2012-12-16 21:16:33 UTC (rev 3217) +++ trunk/mmex/src/payeedialog.cpp 2012-12-16 21:50:50 UTC (rev 3218) @@ -37,6 +37,7 @@ EVT_LISTBOX(wxID_ANY, mmPayeeDialog::OnSelChanged) EVT_LISTBOX_DCLICK(wxID_ANY, mmPayeeDialog::OnDoubleClicked) EVT_TEXT(wxID_ANY, mmPayeeDialog::OnTextCtrlChanged) + EVT_TEXT_ENTER(wxID_ANY, mmPayeeDialog::OnBSelect) EVT_CHAR_HOOK(mmPayeeDialog::OnListKeyDown) END_EVENT_TABLE() @@ -70,7 +71,7 @@ SetIcon(mmex::getProgramIcon()); - wxString sResult = core_->iniSettings_->GetStringSetting(wxT("SHOW_HIDEN_PAYEES"), wxT("")); + wxString sResult = core_->iniSettings_->GetStringSetting(wxT("HIDEN_PAYEES_STRING"), wxT("")); hideTextCtrl_->ChangeValue(sResult); fillControls(); @@ -100,7 +101,7 @@ cbShowAll_ = new wxCheckBox(this, wxID_SELECTALL, _("Show All"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE); - cbShowAll_->SetToolTip(_("Show all hiden payees")); + cbShowAll_->SetToolTip(_("Show all hidden payees")); itemBoxSizer22->Add(cbShowAll_, flags); cbShowAll_->Connect(wxID_SELECTALL, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler(mmPayeeDialog::OnShowHidenChbClick), NULL, this); @@ -138,7 +139,7 @@ itemBoxSizer2->Add(acc_notebook, flagsExpand); textCtrl_ = new wxTextCtrl( notes_tab, wxID_ANY, wxT(""), - wxDefaultPosition, wxSize(240,-1)); + wxDefaultPosition, wxSize(240,-1), wxTE_PROCESS_ENTER); notes_sizer->Add(textCtrl_, flagsExpand); textCtrl_->SetFocus(); @@ -206,7 +207,7 @@ void mmPayeeDialog::fillControls() { - bool bResult = core_->iniSettings_->GetBoolSetting(wxT("SHOW_HIDEN_PAYEES"), true); + bool bResult = core_->iniSettings_->GetBoolSetting(wxT("SHOW_HIDDEN_PAYEES"), true); cbShowAll_->SetValue(bResult); wxArrayString filtd = core_->payeeList_.FilterPayees(textCtrl_->GetValue()); @@ -344,7 +345,7 @@ void mmPayeeDialog::OnShowHidenChbClick(wxCommandEvent& /*event*/) { - core_->iniSettings_->SetBoolSetting(wxT("SHOW_HIDEN_PAYEES"), cbShowAll_->IsChecked()); + core_->iniSettings_->SetBoolSetting(wxT("SHOW_HIDDEN_PAYEES"), cbShowAll_->IsChecked()); fillControls(); } @@ -368,6 +369,6 @@ void mmPayeeDialog::saveFilterSettings(wxCommandEvent& event) { - core_->iniSettings_->SetStringSetting(wxT("SHOW_HIDEN_PAYEES"), hideTextCtrl_->GetValue()); + core_->iniSettings_->SetStringSetting(wxT("HIDEN_PAYEES_STRING"), hideTextCtrl_->GetValue()); event.Skip(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-12-22 16:34:18
|
Revision: 3239 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3239&view=rev Author: vomikan Date: 2012-12-22 16:34:06 +0000 (Sat, 22 Dec 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/payeedialog.cpp Modified: trunk/mmex/src/payeedialog.cpp =================================================================== --- trunk/mmex/src/payeedialog.cpp 2012-12-22 08:43:40 UTC (rev 3238) +++ trunk/mmex/src/payeedialog.cpp 2012-12-22 16:34:06 UTC (rev 3239) @@ -115,44 +115,29 @@ wxDefaultPosition, wxSize(100, vertical_size_), wxArrayString(), wxLB_SINGLE); itemBoxSizer3->Add(listBox_, 1, wxGROW|wxALL, 1); - wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer2->Add(itemBoxSizer5, flagsExpand); - - addButton = new wxButton( this, wxID_ADD); - itemBoxSizer5->Add(addButton, flags.Border(1)); - - editButton = new wxButton( this, wxID_EDIT); - itemBoxSizer5->Add(editButton, flags); - editButton->Disable(); - - deleteButton = new wxButton( this, wxID_REMOVE); - itemBoxSizer5->Add(deleteButton, flags); - deleteButton->Disable(); - - - wxNotebook* acc_notebook = new wxNotebook(this, + wxNotebook* payee_notebook = new wxNotebook(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_MULTILINE ); - wxPanel* notes_tab = new wxPanel(acc_notebook, wxID_ANY); - acc_notebook->AddPage(notes_tab, _("Filter")); + wxPanel* filter_tab = new wxPanel(payee_notebook, wxID_ANY); + payee_notebook->AddPage(filter_tab, _("Filter")); wxBoxSizer *notes_sizer = new wxBoxSizer(wxVERTICAL); - notes_tab->SetSizer(notes_sizer); - itemBoxSizer2->Add(acc_notebook, flagsExpand); + filter_tab->SetSizer(notes_sizer); + itemBoxSizer2->Add(payee_notebook, flagsExpand); - textCtrl_ = new wxTextCtrl( notes_tab, wxID_ANY, wxT(""), + textCtrl_ = new wxTextCtrl( filter_tab, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(240,-1), wxTE_PROCESS_ENTER); notes_sizer->Add(textCtrl_, flagsExpand); textCtrl_->SetFocus(); - wxPanel* others_tab = new wxPanel(acc_notebook, wxID_ANY); - acc_notebook->AddPage(others_tab, _("Hide")); + wxPanel* hide_tab = new wxPanel(payee_notebook, wxID_ANY); + payee_notebook->AddPage(hide_tab, _("Hide")); wxBoxSizer *others_sizer = new wxBoxSizer(wxHORIZONTAL); - others_tab->SetSizer(others_sizer); + hide_tab->SetSizer(others_sizer); - hideTextCtrl_ = new wxTextCtrl( others_tab, wxID_ANY, wxT(""), - wxDefaultPosition, wxSize(210,-1)); - others_sizer->Add(hideTextCtrl_, flagsExpand); + hideTextCtrl_ = new wxTextCtrl( hide_tab, wxID_ANY, wxT(""), + wxDefaultPosition, wxDefaultSize); + others_sizer->Add(hideTextCtrl_, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1); - wxBitmapButton* save_button = new wxBitmapButton( others_tab, + wxBitmapButton* save_button = new wxBitmapButton( hide_tab, wxID_SAVE, wxNullBitmap, wxDefaultPosition, wxSize(hideTextCtrl_->GetSize().GetHeight(), hideTextCtrl_->GetSize().GetHeight())); save_button->Show(true); @@ -162,6 +147,21 @@ wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer9, flagsExpand); + wxPanel* maintenance_tab = new wxPanel(payee_notebook, wxID_ANY); + payee_notebook->AddPage(maintenance_tab, _("Tools")); + wxBoxSizer *maintenance_sizer = new wxBoxSizer(wxHORIZONTAL); + maintenance_tab->SetSizer(maintenance_sizer); + + addButton = new wxButton( maintenance_tab, wxID_ADD); + editButton = new wxButton( maintenance_tab, wxID_EDIT); + editButton->Disable(); + deleteButton = new wxButton( maintenance_tab, wxID_REMOVE); + deleteButton->Disable(); + + maintenance_sizer->Add(addButton, flags.Border(1)); + maintenance_sizer->Add(editButton, flags); + maintenance_sizer->Add(deleteButton, flags); + selectButton = new wxButton( this, wxID_OK, _("&Select")); itemBoxSizer9->Add(selectButton, 1, wxALIGN_CENTER_VERTICAL|wxALL, 1); selectButton->Disable(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |