From 5db4638bb166aa79c95b433181681f968218b8f4 Mon Sep 17 00:00:00 2001 From: Ansgar Becker Date: Mon, 6 Jul 2020 22:17:47 +0200 Subject: [PATCH] Rename "IS NULL" and "IS NOT NULL" quick filter actions, so they don't prompt the user for an unused value. Closes #1065 --- source/main.dfm | 12 ++++++------ source/main.pas | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/source/main.dfm b/source/main.dfm index 9a73e7b8..bcf24de4 100644 --- a/source/main.dfm +++ b/source/main.dfm @@ -3329,17 +3329,17 @@ object MainForm: TMainForm ImageName = 'icons8-rename' OnExecute = QuickFilterClick end - object actQuickFilterPrompt6: TAction + object actQuickFilterNull: TAction Category = 'Data' Caption = 'Quick filter: Column IS NULL' - ImageIndex = 58 + ImageIndex = 151 ImageName = 'icons8-rename' OnExecute = QuickFilterClick end - object actQuickFilterPrompt7: TAction + object actQuickFilterNotNull: TAction Category = 'Data' Caption = 'Quick filter: Column IS NOT NULL' - ImageIndex = 58 + ImageIndex = 167 ImageName = 'icons8-rename' OnExecute = QuickFilterClick end @@ -3775,10 +3775,10 @@ object MainForm: TMainForm Action = actQuickFilterPrompt5 end object menuQuickFilterPrompt6: TMenuItem - Action = actQuickFilterPrompt6 + Action = actQuickFilterNull end object menuQuickFilterPrompt7: TMenuItem - Action = actQuickFilterPrompt7 + Action = actQuickFilterNotNull end object N7a: TMenuItem AutoHotkeys = maManual diff --git a/source/main.pas b/source/main.pas index 93e05157..af86e744 100644 --- a/source/main.pas +++ b/source/main.pas @@ -661,8 +661,8 @@ type actQuickFilterPrompt3: TAction; actQuickFilterPrompt4: TAction; actQuickFilterPrompt5: TAction; - actQuickFilterPrompt6: TAction; - actQuickFilterPrompt7: TAction; + actQuickFilterNull: TAction; + actQuickFilterNotNull: TAction; actQuickFilterClipboard1: TAction; actQuickFilterClipboard2: TAction; actQuickFilterClipboard3: TAction; @@ -7248,8 +7248,8 @@ begin actQuickFilterPrompt3.Hint := Col + ' > "..."'; actQuickFilterPrompt4.Hint := Col + ' < "..."'; actQuickFilterPrompt5.Hint := Results.Connection.GetSQLSpecifity(spLikeCompare, [Col, '"%...%"']); - actQuickFilterPrompt6.Hint := Col + ' IS NULL'; - actQuickFilterPrompt7.Hint := Col + ' IS NOT NULL'; + actQuickFilterNull.Hint := Col + ' IS NULL'; + actQuickFilterNotNull.Hint := Col + ' IS NOT NULL'; // Block 3: WHERE col = [clipboard content] Value := Trim(Clipboard.AsText);