fix: make some cancel buttons react on Esc key

https://www.heidisql.com/forum.php?t=45320

Author: ansgarbecker

source/exportgrid.lfm

@@ -27,6 +27,7 @@ object frmExportGrid: TfrmExportGrid
     Anchors = [akRight, akBottom]
     BorderSpacing.Around = 5
     Caption = 'OK'
+    Default = True
     ModalResult = 1
     TabOrder = 5
     OnClick = btnOKClick
@@ -42,6 +43,7 @@ object frmExportGrid: TfrmExportGrid
     Width = 75
     Anchors = [akRight, akBottom]
     BorderSpacing.Around = 5
+    Cancel = True
     Caption = 'Cancel'
     ModalResult = 2
     TabOrder = 4

source/loaddata.lfm

@@ -28,6 +28,7 @@ object loaddataform: Tloaddataform
     Anchors = [akRight, akBottom]
     BorderSpacing.Around = 5
     Caption = 'Import!'
+    Default = True
     Enabled = False
     ModalResult = 1
     TabOrder = 6
@@ -43,6 +44,7 @@ object loaddataform: Tloaddataform
     Width = 75
     Anchors = [akRight, akBottom]
     BorderSpacing.Around = 5
+    Cancel = True
     Caption = 'Cancel'
     ModalResult = 2
     TabOrder = 7

source/tabletools.lfm

@@ -36,6 +36,7 @@ object frmTableTools: TfrmTableTools
     Width = 95
     Anchors = [akRight, akBottom]
     BorderSpacing.Around = 5
+    Cancel = True
     Caption = 'Close'
     ModalResult = 2
     TabOrder = 3
@@ -1019,6 +1020,7 @@ object frmTableTools: TfrmTableTools
     Anchors = [akRight, akBottom]
     BorderSpacing.Around = 5
     Caption = 'Execute'
+    Default = True
     TabOrder = 2
     OnClick = Execute
   end

source/usermanager.lfm

@@ -728,7 +728,7 @@ object UserManagerForm: TUserManagerForm
     ClientWidth = 617
     ParentBackground = False
     TabOrder = 3
-    object btnDiscard: TSpeedButton
+    object btnDiscard: TBitBtn
       AnchorSideRight.Control = btnCancel
       AnchorSideBottom.Control = pnlBottom
       AnchorSideBottom.Side = asrBottom
@@ -739,13 +739,14 @@ object UserManagerForm: TUserManagerForm
       Anchors = [akRight, akBottom]
       AutoSize = True
       BorderSpacing.Left = 5
-      Constraints.MinWidth = 100
       Caption = 'Discard'
+      Constraints.MinWidth = 100
       Images = MainForm.ImageListMain
       ImageIndex = 40
+      TabOrder = 0
       OnClick = btnDiscardClick
     end
-    object btnSave: TSpeedButton
+    object btnSave: TBitBtn
       AnchorSideRight.Control = btnDiscard
       AnchorSideBottom.Control = pnlBottom
       AnchorSideBottom.Side = asrBottom
@@ -755,13 +756,15 @@ object UserManagerForm: TUserManagerForm
       Width = 100
       Anchors = [akRight, akBottom]
       AutoSize = True
-      Constraints.MinWidth = 100
       Caption = 'Save'
+      Constraints.MinWidth = 100
+      Default = True
       Images = MainForm.ImageListMain
       ImageIndex = 10
+      TabOrder = 1
       OnClick = btnSaveClick
     end
-    object btnCancel: TSpeedButton
+    object btnCancel: TBitBtn
       AnchorSideRight.Control = pnlBottom
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = pnlBottom
@@ -773,10 +776,12 @@ object UserManagerForm: TUserManagerForm
       Anchors = [akRight, akBottom]
       AutoSize = True
       BorderSpacing.Left = 5
-      Constraints.MinWidth = 100
+      Cancel = True
       Caption = 'Close'
+      Constraints.MinWidth = 100
       Images = MainForm.ImageListMain
       ImageIndex = 26
+      TabOrder = 2
       OnClick = btnCancelClick
     end
     object lblWarning: TLabel

source/usermanager.pas

@@ -61,8 +61,8 @@   EInputError = class(Exception);
   { TUserManagerForm }
 
   TUserManagerForm = class(TExtForm)
-    btnCancel: TSpeedButton;
-    btnSave: TSpeedButton;
+    btnCancel: TBitBtn;
+    btnSave: TBitBtn;
     comboPlugins: TComboBox;
     lblPasswordHint: TLabel;
     lblPlugin: TLabel;
@@ -71,7 +71,7 @@   TUserManagerForm = class(TExtForm)
     listUsers: TLazVirtualStringTree;
     Splitter1: TSplitter;
     pnlRight: TPanel;
-    btnDiscard: TSpeedButton;
+    btnDiscard: TBitBtn;
     lblUsers: TLabel;
     ToolBar1: TToolBar;
     btnAddUser: TToolButton;
@@ -526,6 +526,10 @@ procedure TUserManagerForm.SetModified(Value: Boolean);
   FModified := Value;
   btnSave.Enabled := FModified;
   btnDiscard.Enabled := FModified and (not FAdded);
+  btnDiscard.Cancel := False;
+  btnCancel.Cancel := False;
+  btnDiscard.Cancel := btnDiscard.Enabled;
+  btnCancel.Cancel := not btnDiscard.Enabled;
   listUsers.Invalidate;
 end;