IDE: Add acceleration keys and fix tab order in Project Wizard and ImageListEditor, issue #21718

git-svn-id: trunk@36755 -

ide/lazarusidestrconsts.pas

@@ -882,8 +882,6 @@ resourcestring
   lisExePrograms = 'Programs';
   lisSelectFile = 'Select the file';
   lisClickHereToBrowseTheFileHint = 'Click here to browse the file';
-  lisProjectWizard = 'Project Wizard';
-  lisQuitLazarus = 'Quit Lazarus';
   lisOpenPackageFile = 'Open Package File';
   lisSaveSpace = 'Save ';
   lisSelectDFMFiles = 'Select Delphi form files (*.dfm)';
@@ -4834,11 +4832,13 @@ resourcestring
   lisetEditCustomScanners = 'Edit custom scanners (%s)';
   
   // ProjectWizard Dialog
-  lisPWNewProject = 'New Project';
-  lisPWOpenProject = 'Open Project';
-  lisPWOpenRecentProject = 'Open Recent Project';
-  lisPWViewExampleProjects = 'View Example Projects';
-  lisPWConvertProject = 'Convert Delphi Project';
+  lisProjectWizard = 'Project Wizard';
+  lisPWNewProject = '&New Project';
+  lisPWOpenProject = '&Open Project';
+  lisPWOpenRecentProject = 'Open &Recent Project';
+  lisPWViewExampleProjects = 'View &Example Projects';
+  lisPWConvertProject = 'Convert &Delphi Project';
+  lisQuitLazarus = '&Quit Lazarus';
   lisIsAThisCircularDependencyIsNotAllowed = '%s is a %s.%sThis circular '
     +'dependency is not allowed.';
   lisTheComponentCanNotBeDeletedBecauseItIsNotOwnedBy = 'The component %s can '

ide/projectwizarddlg.lfm

@@ -14,7 +14,7 @@ object ProjectWizardDialog: TProjectWizardDialog
     AnchorSideTop.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 7
-    Height = 26
+    Height = 25
     Top = 11
     Width = 368
     Anchors = [akTop, akLeft, akRight]
@@ -31,7 +31,7 @@ object ProjectWizardDialog: TProjectWizardDialog
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Side = asrBottom
     Left = 7
-    Height = 26
+    Height = 25
     Top = 126
     Width = 368
     Anchors = [akTop, akLeft, akRight]
@@ -41,15 +41,15 @@ object ProjectWizardDialog: TProjectWizardDialog
     ModalResult = 1
     NumGlyphs = 0
     OnClick = btnOpenProjectClick
-    TabOrder = 1
+    TabOrder = 2
   end
   object btnConvertProject: TBitBtn
     AnchorSideTop.Control = btnExamples
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Side = asrBottom
     Left = 7
-    Height = 26
-    Top = 200
+    Height = 25
+    Top = 198
     Width = 368
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
@@ -58,15 +58,15 @@ object ProjectWizardDialog: TProjectWizardDialog
     ModalResult = 1
     NumGlyphs = 0
     OnClick = btnConvertProjectClick
-    TabOrder = 2
+    TabOrder = 4
   end
   object btnCloseIDE: TBitBtn
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
     Left = 7
-    Height = 26
-    Top = 257
+    Height = 25
+    Top = 258
     Width = 368
     Anchors = [akLeft, akRight, akBottom]
     AutoSize = True
@@ -75,7 +75,7 @@ object ProjectWizardDialog: TProjectWizardDialog
     ModalResult = 1
     NumGlyphs = 0
     OnClick = btnCloseIDEClick
-    TabOrder = 3
+    TabOrder = 5
   end
   object gbRecent: TGroupBox
     AnchorSideTop.Control = btnNewProject
@@ -87,9 +87,9 @@ object ProjectWizardDialog: TProjectWizardDialog
     BorderSpacing.Top = 25
     BorderSpacing.Around = 17
     Caption = 'Open Recent Project'
-    ClientHeight = 40
+    ClientHeight = 38
     ClientWidth = 364
-    TabOrder = 4
+    TabOrder = 1
     object cbRecentProjects: TComboBox
       AnchorSideLeft.Control = gbRecent
       AnchorSideTop.Control = gbRecent
@@ -97,7 +97,7 @@ object ProjectWizardDialog: TProjectWizardDialog
       AnchorSideRight.Control = gbRecent
       AnchorSideRight.Side = asrBottom
       Left = 1
