From: <oma...@us...> - 2009-11-11 21:47:25
|
Revision: 753 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=753&view=rev Author: omalleypat Date: 2009-11-11 21:46:57 +0000 (Wed, 11 Nov 2009) Log Message: ----------- Merge changes from 0.9.5.1 release using the following commands: svn merge -r 407:HEAD -x -b -x --ignore-eol-style https://moneymanagerex.svn.sourceforge.net/svnroot/moneymanagerex/tags/releases/0.9.5.1/include/stockspanel.h ./src/stockspanel.h svn merge -r 407:HEAD -x -b -x --ignore-eol-style https://moneymanagerex.svn.sourceforge.net/svnroot/moneymanagerex/tags/releases/0.9.5.1/src/stockspanel.cpp ./src/stockspanel.cpp There were no conflicts. Modified Paths: -------------- trunk/mmex/src/stockspanel.cpp trunk/mmex/src/stockspanel.h Property Changed: ---------------- trunk/mmex/src/stockspanel.cpp trunk/mmex/src/stockspanel.h Modified: trunk/mmex/src/stockspanel.cpp =================================================================== --- trunk/mmex/src/stockspanel.cpp 2009-11-11 19:16:26 UTC (rev 752) +++ trunk/mmex/src/stockspanel.cpp 2009-11-11 21:46:57 UTC (rev 753) @@ -45,6 +45,7 @@ EVT_LIST_ITEM_ACTIVATED(ID_PANEL_STOCKS_LISTCTRL, stocksListCtrl::OnListItemActivated) EVT_LIST_ITEM_RIGHT_CLICK(ID_PANEL_STOCKS_LISTCTRL, stocksListCtrl::OnItemRightClick) EVT_LIST_ITEM_SELECTED(ID_PANEL_STOCKS_LISTCTRL, stocksListCtrl::OnListItemSelected) + EVT_LIST_ITEM_DESELECTED(ID_PANEL_STOCKS_LISTCTRL, stocksListCtrl::OnListItemDeselected) EVT_MENU(MENU_TREEPOPUP_NEW, stocksListCtrl::OnNewStocks) EVT_MENU(MENU_TREEPOPUP_EDIT, stocksListCtrl::OnEditStocks) @@ -171,8 +172,8 @@ ID_PANEL_CHECKING_STATIC_BALHEADER, _("Total:"), wxDefaultPosition, wxSize(500, 20), 0 ); - //m_LED = new awxLed( headerPanel, ID_PANEL_STOCK_UPDATE_LED, wxDefaultPosition, wxDefaultSize, awxLED_GREEN, 0 ); - m_LED = new awxLed( headerPanel, ID_PANEL_STOCK_UPDATE_LED, wxDefaultPosition, wxDefaultSize, awxLED_GREEN); + m_LED = new awxLed( headerPanel, ID_PANEL_STOCK_UPDATE_LED, wxDefaultPosition, wxDefaultSize, awxLED_GREEN, 1, 5 ); + //m_LED = new awxLed( headerPanel, ID_PANEL_STOCK_UPDATE_LED, wxDefaultPosition, wxDefaultSize, awxLED_GREEN); m_LED->SetState( awxLED_OFF ); m_LED->SetToolTip( _("Idle") ); @@ -274,12 +275,14 @@ wxDefaultPosition, wxDefaultSize, 0 ); itemButton81->SetToolTip(_("Edit Stock Investment")); itemBoxSizer5->Add(itemButton81, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); + itemButton81->Enable(false); wxButton* itemButton7 = new wxButton( itemPanel12, ID_BUTTON_DELETE_STOCK, _("&Delete"), wxDefaultPosition, wxDefaultSize, 0 ); itemButton7->SetToolTip(_("Delete Stock Investment")); itemBoxSizer5->Add(itemButton7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); - + itemButton7->Enable(false); + wxButton* itemButton8 = new wxButton( itemPanel12, ID_BUTTON_REFRESH_STOCK, _("&Refresh"), wxDefaultPosition, wxDefaultSize, 0 ); itemButton8->SetToolTip(_("Refresh Stock Prices from Yahoo")); @@ -819,8 +822,22 @@ void stocksListCtrl::OnListItemSelected(wxListEvent& event) { selectedIndex_ = event.GetIndex(); + cp_->enableEditDeleteButtons(true); } +void stocksListCtrl::OnListItemDeselected(wxListEvent& event) +{ + selectedIndex_ = -1; + cp_->enableEditDeleteButtons(false); +} +void mmStocksPanel::enableEditDeleteButtons(bool en) +{ + wxButton* bE = (wxButton*)FindWindow(ID_BUTTON_EDIT_STOCK); + wxButton* bD = (wxButton*)FindWindow(ID_BUTTON_DELETE_STOCK); + bE->Enable(en); + bD->Enable(en); +} + int stocksListCtrl::OnGetItemImage(long item) const { /* Returns the icon to be shown for each entry */ Property changes on: trunk/mmex/src/stockspanel.cpp ___________________________________________________________________ Added: svn:mergeinfo + /branches/0.9.5/mmex/src/stockspanel.cpp:408-735 /tags/releases/0.9.5.1/src/stockspanel.cpp:736-752 Modified: trunk/mmex/src/stockspanel.h =================================================================== --- trunk/mmex/src/stockspanel.h 2009-11-11 19:16:26 UTC (rev 752) +++ trunk/mmex/src/stockspanel.h 2009-11-11 21:46:57 UTC (rev 753) @@ -59,6 +59,7 @@ void OnMarkAllTransactions(wxCommandEvent& event); void OnListKeyDown(wxListEvent& event); void OnListItemSelected(wxListEvent& event); + void OnListItemDeselected(wxListEvent& event); void OnNewStocks(wxCommandEvent& event); void OnDeleteStocks(wxCommandEvent& event); @@ -129,6 +130,7 @@ void OnEditStocks(wxCommandEvent& event); void OnRefreshQuotes(wxCommandEvent& event); void OnHTTPSettings(wxCommandEvent& event); + void enableEditDeleteButtons(bool en); void OnViewPopupSelected(wxCommandEvent& event); Property changes on: trunk/mmex/src/stockspanel.h ___________________________________________________________________ Added: svn:mergeinfo + /branches/0.9.5/mmex/include/stockspanel.h:408-735 /tags/releases/0.9.5.1/include/stockspanel.h:736-752 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |