From 1113049583784f70f9eb7a096abf44e549b66ff9 Mon Sep 17 00:00:00 2001
From: paul <paul@lazarus-ide.org>
Date: Thu, 15 Jan 2009 04:48:06 +0000
Subject: [PATCH] ide: trial to fix layout of some frames under non-windows
 platform

git-svn-id: trunk@18296 -
---
 ide/frames/desktop_options.lfm |  86 ++++++-----
 ide/frames/desktop_options.lrs | 161 ++++++++++----------
 ide/frames/oi_options.lfm      | 199 ++++---------------------
 ide/frames/oi_options.lrs      | 264 +++++++++++++--------------------
 ide/lazarus.lpi                |  32 ++--
 5 files changed, 278 insertions(+), 464 deletions(-)

diff --git a/ide/frames/desktop_options.lfm b/ide/frames/desktop_options.lfm
index a498bb0fb3..f31551a4dc 100644
--- a/ide/frames/desktop_options.lfm
+++ b/ide/frames/desktop_options.lfm
@@ -3,22 +3,24 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
   Width = 597
   ClientHeight = 382
   ClientWidth = 597
-  TabOrder = 0
   Visible = False
-  DesignLeft = 88
-  DesignTop = 116
+  DesignLeft = 449
+  DesignTop = 233
   object LanguageGroupBox: TGroupBox[0]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
+    Left = 0
     Height = 51
+    Top = 0
     Width = 597
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
     Caption = 'LanguageGroupBox'
     ClientHeight = 33
     ClientWidth = 593
+    Ctl3D = False
     TabOrder = 0
     object LanguageComboBox: TComboBox
       AnchorSideLeft.Control = LanguageGroupBox
@@ -29,8 +31,11 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
       Top = 6
       Width = 581
       Anchors = [akTop, akLeft, akRight]
+      AutoComplete = False
       BorderSpacing.Around = 6
+      Ctl3D = False
       ItemHeight = 13
+      ItemWidth = 0
       Style = csDropDownList
       TabOrder = 0
     end
@@ -41,14 +46,17 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Height = 112
+    Left = 0
+    Height = 111
     Top = 57
     Width = 597
     Anchors = [akTop, akLeft, akRight]
+    AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'AutoSaveGroupBox'
-    ClientHeight = 94
+    ClientHeight = 93
     ClientWidth = 593
+    Ctl3D = False
     TabOrder = 1
     object AutoSaveIntervalInSecsLabel: TLabel
       AnchorSideLeft.Control = AutoSaveGroupBox
@@ -56,7 +64,7 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
       AnchorSideTop.Side = asrBottom
       Left = 6
       Height = 14
-      Top = 50
+      Top = 46
       Width = 143
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
@@ -68,9 +76,9 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
       AnchorSideLeft.Control = AutoSaveGroupBox
       AnchorSideTop.Control = AutoSaveGroupBox
       Left = 6
-      Height = 19
+      Height = 17
       Top = 6
-      Width = 169
+      Width = 162
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
       Caption = 'AutoSaveEditorFilesCheckBox'
@@ -82,9 +90,9 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
       AnchorSideTop.Control = AutoSaveEditorFilesCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 19
-      Top = 25
-      Width = 154
+      Height = 17
+      Top = 23
+      Width = 147
       BorderSpacing.Left = 6
       Caption = 'AutoSaveProjectCheckBox'
       Enabled = False
@@ -98,11 +106,12 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
       AnchorSideRight.Side = asrBottom
       Left = 6
       Height = 21
-      Top = 64
+      Top = 66
       Width = 581
       Anchors = [akTop, akLeft, akRight]
-      BorderSpacing.Left = 6
-      BorderSpacing.Right = 6
+      AutoComplete = False
+      BorderSpacing.Around = 6
+      Ctl3D = False
       Enabled = False
       ItemHeight = 13
       Items.Strings = (
@@ -111,6 +120,7 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
         '300'
         '120'
       )
+      ItemWidth = 0
       TabOrder = 2
     end
   end
@@ -120,14 +130,17 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Height = 97
-    Top = 175
+    Left = 0
+    Height = 88
+    Top = 174
     Width = 597
     Anchors = [akTop, akLeft, akRight]
+    AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'DesktopFilesGroupBox'
-    ClientHeight = 79
+    ClientHeight = 70
     ClientWidth = 593
+    Ctl3D = False
     TabOrder = 2
     object SaveDesktopSettingsToFileButton: TButton
       AnchorSideLeft.Control = DesktopFilesGroupBox
@@ -135,7 +148,7 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
       AnchorSideRight.Side = asrBottom
       Left = 6
       Height = 23
-      Top = 8
+      Top = 6
       Width = 581
       Anchors = [akTop, akLeft, akRight]
       AutoSize = True
@@ -150,7 +163,7 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
       AnchorSideRight.Side = asrBottom
       Left = 6
       Height = 23
-      Top = 43
+      Top = 41
       Width = 581
       Anchors = [akTop, akLeft, akRight]
       AutoSize = True
@@ -164,9 +177,10 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = DesktopFilesGroupBox
     AnchorSideTop.Side = asrBottom
-    Height = 19
-    Top = 278
-    Width = 222
+    Left = 0
+    Height = 17
+    Top = 268
+    Width = 221
     BorderSpacing.Top = 6
     Caption = 'CheckDiskChangesWithLoadingCheckBox'
     TabOrder = 3
@@ -175,9 +189,10 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = CheckDiskChangesWithLoadingCheckBox
     AnchorSideTop.Side = asrBottom
-    Height = 19
-    Top = 297
-    Width = 228
+    Left = 0
+    Height = 17
+    Top = 285
+    Width = 220
     Caption = 'ShowHintsForComponentPaletteCheckBox'
     TabOrder = 4
   end
@@ -185,9 +200,10 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = ShowHintsForComponentPaletteCheckBox
     AnchorSideTop.Side = asrBottom
-    Height = 19
-    Top = 316
-    Width = 228
+    Left = 0
+    Height = 17
+    Top = 302
+    Width = 223
     Caption = 'ShowHintsForMainSpeedButtonsCheckBox'
     TabOrder = 5
   end
@@ -195,9 +211,10 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = ShowHintsForMainSpeedButtonsCheckBox
     AnchorSideTop.Side = asrBottom
-    Height = 19
-    Top = 335
-    Width = 180
+    Left = 0
+    Height = 17
+    Top = 319
+    Width = 179
     Caption = 'MsgViewDblClickJumpsCheckBox'
     TabOrder = 6
   end
@@ -205,9 +222,10 @@ inherited DesktopOptionsFrame: TDesktopOptionsFrame
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = MsgViewDblClickJumpsCheckBox
     AnchorSideTop.Side = asrBottom
-    Height = 19
-    Top = 354
-    Width = 142
+    Left = 0
+    Height = 17
+    Top = 336
+    Width = 139
     Caption = 'MsgViewFocusCheckBox'
     TabOrder = 7
   end
