From: <vo...@us...> - 2012-10-15 18:45:24
|
Revision: 3052 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3052&view=rev Author: vomikan Date: 2012-10-15 18:45:18 +0000 (Mon, 15 Oct 2012) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2012-10-15 13:52:18 UTC (rev 3051) +++ trunk/mmex/src/assetspanel.cpp 2012-10-15 18:45:18 UTC (rev 3052) @@ -115,7 +115,7 @@ /* ---------------------- */ wxPanel* headerPanel = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER|wxTAB_TRAVERSAL ); - itemBoxSizer9->Add(headerPanel, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5); + itemBoxSizer9->Add(headerPanel, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxGROW, 5); wxBoxSizer* itemBoxSizerVHeader = new wxBoxSizer(wxVERTICAL); headerPanel->SetSizer(itemBoxSizerVHeader); @@ -136,7 +136,7 @@ itemStaticBitmap3->Connect(wxID_STATIC, wxEVT_LEFT_DOWN, wxMouseEventHandler(mmAssetsPanel::OnMouseLeftDown), NULL, this); itemStaticTextMainFilter_ = new wxStaticText( headerPanel, wxID_STATIC, _("All")); - itemBoxSizerHHeader2->Add(itemStaticTextMainFilter_, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); + itemBoxSizerHHeader2->Add(itemStaticTextMainFilter_, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxGROW, 5); header_text_ = new wxStaticText( headerPanel, wxID_STATIC, _("Total:")); itemBoxSizerVHeader->Add(header_text_, 0, wxALL, 1); @@ -448,7 +448,7 @@ if (cnt>0) RefreshItems(0, cnt > 0 ? --cnt : 0); - else + else selectedIndex = -1; if (selectedIndex >= 0 && cnt>0) @@ -483,7 +483,7 @@ if (selectedIndex_ < 0) return; wxListEvent evt(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, IDC_PANEL_STOCKS_LISTCTRL); - AddPendingEvent(evt); + AddPendingEvent(evt); } void assetsListCtrl::OnListItemActivated(wxListEvent& /*event*/) @@ -520,7 +520,7 @@ } void mmAssetsPanel::OnMouseLeftDown ( wxMouseEvent& event ) -{ +{ wxMenu* menu = new wxMenu; menu->Append(new wxMenuItem(menu, 0, wxGetTranslation(wxTRANSLATE("All")))); @@ -552,16 +552,15 @@ } } filter_.RemoveLast(1); - + if (evt == 0) itemStaticTextMainFilter_->SetLabel(_("All")); else itemStaticTextMainFilter_->SetLabel(wxGetTranslation(label)); int trx_id = -1; - //if (selectedIndex_>=0) trx_id = cp_->getTrans()[selectedIndex_]->id_; - m_listCtrlAssets->doRefreshItems(trx_id); + updateExtraAssetData(trx_id); /* core_->db_.get()->Begin(); mmDBWrapper::setInfoSettingValue(core_->db_.get(), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2013-02-13 09:56:44
|
Revision: 3471 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3471&view=rev Author: stef145g Date: 2013-02-13 09:56:35 +0000 (Wed, 13 Feb 2013) Log Message: ----------- Code reorganisation Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2013-02-13 09:36:58 UTC (rev 3470) +++ trunk/mmex/src/assetspanel.cpp 2013-02-13 09:56:35 UTC (rev 3471) @@ -38,13 +38,6 @@ } // namespace /*******************************************************/ -BEGIN_EVENT_TABLE(mmAssetsPanel, wxPanel) - EVT_BUTTON(wxID_NEW, mmAssetsPanel::OnNewAsset) - EVT_BUTTON(wxID_EDIT, mmAssetsPanel::OnEditAsset) - EVT_BUTTON(wxID_DELETE, mmAssetsPanel::OnDeleteAsset) - EVT_MENU(wxID_ANY, mmAssetsPanel::OnViewPopupSelected) -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) @@ -61,6 +54,180 @@ END_EVENT_TABLE() /*******************************************************/ +void assetsListCtrl::OnItemResize(wxListEvent& event) +{ + int i = event.GetColumn(); + int width = cp_->GetListCtrlWidth(i); + cp_->core_->iniSettings_->SetIntSetting(wxString::Format(wxT("ASSETS_COL%d_WIDTH"), i), width); +} + +void assetsListCtrl::InitVariables() +{ + m_selected_col = 0; + m_asc = true; + cp_->SetFilter(wxT(" 'Property','Automobile','Household Object','Art','Jewellery','Cash','Other' ")); +} + +void assetsListCtrl::OnItemRightClick(wxListEvent& event) +{ + selectedIndex_ = event.GetIndex(); + + wxMenu menu; + menu.Append(MENU_TREEPOPUP_NEW, _("&New Asset")); + menu.AppendSeparator(); + menu.Append(MENU_TREEPOPUP_EDIT, _("&Edit Asset")); + menu.Append(MENU_TREEPOPUP_DELETE, _("&Delete Asset")); + PopupMenu(&menu, event.GetPoint()); +} + +wxString assetsListCtrl::OnGetItemText(long item, long column) const +{ + return cp_->getItem(item, column); +} + +void assetsListCtrl::OnListItemSelected(wxListEvent& event) +{ + selectedIndex_ = event.GetIndex(); + cp_->updateExtraAssetData(selectedIndex_); +} + +void assetsListCtrl::OnListItemDeselected(wxListEvent& /*event*/) +{ + selectedIndex_ = -1; + cp_->updateExtraAssetData(selectedIndex_); +} + +int assetsListCtrl::OnGetItemImage(long item) const +{ + int image_id = 0; + size_t size = sizeof(ASSET_TYPE)/sizeof(wxString); + for(size_t i = 0; i < size; ++i) + { + if (ASSET_TYPE[i] == OnGetItemText(item, COL_TYPE)) + image_id = i; + } + + return item; +} + +wxListItemAttr* assetsListCtrl::OnGetItemAttr(long item) const +{ + /* Returns the alternating background pattern */ + return item % 2 ? (wxListItemAttr *)&m_attr2 : (wxListItemAttr *)&m_attr1; +} + +void assetsListCtrl::OnListKeyDown(wxListEvent& event) +{ + if (event.GetKeyCode() == WXK_DELETE) + { + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_DELETE); + OnDeleteAsset(evt); + } + else + { + event.Skip(); + } +} + +void assetsListCtrl::OnNewAsset(wxCommandEvent& /*event*/) +{ + mmAssetDialog dlg(this, cp_->core_, NULL, false); + if (dlg.ShowModal() == wxID_OK) + { + doRefreshItems(dlg.GetAssetID()); + } +} + +void assetsListCtrl::doRefreshItems(int trx_id) +{ + int selectedIndex = cp_->initVirtualListControl(trx_id, m_selected_col, m_asc); + + long cnt = static_cast<long>(cp_->getTrans().size()); + + if (selectedIndex >= cnt || selectedIndex < 0) + selectedIndex = m_asc ? cnt - 1 : 0; + + if (cnt>0) + RefreshItems(0, cnt > 0 ? --cnt : 0); + else + selectedIndex = -1; + + if (selectedIndex >= 0 && cnt>0) + { + SetItemState(selectedIndex, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); + SetItemState(selectedIndex, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); + EnsureVisible(selectedIndex); + } + selectedIndex_ = selectedIndex; +} + +void assetsListCtrl::OnDeleteAsset(wxCommandEvent& /*event*/) +{ + if (selectedIndex_ == -1) return; + if (cp_->getTrans().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) + { + mmDBWrapper::deleteAsset(cp_->core_->db_.get(), cp_->getTrans()[selectedIndex_]->id_); + DeleteItem(selectedIndex_); + cp_->initVirtualListControl(selectedIndex_, m_selected_col, m_asc); + selectedIndex_ = -1; + cp_->updateExtraAssetData(selectedIndex_); + } +} + +void assetsListCtrl::OnEditAsset(wxCommandEvent& /*event*/) +{ + if (selectedIndex_ < 0) return; + + wxListEvent evt(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, IDC_PANEL_STOCKS_LISTCTRL); + AddPendingEvent(evt); +} + +void assetsListCtrl::OnListItemActivated(wxListEvent& /*event*/) +{ + //selectedIndex_ = event.GetIndex(); + mmAssetDialog dlg(this, cp_->core_, cp_->getTrans()[selectedIndex_], true); + + if (dlg.ShowModal() == wxID_OK) + doRefreshItems(dlg.GetAssetID()); + + cp_->updateExtraAssetData(selectedIndex_); +} + +void assetsListCtrl::OnColClick(wxListEvent& event) +{ + if(0 > event.GetColumn() || event.GetColumn() >= COL_MAX) return; + + if (m_selected_col == event.GetColumn()) m_asc = !m_asc; + + wxListItem item; + item.SetMask(wxLIST_MASK_IMAGE); + item.SetImage(-1); + cp_->SetListCtrlColumn(m_selected_col, item); + + m_selected_col = event.GetColumn(); + + item.SetImage(m_asc ? 8 : 7); + SetColumn(m_selected_col, item); + + int trx_id = -1; + if (selectedIndex_>=0) trx_id = cp_->getTrans()[selectedIndex_]->id_; + + doRefreshItems(trx_id); +} + +/*******************************************************/ +BEGIN_EVENT_TABLE(mmAssetsPanel, wxPanel) + EVT_BUTTON(wxID_NEW, mmAssetsPanel::OnNewAsset) + EVT_BUTTON(wxID_EDIT, mmAssetsPanel::OnEditAsset) + EVT_BUTTON(wxID_DELETE, mmAssetsPanel::OnDeleteAsset) + EVT_MENU(wxID_ANY, mmAssetsPanel::OnViewPopupSelected) +END_EVENT_TABLE() +/*******************************************************/ + mmAssetsPanel::mmAssetsPanel(wxWindow *parent, mmCoreDB* core) : mmPanelBase(core) { @@ -93,20 +260,6 @@ { } -void assetsListCtrl::OnItemResize(wxListEvent& event) -{ - int i = event.GetColumn(); - int width = cp_->GetListCtrlWidth(i); - cp_->core_->iniSettings_->SetIntSetting(wxString::Format(wxT("ASSETS_COL%d_WIDTH"), i), width); -} - -void assetsListCtrl::InitVariables() -{ - m_selected_col = 0; - m_asc = true; - cp_->SetFilter(wxT(" 'Property','Automobile','Household Object','Art','Jewellery','Cash','Other' ")); -} - void mmAssetsPanel::CreateControls() { wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxVERTICAL); @@ -320,20 +473,6 @@ m_listCtrlAssets->OnEditAsset(event); } -/*******************************************************/ - -void assetsListCtrl::OnItemRightClick(wxListEvent& event) -{ - selectedIndex_ = event.GetIndex(); - - wxMenu menu; - menu.Append(MENU_TREEPOPUP_NEW, _("&New Asset")); - menu.AppendSeparator(); - menu.Append(MENU_TREEPOPUP_EDIT, _("&Edit Asset")); - menu.Append(MENU_TREEPOPUP_DELETE, _("&Delete Asset")); - PopupMenu(&menu, event.GetPoint()); -} - wxString mmAssetsPanel::getItem(long item, long column) { if (column == COL_NAME) return m_trans[item]->assetName_; @@ -345,24 +484,6 @@ return wxGetEmptyString(); } -wxString assetsListCtrl::OnGetItemText(long item, long column) const -{ - return cp_->getItem(item, column); -} - -void assetsListCtrl::OnListItemSelected(wxListEvent& event) -{ - selectedIndex_ = event.GetIndex(); - cp_->updateExtraAssetData(selectedIndex_); -} - -void assetsListCtrl::OnListItemDeselected(wxListEvent& /*event*/) -{ - selectedIndex_ = -1; - cp_->updateExtraAssetData(selectedIndex_); -} -//---------------------------------------------------------------------------- - void mmAssetsPanel::updateExtraAssetData(int selIndex) { wxStaticText* st = (wxStaticText*)FindWindow(IDC_PANEL_ASSET_STATIC_DETAILS); @@ -398,128 +519,6 @@ btn->Enable(enable); } -int assetsListCtrl::OnGetItemImage(long item) const -{ - int image_id = 0; - size_t size = sizeof(ASSET_TYPE)/sizeof(wxString); - for(size_t i = 0; i < size; ++i) - { - if (ASSET_TYPE[i] == OnGetItemText(item, COL_TYPE)) - image_id = i; - } - - return item; -} - -wxListItemAttr* assetsListCtrl::OnGetItemAttr(long item) const -{ - /* Returns the alternating background pattern */ - return item % 2 ? (wxListItemAttr *)&m_attr2 : (wxListItemAttr *)&m_attr1; -} - -void assetsListCtrl::OnListKeyDown(wxListEvent& event) -{ - if (event.GetKeyCode() == WXK_DELETE) - { - wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_TREEPOPUP_DELETE); - OnDeleteAsset(evt); - } - else - { - event.Skip(); - } -} - -void assetsListCtrl::OnNewAsset(wxCommandEvent& /*event*/) -{ - mmAssetDialog dlg(this, cp_->core_, NULL, false); - if (dlg.ShowModal() == wxID_OK) - { - doRefreshItems(dlg.GetAssetID()); - } -} - -void assetsListCtrl::doRefreshItems(int trx_id) -{ - int selectedIndex = cp_->initVirtualListControl(trx_id, m_selected_col, m_asc); - - long cnt = static_cast<long>(cp_->getTrans().size()); - - if (selectedIndex >= cnt || selectedIndex < 0) - selectedIndex = m_asc ? cnt - 1 : 0; - - if (cnt>0) - RefreshItems(0, cnt > 0 ? --cnt : 0); - else - selectedIndex = -1; - - if (selectedIndex >= 0 && cnt>0) - { - SetItemState(selectedIndex, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); - SetItemState(selectedIndex, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); - EnsureVisible(selectedIndex); - } - selectedIndex_ = selectedIndex; -} - -void assetsListCtrl::OnDeleteAsset(wxCommandEvent& /*event*/) -{ - if (selectedIndex_ == -1) return; - if (cp_->getTrans().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) - { - mmDBWrapper::deleteAsset(cp_->core_->db_.get(), cp_->getTrans()[selectedIndex_]->id_); - DeleteItem(selectedIndex_); - cp_->initVirtualListControl(selectedIndex_, m_selected_col, m_asc); - selectedIndex_ = -1; - cp_->updateExtraAssetData(selectedIndex_); - } -} - -void assetsListCtrl::OnEditAsset(wxCommandEvent& /*event*/) -{ - if (selectedIndex_ < 0) return; - - wxListEvent evt(wxEVT_COMMAND_LIST_ITEM_ACTIVATED, IDC_PANEL_STOCKS_LISTCTRL); - AddPendingEvent(evt); -} - -void assetsListCtrl::OnListItemActivated(wxListEvent& /*event*/) -{ - //selectedIndex_ = event.GetIndex(); - mmAssetDialog dlg(this, cp_->core_, cp_->getTrans()[selectedIndex_], true); - - if (dlg.ShowModal() == wxID_OK) - doRefreshItems(dlg.GetAssetID()); - - cp_->updateExtraAssetData(selectedIndex_); -} - -void assetsListCtrl::OnColClick(wxListEvent& event) -{ - if(0 > event.GetColumn() || event.GetColumn() >= COL_MAX) return; - - if (m_selected_col == event.GetColumn()) m_asc = !m_asc; - - wxListItem item; - item.SetMask(wxLIST_MASK_IMAGE); - item.SetImage(-1); - cp_->SetListCtrlColumn(m_selected_col, item); - - m_selected_col = event.GetColumn(); - - item.SetImage(m_asc ? 8 : 7); - SetColumn(m_selected_col, item); - - int trx_id = -1; - if (selectedIndex_>=0) trx_id = cp_->getTrans()[selectedIndex_]->id_; - - doRefreshItems(trx_id); -} - void mmAssetsPanel::OnMouseLeftDown ( wxMouseEvent& event ) { wxMenu* menu = new wxMenu; @@ -562,10 +561,4 @@ int trx_id = -1; m_listCtrlAssets->doRefreshItems(trx_id); updateExtraAssetData(trx_id); - -/* core_->db_.get()->Begin(); - mmDBWrapper::setInfoSettingValue(core_->db_.get(), - wxString::Format(wxT("ASSET_FILTER_ID_%ld"), (long)m_AccountID), m_currentView); - core_->db_.get()->Commit(); -*/ } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-03-27 13:56:32
|
Revision: 3633 http://sourceforge.net/p/moneymanagerex/code/3633 Author: vomikan Date: 2013-03-27 13:56:29 +0000 (Wed, 27 Mar 2013) Log Message: ----------- update Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2013-03-27 12:42:55 UTC (rev 3632) +++ trunk/mmex/src/assetspanel.cpp 2013-03-27 13:56:29 UTC (rev 3633) @@ -55,8 +55,8 @@ mmAssetsListCtrl::mmAssetsListCtrl(mmAssetsPanel* cp, wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size, long style) : wxListCtrl(parent, id, pos, size, style) -, m_attr1(mmColors::listBorderColor, mmColors::listAlternativeColor0, wxNullFont) -, m_attr2(mmColors::listBorderColor, mmColors::listAlternativeColor1, wxNullFont) +, m_attr1(*wxBLACK, mmColors::listAlternativeColor0, wxNullFont) +, m_attr2(*wxBLACK, mmColors::listAlternativeColor1, wxNullFont) , cp_(cp) , selectedIndex_(-1) {} @@ -346,9 +346,9 @@ m_imageList->Add(wxBitmap(wxImage(car_xpm).Scale(16, 16))); // Automobile m_imageList->Add(wxBitmap(wxImage(clock_xpm).Scale(16, 16))); // Household Object m_imageList->Add(wxBitmap(wxImage(art_xpm).Scale(16, 16))); // Art - m_imageList->Add(wxBitmap(wxImage(rubik_cube_xpm).Scale(16, 16))); // Jewellery - m_imageList->Add(wxBitmap(wxImage(money_dollar_xpm).Scale(16, 16))); // Cash - m_imageList->Add(wxBitmap(wxImage(assets_xpm).Scale(16, 16))); // Other + m_imageList->Add(wxBitmap(wxImage(assets_xpm).Scale(16, 16))); // Jewellery + m_imageList->Add(wxBitmap(wxImage(coin_xpm).Scale(16, 16))); // Cash + m_imageList->Add(wxBitmap(wxImage(rubik_cube_xpm).Scale(16, 16))); // Other m_listCtrlAssets->SetImageList(m_imageList.get(), wxIMAGE_LIST_SMALL); m_listCtrlAssets->InsertColumn(COL_NAME, _("Name")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-03-27 17:47:41
|
Revision: 3634 http://sourceforge.net/p/moneymanagerex/code/3634 Author: vomikan Date: 2013-03-27 17:47:39 +0000 (Wed, 27 Mar 2013) Log Message: ----------- fix for arrows icons Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2013-03-27 13:56:29 UTC (rev 3633) +++ trunk/mmex/src/assetspanel.cpp 2013-03-27 17:47:39 UTC (rev 3634) @@ -349,6 +349,8 @@ m_imageList->Add(wxBitmap(wxImage(assets_xpm).Scale(16, 16))); // Jewellery m_imageList->Add(wxBitmap(wxImage(coin_xpm).Scale(16, 16))); // Cash m_imageList->Add(wxBitmap(wxImage(rubik_cube_xpm).Scale(16, 16))); // Other + m_imageList->Add(wxBitmap(wxImage(uparrow_xpm).Scale(16, 16))); + m_imageList->Add(wxBitmap(wxImage(downarrow_xpm).Scale(16, 16))); m_listCtrlAssets->SetImageList(m_imageList.get(), wxIMAGE_LIST_SMALL); m_listCtrlAssets->InsertColumn(COL_NAME, _("Name")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2013-03-31 08:30:08
|
Revision: 3639 http://sourceforge.net/p/moneymanagerex/code/3639 Author: stef145g Date: 2013-03-31 08:30:05 +0000 (Sun, 31 Mar 2013) Log Message: ----------- Update - previously missed code. Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2013-03-31 08:24:24 UTC (rev 3638) +++ trunk/mmex/src/assetspanel.cpp 2013-03-31 08:30:05 UTC (rev 3639) @@ -287,9 +287,8 @@ m_listCtrlAssets->InitVariables(); initVirtualListControl(); - // Not sure what this achives at this stage. - //if (!m_trans.empty()) - // m_listCtrlAssets->EnsureVisible(static_cast<long>(m_trans.size()) - 1); + if (!asset_list_.entrylist_.empty()) + m_listCtrlAssets->EnsureVisible(static_cast<long>(asset_list_.entrylist_.size()) - 1); windowsFreezeThaw(this); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-04-06 09:39:59
|
Revision: 3652 http://sourceforge.net/p/moneymanagerex/code/3652 Author: vomikan Date: 2013-04-06 09:39:56 +0000 (Sat, 06 Apr 2013) Log Message: ----------- forrmating Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2013-04-06 06:18:14 UTC (rev 3651) +++ trunk/mmex/src/assetspanel.cpp 2013-04-06 09:39:56 UTC (rev 3652) @@ -172,12 +172,16 @@ void mmAssetsListCtrl::OnDeleteAsset(wxCommandEvent& /*event*/) { - if (selectedIndex_ == -1) return; - wxMessageDialog msgDlg(this, _("Do you really want to delete the Asset?"), - _("Confirm Asset Deletion"), wxYES_NO | wxNO_DEFAULT | wxICON_EXCLAMATION); + if (selectedIndex_ < 0) 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) { - boost::shared_ptr<TAssetEntry> pEntry = cp_->AssetList().GetIndexedEntryPtr(selectedIndex_); + const boost::shared_ptr<TAssetEntry> pEntry = cp_->AssetList().GetIndexedEntryPtr(selectedIndex_); cp_->AssetList().DeleteEntry(pEntry->GetId()); cp_->initVirtualListControl(selectedIndex_, m_selected_col, m_asc); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2013-04-10 08:44:27
|
Revision: 3661 http://sourceforge.net/p/moneymanagerex/code/3661 Author: stef145g Date: 2013-04-10 08:44:23 +0000 (Wed, 10 Apr 2013) Log Message: ----------- Update Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2013-04-09 11:57:02 UTC (rev 3660) +++ trunk/mmex/src/assetspanel.cpp 2013-04-10 08:44:23 UTC (rev 3661) @@ -181,8 +181,7 @@ if (msgDlg.ShowModal() == wxID_YES) { - const boost::shared_ptr<TAssetEntry> pEntry = cp_->AssetList().GetIndexedEntryPtr(selectedIndex_); - cp_->AssetList().DeleteEntry(pEntry->GetId()); + cp_->AssetList().DeleteEntry(cp_->AssetList().GetIndexedEntryPtr(selectedIndex_)->GetId()); cp_->initVirtualListControl(selectedIndex_, m_selected_col, m_asc); selectedIndex_ = -1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2013-05-15 12:31:30
|
Revision: 3917 http://sourceforge.net/p/moneymanagerex/code/3917 Author: stef145g Date: 2013-05-15 12:31:27 +0000 (Wed, 15 May 2013) Log Message: ----------- Fix crash on double click asset item for edit Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2013-05-15 07:30:57 UTC (rev 3916) +++ trunk/mmex/src/assetspanel.cpp 2013-05-15 12:31:27 UTC (rev 3917) @@ -215,8 +215,9 @@ } } -void mmAssetsListCtrl::OnListItemActivated(wxListEvent& /*event*/) +void mmAssetsListCtrl::OnListItemActivated(wxListEvent& event) { + selectedIndex_ = event.GetIndex(); EditAsset(cp_->AssetList().entrylist_[selectedIndex_].get()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-06-12 10:17:45
|
Revision: 4055 http://sourceforge.net/p/moneymanagerex/code/4055 Author: vomikan Date: 2013-06-12 10:17:40 +0000 (Wed, 12 Jun 2013) Log Message: ----------- minor changes Modified Paths: -------------- trunk/mmex/src/assetspanel.cpp Modified: trunk/mmex/src/assetspanel.cpp =================================================================== --- trunk/mmex/src/assetspanel.cpp 2013-06-11 07:16:57 UTC (rev 4054) +++ trunk/mmex/src/assetspanel.cpp 2013-06-12 10:17:40 UTC (rev 4055) @@ -205,7 +205,7 @@ // Locate new entry in the visual list. cp_->AssetList().GetEntryPtr(new_asset_id); selectedIndex_ = cp_->AssetList().GetCurrentIndex(); - + if (! EditAsset(pNewEntry)) { // remove the duplicate asset canceled by user. @@ -349,7 +349,7 @@ m_imageList->Add(wxBitmap(wxImage(coin_xpm).Scale(16, 16))); // Cash m_imageList->Add(wxBitmap(wxImage(rubik_cube_xpm).Scale(16, 16))); // Other m_imageList->Add(wxBitmap(wxImage(uparrow_xpm).Scale(16, 16))); - m_imageList->Add(wxBitmap(wxImage(downarrow_xpm).Scale(16, 16))); + m_imageList->Add(wxBitmap(wxImage(downarrow_xpm).Scale(16, 16))); m_listCtrlAssets->SetImageList(m_imageList.get(), wxIMAGE_LIST_SMALL); m_listCtrlAssets->InsertColumn(COL_NAME, _("Name")); @@ -477,13 +477,14 @@ wxString mmAssetsPanel::getItem(long item, long column) { - if (column == COL_NAME) return asset_list_.entrylist_[item]->name_; - if (column == COL_TYPE) return wxGetTranslation(asset_list_.entrylist_[item]->type_); - if (column == COL_VALUE) return wxString() << asset_list_.entrylist_[item]->GetValueCurrencyEditFormat(); - if (column == COL_DATE) return asset_list_.entrylist_[item]->DisplayDate(); - if (column == COL_NOTES) return asset_list_.entrylist_[item]->notes_; + wxString item_data = wxGetEmptyString(); + if (column == COL_NAME) item_data = asset_list_.entrylist_[item]->name_; + else if (column == COL_TYPE) item_data = wxGetTranslation(asset_list_.entrylist_[item]->type_); + else if (column == COL_VALUE) item_data = wxString() << asset_list_.entrylist_[item]->GetValueCurrencyEditFormat(); + else if (column == COL_DATE) item_data = asset_list_.entrylist_[item]->DisplayDate(); + else if (column == COL_NOTES) item_data = asset_list_.entrylist_[item]->notes_; - return wxGetEmptyString(); + return item_data; } void mmAssetsPanel::SetFilter(wxString filter) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |