Merge pull request #5133 from whalley/master

fix(#5122): sort order fixes
moneymanagerex · Sep 26, 2022 · 3bc3364 · 3bc3364
2 parents 4bd91ba + f20a893
commit 3bc3364
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/src/mmchecking_list.cpp b/src/mmchecking_list.cpp
@@ -199,6 +199,11 @@ void TransactionListCtrl::sortTable()
 
     SortTransactions(prev_g_sortcol, prev_g_asc);
     SortTransactions(g_sortcol, g_asc);
+
+    wxString sortText = wxString::Format("%s: %s %s / %s %s", _("Sort Order")
+                        , m_columns[g_sortcol].HEADER, g_asc ? L"\u25B2" : L"\u25BC"
+                        , m_columns[prev_g_sortcol].HEADER, prev_g_asc ? L"\u25B2" : L"\u25BC");
+    m_cp->m_header_sortOrder->SetLabelText(sortText);
 
     RefreshItems(0, m_trans.size() - 1);
 }
@@ -555,8 +560,6 @@ void TransactionListCtrl::OnColClick(wxListEvent& event)
     /* Clear previous column image */
     if (m_sortCol != ColumnNr) {
         setColumnImage(m_sortCol, -1);
-        Model_Setting::instance().Set(wxString::Format("%s_ASC2", m_cp->m_sortSaveTitle), (g_asc ? 1 : 0));
-        Model_Setting::instance().Set(wxString::Format("%s_SORT_COL2", m_cp->m_sortSaveTitle), g_sortcol);
         prev_g_sortcol = g_sortcol;
         prev_g_asc = m_asc;
     }
@@ -569,6 +572,14 @@ void TransactionListCtrl::OnColClick(wxListEvent& event)
     m_sortCol = toEColumn(ColumnNr);
     g_sortcol = m_sortCol;
 
+    // If primary sort is DATE then secondary is always ID in the same direction
+    if (ColumnNr == COL_DATE)
+    {
+        prev_g_sortcol = toEColumn(COL_ID);
+        prev_g_asc = m_asc;        
+    }
+    Model_Setting::instance().Set(wxString::Format("%s_ASC2", m_cp->m_sortSaveTitle), (prev_g_asc ? 1 : 0));
+    Model_Setting::instance().Set(wxString::Format("%s_SORT_COL2", m_cp->m_sortSaveTitle), prev_g_sortcol);
     Model_Setting::instance().Set(wxString::Format("%s_ASC", m_cp->m_sortSaveTitle), (g_asc ? 1 : 0));
     Model_Setting::instance().Set(wxString::Format("%s_SORT_COL", m_cp->m_sortSaveTitle), g_sortcol);
 

diff --git a/src/mmcheckingpanel.cpp b/src/mmcheckingpanel.cpp
@@ -284,9 +284,13 @@ void mmCheckingPanel::CreateControls()
     m_header_text->SetFont(this->GetFont().Larger().Bold());
     itemBoxSizerVHeader->Add(m_header_text, g_flagsExpandBorder1);
 
+    wxBoxSizer* infoPanel = new wxBoxSizer(wxHORIZONTAL);
     m_bitmapTransFilter = new wxButton(this, ID_TRX_FILTER);
     m_bitmapTransFilter->SetBitmap(mmBitmap(png::TRANSFILTER, mmBitmapButtonSize));
-    itemBoxSizerVHeader->Add(m_bitmapTransFilter, g_flagsBorder1H);
+    infoPanel->Add(m_bitmapTransFilter, g_flagsH);
+    m_header_sortOrder = new wxStaticText(this, wxID_STATIC, "");
+    infoPanel->Add(m_header_sortOrder, g_flagsH);
+    itemBoxSizerVHeader->Add(infoPanel, g_flagsBorder1H);
 
     m_header_balance = new wxStaticText(this, wxID_STATIC, "");
     itemBoxSizerVHeader->Add(m_header_balance, g_flagsBorder1V);

diff --git a/src/mmcheckingpanel.h b/src/mmcheckingpanel.h
@@ -124,6 +124,7 @@ class mmCheckingPanel : public mmPanelBase
     wxButton* m_btnDelete;
     wxButton* m_btnAttachment;
     wxStaticText* m_header_text;
+    wxStaticText* m_header_sortOrder;
     wxStaticText* m_header_balance;
     wxStaticText* m_info_panel;
     wxStaticText* m_info_panel_mini;