-      Height = 27
+      Height = 24
       Top = 10
       Width = 362
       Anchors = [akLeft, akRight]
@@ -112,8 +112,8 @@ object ProjectWizardDialog: TProjectWizardDialog
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Side = asrBottom
     Left = 8
-    Height = 26
-    Top = 163
+    Height = 25
+    Top = 162
     Width = 368
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
@@ -122,6 +122,6 @@ object ProjectWizardDialog: TProjectWizardDialog
     ModalResult = 1
     NumGlyphs = 0
     OnClick = btnExamplesClick
-    TabOrder = 5
+    TabOrder = 3
   end
 end

ideintf/frmselectprops.lfm

@@ -10,9 +10,11 @@ object SelectPropertiesForm: TSelectPropertiesForm
   OnClose = SelectPropertiesFormClose
   OnCreate = SelectPropertiesFormCreate
   Position = poScreenCenter
-  LCLVersion = '0.9.25'
+  LCLVersion = '1.1'
   object PTop: TPanel
+    Left = 0
     Height = 248
+    Top = 0
     Width = 485
     Align = alTop
     BevelOuter = bvNone
@@ -23,6 +25,7 @@ object SelectPropertiesForm: TSelectPropertiesForm
     object PProperties: TPanel
       Left = 233
       Height = 248
+      Top = 0
       Width = 252
       Align = alClient
       BevelOuter = bvNone
@@ -32,7 +35,7 @@ object SelectPropertiesForm: TSelectPropertiesForm
       TabOrder = 0
       object LProperties: TLabel
         Left = 6
-        Height = 14
+        Height = 15
         Top = 6
         Width = 240
         Align = alTop
@@ -43,21 +46,23 @@ object SelectPropertiesForm: TSelectPropertiesForm
       end
       object LBProperties: TListBox
         Left = 6
-        Height = 216
-        Top = 26
+        Height = 215
+        Top = 27
         Width = 240
         Align = alClient
         BorderSpacing.Around = 6
+        ItemHeight = 0
         MultiSelect = True
         OnClick = LBPropertiesClick
         OnDblClick = LBPropertiesDblClick
         Sorted = True
         TabOrder = 0
-        TopIndex = -1
       end
     end
     object PComponents: TPanel
+      Left = 0
       Height = 248
+      Top = 0
       Width = 229
       Align = alLeft
       BevelOuter = bvNone
@@ -68,11 +73,10 @@ object SelectPropertiesForm: TSelectPropertiesForm
       TabOrder = 1
       object LComponents: TLabel
         Left = 6
-        Height = 14
+        Height = 15
         Top = 6
         Width = 217
         Align = alTop
-        Anchors = [akTop, akLeft]
         BorderSpacing.Around = 6
         Caption = 'Co&mponents'
         Layout = tlCenter
@@ -80,25 +84,27 @@ object SelectPropertiesForm: TSelectPropertiesForm
       end
       object LBComponents: TListBox
         Left = 6
-        Height = 216
-        Top = 26
+        Height = 215
+        Top = 27
         Width = 217
         Align = alClient
         BorderSpacing.Around = 6
+        ItemHeight = 0
         OnSelectionChange = LBComponentsSelectionChange
         Sorted = True
         TabOrder = 0
-        TopIndex = -1
       end
     end
     object VSplitter: TSplitter
       Left = 229
       Height = 248
+      Top = 0
       Width = 4
     end
   end
   object HSplitter: TSplitter
     Cursor = crVSplit
+    Left = 0
     Height = 4
     Top = 248
     Width = 485
@@ -107,6 +113,7 @@ object SelectPropertiesForm: TSelectPropertiesForm
     ResizeAnchor = akTop
   end
   object PBottom: TPanel
+    Left = 0
     Height = 210
     Top = 252
     Width = 485
@@ -119,9 +126,9 @@ object SelectPropertiesForm: TSelectPropertiesForm
     TabOrder = 1
     object LLBSelected: TLabel
       Left = 10
-      Height = 14
+      Height = 15
       Top = 3
-      Width = 94
+      Width = 99
       BorderSpacing.Around = 6
       Caption = '&Selected Properties'
       ParentColor = False
@@ -132,14 +139,14 @@ object SelectPropertiesForm: TSelectPropertiesForm
       AnchorSideBottom.Control = PBottom
       AnchorSideBottom.Side = asrBottom
       Left = 6
-      Height = 180
-      Top = 24
+      Height = 112
+      Top = 92
       Width = 392
       Anchors = [akTop, akLeft, akRight, akBottom]
       BorderSpacing.Around = 6
+      ItemHeight = 0
       MultiSelect = True
       TabOrder = 0
-      TopIndex = -1
     end
     object BAdd: TButton
       AnchorSideTop.Control = LBSelected
@@ -147,7 +154,7 @@ object SelectPropertiesForm: TSelectPropertiesForm
       AnchorSideRight.Side = asrBottom
       Left = 404
       Height = 25
-      Top = 24
+      Top = 92
       Width = 75
       Anchors = [akTop, akRight]
       BorderSpacing.Right = 6
@@ -163,7 +170,7 @@ object SelectPropertiesForm: TSelectPropertiesForm
       AnchorSideRight.Side = asrBottom
       Left = 404
       Height = 25
-      Top = 55
+      Top = 123
       Width = 75
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Top = 6
@@ -179,7 +186,7 @@ object SelectPropertiesForm: TSelectPropertiesForm
       AnchorSideRight.Side = asrBottom
       Left = 404
       Height = 25
-      Top = 86
+      Top = 154
       Width = 75
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Top = 6

ideintf/imagelisteditor.lfm

@@ -12,26 +12,26 @@ object ImageListEditorDlg: TImageListEditorDlg
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   Position = poScreenCenter
-  LCLVersion = '0.9.29'
+  LCLVersion = '1.1'
   object GroupBoxR: TGroupBox
     AnchorSideTop.Control = Owner
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = BtnPanel
-    Left = 375
-    Height = 335
+    Left = 376
+    Height = 328
     Top = 6
-    Width = 235
+    Width = 234
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Around = 6
     Caption = 'Selected Image'
-    ClientHeight = 317
-    ClientWidth = 231
+    ClientHeight = 310
+    ClientWidth = 230
     TabOrder = 1
     object LabelTransparent: TLabel
       Left = 110
-      Height = 14
-      Top = 211
+      Height = 15
+      Top = 203
       Width = 92
       Anchors = [akLeft, akBottom]
       BorderSpacing.Around = 6
@@ -40,16 +40,18 @@ object ImageListEditorDlg: TImageListEditorDlg
     end
     object LabelSize: TLabel
       Left = 6
-      Height = 14
+      Height = 1
       Top = 6
       Width = 1
       ParentColor = False
     end
     object Preview: TScrollBox
       Left = 6
-      Height = 169
+      Height = 162
       Top = 32
-      Width = 218
+      Width = 217
+      HorzScrollBar.Page = 213
+      VertScrollBar.Page = 158
       Anchors = [akTop, akLeft, akRight, akBottom]
       BorderSpacing.Around = 6
       Color = clGrayText
@@ -58,9 +60,9 @@ object ImageListEditorDlg: TImageListEditorDlg
       OnPaint = PreviewPaint
     end
     object RadioGroup: TRadioGroup
-      Left = 6
+      Left = 7
       Height = 105
-      Top = 207
+      Top = 200
       Width = 96
       Anchors = [akLeft, akBottom]
       AutoFill = True
@@ -91,8 +93,8 @@ object ImageListEditorDlg: TImageListEditorDlg
       AnchorSideTop.Control = LabelTransparent
       AnchorSideTop.Side = asrBottom
       Left = 110
-      Height = 22
-      Top = 231
+      Height = 24
+      Top = 224
       Width = 96
       Selected = clFuchsia
       Style = [cbStandardColors, cbExtendedColors, cbIncludeDefault, cbCustomColor, cbPrettyNames]
@@ -107,20 +109,20 @@ object ImageListEditorDlg: TImageListEditorDlg
     AnchorSideTop.Control = Owner
     AnchorSideBottom.Control = BtnPanel
     Left = 6
-    Height = 335
+    Height = 328
     Top = 6
     Width = 364
     Anchors = [akTop, akLeft, akBottom]
     BorderSpacing.Around = 6
     Caption = 'Images'
-    ClientHeight = 317
+    ClientHeight = 310
     ClientWidth = 360
     TabOrder = 0
     object TreeView: TTreeView
       AnchorSideLeft.Control = GroupBoxL
       AnchorSideTop.Control = GroupBoxL
       Left = 6