diff --git a/ide/frames/desktop_options.lrs b/ide/frames/desktop_options.lrs
index 56bef6c767..1bee62d4e0 100644
--- a/ide/frames/desktop_options.lrs
+++ b/ide/frames/desktop_options.lrs
@@ -2,83 +2,86 @@
 
 LazarusResources.Add('TDesktopOptionsFrame','FORMDATA',[
   'TPF0'#241#20'TDesktopOptionsFrame'#19'DesktopOptionsFrame'#6'Height'#3'~'#1#5
-  +'Width'#3'U'#2#12'ClientHeight'#3'~'#1#11'ClientWidth'#3'U'#2#8'TabOrder'#2#0
-  +#7'Visible'#8#10'DesignLeft'#2'X'#9'DesignTop'#2't'#0#242#2#0#9'TGroupBox'#16
-  +'LanguageGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Co'
-  +'ntrol'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight'
-  +'.Side'#7#9'asrBottom'#6'Height'#2'3'#5'Width'#3'U'#2#7'Anchors'#11#5'akTop'
-  +#6'akLeft'#7'akRight'#0#8'AutoSize'#9#7'Caption'#6#16'LanguageGroupBox'#12'C'
-  +'lientHeight'#2'!'#11'ClientWidth'#3'Q'#2#8'TabOrder'#2#0#0#9'TComboBox'#16
-  +'LanguageComboBox'#22'AnchorSideLeft.Control'#7#16'LanguageGroupBox'#23'Anch'
-  +'orSideRight.Control'#7#16'LanguageGroupBox'#20'AnchorSideRight.Side'#7#9'as'
-  +'rBottom'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#6#5'Width'#3'E'#2#7'Anchors'#11
-  +#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#10'ItemHeight'
-  +#2#13#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#0#0#0#0#242#2#1#9'TGroupBo'
-  +'x'#16'AutoSaveGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSide'
-  +'Top.Control'#7#16'LanguageGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23
-  +'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'
-  +#6'Height'#2'p'#3'Top'#2'9'#5'Width'#3'U'#2#7'Anchors'#11#5'akTop'#6'akLeft'
-  +#7'akRight'#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#16'AutoSaveGroupBox'#12
-  +'ClientHeight'#2'^'#11'ClientWidth'#3'Q'#2#8'TabOrder'#2#1#0#6'TLabel'#27'Au'
-  +'toSaveIntervalInSecsLabel'#22'AnchorSideLeft.Control'#7#16'AutoSaveGroupBox'
-  +#21'AnchorSideTop.Control'#7#23'AutoSaveProjectCheckBox'#18'AnchorSideTop.Si'
-  +'de'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#14#3'Top'#2'2'#5'Width'#3#143#0
-  +#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#27'AutoSa'
-  +'veIntervalInSecsLabel'#7'Enabled'#8#11'ParentColor'#8#0#0#9'TCheckBox'#27'A'
-  +'utoSaveEditorFilesCheckBox'#22'AnchorSideLeft.Control'#7#16'AutoSaveGroupBo'
-  +'x'#21'AnchorSideTop.Control'#7#16'AutoSaveGroupBox'#4'Left'#2#6#6'Height'#2
-  +#19#3'Top'#2#6#5'Width'#3#169#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.'
-  +'Top'#2#6#7'Caption'#6#27'AutoSaveEditorFilesCheckBox'#7'Enabled'#8#8'TabOrd'
-  +'er'#2#0#0#0#9'TCheckBox'#23'AutoSaveProjectCheckBox'#22'AnchorSideLeft.Cont'
-  +'rol'#7#16'AutoSaveGroupBox'#21'AnchorSideTop.Control'#7#27'AutoSaveEditorFi'
-  +'lesCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
-  +#19#3'Top'#2#25#5'Width'#3#154#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#23
-  +'AutoSaveProjectCheckBox'#7'Enabled'#8#8'TabOrder'#2#1#0#0#9'TComboBox'#30'A'
-  +'utoSaveIntervalInSecsComboBox'#22'AnchorSideLeft.Control'#7#16'AutoSaveGrou'
-  +'pBox'#21'AnchorSideTop.Control'#7#27'AutoSaveIntervalInSecsLabel'#18'Anchor'
-  +'SideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#16'AutoSaveGroup'
-  +'Box'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#21#3'T'
-  +'op'#2'@'#5'Width'#3'E'#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'B'
-  +'orderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#7'Enabled'#8#10'ItemHeig'
-  +'ht'#2#13#13'Items.Strings'#1#6#4'1200'#6#3'600'#6#3'300'#6#3'120'#0#8'TabOr'
-  +'der'#2#2#0#0#0#242#2#2#9'TGroupBox'#20'DesktopFilesGroupBox'#22'AnchorSideL'
-  +'eft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#16'AutoSaveGroupBox'#18
-  +'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20
-  +'AnchorSideRight.Side'#7#9'asrBottom'#6'Height'#2'a'#3'Top'#3#175#0#5'Width'
-  +#3'U'#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2
-  +#6#7'Caption'#6#20'DesktopFilesGroupBox'#12'ClientHeight'#2'O'#11'ClientWidt'
-  +'h'#3'Q'#2#8'TabOrder'#2#2#0#7'TButton'#31'SaveDesktopSettingsToFileButton'
-  +#22'AnchorSideLeft.Control'#7#20'DesktopFilesGroupBox'#23'AnchorSideRight.Co'
-  +'ntrol'#7#20'DesktopFilesGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
-  +'Left'#2#6#6'Height'#2#23#3'Top'#2#8#5'Width'#3'E'#2#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6
-  +#31'SaveDesktopSettingsToFileButton'#7'OnClick'#7'$SaveDesktopSettingsToFile'
-  +'ButtonClick'#8'TabOrder'#2#0#0#0#7'TButton!LoadDesktopSettingsFromFileButto'
-  +'n'#22'AnchorSideLeft.Control'#7#20'DesktopFilesGroupBox'#23'AnchorSideRight'
-  +'.Control'#7#20'DesktopFilesGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'
-  +#4'Left'#2#6#6'Height'#2#23#3'Top'#2'+'#5'Width'#3'E'#2#7'Anchors'#11#5'akTo'
-  +'p'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Capt'
-  +'ion'#6'!LoadDesktopSettingsFromFileButton'#7'OnClick'#7'&LoadDesktopSetting'
-  +'sFromFileButtonClick'#8'TabOrder'#2#1#0#0#0#242#2#3#9'TCheckBox#CheckDiskCh'
-  +'angesWithLoadingCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSi'
-  +'deTop.Control'#7#20'DesktopFilesGroupBox'#18'AnchorSideTop.Side'#7#9'asrBot'
-  +'tom'#6'Height'#2#19#3'Top'#3#22#1#5'Width'#3#222#0#17'BorderSpacing.Top'#2#6
-  +#7'Caption'#6'#CheckDiskChangesWithLoadingCheckBox'#8'TabOrder'#2#3#0#0#242#2
-  +#4#9'TCheckBox$ShowHintsForComponentPaletteCheckBox'#22'AnchorSideLeft.Contr'
-  ,'ol'#7#5'Owner'#21'AnchorSideTop.Control'#7'#CheckDiskChangesWithLoadingChec'
-  +'kBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#6'Height'#2#19#3'Top'#3')'#1#5
-  +'Width'#3#228#0#7'Caption'#6'$ShowHintsForComponentPaletteCheckBox'#8'TabOrd'
-  +'er'#2#4#0#0#242#2#5#9'TCheckBox$ShowHintsForMainSpeedButtonsCheckBox'#22'An'
-  +'chorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7'$ShowHintsForC'
-  +'omponentPaletteCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#6'Height'#2
-  +#19#3'Top'#3'<'#1#5'Width'#3#228#0#7'Caption'#6'$ShowHintsForMainSpeedButton'
-  +'sCheckBox'#8'TabOrder'#2#5#0#0#242#2#6#9'TCheckBox'#28'MsgViewDblClickJumps'
-  +'CheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7
-  +'$ShowHintsForMainSpeedButtonsCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'
-  +#6'Height'#2#19#3'Top'#3'O'#1#5'Width'#3#180#0#7'Caption'#6#28'MsgViewDblCli'
-  +'ckJumpsCheckBox'#8'TabOrder'#2#6#0#0#242#2#7#9'TCheckBox'#20'MsgViewFocusCh'
-  +'eckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#28
-  +'MsgViewDblClickJumpsCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#6'Heigh'
-  +'t'#2#19#3'Top'#3'b'#1#5'Width'#3#142#0#7'Caption'#6#20'MsgViewFocusCheckBox'
-  +#8'TabOrder'#2#7#0#0#0
+  +'Width'#3'U'#2#12'ClientHeight'#3'~'#1#11'ClientWidth'#3'U'#2#7'Visible'#8#10
+  +'DesignLeft'#3#193#1#9'DesignTop'#3#233#0#0#242#2#0#9'TGroupBox'#16'Language'
+  +'GroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7
+  +#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#4'Left'#2#0#6'Height'#2'3'#3'Top'#2#0#5'Width'#3'U'#2#7'Anchors'
+  +#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#7'Caption'#6#16'LanguageGr'
+  +'oupBox'#12'ClientHeight'#2'!'#11'ClientWidth'#3'Q'#2#5'Ctl3D'#8#8'TabOrder'
+  +#2#0#0#9'TComboBox'#16'LanguageComboBox'#22'AnchorSideLeft.Control'#7#16'Lan'
+  +'guageGroupBox'#23'AnchorSideRight.Control'#7#16'LanguageGroupBox'#20'Anchor'
+  +'SideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#6#5'Widt'
+  +'h'#3'E'#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#12'AutoComplete'#8
+  +#20'BorderSpacing.Around'#2#6#5'Ctl3D'#8#10'ItemHeight'#2#13#9'ItemWidth'#2#0
+  +#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#0#0#0#0#242#2#1#9'TGroupBox'#16
+  +'AutoSaveGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Co'
+  +'ntrol'#7#16'LanguageGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anch'
+  +'orSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'L'
+  +'eft'#2#0#6'Height'#2'o'#3'Top'#2'9'#5'Width'#3'U'#2#7'Anchors'#11#5'akTop'#6
+  +'akLeft'#7'akRight'#0#8'AutoSize'#9#17'BorderSpacing.Top'#2#6#7'Caption'#6#16
+  +'AutoSaveGroupBox'#12'ClientHeight'#2']'#11'ClientWidth'#3'Q'#2#5'Ctl3D'#8#8
+  +'TabOrder'#2#1#0#6'TLabel'#27'AutoSaveIntervalInSecsLabel'#22'AnchorSideLeft'
+  +'.Control'#7#16'AutoSaveGroupBox'#21'AnchorSideTop.Control'#7#23'AutoSavePro'
+  +'jectCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +#14#3'Top'#2'.'#5'Width'#3#143#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing'
+  +'.Top'#2#6#7'Caption'#6#27'AutoSaveIntervalInSecsLabel'#7'Enabled'#8#11'Pare'
+  +'ntColor'#8#0#0#9'TCheckBox'#27'AutoSaveEditorFilesCheckBox'#22'AnchorSideLe'
+  +'ft.Control'#7#16'AutoSaveGroupBox'#21'AnchorSideTop.Control'#7#16'AutoSaveG'
+  +'roupBox'#4'Left'#2#6#6'Height'#2#17#3'Top'#2#6#5'Width'#3#162#0#18'BorderSp'
+  +'acing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#27'AutoSaveEditorFil'
+  +'esCheckBox'#7'Enabled'#8#8'TabOrder'#2#0#0#0#9'TCheckBox'#23'AutoSaveProjec'
+  +'tCheckBox'#22'AnchorSideLeft.Control'#7#16'AutoSaveGroupBox'#21'AnchorSideT'
+  +'op.Control'#7#27'AutoSaveEditorFilesCheckBox'#18'AnchorSideTop.Side'#7#9'as'
+  +'rBottom'#4'Left'#2#6#6'Height'#2#17#3'Top'#2#23#5'Width'#3#147#0#18'BorderS'
+  +'pacing.Left'#2#6#7'Caption'#6#23'AutoSaveProjectCheckBox'#7'Enabled'#8#8'Ta'
+  +'bOrder'#2#1#0#0#9'TComboBox'#30'AutoSaveIntervalInSecsComboBox'#22'AnchorSi'
+  +'deLeft.Control'#7#16'AutoSaveGroupBox'#21'AnchorSideTop.Control'#7#27'AutoS'
+  +'aveIntervalInSecsLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSide'
+  +'Right.Control'#7#16'AutoSaveGroupBox'#20'AnchorSideRight.Side'#7#9'asrBotto'
+  +'m'#4'Left'#2#6#6'Height'#2#21#3'Top'#2'B'#5'Width'#3'E'#2#7'Anchors'#11#5'a'
+  +'kTop'#6'akLeft'#7'akRight'#0#12'AutoComplete'#8#20'BorderSpacing.Around'#2#6
+  +#5'Ctl3D'#8#7'Enabled'#8#10'ItemHeight'#2#13#13'Items.Strings'#1#6#4'1200'#6
+  +#3'600'#6#3'300'#6#3'120'#0#9'ItemWidth'#2#0#8'TabOrder'#2#2#0#0#0#242#2#2#9
+  +'TGroupBox'#20'DesktopFilesGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21
+  +'AnchorSideTop.Control'#7#16'AutoSaveGroupBox'#18'AnchorSideTop.Side'#7#9'as'
+  +'rBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#4'Left'#2#0#6'Height'#2'X'#3'Top'#3#174#0#5'Width'#3'U'#2#7'Anch'
+  +'ors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#17'BorderSpacing.Top'
+  +#2#6#7'Caption'#6#20'DesktopFilesGroupBox'#12'ClientHeight'#2'F'#11'ClientWi'
+  +'dth'#3'Q'#2#5'Ctl3D'#8#8'TabOrder'#2#2#0#7'TButton'#31'SaveDesktopSettingsT'
+  +'oFileButton'#22'AnchorSideLeft.Control'#7#20'DesktopFilesGroupBox'#23'Ancho'
+  +'rSideRight.Control'#7#20'DesktopFilesGroupBox'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#6#5'Width'#3'E'#2#7'Anchors'
+  +#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2
+  +#6#7'Caption'#6#31'SaveDesktopSettingsToFileButton'#7'OnClick'#7'$SaveDeskto'
+  +'pSettingsToFileButtonClick'#8'TabOrder'#2#0#0#0#7'TButton!LoadDesktopSettin'
+  +'gsFromFileButton'#22'AnchorSideLeft.Control'#7#20'DesktopFilesGroupBox'#23
+  +'AnchorSideRight.Control'#7#20'DesktopFilesGroupBox'#20'AnchorSideRight.Side'
+  +#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#2')'#5'Width'#3'E'#2#7'Anc'
+  +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Aro'
+  +'und'#2#6#7'Caption'#6'!LoadDesktopSettingsFromFileButton'#7'OnClick'#7'&Loa'
+  +'dDesktopSettingsFromFileButtonClick'#8'TabOrder'#2#1#0#0#0#242#2#3#9'TCheck'
+  +'Box#CheckDiskChangesWithLoadingCheckBox'#22'AnchorSideLeft.Control'#7#5'Own'
+  +'er'#21'AnchorSideTop.Control'#7#20'DesktopFilesGroupBox'#18'AnchorSideTop.S'
+  +'ide'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#17#3'Top'#3#12#1#5'Width'#3#221
+  ,#0#17'BorderSpacing.Top'#2#6#7'Caption'#6'#CheckDiskChangesWithLoadingCheckB'
+  +'ox'#8'TabOrder'#2#3#0#0#242#2#4#9'TCheckBox$ShowHintsForComponentPaletteChe'
+  +'ckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7'#C'
+  +'heckDiskChangesWithLoadingCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
+  +'Left'#2#0#6'Height'#2#17#3'Top'#3#29#1#5'Width'#3#220#0#7'Caption'#6'$ShowH'
+  +'intsForComponentPaletteCheckBox'#8'TabOrder'#2#4#0#0#242#2#5#9'TCheckBox$Sh'
+  +'owHintsForMainSpeedButtonsCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21
+  +'AnchorSideTop.Control'#7'$ShowHintsForComponentPaletteCheckBox'#18'AnchorSi'
+  +'deTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#17#3'Top'#3'.'#1#5'Width'
+  +#3#223#0#7'Caption'#6'$ShowHintsForMainSpeedButtonsCheckBox'#8'TabOrder'#2#5
+  +#0#0#242#2#6#9'TCheckBox'#28'MsgViewDblClickJumpsCheckBox'#22'AnchorSideLeft'
+  +'.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7'$ShowHintsForMainSpeedButt'
+  +'onsCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2
+  +#17#3'Top'#3'?'#1#5'Width'#3#179#0#7'Caption'#6#28'MsgViewDblClickJumpsCheck'
+  +'Box'#8'TabOrder'#2#6#0#0#242#2#7#9'TCheckBox'#20'MsgViewFocusCheckBox'#22'A'
+  +'nchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#28'MsgViewDbl'
+  +'ClickJumpsCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Hei'
+  +'ght'#2#17#3'Top'#3'P'#1#5'Width'#3#139#0#7'Caption'#6#20'MsgViewFocusCheckB'
+  +'ox'#8'TabOrder'#2#7#0#0#0
 ]);
diff --git a/ide/frames/oi_options.lfm b/ide/frames/oi_options.lfm
index 1ed5d10078..79e42bed45 100644
--- a/ide/frames/oi_options.lfm
+++ b/ide/frames/oi_options.lfm
@@ -3,10 +3,9 @@ inherited OIOptionsFrame: TOIOptionsFrame
   Width = 634
   ClientHeight = 484
   ClientWidth = 634
-  TabOrder = 0
   Visible = False
-  DesignLeft = 1026
-  DesignTop = 324
+  DesignLeft = 403
+  DesignTop = 218
   object ObjectInspectorColorsGroupBox: TGroupBox[0]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
@@ -16,21 +15,12 @@ inherited OIOptionsFrame: TOIOptionsFrame
     Height = 228
     Top = 0
     Width = 226
-    HelpContext = 0
     AutoSize = True
-    BorderSpacing.Left = 0
-    BorderSpacing.Top = 0
-    BorderSpacing.Right = 0
-    BorderSpacing.Bottom = 0
-    BorderSpacing.Around = 0
-    BorderSpacing.CellAlignHorizontal = ccaFill
-    BorderSpacing.CellAlignVertical = ccaFill
     Caption = 'ObjectInspectorColorsGroupBox'
     ChildSizing.LeftRightSpacing = 6
     ChildSizing.TopBottomSpacing = 6
     ChildSizing.HorizontalSpacing = 2
     ChildSizing.VerticalSpacing = 2
-    ChildSizing.ControlsPerLine = 0
     ClientHeight = 210
     ClientWidth = 222
     Ctl3D = False
@@ -42,21 +32,12 @@ inherited OIOptionsFrame: TOIOptionsFrame
       Height = 170
       Top = 6
       Width = 210
-      HelpContext = 0
       Style = [cbCustomColors]
       OnGetColors = ColorsListBoxGetColors
-      BorderSpacing.Left = 0
-      BorderSpacing.Top = 0
-      BorderSpacing.Right = 0
-      BorderSpacing.Bottom = 0
       BorderSpacing.Around = 6
-      BorderSpacing.CellAlignHorizontal = ccaFill
-      BorderSpacing.CellAlignVertical = ccaFill
-      IntegralHeight = False
       ItemHeight = 0
       OnSelectionChange = ColorsListBoxSelectionChange
       TabOrder = 0
-      TopIndex = 0
     end
     object ColorBox: TColorBox
       AnchorSideLeft.Control = ObjectInspectorColorsGroupBox
@@ -68,16 +49,9 @@ inherited OIOptionsFrame: TOIOptionsFrame
       Height = 22
       Top = 182
       Width = 210
-      HelpContext = 0
       Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbCustomColor, cbPrettyNames]
       AutoComplete = False
-      BorderSpacing.Left = 0
-      BorderSpacing.Top = 0
-      BorderSpacing.Right = 0
-      BorderSpacing.Bottom = 0
       BorderSpacing.Around = 6
-      BorderSpacing.CellAlignHorizontal = ccaFill
-      BorderSpacing.CellAlignVertical = ccaFill
       Ctl3D = False
       ItemHeight = 16
       ItemWidth = 0
@@ -92,26 +66,14 @@ inherited OIOptionsFrame: TOIOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 178
+    Height = 164
     Top = 235
     Width = 634
-    HelpContext = 0
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
-    BorderSpacing.Left = 0
     BorderSpacing.Top = 7
-    BorderSpacing.Right = 0
-    BorderSpacing.Bottom = 0
-    BorderSpacing.Around = 0
-    BorderSpacing.CellAlignHorizontal = ccaFill
-    BorderSpacing.CellAlignVertical = ccaFill
     Caption = 'OIOptionsGroupBox'
-    ChildSizing.LeftRightSpacing = 0
-    ChildSizing.TopBottomSpacing = 0
-    ChildSizing.HorizontalSpacing = 0
-    ChildSizing.VerticalSpacing = 0
-    ChildSizing.ControlsPerLine = 0
-    ClientHeight = 160
+    ClientHeight = 146
     ClientWidth = 630
     Ctl3D = False
     TabOrder = 1
@@ -119,147 +81,91 @@ inherited OIOptionsFrame: TOIOptionsFrame
       AnchorSideLeft.Control = OIOptionsGroupBox
       AnchorSideTop.Control = OIOptionsGroupBox
       Left = 6
-      Height = 19
+      Height = 17
       Top = 6
-      Width = 130
-      HelpContext = 0
+      Width = 124
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
-      BorderSpacing.Right = 0
-      BorderSpacing.Bottom = 0
-      BorderSpacing.Around = 0
-      BorderSpacing.CellAlignHorizontal = ccaFill
-      BorderSpacing.CellAlignVertical = ccaFill
       Caption = 'OIShowHintCheckBox'
-      State = cbUnchecked
       TabOrder = 0
-      UseOnChange = False
     end
     object OIAutoShowCheckBox: TCheckBox
       AnchorSideLeft.Control = OIOptionsGroupBox
       AnchorSideTop.Control = OIShowHintCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 19
-      Top = 28
-      Width = 134
-      HelpContext = 0
+      Height = 17
+      Top = 26
+      Width = 127
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
-      BorderSpacing.Right = 0
-      BorderSpacing.Bottom = 0
-      BorderSpacing.Around = 0
-      BorderSpacing.CellAlignHorizontal = ccaFill
-      BorderSpacing.CellAlignVertical = ccaFill
       Caption = 'OIAutoShowCheckBox'
-      State = cbUnchecked
       TabOrder = 1
-      UseOnChange = False
     end
     object OIBoldNonDefaultCheckBox: TCheckBox
       AnchorSideLeft.Control = OIOptionsGroupBox
       AnchorSideTop.Control = OIAutoShowCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 19
-      Top = 50
-      Width = 159
-      HelpContext = 0
+      Height = 17
+      Top = 46
+      Width = 153
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
-      BorderSpacing.Right = 0
-      BorderSpacing.Bottom = 0
-      BorderSpacing.Around = 0
-      BorderSpacing.CellAlignHorizontal = ccaFill
-      BorderSpacing.CellAlignVertical = ccaFill
       Caption = 'OIBoldNonDefaultCheckBox'
-      State = cbUnchecked
       TabOrder = 2
-      UseOnChange = False
     end
     object OIDrawGridLinesCheckBox: TCheckBox
       AnchorSideLeft.Control = OIOptionsGroupBox
       AnchorSideTop.Control = OIBoldNonDefaultCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 19
-      Top = 72
-      Width = 153
-      HelpContext = 0
+      Height = 17
+      Top = 66
+      Width = 147
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
-      BorderSpacing.Right = 0
-      BorderSpacing.Bottom = 0
-      BorderSpacing.Around = 0
-      BorderSpacing.CellAlignHorizontal = ccaFill
-      BorderSpacing.CellAlignVertical = ccaFill
       Caption = 'OIDrawGridLinesCheckBox'
-      State = cbUnchecked
       TabOrder = 3
-      UseOnChange = False
     end
     object OIShowGutterCheckBox: TCheckBox
       AnchorSideLeft.Control = OIOptionsGroupBox
       AnchorSideTop.Control = OIDrawGridLinesCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 19
-      Top = 94
-      Width = 142
-      HelpContext = 0
+      Height = 17
+      Top = 86
+      Width = 134
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
-      BorderSpacing.Right = 0
-      BorderSpacing.Bottom = 0
-      BorderSpacing.Around = 0
-      BorderSpacing.CellAlignHorizontal = ccaFill
-      BorderSpacing.CellAlignVertical = ccaFill
       Caption = 'OIShowGutterCheckBox'
-      State = cbUnchecked
       TabOrder = 4
-      UseOnChange = False
     end
     object OIShowStatusBarCheckBox: TCheckBox
       AnchorSideLeft.Control = OIOptionsGroupBox
       AnchorSideTop.Control = OIShowGutterCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 19
-      Top = 116
-      Width = 158
-      HelpContext = 0
+      Height = 17
+      Top = 106
+      Width = 151
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
-      BorderSpacing.Right = 0
-      BorderSpacing.Bottom = 0
-      BorderSpacing.Around = 0
-      BorderSpacing.CellAlignHorizontal = ccaFill
-      BorderSpacing.CellAlignVertical = ccaFill
       Caption = 'OIShowStatusBarCheckBox'
-      State = cbUnchecked
       TabOrder = 5
-      UseOnChange = False
     end
     object OIShowInfoBoxCheckBox: TCheckBox
       AnchorSideLeft.Control = OIOptionsGroupBox
       AnchorSideTop.Control = OIShowStatusBarCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 19
-      Top = 138
-      Width = 149
-      HelpContext = 0
+      Height = 17
+      Top = 126
+      Width = 141
       BorderSpacing.Left = 3
-      BorderSpacing.Top = 0
-      BorderSpacing.Right = 0
-      BorderSpacing.Bottom = 0
       BorderSpacing.Around = 3
-      BorderSpacing.CellAlignHorizontal = ccaFill
-      BorderSpacing.CellAlignVertical = ccaFill
       Caption = 'OIShowInfoBoxCheckBox'
-      State = cbUnchecked
       TabOrder = 6
-      UseOnChange = False
     end
   end
   object ObjectInspectorSpeedSettingsGroupBox: TGroupBox[2]
@@ -273,21 +179,10 @@ inherited OIOptionsFrame: TOIOptionsFrame
     Height = 166
     Top = 0
     Width = 401
-    HelpContext = 0
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Left = 7
-    BorderSpacing.Top = 0
-    BorderSpacing.Right = 0
     BorderSpacing.Bottom = 7
-    BorderSpacing.Around = 0
-    BorderSpacing.CellAlignHorizontal = ccaFill
-    BorderSpacing.CellAlignVertical = ccaFill
     Caption = 'ObjectInspectorSpeedSettingsGroupBox'
-    ChildSizing.LeftRightSpacing = 0
-    ChildSizing.TopBottomSpacing = 0
-    ChildSizing.HorizontalSpacing = 0
-    ChildSizing.VerticalSpacing = 0
-    ChildSizing.ControlsPerLine = 0
     ClientHeight = 148
     ClientWidth = 397
     Ctl3D = False
