ide: use button panel in publish project dialog (fixed issue #0013562)

git-svn-id: trunk@19766 -

ide/publishprojectdlg.lfm

@@ -220,80 +220,12 @@ object PublishProjectDialog: TPublishProjectDialog
       Text = 'ExcludeFilterCombobox'
     end
   end
-  object BtnPanel: TPanel
+  object ButtonPanel1: TButtonPanel
-    Left = 0
+    Left = 6
-    Height = 38
+    Height = 26
-    Top = 493
+    Top = 499
-    Width = 484
+    Width = 472
-    Align = alBottom
-    AutoSize = True
-    BevelOuter = bvNone
-    ClientHeight = 38
-    ClientWidth = 484
     TabOrder = 5
-    object CancelButton: TBitBtn
+    ShowBevel = False
-      AnchorSideRight.Side = asrBottom
-      AnchorSideBottom.Side = asrBottom
-      Left = 401
-      Height = 26
-      Top = 6
-      Width = 77
-      Align = alRight
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Cancel = True
-      Caption = 'Cancel'
-      Kind = bkCancel
-      ModalResult = 2
-      NumGlyphs = 0
-      TabOrder = 0
-    end
-    object OkButton: TBitBtn
-      AnchorSideBottom.Side = asrBottom
-      Left = 336
-      Height = 26
-      Top = 6
-      Width = 59
-      Align = alRight
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Caption = '&OK'
-      Default = True
-      Kind = bkOK
-      ModalResult = 1
-      NumGlyphs = 0
-      OnClick = OkButtonCLICK
-      TabOrder = 1
-    end
-    object SaveSettingsButton: TBitBtn
-      AnchorSideRight.Control = OkButton
-      AnchorSideBottom.Control = BtnPanel
-      AnchorSideBottom.Side = asrBottom
-      Left = 239
-      Height = 23
-      Top = 9
-      Width = 91
-      Anchors = [akRight, akBottom]
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Caption = 'Save settings'
-      NumGlyphs = 0
-      OnClick = SaveSettingsButtonCLICK
-      TabOrder = 2
-    end
-    object HelpButton: TBitBtn
-      Left = 6
-      Height = 26
-      Top = 6
-      Width = 66
-      Align = alLeft
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Caption = '&Help'
-      Kind = bkHelp
-      NumGlyphs = 0
-      OnClick = HelpButtonClick
-      TabOrder = 3
-    end
   end
 end

ide/publishprojectdlg.lrs

@@ -62,25 +62,7 @@ LazarusResources.Add('TPublishProjectDialog','FORMDATA',[
   +#2#1#0#0#9'TComboBox'#21'ExcludeFilterCombobox'#4'Left'#2#6#6'Height'#2#21#3
   +'Top'#2'!'#5'Width'#3#190#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#12
   +'AutoComplete'#8#10'ItemHeight'#2#13#9'ItemWidth'#2#0#8'TabOrder'#2#2#4'Text'
-  +#6#21'ExcludeFilterCombobox'#0#0#0#6'TPanel'#8'BtnPanel'#4'Left'#2#0#6'Heigh'
+  +#6#21'ExcludeFilterCombobox'#0#0#0#12'TButtonPanel'#12'ButtonPanel1'#4'Left'
-  +'t'#2'&'#3'Top'#3#237#1#5'Width'#3#228#1#5'Align'#7#8'alBottom'#8'AutoSize'#9
+  +#2#6#6'Height'#2#26#3'Top'#3#243#1#5'Width'#3#216#1#8'TabOrder'#2#5#9'ShowBe'
-  +#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'&'#11'ClientWidth'#3#228#1#8
+  +'vel'#8#0#0#0
-  ,'TabOrder'#2#5#0#7'TBitBtn'#12'CancelButton'#20'AnchorSideRight.Side'#7#9'as'
-  +'rBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#145#1#6'Height'
-  +#2#26#3'Top'#2#6#5'Width'#2'M'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'Border'
-  +'Spacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'
-  +#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'#8'OkBut'
-  +'ton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'P'#1#6'Height'#2#26
-  +#3'Top'#2#6#5'Width'#2';'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpaci'
-  +'ng.Around'#2#6#7'Caption'#6#3'&OK'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalR'
-  +'esult'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7#13'OkButtonCLICK'#8'TabOrder'#2#1#0
-  +#0#7'TBitBtn'#18'SaveSettingsButton'#23'AnchorSideRight.Control'#7#8'OkButto'
-  +'n'#24'AnchorSideBottom.Control'#7#8'BtnPanel'#21'AnchorSideBottom.Side'#7#9
-  +'asrBottom'#4'Left'#3#239#0#6'Height'#2#23#3'Top'#2#9#5'Width'#2'['#7'Anchor'
-  +'s'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#13'Save settings'#9'NumGlyphs'#2#0#7'OnClick'#7#23'SaveSettingsB'
-  +'uttonCLICK'#8'TabOrder'#2#2#0#0#7'TBitBtn'#10'HelpButton'#4'Left'#2#6#6'Hei'
-  +'ght'#2#26#3'Top'#2#6#5'Width'#2'B'#5'Align'#7#6'alLeft'#8'AutoSize'#9#20'Bo'
-  +'rderSpacing.Around'#2#6#7'Caption'#6#5'&Help'#4'Kind'#7#6'bkHelp'#9'NumGlyp'
-  +'hs'#2#0#7'OnClick'#7#15'HelpButtonClick'#8'TabOrder'#2#3#0#0#0#0
 ]);

ide/publishprojectdlg.pas

@@ -41,15 +41,13 @@ uses
   StdCtrls, Dialogs,
   IDEWindowIntf,
   ProjectDefs, PackageDefs, PublishModule, IDEOptionDefs, InputHistory,
-  LazarusIDEStrConsts, ExtCtrls, IDEContextHelpEdit;
+  LazarusIDEStrConsts, ExtCtrls, IDEContextHelpEdit, ButtonPanel;
 
 type
   { TPublishProjectDialog }
 
   TPublishProjectDialog = class(TForm)
-    HelpButton: TBitBtn;
+    ButtonPanel1: TButtonPanel;
-    OkButton: TBitBtn;
-    CancelButton: TBitBtn;
     DestDirGroupBox: TGroupBox;
     DestDirComboBox: TComboBox;
     BrowseDestDirBitBtn: TBitBtn;
@@ -61,8 +59,6 @@ type
 
     IncludeFilterCombobox: TComboBox;
     IncFilterSimpleSyntaxCheckbox: TCheckBox;
-    BtnPanel: TPanel;
-    SaveSettingsButton: TBitBtn;
     UseIncludeFilterCheckbox: TCheckBox;
     IncludeFilterGroupbox: TGroupBox;
 
@@ -170,10 +166,18 @@ begin
                                         lisSaveEditorInfoOfNonProjectFiles;
   SaveClosedEditorFilesInfoCheckbox.Caption:=lisSaveInfoOfClosedEditorFiles;
 
-  OkButton.Caption:=lisLazBuildOk;
+  ButtonPanel1.OkButton.Caption := lisLazBuildOk;
-  SaveSettingsButton.Caption:=lisSaveSettings;
+  ButtonPanel1.OKButton.OnClick := @OkButtonCLICK;
-  CancelButton.Caption:=dlgCancel;
+
-  SaveSettingsButton.LoadGlyphFromLazarusResource('menu_save');
+  ButtonPanel1.CancelButton.Caption := dlgCancel;
+
+  ButtonPanel1.CloseButton.Caption := lisSaveSettings;
+  ButtonPanel1.CloseButton.ModalResult := mrNone;
+  ButtonPanel1.CloseButton.Kind := bkCustom;
+  ButtonPanel1.CloseButton.LoadGlyphFromLazarusResource('menu_save');
+  ButtonPanel1.CloseButton.OnClick := @SaveSettingsButtonCLICK;
+
+  ButtonPanel1.HelpButton.OnClick := @HelpButtonClick;
 end;
 
 procedure TPublishProjectDialog.HelpButtonClick(Sender: TObject);