Merge pull request #5135 from whalley/master

fix(#5122): secondary sort default is ID
moneymanagerex · Sep 27, 2022 · 16e0a39 · 16e0a39
2 parents 3bc3364 + e0f6ab8
commit 16e0a39
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/mmchecking_list.cpp b/src/mmchecking_list.cpp
@@ -228,7 +228,7 @@ TransactionListCtrl::TransactionListCtrl(
     m_attr17(new wxListItemAttr(*bestFontColour(mmColors::userDefColor7), mmColors::userDefColor7, wxNullFont)),
     m_sortCol(COL_DEF_SORT),
     g_sortcol(COL_DEF_SORT),
-    prev_g_sortcol(COL_DEF_SORT),
+    prev_g_sortcol(COL_DEF_SORT2),
     g_asc(true),
     prev_g_asc(true),
     m_firstSort(true),

diff --git a/src/mmchecking_list.h b/src/mmchecking_list.h
@@ -64,7 +64,8 @@ class TransactionListCtrl : public mmListCtrl
         COL_UDFC04,
         COL_UDFC05,
         COL_MAX, // number of columns
-        COL_DEF_SORT = COL_DATE // don't omit any columns before this
+        COL_DEF_SORT = COL_DATE, // don't omit any columns before this
+        COL_DEF_SORT2 = COL_ID 
     };
     EColumn toEColumn(long col);
 public:

diff --git a/src/mmcheckingpanel.cpp b/src/mmcheckingpanel.cpp
@@ -326,7 +326,7 @@ void mmCheckingPanel::CreateControls()
     long val = m_listCtrlAccount->COL_DEF_SORT;
     wxString strVal = Model_Setting::instance().GetStringSetting(wxString::Format("%s_SORT_COL", m_sortSaveTitle), wxString() << val);
     if (strVal.ToLong(&val)) m_listCtrlAccount->g_sortcol = m_listCtrlAccount->toEColumn(val);
-    val = m_listCtrlAccount->COL_DEF_SORT;
+    val = m_listCtrlAccount->COL_DEF_SORT2;
     strVal = Model_Setting::instance().GetStringSetting(wxString::Format("%s_SORT_COL2", m_sortSaveTitle), wxString() << val);
     if (strVal.ToLong(&val)) m_listCtrlAccount->prev_g_sortcol = m_listCtrlAccount->toEColumn(val);