-      Height = 306
+      Height = 299
       Top = 6
       Width = 186
       Anchors = [akTop, akLeft, akRight, akBottom]
@@ -170,7 +172,7 @@ object ImageListEditorDlg: TImageListEditorDlg
       BorderSpacing.Around = 6
       Caption = 'Clear'
       OnClick = BtnClearClick
-      TabOrder = 2
+      TabOrder = 3
     end
     object BtnDelete: TButton
       AnchorSideLeft.Control = TreeView
@@ -187,7 +189,7 @@ object ImageListEditorDlg: TImageListEditorDlg
       BorderSpacing.Around = 6
       Caption = '&Delete'
       OnClick = BtnDeleteClick
-      TabOrder = 3
+      TabOrder = 2
     end
     object BtnMoveUp: TButton
       Tag = -1
@@ -260,9 +262,17 @@ object ImageListEditorDlg: TImageListEditorDlg
   end
   object BtnPanel: TButtonPanel
     Left = 6
-    Height = 26
-    Top = 347
+    Height = 33
+    Top = 340
     Width = 604
+    OKButton.Name = 'OKButton'
+    OKButton.DefaultCaption = True
+    HelpButton.Name = 'HelpButton'
+    HelpButton.DefaultCaption = True
+    CloseButton.Name = 'CloseButton'
+    CloseButton.DefaultCaption = True
+    CancelButton.Name = 'CancelButton'
+    CancelButton.DefaultCaption = True
     TabOrder = 2
     ShowBevel = False
   end
@@ -277,7 +287,6 @@ object ImageListEditorDlg: TImageListEditorDlg
     top = 209
   end
   object SaveDialog: TSavePictureDialog
-    Title = 'Save file as'
     FilterIndex = 0
     Options = [ofEnableSizing, ofViewDetail, ofAutoPreview]
     left = 252

ideintf/objinspstrconsts.pas

@@ -132,30 +132,30 @@ resourcestring
   sccsILEdtCaption     = 'ImageList Editor';
   sccsILEdtGrpLCaption = 'Images';
   sccsILEdtGrpRCaption = 'Selected Image';
-  sccsILEdtAdd         = 'Add ...';
-  sccsILEdtDelete      = 'Delete';
-  sccsILEdtApply       = 'Apply';
-  sccsILEdtClear       = 'Clear';
-  sccsILEdtMoveUp      = 'Move Up';
-  sccsILEdtMoveDown    = 'Move Down';
-  sccsILEdtSave        = 'Save ...';
+  sccsILEdtAdd         = '&Add ...';
+  sccsILEdtDelete      = '&Delete';
+  sccsILEdtApply       = '&Apply';
+  sccsILEdtClear       = '&Clear';
+  sccsILEdtMoveUp      = 'Move &Up';
+  sccsILEdtMoveDown    = 'Move D&own';
+  sccsILEdtSave        = '&Save ...';
   sccsILEdtSaveAll     = 'Save All ...';
   sccsILEdtransparentColor = 'Transparent Color:';
   sccsILEdtAdjustment  = 'Adjustment';
   sccsILEdtNone        = 'None';
-  liisIf = 'If';
-  liisIfDef = 'IfDef';
-  liisIfNDef = 'IfNDef';
-  liisElseIf = 'ElseIf';
-  liisElse = 'Else';
-  liisAddValue = 'Add value';
-  liisSetValue = 'Set value';
+  liisIf               = 'If';
+  liisIfDef            = 'IfDef';
+  liisIfNDef           = 'IfNDef';
+  liisElseIf           = 'ElseIf';
+  liisElse             = 'Else';
+  liisAddValue         = 'Add value';
+  liisSetValue         = 'Set value';
   sccsILEdtStretch     = 'Stretch';
   sccsILEdtCrop        = 'Crop';
   sccsILEdtCenter      = 'Center';
-  rscdRight = 'Right';
-  rscdVisible = 'Visible';
-  rscdAutoSize = 'Auto Size';
+  rscdRight            = 'Right';
+  rscdVisible          = 'Visible';
+  rscdAutoSize         = 'Auto Size';
   sccsILEdtOpenDialog  = 'Add Images';
   sccsILEdtSaveDialog  = 'Save Image';