From: <gua...@us...> - 2012-05-30 03:39:22
|
Revision: 2461 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2461&view=rev Author: guanlisheng Date: 2012-05-30 03:39:15 +0000 (Wed, 30 May 2012) Log Message: ----------- Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp trunk/mmex/src/assetspanel.h Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-05-30 02:45:04 UTC (rev 2460) +++ trunk/mmex/src/assetspanel.cpp 2012-05-30 03:39:15 UTC (rev 2461) @@ -24,9 +24,6 @@ { IDC_PANEL_ASSETS_LISTCTRL = wxID_HIGHEST + 1, IDC_PANEL_ASSET_STATIC_BALHEADER, - IDC_PANEL_ASSET_STATIC_BAL, - IDC_PANEL_ASSET_STATIC_DETAILS, - IDC_PANEL_ASSET_STATIC_DETAILS_MINI }; enum EColumn { @@ -62,6 +59,8 @@ mmAssetsPanel::mmAssetsPanel(wxWindow *parent, wxSQLite3Database* db, wxSQLite3Database* inidb, mmCoreDB* core) : mmPanelBase(db, inidb, core) + , m_listCtrlAssets(0), m_new_button(0), m_edit_button(0), m_delete_button(0) + , m_sum(0), m_detail(0) { Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, wxPanelNameStr); } @@ -106,7 +105,7 @@ /* ---------------------- */ wxSplitterWindow* itemSplitterWindow = new wxSplitterWindow(this, - IDC_PANEL_ASSET_STATIC_BAL, wxDefaultPosition, wxSize(200, 200), wxSP_3DBORDER|wxSP_3DSASH|wxNO_BORDER ); + wxID_ANY, wxDefaultPosition, wxSize(200, 200), wxSP_3DBORDER|wxSP_3DSASH|wxNO_BORDER ); m_listCtrlAssets = new assetsListCtrl(this, itemSplitterWindow, IDC_PANEL_ASSETS_LISTCTRL, wxDefaultPosition, wxDefaultSize, @@ -151,13 +150,11 @@ itemBoxSizer3->Add(m_delete_button, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); m_delete_button->Enable(false); - //Infobar-mini - wxStaticText* itemStaticText44 = new wxStaticText(assets_panel, IDC_PANEL_ASSET_STATIC_DETAILS_MINI, wxT(""), wxDefaultPosition, wxDefaultSize, 0); - itemBoxSizer3->Add(itemStaticText44, 1, wxGROW|wxTOP, 12); + m_sum = new wxStaticText(assets_panel, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, 0); + itemBoxSizer3->Add(m_sum, 1, wxGROW|wxTOP, 12); - //Infobar - wxStaticText* itemStaticText33 = new wxStaticText(assets_panel, IDC_PANEL_ASSET_STATIC_DETAILS, wxT(""), wxDefaultPosition, wxSize(200,-1), wxTE_MULTILINE|wxTE_WORDWRAP); - itemBoxSizer2->Add(itemStaticText33, 1, wxGROW|wxLEFT|wxRIGHT, 14); + m_detail = new wxStaticText(assets_panel, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(200,-1), wxTE_MULTILINE|wxTE_WORDWRAP); + itemBoxSizer2->Add(m_detail, 1, wxGROW|wxLEFT|wxRIGHT, 14); updateExtraAssetData(-1); } @@ -260,23 +257,21 @@ void mmAssetsPanel::updateExtraAssetData(int selIndex) { - wxStaticText* st = (wxStaticText*)FindWindow(IDC_PANEL_ASSET_STATIC_DETAILS); - wxStaticText* stm = (wxStaticText*)FindWindow(IDC_PANEL_ASSET_STATIC_DETAILS_MINI); - if ((selIndex > -1) && (selIndex < (int)all_assets_.size())) + if (selIndex > -1 && selIndex < (int)all_assets_.size()) { const DB_View_ASSETS_V1::Data& asset = all_assets_.at(selIndex); - enableEditDeleteButtons(true); + m_detail->SetLabel(asset.NOTES); wxString miniInfo; - miniInfo << wxT("\t") << _("Change in Value") << wxT(": ") << asset.VALUECHANGE; + miniInfo << wxT("\t") << _("Change in Value") << wxT(": ") << wxGetTranslation(asset.VALUECHANGE); if (asset.VALUECHANGE != _("None")) miniInfo<< wxT(" = ") << asset.VALUECHANGERATE << wxT("%"); - st->SetLabel(asset.NOTES); - stm->SetLabel(miniInfo); + m_sum->SetLabel(miniInfo); + enableEditDeleteButtons(true); } else { - stm->SetLabel(wxT("")); - st->SetLabel(Tips(TIPS_ASSETS)); + m_detail->SetLabel(Tips(TIPS_ASSETS)); + m_sum->SetLabel(wxT("")); enableEditDeleteButtons(false); } } Modified: trunk/mmex/src/assetspanel.h =================================================================== --- trunk/mmex/src/assetspanel.h 2012-05-30 02:45:04 UTC (rev 2460) +++ trunk/mmex/src/assetspanel.h 2012-05-30 03:39:15 UTC (rev 2461) @@ -87,6 +87,8 @@ wxButton* m_delete_button; wxButton* m_edit_button; wxButton* m_new_button; + wxStaticText* m_sum; + wxStaticText* m_detail; bool Create(wxWindow *parent, wxWindowID winid, const wxPoint& pos, const wxSize& size, long style, const wxString &name); void CreateControls(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |