EditorOptions: re-layouted color page

git-svn-id: trunk@25763 -

ide/frames/editor_color_options.lfm

@@ -6,123 +6,35 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
   Visible = False
   DesignLeft = 83
   DesignTop = 146
-  object FileExtensionsLabel: TLabel[0]
-    AnchorSideLeft.Control = FileExtensionsComboBox
+  object SetAllAttributesToDefaultButton: TButton[0]
+    AnchorSideLeft.Control = btnExport
     AnchorSideLeft.Side = asrBottom
-    AnchorSideTop.Control = FileExtensionsComboBox
-    AnchorSideTop.Side = asrCenter
-    Left = 206
-    Height = 16
-    Top = 55
-    Width = 102
-    BorderSpacing.Left = 6
-    Caption = 'FileExtensionsLabel'
-    ParentColor = False
-  end
-  object ColorSchemeLabel: TLabel[1]
-    AnchorSideLeft.Control = ColorSchemeComboBox
-    AnchorSideLeft.Side = asrBottom
-    AnchorSideTop.Control = ColorSchemeComboBox
-    AnchorSideTop.Side = asrCenter
-    Left = 206
-    Height = 16
-    Top = 29
-    Width = 100
-    BorderSpacing.Left = 6
-    Caption = 'ColorSchemeLabel'
-    ParentColor = False
-  end
-  object LanguageLabel: TLabel[2]
-    AnchorSideLeft.Control = LanguageComboBox
-    AnchorSideLeft.Side = asrBottom
-    AnchorSideTop.Control = LanguageComboBox
-    AnchorSideTop.Side = asrCenter
-    Left = 206
-    Height = 16
-    Top = 3
-    Width = 81
-    BorderSpacing.Left = 6
-    BorderSpacing.Right = 6
-    Caption = 'LanguageLabel'
-    ParentColor = False
-  end
-  object LanguageComboBox: TComboBox[3]
-    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = Owner
-    Left = 0
-    Height = 23
-    Top = 0
-    Width = 200
-    ItemHeight = 15
-    OnChange = ComboBoxOnChange
-    OnExit = ComboBoxOnExit
-    OnKeyDown = ComboBoxOnKeyDown
-    Style = csDropDownList
-    TabOrder = 0
-  end
-  object ColorSchemeComboBox: TComboBox[4]
-    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = LanguageComboBox
-    AnchorSideTop.Side = asrBottom
-    Left = 0
-    Height = 23
-    Top = 26
-    Width = 200
-    BorderSpacing.Top = 3
-    ItemHeight = 15
-    OnChange = ComboBoxOnChange
-    OnExit = ComboBoxOnExit
-    OnKeyDown = ComboBoxOnKeyDown
-    Style = csDropDownList
-    TabOrder = 1
-  end
-  object FileExtensionsComboBox: TComboBox[5]
-    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = ColorSchemeComboBox
-    AnchorSideTop.Side = asrBottom
-    Left = 0
-    Height = 23
-    Top = 52
-    Width = 200
-    BorderSpacing.Top = 3
-    ItemHeight = 15
-    Items.Strings = (
-      'pp;pas;inc;lpr;lrs;dpr;dpk'
-      'pp;pas;inc;lpr;lrs'
-      'pp;pas;inc'
-    )
-    OnChange = ComboBoxOnChange
-    OnExit = ComboBoxOnExit
-    OnKeyDown = ComboBoxOnKeyDown
-    TabOrder = 2
-  end
-  object SetAllAttributesToDefaultButton: TButton[6]
-    AnchorSideLeft.Control = FileExtensionsLabel
-    AnchorSideLeft.Side = asrBottom
-    AnchorSideTop.Control = FileExtensionsComboBox
+    AnchorSideTop.Control = btnExport
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 328
+    Left = 438
     Height = 25
-    Top = 52
-    Width = 300
-    Anchors = [akTop, akLeft, akRight]
+    Top = 282
+    Width = 196
+    Anchors = [akTop, akRight]
+    AutoSize = True
     BorderSpacing.Left = 20
+    BorderSpacing.Right = 6
     Caption = 'SetAllAttributesToDefaultButton'
     Constraints.MaxWidth = 300
     OnClick = SetAllAttributesToDefaultButtonClick
-    TabOrder = 3
+    TabOrder = 0
   end
-  object pnlElementAttributes: TPanel[7]
+  object pnlElementAttributes: TPanel[1]
     AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = lblAttributeSection
+    AnchorSideTop.Control = pnlTop
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Side = asrBottom
     Left = 0
     Height = 250
-    Top = 97
+    Top = 26
     Width = 640
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
@@ -130,7 +42,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
     ClientHeight = 250
     ClientWidth = 640
     Constraints.MinHeight = 250
-    TabOrder = 4
+    TabOrder = 1
     OnResize = pnlElementAttributesResize
     object ForeGroundLabel: TLabel
       AnchorSideLeft.Control = ColorElementTree
@@ -139,7 +51,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideTop.Side = asrCenter
       Left = 206
       Height = 16
-      Top = 53
+      Top = 69
       Width = 92
       BorderSpacing.Left = 6
       Caption = 'ForeGroundLabel'
@@ -157,11 +69,11 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideBottom.Side = asrBottom
       Left = 457
       Height = 25
-      Top = 219
+      Top = 225
       Width = 177
       Anchors = [akRight, akBottom]
       AutoSize = True
-      BorderSpacing.Around = 6
+      BorderSpacing.Right = 6
       Caption = 'SetAttributeToDefaultButton'
       Constraints.MinHeight = 25
       Constraints.MinWidth = 75
@@ -171,9 +83,10 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
     object ColorElementTree: TTreeView
       AnchorSideLeft.Control = pnlElementAttributes
       AnchorSideTop.Control = pnlElementAttributes
+      AnchorSideBottom.Control = pnlElementAttributes
       AnchorSideBottom.Side = asrBottom
       Left = 0
-      Height = 240
+      Height = 244
       Top = 6
       Width = 200
       Anchors = [akTop, akLeft, akBottom]
@@ -194,10 +107,11 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
     object chkSchemeDefaults: TCheckBox
       AnchorSideLeft.Control = ColorElementTree
       AnchorSideLeft.Side = asrBottom
-      AnchorSideTop.Control = ColorElementTree
+      AnchorSideTop.Control = lblAttributeSection
+      AnchorSideTop.Side = asrBottom
       Left = 206
       Height = 19
-      Top = 6
+      Top = 22
       Width = 124
       Caption = 'chkSchemeDefaults'
       OnChange = GeneralCheckBoxOnChange
@@ -210,7 +124,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideTop.Side = asrBottom
       Left = 206
       Height = 16
-      Top = 31
+      Top = 47
       Width = 118
       BorderSpacing.Top = 6
       Caption = 'lblSelectModifications'
@@ -223,7 +137,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideTop.Side = asrCenter
       Left = 206
       Height = 16
-      Top = 78
+      Top = 94
       Width = 94
       BorderSpacing.Left = 6
       Caption = 'BackGroundLabel'
@@ -237,7 +151,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideTop.Side = asrCenter
       Left = 206
       Height = 19
-      Top = 52
+      Top = 68
       Width = 192
       BorderSpacing.Left = 6
       Caption = 'ForeGroundUseDefaultCheckBox'
@@ -253,7 +167,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideRight.Side = asrBottom
       Left = 404
       Height = 22
-      Top = 50
+      Top = 66
       Width = 200
       DefaultColorColor = clWhite
       Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeDefault, cbCustomColor, cbPrettyNames, cbCustomColors]
@@ -274,7 +188,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideRight.Side = asrBottom
       Left = 404
       Height = 22
-      Top = 75
+      Top = 91
       Width = 200
       DefaultColorColor = clWhite
       Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeDefault, cbCustomColor, cbPrettyNames, cbCustomColors]
@@ -294,7 +208,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideRight.Side = asrBottom
       Left = 206
       Height = 19
-      Top = 77
+      Top = 93
       Width = 194
       Caption = 'BackGroundUseDefaultCheckBox'
       OnChange = GeneralCheckBoxOnChange
@@ -308,7 +222,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideRight.Side = asrBottom
       Left = 404
       Height = 22
-      Top = 100
+      Top = 116
       Width = 200
       DefaultColorColor = clWhite
       Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeDefault, cbCustomColor, cbPrettyNames, cbCustomColors]
@@ -328,7 +242,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideRight.Side = asrBottom
       Left = 206
       Height = 19
-      Top = 102
+      Top = 118
       Width = 191
       BorderSpacing.Left = 6
       Caption = 'FrameColorUseDefaultCheckBox'
@@ -342,7 +256,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideRight.Side = asrBottom
       Left = 404
       Height = 19
-      Top = 125
+      Top = 141
       Width = 129
       AutoSize = True
       BevelOuter = bvNone
@@ -403,7 +317,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideTop.Side = asrBottom
       Left = 206
       Height = 19
-      Top = 125
+      Top = 141
       Width = 145
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
@@ -418,7 +332,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideRight.Side = asrBottom
       Left = 404
       Height = 19
-      Top = 147
+      Top = 163
       Width = 129
       AutoSize = True
       BevelOuter = bvNone
@@ -479,7 +393,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideTop.Side = asrBottom
       Left = 206
       Height = 19
-      Top = 147
+      Top = 163
       Width = 118
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
@@ -494,7 +408,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideRight.Side = asrBottom
       Left = 404
       Height = 19
-      Top = 169
+      Top = 185
       Width = 129
       AutoSize = True
       BevelOuter = bvNone
@@ -555,7 +469,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideTop.Side = asrBottom
       Left = 206
       Height = 19
-      Top = 169
+      Top = 185
       Width = 119
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
@@ -569,24 +483,63 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideTop.Side = asrBottom
       AnchorSideBottom.Control = SetAttributeToDefaultButton
       Left = 206
-      Height = 25
-      Top = 188
+      Height = 21
+      Top = 204
       Width = 50
       Anchors = [akTop, akLeft, akBottom]
       Shape = bsSpacer
     end
+    object lblAttributeSection: TLabel
+      AnchorSideLeft.Control = Bevel1a
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = pnlElementAttributes
+      Left = 276
+      Height = 16
+      Top = 6
+      Width = 108
+      BorderSpacing.Left = 10
+      BorderSpacing.Top = 6
+      Caption = 'lblAttributeSection'
+      Font.Style = [fsBold]
+      ParentColor = False
+      ParentFont = False
+    end
+    object Bevel1a: TBevel
+      AnchorSideLeft.Control = ColorElementTree
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = lblAttributeSection
+      AnchorSideTop.Side = asrCenter
+      AnchorSideRight.Side = asrBottom
+      Left = 206
+      Height = 3
+      Top = 13
+      Width = 60
+    end
+    object Bevel1: TBevel
+      AnchorSideLeft.Control = lblAttributeSection
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = lblAttributeSection
+      AnchorSideTop.Side = asrCenter
+      AnchorSideRight.Side = asrBottom
+      Left = 394
+      Height = 3
+      Top = 13
+      Width = 246
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Left = 10
+    end
   end
-  inline ColorPreview: TSynEdit[8]
+  inline ColorPreview: TSynEdit[2]
     AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = pnlElementAttributes
+    AnchorSideTop.Control = btnExport
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
     Left = 0
-    Height = 104
-    Top = 353
+    Height = 144
+    Top = 313
     Width = 640
     BorderSpacing.Top = 6
     Anchors = [akTop, akLeft, akRight, akBottom]
@@ -596,7 +549,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
     Font.Quality = fqNonAntialiased
     ParentColor = False
     ParentFont = False