@@ -298,16 +193,9 @@ inherited OIOptionsFrame: TOIOptionsFrame
       Left = 6
       Height = 25
       Top = 6
-      Width = 171
-      HelpContext = 0
+      Width = 170
       AutoSize = True
-      BorderSpacing.Left = 0
-      BorderSpacing.Top = 0
-      BorderSpacing.Right = 0
-      BorderSpacing.Bottom = 0
       BorderSpacing.Around = 6
-      BorderSpacing.CellAlignHorizontal = ccaFill
-      BorderSpacing.CellAlignVertical = ccaFill
       Caption = 'BtnUseDefaultLazarusSettings'
       Constraints.MinHeight = 25
       Constraints.MinWidth = 75
@@ -323,17 +211,11 @@ inherited OIOptionsFrame: TOIOptionsFrame
       Left = 6
       Height = 25
       Top = 37
-      Width = 171
-      HelpContext = 0
+      Width = 170
       Anchors = [akTop, akLeft, akRight]
       AutoSize = True
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
-      BorderSpacing.Right = 0
-      BorderSpacing.Bottom = 0
-      BorderSpacing.Around = 0
-      BorderSpacing.CellAlignHorizontal = ccaFill
-      BorderSpacing.CellAlignVertical = ccaFill
       Caption = 'BtnUseDefaultDelphiSettings'
       Constraints.MinHeight = 25
       Constraints.MinWidth = 75
@@ -352,22 +234,10 @@ inherited OIOptionsFrame: TOIOptionsFrame
     Height = 55
     Top = 173
     Width = 401
-    HelpContext = 0
     Anchors = [akLeft, akRight, akBottom]
     AutoSize = True
     BorderSpacing.Left = 7
-    BorderSpacing.Top = 0
-    BorderSpacing.Right = 0
-    BorderSpacing.Bottom = 0
-    BorderSpacing.Around = 0
-    BorderSpacing.CellAlignHorizontal = ccaFill
-    BorderSpacing.CellAlignVertical = ccaFill
     Caption = 'OIMiscGroupBox'
-    ChildSizing.LeftRightSpacing = 0
-    ChildSizing.TopBottomSpacing = 0
-    ChildSizing.HorizontalSpacing = 0
-    ChildSizing.VerticalSpacing = 0
-    ChildSizing.ControlsPerLine = 0
     ClientHeight = 37
     ClientWidth = 397
     Ctl3D = False
@@ -380,15 +250,7 @@ inherited OIOptionsFrame: TOIOptionsFrame
       Height = 14
       Top = 11
       Width = 126
-      HelpContext = 0
-      Alignment = taLeftJustify
-      BorderSpacing.Left = 6
-      BorderSpacing.Top = 0
-      BorderSpacing.Right = 0
-      BorderSpacing.Bottom = 0
-      BorderSpacing.Around = 0
-      BorderSpacing.CellAlignHorizontal = ccaFill
-      BorderSpacing.CellAlignVertical = ccaFill
+      BorderSpacing.Around = 6
       Caption = 'OIDefaultItemHeightLabel'
       ParentColor = False
     end
@@ -400,14 +262,7 @@ inherited OIOptionsFrame: TOIOptionsFrame
       Height = 25
       Top = 6
       Width = 53
-      HelpContext = 0
-      BorderSpacing.Left = 0
-      BorderSpacing.Top = 0
-      BorderSpacing.Right = 0
-      BorderSpacing.Bottom = 0
       BorderSpacing.Around = 6
-      BorderSpacing.CellAlignHorizontal = ccaFill
-      BorderSpacing.CellAlignVertical = ccaFill
       TabOrder = 0
       Value = 1
     end
