IDE: Improve layout for Environment - Messages Window. Issue #33437, patch from Phemtik.

git-svn-id: trunk@57535 -

ide/frames/msgwnd_options.lfm

@@ -11,12 +11,12 @@ object MsgWndOptionsFrame: TMsgWndOptionsFrame
   object MWOptionsLabel: TLabel
     AnchorSideLeft.Control = MWOptsLeftBevel
     AnchorSideLeft.Side = asrBottom
-    AnchorSideTop.Control = Notebook1
+    AnchorSideTop.Control = MsgColorGroupBox
     AnchorSideTop.Side = asrBottom
     Left = 70
-    Height = 15
-    Top = 206
-    Width = 93
+    Height = 20
+    Top = 390
+    Width = 110
     BorderSpacing.Left = 10
     BorderSpacing.Top = 6
     BorderSpacing.Right = 10
@@ -30,7 +30,7 @@ object MsgWndOptionsFrame: TMsgWndOptionsFrame
     AnchorSideTop.Side = asrCenter
     Left = 0
     Height = 3
-    Top = 212
+    Top = 399
     Width = 60
   end
   object MWOptsRightBevel: TBevel
@@ -40,10 +40,10 @@ object MsgWndOptionsFrame: TMsgWndOptionsFrame
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 173
+    Left = 190
     Height = 3
-    Top = 212
-    Width = 347
+    Top = 399
+    Width = 330
     Anchors = [akTop, akLeft, akRight]
   end
   object MWShowIconsCheckBox: TCheckBox
@@ -51,250 +51,224 @@ object MsgWndOptionsFrame: TMsgWndOptionsFrame
     AnchorSideTop.Control = MWOptionsLabel
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 24
-    Top = 227
-    Width = 158
+    Height = 32
+    Top = 416
+    Width = 193
     BorderSpacing.Left = 6
     Caption = 'MWShowIconsCheckBox'
     ParentShowHint = False
     ShowHint = True
-    TabOrder = 0
+    TabOrder = 2
   end
   object MWFocusCheckBox: TCheckBox
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = MWAlwaysDrawFocusedCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 24
-    Top = 275
-    Width = 132
+    Height = 32
+    Top = 480
+    Width = 161
     BorderSpacing.Left = 6
     Caption = 'MWFocusCheckBox'
     ParentShowHint = False
     ShowHint = True
-    TabOrder = 1
+    TabOrder = 4
   end
   object MWAlwaysDrawFocusedCheckBox: TCheckBox
     AnchorSideLeft.Control = MWShowIconsCheckBox
     AnchorSideTop.Control = MWShowIconsCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 24
-    Top = 251
-    Width = 212
+    Height = 32
+    Top = 448
+    Width = 255
     Caption = 'MWAlwaysDrawFocusedCheckBox'
     ParentShowHint = False
     ShowHint = True
-    TabOrder = 2
+    TabOrder = 3
   end
   object MWMaxProcsSpinEdit: TSpinEdit
     AnchorSideLeft.Control = MWMaxProcsLabel
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = MWFocusCheckBox
     AnchorSideTop.Side = asrBottom
-    Left = 110
-    Height = 25
-    Top = 299
+    Left = 129
+    Height = 40
+    Top = 512
     Width = 50
     BorderSpacing.Left = 2
-    TabOrder = 3
+    TabOrder = 5
   end
   object MWMaxProcsLabel: TLabel
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = MWMaxProcsSpinEdit
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 15
-    Top = 304
-    Width = 102
+    Height = 20
+    Top = 522
+    Width = 121
     BorderSpacing.Left = 6
     Caption = 'MWMaxProcsLabel'
     ParentColor = False
   end
-  object ToolBar1: TToolBar
+  object MWColorsGroupBox: TGroupBox
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 26
+    Height = 189
     Top = 0
     Width = 520
-    Caption = 'ToolBar1'
-    ShowCaptions = True
-    TabOrder = 4
-    object BtnHeaderColor: TToolButton
-      Left = 1
-      Top = 2
-      AllowAllUp = True
-      Caption = 'BtnHeaderColor'
-      Down = True
-      Grouped = True
-      OnClick = BtnHeaderColorClick
-      Style = tbsCheck
+    Anchors = [akTop, akLeft, akRight]
+    AutoSize = True
+    Caption = 'MWColorsGroupBox'
+    ClientHeight = 168
+    ClientWidth = 518
+    TabOrder = 0
+    object MWColorListBox: TColorListBox
+      AnchorSideLeft.Control = MWColorsGroupBox
+      AnchorSideTop.Control = MWColorsGroupBox
+      AnchorSideRight.Control = MWSpeedSetColorsGroupBox
+      AnchorSideBottom.Control = MWColorBox
+      Left = 6
+      Height = 110
+      Top = 6
+      Width = 330
+      Style = [cbCustomColors]
+      OnGetColors = MWColorListBoxGetColors
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Around = 6
+      ItemHeight = 0
+      OnSelectionChange = MWColorListBoxSelectionChange
+      TabOrder = 0
+      TopIndex = -1
     end
