IDE: grab key: escape sets VK_UNKNOWN

git-svn-id: trunk@22189 -

ide/keymapshortcutdlg.lfm

@@ -1,14 +1,15 @@
 object ShortCutDialog: TShortCutDialog
   Left = 290
-  Height = 248
+  Height = 260
   Top = 189
   Width = 545
+  ActiveControl = BtnPanel
   AutoSize = True
   Caption = 'ShortCutDialog'
-  ClientHeight = 248
+  ClientHeight = 260
   ClientWidth = 545
   OnCreate = FormCreate
-  LCLVersion = '0.9.27'
+  LCLVersion = '0.9.29'
   object PrimaryGroupBox: TGroupBox
     Left = 6
     Height = 93
@@ -32,7 +33,7 @@ object ShortCutDialog: TShortCutDialog
   object BtnPanel: TButtonPanel
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 26
+    Height = 36
     Top = 216
     Width = 533
     Align = alTop

ide/keymapshortcutdlg.lrs

@@ -1,16 +1,16 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TShortCutDialog','FORMDATA',[
-  'TPF0'#15'TShortCutDialog'#14'ShortCutDialog'#4'Left'#3'"'#1#6'Height'#3#248#0
-  +#3'Top'#3#189#0#5'Width'#3'!'#2#8'AutoSize'#9#7'Caption'#6#14'ShortCutDialog'
-  +#12'ClientHeight'#3#248#0#11'ClientWidth'#3'!'#2#8'OnCreate'#7#10'FormCreate'
-  +#10'LCLVersion'#6#6'0.9.27'#0#9'TGroupBox'#15'PrimaryGroupBox'#4'Left'#2#6#6
-  +'Height'#2']'#3'Top'#2#6#5'Width'#3#21#2#5'Align'#7#5'alTop'#20'BorderSpacin'
-  +'g.Around'#2#6#7'Caption'#6#15'PrimaryGroupBox'#8'TabOrder'#2#0#0#0#9'TGroup'
-  +'Box'#17'SecondaryGroupBox'#4'Left'#2#6#6'Height'#2'i'#3'Top'#2'i'#5'Width'#3
-  +#21#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'Secon'
-  +'daryGroupBox'#8'TabOrder'#2#1#0#0#12'TButtonPanel'#8'BtnPanel'#18'AnchorSid'
-  +'eTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#26#3'Top'#3#216#0#5'Width'
-  +#3#21#2#5'Align'#7#5'alTop'#8'TabOrder'#2#2#11'ShowButtons'#11#4'pbOK'#8'pbC'
-  +'ancel'#0#9'ShowBevel'#8#0#0#0
+  'TPF0'#15'TShortCutDialog'#14'ShortCutDialog'#4'Left'#3'"'#1#6'Height'#3#4#1#3
+  +'Top'#3#189#0#5'Width'#3'!'#2#13'ActiveControl'#7#8'BtnPanel'#8'AutoSize'#9#7
+  +'Caption'#6#14'ShortCutDialog'#12'ClientHeight'#3#4#1#11'ClientWidth'#3'!'#2
+  +#8'OnCreate'#7#10'FormCreate'#10'LCLVersion'#6#6'0.9.29'#0#9'TGroupBox'#15'P'
+  +'rimaryGroupBox'#4'Left'#2#6#6'Height'#2']'#3'Top'#2#6#5'Width'#3#21#2#5'Ali'
+  +'gn'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'PrimaryGroupBox'
+  +#8'TabOrder'#2#0#0#0#9'TGroupBox'#17'SecondaryGroupBox'#4'Left'#2#6#6'Height'
+  +#2'i'#3'Top'#2'i'#5'Width'#3#21#2#5'Align'#7#5'alTop'#20'BorderSpacing.Aroun'
+  +'d'#2#6#7'Caption'#6#17'SecondaryGroupBox'#8'TabOrder'#2#1#0#0#12'TButtonPan'
+  +'el'#8'BtnPanel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'
+  +#2'$'#3'Top'#3#216#0#5'Width'#3#21#2#5'Align'#7#5'alTop'#8'TabOrder'#2#2#11
+  +'ShowButtons'#11#4'pbOK'#8'pbCancel'#0#9'ShowBevel'#8#0#0#0
 ]);

ide/lazarusidestrconsts.pas

@@ -1430,7 +1430,7 @@ resourcestring
   dlgAddHiAttrGroupSyncroEdit    = 'Syncron Edit';
   dlgAddHiAttrGroupTemplateEdit  = 'Template Edit';
   
-  lisClearKeyShortMapping = 'Clear Key Mapping';
+  lisClearKeyMapping = 'Clear Key Mapping';
 
   // CodeTools dialog
   dlgCodeToolsOpts = 'CodeTools Options';

ideintf/propedits.pp

@@ -6900,8 +6900,13 @@ begin
              VK_LWIN, VK_RWIN,
              VK_UNKNOWN, VK_UNDEFINED])
   then begin
-    Key:=AKey;
-    ShiftState:=AShift;
+    if (AKey=VK_ESCAPE) and (AShift=[]) then begin
+      Key:=VK_UNKNOWN;
+      ShiftState:=[];
+    end else begin
+      Key:=AKey;
+      ShiftState:=AShift;
+    end;
     FGrabForm.ModalResult:=mrOk;
   end;
 end;