diff --git a/ide/frames/oi_options.lrs b/ide/frames/oi_options.lrs
index 4d7d6b66a1..38307c8877 100644
--- a/ide/frames/oi_options.lrs
+++ b/ide/frames/oi_options.lrs
@@ -2,167 +2,105 @@
 
 LazarusResources.Add('TOIOptionsFrame','FORMDATA',[
   'TPF0'#241#15'TOIOptionsFrame'#14'OIOptionsFrame'#6'Height'#3#228#1#5'Width'#3
-  +'z'#2#12'ClientHeight'#3#228#1#11'ClientWidth'#3'z'#2#8'TabOrder'#2#0#7'Visi'
-  +'ble'#8#10'DesignLeft'#3#2#4#9'DesignTop'#3'D'#1#0#242#2#0#9'TGroupBox'#29'O'
-  +'bjectInspectorColorsGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anch'
-  +'orSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20'Anc'
-  +'horSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#3#228#0#3'Top'#2#0#5
-  +'Width'#3#226#0#11'HelpContext'#2#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#0
-  +#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bott'
-  +'om'#2#0#20'BorderSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7
-  +'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#29'O'
-  +'bjectInspectorColorsGroupBox'#28'ChildSizing.LeftRightSpacing'#2#6#28'Child'
-  +'Sizing.TopBottomSpacing'#2#6#29'ChildSizing.HorizontalSpacing'#2#2#27'Child'
-  +'Sizing.VerticalSpacing'#2#2#27'ChildSizing.ControlsPerLine'#2#0#12'ClientHe'
-  +'ight'#3#210#0#11'ClientWidth'#3#222#0#5'Ctl3D'#8#8'TabOrder'#2#0#0#13'TColo'
-  +'rListBox'#13'ColorsListBox'#22'AnchorSideLeft.Control'#7#29'ObjectInspector'
-  +'ColorsGroupBox'#21'AnchorSideTop.Control'#7#29'ObjectInspectorColorsGroupBo'
-  +'x'#4'Left'#2#6#6'Height'#3#170#0#3'Top'#2#6#5'Width'#3#210#0#11'HelpContext'
-  +#2#0#5'Style'#11#14'cbCustomColors'#0#11'OnGetColors'#7#22'ColorsListBoxGetC'
-  +'olors'#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19'BorderSpacin'
-  +'g.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#6'!Bor'
-  +'derSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVert'
-  +'ical'#7#7'ccaFill'#14'IntegralHeight'#8#10'ItemHeight'#2#0#17'OnSelectionCh'
-  +'ange'#7#28'ColorsListBoxSelectionChange'#8'TabOrder'#2#0#8'TopIndex'#2#0#0#0
-  +#9'TColorBox'#8'ColorBox'#22'AnchorSideLeft.Control'#7#29'ObjectInspectorCol'
-  +'orsGroupBox'#21'AnchorSideTop.Control'#7#13'ColorsListBox'#18'AnchorSideTop'
-  +'.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#13'ColorsListBox'#20'An'
-  +'chorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#3#182#0
-  +#5'Width'#3#210#0#11'HelpContext'#2#0#5'Style'#11#16'cbStandardColors'#16'cb'
-  +'ExtendedColors'#14'cbSystemColors'#13'cbCustomColor'#13'cbPrettyNames'#0#12
-  +'AutoComplete'#8#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19'Bor'
-  +'derSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'
-  +#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellA'
-  +'lignVertical'#7#7'ccaFill'#5'Ctl3D'#8#10'ItemHeight'#2#16#9'ItemWidth'#2#0#8
-  +'OnChange'#7#14'ColorBoxChange'#8'TabOrder'#2#1#0#0#0#242#2#1#9'TGroupBox'#17
-  +'OIOptionsGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.C'
-  +'ontrol'#7#29'ObjectInspectorColorsGroupBox'#18'AnchorSideTop.Side'#7#9'asrB'
-  +'ottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9
-  +'asrBottom'#4'Left'#2#0#6'Height'#3#178#0#3'Top'#3#235#0#5'Width'#3'z'#2#11
-  +'HelpContext'#2#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9
-  +#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#7#19'BorderSpacing.Right'
-  +#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#0'!BorderSpacin'
-  +'g.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7
-  +'ccaFill'#7'Caption'#6#17'OIOptionsGroupBox'#28'ChildSizing.LeftRightSpacing'
-  +#2#0#28'ChildSizing.TopBottomSpacing'#2#0#29'ChildSizing.HorizontalSpacing'#2
-  +#0#27'ChildSizing.VerticalSpacing'#2#0#27'ChildSizing.ControlsPerLine'#2#0#12
-  +'ClientHeight'#3#160#0#11'ClientWidth'#3'v'#2#5'Ctl3D'#8#8'TabOrder'#2#1#0#9
-  +'TCheckBox'#18'OIShowHintCheckBox'#22'AnchorSideLeft.Control'#7#17'OIOptions'
-  +'GroupBox'#21'AnchorSideTop.Control'#7#17'OIOptionsGroupBox'#4'Left'#2#6#6'H'
-  +'eight'#2#19#3'Top'#2#6#5'Width'#3#130#0#11'HelpContext'#2#0#18'BorderSpacin'
-  +'g.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#0#20'Border'
-  +'Spacing.Bottom'#2#0#20'BorderSpacing.Around'#2#0'!BorderSpacing.CellAlignHo'
-  +'rizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'C'
-  +'aption'#6#18'OIShowHintCheckBox'#5'State'#7#11'cbUnchecked'#8'TabOrder'#2#0
-  +#11'UseOnChange'#8#0#0#9'TCheckBox'#18'OIAutoShowCheckBox'#22'AnchorSideLeft'
-  +'.Control'#7#17'OIOptionsGroupBox'#21'AnchorSideTop.Control'#7#18'OIShowHint'
-  +'CheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3
-  +'Top'#2#28#5'Width'#3#134#0#11'HelpContext'#2#0#18'BorderSpacing.Left'#2#6#17
-  +'BorderSpacing.Top'#2#3#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'
-  +#2#0#20'BorderSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'cc'
-  +'aFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#18'OIA'
-  +'utoShowCheckBox'#5'State'#7#11'cbUnchecked'#8'TabOrder'#2#1#11'UseOnChange'
-  +#8#0#0#9'TCheckBox'#24'OIBoldNonDefaultCheckBox'#22'AnchorSideLeft.Control'#7
-  +#17'OIOptionsGroupBox'#21'AnchorSideTop.Control'#7#18'OIAutoShowCheckBox'#18
-  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'2'#5
-  ,'Width'#3#159#0#11'HelpContext'#2#0#18'BorderSpacing.Left'#2#6#17'BorderSpac'
-  +'ing.Top'#2#3#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'Bo'
-  +'rderSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31
-  +'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#24'OIBoldNonDefa'
-  +'ultCheckBox'#5'State'#7#11'cbUnchecked'#8'TabOrder'#2#2#11'UseOnChange'#8#0
-  +#0#9'TCheckBox'#23'OIDrawGridLinesCheckBox'#22'AnchorSideLeft.Control'#7#17
-  +'OIOptionsGroupBox'#21'AnchorSideTop.Control'#7#24'OIBoldNonDefaultCheckBox'
-  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'H'
-  +#5'Width'#3#153#0#11'HelpContext'#2#0#18'BorderSpacing.Left'#2#6#17'BorderSp'
-  +'acing.Top'#2#3#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20
-  +'BorderSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'
-  +#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#23'OIDrawGrid'
-  +'LinesCheckBox'#5'State'#7#11'cbUnchecked'#8'TabOrder'#2#3#11'UseOnChange'#8
-  +#0#0#9'TCheckBox'#20'OIShowGutterCheckBox'#22'AnchorSideLeft.Control'#7#17'O'
-  +'IOptionsGroupBox'#21'AnchorSideTop.Control'#7#23'OIDrawGridLinesCheckBox'#18
-  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'^'#5
-  +'Width'#3#142#0#11'HelpContext'#2#0#18'BorderSpacing.Left'#2#6#17'BorderSpac'
-  +'ing.Top'#2#3#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'Bo'
-  +'rderSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31
-  +'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#20'OIShowGutterC'
-  +'heckBox'#5'State'#7#11'cbUnchecked'#8'TabOrder'#2#4#11'UseOnChange'#8#0#0#9
-  +'TCheckBox'#23'OIShowStatusBarCheckBox'#22'AnchorSideLeft.Control'#7#17'OIOp'
-  +'tionsGroupBox'#21'AnchorSideTop.Control'#7#20'OIShowGutterCheckBox'#18'Anch'
-  +'orSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2't'#5'Wid'
-  +'th'#3#158#0#11'HelpContext'#2#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing'
-  +'.Top'#2#3#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'Borde'
-  +'rSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'Bo'
-  +'rderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#23'OIShowStatusBar'
-  +'CheckBox'#5'State'#7#11'cbUnchecked'#8'TabOrder'#2#5#11'UseOnChange'#8#0#0#9
-  +'TCheckBox'#21'OIShowInfoBoxCheckBox'#22'AnchorSideLeft.Control'#7#17'OIOpti'
-  +'onsGroupBox'#21'AnchorSideTop.Control'#7#23'OIShowStatusBarCheckBox'#18'Anc'
-  +'horSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#138#0#5
-  +'Width'#3#149#0#11'HelpContext'#2#0#18'BorderSpacing.Left'#2#3#17'BorderSpac'
-  +'ing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'Bo'
-  +'rderSpacing.Around'#2#3'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31
-  +'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#21'OIShowInfoBox'
-  +'CheckBox'#5'State'#7#11'cbUnchecked'#8'TabOrder'#2#6#11'UseOnChange'#8#0#0#0
-  +#242#2#2#9'TGroupBox$ObjectInspectorSpeedSettingsGroupBox'#22'AnchorSideLeft'
-  +'.Control'#7#29'ObjectInspectorColorsGroupBox'#19'AnchorSideLeft.Side'#7#9'a'
-  +'srBottom'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7
-  +#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Contro'
-  +'l'#7#14'OIMiscGroupBox'#4'Left'#3#233#0#6'Height'#3#166#0#3'Top'#2#0#5'Widt'
-  +'h'#3#145#1#11'HelpContext'#2#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8
-  +'akBottom'#0#18'BorderSpacing.Left'#2#7#17'BorderSpacing.Top'#2#0#19'BorderS'
-  +'pacing.Right'#2#0#20'BorderSpacing.Bottom'#2#7#20'BorderSpacing.Around'#2#0
-  +'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlign'
-  +'Vertical'#7#7'ccaFill'#7'Caption'#6'$ObjectInspectorSpeedSettingsGroupBox'
-  +#28'ChildSizing.LeftRightSpacing'#2#0#28'ChildSizing.TopBottomSpacing'#2#0#29
-  +'ChildSizing.HorizontalSpacing'#2#0#27'ChildSizing.VerticalSpacing'#2#0#27'C'
-  +'hildSizing.ControlsPerLine'#2#0#12'ClientHeight'#3#148#0#11'ClientWidth'#3
-  +#141#1#5'Ctl3D'#8#8'TabOrder'#2#2#0#7'TButton'#28'BtnUseDefaultLazarusSettin'
-  +'gs'#22'AnchorSideLeft.Control'#7'$ObjectInspectorSpeedSettingsGroupBox'#21
-  +'AnchorSideTop.Control'#7'$ObjectInspectorSpeedSettingsGroupBox'#4'Left'#2#6
-  +#6'Height'#2#25#3'Top'#2#6#5'Width'#3#171#0#11'HelpContext'#2#0#8'AutoSize'#9
-  +#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'
-  +#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#6'!BorderSpacin'
-  +'g.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7
-  +'ccaFill'#7'Caption'#6#28'BtnUseDefaultLazarusSettings'#21'Constraints.MinHe'
-  +'ight'#2#25#20'Constraints.MinWidth'#2'K'#7'OnClick'#7'!BtnUseDefaultLazarus'
-  +'SettingsClick'#8'TabOrder'#2#0#0#0#7'TButton'#27'BtnUseDefaultDelphiSetting'
-  +'s'#22'AnchorSideLeft.Control'#7'$ObjectInspectorSpeedSettingsGroupBox'#21'A'
-  +'nchorSideTop.Control'#7#28'BtnUseDefaultLazarusSettings'#18'AnchorSideTop.S'
-  +'ide'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#28'BtnUseDefaultLazarusSe'
-  +'ttings'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#25#3
-  ,'Top'#2'%'#5'Width'#3#171#0#11'HelpContext'#2#0#7'Anchors'#11#5'akTop'#6'akL'
-  +'eft'#7'akRight'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#17'BorderSpacing'
-  +'.Top'#2#6#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'Borde'
-  +'rSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'Bo'
-  +'rderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#27'BtnUseDefaultDe'
-  +'lphiSettings'#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#7
-  +'OnClick'#7' BtnUseDefaultDelphiSettingsClick'#8'TabOrder'#2#1#0#0#0#242#2#3
-  +#9'TGroupBox'#14'OIMiscGroupBox'#22'AnchorSideLeft.Control'#7#29'ObjectInspe'
-  +'ctorColorsGroupBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#23'AnchorSideRig'
-  +'ht.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSid'
-  +'eBottom.Control'#7#29'ObjectInspectorColorsGroupBox'#21'AnchorSideBottom.Si'
-  +'de'#7#9'asrBottom'#4'Left'#3#233#0#6'Height'#2'7'#3'Top'#3#173#0#5'Width'#3
-  +#145#1#11'HelpContext'#2#0#7'Anchors'#11#6'akLeft'#7'akRight'#8'akBottom'#0#8
-  +'AutoSize'#9#18'BorderSpacing.Left'#2#7#17'BorderSpacing.Top'#2#0#19'BorderS'
-  +'pacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#0
-  +'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlign'
-  +'Vertical'#7#7'ccaFill'#7'Caption'#6#14'OIMiscGroupBox'#28'ChildSizing.LeftR'
-  +'ightSpacing'#2#0#28'ChildSizing.TopBottomSpacing'#2#0#29'ChildSizing.Horizo'
-  +'ntalSpacing'#2#0#27'ChildSizing.VerticalSpacing'#2#0#27'ChildSizing.Control'
-  +'sPerLine'#2#0#12'ClientHeight'#2'%'#11'ClientWidth'#3#141#1#5'Ctl3D'#8#8'Ta'
-  +'bOrder'#2#3#0#6'TLabel'#24'OIDefaultItemHeightLabel'#22'AnchorSideLeft.Cont'
-  +'rol'#7#14'OIMiscGroupBox'#21'AnchorSideTop.Control'#7#27'OIDefaultItemHeigh'
-  +'tSpinEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#14
-  +#3'Top'#2#11#5'Width'#2'~'#11'HelpContext'#2#0#9'Alignment'#7#13'taLeftJusti'
-  +'fy'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#0#19'BorderSpacing.R'
-  +'ight'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#0'!Border'
-  +'Spacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVertica'
-  +'l'#7#7'ccaFill'#7'Caption'#6#24'OIDefaultItemHeightLabel'#11'ParentColor'#8
-  +#0#0#9'TSpinEdit'#27'OIDefaultItemHeightSpinEdit'#22'AnchorSideLeft.Control'
-  +#7#24'OIDefaultItemHeightLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'An'
-  +'chorSideTop.Control'#7#14'OIMiscGroupBox'#4'Left'#3#138#0#6'Height'#2#25#3
-  +'Top'#2#6#5'Width'#2'5'#11'HelpContext'#2#0#18'BorderSpacing.Left'#2#0#17'Bo'
-  +'rderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2
-  +#0#20'BorderSpacing.Around'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'ccaF'
-  +'ill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#8'TabOrder'#2#0#5'Val'
-  +'ue'#2#1#0#0#0#0
+  +'z'#2#12'ClientHeight'#3#228#1#11'ClientWidth'#3'z'#2#7'Visible'#8#10'Design'
+  +'Left'#3#147#1#9'DesignTop'#3#218#0#0#242#2#0#9'TGroupBox'#29'ObjectInspecto'
+  +'rColorsGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Con'
+  +'trol'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.'
+  +'Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#3#228#0#3'Top'#2#0#5'Width'#3#226
+  +#0#8'AutoSize'#9#7'Caption'#6#29'ObjectInspectorColorsGroupBox'#28'ChildSizi'
+  +'ng.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizin'
+  +'g.HorizontalSpacing'#2#2#27'ChildSizing.VerticalSpacing'#2#2#12'ClientHeigh'
+  +'t'#3#210#0#11'ClientWidth'#3#222#0#5'Ctl3D'#8#8'TabOrder'#2#0#0#13'TColorLi'
+  +'stBox'#13'ColorsListBox'#22'AnchorSideLeft.Control'#7#29'ObjectInspectorCol'
+  +'orsGroupBox'#21'AnchorSideTop.Control'#7#29'ObjectInspectorColorsGroupBox'#4
+  +'Left'#2#6#6'Height'#3#170#0#3'Top'#2#6#5'Width'#3#210#0#5'Style'#11#14'cbCu'
+  +'stomColors'#0#11'OnGetColors'#7#22'ColorsListBoxGetColors'#20'BorderSpacing'
+  +'.Around'#2#6#10'ItemHeight'#2#0#17'OnSelectionChange'#7#28'ColorsListBoxSel'
+  +'ectionChange'#8'TabOrder'#2#0#0#0#9'TColorBox'#8'ColorBox'#22'AnchorSideLef'
+  +'t.Control'#7#29'ObjectInspectorColorsGroupBox'#21'AnchorSideTop.Control'#7
+  +#13'ColorsListBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.'
+  +'Control'#7#13'ColorsListBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'
+  +#2#6#6'Height'#2#22#3'Top'#3#182#0#5'Width'#3#210#0#5'Style'#11#16'cbStandar'
+  +'dColors'#16'cbExtendedColors'#14'cbSystemColors'#13'cbCustomColor'#13'cbPre'
+  +'ttyNames'#0#12'AutoComplete'#8#20'BorderSpacing.Around'#2#6#5'Ctl3D'#8#10'I'
+  +'temHeight'#2#16#9'ItemWidth'#2#0#8'OnChange'#7#14'ColorBoxChange'#8'TabOrde'
+  +'r'#2#1#0#0#0#242#2#1#9'TGroupBox'#17'OIOptionsGroupBox'#22'AnchorSideLeft.C'
+  +'ontrol'#7#5'Owner'#21'AnchorSideTop.Control'#7#29'ObjectInspectorColorsGrou'
+  +'pBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5
+  +'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#3#164#0
+  +#3'Top'#3#235#0#5'Width'#3'z'#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
+  +#8'AutoSize'#9#17'BorderSpacing.Top'#2#7#7'Caption'#6#17'OIOptionsGroupBox'
+  +#12'ClientHeight'#3#146#0#11'ClientWidth'#3'v'#2#5'Ctl3D'#8#8'TabOrder'#2#1#0
+  +#9'TCheckBox'#18'OIShowHintCheckBox'#22'AnchorSideLeft.Control'#7#17'OIOptio'
+  +'nsGroupBox'#21'AnchorSideTop.Control'#7#17'OIOptionsGroupBox'#4'Left'#2#6#6
+  +'Height'#2#17#3'Top'#2#6#5'Width'#2'|'#18'BorderSpacing.Left'#2#6#17'BorderS'
+  +'pacing.Top'#2#6#7'Caption'#6#18'OIShowHintCheckBox'#8'TabOrder'#2#0#0#0#9'T'
+  +'CheckBox'#18'OIAutoShowCheckBox'#22'AnchorSideLeft.Control'#7#17'OIOptionsG'
+  +'roupBox'#21'AnchorSideTop.Control'#7#18'OIShowHintCheckBox'#18'AnchorSideTo'
+  +'p.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#17#3'Top'#2#26#5'Width'#2''
+  +#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#3#7'Caption'#6#18'OIAuto'
+  +'ShowCheckBox'#8'TabOrder'#2#1#0#0#9'TCheckBox'#24'OIBoldNonDefaultCheckBox'
+  +#22'AnchorSideLeft.Control'#7#17'OIOptionsGroupBox'#21'AnchorSideTop.Control'
+  +#7#18'OIAutoShowCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6
+  +'Height'#2#17#3'Top'#2'.'#5'Width'#3#153#0#18'BorderSpacing.Left'#2#6#17'Bor'
+  +'derSpacing.Top'#2#3#7'Caption'#6#24'OIBoldNonDefaultCheckBox'#8'TabOrder'#2
+  +#2#0#0#9'TCheckBox'#23'OIDrawGridLinesCheckBox'#22'AnchorSideLeft.Control'#7
+  +#17'OIOptionsGroupBox'#21'AnchorSideTop.Control'#7#24'OIBoldNonDefaultCheckB'
+  +'ox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#17#3'Top'
+  +#2'B'#5'Width'#3#147#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#3#7
+  +'Caption'#6#23'OIDrawGridLinesCheckBox'#8'TabOrder'#2#3#0#0#9'TCheckBox'#20
+  +'OIShowGutterCheckBox'#22'AnchorSideLeft.Control'#7#17'OIOptionsGroupBox'#21
+  +'AnchorSideTop.Control'#7#23'OIDrawGridLinesCheckBox'#18'AnchorSideTop.Side'
+  +#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#17#3'Top'#2'V'#5'Width'#3#134#0#18'B'
+  +'orderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#3#7'Caption'#6#20'OIShowGutt'
+  +'erCheckBox'#8'TabOrder'#2#4#0#0#9'TCheckBox'#23'OIShowStatusBarCheckBox'#22
+  +'AnchorSideLeft.Control'#7#17'OIOptionsGroupBox'#21'AnchorSideTop.Control'#7
+  +#20'OIShowGutterCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6
+  +'Height'#2#17#3'Top'#2'j'#5'Width'#3#151#0#18'BorderSpacing.Left'#2#6#17'Bor'
+  +'derSpacing.Top'#2#3#7'Caption'#6#23'OIShowStatusBarCheckBox'#8'TabOrder'#2#5
+  +#0#0#9'TCheckBox'#21'OIShowInfoBoxCheckBox'#22'AnchorSideLeft.Control'#7#17
+  +'OIOptionsGroupBox'#21'AnchorSideTop.Control'#7#23'OIShowStatusBarCheckBox'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#17#3'Top'#2'~'
+  +#5'Width'#3#141#0#18'BorderSpacing.Left'#2#3#20'BorderSpacing.Around'#2#3#7
+  +'Caption'#6#21'OIShowInfoBoxCheckBox'#8'TabOrder'#2#6#0#0#0#242#2#2#9'TGroup'
+  +'Box$ObjectInspectorSpeedSettingsGroupBox'#22'AnchorSideLeft.Control'#7#29'O'
+  +'bjectInspectorColorsGroupBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'Anc'
+  ,'horSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20'An'
+  +'chorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#14'OIMisc'
+  +'GroupBox'#4'Left'#3#233#0#6'Height'#3#166#0#3'Top'#2#0#5'Width'#3#145#1#7'A'
+  +'nchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#18'BorderSpacing.Lef'
+  +'t'#2#7#20'BorderSpacing.Bottom'#2#7#7'Caption'#6'$ObjectInspectorSpeedSetti'
+  +'ngsGroupBox'#12'ClientHeight'#3#148#0#11'ClientWidth'#3#141#1#5'Ctl3D'#8#8
+  +'TabOrder'#2#2#0#7'TButton'#28'BtnUseDefaultLazarusSettings'#22'AnchorSideLe'
+  +'ft.Control'#7'$ObjectInspectorSpeedSettingsGroupBox'#21'AnchorSideTop.Contr'
+  +'ol'#7'$ObjectInspectorSpeedSettingsGroupBox'#4'Left'#2#6#6'Height'#2#25#3'T'
+  +'op'#2#6#5'Width'#3#170#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Capti'
+  +'on'#6#28'BtnUseDefaultLazarusSettings'#21'Constraints.MinHeight'#2#25#20'Co'
+  +'nstraints.MinWidth'#2'K'#7'OnClick'#7'!BtnUseDefaultLazarusSettingsClick'#8
+  +'TabOrder'#2#0#0#0#7'TButton'#27'BtnUseDefaultDelphiSettings'#22'AnchorSideL'
+  +'eft.Control'#7'$ObjectInspectorSpeedSettingsGroupBox'#21'AnchorSideTop.Cont'
+  +'rol'#7#28'BtnUseDefaultLazarusSettings'#18'AnchorSideTop.Side'#7#9'asrBotto'
+  +'m'#23'AnchorSideRight.Control'#7#28'BtnUseDefaultLazarusSettings'#20'Anchor'
+  +'SideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#25#3'Top'#2'%'#5'Wid'
+  +'th'#3#170#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#18
+  +'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#27'BtnUseDef'
+  +'aultDelphiSettings'#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'
+  +#2'K'#7'OnClick'#7' BtnUseDefaultDelphiSettingsClick'#8'TabOrder'#2#1#0#0#0
+  +#242#2#3#9'TGroupBox'#14'OIMiscGroupBox'#22'AnchorSideLeft.Control'#7#29'Obj'
+  +'ectInspectorColorsGroupBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#23'Ancho'
+  +'rSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'A'
+  +'nchorSideBottom.Control'#7#29'ObjectInspectorColorsGroupBox'#21'AnchorSideB'
+  +'ottom.Side'#7#9'asrBottom'#4'Left'#3#233#0#6'Height'#2'7'#3'Top'#3#173#0#5
+  +'Width'#3#145#1#7'Anchors'#11#6'akLeft'#7'akRight'#8'akBottom'#0#8'AutoSize'
+  +#9#18'BorderSpacing.Left'#2#7#7'Caption'#6#14'OIMiscGroupBox'#12'ClientHeigh'
+  +'t'#2'%'#11'ClientWidth'#3#141#1#5'Ctl3D'#8#8'TabOrder'#2#3#0#6'TLabel'#24'O'
+  +'IDefaultItemHeightLabel'#22'AnchorSideLeft.Control'#7#14'OIMiscGroupBox'#21
+  +'AnchorSideTop.Control'#7#27'OIDefaultItemHeightSpinEdit'#18'AnchorSideTop.S'
+  +'ide'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#14#3'Top'#2#11#5'Width'#2'~'#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#24'OIDefaultItemHeightLabel'#11'Pare'
+  +'ntColor'#8#0#0#9'TSpinEdit'#27'OIDefaultItemHeightSpinEdit'#22'AnchorSideLe'
+  +'ft.Control'#7#24'OIDefaultItemHeightLabel'#19'AnchorSideLeft.Side'#7#9'asrB'
+  +'ottom'#21'AnchorSideTop.Control'#7#14'OIMiscGroupBox'#4'Left'#3#138#0#6'Hei'
+  +'ght'#2#25#3'Top'#2#6#5'Width'#2'5'#20'BorderSpacing.Around'#2#6#8'TabOrder'
+  +#2#0#5'Value'#2#1#0#0#0#0
 ]);
