From 6238c3906de62db94b29afab83b51a51ca29b886 Mon Sep 17 00:00:00 2001
From: paul <paul@lazarus-ide.org>
Date: Thu, 21 May 2009 03:47:40 +0000
Subject: [PATCH] ide: help options: use object inspector settings for embedded
 grids

git-svn-id: trunk@20085 -
---
 ide/helpoptions.lfm | 32 +++++++++-------
 ide/helpoptions.lrs | 90 +++++++++++++++++++++++----------------------
 ide/helpoptions.pas | 32 ++++++++++------
 3 files changed, 84 insertions(+), 70 deletions(-)

diff --git a/ide/helpoptions.lfm b/ide/helpoptions.lfm
index 66d3f6e5ee..fa265ee7e5 100644
--- a/ide/helpoptions.lfm
+++ b/ide/helpoptions.lfm
@@ -20,17 +20,17 @@ object HelpOptionsDialog: THelpOptionsDialog
     Width = 500
     Align = alClient
     BorderSpacing.Bottom = 6
-    PageIndex = 1
+    PageIndex = 0
     TabOrder = 0
     object GeneralPage: TPage
       Caption = 'GeneralPage'
       ClientWidth = 492
-      ClientHeight = 283
+      ClientHeight = 299
       object FPCDocHTMLLabel: TLabel
         AnchorSideLeft.Control = GeneralPage
         AnchorSideTop.Control = GeneralPage
         Left = 6
-        Height = 18
+        Height = 14
         Top = 6
         Width = 480
         Align = alTop
@@ -45,10 +45,12 @@ object HelpOptionsDialog: THelpOptionsDialog
         AnchorSideRight.Control = FPCDocHTMLBrowseButton
         Left = 6
         Height = 23
-        Top = 30
-        Width = 451
+        Top = 26
+        Width = 457
         Anchors = [akTop, akLeft, akRight]
-        BorderSpacing.Around = 6
+        BorderSpacing.Left = 6
+        BorderSpacing.Top = 6
+        BorderSpacing.Bottom = 6
         TabOrder = 0
         Text = 'FPCDocHTMLEdit'
       end
@@ -59,10 +61,12 @@ object HelpOptionsDialog: THelpOptionsDialog
         AnchorSideRight.Side = asrBottom
         Left = 463
         Height = 23
-        Top = 30
+        Top = 26
         Width = 23
         Anchors = [akTop, akRight]
-        BorderSpacing.Around = 6
+        BorderSpacing.Top = 6
+        BorderSpacing.Right = 6
+        BorderSpacing.Bottom = 6
         Caption = '...'
         OnClick = FPCDocHTMLBrowseButtonClick
         TabOrder = 1
@@ -115,13 +119,13 @@ object HelpOptionsDialog: THelpOptionsDialog
     object DataBasePage: TPage
       Caption = 'DataBasePage'
       ClientWidth = 492
-      ClientHeight = 283
+      ClientHeight = 299
       object DatabasesLabel: TLabel
         AnchorSideTop.Control = DataBasesPropsGroupBox
         Left = 6
-        Height = 18
+        Height = 14
         Top = 6
-        Width = 104
+        Width = 77
         Caption = 'DatabasesLabel'
         ParentColor = False
       end
@@ -132,8 +136,8 @@ object HelpOptionsDialog: THelpOptionsDialog
         AnchorSideBottom.Control = DataBasePage
         AnchorSideBottom.Side = asrBottom
         Left = 6
-        Height = 247
-        Top = 30
+        Height = 267
+        Top = 26
         Width = 152
         Anchors = [akTop, akLeft, akBottom]
         BorderSpacing.Around = 6
@@ -146,7 +150,7 @@ object HelpOptionsDialog: THelpOptionsDialog
         AnchorSideLeft.Control = DatabasesListBox
         AnchorSideLeft.Side = asrBottom
         Left = 164
-        Height = 271
+        Height = 287
         Top = 6
         Width = 322
         Align = alRight
diff --git a/ide/helpoptions.lrs b/ide/helpoptions.lrs
index 7f5979706c..8e43f9948b 100644
--- a/ide/helpoptions.lrs
+++ b/ide/helpoptions.lrs
@@ -8,54 +8,56 @@ LazarusResources.Add('THelpOptionsDialog','FORMDATA',[
   +#244#1#7'OnClose'#7#22'HelpOptionsDialogClose'#8'OnCreate'#7#23'HelpOptionsD'
   +'ialogCreate'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#9
   +'TNotebook'#12'MainNotebook'#4'Left'#2#0#6'Height'#3'E'#1#3'Top'#2#0#5'Width'
-  +#3#244#1#5'Align'#7#8'alClient'#20'BorderSpacing.Bottom'#2#6#9'PageIndex'#2#1
+  +#3#244#1#5'Align'#7#8'alClient'#20'BorderSpacing.Bottom'#2#6#9'PageIndex'#2#0
   +#8'TabOrder'#2#0#0#5'TPage'#11'GeneralPage'#7'Caption'#6#11'GeneralPage'#11
-  +'ClientWidth'#3#236#1#12'ClientHeight'#3#27#1#0#6'TLabel'#15'FPCDocHTMLLabel'
+  +'ClientWidth'#3#236#1#12'ClientHeight'#3'+'#1#0#6'TLabel'#15'FPCDocHTMLLabel'
   +#22'AnchorSideLeft.Control'#7#11'GeneralPage'#21'AnchorSideTop.Control'#7#11
-  +'GeneralPage'#4'Left'#2#6#6'Height'#2#18#3'Top'#2#6#5'Width'#3#224#1#5'Align'
+  +'GeneralPage'#4'Left'#2#6#6'Height'#2#14#3'Top'#2#6#5'Width'#3#224#1#5'Align'
   +#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'FPCDocHTMLLabel'#11
   +'ParentColor'#8#0#0#5'TEdit'#14'FPCDocHTMLEdit'#22'AnchorSideLeft.Control'#7
   +#11'GeneralPage'#21'AnchorSideTop.Control'#7#15'FPCDocHTMLLabel'#18'AnchorSi'
   +'deTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#22'FPCDocHTMLBrows'
-  +'eButton'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#30#5'Width'#3#195#1#7'Anchors'
-  +#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#8'TabOrder'
-  +#2#0#4'Text'#6#14'FPCDocHTMLEdit'#0#0#7'TButton'#22'FPCDocHTMLBrowseButton'
-  +#21'AnchorSideTop.Control'#7#15'FPCDocHTMLLabel'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#23'AnchorSideRight.Control'#7#11'GeneralPage'#20'AnchorSideRight'
-  +'.Side'#7#9'asrBottom'#4'Left'#3#207#1#6'Height'#2#23#3'Top'#2#30#5'Width'#2
-  +#23#7'Anchors'#11#5'akTop'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Capti'
-  +'on'#6#3'...'#7'OnClick'#7#27'FPCDocHTMLBrowseButtonClick'#8'TabOrder'#2#1#0
-  +#0#0#5'TPage'#11'ViewersPage'#7'Caption'#6#11'ViewersPage'#11'ClientWidth'#3
-  +#236#1#12'ClientHeight'#3'+'#1#0#6'TLabel'#12'ViewersLabel'#21'AnchorSideTop'
-  +'.Control'#7#19'ViewerPropsGroupBox'#4'Left'#2#6#6'Height'#2#14#3'Top'#2#6#5
-  +'Width'#2'?'#7'Caption'#6#12'ViewersLabel'#11'ParentColor'#8#0#0#8'TListBox'
-  +#14'ViewersListBox'#22'AnchorSideLeft.Control'#7#11'ViewersPage'#21'AnchorSi'
-  +'deTop.Control'#7#12'ViewersLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#24
-  +'AnchorSideBottom.Control'#7#11'ViewersPage'#21'AnchorSideBottom.Side'#7#9'a'
-  +'srBottom'#4'Left'#2#6#6'Height'#3#11#1#3'Top'#2#26#5'Width'#3#152#0#7'Ancho'
-  +'rs'#11#5'akTop'#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#16'Cli'
-  +'ckOnSelChange'#8#10'ItemHeight'#2#0#17'OnSelectionChange'#7#29'ViewersListB'
-  +'oxSelectionChange'#8'TabOrder'#2#0#0#0#9'TGroupBox'#19'ViewerPropsGroupBox'
-  +#22'AnchorSideLeft.Control'#7#14'ViewersListBox'#19'AnchorSideLeft.Side'#7#9
-  +'asrBottom'#4'Left'#3#164#0#6'Height'#3#31#1#3'Top'#2#6#5'Width'#3'B'#1#5'Al'
-  +'ign'#7#7'alRight'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0
-  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'ViewerPropsGroupBox'#8'TabOrde'
-  +'r'#2#1#0#0#0#5'TPage'#12'DataBasePage'#7'Caption'#6#12'DataBasePage'#11'Cli'
-  +'entWidth'#3#236#1#12'ClientHeight'#3#27#1#0#6'TLabel'#14'DatabasesLabel'#21
-  +'AnchorSideTop.Control'#7#22'DataBasesPropsGroupBox'#4'Left'#2#6#6'Height'#2
-  +#18#3'Top'#2#6#5'Width'#2'h'#7'Caption'#6#14'DatabasesLabel'#11'ParentColor'
-  +#8#0#0#8'TListBox'#16'DatabasesListBox'#22'AnchorSideLeft.Control'#7#12'Data'
-  +'BasePage'#21'AnchorSideTop.Control'#7#14'DatabasesLabel'#18'AnchorSideTop.S'
-  +'ide'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'DataBasePage'#21'Anch'
-  +'orSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#247#0#3'Top'#2#30
-  +#5'Width'#3#152#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#20'BorderSp'
-  +'acing.Around'#2#6#16'ClickOnSelChange'#8#10'ItemHeight'#2#0#17'OnSelectionC'
-  +'hange'#7#31'DatabasesListBoxSelectionChange'#8'TabOrder'#2#0#0#0#9'TGroupBo'
-  +'x'#22'DataBasesPropsGroupBox'#22'AnchorSideLeft.Control'#7#16'DatabasesList'
-  +'Box'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#3#164#0#6'Height'#3#15#1
-  +#3'Top'#2#6#5'Width'#3'B'#1#5'Align'#7#7'alRight'#7'Anchors'#11#5'akTop'#6'a'
-  +'kLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#22
-  +'DataBasesPropsGroupBox'#8'TabOrder'#2#1#0#0#0#0#12'TButtonPanel'#11'ButtonP'
-  +'anel'#4'Left'#2#6#6'Height'#2#26#3'Top'#3'K'#1#5'Width'#3#232#1#8'TabOrder'
-  +#2#1#11'ShowButtons'#11#4'pbOK'#8'pbCancel'#6'pbHelp'#0#9'ShowBevel'#8#0#0#0
+  +'eButton'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#26#5'Width'#3#201#1#7'Anchors'
+  +#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#17'BorderSpac'
+  +'ing.Top'#2#6#20'BorderSpacing.Bottom'#2#6#8'TabOrder'#2#0#4'Text'#6#14'FPCD'
+  +'ocHTMLEdit'#0#0#7'TButton'#22'FPCDocHTMLBrowseButton'#21'AnchorSideTop.Cont'
+  +'rol'#7#15'FPCDocHTMLLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorS'
+  +'ideRight.Control'#7#11'GeneralPage'#20'AnchorSideRight.Side'#7#9'asrBottom'
+  +#4'Left'#3#207#1#6'Height'#2#23#3'Top'#2#26#5'Width'#2#23#7'Anchors'#11#5'ak'
+  +'Top'#7'akRight'#0#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#20
+  +'BorderSpacing.Bottom'#2#6#7'Caption'#6#3'...'#7'OnClick'#7#27'FPCDocHTMLBro'
+  +'wseButtonClick'#8'TabOrder'#2#1#0#0#0#5'TPage'#11'ViewersPage'#7'Caption'#6
+  +#11'ViewersPage'#11'ClientWidth'#3#236#1#12'ClientHeight'#3'+'#1#0#6'TLabel'
+  +#12'ViewersLabel'#21'AnchorSideTop.Control'#7#19'ViewerPropsGroupBox'#4'Left'
+  +#2#6#6'Height'#2#14#3'Top'#2#6#5'Width'#2'?'#7'Caption'#6#12'ViewersLabel'#11
+  +'ParentColor'#8#0#0#8'TListBox'#14'ViewersListBox'#22'AnchorSideLeft.Control'
+  +#7#11'ViewersPage'#21'AnchorSideTop.Control'#7#12'ViewersLabel'#18'AnchorSid'
+  +'eTop.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#11'ViewersPage'#21
+  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#11#1#3'Top'#2
+  +#26#5'Width'#3#152#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#20'Borde'
+  +'rSpacing.Around'#2#6#16'ClickOnSelChange'#8#10'ItemHeight'#2#0#17'OnSelecti'
+  +'onChange'#7#29'ViewersListBoxSelectionChange'#8'TabOrder'#2#0#0#0#9'TGroupB'
+  +'ox'#19'ViewerPropsGroupBox'#22'AnchorSideLeft.Control'#7#14'ViewersListBox'
+  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#3#164#0#6'Height'#3#31#1#3'T'
+  +'op'#2#6#5'Width'#3'B'#1#5'Align'#7#7'alRight'#7'Anchors'#11#5'akTop'#6'akLe'
+  +'ft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'V'
+  +'iewerPropsGroupBox'#8'TabOrder'#2#1#0#0#0#5'TPage'#12'DataBasePage'#7'Capti'
+  +'on'#6#12'DataBasePage'#11'ClientWidth'#3#236#1#12'ClientHeight'#3'+'#1#0#6
+  +'TLabel'#14'DatabasesLabel'#21'AnchorSideTop.Control'#7#22'DataBasesPropsGro'
+  +'upBox'#4'Left'#2#6#6'Height'#2#14#3'Top'#2#6#5'Width'#2'M'#7'Caption'#6#14
+  +'DatabasesLabel'#11'ParentColor'#8#0#0#8'TListBox'#16'DatabasesListBox'#22'A'
+  +'nchorSideLeft.Control'#7#12'DataBasePage'#21'AnchorSideTop.Control'#7#14'Da'
+  +'tabasesLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#24'AnchorSideBottom.Con'
+  +'trol'#7#12'DataBasePage'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2
+  +#6#6'Height'#3#11#1#3'Top'#2#26#5'Width'#3#152#0#7'Anchors'#11#5'akTop'#6'ak'
+  +'Left'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#16'ClickOnSelChange'#8#10
+  +'ItemHeight'#2#0#17'OnSelectionChange'#7#31'DatabasesListBoxSelectionChange'
+  +#8'TabOrder'#2#0#0#0#9'TGroupBox'#22'DataBasesPropsGroupBox'#22'AnchorSideLe'
+  +'ft.Control'#7#16'DatabasesListBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4
+  +'Left'#3#164#0#6'Height'#3#31#1#3'Top'#2#6#5'Width'#3'B'#1#5'Align'#7#7'alRi'
+  +'ght'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpa'
+  +'cing.Around'#2#6#7'Caption'#6#22'DataBasesPropsGroupBox'#8'TabOrder'#2#1#0#0
+  +#0#0#12'TButtonPanel'#11'ButtonPanel'#4'Left'#2#6#6'Height'#2#26#3'Top'#3'K'
+  +#1#5'Width'#3#232#1#8'TabOrder'#2#1#11'ShowButtons'#11#4'pbOK'#8'pbCancel'#6
+  +'pbHelp'#0#9'ShowBevel'#8#0#0#0
 ]);
