From d5bc11ca0726cd88eb5acab0b0d6f3bb26ebfb92 Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Tue, 30 Jul 2013 11:19:08 +0000
Subject: [PATCH] IDE: show already grabbed shortcut key in the filter GUI.

git-svn-id: trunk@42238 -
---
 ide/frames/editor_keymapping_options.pas | 23 ++++++++++++++++-------
 ide/keymapshortcutdlg.pas                | 17 -----------------
 2 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/ide/frames/editor_keymapping_options.pas b/ide/frames/editor_keymapping_options.pas
index c57491007d..9c009cb0ad 100644
--- a/ide/frames/editor_keymapping_options.pas
+++ b/ide/frames/editor_keymapping_options.pas
@@ -245,13 +245,22 @@ end;
 
 procedure TEditorKeymappingOptionsFrame.FindKeyButtonClick(Sender: TObject);
 var
-  KeyFilter: TIDEShortCut;
+  ShortCutDialog: TShortCutDialog;
 begin
-  if ShowKeyMappingGrabForm(KeyFilter) = mrOK then begin
-    KeyMapKeyFilter := KeyFilter;
-    UpdateKeyFilterButton;
-    FilterEdit.Filter:='';         // Allow only one of the filters to be active.
-    FilterEdit.InvalidateFilter;
+  ShortCutDialog := TShortCutDialog.Create(nil);
+  try
+    ShortCutDialog.ShowSecondary:=False;
+    ShortCutDialog.ShowSequence:=False;
+    ShortCutDialog.Caption:=lisChooseAKey;
+    ShortCutDialog.PrimaryShortCut := KeyMapKeyFilter;
+    if ShortCutDialog.ShowModal = mrOK then begin
+      KeyMapKeyFilter := ShortCutDialog.PrimaryShortCut;
+      UpdateKeyFilterButton;
+      FilterEdit.Filter:='';       // Allow only one of the filters to be active.
+      FilterEdit.InvalidateFilter;
+    end;
+  finally
+    ShortCutDialog.Free;
   end;
 end;
 
@@ -547,7 +556,7 @@ end;
 procedure TEditorKeymappingOptionsFrame.UpdateKeyFilterButton;
 begin
   if IDEShortCutEmpty(KeyMapKeyFilter) then
-    FindKeyButton.Caption:=lisFindKeyCombination
+    FindKeyButton.Caption := lisFindKeyCombination
   else
     FindKeyButton.Caption:=
       Format(lisFilter3, [KeyAndShiftStateToEditorKeyString(KeyMapKeyFilter)]);
diff --git a/ide/keymapshortcutdlg.pas b/ide/keymapshortcutdlg.pas
index a34692f1b8..371d4d03c1 100644
--- a/ide/keymapshortcutdlg.pas
+++ b/ide/keymapshortcutdlg.pas
@@ -84,7 +84,6 @@ type
 
 function ShowKeyMappingEditForm(Index: integer;
                 AKeyCommandRelationList: TKeyCommandRelationList): TModalResult;
-function ShowKeyMappingGrabForm(out Key: TIDEShortCut; AllowSequence: boolean = false): TModalResult;
 
 implementation
 
@@ -106,22 +105,6 @@ begin
   end;
 end;
 
-function ShowKeyMappingGrabForm(out Key: TIDEShortCut; AllowSequence: boolean): TModalResult;
-var
-  ShortCutDialog: TShortCutDialog;
-begin
-  ShortCutDialog:=TShortCutDialog.Create(nil);
-  try
-    ShortCutDialog.ShowSecondary:=false;
-    ShortCutDialog.ShowSequence:=AllowSequence;
-    ShortCutDialog.Caption:=lisChooseAKey;
-    Result:=ShortCutDialog.ShowModal;
-    Key:=ShortCutDialog.PrimaryShortCut;
-  finally
-    ShortCutDialog.Free;
-  end;
-end;
-
 
 { TShortCutDialog }