-    TabOrder = 5
+    TabOrder = 2
     OnMouseUp = ColorPreviewMouseUp
     BookMarkOptions.Xoffset = 30
     Gutter.Width = 59
@@ -1179,76 +1132,98 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       end
     end
   end
-  object UseSyntaxHighlightCheckBox: TCheckBox[9]
-    AnchorSideLeft.Control = SetAllAttributesToDefaultButton
-    AnchorSideTop.Control = Owner
+  object btnExport: TButton[3]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = pnlElementAttributes
+    AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 328
-    Height = 19
-    Top = 0
-    Width = 175
-    Caption = 'UseSyntaxHighlightCheckBox'
-    OnChange = GeneralCheckBoxOnChange
-    TabOrder = 6
-  end
-  object btnExport: TButton[10]
-    AnchorSideLeft.Control = SetAllAttributesToDefaultButton
-    AnchorSideTop.Control = ColorSchemeComboBox
-    AnchorSideTop.Side = asrCenter
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    Left = 328
+    Left = 0
     Height = 25
-    Top = 25
-    Width = 300
-    Anchors = [akTop, akLeft, akRight]
+    Top = 282
+    Width = 77
+    AutoSize = True
+    BorderSpacing.Top = 6
     Caption = 'btnExport'
     Constraints.MaxWidth = 300
     OnClick = btnExportClick
-    TabOrder = 7
+    TabOrder = 3
   end
-  object Bevel1a: TBevel[11]
-    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = lblAttributeSection
-    AnchorSideTop.Side = asrCenter
-    AnchorSideRight.Side = asrBottom
+  object pnlTop: TPanel[4]
     Left = 0
-    Height = 3
-    Top = 88
-    Width = 60
+    Height = 26
+    Top = 0
+    Width = 640
+    Align = alTop
+    AutoSize = True
+    BevelOuter = bvNone
+    ChildSizing.HorizontalSpacing = 3
+    ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
+    ChildSizing.ShrinkHorizontal = crsHomogenousChildResize
+    ChildSizing.Layout = cclLeftToRightThenTopToBottom
+    ChildSizing.ControlsPerLine = 4
+    ClientHeight = 26
+    ClientWidth = 640
+    Constraints.MaxWidth = 1000
+    ParentShowHint = False
+    ShowHint = True
+    TabOrder = 4
+    object LanguageComboBox: TComboBox
+      Left = 0
+      Height = 23
+      Top = 3
+      Width = 139
+      ItemHeight = 15
+      OnChange = ComboBoxOnChange
+      OnExit = ComboBoxOnExit
+      OnKeyDown = ComboBoxOnKeyDown
+      Style = csDropDownList
+      TabOrder = 0
+    end
+    object ColorSchemeComboBox: TComboBox
+      AnchorSideTop.Side = asrBottom
+      Left = 142
+      Height = 23
+      Top = 3
+      Width = 139
+      BorderSpacing.Top = 3
+      ItemHeight = 15
+      OnChange = ComboBoxOnChange
+      OnExit = ComboBoxOnExit
+      OnKeyDown = ComboBoxOnKeyDown
+      Style = csDropDownList
+      TabOrder = 1
+    end
+    object FileExtensionsComboBox: TComboBox
+      AnchorSideTop.Side = asrBottom
+      Left = 284
+      Height = 23
+      Top = 3
+      Width = 139
+      BorderSpacing.Top = 3
+      ItemHeight = 15
+      Items.Strings = (
+        'pp;pas;inc;lpr;lrs;dpr;dpk'
+        'pp;pas;inc;lpr;lrs'
+        'pp;pas;inc'
+      )
+      OnChange = ComboBoxOnChange
+      OnExit = ComboBoxOnExit
+      OnKeyDown = ComboBoxOnKeyDown
+      TabOrder = 2
+    end
+    object UseSyntaxHighlightCheckBox: TCheckBox
+      AnchorSideRight.Side = asrBottom
+      Left = 426
+      Height = 23
+      Top = 3
+      Width = 214
+      Caption = 'UseSyntaxHighlightCheckBox'
+      OnChange = GeneralCheckBoxOnChange
+      TabOrder = 3
+    end
   end
