[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[5740] branches/version_1.0.0.0/src

[<sie...@us...>]

Revision: 5740
          http://sourceforge.net/p/moneymanagerex/code/5740
Author:   siena123
Date:     2013-12-28 16:13:32 +0000 (Sat, 28 Dec 2013)
Log Message:
-----------
[bug:#251] fix - remember sorting column and direction

Modified Paths:
--------------
    branches/version_1.0.0.0/src/assetspanel.cpp
    branches/version_1.0.0.0/src/billsdepositspanel.cpp
    branches/version_1.0.0.0/src/mmcheckingpanel.cpp
    branches/version_1.0.0.0/src/stockspanel.cpp

Modified: branches/version_1.0.0.0/src/assetspanel.cpp
===================================================================
--- branches/version_1.0.0.0/src/assetspanel.cpp	2013-12-28 14:54:09 UTC (rev 5739)
+++ branches/version_1.0.0.0/src/assetspanel.cpp	2013-12-28 16:13:32 UTC (rev 5740)
@@ -50,7 +50,11 @@
 mmAssetsListCtrl::mmAssetsListCtrl(mmAssetsPanel* cp, wxWindow *parent, wxWindowID winid)
     : mmListCtrl(parent, winid)
     , cp_(cp)
-{}
+{
+    // load the global variables
+    m_selected_col = Model_Setting::instance().GetIntSetting("ASSETS_SORT_COL", 0);
+    m_asc = Model_Setting::instance().GetBoolSetting("ASSETS_ASC", true);
+}
 
 void mmAssetsListCtrl::OnItemResize(wxListEvent& event)
 {
@@ -231,6 +235,9 @@
     item.SetImage(m_asc ? 8 : 7);
     SetColumn(m_selected_col, item);
 
+    Model_Setting::instance().Set("ASSETS_ASC", m_asc);
+    Model_Setting::instance().Set("ASSETS_SORT_COL", m_selected_col);
+
     int trx_id = -1;
     if (m_selected_row>=0) trx_id = cp_->m_assets[m_selected_row].ASSETID;
 
@@ -273,7 +280,7 @@
     GetSizer()->Fit(this);
     GetSizer()->SetSizeHints(this);
 
-    initVirtualListControl();
+    initVirtualListControl(-1, m_listCtrlAssets->m_selected_col, m_listCtrlAssets->m_asc);
     if (!this->m_assets.empty())
         m_listCtrlAssets->EnsureVisible(this->m_assets.size() - 1);
 

Modified: branches/version_1.0.0.0/src/billsdepositspanel.cpp
===================================================================
--- branches/version_1.0.0.0/src/billsdepositspanel.cpp	2013-12-28 14:54:09 UTC (rev 5739)
+++ branches/version_1.0.0.0/src/billsdepositspanel.cpp	2013-12-28 16:13:32 UTC (rev 5740)
@@ -55,8 +55,9 @@
 : mmListCtrl(parent, winid)
 , cp_(cp)
 {
-    m_selected_col = 4;
-    m_asc = true;
+    // load the global variables
+    m_selected_col = Model_Setting::instance().GetIntSetting("BD_SORT_COL", 4);
+    m_asc = Model_Setting::instance().GetBoolSetting("BD_ASC", true);
 }
 
 billsDepositsListCtrl::~billsDepositsListCtrl()
@@ -76,6 +77,9 @@
 
     m_selected_col = event.GetColumn();
 
+    Model_Setting::instance().Set("BD_ASC", m_asc);
+    Model_Setting::instance().Set("BD_SORT_COL", m_selected_col);
+
     int id = -1;
     if (m_selected_row >= 0) id = cp_->bills_[m_selected_row].BDID;
     refreshVisualList(cp_->initVirtualListControl(id));

Modified: branches/version_1.0.0.0/src/mmcheckingpanel.cpp
===================================================================
--- branches/version_1.0.0.0/src/mmcheckingpanel.cpp	2013-12-28 14:54:09 UTC (rev 5739)
+++ branches/version_1.0.0.0/src/mmcheckingpanel.cpp	2013-12-28 16:13:32 UTC (rev 5740)
@@ -1207,7 +1207,7 @@
     g_sortcol = m_sortCol;
 
     setColumnImage(m_sortCol, m_asc ? ICON_ASC : ICON_DESC);
-    Model_Setting::instance().Set("CHECK_ASC", g_asc);
+    Model_Setting::instance().Set("CHECK_ASC", (g_asc ? 1 : 0));
     Model_Setting::instance().Set("CHECK_SORT_COL", g_sortcol);
 
     m_cp->m_listCtrlAccount->refreshVisualList(m_selectedID);

Modified: branches/version_1.0.0.0/src/stockspanel.cpp
===================================================================
--- branches/version_1.0.0.0/src/stockspanel.cpp	2013-12-28 14:54:09 UTC (rev 5739)
+++ branches/version_1.0.0.0/src/stockspanel.cpp	2013-12-28 16:13:32 UTC (rev 5740)
@@ -79,7 +79,11 @@
         SetColumnWidth(column.first, col_x);
     }
 
-    initVirtualListControl();
+    // load the global variables
+    m_selected_col = Model_Setting::instance().GetIntSetting("STOCKS_SORT_COL", 0);
+    m_asc = Model_Setting::instance().GetBoolSetting("STOCKS_ASC", true);
+
+    initVirtualListControl(-1, m_selected_col, m_asc);
     if (!m_stocks.empty())
         EnsureVisible(m_stocks.size() - 1);
 
@@ -255,6 +259,9 @@
 
     m_selected_col = event.GetColumn();
 
+    Model_Setting::instance().Set("STOCKS_ASC", m_asc);
+    Model_Setting::instance().Set("STOCKS_SORT_COL", m_selected_col);
+
     int trx_id = -1;
     if (m_selected_row>=0) trx_id = m_stocks[m_selected_row].STOCKID;
     doRefreshItems(trx_id);

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