From: <gua...@us...> - 2012-05-24 06:22:24
|
Revision: 2385 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2385&view=rev Author: guanlisheng Date: 2012-05-24 06:22:18 +0000 (Thu, 24 May 2012) Log Message: ----------- format & cleanup Modified Paths: -------------- trunk/mmex/src/assetspanel.h trunk/mmex/src/billsdepositspanel.cpp trunk/mmex/src/billsdepositspanel.h trunk/mmex/src/budgetingpanel.cpp trunk/mmex/src/budgetingpanel.h trunk/mmex/src/stockspanel.cpp trunk/mmex/src/stockspanel.h Modified: trunk/mmex/src/assetspanel.h =================================================================== --- trunk/mmex/src/assetspanel.h 2012-05-24 05:16:01 UTC (rev 2384) +++ trunk/mmex/src/assetspanel.h 2012-05-24 06:22:18 UTC (rev 2385) @@ -71,7 +71,7 @@ public: mmAssetsPanel(wxWindow *parent, wxSQLite3Database* db, wxSQLite3Database* inidb, mmCoreDB* core); - ~mmAssetsPanel(); + ~mmAssetsPanel(); void enableEditDeleteButtons(bool enable); void initVirtualListControl(int col, bool asc); Modified: trunk/mmex/src/billsdepositspanel.cpp =================================================================== --- trunk/mmex/src/billsdepositspanel.cpp 2012-05-24 05:16:01 UTC (rev 2384) +++ trunk/mmex/src/billsdepositspanel.cpp 2012-05-24 06:22:18 UTC (rev 2385) @@ -67,7 +67,7 @@ wxWindow *parent, wxWindowID winid, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) - : mmPanelBase(db, inidb, core), m_imageList(), listCtrlAccount_() + : mmPanelBase(db, inidb, core), m_imageList(), listCtrlBD_() { Create(parent, winid, pos, size, style, name); } @@ -86,7 +86,7 @@ initVirtualListControl(); if (trans_.size() > 1) - listCtrlAccount_->EnsureVisible(((int)trans_.size()) - 1); + listCtrlBD_->EnsureVisible(((int)trans_.size()) - 1); this->Thaw(); return TRUE; @@ -95,7 +95,7 @@ mmBillsDepositsPanel::~mmBillsDepositsPanel() { if (m_imageList) delete m_imageList; - this->save_config(listCtrlAccount_, wxT("BD")); + this->save_config(listCtrlBD_, wxT("BD")); } void mmBillsDepositsPanel::CreateControls() @@ -129,23 +129,23 @@ m_imageList->Add(wxBitmap(rt_exec_auto_xpm)); m_imageList->Add(wxBitmap(rt_exec_user_xpm)); - listCtrlAccount_ = new billsDepositsListCtrl( this, itemSplitterWindowBillsDeposit, + listCtrlBD_ = new billsDepositsListCtrl( this, itemSplitterWindowBillsDeposit, ID_PANEL_BD_LISTCTRL, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_HRULES | wxLC_VRULES | wxLC_VIRTUAL | wxLC_SINGLE_SEL ); - //listCtrlAccount_->SetBackgroundColour(mmColors::listDetailsPanelColor); - listCtrlAccount_->SetImageList(m_imageList, wxIMAGE_LIST_SMALL); - listCtrlAccount_->InsertColumn(0, _("Payee")); - listCtrlAccount_->InsertColumn(1, _("Account")); - listCtrlAccount_->InsertColumn(2, _("Type")); + //listCtrlBD_->SetBackgroundColour(mmColors::listDetailsPanelColor); + listCtrlBD_->SetImageList(m_imageList, wxIMAGE_LIST_SMALL); + listCtrlBD_->InsertColumn(0, _("Payee")); + listCtrlBD_->InsertColumn(1, _("Account")); + listCtrlBD_->InsertColumn(2, _("Type")); wxListItem itemCol; itemCol.SetImage(-1); itemCol.SetAlign(wxLIST_FORMAT_RIGHT); itemCol.SetText(_("Amount")); - listCtrlAccount_->InsertColumn(3, itemCol); - listCtrlAccount_->InsertColumn(4, _("Next Due Date")); - listCtrlAccount_->InsertColumn(5, _("Frequency")); - listCtrlAccount_->InsertColumn(6, _("Remaining Days")); - listCtrlAccount_->InsertColumn(7, _("Notes")); + listCtrlBD_->InsertColumn(3, itemCol); + listCtrlBD_->InsertColumn(4, _("Next Due Date")); + listCtrlBD_->InsertColumn(5, _("Frequency")); + listCtrlBD_->InsertColumn(6, _("Remaining Days")); + listCtrlBD_->InsertColumn(7, _("Notes")); /* See if we can get data from inidb */ long col0, col1, col2, col3, col4, col5, col6, col7; @@ -159,19 +159,19 @@ mmDBWrapper::getINISettingValue(inidb_, wxT("BD_COL7_WIDTH"), wxT("-2")).ToLong(&col7); - listCtrlAccount_->SetColumnWidth(0, col0); - listCtrlAccount_->SetColumnWidth(1, col1); - listCtrlAccount_->SetColumnWidth(2, col2); - listCtrlAccount_->SetColumnWidth(3, col3); - listCtrlAccount_->SetColumnWidth(4, col4); - listCtrlAccount_->SetColumnWidth(5, col5); - listCtrlAccount_->SetColumnWidth(6, col6); - listCtrlAccount_->SetColumnWidth(7, col7); + listCtrlBD_->SetColumnWidth(0, col0); + listCtrlBD_->SetColumnWidth(1, col1); + listCtrlBD_->SetColumnWidth(2, col2); + listCtrlBD_->SetColumnWidth(3, col3); + listCtrlBD_->SetColumnWidth(4, col4); + listCtrlBD_->SetColumnWidth(5, col5); + listCtrlBD_->SetColumnWidth(6, col6); + listCtrlBD_->SetColumnWidth(7, col7); wxPanel* itemPanel12 = new wxPanel( itemSplitterWindowBillsDeposit, ID_PANEL1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL ); - itemSplitterWindowBillsDeposit->SplitHorizontally(listCtrlAccount_, itemPanel12); + itemSplitterWindowBillsDeposit->SplitHorizontally(listCtrlBD_, itemPanel12); itemSplitterWindowBillsDeposit->SetMinimumPaneSize(100); itemSplitterWindowBillsDeposit->SetSashGravity(1.0); itemBoxSizer9->Add(itemSplitterWindowBillsDeposit, 1, wxGROW|wxALL, 1); @@ -367,33 +367,33 @@ q1.Finalize(); std::sort(trans_.begin(), trans_.end(), sortTransactionsByRemainingDays); - listCtrlAccount_->SetItemCount(static_cast<long>(trans_.size())); + listCtrlBD_->SetItemCount(static_cast<long>(trans_.size())); } void mmBillsDepositsPanel::OnNewBDSeries(wxCommandEvent& event) { - listCtrlAccount_->OnNewBDSeries(event); + listCtrlBD_->OnNewBDSeries(event); } void mmBillsDepositsPanel::OnEditBDSeries(wxCommandEvent& event) { - listCtrlAccount_->OnEditBDSeries(event); + listCtrlBD_->OnEditBDSeries(event); } void mmBillsDepositsPanel::OnDeleteBDSeries(wxCommandEvent& event) { - listCtrlAccount_->OnDeleteBDSeries(event); + listCtrlBD_->OnDeleteBDSeries(event); } void mmBillsDepositsPanel::OnEnterBDTransaction(wxCommandEvent& event) { - listCtrlAccount_->OnEnterBDTransaction(event); + listCtrlBD_->OnEnterBDTransaction(event); } void mmBillsDepositsPanel::OnSkipBDTransaction(wxCommandEvent& event) { - listCtrlAccount_->OnSkipBDTransaction(event); - listCtrlAccount_->SetFocus(); + listCtrlBD_->OnSkipBDTransaction(event); + listCtrlBD_->SetFocus(); } /*******************************************************/ @@ -604,8 +604,8 @@ { wxListItem selectedItem; selectedItem.SetId(selIndex); - listCtrlAccount_->GetItem(selectedItem); - listCtrlAccount_->SetItemState(selectedItem, wxLIST_STATE_SELECTED|wxLIST_STATE_FOCUSED, wxLIST_STATE_SELECTED|wxLIST_STATE_FOCUSED); + listCtrlBD_->GetItem(selectedItem); + listCtrlBD_->SetItemState(selectedItem, wxLIST_STATE_SELECTED|wxLIST_STATE_FOCUSED, wxLIST_STATE_SELECTED|wxLIST_STATE_FOCUSED); wxString addInfo; addInfo << trans_[selIndex].categoryStr_ << (trans_[selIndex].subcategoryStr_ == wxT ("") ? wxT ("") : wxT (":") + trans_[selIndex].subcategoryStr_); Modified: trunk/mmex/src/billsdepositspanel.h =================================================================== --- trunk/mmex/src/billsdepositspanel.h 2012-05-24 05:16:01 UTC (rev 2384) +++ trunk/mmex/src/billsdepositspanel.h 2012-05-24 06:22:18 UTC (rev 2385) @@ -153,7 +153,7 @@ public: wxImageList* m_imageList; - billsDepositsListCtrl* listCtrlAccount_; + billsDepositsListCtrl* listCtrlBD_; }; #endif Modified: trunk/mmex/src/budgetingpanel.cpp =================================================================== --- trunk/mmex/src/budgetingpanel.cpp 2012-05-24 05:16:01 UTC (rev 2384) +++ trunk/mmex/src/budgetingpanel.cpp 2012-05-24 06:22:18 UTC (rev 2385) @@ -46,7 +46,7 @@ ) : mmPanelBase(db, inidb, core), m_imageList(), - listCtrlAccount_(), + listCtrlBudget_(), budgetYearID_(budgetYearID), mainFrame_(mainFrame) { @@ -75,7 +75,7 @@ mmBudgetingPanel::~mmBudgetingPanel() { if (m_imageList) delete m_imageList; - this->save_config(listCtrlAccount_, wxT("BUDGET")); + this->save_config(listCtrlBudget_, wxT("BUDGET")); } void mmBudgetingPanel::OnViewPopupSelected(wxCommandEvent& event) @@ -112,9 +112,9 @@ wxASSERT(false); } - listCtrlAccount_->DeleteAllItems(); + listCtrlBudget_->DeleteAllItems(); initVirtualListControl(); - listCtrlAccount_->RefreshItems(0, ((int)trans_.size()) - 1); + listCtrlBudget_->RefreshItems(0, ((int)trans_.size()) - 1); } void mmBudgetingPanel::OnMouseLeftDown( wxMouseEvent& event ) @@ -245,26 +245,26 @@ m_imageList->Add(wxBitmap(flag_xpm)); m_imageList->Add(wxBitmap(empty_xpm)); - listCtrlAccount_ = new budgetingListCtrl( this, this, + listCtrlBudget_ = new budgetingListCtrl( this, this, ID_PANEL_CHECKING_LISTCTRL_ACCT, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_HRULES | wxLC_VRULES | wxLC_VIRTUAL | wxLC_SINGLE_SEL ); - //listCtrlAccount_->SetBackgroundColour(mmColors::listBackColor); - listCtrlAccount_->SetImageList(m_imageList, wxIMAGE_LIST_SMALL); - listCtrlAccount_->InsertColumn(0, _("Category ")); - listCtrlAccount_->InsertColumn(1, _("Sub Category")); - listCtrlAccount_->InsertColumn(2, _("Frequency")); + //listCtrlBudget_->SetBackgroundColour(mmColors::listBackColor); + listCtrlBudget_->SetImageList(m_imageList, wxIMAGE_LIST_SMALL); + listCtrlBudget_->InsertColumn(0, _("Category ")); + listCtrlBudget_->InsertColumn(1, _("Sub Category")); + listCtrlBudget_->InsertColumn(2, _("Frequency")); wxListItem itemCol; itemCol.SetImage(-1); itemCol.SetAlign(wxLIST_FORMAT_RIGHT); itemCol.SetText(_("Amount")); - listCtrlAccount_->InsertColumn(3, itemCol); + listCtrlBudget_->InsertColumn(3, itemCol); itemCol.SetText(_("Estimated")); - listCtrlAccount_->InsertColumn(4, itemCol); + listCtrlBudget_->InsertColumn(4, itemCol); itemCol.SetText(_("Actual")); - listCtrlAccount_->InsertColumn(5, itemCol); + listCtrlBudget_->InsertColumn(5, itemCol); /* See if we can get data from inidb */ long col0, col1, col2, col3, col4, col5; @@ -275,14 +275,14 @@ mmDBWrapper::getINISettingValue(inidb_, wxT("BUDGET_COL4_WIDTH"), wxT("80")).ToLong(&col4); mmDBWrapper::getINISettingValue(inidb_, wxT("BUDGET_COL5_WIDTH"), wxT("80")).ToLong(&col5); - listCtrlAccount_->SetColumnWidth(0, col0); - listCtrlAccount_->SetColumnWidth(1, col1); - listCtrlAccount_->SetColumnWidth(2, col2); - listCtrlAccount_->SetColumnWidth(3, col3); - listCtrlAccount_->SetColumnWidth(4, col4); - listCtrlAccount_->SetColumnWidth(5, col5); + listCtrlBudget_->SetColumnWidth(0, col0); + listCtrlBudget_->SetColumnWidth(1, col1); + listCtrlBudget_->SetColumnWidth(2, col2); + listCtrlBudget_->SetColumnWidth(3, col3); + listCtrlBudget_->SetColumnWidth(4, col4); + listCtrlBudget_->SetColumnWidth(5, col5); - itemBoxSizer2->Add(listCtrlAccount_, 1, wxGROW | wxALL, 1); + itemBoxSizer2->Add(listCtrlBudget_, 1, wxGROW | wxALL, 1); } bool mmBudgetingPanel::displayEntryAllowed(mmBudgetEntryHolder& budgetEntry) @@ -482,14 +482,14 @@ { trans_.push_back(catTotals); int transCatTotalIndex = (int)trans_.size()-1; - listCtrlAccount_->RefreshItem(transCatTotalIndex); + listCtrlBudget_->RefreshItem(transCatTotalIndex); } } st_sub.Finalize(); st.Finalize(); - listCtrlAccount_->SetItemCount((int)trans_.size()); + listCtrlBudget_->SetItemCount((int)trans_.size()); wxString estIncomeStr, actIncomeStr, estExpensesStr, actExpensesStr; mmex::formatDoubleToCurrency(estIncome, estIncomeStr); Modified: trunk/mmex/src/budgetingpanel.h =================================================================== --- trunk/mmex/src/budgetingpanel.h 2012-05-24 05:16:01 UTC (rev 2384) +++ trunk/mmex/src/budgetingpanel.h 2012-05-24 06:22:18 UTC (rev 2385) @@ -124,7 +124,7 @@ public: wxImageList* m_imageList; - budgetingListCtrl* listCtrlAccount_; + budgetingListCtrl* listCtrlBudget_; wxString currentView_; int budgetYearID_; mmGUIFrame* mainFrame_; Modified: trunk/mmex/src/stockspanel.cpp =================================================================== --- trunk/mmex/src/stockspanel.cpp 2012-05-24 05:16:01 UTC (rev 2384) +++ trunk/mmex/src/stockspanel.cpp 2012-05-24 06:22:18 UTC (rev 2385) @@ -91,7 +91,7 @@ initVirtualListControl(); if (trans_.size() > 1) - listCtrlAccount_->EnsureVisible(((int)trans_.size()) - 1); + listCtrlStock_->EnsureVisible(((int)trans_.size()) - 1); // Greg Newton yahoo_ = new mmYahoo(inidb_, db_); @@ -127,7 +127,7 @@ if (yahoo_) delete yahoo_; if (m_LED) delete m_LED; - this->save_config(listCtrlAccount_, wxT("STOCKS_COL")); + this->save_config(listCtrlStock_, wxT("STOCKS_COL")); } void mmStocksPanel::CreateControls() @@ -172,38 +172,38 @@ ID_SPLITTERWINDOW, wxDefaultPosition, wxSize(100, 100), wxSP_3DBORDER|wxSP_3DSASH|wxNO_BORDER); - listCtrlAccount_ = new stocksListCtrl(this, itemSplitterWindow10, + listCtrlStock_ = new stocksListCtrl(this, itemSplitterWindow10, ID_PANEL_STOCKS_LISTCTRL, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_HRULES | wxLC_VRULES | wxLC_VIRTUAL | wxLC_SINGLE_SEL); - //listCtrlAccount_->SetBackgroundColour(mmColors::listDetailsPanelColor); - listCtrlAccount_->InsertColumn(COL_DATE, _("Purchase Date")); + //listCtrlStock_->SetBackgroundColour(mmColors::listDetailsPanelColor); + listCtrlStock_->InsertColumn(COL_DATE, _("Purchase Date")); wxListItem itemCol; itemCol.SetImage(-1); //itemCol.SetAlign(wxLIST_FORMAT_LEFT); itemCol.SetText(_("Share Name")); - listCtrlAccount_->InsertColumn(COL_NAME, itemCol); + listCtrlStock_->InsertColumn(COL_NAME, itemCol); itemCol.SetAlign(wxLIST_FORMAT_RIGHT); itemCol.SetText(_("Number of Shares")); - listCtrlAccount_->InsertColumn(COL_NUMBER, itemCol); + listCtrlStock_->InsertColumn(COL_NUMBER, itemCol); itemCol.SetAlign(wxLIST_FORMAT_RIGHT); itemCol.SetText(_("Gain/Loss")); - listCtrlAccount_->InsertColumn(COL_GAIN_LOSS, itemCol); + listCtrlStock_->InsertColumn(COL_GAIN_LOSS, itemCol); itemCol.SetAlign(wxLIST_FORMAT_RIGHT); itemCol.SetText(_("Value")); - listCtrlAccount_->InsertColumn(COL_VALUE, itemCol); + listCtrlStock_->InsertColumn(COL_VALUE, itemCol); itemCol.SetAlign(wxLIST_FORMAT_RIGHT); itemCol.SetText(_("Current")); - listCtrlAccount_->InsertColumn(COL_CURRENT, itemCol); + listCtrlStock_->InsertColumn(COL_CURRENT, itemCol); itemCol.SetAlign(wxLIST_FORMAT_LEFT); itemCol.SetText(_("Notes")); - listCtrlAccount_->InsertColumn(COL_NOTES, itemCol); + listCtrlStock_->InsertColumn(COL_NOTES, itemCol); /* See if we can get data from inidb */ long col_x = -2; @@ -212,13 +212,13 @@ if (!mmDBWrapper::getINISettingValue(inidb_, wxString::Format(wxT("STOCKS_COL%i_WIDTH"), i), (i == 0 ? wxT("140"): wxT("-2"))).ToLong(&col_x)) (i == 0 ? col_x = 140 : col_x = -2); - listCtrlAccount_->SetColumnWidth(i, col_x); + listCtrlStock_->SetColumnWidth(i, col_x); }; wxPanel* itemPanel12 = new wxPanel(itemSplitterWindow10, ID_PANEL1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL); - itemSplitterWindow10->SplitHorizontally(listCtrlAccount_, itemPanel12); + itemSplitterWindow10->SplitHorizontally(listCtrlStock_, itemPanel12); itemSplitterWindow10->SetMinimumPaneSize(100); itemSplitterWindow10->SetSashGravity(1.0); itemBoxSizer9->Add(itemSplitterWindow10, 1, wxGROW|wxALL, 1); @@ -399,7 +399,7 @@ } st.Finalize(); - listCtrlAccount_->SetItemCount(cnt); + listCtrlStock_->SetItemCount(cnt); } void mmStocksPanel::OnRefreshQuotes(wxCommandEvent& WXUNUSED(event)) @@ -424,17 +424,17 @@ void mmStocksPanel::OnDeleteStocks(wxCommandEvent& event) { - listCtrlAccount_->OnDeleteStocks(event); + listCtrlStock_->OnDeleteStocks(event); } void mmStocksPanel::OnNewStocks(wxCommandEvent& event) { - listCtrlAccount_->OnNewStocks(event); + listCtrlStock_->OnNewStocks(event); } void mmStocksPanel::OnEditStocks(wxCommandEvent& event) { - listCtrlAccount_->OnEditStocks(event); + listCtrlStock_->OnEditStocks(event); } /** Thread and timer events **/ @@ -706,7 +706,7 @@ // Now refresh the display initVirtualListControl(); - listCtrlAccount_->RefreshItems(0, ((int)trans_.size()) - 1); + listCtrlStock_->RefreshItems(0, ((int)trans_.size()) - 1); // We are done! yahoo_->LastRefreshDT_ = wxDateTime::Now(); Modified: trunk/mmex/src/stockspanel.h =================================================================== --- trunk/mmex/src/stockspanel.h 2012-05-24 05:16:01 UTC (rev 2384) +++ trunk/mmex/src/stockspanel.h 2012-05-24 06:22:18 UTC (rev 2385) @@ -139,7 +139,7 @@ public: - stocksListCtrl* listCtrlAccount_; + stocksListCtrl* listCtrlStock_; int accountID_; /************************************************************/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |