From: <vo...@us...> - 2010-09-01 13:57:30
|
Revision: 1005 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1005&view=rev Author: vomikan Date: 2010-09-01 13:57:23 +0000 (Wed, 01 Sep 2010) Log Message: ----------- New style for New/Edit/Delete buttons for Assets panel Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2010-09-01 13:13:58 UTC (rev 1004) +++ trunk/mmex/src/assetspanel.cpp 2010-09-01 13:57:23 UTC (rev 1005) @@ -186,22 +186,29 @@ wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer4->Add(itemBoxSizer5, 0, wxALIGN_LEFT|wxALL, 5); - wxButton* itemButton6 = new wxButton( itemPanel12, IDC_BUTTON_NEW_ASSET, _("&New"), - wxDefaultPosition, wxDefaultSize, 0 ); + wxSizerFlags flags; + flags.Border(); + + wxButton* itemButton6 = new wxButton( itemPanel12, IDC_BUTTON_NEW_ASSET, _("&New")); itemButton6->SetToolTip(_("New Asset")); - itemBoxSizer5->Add(itemButton6, 0, wxGROW|wxALL, 1); + wxFont fnt = itemButton6->GetFont(); + itemButton6->SetFont(fnt); + itemButton6->SetForegroundColour(wxColour(wxT("FOREST GREEN"))); + itemBoxSizer5->Add(itemButton6, flags); - wxButton* itemButton81 = new wxButton( itemPanel12, IDC_BUTTON_EDIT_ASSET, _("&Edit"), - wxDefaultPosition, wxDefaultSize, 0 ); + wxButton* itemButton81 = new wxButton( itemPanel12, IDC_BUTTON_EDIT_ASSET, _("&Edit")); itemButton81->SetToolTip(_("Edit Asset")); - itemBoxSizer5->Add(itemButton81, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); + itemButton81->SetFont(fnt); + itemButton81->SetForegroundColour(wxColour(wxT("SALMON"))); + itemBoxSizer5->Add(itemButton81, flags); itemButton81->Enable(false); - wxButton* itemButton7 = new wxButton( itemPanel12, IDC_BUTTON_DELETE_ASSET, _("&Delete"), - wxDefaultPosition, wxDefaultSize, 0 ); + wxButton* itemButton7 = new wxButton( itemPanel12, IDC_BUTTON_DELETE_ASSET, _("&Delete")); itemButton7->SetToolTip(_("Delete Asset")); - itemBoxSizer5->Add(itemButton7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 1); - itemButton7->Enable(false); + itemButton7->SetFont(fnt); + itemButton7->SetForegroundColour(wxColour(wxT("ORANGE"))); // FIREBRICK + itemBoxSizer5->Add(itemButton7, flags); + itemButton7->Enable(false); } void mmAssetsPanel::initVirtualListControl() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2010-12-02 13:42:06
|
Revision: 1017 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1017&view=rev Author: vomikan Date: 2010-12-02 13:42:00 +0000 (Thu, 02 Dec 2010) Log Message: ----------- Buttons corol changed Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2010-12-02 13:32:08 UTC (rev 1016) +++ trunk/mmex/src/assetspanel.cpp 2010-12-02 13:42:00 UTC (rev 1017) @@ -213,14 +213,14 @@ wxButton* itemButton81 = new wxButton( itemPanel12, IDC_BUTTON_EDIT_ASSET, _("&Edit")); itemButton81->SetToolTip(_("Edit Asset")); itemButton81->SetFont(fnt); - itemButton81->SetForegroundColour(wxColour(wxT("SALMON"))); + itemButton81->SetForegroundColour(wxColour(wxT("ORANGE"))); itemBoxSizer5->Add(itemButton81, flags); itemButton81->Enable(false); wxButton* itemButton7 = new wxButton( itemPanel12, IDC_BUTTON_DELETE_ASSET, _("&Delete")); itemButton7->SetToolTip(_("Delete Asset")); itemButton7->SetFont(fnt); - itemButton7->SetForegroundColour(wxColour(wxT("ORANGE"))); // FIREBRICK + itemButton7->SetForegroundColour(wxColour(wxT("RED"))); // FIREBRICK itemBoxSizer5->Add(itemButton7, flags); itemButton7->Enable(false); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-01-02 21:31:28
|
Revision: 1057 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1057&view=rev Author: vomikan Date: 2011-01-02 21:31:22 +0000 (Sun, 02 Jan 2011) Log Message: ----------- Info message added in the botton of the assets panel when Assets selected in the navigation panel Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2011-01-02 21:16:06 UTC (rev 1056) +++ trunk/mmex/src/assetspanel.cpp 2011-01-02 21:31:22 UTC (rev 1057) @@ -229,6 +229,8 @@ IDC_PANEL_ASSET_STATIC_DETAILS, wxT(""), wxPoint(-1,-1), wxSize(350, -1), wxNO_BORDER|wxTE_MULTILINE|wxTE_WORDWRAP|wxST_NO_AUTORESIZE); itemBoxSizer4->Add(itemStaticText33, 1, wxGROW|wxALL, 5); + + updateExtraAssetData(-1); } @@ -353,7 +355,7 @@ } else { - st->SetLabel(wxT ("")); + st->SetLabel(_("MMEX allows you to track fixed assets like cars, houses, land and others. Each asset can have its value appreciate by a certain rate per year, depreciate by a certain rate per year, or not change in value. The total assets are added to your total financial worth.")); enableEditDeleteButtons(false); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2011-08-28 12:48:53
|
Revision: 1440 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1440&view=rev Author: vomikan Date: 2011-08-28 12:48:47 +0000 (Sun, 28 Aug 2011) Log Message: ----------- date formating algorytm changed Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2011-08-24 02:58:05 UTC (rev 1439) +++ trunk/mmex/src/assetspanel.cpp 2011-08-28 12:48:47 UTC (rev 1440) @@ -272,7 +272,9 @@ "a.ASSETNAME as ASSETNAME, " "a.ASSETTYPE as ASSETTYPE, " "a.STARTDATE as STARTDATE, " - "strftime(INFOVALUE, a.STARTDATE) as BEGINDATE, " + "ifnull (strftime(INFOVALUE, a.STARTDATE), " + "(strftime(replace (i.infovalue, '%y', SubStr (strftime('%Y', a.STARTDATE),3,2)),a.STARTDATE))) " + "as FORMATEDDATE, " "a.NOTES as NOTES, " "VALUECHANGE as VALUECHANGE, " "VALUECHANGERATE as VALUECHANGERATE " @@ -290,7 +292,7 @@ th.assetID_ = q1.GetInt(wxT("ASSETID")); th.value_ = mmDBWrapper::getAssetValue(m_db, th.assetID_); th.assetName_ = q1.GetString(wxT("ASSETNAME")); - th.assetDate_ = q1.GetString(wxT("BEGINDATE")); + th.assetDate_ = q1.GetString(wxT("FORMATEDDATE")); //sqlite does not support %y date mask therefore null value should be replaces if (th.assetDate_ == wxT("")) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2011-12-04 03:13:56
|
Revision: 1551 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1551&view=rev Author: stef145g Date: 2011-12-04 03:13:49 +0000 (Sun, 04 Dec 2011) Log Message: ----------- Fix compiler warnings - cosmetic code changes - No real change. Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2011-12-04 01:57:26 UTC (rev 1550) +++ trunk/mmex/src/assetspanel.cpp 2011-12-04 03:13:49 UTC (rev 1551) @@ -135,19 +135,20 @@ wxBoxSizer* itemBoxSizerVHeader = new wxBoxSizer(wxVERTICAL); headerPanel->SetSizer(itemBoxSizerVHeader); - wxStaticText* itemStaticText9 = new wxStaticText( headerPanel, wxID_ANY, _("Assets"), wxDefaultPosition, wxDefaultSize, 0 ); - itemStaticText9->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, - wxGetEmptyString())); + wxStaticText* itemStaticText9 = new wxStaticText( headerPanel, wxID_ANY, _("Assets"), + wxDefaultPosition, wxDefaultSize, 0 ); + itemStaticText9->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, wxGetEmptyString())); - wxStaticText* itemStaticText10 = new wxStaticText( headerPanel, IDC_PANEL_CHECKING_STATIC_BALHEADER, _("Total:"), wxDefaultPosition, wxDefaultSize, 0 ); + wxStaticText* itemStaticText10 = new wxStaticText( headerPanel, IDC_PANEL_CHECKING_STATIC_BALHEADER, _("Total:"), + wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizerVHeader->Add(itemStaticText9, 0, wxALL, 1); itemBoxSizerVHeader->Add(itemStaticText10, 0, wxALL, 1); /* ---------------------- */ - wxSplitterWindow* itemSplitterWindow10 = new wxSplitterWindow( itemPanelAssets, IDC_PANEL_CHECKING_STATIC_BAL, wxDefaultPosition, wxSize(100, 100), - wxSP_3DBORDER|wxSP_3DSASH|wxNO_BORDER ); + wxSplitterWindow* itemSplitterWindow10 = new wxSplitterWindow( itemPanelAssets, IDC_PANEL_CHECKING_STATIC_BAL, + wxDefaultPosition, wxSize(100, 100), wxSP_3DBORDER|wxSP_3DSASH|wxNO_BORDER ); wxSize imageSize(16, 16); m_imageList.reset(new wxImageList(imageSize.GetWidth(), imageSize.GetHeight())); @@ -196,7 +197,8 @@ m_listCtrlAssets->SetColumnWidth(COL_DATE, col3); m_listCtrlAssets->SetColumnWidth(COL_NOTES, col4); - wxPanel* itemPanel12 = new wxPanel( itemSplitterWindow10, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL ); + wxPanel* itemPanel12 = new wxPanel( itemSplitterWindow10, wxID_ANY, + wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL ); itemSplitterWindow10->SplitHorizontally(m_listCtrlAssets, itemPanel12); itemSplitterWindow10->SetMinimumPaneSize(100); @@ -281,11 +283,11 @@ th.assetDate_ = q1.GetString(wxT("FORMATEDDATE")); //sqlite does not support %y date mask therefore null value should be replaces if (th.assetDate_ == wxT("")) - { + { wxString dateString = q1.GetString(wxT("STARTDATE")); wxDateTime dtdt = mmGetStorageStringAsDate(dateString); th.assetDate_ = mmGetDateForDisplay(m_db, dtdt); - } + } wxString assetStr = q1.GetString(wxT("ASSETTYPE")); th.assetType_ = wxGetTranslation(assetStr); // string should be marked for translation @@ -313,7 +315,7 @@ void mmAssetsPanel::OnNewAsset(wxCommandEvent& event) { - m_listCtrlAssets->OnNewAsset(event); + m_listCtrlAssets->OnNewAsset(event); } void mmAssetsPanel::OnEditAsset(wxCommandEvent& event) @@ -362,40 +364,39 @@ void assetsListCtrl::OnListItemSelected(wxListEvent& event) { - m_selectedIndex = event.GetIndex(); - m_cp->updateExtraAssetData(m_selectedIndex); - + m_selectedIndex = event.GetIndex(); + m_cp->updateExtraAssetData(m_selectedIndex); } void assetsListCtrl::OnListItemDeselected(wxListEvent& /*event*/) { - m_selectedIndex = -1; - m_cp->updateExtraAssetData(m_selectedIndex); + m_selectedIndex = -1; + m_cp->updateExtraAssetData(m_selectedIndex); } //---------------------------------------------------------------------------- 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) { + wxStaticText* st = (wxStaticText*)FindWindow(IDC_PANEL_ASSET_STATIC_DETAILS); + wxStaticText* stm = (wxStaticText*)FindWindow(IDC_PANEL_ASSET_STATIC_DETAILS_MINI); + if (selIndex!=-1) + { enableEditDeleteButtons(true); wxString miniInfo; wxString infoStr; infoStr = getItem(selIndex, COL_NOTES); - double valueChange = m_trans[selIndex].valueChange_; miniInfo << wxT("\t") << _("Change in Value") << wxT(": ") << m_trans[selIndex].assetValueChange_ ; if (m_trans[selIndex].assetValueChange_ != _("None")) - miniInfo<< wxT(" = ") << m_trans[selIndex].valueChange_ << wxT("%"); + miniInfo<< wxT(" = ") << m_trans[selIndex].valueChange_ << wxT("%"); st->SetLabel(infoStr); stm->SetLabel(miniInfo); - } - else - { + } + else + { stm -> SetLabel(wxT("")); st->SetLabel(_("MMEX allows you to track fixed assets like cars, houses, land and others. Each asset can have its value appreciate by a certain rate per year, depreciate by a certain rate per year, or not change in value. The total assets are added to your total financial worth.")); enableEditDeleteButtons(false); - } + } } void mmAssetsPanel::enableEditDeleteButtons(bool enable) @@ -411,7 +412,7 @@ int assetsListCtrl::OnGetItemImage(long /*item*/) const { - return 0; // Returns the icon to be shown for each entry + return 0; // Returns the icon to be shown for each entry } wxListItemAttr* assetsListCtrl::OnGetItemAttr(long item) const @@ -423,10 +424,10 @@ void assetsListCtrl::OnListKeyDown(wxListEvent& event) { if (event.GetKeyCode() == WXK_DELETE) { - wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_DELETE); - OnDeleteAsset(evt); - } else { - event.Skip(); + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_DELETE); + OnDeleteAsset(evt); + } else { + event.Skip(); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-01-21 21:32:24
|
Revision: 1691 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1691&view=rev Author: vomikan Date: 2012-01-21 21:32:18 +0000 (Sat, 21 Jan 2012) Log Message: ----------- minor changes Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-01-21 05:52:49 UTC (rev 1690) +++ trunk/mmex/src/assetspanel.cpp 2012-01-21 21:32:18 UTC (rev 1691) @@ -192,43 +192,43 @@ m_listCtrlAssets->SetColumnWidth(COL_DATE, col3); m_listCtrlAssets->SetColumnWidth(COL_NOTES, col4); - wxPanel* itemPanel12 = new wxPanel( itemSplitterWindow10, wxID_ANY, + wxPanel* assets_panel = new wxPanel( itemSplitterWindow10, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL ); - itemSplitterWindow10->SplitHorizontally(m_listCtrlAssets, itemPanel12); + itemSplitterWindow10->SplitHorizontally(m_listCtrlAssets, assets_panel); itemSplitterWindow10->SetMinimumPaneSize(100); itemSplitterWindow10->SetSashGravity(1.0); itemBoxSizer9->Add(itemSplitterWindow10, 1, wxGROW|wxALL, 1); wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxVERTICAL); - itemPanel12->SetSizer(itemBoxSizer4); - itemPanel12->SetBackgroundColour(mmColors::listBackColor); + assets_panel->SetSizer(itemBoxSizer4); + assets_panel->SetBackgroundColour(mmColors::listBackColor); wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer4->Add(itemBoxSizer5, 0, wxALIGN_LEFT|wxALL, 3); - wxButton* itemButton6 = new wxButton( itemPanel12, wxID_NEW, _("&New")); + wxButton* itemButton6 = new wxButton( assets_panel, wxID_NEW, _("&New")); itemButton6->SetToolTip(_("New Asset")); itemBoxSizer5->Add(itemButton6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); - wxButton* itemButton81 = new wxButton( itemPanel12, wxID_EDIT, _("&Edit")); + wxButton* itemButton81 = new wxButton( assets_panel, wxID_EDIT, _("&Edit")); itemButton81->SetToolTip(_("Edit Asset")); itemBoxSizer5->Add(itemButton81, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemButton81->Enable(false); - wxButton* itemButton7 = new wxButton( itemPanel12, wxID_DELETE, _("&Delete")); + wxButton* itemButton7 = new wxButton( assets_panel, wxID_DELETE, _("&Delete")); itemButton7->SetToolTip(_("Delete Asset")); itemBoxSizer5->Add(itemButton7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemButton7->Enable(false); //Infobar-mini - wxStaticText* itemStaticText44 = new wxStaticText( itemPanel12, IDC_PANEL_ASSET_STATIC_DETAILS_MINI, wxT(""), + wxStaticText* itemStaticText44 = new wxStaticText( assets_panel, IDC_PANEL_ASSET_STATIC_DETAILS_MINI, wxT(""), wxDefaultPosition, wxDefaultSize, 0); itemBoxSizer5->Add(itemStaticText44, 1, wxGROW|wxTOP, 12); //Infobar - wxStaticText* itemStaticText33 = new wxStaticText( itemPanel12, - IDC_PANEL_ASSET_STATIC_DETAILS, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_WORDWRAP); + wxStaticText* itemStaticText33 = new wxStaticText( assets_panel, + IDC_PANEL_ASSET_STATIC_DETAILS, wxT(""), wxDefaultPosition, wxSize(200,-1), wxTE_MULTILINE|wxTE_WORDWRAP); itemBoxSizer4->Add(itemStaticText33, 1, wxGROW|wxALL, 5); updateExtraAssetData(-1); @@ -364,7 +364,7 @@ { wxStaticText* st = (wxStaticText*)FindWindow(IDC_PANEL_ASSET_STATIC_DETAILS); wxStaticText* stm = (wxStaticText*)FindWindow(IDC_PANEL_ASSET_STATIC_DETAILS_MINI); - if (selIndex!=-1) + if (selIndex > -1) { enableEditDeleteButtons(true); wxString miniInfo; @@ -379,7 +379,7 @@ else { stm -> SetLabel(wxT("")); - st->SetLabel(_("MMEX allows you to track fixed assets like cars, houses, land and others. Each asset can have its value appreciate by a certain rate per year, depreciate by a certain rate per year, or not change in value. The total assets are added to your total financial worth.")); + st->SetLabel(Tips(wxT("assets"))); enableEditDeleteButtons(false); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-03-06 07:17:56
|
Revision: 1925 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1925&view=rev Author: guanlisheng Date: 2012-03-06 07:17:49 +0000 (Tue, 06 Mar 2012) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-03-06 07:16:11 UTC (rev 1924) +++ trunk/mmex/src/assetspanel.cpp 2012-03-06 07:17:49 UTC (rev 1925) @@ -117,14 +117,12 @@ void mmAssetsPanel::CreateControls() { - mmAssetsPanel* itemPanelAssets = this; - wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxVERTICAL); - itemPanelAssets->SetSizer(itemBoxSizer9); - itemPanelAssets->SetBackgroundColour(mmColors::listBackColor); + this->SetSizer(itemBoxSizer9); + this->SetBackgroundColour(mmColors::listBackColor); /* ---------------------- */ - wxPanel* headerPanel = new wxPanel( itemPanelAssets, wxID_ANY, wxDefaultPosition, + wxPanel* headerPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL ); itemBoxSizer9->Add(headerPanel, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); @@ -144,7 +142,7 @@ /* ---------------------- */ - wxSplitterWindow* itemSplitterWindow10 = new wxSplitterWindow( itemPanelAssets, IDC_PANEL_CHECKING_STATIC_BAL, + wxSplitterWindow* itemSplitterWindow10 = new wxSplitterWindow( this, IDC_PANEL_CHECKING_STATIC_BAL, wxDefaultPosition, wxSize(100, 100), wxSP_3DBORDER|wxSP_3DSASH|wxNO_BORDER ); wxSize imageSize(16, 16); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-05-13 12:21:10
|
Revision: 2332 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2332&view=rev Author: guanlisheng Date: 2012-05-13 12:21:04 +0000 (Sun, 13 May 2012) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-05-13 12:04:12 UTC (rev 2331) +++ trunk/mmex/src/assetspanel.cpp 2012-05-13 12:21:04 UTC (rev 2332) @@ -297,17 +297,15 @@ const DB_View_ASSETS_V1::Data& asset = all_assets_.at(selIndex); enableEditDeleteButtons(true); wxString miniInfo; - wxString infoStr; - infoStr = asset.NOTES; miniInfo << wxT("\t") << _("Change in Value") << wxT(": ") << asset.VALUECHANGE; if (asset.VALUECHANGE != _("None")) miniInfo<< wxT(" = ") << asset.VALUECHANGERATE << wxT("%"); - st->SetLabel(infoStr); + st->SetLabel(asset.NOTES); stm->SetLabel(miniInfo); } else { - stm -> SetLabel(wxT("")); + stm->SetLabel(wxT("")); st->SetLabel(Tips(TIPS_ASSETS)); enableEditDeleteButtons(false); } @@ -357,9 +355,7 @@ void assetsListCtrl::doRefreshItems() { m_cp->initVirtualListControl(); - - long cnt = static_cast<long>(m_cp->all_assets_.size()); - RefreshItems(0, cnt > 0 ? --cnt : 0); + RefreshItems(0, m_cp->all_assets_.empty() ? 0: m_cp->all_assets_.size() - 1); } void assetsListCtrl::OnDeleteAsset(wxCommandEvent& /*event*/) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-05-13 13:54:17
|
Revision: 2334 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2334&view=rev Author: guanlisheng Date: 2012-05-13 13:54:11 +0000 (Sun, 13 May 2012) Log Message: ----------- DATE display Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-05-13 13:11:57 UTC (rev 2333) +++ trunk/mmex/src/assetspanel.cpp 2012-05-13 13:54:11 UTC (rev 2334) @@ -264,7 +264,12 @@ if (column == COL_NAME) return asset.ASSETNAME; if (column == COL_TYPE) return wxGetTranslation(asset.ASSETTYPE); if (column == COL_VALUE) return asset.to_string(DB_View_ASSETS_V1::COL_VALUE); // TODO - if (column == COL_DATE) return asset.STARTDATE; // TODO + if (column == COL_DATE) + { + wxDateTime dt; + dt.ParseDate(asset.STARTDATE); + return dt.Format(mmOptions::instance().dateFormat); + } if (column == COL_NOTES) return asset.NOTES; return wxGetEmptyString(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-05-13 14:01:14
|
Revision: 2335 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2335&view=rev Author: guanlisheng Date: 2012-05-13 14:01:08 +0000 (Sun, 13 May 2012) Log Message: ----------- $ display Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-05-13 13:54:11 UTC (rev 2334) +++ trunk/mmex/src/assetspanel.cpp 2012-05-13 14:01:08 UTC (rev 2335) @@ -263,7 +263,13 @@ if (column == COL_NAME) return asset.ASSETNAME; if (column == COL_TYPE) return wxGetTranslation(asset.ASSETTYPE); - if (column == COL_VALUE) return asset.to_string(DB_View_ASSETS_V1::COL_VALUE); // TODO + if (column == COL_VALUE) + { + double val = mmDBWrapper::getAssetValue(asset); + wxString val_str; + mmex::formatDoubleToCurrencyEdit(val, val_str); + return val_str; + } if (column == COL_DATE) { wxDateTime dt; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-05-14 08:28:20
|
Revision: 2339 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2339&view=rev Author: guanlisheng Date: 2012-05-14 08:28:11 +0000 (Mon, 14 May 2012) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-05-14 08:19:46 UTC (rev 2338) +++ trunk/mmex/src/assetspanel.cpp 2012-05-14 08:28:11 UTC (rev 2339) @@ -24,8 +24,7 @@ #include "../resources/assets.xpm" enum { - IDC_PANEL_STOCKS_LISTCTRL = wxID_HIGHEST + 1, - IDC_PANEL_ASSETS_LISTCTRL, + IDC_PANEL_ASSETS_LISTCTRL = wxID_HIGHEST + 1, IDC_PANEL_CHECKING_STATIC_BALHEADER, IDC_PANEL_CHECKING_STATIC_BAL, MENU_TREEPOPUP_NEW, @@ -52,10 +51,10 @@ END_EVENT_TABLE() /*******************************************************/ BEGIN_EVENT_TABLE(assetsListCtrl, wxListCtrl) - EVT_LIST_ITEM_ACTIVATED(IDC_PANEL_STOCKS_LISTCTRL, assetsListCtrl::OnListItemActivated) - EVT_LIST_ITEM_RIGHT_CLICK(IDC_PANEL_STOCKS_LISTCTRL, assetsListCtrl::OnItemRightClick) - EVT_LIST_ITEM_SELECTED(IDC_PANEL_STOCKS_LISTCTRL, assetsListCtrl::OnListItemSelected) - EVT_LIST_ITEM_DESELECTED(IDC_PANEL_STOCKS_LISTCTRL, assetsListCtrl::OnListItemDeselected) + EVT_LIST_ITEM_ACTIVATED(IDC_PANEL_ASSETS_LISTCTRL, assetsListCtrl::OnListItemActivated) + EVT_LIST_ITEM_RIGHT_CLICK(IDC_PANEL_ASSETS_LISTCTRL, assetsListCtrl::OnItemRightClick) + EVT_LIST_ITEM_SELECTED(IDC_PANEL_ASSETS_LISTCTRL, assetsListCtrl::OnListItemSelected) + EVT_LIST_ITEM_DESELECTED(IDC_PANEL_ASSETS_LISTCTRL, assetsListCtrl::OnListItemDeselected) EVT_MENU(MENU_TREEPOPUP_NEW, assetsListCtrl::OnNewAsset) EVT_MENU(MENU_TREEPOPUP_EDIT, assetsListCtrl::OnEditAsset) @@ -145,7 +144,7 @@ m_imageList->Add(wxBitmap(assets_xpm)); m_listCtrlAssets = new assetsListCtrl( this, itemSplitterWindow10, - IDC_PANEL_STOCKS_LISTCTRL, wxDefaultPosition, wxDefaultSize, + IDC_PANEL_ASSETS_LISTCTRL, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_HRULES | wxLC_VRULES | wxLC_VIRTUAL | wxLC_SINGLE_SEL ); //m_listCtrlAssets->SetBackgroundColour(mmColors::listDetailsPanelColor); m_listCtrlAssets->SetImageList(m_imageList.get(), wxIMAGE_LIST_SMALL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-05-16 05:26:17
|
Revision: 2350 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2350&view=rev Author: guanlisheng Date: 2012-05-16 05:26:11 +0000 (Wed, 16 May 2012) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-05-16 03:54:14 UTC (rev 2349) +++ trunk/mmex/src/assetspanel.cpp 2012-05-16 05:26:11 UTC (rev 2350) @@ -144,13 +144,7 @@ IDC_PANEL_ASSETS_LISTCTRL, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_HRULES | wxLC_VRULES | wxLC_VIRTUAL | wxLC_SINGLE_SEL ); m_listCtrlAssets->m_imageList->Add(wxBitmap(assets_xpm)); - - m_listCtrlAssets->InsertColumn(COL_NAME, _("Name"), wxLIST_FORMAT_RIGHT); - m_listCtrlAssets->InsertColumn(COL_TYPE, _("Type"), wxLIST_FORMAT_RIGHT); - m_listCtrlAssets->InsertColumn(COL_VALUE, _("Value"), wxLIST_FORMAT_RIGHT); - m_listCtrlAssets->InsertColumn(COL_DATE, _("Date"), wxLIST_FORMAT_RIGHT); - m_listCtrlAssets->InsertColumn(COL_NOTES, _("Notes")); - + /* See if we can get data from inidb */ long col0, col1, col2, col3, col4; mmDBWrapper::getINISettingValue(inidb_, wxT("ASSETS_COL0_WIDTH"), wxT("150")).ToLong(&col0); @@ -158,13 +152,13 @@ mmDBWrapper::getINISettingValue(inidb_, wxT("ASSETS_COL2_WIDTH"), wxT("-2")).ToLong(&col2); mmDBWrapper::getINISettingValue(inidb_, wxT("ASSETS_COL3_WIDTH"), wxT("-2")).ToLong(&col3); mmDBWrapper::getINISettingValue(inidb_, wxT("ASSETS_COL4_WIDTH"), wxT("450")).ToLong(&col4); - - m_listCtrlAssets->SetColumnWidth(COL_NAME, col0); - m_listCtrlAssets->SetColumnWidth(COL_TYPE, col1); - m_listCtrlAssets->SetColumnWidth(COL_VALUE, col2); - m_listCtrlAssets->SetColumnWidth(COL_DATE, col3); - m_listCtrlAssets->SetColumnWidth(COL_NOTES, col4); - + + m_listCtrlAssets->InsertColumn(COL_NAME, _("Name"), wxLIST_FORMAT_RIGHT, col0); + m_listCtrlAssets->InsertColumn(COL_TYPE, _("Type"), wxLIST_FORMAT_RIGHT, col1); + m_listCtrlAssets->InsertColumn(COL_VALUE, _("Value"), wxLIST_FORMAT_RIGHT, col2); + m_listCtrlAssets->InsertColumn(COL_DATE, _("Date"), wxLIST_FORMAT_RIGHT, col3); + m_listCtrlAssets->InsertColumn(COL_NOTES, _("Notes"), wxLIST_FORMAT_LEFT, col4); + wxPanel* assets_panel = new wxPanel( itemSplitterWindow10, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL ); 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:56:36
|
Revision: 2360 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2360&view=rev Author: stef145g Date: 2012-05-19 02:56:30 +0000 (Sat, 19 May 2012) Log Message: ----------- Fix: compiler warning Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-05-19 02:45:21 UTC (rev 2359) +++ trunk/mmex/src/assetspanel.cpp 2012-05-19 02:56:30 UTC (rev 2360) @@ -301,7 +301,7 @@ { wxStaticText* st = (wxStaticText*)FindWindow(IDC_PANEL_ASSET_STATIC_DETAILS); wxStaticText* stm = (wxStaticText*)FindWindow(IDC_PANEL_ASSET_STATIC_DETAILS_MINI); - if (selIndex > -1 && selIndex < all_assets_.size()) + if ((selIndex > -1) && (selIndex < (int)all_assets_.size())) { const DB_View_ASSETS_V1::Data& asset = all_assets_.at(selIndex); enableEditDeleteButtons(true); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-05-23 08:10:46
|
Revision: 2370 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2370&view=rev Author: guanlisheng Date: 2012-05-23 08:10:36 +0000 (Wed, 23 May 2012) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-05-23 07:00:51 UTC (rev 2369) +++ trunk/mmex/src/assetspanel.cpp 2012-05-23 08:10:36 UTC (rev 2370) @@ -25,8 +25,8 @@ enum { IDC_PANEL_ASSETS_LISTCTRL = wxID_HIGHEST + 1, - IDC_PANEL_CHECKING_STATIC_BALHEADER, - IDC_PANEL_CHECKING_STATIC_BAL, + IDC_PANEL_ASSET_STATIC_BALHEADER, + IDC_PANEL_ASSET_STATIC_BAL, MENU_TREEPOPUP_NEW, MENU_TREEPOPUP_EDIT, MENU_TREEPOPUP_DELETE, @@ -118,33 +118,27 @@ { wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxVERTICAL); this->SetSizer(itemBoxSizer9); - //this->SetBackgroundColour(mmColors::listBackColor); /* ---------------------- */ - wxPanel* headerPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, - wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL ); + wxPanel* headerPanel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL); itemBoxSizer9->Add(headerPanel, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); wxBoxSizer* itemBoxSizerVHeader = new wxBoxSizer(wxVERTICAL); headerPanel->SetSizer(itemBoxSizerVHeader); - //headerPanel->SetBackgroundColour(mmColors::listBackColor); - wxStaticText* itemStaticText9 = new wxStaticText( headerPanel, wxID_ANY, _("Assets"), - wxDefaultPosition, wxDefaultSize, 0 ); + wxStaticText* itemStaticText9 = new wxStaticText(headerPanel, wxID_ANY, _("Assets")); itemStaticText9->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, wxGetEmptyString())); - wxStaticText* itemStaticText10 = new wxStaticText( headerPanel, IDC_PANEL_CHECKING_STATIC_BALHEADER, _("Total:"), - wxDefaultPosition, wxDefaultSize, 0 ); + wxStaticText* itemStaticText10 = new wxStaticText(headerPanel, IDC_PANEL_ASSET_STATIC_BALHEADER, _("Total:")); itemBoxSizerVHeader->Add(itemStaticText9, 0, wxALL, 1); itemBoxSizerVHeader->Add(itemStaticText10, 0, wxALL, 1); /* ---------------------- */ - wxSplitterWindow* itemSplitterWindow10 = new wxSplitterWindow( this, IDC_PANEL_CHECKING_STATIC_BAL, - wxDefaultPosition, wxSize(100, 100), wxSP_3DBORDER|wxSP_3DSASH|wxNO_BORDER ); + wxSplitterWindow* itemSplitterWindow10 = new wxSplitterWindow(this, IDC_PANEL_ASSET_STATIC_BAL, wxDefaultPosition, wxSize(100, 100), wxSP_3DBORDER|wxSP_3DSASH|wxNO_BORDER ); - m_listCtrlAssets = new assetsListCtrl( this, itemSplitterWindow10, + m_listCtrlAssets = new assetsListCtrl(this, itemSplitterWindow10, IDC_PANEL_ASSETS_LISTCTRL, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_HRULES | wxLC_VRULES | wxLC_VIRTUAL | wxLC_SINGLE_SEL ); m_listCtrlAssets->m_imageList->Add(wxBitmap(assets_xpm)); @@ -163,7 +157,7 @@ m_listCtrlAssets->InsertColumn(COL_DATE, _("Date"), wxLIST_FORMAT_RIGHT, col3); m_listCtrlAssets->InsertColumn(COL_NOTES, _("Notes"), wxLIST_FORMAT_LEFT, col4); - wxPanel* assets_panel = new wxPanel( itemSplitterWindow10, wxID_ANY, + wxPanel* assets_panel = new wxPanel(itemSplitterWindow10, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL ); itemSplitterWindow10->SplitHorizontally(m_listCtrlAssets, assets_panel); @@ -178,11 +172,11 @@ wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer4->Add(itemBoxSizer5, 0, wxALIGN_LEFT|wxALL, 3); - m_new_button = new wxButton( assets_panel, wxID_NEW, _("&New")); + m_new_button = new wxButton(assets_panel, wxID_NEW, _("&New")); m_new_button->SetToolTip(_("New Asset")); itemBoxSizer5->Add(m_new_button, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); - m_edit_button = new wxButton( assets_panel, wxID_EDIT, _("&Edit")); + m_edit_button = new wxButton(assets_panel, wxID_EDIT, _("&Edit")); m_edit_button->SetToolTip(_("Edit Asset")); itemBoxSizer5->Add(m_edit_button, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); m_edit_button->Enable(false); @@ -193,12 +187,11 @@ m_delete_button->Enable(false); //Infobar-mini - wxStaticText* itemStaticText44 = new wxStaticText( assets_panel, IDC_PANEL_ASSET_STATIC_DETAILS_MINI, wxT(""), - wxDefaultPosition, wxDefaultSize, 0); + wxStaticText* itemStaticText44 = new wxStaticText(assets_panel, IDC_PANEL_ASSET_STATIC_DETAILS_MINI, wxT(""), wxDefaultPosition, wxDefaultSize, 0); itemBoxSizer5->Add(itemStaticText44, 1, wxGROW|wxTOP, 12); //Infobar - wxStaticText* itemStaticText33 = new wxStaticText( assets_panel, + wxStaticText* itemStaticText33 = new wxStaticText(assets_panel, IDC_PANEL_ASSET_STATIC_DETAILS, wxT(""), wxDefaultPosition, wxSize(200,-1), wxTE_MULTILINE|wxTE_WORDWRAP); itemBoxSizer4->Add(itemStaticText33, 1, wxGROW|wxLEFT|wxRIGHT, 14); @@ -212,7 +205,7 @@ double total = mmDBWrapper::getAssetBalance(db_); wxString balance; mmex::formatDoubleToCurrency(total, balance); - wxStaticText* header = (wxStaticText*)FindWindow(IDC_PANEL_CHECKING_STATIC_BALHEADER); + wxStaticText* header = (wxStaticText*)FindWindow(IDC_PANEL_ASSET_STATIC_BALHEADER); wxASSERT(header); wxString lbl = wxString::Format(_("Total: %s"), balance.c_str()); header->SetLabel(lbl); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-05-23 08:37:03
|
Revision: 2371 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2371&view=rev Author: guanlisheng Date: 2012-05-23 08:36:56 +0000 (Wed, 23 May 2012) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-05-23 08:10:36 UTC (rev 2370) +++ trunk/mmex/src/assetspanel.cpp 2012-05-23 08:36:56 UTC (rev 2371) @@ -116,29 +116,27 @@ void mmAssetsPanel::CreateControls() { - wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxVERTICAL); - this->SetSizer(itemBoxSizer9); + wxBoxSizer* itemBoxSizer1 = new wxBoxSizer(wxVERTICAL); + this->SetSizer(itemBoxSizer1); /* ---------------------- */ wxPanel* headerPanel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL); - itemBoxSizer9->Add(headerPanel, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemBoxSizer1->Add(headerPanel, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); wxBoxSizer* itemBoxSizerVHeader = new wxBoxSizer(wxVERTICAL); headerPanel->SetSizer(itemBoxSizerVHeader); - wxStaticText* itemStaticText9 = new wxStaticText(headerPanel, wxID_ANY, _("Assets")); - itemStaticText9->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, wxGetEmptyString())); + wxStaticText* itemStaticText1 = new wxStaticText(headerPanel, wxID_ANY, _("Assets")); + itemStaticText1->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, wxGetEmptyString())); + wxStaticText* itemStaticText2 = new wxStaticText(headerPanel, IDC_PANEL_ASSET_STATIC_BALHEADER, _("Total:")); + itemBoxSizerVHeader->Add(itemStaticText1, 0, wxALL, 1); + itemBoxSizerVHeader->Add(itemStaticText2, 0, wxALL, 1); - wxStaticText* itemStaticText10 = new wxStaticText(headerPanel, IDC_PANEL_ASSET_STATIC_BALHEADER, _("Total:")); - - itemBoxSizerVHeader->Add(itemStaticText9, 0, wxALL, 1); - itemBoxSizerVHeader->Add(itemStaticText10, 0, wxALL, 1); - /* ---------------------- */ - wxSplitterWindow* itemSplitterWindow10 = new wxSplitterWindow(this, IDC_PANEL_ASSET_STATIC_BAL, wxDefaultPosition, wxSize(100, 100), wxSP_3DBORDER|wxSP_3DSASH|wxNO_BORDER ); + wxSplitterWindow* itemSplitterWindow = new wxSplitterWindow(this, IDC_PANEL_ASSET_STATIC_BAL, wxDefaultPosition, wxSize(100, 100), wxSP_3DBORDER|wxSP_3DSASH|wxNO_BORDER ); - m_listCtrlAssets = new assetsListCtrl(this, itemSplitterWindow10, + m_listCtrlAssets = new assetsListCtrl(this, itemSplitterWindow, IDC_PANEL_ASSETS_LISTCTRL, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_HRULES | wxLC_VRULES | wxLC_VIRTUAL | wxLC_SINGLE_SEL ); m_listCtrlAssets->m_imageList->Add(wxBitmap(assets_xpm)); @@ -157,43 +155,41 @@ m_listCtrlAssets->InsertColumn(COL_DATE, _("Date"), wxLIST_FORMAT_RIGHT, col3); m_listCtrlAssets->InsertColumn(COL_NOTES, _("Notes"), wxLIST_FORMAT_LEFT, col4); - wxPanel* assets_panel = new wxPanel(itemSplitterWindow10, wxID_ANY, - wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL ); + wxPanel* assets_panel = new wxPanel(itemSplitterWindow, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL ); - itemSplitterWindow10->SplitHorizontally(m_listCtrlAssets, assets_panel); - itemSplitterWindow10->SetMinimumPaneSize(100); - itemSplitterWindow10->SetSashGravity(1.0); - itemBoxSizer9->Add(itemSplitterWindow10, 1, wxGROW|wxALL, 1); + itemSplitterWindow->SplitHorizontally(m_listCtrlAssets, assets_panel); + itemSplitterWindow->SetMinimumPaneSize(100); + itemSplitterWindow->SetSashGravity(1.0); + itemBoxSizer1->Add(itemSplitterWindow, 1, wxGROW|wxALL, 1); - wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxVERTICAL); - assets_panel->SetSizer(itemBoxSizer4); + wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); + assets_panel->SetSizer(itemBoxSizer2); //assets_panel->SetBackgroundColour(mmColors::listBackColor); - wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer4->Add(itemBoxSizer5, 0, wxALIGN_LEFT|wxALL, 3); + wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL); + itemBoxSizer2->Add(itemBoxSizer3, 0, wxALIGN_LEFT|wxALL, 3); m_new_button = new wxButton(assets_panel, wxID_NEW, _("&New")); m_new_button->SetToolTip(_("New Asset")); - itemBoxSizer5->Add(m_new_button, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); + itemBoxSizer3->Add(m_new_button, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); m_edit_button = new wxButton(assets_panel, wxID_EDIT, _("&Edit")); m_edit_button->SetToolTip(_("Edit Asset")); - itemBoxSizer5->Add(m_edit_button, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); + itemBoxSizer3->Add(m_edit_button, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); m_edit_button->Enable(false); m_delete_button = new wxButton(assets_panel, wxID_DELETE, _("&Delete")); m_delete_button->SetToolTip(_("Delete Asset")); - itemBoxSizer5->Add(m_delete_button, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); + 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); - itemBoxSizer5->Add(itemStaticText44, 1, wxGROW|wxTOP, 12); + itemBoxSizer3->Add(itemStaticText44, 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); - itemBoxSizer4->Add(itemStaticText33, 1, wxGROW|wxLEFT|wxRIGHT, 14); + 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); updateExtraAssetData(-1); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-05-23 09:27:05
|
Revision: 2372 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2372&view=rev Author: guanlisheng Date: 2012-05-23 09:26:55 +0000 (Wed, 23 May 2012) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-05-23 08:36:56 UTC (rev 2371) +++ trunk/mmex/src/assetspanel.cpp 2012-05-23 09:26:55 UTC (rev 2372) @@ -362,11 +362,8 @@ DeleteItem(m_selectedIndex); m_cp->initVirtualListControl(m_selected_col, m_asc); - //if (m_cp->getTrans().empty()) //after delition of asset - index and extra panel should be erased - { - m_selectedIndex = -1; - m_cp->updateExtraAssetData(m_selectedIndex); - } + m_selectedIndex = -1; + m_cp->updateExtraAssetData(m_selectedIndex); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-05-23 09:29:26
|
Revision: 2373 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2373&view=rev Author: guanlisheng Date: 2012-05-23 09:29:20 +0000 (Wed, 23 May 2012) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-05-23 09:26:55 UTC (rev 2372) +++ trunk/mmex/src/assetspanel.cpp 2012-05-23 09:29:20 UTC (rev 2373) @@ -92,12 +92,7 @@ mmAssetsPanel::~mmAssetsPanel() { - try { - destroy(); - } catch (...) { - wxASSERT(false); - } - + destroy(); if (m_new_button) delete m_new_button; if (m_edit_button) delete m_edit_button; if (m_delete_button) delete m_delete_button; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-05-24 07:49:58
|
Revision: 2388 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2388&view=rev Author: guanlisheng Date: 2012-05-24 07:49:47 +0000 (Thu, 24 May 2012) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-05-24 07:15:01 UTC (rev 2387) +++ trunk/mmex/src/assetspanel.cpp 2012-05-24 07:49:47 UTC (rev 2388) @@ -150,17 +150,14 @@ wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL); itemBoxSizer2->Add(itemBoxSizer3, 0, wxALIGN_LEFT|wxALL, 3); - m_new_button = new wxButton(assets_panel, wxID_NEW, _("&New")); - m_new_button->SetToolTip(_("New Asset")); + m_new_button = new wxButton(assets_panel, wxID_NEW); itemBoxSizer3->Add(m_new_button, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); - m_edit_button = new wxButton(assets_panel, wxID_EDIT, _("&Edit")); - m_edit_button->SetToolTip(_("Edit Asset")); + m_edit_button = new wxButton(assets_panel, wxID_EDIT); itemBoxSizer3->Add(m_edit_button, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); m_edit_button->Enable(false); - m_delete_button = new wxButton(assets_panel, wxID_DELETE, _("&Delete")); - m_delete_button->SetToolTip(_("Delete Asset")); + m_delete_button = new wxButton(assets_panel, wxID_DELETE); itemBoxSizer3->Add(m_delete_button, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); m_delete_button->Enable(false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-05-24 11:01:26
|
Revision: 2391 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2391&view=rev Author: vomikan Date: 2012-05-24 11:01:15 +0000 (Thu, 24 May 2012) Log Message: ----------- fix for panel Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-05-24 10:34:48 UTC (rev 2390) +++ trunk/mmex/src/assetspanel.cpp 2012-05-24 11:01:15 UTC (rev 2391) @@ -3,12 +3,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 @@ -20,8 +20,8 @@ #include "assetdialog.h" #include <boost/foreach.hpp> -enum -{ +enum +{ IDC_PANEL_ASSETS_LISTCTRL = wxID_HIGHEST + 1, IDC_PANEL_ASSET_STATIC_BALHEADER, IDC_PANEL_ASSET_STATIC_BAL, @@ -32,10 +32,10 @@ IDC_PANEL_ASSET_STATIC_DETAILS_MINI }; enum EColumn -{ - COL_NAME = 0, +{ + COL_NAME = 0, COL_DATE, - COL_TYPE, + COL_TYPE, COL_VALUE, COL_NOTES, COL_MAX, // number of columns @@ -54,16 +54,16 @@ EVT_LIST_ITEM_SELECTED(IDC_PANEL_ASSETS_LISTCTRL, assetsListCtrl::OnListItemSelected) EVT_LIST_ITEM_DESELECTED(IDC_PANEL_ASSETS_LISTCTRL, assetsListCtrl::OnListItemDeselected) EVT_LIST_COL_CLICK(IDC_PANEL_ASSETS_LISTCTRL, assetsListCtrl::OnColClick) - + EVT_MENU(MENU_TREEPOPUP_NEW, assetsListCtrl::OnNewAsset) EVT_MENU(MENU_TREEPOPUP_EDIT, assetsListCtrl::OnEditAsset) EVT_MENU(MENU_TREEPOPUP_DELETE, assetsListCtrl::OnDeleteAsset) - + EVT_LIST_KEY_DOWN(IDC_PANEL_ASSETS_LISTCTRL, assetsListCtrl::OnListKeyDown) END_EVENT_TABLE() /*******************************************************/ -mmAssetsPanel::mmAssetsPanel(wxWindow *parent, wxSQLite3Database* db, wxSQLite3Database* inidb, mmCoreDB* core) : +mmAssetsPanel::mmAssetsPanel(wxWindow *parent, wxSQLite3Database* db, wxSQLite3Database* inidb, mmCoreDB* core) : mmPanelBase(db, inidb, core) { Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, wxPanelNameStr); @@ -79,7 +79,7 @@ CreateControls(); GetSizer()->Fit(this); GetSizer()->SetSizeHints(this); - + initVirtualListControl(0, true); if (!all_assets_.empty()) m_listCtrlAssets->EnsureVisible(all_assets_.size() - 1); @@ -97,7 +97,7 @@ } void mmAssetsPanel::CreateControls() -{ +{ wxBoxSizer* itemBoxSizer1 = new wxBoxSizer(wxVERTICAL); this->SetSizer(itemBoxSizer1); @@ -116,19 +116,20 @@ /* ---------------------- */ - wxSplitterWindow* itemSplitterWindow = new wxSplitterWindow(this, IDC_PANEL_ASSET_STATIC_BAL, wxDefaultPosition, wxSize(100, 100), wxSP_3DBORDER|wxSP_3DSASH|wxNO_BORDER ); + wxSplitterWindow* itemSplitterWindow = new wxSplitterWindow(this, + IDC_PANEL_ASSET_STATIC_BAL, wxDefaultPosition, wxSize(200, 200), wxSP_3DBORDER|wxSP_3DSASH|wxNO_BORDER ); - m_listCtrlAssets = new assetsListCtrl(this, itemSplitterWindow, - IDC_PANEL_ASSETS_LISTCTRL, wxDefaultPosition, wxDefaultSize, + m_listCtrlAssets = new assetsListCtrl(this, itemSplitterWindow, + IDC_PANEL_ASSETS_LISTCTRL, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_HRULES | wxLC_VRULES | wxLC_VIRTUAL | wxLC_SINGLE_SEL ); - + /* See if we can get data from inidb */ long col0, col1, col2, col3, col4; - mmDBWrapper::getINISettingValue(inidb_, wxT("ASSETS_COL0_WIDTH"), wxT("150")).ToLong(&col0); - mmDBWrapper::getINISettingValue(inidb_, wxT("ASSETS_COL1_WIDTH"), wxT("-2")).ToLong(&col1); - mmDBWrapper::getINISettingValue(inidb_, wxT("ASSETS_COL2_WIDTH"), wxT("-2")).ToLong(&col2); - mmDBWrapper::getINISettingValue(inidb_, wxT("ASSETS_COL3_WIDTH"), wxT("-2")).ToLong(&col3); - mmDBWrapper::getINISettingValue(inidb_, wxT("ASSETS_COL4_WIDTH"), wxT("450")).ToLong(&col4); + mmDBWrapper::getINISettingValue(inidb_, wxT("ASSETS_COL0_WIDTH"), wxT("150")).ToLong(&col0); + mmDBWrapper::getINISettingValue(inidb_, wxT("ASSETS_COL1_WIDTH"), wxT("-2")).ToLong(&col1); + mmDBWrapper::getINISettingValue(inidb_, wxT("ASSETS_COL2_WIDTH"), wxT("-2")).ToLong(&col2); + mmDBWrapper::getINISettingValue(inidb_, wxT("ASSETS_COL3_WIDTH"), wxT("-2")).ToLong(&col3); + mmDBWrapper::getINISettingValue(inidb_, wxT("ASSETS_COL4_WIDTH"), wxT("450")).ToLong(&col4); m_listCtrlAssets->InsertColumn(COL_NAME, _("Name"), wxLIST_FORMAT_RIGHT, col0); m_listCtrlAssets->InsertColumn(COL_TYPE, _("Type"), wxLIST_FORMAT_RIGHT, col1); @@ -156,19 +157,19 @@ m_edit_button = new wxButton(assets_panel, wxID_EDIT); itemBoxSizer3->Add(m_edit_button, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); m_edit_button->Enable(false); - + m_delete_button = new wxButton(assets_panel, wxID_DELETE); itemBoxSizer3->Add(m_delete_button, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); m_delete_button->Enable(false); - //Infobar-mini + //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); - //Infobar + //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); - + updateExtraAssetData(-1); } @@ -232,14 +233,14 @@ if (column == COL_NAME) return asset.ASSETNAME; if (column == COL_TYPE) return wxGetTranslation(asset.ASSETTYPE); - if (column == COL_VALUE) + if (column == COL_VALUE) { double val = mmDBWrapper::getAssetValue(asset); wxString val_str; mmex::formatDoubleToCurrencyEdit(val, val_str); return val_str; } - if (column == COL_DATE) + if (column == COL_DATE) { wxDateTime dt; dt.ParseDate(asset.STARTDATE); @@ -299,17 +300,17 @@ int assetsListCtrl::OnGetItemImage(long /*item*/) const { - return ICON_ASSET; + return ICON_ASSET; } void assetsListCtrl::OnListKeyDown(wxListEvent& event) { - if (event.GetKeyCode() == WXK_DELETE) + if (event.GetKeyCode() == WXK_DELETE) { wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_DELETE); OnDeleteAsset(evt); - } - else + } + else { event.Skip(); } @@ -326,20 +327,20 @@ m_cp->initVirtualListControl(m_selected_col, m_asc); RefreshItems(0, m_cp->all_assets_.empty() ? 0: m_cp->all_assets_.size() - 1); } - + void assetsListCtrl::OnDeleteAsset(wxCommandEvent& /*event*/) { if (m_selectedIndex == -1) return; if (m_cp->all_assets_.empty()) return; wxMessageDialog msgDlg(this, _("Do you really want to delete the Asset?"), _("Confirm Asset Deletion"), wxYES_NO | wxNO_DEFAULT | wxICON_EXCLAMATION); - if (msgDlg.ShowModal() == wxID_YES) + if (msgDlg.ShowModal() == wxID_YES) { DB_View_ASSETS_V1::Data& asset = m_cp->all_assets_[m_selectedIndex]; asset.remove(m_cp->getDb()); DeleteItem(m_selectedIndex); m_cp->initVirtualListControl(m_selected_col, m_asc); - + m_selectedIndex = -1; m_cp->updateExtraAssetData(m_selectedIndex); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-05-24 23:47:58
|
Revision: 2403 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2403&view=rev Author: guanlisheng Date: 2012-05-24 23:47:51 +0000 (Thu, 24 May 2012) Log Message: ----------- Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-05-24 23:40:17 UTC (rev 2402) +++ trunk/mmex/src/assetspanel.cpp 2012-05-24 23:47:51 UTC (rev 2403) @@ -25,9 +25,6 @@ IDC_PANEL_ASSETS_LISTCTRL = wxID_HIGHEST + 1, IDC_PANEL_ASSET_STATIC_BALHEADER, IDC_PANEL_ASSET_STATIC_BAL, - MENU_TREEPOPUP_NEW, - MENU_TREEPOPUP_EDIT, - MENU_TREEPOPUP_DELETE, IDC_PANEL_ASSET_STATIC_DETAILS, IDC_PANEL_ASSET_STATIC_DETAILS_MINI }; @@ -55,9 +52,9 @@ EVT_LIST_ITEM_DESELECTED(IDC_PANEL_ASSETS_LISTCTRL, assetsListCtrl::OnListItemDeselected) EVT_LIST_COL_CLICK(IDC_PANEL_ASSETS_LISTCTRL, assetsListCtrl::OnColClick) - EVT_MENU(MENU_TREEPOPUP_NEW, assetsListCtrl::OnNewAsset) - EVT_MENU(MENU_TREEPOPUP_EDIT, assetsListCtrl::OnEditAsset) - EVT_MENU(MENU_TREEPOPUP_DELETE, assetsListCtrl::OnDeleteAsset) + EVT_MENU(wxID_NEW, assetsListCtrl::OnNewAsset) + EVT_MENU(wxID_EDIT, assetsListCtrl::OnEditAsset) + EVT_MENU(wxID_DELETE, assetsListCtrl::OnDeleteAsset) EVT_LIST_KEY_DOWN(IDC_PANEL_ASSETS_LISTCTRL, assetsListCtrl::OnListKeyDown) END_EVENT_TABLE() @@ -220,10 +217,10 @@ m_selectedIndex = event.GetIndex(); wxMenu menu; - menu.Append(MENU_TREEPOPUP_NEW, _("&New Asset")); + menu.Append(wxID_NEW); menu.AppendSeparator(); - menu.Append(MENU_TREEPOPUP_EDIT, _("&Edit Asset")); - menu.Append(MENU_TREEPOPUP_DELETE, _("&Delete Asset")); + menu.Append(wxID_EDIT); + menu.Append(wxID_DELETE); PopupMenu(&menu, event.GetPoint()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-05-24 23:54:01
|
Revision: 2404 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2404&view=rev Author: guanlisheng Date: 2012-05-24 23:53:55 +0000 (Thu, 24 May 2012) Log Message: ----------- Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-05-24 23:47:51 UTC (rev 2403) +++ trunk/mmex/src/assetspanel.cpp 2012-05-24 23:53:55 UTC (rev 2404) @@ -304,7 +304,7 @@ { if (event.GetKeyCode() == WXK_DELETE) { - wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_DELETE); + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, wxID_DELETE); OnDeleteAsset(evt); } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-05-25 00:18:30
|
Revision: 2406 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2406&view=rev Author: guanlisheng Date: 2012-05-25 00:18:24 +0000 (Fri, 25 May 2012) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-05-25 00:14:56 UTC (rev 2405) +++ trunk/mmex/src/assetspanel.cpp 2012-05-25 00:18:24 UTC (rev 2406) @@ -18,7 +18,6 @@ #include "util.h" #include "dbwrapper.h" #include "assetdialog.h" -#include <boost/foreach.hpp> enum { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-05-28 08:18:34
|
Revision: 2433 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2433&view=rev Author: guanlisheng Date: 2012-05-28 08:18:22 +0000 (Mon, 28 May 2012) Log Message: ----------- remove Freeze & Thaw Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-05-28 04:02:03 UTC (rev 2432) +++ trunk/mmex/src/assetspanel.cpp 2012-05-28 08:18:22 UTC (rev 2433) @@ -72,7 +72,6 @@ if (!wxPanel::Create(parent, winid, pos, size, style, name)) return false; - Freeze(); CreateControls(); GetSizer()->Fit(this); GetSizer()->SetSizeHints(this); @@ -80,8 +79,6 @@ initVirtualListControl(0, true); if (!all_assets_.empty()) m_listCtrlAssets->EnsureVisible(all_assets_.size() - 1); - - Thaw(); return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2012-05-30 01:48:00
|
Revision: 2459 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2459&view=rev Author: guanlisheng Date: 2012-05-30 01:47:54 +0000 (Wed, 30 May 2012) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-05-30 00:47:14 UTC (rev 2458) +++ trunk/mmex/src/assetspanel.cpp 2012-05-30 01:47:54 UTC (rev 2459) @@ -95,21 +95,16 @@ wxBoxSizer* itemBoxSizer1 = new wxBoxSizer(wxVERTICAL); this->SetSizer(itemBoxSizer1); - /* ---------------------- */ - wxPanel* headerPanel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL); - itemBoxSizer1->Add(headerPanel, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); - wxBoxSizer* itemBoxSizerVHeader = new wxBoxSizer(wxVERTICAL); - headerPanel->SetSizer(itemBoxSizerVHeader); - wxStaticText* itemStaticText1 = new wxStaticText(headerPanel, wxID_ANY, _("Assets")); + wxStaticText* itemStaticText1 = new wxStaticText(this, wxID_ANY, _("Assets")); itemStaticText1->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, wxGetEmptyString())); - wxStaticText* itemStaticText2 = new wxStaticText(headerPanel, IDC_PANEL_ASSET_STATIC_BALHEADER, _("Total:")); + wxStaticText* itemStaticText2 = new wxStaticText(this, IDC_PANEL_ASSET_STATIC_BALHEADER, _("Total:")); itemBoxSizerVHeader->Add(itemStaticText1, 0, wxALL, 1); itemBoxSizerVHeader->Add(itemStaticText2, 0, wxALL, 1); + itemBoxSizer1->Add(itemBoxSizerVHeader); /* ---------------------- */ - wxSplitterWindow* itemSplitterWindow = new wxSplitterWindow(this, IDC_PANEL_ASSET_STATIC_BAL, wxDefaultPosition, wxSize(200, 200), wxSP_3DBORDER|wxSP_3DSASH|wxNO_BORDER ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-06-02 21:50:24
|
Revision: 2496 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2496&view=rev Author: vomikan Date: 2012-06-02 21:50:17 +0000 (Sat, 02 Jun 2012) Log Message: ----------- wxSizerFlags Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-06-02 21:12:00 UTC (rev 2495) +++ trunk/mmex/src/assetspanel.cpp 2012-06-02 21:50:17 UTC (rev 2496) @@ -100,16 +100,20 @@ void mmAssetsPanel::CreateControls() { + wxSizerFlags flags; + flags.Align(wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL).Border(wxLEFT|wxTOP, 4); + wxBoxSizer* itemBoxSizer1 = new wxBoxSizer(wxVERTICAL); this->SetSizer(itemBoxSizer1); wxBoxSizer* itemBoxSizerVHeader = new wxBoxSizer(wxVERTICAL); wxStaticText* itemStaticText1 = new wxStaticText(this, wxID_ANY, _("Assets")); - itemStaticText1->SetFont(wxFont(12, wxSWISS, wxNORMAL, wxBOLD, FALSE, wxGetEmptyString())); + int font_size = this->GetFont().GetPointSize() + 2; + itemStaticText1->SetFont(wxFont(font_size, wxSWISS, wxNORMAL, wxBOLD, FALSE, "")); wxStaticText* itemStaticText2 = new wxStaticText(this, IDC_PANEL_ASSET_STATIC_BALHEADER, _("Total:")); - itemBoxSizerVHeader->Add(itemStaticText1, 0, wxALL, 1); - itemBoxSizerVHeader->Add(itemStaticText2, 0, wxALL, 1); + itemBoxSizerVHeader->Add(itemStaticText1, flags); + itemBoxSizerVHeader->Add(itemStaticText2, flags); itemBoxSizer1->Add(itemBoxSizerVHeader); /* ---------------------- */ @@ -139,31 +143,30 @@ itemSplitterWindow->SplitHorizontally(m_listCtrlAssets, assets_panel); itemSplitterWindow->SetMinimumPaneSize(100); itemSplitterWindow->SetSashGravity(1.0); - itemBoxSizer1->Add(itemSplitterWindow, 1, wxGROW|wxALL, 1); + itemBoxSizer1->Add(itemSplitterWindow, 1, wxGROW|wxALL, 5); wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); assets_panel->SetSizer(itemBoxSizer2); - //assets_panel->SetBackgroundColour(mmColors::listBackColor); wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL); - itemBoxSizer2->Add(itemBoxSizer3, 0, wxALIGN_LEFT|wxALL, 3); + itemBoxSizer2->Add(itemBoxSizer3); m_new_button = new wxButton(assets_panel, wxID_NEW); - itemBoxSizer3->Add(m_new_button, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); + itemBoxSizer3->Add(m_new_button, flags); m_edit_button = new wxButton(assets_panel, wxID_EDIT); - itemBoxSizer3->Add(m_edit_button, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); + itemBoxSizer3->Add(m_edit_button, flags); m_edit_button->Enable(false); m_delete_button = new wxButton(assets_panel, wxID_DELETE); - itemBoxSizer3->Add(m_delete_button, 0, wxALIGN_CENTER_VERTICAL|wxALL, 4); + itemBoxSizer3->Add(m_delete_button, flags); m_delete_button->Enable(false); m_sum = new wxStaticText(assets_panel, wxID_ANY, wxT(""), wxDefaultPosition, wxDefaultSize, 0); - itemBoxSizer3->Add(m_sum, 1, wxGROW|wxTOP, 12); + itemBoxSizer3->Add(m_sum, flags); 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); + itemBoxSizer2->Add(m_detail, 1, wxGROW|wxALL, 5); updateExtraAssetData(-1); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |