Skip to content

Commit

Permalink
Reset sort order of data tab grid as well, when user clicks "Clear da…
Browse files Browse the repository at this point in the history
…ta tab filter". Closes #1868
  • Loading branch information
ansgarbecker committed Apr 29, 2024
1 parent 223ed26 commit 7647fa1
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
14 changes: 9 additions & 5 deletions out/locale/en/LC_MESSAGES/default.po
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion source/main.dfm
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions source/main.pas
Expand Up @@ -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;


Expand Down

0 comments on commit 7647fa1

Please sign in to comment.