-    object BtnMsgColor: TToolButton
-      Left = 98
-      Top = 2
-      AllowAllUp = True
-      Caption = 'BtnMsgColor'
-      Grouped = True
-      OnClick = BtnMsgColorClick
-      Style = tbsCheck
+    object MWColorBox: TColorBox
+      AnchorSideLeft.Control = MWColorsGroupBox
+      AnchorSideTop.Control = MWColorListBox
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = MWSpeedSetColorsGroupBox
+      AnchorSideBottom.Control = MWColorsGroupBox
+      AnchorSideBottom.Side = asrBottom
+      Left = 6
+      Height = 40
+      Top = 122
+      Width = 330
+      Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeNone, cbIncludeDefault, cbCustomColor, cbPrettyNames, cbCustomColors]
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Around = 6
+      ItemHeight = 20
+      OnChange = MWColorBoxChange
+      TabOrder = 1
+    end
+    object MWSpeedSetColorsGroupBox: TGroupBox
+      Left = 342
+      Height = 156
+      Top = 6
+      Width = 170
+      Align = alRight
+      BorderSpacing.Around = 6
+      Caption = 'MWSpeedSetColorsGroupBox'
+      ChildSizing.Layout = cclLeftToRightThenTopToBottom
+      ChildSizing.ControlsPerLine = 1
+      ClientHeight = 135
+      ClientWidth = 168
+      TabOrder = 2
+      object MWSetEditorColorsButton: TButton
+        AnchorSideLeft.Control = MWSpeedSetColorsGroupBox
+        AnchorSideTop.Control = MWSpeedSetColorsGroupBox
+        Left = 5
+        Height = 40
+        Top = 0
+        Width = 189
+        AutoSize = True
+        BorderSpacing.Left = 6
+        Caption = 'MWSetEditorColorsButton'
+        OnClick = MWSetEditorColorsButtonClick
+        TabOrder = 0
+      end
+      object MWSetDefaultColorsButton: TButton
+        AnchorSideLeft.Control = MWSpeedSetColorsGroupBox
+        AnchorSideTop.Control = MWSetEditorColorsButton
+        AnchorSideTop.Side = asrBottom
+        AnchorSideRight.Side = asrBottom
+        Left = 5
+        Height = 40
+        Top = 46
+        Width = 199
+        AutoSize = True
+        BorderSpacing.Left = 6
+        BorderSpacing.Top = 6
+        BorderSpacing.Right = 6
+        Caption = 'MWSetDefaultColorsButton'
+        OnClick = MWSetDefaultColorsButtonClick
+        TabOrder = 1
+      end
+      object MWSetPastelColorsButton: TButton
+        AnchorSideLeft.Control = MWSpeedSetColorsGroupBox
+        AnchorSideTop.Control = MWSetDefaultColorsButton
+        AnchorSideTop.Side = asrBottom
+        Left = 5
+        Height = 40
+        Top = 92
+        Width = 191
+        AutoSize = True
+        BorderSpacing.Left = 6
+        BorderSpacing.Top = 6
+        Caption = 'MWSetPastelColorsButton'
+        OnClick = MWSetPastelColorsButtonClick
+        TabOrder = 2
+      end
     end
   end
-  object Notebook1: TNotebook
+  object MsgColorGroupBox: TGroupBox
     AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = ToolBar1
+    AnchorSideTop.Control = MWColorsGroupBox
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 174
-    Top = 26
+    Height = 189
+    Top = 195
     Width = 520
-    PageIndex = 0
     Anchors = [akTop, akLeft, akRight]
-    TabOrder = 5
-    TabStop = True
-    object PageHeader: TPage
-      object MWColorsGroupBox: TGroupBox
-        Left = 0
-        Height = 174
-        Top = 0
-        Width = 520
-        Align = alClient
-        Anchors = [akTop, akLeft, akRight]
-        Caption = 'MWColorsGroupBox'
-        ClientHeight = 157
-        ClientWidth = 516
-        TabOrder = 0
-        object MWColorListBox: TColorListBox
-          AnchorSideLeft.Control = MWColorsGroupBox
-          AnchorSideTop.Control = MWColorsGroupBox
-          AnchorSideRight.Control = MWSpeedSetColorsGroupBox
-          AnchorSideBottom.Control = MWColorBox
-          Left = 6
-          Height = 110
-          Top = 6
-          Width = 328
-          Style = [cbCustomColors]
-          OnGetColors = MWColorListBoxGetColors
-          Anchors = [akTop, akLeft, akRight]
-          BorderSpacing.Around = 6
-          ItemHeight = 0
-          OnSelectionChange = MWColorListBoxSelectionChange
-          TabOrder = 0
-          TopIndex = -1
-        end
-        object MWColorBox: TColorBox
-          AnchorSideLeft.Control = MWColorsGroupBox
-          AnchorSideTop.Control = MWColorListBox
-          AnchorSideTop.Side = asrBottom
-          AnchorSideRight.Control = MWSpeedSetColorsGroupBox
-          AnchorSideBottom.Control = MWColorsGroupBox
-          AnchorSideBottom.Side = asrBottom
-          Left = 6
-          Height = 29
-          Top = 122
-          Width = 328
-          Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeNone, cbIncludeDefault, cbCustomColor, cbPrettyNames, cbCustomColors]
-          Anchors = [akTop, akLeft, akRight, akBottom]
-          BorderSpacing.Around = 6
-          ItemHeight = 20
-          OnChange = MWColorBoxChange
-          TabOrder = 1
-        end
-        object MWSpeedSetColorsGroupBox: TGroupBox
-          Left = 340
-          Height = 145
-          Top = 6
-          Width = 170
-          Align = alRight
-          BorderSpacing.Around = 6
-          Caption = 'MWSpeedSetColorsGroupBox'
-          ChildSizing.Layout = cclLeftToRightThenTopToBottom
-          ChildSizing.ControlsPerLine = 1
-          ClientHeight = 128
-          ClientWidth = 166
-          TabOrder = 2
-          object MWSetEditorColorsButton: TButton
-            Left = 0
-            Height = 27
-            Top = 0
-            Width = 166
-            AutoSize = True
-            Caption = 'MWSetEditorColorsButton'
-            OnClick = MWSetEditorColorsButtonClick
-            TabOrder = 0
-          end
-          object MWSetDefaultColorsButton: TButton
-            AnchorSideTop.Side = asrBottom
-            AnchorSideRight.Side = asrBottom
-            Left = 0
-            Height = 27
-            Top = 33
-            Width = 166
-            AutoSize = True
-            BorderSpacing.Top = 6
-            BorderSpacing.Right = 6
-            Caption = 'MWSetDefaultColorsButton'
-            OnClick = MWSetDefaultColorsButtonClick
-            TabOrder = 1
-          end
-          object MWSetPastelColorsButton: TButton
-            Left = 0
-            Height = 27
-            Top = 66
-            Width = 166
-            AutoSize = True
-            BorderSpacing.Top = 6
-            Caption = 'MWSetPastelColorsButton'
-            OnClick = MWSetPastelColorsButtonClick
-            TabOrder = 2
-          end
-        end
-      end
+    AutoSize = True
+    BorderSpacing.Top = 6
+    Caption = 'MsgColorGroupBox'
+    ClientHeight = 168
+    ClientWidth = 518
+    TabOrder = 1
+    object MsgColorListBox: TColorListBox
+      AnchorSideLeft.Control = MsgColorGroupBox
+      AnchorSideTop.Control = MsgColorGroupBox
+      Left = 6
+      Height = 110
+      Top = 6
+      Width = 303
+      Style = [cbCustomColors]
+      OnGetColors = MsgColorListBoxGetColors
+      BorderSpacing.Around = 6
+      ItemHeight = 0
+      OnSelectionChange = MsgColorListBoxSelectionChange
+      TabOrder = 0
     end