-  object lblAttributeSection: TLabel[12]
-    AnchorSideLeft.Control = Bevel1a
-    AnchorSideLeft.Side = asrBottom
-    AnchorSideTop.Control = FileExtensionsComboBox
-    AnchorSideTop.Side = asrBottom
-    Left = 70
-    Height = 16
-    Top = 81
-    Width = 108
-    BorderSpacing.Left = 10
-    BorderSpacing.Top = 6
-    Caption = 'lblAttributeSection'
-    Font.Style = [fsBold]
-    ParentColor = False
-    ParentFont = False
-  end
-  object Bevel1: TBevel[13]
-    AnchorSideLeft.Control = lblAttributeSection
-    AnchorSideLeft.Side = asrBottom
-    AnchorSideTop.Control = lblAttributeSection
-    AnchorSideTop.Side = asrCenter
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    Left = 188
-    Height = 3
-    Top = 88
-    Width = 452
-    Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Left = 10
-  end
-  object ExportSaveDialog: TSaveDialog[14]
+  object ExportSaveDialog: TSaveDialog[5]
     Filter = 'xml|*.xml'
     Options = [ofOverwritePrompt, ofPathMustExist, ofEnableSizing, ofViewDetail]
     left = 288

ide/frames/editor_color_options.pas

@@ -48,9 +48,10 @@ type
     BackGroundUseDefaultCheckBox: TCheckBox;
     FrameColorUseDefaultCheckBox: TCheckBox;
     ForegroundColorBox: TColorBox;
+    lblAttributeSection: TLabel;
     lblSelectModifications: TLabel;
     ExportSaveDialog: TSaveDialog;
-    lblAttributeSection: TLabel;
+    pnlTop: TPanel;
     TextBoldCheckBox: TCheckBox;
     TextBoldRadioInvert: TRadioButton;
     TextBoldRadioOff: TRadioButton;
@@ -70,13 +71,10 @@ type
     UseSyntaxHighlightCheckBox: TCheckBox;
     ColorPreview: TSynEdit;
     ColorSchemeComboBox: TComboBox;
-    ColorSchemeLabel: TLabel;
     FileExtensionsComboBox: TComboBox;
-    FileExtensionsLabel: TLabel;
     ForeGroundLabel: TLabel;
     ForeGroundUseDefaultCheckBox: TCheckBox;
     LanguageComboBox: TComboBox;
-    LanguageLabel: TLabel;
     SetAllAttributesToDefaultButton: TButton;
     SetAttributeToDefaultButton: TButton;
     pnlElementAttributes: TPanel;
@@ -1136,8 +1134,6 @@ begin
   FCurHighlightElement := nil;
 
   UseSyntaxHighlightCheckBox.Caption := dlgUseSyntaxHighlight;
-  LanguageLabel.Caption := dlgLang;
-  ColorSchemeLabel.Caption := dlgClrScheme;
 
   ColorSchemeComboBox.Sorted := True;
   with ColorSchemeComboBox do
@@ -1146,8 +1142,11 @@ begin
     Text := ColorSchemeFactory.ColorSchemeGroupAtPos[0].Name;
   end;
 
-  FileExtensionsLabel.Caption := dlgFileExts;
+  bevel2.Height := 1;
 
+  LanguageComboBox.Hint := dlgLang;
+  ColorSchemeComboBox.Hint := dlgClrScheme;
+  FileExtensionsComboBox.hint := dlgFileExts;
   SetAttributeToDefaultButton.Caption := dlgSetElementDefault;
   SetAllAttributesToDefaultButton.Caption := dlgSetAllElementDefault;
   btnExport.Caption := dlgColorExportButton;