ideintf: improve buttons in checklistbox editor

git-svn-id: trunk@19970 -

ideintf/checklistboxeditordlg.lfm

@@ -3,8 +3,6 @@ object CheckListBoxEditorDlg: TCheckListBoxEditorDlg
   Height = 294
   Top = 154
   Width = 445
-  HorzScrollBar.Page = 444
-  VertScrollBar.Page = 293
   ActiveControl = FCheck
   BorderIcons = [biSystemMenu]
   BorderStyle = bsDialog
@@ -15,95 +13,25 @@ object CheckListBoxEditorDlg: TCheckListBoxEditorDlg
   Constraints.MinWidth = 200
   OnCreate = FormCreate
   Position = poScreenCenter
+  LCLVersion = '0.9.27'
   object FCheck: TCheckListBox
-    Height = 234
+    Left = 0
+    Height = 232
     Top = 24
     Width = 445
     Align = alClient
+    ItemHeight = 0
     OnClick = FCheckClick
     TabOrder = 0
   end
-  object FPanelOKCancel: TPanel
-    Height = 36
-    Top = 258
-    Width = 445
-    Align = alBottom
-    BevelInner = bvLowered
-    ClientHeight = 36
-    ClientWidth = 445
-    TabOrder = 1
-    object BtnHelp: TBitBtn
-      AnchorSideRight.Control = FPanelOKCancel
-      AnchorSideRight.Side = asrBottom
-      AnchorSideBottom.Control = FPanelOKCancel
-      AnchorSideBottom.Side = asrBottom
-      Left = 364
-      Height = 25
-      Top = 5
-      Width = 75
-      Anchors = [akRight, akBottom]
-      BorderSpacing.Around = 6
-      Caption = '&Help'
-      Kind = bkHelp
-      NumGlyphs = 0
-      TabOrder = 0
-    end
-    object BtnApply: TBitBtn
-      AnchorSideRight.Control = BtnHelp
-      AnchorSideBottom.Control = FPanelOKCancel
-      AnchorSideBottom.Side = asrBottom
-      Left = 283
-      Height = 25
-      Top = 5
-      Width = 75
-      Anchors = [akRight, akBottom]
-      BorderSpacing.Around = 6
-      Caption = '&Apply'
-      NumGlyphs = 0
-      OnClick = ApplyCheck
-      TabOrder = 1
-    end
-    object BtnCancel: TBitBtn
-      AnchorSideRight.Control = BtnApply
-      AnchorSideBottom.Control = FPanelOKCancel
-      AnchorSideBottom.Side = asrBottom
-      Left = 202
-      Height = 25
-      Top = 5
-      Width = 75
-      Anchors = [akRight, akBottom]
-      BorderSpacing.Around = 6
-      Caption = 'Cancel'
-      Kind = bkCancel
-      ModalResult = 2
-      NumGlyphs = 0
-      TabOrder = 2
-    end
-    object BtnOK: TBitBtn
-      AnchorSideRight.Control = BtnCancel
-      AnchorSideBottom.Control = FPanelOKCancel
-      AnchorSideBottom.Side = asrBottom
-      Left = 121
-      Height = 25
-      Top = 5
-      Width = 75
-      Anchors = [akRight, akBottom]
-      BorderSpacing.Around = 6
-      Caption = '&OK'
-      Default = True
-      Kind = bkOK
-      ModalResult = 1
-      NumGlyphs = 0
-      TabOrder = 3
-    end
-  end
   object ToolBar: TToolBar
+    Left = 0
     Height = 24
+    Top = 0
     Width = 445
     AutoSize = True
     Caption = 'ToolBar'
-    Flat = True
+    TabOrder = 1
-    TabOrder = 2
     object tbAdd: TToolButton
       Left = 1
       Top = 2
@@ -163,4 +91,12 @@ object CheckListBoxEditorDlg: TCheckListBoxEditorDlg
       OnClick = ModifyItem
     end
   end
+  object BtnPanel: TButtonPanel
+    Left = 6
+    Height = 26
+    Top = 262
+    Width = 433
+    TabOrder = 2
+    ShowBevel = False
+  end
 end

ideintf/checklistboxeditordlg.lrs

@@ -2,50 +2,29 @@
 
 LazarusResources.Add('TCheckListBoxEditorDlg','FORMDATA',[
   'TPF0'#22'TCheckListBoxEditorDlg'#21'CheckListBoxEditorDlg'#4'Left'#3'<'#1#6
-  +'Height'#3'&'#1#3'Top'#3#154#0#5'Width'#3#189#1#18'HorzScrollBar.Page'#3#188
+  +'Height'#3'&'#1#3'Top'#3#154#0#5'Width'#3#189#1#13'ActiveControl'#7#6'FCheck'
-  +#1#18'VertScrollBar.Page'#3'%'#1#13'ActiveControl'#7#6'FCheck'#11'BorderIcon'
+  +#11'BorderIcons'#11#12'biSystemMenu'#0#11'BorderStyle'#7#8'bsDialog'#7'Capti'
-  +'s'#11#12'biSystemMenu'#0#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#21'Chec'
+  +'on'#6#21'CheckListBoxEditorDlg'#12'ClientHeight'#3'&'#1#11'ClientWidth'#3
-  +'kListBoxEditorDlg'#12'ClientHeight'#3'&'#1#11'ClientWidth'#3#189#1#21'Const'
+  +#189#1#21'Constraints.MinHeight'#2'd'#20'Constraints.MinWidth'#3#200#0#8'OnC'
-  +'raints.MinHeight'#2'd'#20'Constraints.MinWidth'#3#200#0#8'OnCreate'#7#10'Fo'
+  +'reate'#7#10'FormCreate'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6
-  +'rmCreate'#8'Position'#7#14'poScreenCenter'#0#13'TCheckListBox'#6'FCheck'#6
+  +'0.9.27'#0#13'TCheckListBox'#6'FCheck'#4'Left'#2#0#6'Height'#3#232#0#3'Top'#2
-  +'Height'#3#234#0#3'Top'#2#24#5'Width'#3#189#1#5'Align'#7#8'alClient'#7'OnCli'
+  +#24#5'Width'#3#189#1#5'Align'#7#8'alClient'#10'ItemHeight'#2#0#7'OnClick'#7
-  +'ck'#7#11'FCheckClick'#8'TabOrder'#2#0#0#0#6'TPanel'#14'FPanelOKCancel'#6'He'
+  +#11'FCheckClick'#8'TabOrder'#2#0#0#0#8'TToolBar'#7'ToolBar'#4'Left'#2#0#6'He'
-  +'ight'#2'$'#3'Top'#3#2#1#5'Width'#3#189#1#5'Align'#7#8'alBottom'#10'BevelInn'
+  +'ight'#2#24#3'Top'#2#0#5'Width'#3#189#1#8'AutoSize'#9#7'Caption'#6#7'ToolBar'
-  +'er'#7#9'bvLowered'#12'ClientHeight'#2'$'#11'ClientWidth'#3#189#1#8'TabOrder'
+  +#8'TabOrder'#2#1#0#11'TToolButton'#5'tbAdd'#4'Left'#2#1#3'Top'#2#2#7'Caption'
-  +#2#1#0#7'TBitBtn'#7'BtnHelp'#23'AnchorSideRight.Control'#7#14'FPanelOKCancel'
+  +#6#5'tbAdd'#14'ParentShowHint'#8#8'ShowHint'#9#7'OnClick'#7#7'AddItem'#0#0#11
-  +#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#14'F'
+  +'TToolButton'#8'tbDelete'#4'Left'#2#24#3'Top'#2#2#7'Caption'#6#8'tbDelete'#7
-  +'PanelOKCancel'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'l'#1#6'He'
+  +'Enabled'#8#14'ParentShowHint'#8#8'ShowHint'#9#7'OnClick'#7#10'DeleteItem'#0
-  +'ight'#2#25#3'Top'#2#5#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0
+  +#0#11'TToolButton'#11'ToolButton3'#4'Left'#2'/'#3'Top'#2#2#5'Width'#2#9#7'Ca'
-  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#5'&Help'#4'Kind'#7#6'bkHelp'#9'Nu'
+  +'ption'#6#11'ToolButton3'#5'Style'#7#10'tbsDivider'#0#0#11'TToolButton'#4'tb'
-  +'mGlyphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'#8'BtnApply'#23'AnchorSideRight.'
+  +'Up'#4'Left'#2'8'#3'Top'#2#2#7'Caption'#6#4'tbUp'#7'Enabled'#8#14'ParentShow'
-  +'Control'#7#7'BtnHelp'#24'AnchorSideBottom.Control'#7#14'FPanelOKCancel'#21
+  +'Hint'#8#8'ShowHint'#9#7'OnClick'#7#10'MoveUpItem'#0#0#11'TToolButton'#6'tbD'
-  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#27#1#6'Height'#2#25#3'Top'#2
+  +'own'#4'Left'#2'O'#3'Top'#2#2#7'Caption'#6#6'tbDown'#7'Enabled'#8#14'ParentS'
-  +#5#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#20'BorderSpacing.Aro'
+  +'howHint'#8#8'ShowHint'#9#7'OnClick'#7#12'MoveDownItem'#0#0#11'TToolButton'
-  +'und'#2#6#7'Caption'#6#6'&Apply'#9'NumGlyphs'#2#0#7'OnClick'#7#10'ApplyCheck'
+  +#11'ToolButton6'#4'Left'#2'f'#3'Top'#2#2#5'Width'#2#10#7'Caption'#6#11'ToolB'
-  +#8'TabOrder'#2#1#0#0#7'TBitBtn'#9'BtnCancel'#23'AnchorSideRight.Control'#7#8
+  +'utton6'#5'Style'#7#10'tbsDivider'#0#0#11'TToolButton'#6'tbEdit'#4'Left'#2'p'
-  +'BtnApply'#24'AnchorSideBottom.Control'#7#14'FPanelOKCancel'#21'AnchorSideBo'
+  +#3'Top'#2#2#7'Caption'#6#6'tbEdit'#7'Enabled'#8#14'ParentShowHint'#8#8'ShowH'
-  +'ttom.Side'#7#9'asrBottom'#4'Left'#3#202#0#6'Height'#2#25#3'Top'#2#5#5'Width'
+  +'int'#9#7'OnClick'#7#10'ModifyItem'#0#0#0#12'TButtonPanel'#8'BtnPanel'#4'Lef'
-  +#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7
+  +'t'#2#6#6'Height'#2#26#3'Top'#3#6#1#5'Width'#3#177#1#8'TabOrder'#2#2#9'ShowB'
-  +'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'
+  +'evel'#8#0#0#0
-  +#2#0#8'TabOrder'#2#2#0#0#7'TBitBtn'#5'BtnOK'#23'AnchorSideRight.Control'#7#9
-  +'BtnCancel'#24'AnchorSideBottom.Control'#7#14'FPanelOKCancel'#21'AnchorSideB'
-  +'ottom.Side'#7#9'asrBottom'#4'Left'#2'y'#6'Height'#2#25#3'Top'#2#5#5'Width'#2
-  +'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Ca'
-  +'ption'#6#3'&OK'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGly'
-  +'phs'#2#0#8'TabOrder'#2#3#0#0#0#8'TToolBar'#7'ToolBar'#6'Height'#2#24#5'Widt'
-  +'h'#3#189#1#8'AutoSize'#9#7'Caption'#6#7'ToolBar'#4'Flat'#9#8'TabOrder'#2#2#0
-  +#11'TToolButton'#5'tbAdd'#4'Left'#2#1#3'Top'#2#2#7'Caption'#6#5'tbAdd'#14'Pa'
-  +'rentShowHint'#8#8'ShowHint'#9#7'OnClick'#7#7'AddItem'#0#0#11'TToolButton'#8
-  +'tbDelete'#4'Left'#2#24#3'Top'#2#2#7'Caption'#6#8'tbDelete'#7'Enabled'#8#14
-  +'ParentShowHint'#8#8'ShowHint'#9#7'OnClick'#7#10'DeleteItem'#0#0#11'TToolBut'
-  +'ton'#11'ToolButton3'#4'Left'#2'/'#3'Top'#2#2#5'Width'#2#9#7'Caption'#6#11'T'
-  +'oolButton3'#5'Style'#7#10'tbsDivider'#0#0#11'TToolButton'#4'tbUp'#4'Left'#2
-  +'8'#3'Top'#2#2#7'Caption'#6#4'tbUp'#7'Enabled'#8#14'ParentShowHint'#8#8'Show'
-  +'Hint'#9#7'OnClick'#7#10'MoveUpItem'#0#0#11'TToolButton'#6'tbDown'#4'Left'#2
-  +'O'#3'Top'#2#2#7'Caption'#6#6'tbDown'#7'Enabled'#8#14'ParentShowHint'#8#8'Sh'
-  +'owHint'#9#7'OnClick'#7#12'MoveDownItem'#0#0#11'TToolButton'#11'ToolButton6'
-  +#4'Left'#2'f'#3'Top'#2#2#5'Width'#2#10#7'Caption'#6#11'ToolButton6'#5'Style'
-  +#7#10'tbsDivider'#0#0#11'TToolButton'#6'tbEdit'#4'Left'#2'p'#3'Top'#2#2#7'Ca'
-  +'ption'#6#6'tbEdit'#7'Enabled'#8#14'ParentShowHint'#8#8'ShowHint'#9#7'OnClic'
-  +'k'#7#10'ModifyItem'#0#0#0#0
 ]);