diff --git a/ide/helpoptions.pas b/ide/helpoptions.pas
index d93433d90a..41ca868d5c 100644
--- a/ide/helpoptions.pas
+++ b/ide/helpoptions.pas
@@ -36,7 +36,7 @@ interface
 
 uses
   Classes, SysUtils, LCLProc, LResources, Forms, Controls, Graphics, Dialogs,
-  FileUtil, StdCtrls, Buttons, ExtCtrls, IDEContextHelpEdit,
+  FileUtil, StdCtrls, Buttons, ExtCtrls, IDEContextHelpEdit, EnvironmentOpts,
   ObjectInspector, LazHelpIntf, IDEWindowIntf, IDEDialogs, Laz_XMLCfg,
   LazConf, LazarusIDEStrConsts, IDEProcs, IDEOptionDefs, ButtonPanel;
 
@@ -149,22 +149,30 @@ begin
   DataBasesPropsGroupBox.Caption:=lisHlpOptsProperties;
   DatabasesLabel.Caption:=lisHlpOptsDatabases;
 
-  ViewersPropertiesGrid:=TCustomPropertiesGrid.Create(Self);
-  with ViewersPropertiesGrid do begin
-    Name:='ViewersPropertiesGrid';
-    Parent:=ViewerPropsGroupBox;
-    Align:=alClient;
+  ViewersPropertiesGrid := TCustomPropertiesGrid.Create(Self);
+  with ViewersPropertiesGrid do
+  begin
+    Name := 'ViewersPropertiesGrid';
+    Parent := ViewerPropsGroupBox;
+    Align := alClient;
     BorderSpacing.Around := 6;
   end;
-  
-  DatabasesPropertiesGrid:=TCustomPropertiesGrid.Create(Self);
-  with DatabasesPropertiesGrid do begin
-    Name:='DatabasesPropertiesGrid';
-    Parent:=DataBasesPropsGroupBox;
-    Align:=alClient;
+
+  DatabasesPropertiesGrid := TCustomPropertiesGrid.Create(Self);
+  with DatabasesPropertiesGrid do
+  begin
+    Name := 'DatabasesPropertiesGrid';
+    Parent := DataBasesPropsGroupBox;
+    Align := alClient;
     BorderSpacing.Around := 6;
   end;
 
+  with EnvironmentOptions.ObjectInspectorOptions do
+  begin
+    AssignTo(ViewersPropertiesGrid);
+    AssignTo(DatabasesPropertiesGrid);
+  end;
+
   FillGeneralPage;
   FillViewersList;
   FillViewerPropGrid;