FIX: Different color status bars in Options when using QT version in GTK DE (fixes #1456)

components/KASToolBar/kastoolpanel.pas

@@ -8,11 +8,17 @@ uses
   Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Toolwin;
 
 type
+
+  { TKASToolPanel }
+
   TKASToolPanel = class(TToolWindow)
+  public
+    constructor Create(TheOwner: TComponent); override;
   published
     property Align default alNone;
     property Anchors;
     property AutoSize;
+    property BorderSpacing;
     property ChildSizing;
     property EdgeBorders default [ebTop];
     property EdgeInner;
@@ -30,4 +36,12 @@ begin
   RegisterComponents('KASComponents',[TKASToolPanel]);
 end;
 
+{ TKASToolPanel }
+
+constructor TKASToolPanel.Create(TheOwner: TComponent);
+begin
+  inherited Create(TheOwner);
+  EdgeBorders:= [ebTop];
+end;
+
 end.

src/frames/foptionscustomcolumns.lfm

@@ -1366,31 +1366,27 @@ inherited frmOptionsCustomColumns: TfrmOptionsCustomColumns
         TabOrder = 2
       end
     end
-    object pnlPreviewCont: TPanel
+    object pnlPreviewCont: TKASToolPanel
       Left = 1
       Height = 188
       Top = 368
       Width = 1060
       Align = alClient
-      BevelOuter = bvNone
       ChildSizing.LeftRightSpacing = 8
-      ClientHeight = 188
-      ClientWidth = 1060
-      Color = clInactiveCaption
-      Constraints.MinHeight = 125
-      ParentColor = False
       TabOrder = 4
-      object lblPreviewTop: TLabel
+      object lblPreviewTop: TDividerBevel
         Left = 8
         Height = 15
-        Top = 0
+        Top = 8
         Width = 1044
-        Align = alTop
-        Alignment = taCenter
         Caption = 'Below is a preview. You may move cursor and select files to get immediately an actual look and feel of the various settings.'
-        Font.Color = clHighlight
+        Align = alTop
+        BorderSpacing.Top = 6
+        BorderSpacing.Bottom = 6
+        Font.Style = [fsBold]
         ParentColor = False
         ParentFont = False
+        Style = gsHorLines
       end
       object pnlLeft: TPanel
         Left = 8

src/frames/foptionscustomcolumns.pas

@@ -30,9 +30,9 @@ interface
 uses
   //Lazarus, Free-Pascal, etc.
   ComCtrls, Controls, Classes, SysUtils, StdCtrls, ExtCtrls, Forms, ColorBox,
-  Buttons, Spin, Grids, Menus, Dialogs, LMessages,
+  Buttons, Spin, Grids, Menus, Dialogs, LMessages, DividerBevel,
   //DC
-  uColumns, fOptionsFrame, uColumnsFileView;
+  uColumns, KASToolPanel, fOptionsFrame, uColumnsFileView;
 
 type
 
@@ -116,7 +116,7 @@ type
     lblInactiveCursorColor: TLabel;
     lblInactiveMarkColor: TLabel;
     lblMarkColor: TLabel;
-    lblPreviewTop: TLabel;
+    lblPreviewTop: TDividerBevel;
     lblWorkingColumn: TLabel;
     miAddColumn: TMenuItem;
     pnlCommon: TPanel;
@@ -127,7 +127,7 @@ type
     pnlConfigColumns: TPanel;
     pnlGeneralColumnsViewSettings: TPanel;
     pnlLeft: TPanel;
-    pnlPreviewCont: TPanel;
+    pnlPreviewCont: TKASToolPanel;
     pnlRight: TPanel;
     sneFontSize: TSpinEdit;
     spGridArea: TSplitter;

src/frames/foptionsfilepanelscolors.lfm

@@ -409,79 +409,7 @@ inherited frmOptionsFilePanelsColors: TfrmOptionsFilePanelsColors
     OnChange = cbPathInactiveBackChange
     ColorDialog = optColorDialog
   end
-  object pnlPreviewCont: TPanel[27]
-    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = cbCursorBorderColor
-    AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 0
-    Height = 254
-    Top = 267
-    Width = 880
-    Anchors = [akTop, akLeft, akRight, akBottom]
-    BorderSpacing.Top = 11
-    BevelOuter = bvNone
-    ChildSizing.LeftRightSpacing = 8
-    ClientHeight = 254
-    ClientWidth = 880
-    Color = clInactiveCaption
-    Constraints.MinHeight = 250
-    ParentBackground = False
-    ParentColor = False
-    TabOrder = 20
-    TabStop = True
-    object lblPreview: TLabel
-      Left = 8
-      Height = 15
-      Top = 0
-      Width = 864
-      Align = alTop
-      Alignment = taCenter
-      Caption = 'Below is a preview. You may move cursor, select file and get immediately an actual look and feel of the various settings.'
-      Color = clInactiveCaption
-      ParentColor = False
-      Transparent = False
-    end
-    object pnlLeftPreview: TPanel
-      Left = 8
-      Height = 231
-      Top = 15
-      Width = 439
-      Align = alClient
-      Anchors = []
-      BorderSpacing.Bottom = 8
-      ParentColor = False
-      TabOrder = 0
-      TabStop = True
-      OnEnter = pnlLeftPreviewEnter
-    end
-    object pnlRightPreview: TPanel
-      Left = 457
-      Height = 231
-      Top = 15
-      Width = 415
-      Align = alRight
-      Anchors = []
-      BorderSpacing.Bottom = 8
-      ParentColor = False
-      TabOrder = 1
-      TabStop = True
-      OnEnter = pnlRightPreviewEnter
-    end
-    object spPanelSplitter: TSplitter
-      Left = 447
-      Height = 239
-      Top = 15
-      Width = 10
-      Align = alRight
-      Anchors = [akRight]
-      ResizeAnchor = akRight
-    end
-  end
-  object cbUseCursorBorder: TCheckBox[28]
+  object cbUseCursorBorder: TCheckBox[27]
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = cbCursorBorderColor
     AnchorSideTop.Side = asrCenter
@@ -495,7 +423,7 @@ inherited frmOptionsFilePanelsColors: TfrmOptionsFilePanelsColors
     OnChange = cbUseCursorBorderChange
     TabOrder = 8
   end
-  object cbCursorBorderColor: TKASColorBoxButton[29]
+  object cbCursorBorderColor: TKASColorBoxButton[28]
     AnchorSideLeft.Control = cbInactiveMarkColor
     AnchorSideTop.Control = cbInactiveMarkColor
     AnchorSideTop.Side = asrBottom
@@ -511,7 +439,7 @@ inherited frmOptionsFilePanelsColors: TfrmOptionsFilePanelsColors
     OnChange = cbColorBoxChange
     ColorDialog = optColorDialog
   end
-  object btnResetToDCDefault: TButton[30]
+  object btnResetToDCDefault: TButton[29]
     AnchorSideTop.Control = cbCursorBorderColor
     AnchorSideRight.Control = cbPathInactiveBack
     AnchorSideRight.Side = asrBottom
@@ -525,7 +453,7 @@ inherited frmOptionsFilePanelsColors: TfrmOptionsFilePanelsColors
     OnClick = btnResetToDCDefaultClick
     TabOrder = 19
   end
-  object cbAllowOverColor: TCheckBox[31]
+  object cbAllowOverColor: TCheckBox[30]
     AnchorSideLeft.Control = cbbUseInactiveSelColor
     AnchorSideTop.Control = cbbUseFrameCursor
     AnchorSideTop.Side = asrCenter
@@ -537,7 +465,7 @@ inherited frmOptionsFilePanelsColors: TfrmOptionsFilePanelsColors
     OnChange = cbbUseInactiveSelColorChange
     TabOrder = 13
   end
-  object lblPathInactiveText: TLabel[32]
+  object lblPathInactiveText: TLabel[31]
     AnchorSideLeft.Control = cbbUseInvertedSelection
     AnchorSideTop.Control = cbPathInactiveText
     AnchorSideTop.Side = asrCenter
@@ -552,7 +480,7 @@ inherited frmOptionsFilePanelsColors: TfrmOptionsFilePanelsColors
     FocusControl = cbPathInactiveText
     ParentColor = False
   end
-  object cbPathInactiveText: TKASColorBoxButton[33]
+  object cbPathInactiveText: TKASColorBoxButton[32]
     AnchorSideLeft.Control = cbbUseInactiveSelColor
     AnchorSideTop.Control = cbInactiveCursorColor
     AnchorSideTop.Side = asrCenter
@@ -567,7 +495,7 @@ inherited frmOptionsFilePanelsColors: TfrmOptionsFilePanelsColors
     OnChange = cbPathInactiveTextChange
     ColorDialog = optColorDialog
   end
-  object cbPathActiveText: TKASColorBoxButton[34]
+  object cbPathActiveText: TKASColorBoxButton[33]
     AnchorSideLeft.Control = cbbUseInactiveSelColor
     AnchorSideTop.Control = cbCursorColor
     AnchorSideTop.Side = asrCenter
@@ -582,7 +510,7 @@ inherited frmOptionsFilePanelsColors: TfrmOptionsFilePanelsColors
     OnChange = cbPathActiveTextChange
     ColorDialog = optColorDialog
   end
-  object lblPathActiveText: TLabel[35]
+  object lblPathActiveText: TLabel[34]
     AnchorSideTop.Control = cbPathActiveText
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = cbPathInactiveText
@@ -596,6 +524,74 @@ inherited frmOptionsFilePanelsColors: TfrmOptionsFilePanelsColors
     FocusControl = cbPathInactiveText
     ParentColor = False
   end
+  object pnlPreviewCont: TKASToolPanel[35]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = cbCursorBorderColor
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 0
+    Height = 259
+    Top = 262
+    Width = 880
+    Anchors = [akTop, akLeft, akRight, akBottom]
+    BorderSpacing.Top = 6
+    ChildSizing.LeftRightSpacing = 8
+    TabOrder = 20
+    object pnlLeftPreview: TPanel
+      Left = 8
+      Height = 222
+      Top = 29
+      Width = 439
+      Align = alClient
+      Anchors = []
+      BorderSpacing.Bottom = 8
+      BevelOuter = bvNone
+      ParentColor = False
+      TabOrder = 0
+      TabStop = True
+      OnEnter = pnlLeftPreviewEnter
+    end
+    object pnlRightPreview: TPanel
+      Left = 457
+      Height = 222
+      Top = 29
+      Width = 415
+      Align = alRight
+      Anchors = []
+      BorderSpacing.Bottom = 8
+      BevelOuter = bvNone
+      ParentColor = False
+      TabOrder = 1
+      TabStop = True
+      OnEnter = pnlRightPreviewEnter
+    end
+    object spPanelSplitter: TSplitter
+      Left = 447
+      Height = 230
+      Top = 29
+      Width = 10
+      Align = alRight
+      Anchors = [akRight]
+      ResizeAnchor = akRight
+    end
+    object lblPreview: TDividerBevel
+      Left = 8
+      Height = 15
+      Top = 8
+      Width = 864
+      Caption = 'Below is a preview. You may move cursor, select file and get immediately an actual look and feel of the various settings.'
+      Align = alTop
+      BorderSpacing.Top = 6
+      BorderSpacing.Bottom = 6
+      Font.Style = [fsBold]
+      ParentColor = False
+      ParentFont = False
+      Style = gsHorLines
+    end
+  end
   object optColorDialog: TColorDialog[36]
     Color = clBlack
     CustomColors.Strings = (

src/frames/foptionsfilepanelscolors.pas

@@ -29,7 +29,7 @@ interface
 uses
   //Lazarus, Free-Pascal, etc.
   Graphics, Classes, SysUtils, ComCtrls, StdCtrls, ColorBox, ExtCtrls, Dialogs,
-  DividerBevel, LMessages, KASComboBox,
+  DividerBevel, LMessages, KASComboBox, KASToolPanel,
 
   //DC
   uColumns, fOptionsFrame, uColumnsFileView, Controls;
@@ -46,6 +46,7 @@ type
     dbOptionsVertical: TDividerBevel;
     lblPathInactiveText: TLabel;
     lblPathActiveText: TLabel;
+    lblPreview: TDividerBevel;
     lblTextColor: TLabel;
     cbTextColor: TKASColorBoxButton;
     lblBackgroundColor: TLabel;
@@ -66,6 +67,9 @@ type
     cbbUseInactiveSelColor: TCheckBox;
     cbbUseFrameCursor: TCheckBox;
     lblInactivePanelBrightness: TLabel;
+    pnlLeftPreview: TPanel;
+    pnlPreviewCont: TKASToolPanel;
+    pnlRightPreview: TPanel;
     spPanelSplitter: TSplitter;
     tbInactivePanelBrightness: TTrackBar;
     dbCurrentPath: TDividerBevel;
@@ -73,10 +77,6 @@ type
     cbPathActiveBack: TKASColorBoxButton;
     lblPathInactiveBack: TLabel;
     cbPathInactiveBack: TKASColorBoxButton;
-    pnlPreviewCont: TPanel;
-    lblPreview: TLabel;
-    pnlLeftPreview: TPanel;
-    pnlRightPreview: TPanel;
     optColorDialog: TColorDialog;
     procedure btnResetToDCDefaultClick(Sender: TObject);
     procedure cbbUseFrameCursorChange(Sender: TObject);