From: <oma...@us...> - 2009-11-12 21:38:23
|
Revision: 761 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=761&view=rev Author: omalleypat Date: 2009-11-12 21:38:13 +0000 (Thu, 12 Nov 2009) Log Message: ----------- Merge bills deposits panel show/hide edit and delete buttons. svn merge -r 407:HEAD -x -b -x --ignore-eol-style ^/tags/releases/0.9.5.1/include/billsdepositspanel.h ./src/billsdepositspanel.h svn merge -r 407:HEAD -x -b -x --ignore-eol-style ^/tags/releases/0.9.5.1/src/billsdepositspanel.cpp ./src/billsdepositspanel.cpp Minor conflicts were resolved. Modified Paths: -------------- trunk/mmex/src/billsdepositspanel.cpp trunk/mmex/src/billsdepositspanel.h Property Changed: ---------------- trunk/mmex/src/billsdepositspanel.cpp trunk/mmex/src/billsdepositspanel.h Modified: trunk/mmex/src/billsdepositspanel.cpp =================================================================== --- trunk/mmex/src/billsdepositspanel.cpp 2009-11-12 21:05:38 UTC (rev 760) +++ trunk/mmex/src/billsdepositspanel.cpp 2009-11-12 21:38:13 UTC (rev 761) @@ -39,6 +39,7 @@ EVT_LIST_ITEM_ACTIVATED(ID_PANEL_BD_LISTCTRL, billsDepositsListCtrl::OnListItemActivated) EVT_LIST_ITEM_RIGHT_CLICK(ID_PANEL_BD_LISTCTRL, billsDepositsListCtrl::OnItemRightClick) EVT_LIST_ITEM_SELECTED(ID_PANEL_BD_LISTCTRL, billsDepositsListCtrl::OnListItemSelected) + EVT_LIST_ITEM_DESELECTED(ID_PANEL_BD_LISTCTRL, billsDepositsListCtrl::OnListItemDeselected) EVT_MENU(MENU_TREEPOPUP_NEW, billsDepositsListCtrl::OnNewBDSeries) EVT_MENU(MENU_TREEPOPUP_EDIT, billsDepositsListCtrl::OnEditBDSeries) @@ -216,16 +217,19 @@ wxDefaultPosition, wxDefaultSize, 0 ); itemButton81->SetToolTip(_("Edit Bills && Deposit Series")); itemBoxSizer5->Add(itemButton81, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); - + itemButton81->Enable(false); + wxButton* itemButton7 = new wxButton( itemPanel12, ID_BUTTON_DELETE_BD, _("&Delete Series"), wxDefaultPosition, wxDefaultSize, 0 ); itemButton7->SetToolTip(_("Delete Bills && Deposit Series")); itemBoxSizer5->Add(itemButton7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); - + itemButton7->Enable(false); + wxButton* itemButton8 = new wxButton( itemPanel12, ID_BUTTON_ENTEROCCUR_BD, _("Enter &Transaction"), wxDefaultPosition, wxDefaultSize, 0 ); itemButton8->SetToolTip(_("Enter Next Bills && Deposit Occurrence")); itemBoxSizer5->Add(itemButton8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); + itemButton8->Enable(false); wxStaticText* itemStaticText11 = new wxStaticText( itemPanel12, ID_PANEL_CHECKING_STATIC_DETAILS, wxT(""), wxDefaultPosition, wxDefaultSize, wxNO_BORDER ); @@ -475,6 +479,12 @@ cp_->updateBottomPanelData(selectedIndex_); } +void billsDepositsListCtrl::OnListItemDeselected(wxListEvent& event) +{ + selectedIndex_ = -1; + cp_->updateBottomPanelData(selectedIndex_); +} + int billsDepositsListCtrl::OnGetItemImage(long item) const { /* Returns the icon to be shown for each entry */ @@ -598,8 +608,8 @@ RefreshItems(0, ((int)cp_->trans_.size()) - 1); } dlg->Destroy(); +} -} void mmBillsDepositsPanel::updateBottomPanelData(int selIndex) { // Get the items we need to change @@ -607,6 +617,7 @@ wxString text; if (selIndex!=-1) { + enableEditDeleteButtons(true); text += _("Category : "); text += trans_[selIndex].categoryStr_; text += wxT("\n"); @@ -617,5 +628,22 @@ text += trans_[selIndex].notesStr_; // text += wxT("\n"); } + else + { + enableEditDeleteButtons(false); + text = wxT(""); + } + st->SetLabel(text); -} \ No newline at end of file +} + +void mmBillsDepositsPanel::enableEditDeleteButtons(bool en) +{ + wxButton* bE = (wxButton*)FindWindow(ID_BUTTON_EDIT_BD); + wxButton* bD = (wxButton*)FindWindow(ID_BUTTON_DELETE_BD); + wxButton* bN = (wxButton*)FindWindow(ID_BUTTON_ENTEROCCUR_BD); + bE->Enable(en); + bD->Enable(en); + bN->Enable(en); +} + Property changes on: trunk/mmex/src/billsdepositspanel.cpp ___________________________________________________________________ Added: svn:mergeinfo + /branches/0.9.5/mmex/src/billsdepositspanel.cpp:408-735 /tags/releases/0.9.5.1/src/billsdepositspanel.cpp:736-760 Modified: trunk/mmex/src/billsdepositspanel.h =================================================================== --- trunk/mmex/src/billsdepositspanel.h 2009-11-12 21:05:38 UTC (rev 760) +++ trunk/mmex/src/billsdepositspanel.h 2009-11-12 21:38:13 UTC (rev 761) @@ -59,6 +59,7 @@ void OnMarkAllTransactions(wxCommandEvent& event); void OnListKeyDown(wxListEvent& event); void OnListItemSelected(wxListEvent& event); + void OnListItemDeselected(wxListEvent& event); void OnNewBDSeries(wxCommandEvent& event); void OnDeleteBDSeries(wxCommandEvent& event); @@ -143,6 +144,7 @@ void OnDeleteBDSeries(wxCommandEvent& event); void OnEditBDSeries(wxCommandEvent& event); void OnEnterBDSeriesOccurrence(wxCommandEvent& event); + void enableEditDeleteButtons(bool en); void OnViewPopupSelected(wxCommandEvent& event); Property changes on: trunk/mmex/src/billsdepositspanel.h ___________________________________________________________________ Added: svn:mergeinfo + /branches/0.9.5/mmex/include/billsdepositspanel.h:408-735 /tags/releases/0.9.5.1/include/billsdepositspanel.h:736-760 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |