diff --git a/.gitattributes b/.gitattributes index 9494abe6c2..4848e7ab9d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5349,6 +5349,8 @@ ide/frames/fpdoc_options.pas svneol=native#text/pascal ide/frames/help_general_options.lfm svneol=native#text/plain ide/frames/help_general_options.pas svneol=native#text/plain ide/frames/modematrixctrl.pas svneol=native#text/plain +ide/frames/msgwnd_options.lfm svneol=native#text/plain +ide/frames/msgwnd_options.pas svneol=native#text/plain ide/frames/naming_options.lfm svneol=native#text/plain ide/frames/naming_options.pas svneol=native#text/pascal ide/frames/oi_options.lfm svneol=native#text/plain diff --git a/ide/etmessageframe.pas b/ide/etmessageframe.pas index aacddeec39..9d9ebe1407 100644 --- a/ide/etmessageframe.pas +++ b/ide/etmessageframe.pas @@ -2603,6 +2603,8 @@ function TMessagesCtrl.GetHeaderText(View: TLMsgWndView): string; begin Result:=View.Caption; + if Result='' then + Result:='Messages'; if View.SummaryMsg<>'' then Result+=': '+View.SummaryMsg; if mcoShowStats in Options then begin diff --git a/ide/frames/msgwnd_options.lfm b/ide/frames/msgwnd_options.lfm new file mode 100644 index 0000000000..ac59fb8dc0 --- /dev/null +++ b/ide/frames/msgwnd_options.lfm @@ -0,0 +1,54 @@ +object MsgWndOptionsFrame: TMsgWndOptionsFrame + Left = 0 + Height = 331 + Top = 0 + Width = 470 + ClientHeight = 331 + ClientWidth = 470 + TabOrder = 0 + DesignLeft = 386 + DesignTop = 221 + object MWColorsGroupBox: TGroupBox + AnchorSideLeft.Control = Owner + AnchorSideTop.Control = Owner + Left = 0 + Height = 152 + Top = 0 + Width = 225 + Caption = 'MWColorsGroupBox' + ClientHeight = 130 + ClientWidth = 217 + TabOrder = 0 + object MWColorListBox: TColorListBox + AnchorSideLeft.Control = MWColorsGroupBox + AnchorSideTop.Control = MWColorsGroupBox + AnchorSideRight.Control = MWColorsGroupBox + AnchorSideRight.Side = asrBottom + AnchorSideBottom.Control = MWColorBox + Left = 6 + Height = 92 + Top = 6 + Width = 205 + Style = [cbCustomColors] + Anchors = [akTop, akLeft, akRight, akBottom] + BorderSpacing.Around = 6 + ItemHeight = 0 + TabOrder = 0 + end + object MWColorBox: TColorBox + AnchorSideLeft.Control = MWColorsGroupBox + AnchorSideRight.Control = MWColorsGroupBox + AnchorSideRight.Side = asrBottom + AnchorSideBottom.Control = MWColorsGroupBox + AnchorSideBottom.Side = asrBottom + Left = 6 + Height = 20 + Top = 104 + Width = 205 + Anchors = [akLeft, akRight, akBottom] + BorderSpacing.Around = 6 + ItemHeight = 0 + TabOrder = 1 + end + end +end diff --git a/ide/frames/msgwnd_options.pas b/ide/frames/msgwnd_options.pas new file mode 100644 index 0000000000..07a3e25604 --- /dev/null +++ b/ide/frames/msgwnd_options.pas @@ -0,0 +1,51 @@ +{ + *************************************************************************** + * * + * This source is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This code is distributed in the hope that it will be useful, but * + * WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * General Public License for more details. * + * * + * A copy of the GNU General Public License is available on the World * + * Wide Web at . You can also * + * obtain it by writing to the Free Software Foundation, * + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * * + *************************************************************************** +} +unit MsgWnd_Options; + +{$mode objfpc}{$H+} + +interface + +uses + Classes, SysUtils, FileUtil, IDEOptionsIntf, Forms, Controls, Graphics, + Dialogs, StdCtrls, ColorBox; + +type + + { TMsgWndOptionsFrame } + + TMsgWndOptionsFrame = class(TAbstractIDEOptionsEditor) + MWColorBox: TColorBox; + MWColorListBox: TColorListBox; + MWColorsGroupBox: TGroupBox; + private + public + end; + +var + MsgWndOptionsFrame: TMsgWndOptionsFrame; + +implementation + +{$R *.lfm} + +end. + diff --git a/ide/frames/oi_options.lfm b/ide/frames/oi_options.lfm index 82ea80217a..76c62a3f2e 100644 --- a/ide/frames/oi_options.lfm +++ b/ide/frames/oi_options.lfm @@ -7,24 +7,24 @@ object OIOptionsFrame: TOIOptionsFrame ClientWidth = 634 TabOrder = 0 Visible = False - DesignLeft = 403 - DesignTop = 218 + DesignLeft = 479 + DesignTop = 200 object ObjectInspectorColorsGroupBox: TGroupBox AnchorSideLeft.Control = Owner AnchorSideTop.Control = Owner AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 0 - Height = 228 + Height = 230 Top = 0 - Width = 226 + Width = 230 AutoSize = True Caption = 'ObjectInspectorColorsGroupBox' ChildSizing.LeftRightSpacing = 6 ChildSizing.TopBottomSpacing = 6 ChildSizing.HorizontalSpacing = 2 ChildSizing.VerticalSpacing = 2 - ClientHeight = 210 + ClientHeight = 208 ClientWidth = 222 TabOrder = 0 object ColorsListBox: TColorListBox @@ -48,7 +48,7 @@ object OIOptionsFrame: TOIOptionsFrame AnchorSideRight.Control = ColorsListBox AnchorSideRight.Side = asrBottom Left = 6 - Height = 22 + Height = 20 Top = 182 Width = 210 Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbCustomColor, cbPrettyNames] @@ -65,23 +65,23 @@ object OIOptionsFrame: TOIOptionsFrame AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom Left = 0 - Height = 116 - Top = 235 + Height = 124 + Top = 237 Width = 634 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Top = 7 Caption = 'OIOptionsGroupBox' - ClientHeight = 98 - ClientWidth = 630 + ClientHeight = 102 + ClientWidth = 626 TabOrder = 1 object OIShowHintCheckBox: TCheckBox AnchorSideLeft.Control = OIOptsCenterLabel AnchorSideTop.Control = OIOptionsGroupBox - Left = 315 - Height = 17 + Left = 313 + Height = 18 Top = 6 - Width = 122 + Width = 155 BorderSpacing.Top = 6 Caption = 'OIShowHintCheckBox' TabOrder = 0 @@ -90,9 +90,9 @@ object OIOptionsFrame: TOIOptionsFrame AnchorSideLeft.Control = OIOptionsGroupBox AnchorSideTop.Control = OIOptionsGroupBox Left = 6 - Height = 17 + Height = 18 Top = 6 - Width = 126 + Width = 159 BorderSpacing.Left = 6 BorderSpacing.Top = 6 Caption = 'OIAutoShowCheckBox' @@ -102,10 +102,10 @@ object OIOptionsFrame: TOIOptionsFrame AnchorSideLeft.Control = OIOptsCenterLabel AnchorSideTop.Control = OIShowHintCheckBox AnchorSideTop.Side = asrBottom - Left = 315 - Height = 17 - Top = 29 - Width = 151 + Left = 313 + Height = 18 + Top = 30 + Width = 194 BorderSpacing.Top = 6 Caption = 'OIBoldNonDefaultCheckBox' TabOrder = 2 @@ -114,10 +114,10 @@ object OIOptionsFrame: TOIOptionsFrame AnchorSideLeft.Control = OIOptsCenterLabel AnchorSideTop.Control = OIShowGutterCheckBox AnchorSideTop.Side = asrBottom - Left = 315 - Height = 17 - Top = 75 - Width = 145 + Left = 313 + Height = 18 + Top = 78 + Width = 187 BorderSpacing.Top = 6 BorderSpacing.Bottom = 6 Caption = 'OIDrawGridLinesCheckBox' @@ -127,10 +127,10 @@ object OIOptionsFrame: TOIOptionsFrame AnchorSideLeft.Control = OIOptsCenterLabel AnchorSideTop.Control = OIBoldNonDefaultCheckBox AnchorSideTop.Side = asrBottom - Left = 315 - Height = 17 - Top = 52 - Width = 134 + Left = 313 + Height = 18 + Top = 54 + Width = 169 BorderSpacing.Top = 6 Caption = 'OIShowGutterCheckBox' TabOrder = 4 @@ -140,9 +140,9 @@ object OIOptionsFrame: TOIOptionsFrame AnchorSideTop.Control = OIShowInfoBoxCheckBox AnchorSideTop.Side = asrBottom Left = 6 - Height = 17 - Top = 75 - Width = 150 + Height = 18 + Top = 78 + Width = 187 BorderSpacing.Left = 6 BorderSpacing.Top = 6 BorderSpacing.Bottom = 6 @@ -154,9 +154,9 @@ object OIOptionsFrame: TOIOptionsFrame AnchorSideTop.Control = OIShowComponentTreeCheckBox AnchorSideTop.Side = asrBottom Left = 6 - Height = 17 - Top = 52 - Width = 141 + Height = 18 + Top = 54 + Width = 176 BorderSpacing.Left = 6 BorderSpacing.Top = 6 Caption = 'OIShowInfoBoxCheckBox' @@ -167,9 +167,9 @@ object OIOptionsFrame: TOIOptionsFrame AnchorSideTop.Control = OIAutoShowCheckBox AnchorSideTop.Side = asrBottom Left = 6 - Height = 17 - Top = 29 - Width = 180 + Height = 18 + Top = 30 + Width = 230 BorderSpacing.Left = 6 BorderSpacing.Top = 6 Caption = 'OIShowComponentTreeCheckBox' @@ -179,7 +179,7 @@ object OIOptionsFrame: TOIOptionsFrame AnchorSideLeft.Control = OIOptionsGroupBox AnchorSideLeft.Side = asrCenter AnchorSideTop.Control = OIOptionsGroupBox - Left = 315 + Left = 313 Height = 1 Top = 0 Width = 1 @@ -193,16 +193,16 @@ object OIOptionsFrame: TOIOptionsFrame AnchorSideRight.Control = Owner AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = OIMiscGroupBox - Left = 233 - Height = 170 + Left = 237 + Height = 173 Top = 0 - Width = 401 + Width = 397 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Left = 7 BorderSpacing.Bottom = 7 Caption = 'ObjectInspectorSpeedSettingsGroupBox' - ClientHeight = 152 - ClientWidth = 397 + ClientHeight = 151 + ClientWidth = 389 TabOrder = 2 object BtnUseDefaultLazarusSettings: TButton AnchorSideLeft.Control = ObjectInspectorSpeedSettingsGroupBox @@ -210,7 +210,7 @@ object OIOptionsFrame: TOIOptionsFrame Left = 6 Height = 25 Top = 6 - Width = 171 + Width = 215 AutoSize = True BorderSpacing.Around = 6 Caption = 'BtnUseDefaultLazarusSettings' @@ -228,7 +228,7 @@ object OIOptionsFrame: TOIOptionsFrame Left = 6 Height = 25 Top = 37 - Width = 171 + Width = 215 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Left = 6 @@ -247,25 +247,25 @@ object OIOptionsFrame: TOIOptionsFrame AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = ObjectInspectorColorsGroupBox AnchorSideBottom.Side = asrBottom - Left = 233 - Height = 51 - Top = 177 - Width = 401 + Left = 237 + Height = 50 + Top = 180 + Width = 397 Anchors = [akLeft, akRight, akBottom] AutoSize = True BorderSpacing.Left = 7 Caption = 'OIMiscGroupBox' - ClientHeight = 33 - ClientWidth = 397 + ClientHeight = 28 + ClientWidth = 389 TabOrder = 3 object OIDefaultItemHeightLabel: TLabel AnchorSideLeft.Control = OIMiscGroupBox AnchorSideTop.Control = OIDefaultItemHeightSpinEdit AnchorSideTop.Side = asrCenter Left = 6 - Height = 13 - Top = 10 - Width = 125 + Height = 16 + Top = 6 + Width = 162 BorderSpacing.Around = 6 Caption = 'OIDefaultItemHeightLabel' ParentColor = False @@ -274,8 +274,8 @@ object OIOptionsFrame: TOIOptionsFrame AnchorSideLeft.Control = OIDefaultItemHeightLabel AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = OIMiscGroupBox - Left = 137 - Height = 21 + Left = 174 + Height = 16 Top = 6 Width = 53 BorderSpacing.Around = 6 diff --git a/ide/lazarus.lpi b/ide/lazarus.lpi index 15fbcd8a57..5f0038e2c0 100644 --- a/ide/lazarus.lpi +++ b/ide/lazarus.lpi @@ -63,7 +63,7 @@ - + @@ -830,6 +830,14 @@ + + + + + + + +