[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[2910] branches/0.9.9.0/mmex/src

[<vo...@us...>]

Revision: 2910
          http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2910&view=rev
Author:   vomikan
Date:     2012-08-23 12:28:29 +0000 (Thu, 23 Aug 2012)
Log Message:
-----------
arrow images edded

Modified Paths:
--------------
    branches/0.9.9.0/mmex/src/assetspanel.cpp
    branches/0.9.9.0/mmex/src/assetspanel.h

Modified: branches/0.9.9.0/mmex/src/assetspanel.cpp
===================================================================
--- branches/0.9.9.0/mmex/src/assetspanel.cpp	2012-08-23 10:42:05 UTC (rev 2909)
+++ branches/0.9.9.0/mmex/src/assetspanel.cpp	2012-08-23 12:28:29 UTC (rev 2910)
@@ -21,6 +21,7 @@
 #include "assetdialog.h"
 #include "constants.h"
 
+
 namespace
 {
 
@@ -77,6 +78,7 @@
     GetSizer()->Fit(this);
     GetSizer()->SetSizeHints(this);
 
+    m_listCtrlAssets->InitVariables();
     initVirtualListControl(0, true);
     if (!m_trans.empty())
         m_listCtrlAssets->EnsureVisible(static_cast<long>(m_trans.size()) - 1);
@@ -100,6 +102,11 @@
     m_cp->inidb_->Commit();
 }
 
+void assetsListCtrl::InitVariables()
+{
+    m_selected_col = 0;
+}
+
 void mmAssetsPanel::CreateControls()
 {
     wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxVERTICAL);
@@ -130,12 +137,14 @@
 
     wxSize imageSize(16, 16);
     m_imageList.reset(new wxImageList(imageSize.GetWidth(), imageSize.GetHeight()));
-    m_imageList->Add(wxBitmap(assets_xpm));
+    m_imageList->Add(wxBitmap(wxImage(assets_xpm).Scale(16, 16)));
+    m_imageList->Add(wxBitmap(wxImage(uparrow_xpm).Scale(16, 16)));
+    m_imageList->Add(wxBitmap(wxImage(downarrow_xpm).Scale(16, 16)));
 
     m_listCtrlAssets = new assetsListCtrl( this, itemSplitterWindow10,
         IDC_PANEL_STOCKS_LISTCTRL, wxDefaultPosition, wxDefaultSize,
         wxLC_REPORT | wxLC_HRULES | wxLC_VRULES | wxLC_VIRTUAL | wxLC_SINGLE_SEL  );
-    //m_listCtrlAssets->SetBackgroundColour(mmColors::listDetailsPanelColor);
+
     m_imageList.get()->Add(wxBitmap(assets_xpm));
     m_listCtrlAssets->SetImageList(m_imageList.get(), wxIMAGE_LIST_SMALL);
     m_listCtrlAssets->InsertColumn(COL_NAME, _("Name"));
@@ -217,6 +226,12 @@
     /* Clear all the records */
     m_trans.clear();
 
+    wxListItem item;
+    item.SetMask(wxLIST_MASK_IMAGE);
+    item.SetImage(asc ? 2 : 1);
+
+    m_listCtrlAssets->SetColumn(col, item);
+
     mmDBWrapper::loadBaseCurrencySettings(db_);
 
     double total = mmDBWrapper::getAssetBalance(db_);
@@ -460,9 +475,19 @@
 
 void assetsListCtrl::OnColClick(wxListEvent& event)
 {
-    m_asc = !m_asc;
-    if(0 <= event.GetColumn() && event.GetColumn() < COL_MAX)
-        m_selected_col = event.GetColumn();
-    
+    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);
+    m_cp->m_listCtrlAssets->SetColumn(m_selected_col, item);
+
+    m_selected_col = event.GetColumn();
+
+    item.SetImage(m_asc ? 2 : 1);
+    SetColumn(m_selected_col, item);
+
     doRefreshItems();
 }

Modified: branches/0.9.9.0/mmex/src/assetspanel.h
===================================================================
--- branches/0.9.9.0/mmex/src/assetspanel.h	2012-08-23 10:42:05 UTC (rev 2909)
+++ branches/0.9.9.0/mmex/src/assetspanel.h	2012-08-23 12:28:29 UTC (rev 2910)
@@ -46,6 +46,7 @@
     void OnNewAsset(wxCommandEvent& event);
     void OnEditAsset(wxCommandEvent& event);
     void OnDeleteAsset(wxCommandEvent& event);
+    void InitVariables();
 
 private:
     wxListItemAttr m_attr1; // style1

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.