-    object PageMsg: TPage
-      object MsgColorGroupBox: TGroupBox
-        Left = 0
-        Height = 174
-        Top = 0
-        Width = 495
-        Align = alClient
-        Caption = 'MsgColorGroupBox'
-        ClientHeight = 157
-        ClientWidth = 491
-        TabOrder = 0
-        object MsgColorListBox: TColorListBox
-          AnchorSideLeft.Control = MsgColorGroupBox
-          AnchorSideTop.Control = MsgColorGroupBox
-          Left = 6
-          Height = 110
-          Top = 6
-          Width = 303
-          Style = [cbCustomColors]
-          OnGetColors = MsgColorListBoxGetColors
-          BorderSpacing.Around = 6
-          ItemHeight = 0
-          OnSelectionChange = MsgColorListBoxSelectionChange
-          TabOrder = 0
-        end
-        object MsgColorBox: TColorBox
-          AnchorSideLeft.Control = MsgColorGroupBox
-          AnchorSideTop.Control = MsgColorListBox
-          AnchorSideTop.Side = asrBottom
-          AnchorSideRight.Control = MsgColorListBox
-          AnchorSideRight.Side = asrBottom
-          Left = 6
-          Height = 24
-          Top = 122
-          Width = 297
-          Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeDefault, cbCustomColor]
-          Anchors = [akTop, akLeft, akRight]
-          BorderSpacing.Around = 6
-          ItemHeight = 16
-          OnChange = MsgColorBoxChange
-          TabOrder = 1
-        end
-      end
+    object MsgColorBox: TColorBox
+      AnchorSideLeft.Control = MsgColorGroupBox
+      AnchorSideTop.Control = MsgColorListBox
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Control = MsgColorListBox
+      AnchorSideRight.Side = asrBottom
+      Left = 6
+      Height = 40
+      Top = 122
+      Width = 297
+      Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeDefault, cbCustomColor]
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Around = 6
+      ItemHeight = 16
+      OnChange = MsgColorBoxChange
+      TabOrder = 1
     end
   end
   object MWShowFPCMsgLinesCompiledCheckBox: TCheckBox
@@ -302,9 +276,9 @@ object MsgWndOptionsFrame: TMsgWndOptionsFrame
     AnchorSideTop.Control = MWMaxProcsSpinEdit
     AnchorSideTop.Side = asrBottom
     Left = 6
-    Height = 24
-    Top = 334
-    Width = 251
+    Height = 32
+    Top = 562
+    Width = 304
     BorderSpacing.Left = 6
     BorderSpacing.Top = 10
     Caption = 'MWShowFPCMsgLinesCompiledCheckBox'

ide/frames/msgwnd_options.pas

@@ -59,14 +59,6 @@ type
     MWSetDefaultColorsButton: TButton;
     MWSetEditorColorsButton: TButton;
     MWSpeedSetColorsGroupBox: TGroupBox;
-    Notebook1: TNotebook;
-    PageHeader: TPage;
-    PageMsg: TPage;
-    ToolBar1: TToolBar;
-    BtnHeaderColor: TToolButton;
-    BtnMsgColor: TToolButton;
-    procedure BtnHeaderColorClick(Sender: TObject);
-    procedure BtnMsgColorClick(Sender: TObject);
     procedure MsgColorBoxChange(Sender: TObject);
     procedure MsgColorListBoxGetColors(Sender: TCustomColorListBox; Items: TStrings);
     procedure MsgColorListBoxSelectionChange(Sender: TObject; User: boolean);
@@ -120,16 +112,6 @@ begin
   MWColorListBox.Colors[i]:=MWColorBox.Selected;
 end;
 
-procedure TMsgWndOptionsFrame.BtnHeaderColorClick(Sender: TObject);
-begin
-  Notebook1.PageIndex := 0;
-end;
-
-procedure TMsgWndOptionsFrame.BtnMsgColorClick(Sender: TObject);
-begin
-  Notebook1.PageIndex := 1;
-end;
-
 procedure TMsgWndOptionsFrame.MsgColorBoxChange(Sender: TObject);
 var
   i: Integer;
@@ -236,10 +218,8 @@ begin
   inherited Create(AOwner);
 
   MWOptionsLabel.Caption:=lisOptions;
-  BtnHeaderColor.Caption := lisHeaderColors;
-  BtnMsgColor.Caption := lisMsgColors;
-  MWColorsGroupBox.Caption:=dlgColors;
-  MsgColorGroupBox.Caption:=dlgColors;
+  MWColorsGroupBox.Caption:= lisHeaderColors;
+  MsgColorGroupBox.Caption:= lisMsgColors;
   MWSpeedSetColorsGroupBox.Caption:=lisSetAllColors;
   MWSetDefaultColorsButton.Caption:=lisLazarusDefault;
   MWSetPastelColorsButton.Caption:=lisPastelColors;
@@ -254,7 +234,6 @@ begin
   MWShowFPCMsgLinesCompiledCheckBox.Caption:=lisShowFPCMessageLinesCompiled;
   MWShowFPCMsgLinesCompiledCheckBox.Hint:=
     lisElevateTheMessagePriorityToAlwaysShowItByDefaultIt;
-  Notebook1.PageIndex := 0;
 end;
 
 function TMsgWndOptionsFrame.GetTitle: String;