ideintf/checklistboxeditordlg.pas

@@ -18,20 +18,17 @@ interface
 
 uses
   Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, CheckLst,
-  ExtCtrls, Buttons, ComCtrls, IDEImagesIntf, ObjInspStrConsts;
+  ExtCtrls, Buttons, ComCtrls, ButtonPanel, IDEImagesIntf, ObjInspStrConsts,
+  LCLType;
 
 type
 
   { TCheckListBoxEditorDlg }
 
   TCheckListBoxEditorDlg = class(TForm)
-    BtnApply: TBitBtn;
+    BtnPanel: TButtonPanel;
-    BtnCancel: TBitBtn;
-    BtnHelp: TBitBtn;
-    BtnOK: TBitBtn;
     FCheck: TCheckListBox;
     aCheck: TCheckListBox;
-    FPanelOKCancel: TPanel;
     ToolBar: TToolBar;
     tbAdd: TToolButton;
     tbDelete: TToolButton;
@@ -110,10 +107,14 @@ begin
   tbEdit.ImageIndex := IDEImages.LoadImage(16, 'laz_edit');
 
   Caption := clbCheckListBoxEditor;
-  BtnOK.Caption := oisOk;
+  BtnPanel.OKButton.Caption := oisOk;
-  BtnCancel.Caption := oisCancel;
+  BtnPanel.CancelButton.Caption := oisCancel;
-  BtnHelp.Caption := cActionListEditorHelpCategory;
+  BtnPanel.HelpButton.Caption := cActionListEditorHelpCategory;
-  
+  BtnPanel.CloseButton.Kind := bkCustom;
+  BtnPanel.CloseButton.LoadGlyphFromStock(idButtonYes);
+  BtnPanel.CloseButton.Caption := sccsTrEdtApply;
+  BtnPanel.CloseButton.OnClick := @ApplyCheck;
+
   tbAdd.Hint := clbAdd;
   tbDelete.Hint := clbDeleteHint;
   tbUp.Hint := clbUp;