From 7647fa19c065093b22d1534f96f8e172aaa0e3d8 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Mon, 29 Apr 2024 07:44:32 +0200
Subject: [PATCH] Reset sort order of data tab grid as well, when user clicks
 "Clear data tab filter". Closes #1868

---
 out/locale/en/LC_MESSAGES/default.po | 14 +++++++++-----
 source/main.dfm                      |  2 +-
 source/main.pas                      |  4 ++++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/out/locale/en/LC_MESSAGES/default.po b/out/locale/en/LC_MESSAGES/default.po
index 28358562c..5c7a76f6d 100644
--- a/out/locale/en/LC_MESSAGES/default.po
+++ b/out/locale/en/LC_MESSAGES/default.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HeidiSQL\n"
 "POT-Creation-Date: 2012-11-05 21:40\n"
-"PO-Revision-Date: 2024-02-10 15:35+0100\n"
+"PO-Revision-Date: 2024-04-29 07:40+0200\n"
 "Last-Translator: Ansgar Becker <anse@heidisql.com>\n"
 "Language-Team: English (http://www.transifex.com/projects/p/heidisql/language/en/)\n"
 "Language: en\n"
@@ -5764,13 +5764,17 @@ msgstr "The selected foreign column do not match the source columns data type an
 msgid "Foreign key mismatch"
 msgstr "Foreign key mismatch"
 
-#. Clear data tab filter
+#. Clear data tab filter and sort order
 msgid "Data filter for %s deleted"
 msgstr "Data filter for %s deleted"
 
-#. Clear data tab filter
-msgid "Clear data tab filter"
-msgstr "Clear data tab filter"
+#. Clear data tab filter and sort order
+msgid "Sort order for %s deleted"
+msgstr "Sort order for %s deleted"
+
+#. Clear data tab filter and sort order
+msgid "Clear data tab filter and sort order"
+msgstr "Clear data tab filter and sort order"
 
 msgid "Error when updating query history: %s"
 msgstr "Error when updating query history: %s"
diff --git a/source/main.dfm b/source/main.dfm
index 04995d546..47abf593c 100644
--- a/source/main.dfm
+++ b/source/main.dfm
@@ -3431,7 +3431,7 @@ object MainForm: TMainForm
       end
     end
     object menuClearDataTabFilter: TMenuItem
-      Caption = 'Clear data tab filter'
+      Caption = 'Clear data tab filter and sort order'
       OnClick = menuClearDataTabFilterClick
     end
     object N17: TMenuItem
diff --git a/source/main.pas b/source/main.pas
index 3d3cd776f..85310264f 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -2904,6 +2904,10 @@ procedure TMainForm.menuClearDataTabFilterClick(Sender: TObject);
     AppSettings.DeleteValue(asFilter);
     LogSQL(f_('Data filter for %s deleted', [ActiveDbObj.Name]), lcInfo);
   end;
+  if AppSettings.ValueExists(asSort) then begin
+    AppSettings.DeleteValue(asSort);
+    LogSQL(f_('Sort order for %s deleted', [ActiveDbObj.Name]), lcInfo);
+  end;
 end;