diff --git a/ide/lazarus.lpi b/ide/lazarus.lpi
index 6405a7c72e..06705a501e 100644
--- a/ide/lazarus.lpi
+++ b/ide/lazarus.lpi
@@ -291,61 +291,61 @@
         <UnitName Value="ComponentList"/>
       </Unit35>
       <Unit36>
-        <Filename Value="frames/options_oi.pas"/>
+        <Filename Value="frames/oi_options.pas"/>
         <ComponentName Value="OIOptionsFrame"/>
         <HasResources Value="True"/>
         <IsPartOfProject Value="True"/>
         <ResourceBaseClass Value="Frame"/>
-        <UnitName Value="options_OI"/>
+        <UnitName Value="OI_options"/>
       </Unit36>
       <Unit37>
-        <Filename Value="frames/options_files.pas"/>
+        <Filename Value="frames/files_options.pas"/>
         <ComponentName Value="FilesOptionsFrame"/>
         <IsPartOfProject Value="True"/>
         <ResourceBaseClass Value="Frame"/>
-        <UnitName Value="options_files"/>
+        <UnitName Value="files_options"/>
       </Unit37>
       <Unit38>
-        <Filename Value="frames/options_desktop.pas"/>
+        <Filename Value="frames/desktop_options.pas"/>
         <ComponentName Value="DesktopOptionsFrame"/>
         <IsPartOfProject Value="True"/>
         <ResourceBaseClass Value="Frame"/>
-        <UnitName Value="options_desktop"/>
+        <UnitName Value="desktop_options"/>
       </Unit38>
       <Unit39>
-        <Filename Value="frames/options_window.pas"/>
+        <Filename Value="frames/window_options.pas"/>
         <ComponentName Value="WindowOptionsFrame"/>
         <IsPartOfProject Value="True"/>
         <ResourceBaseClass Value="Frame"/>
-        <UnitName Value="options_window"/>
+        <UnitName Value="window_options"/>
       </Unit39>
       <Unit40>
-        <Filename Value="frames/options_formed.pas"/>
+        <Filename Value="frames/formed_options.pas"/>
         <ComponentName Value="FormEditorOptionsFrame"/>
         <IsPartOfProject Value="True"/>
         <ResourceBaseClass Value="Frame"/>
-        <UnitName Value="options_formed"/>
+        <UnitName Value="formed_options"/>
       </Unit40>
       <Unit41>
-        <Filename Value="frames/options_backup.pas"/>
+        <Filename Value="frames/backup_options.pas"/>
         <ComponentName Value="BackupOptionsFrame"/>
         <IsPartOfProject Value="True"/>
         <ResourceBaseClass Value="Frame"/>
-        <UnitName Value="options_backup"/>
+        <UnitName Value="backup_options"/>
       </Unit41>
       <Unit42>
-        <Filename Value="frames/options_naming.pas"/>
+        <Filename Value="frames/naming_options.pas"/>
         <ComponentName Value="NamingOptionsFrame"/>
         <IsPartOfProject Value="True"/>
         <ResourceBaseClass Value="Frame"/>
-        <UnitName Value="options_naming"/>
+        <UnitName Value="naming_options"/>
       </Unit42>
       <Unit43>
-        <Filename Value="frames/options_fpdoc.pas"/>
+        <Filename Value="frames/fpdoc_options.pas"/>
         <ComponentName Value="FpDocOptionsFrame"/>
         <IsPartOfProject Value="True"/>
         <ResourceBaseClass Value="Frame"/>
-        <UnitName Value="options_fpdoc"/>
+        <UnitName Value="fpdoc_options"/>
       </Unit43>
       <Unit44>
         <Filename Value="frames/options_editor_general.pas"/>