|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
patch.diff (9,848 bytes)
Index: ide/frames/msgwnd_options.lfm
===================================================================
--- ide/frames/msgwnd_options.lfm (revision 59713)
+++ ide/frames/msgwnd_options.lfm (working copy)
@@ -14,9 +14,9 @@
AnchorSideTop.Control = MsgColorGroupBox
AnchorSideTop.Side = asrBottom
Left = 70
- Height = 20
- Top = 390
- Width = 110
+ Height = 13
+ Top = 352
+ Width = 80
BorderSpacing.Left = 10
BorderSpacing.Top = 6
BorderSpacing.Right = 10
@@ -30,7 +30,7 @@
AnchorSideTop.Side = asrCenter
Left = 0
Height = 3
- Top = 399
+ Top = 357
Width = 60
end
object MWOptsRightBevel: TBevel
@@ -40,10 +40,10 @@
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
- Left = 190
+ Left = 160
Height = 3
- Top = 399
- Width = 330
+ Top = 357
+ Width = 360
Anchors = [akTop, akLeft, akRight]
end
object MWShowIconsCheckBox: TCheckBox
@@ -51,9 +51,9 @@
AnchorSideTop.Control = MWOptionsLabel
AnchorSideTop.Side = asrBottom
Left = 6
- Height = 32
- Top = 416
- Width = 193
+ Height = 17
+ Top = 371
+ Width = 135
BorderSpacing.Left = 6
Caption = 'MWShowIconsCheckBox'
ParentShowHint = False
@@ -65,9 +65,9 @@
AnchorSideTop.Control = MWAlwaysDrawFocusedCheckBox
AnchorSideTop.Side = asrBottom
Left = 6
- Height = 32
- Top = 480
- Width = 161
+ Height = 17
+ Top = 405
+ Width = 111
BorderSpacing.Left = 6
Caption = 'MWFocusCheckBox'
ParentShowHint = False
@@ -79,9 +79,9 @@
AnchorSideTop.Control = MWShowIconsCheckBox
AnchorSideTop.Side = asrBottom
Left = 6
- Height = 32
- Top = 448
- Width = 255
+ Height = 17
+ Top = 388
+ Width = 182
Caption = 'MWAlwaysDrawFocusedCheckBox'
ParentShowHint = False
ShowHint = True
@@ -92,9 +92,9 @@
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = MWFocusCheckBox
AnchorSideTop.Side = asrBottom
- Left = 129
- Height = 40
- Top = 512
+ Left = 97
+ Height = 21
+ Top = 422
Width = 50
BorderSpacing.Left = 2
TabOrder = 5
@@ -104,9 +104,9 @@
AnchorSideTop.Control = MWMaxProcsSpinEdit
AnchorSideTop.Side = asrCenter
Left = 6
- Height = 20
- Top = 522
- Width = 121
+ Height = 13
+ Top = 426
+ Width = 89
BorderSpacing.Left = 6
Caption = 'MWMaxProcsLabel'
ParentColor = False
@@ -117,14 +117,14 @@
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 0
- Height = 189
+ Height = 172
Top = 0
Width = 520
Anchors = [akTop, akLeft, akRight]
AutoSize = True
Caption = 'MWColorsGroupBox'
- ClientHeight = 168
- ClientWidth = 518
+ ClientHeight = 154
+ ClientWidth = 516
TabOrder = 0
object MWColorListBox: TColorListBox
AnchorSideLeft.Control = MWColorsGroupBox
@@ -134,7 +134,7 @@
Left = 6
Height = 110
Top = 6
- Width = 330
+ Width = 325
Style = [cbCustomColors]
OnGetColors = MWColorListBoxGetColors
Anchors = [akTop, akLeft, akRight]
@@ -142,7 +142,6 @@
ItemHeight = 0
OnSelectionChange = MWColorListBoxSelectionChange
TabOrder = 0
- TopIndex = -1
end
object MWColorBox: TColorBox
AnchorSideLeft.Control = MWColorsGroupBox
@@ -152,9 +151,9 @@
AnchorSideBottom.Control = MWColorsGroupBox
AnchorSideBottom.Side = asrBottom
Left = 6
- Height = 40
+ Height = 26
Top = 122
- Width = 330
+ Width = 325
Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeNone, cbIncludeDefault, cbCustomColor, cbPrettyNames, cbCustomColors]
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Around = 6
@@ -163,59 +162,51 @@
TabOrder = 1
end
object MWSpeedSetColorsGroupBox: TGroupBox
- Left = 342
- Height = 156
+ Left = 337
+ Height = 142
Top = 6
- Width = 170
+ Width = 173
Align = alRight
+ AutoSize = True
BorderSpacing.Around = 6
Caption = 'MWSpeedSetColorsGroupBox'
+ ChildSizing.LeftRightSpacing = 6
+ ChildSizing.TopBottomSpacing = 6
+ ChildSizing.VerticalSpacing = 6
ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 1
- ClientHeight = 135
- ClientWidth = 168
+ ClientHeight = 124
+ ClientWidth = 169
TabOrder = 2
object MWSetEditorColorsButton: TButton
- AnchorSideLeft.Control = MWSpeedSetColorsGroupBox
- AnchorSideTop.Control = MWSpeedSetColorsGroupBox
- Left = 5
- Height = 40
- Top = 0
- Width = 189
+ AnchorSideRight.Side = asrBottom
+ Left = 6
+ Height = 23
+ Top = 6
+ Width = 157
AutoSize = True
- BorderSpacing.Left = 6
Caption = 'MWSetEditorColorsButton'
OnClick = MWSetEditorColorsButtonClick
TabOrder = 0
end
object MWSetDefaultColorsButton: TBitBtn
- AnchorSideLeft.Control = MWSpeedSetColorsGroupBox
- AnchorSideTop.Control = MWSetEditorColorsButton
- AnchorSideTop.Side = asrBottom
AnchorSideRight.Side = asrBottom
- Left = 5
- Height = 40
- Top = 46
- Width = 199
+ Left = 6
+ Height = 23
+ Top = 35
+ Width = 157
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
+ object MWSetPastelColorsButton: TBitBtn
+ AnchorSideRight.Side = asrBottom
+ Left = 6
+ Height = 23
+ Top = 64
+ Width = 157
AutoSize = True
- BorderSpacing.Left = 6
- BorderSpacing.Top = 6
Caption = 'MWSetPastelColorsButton'
OnClick = MWSetPastelColorsButtonClick
TabOrder = 2
@@ -229,15 +220,15 @@
AnchorSideRight.Control = Owner
AnchorSideRight.Side = asrBottom
Left = 0
- Height = 189
- Top = 195
+ Height = 168
+ Top = 178
Width = 520
Anchors = [akTop, akLeft, akRight]
AutoSize = True
BorderSpacing.Top = 6
Caption = 'MsgColorGroupBox'
- ClientHeight = 168
- ClientWidth = 518
+ ClientHeight = 150
+ ClientWidth = 516
TabOrder = 1
object MsgColorListBox: TColorListBox
AnchorSideLeft.Control = MsgColorGroupBox
@@ -254,18 +245,19 @@
TabOrder = 0
end
object MsgColorBox: TColorBox
- AnchorSideLeft.Control = MsgColorGroupBox
+ AnchorSideLeft.Control = MsgColorListBox
AnchorSideTop.Control = MsgColorListBox
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = MsgColorListBox
AnchorSideRight.Side = asrBottom
Left = 6
- Height = 40
+ Height = 22
Top = 122
- Width = 297
+ Width = 303
Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeDefault, cbCustomColor]
Anchors = [akTop, akLeft, akRight]
- BorderSpacing.Around = 6
+ BorderSpacing.Top = 6
+ BorderSpacing.Bottom = 6
ItemHeight = 16
OnChange = MsgColorBoxChange
TabOrder = 1
@@ -276,9 +268,9 @@
AnchorSideTop.Control = MWMaxProcsSpinEdit
AnchorSideTop.Side = asrBottom
Left = 6
- Height = 32
- Top = 562
- Width = 304
+ Height = 17
+ Top = 453
+ Width = 214
BorderSpacing.Left = 6
BorderSpacing.Top = 10
Caption = 'MWShowFPCMsgLinesCompiledCheckBox'
Index: ide/frames/msgwnd_options.pas
===================================================================
--- ide/frames/msgwnd_options.pas (revision 59713)
+++ ide/frames/msgwnd_options.pas (working copy)
@@ -50,7 +50,7 @@
MsgColorGroupBox: TGroupBox;
MWAlwaysDrawFocusedCheckBox: TCheckBox;
MWFocusCheckBox: TCheckBox;
- MWSetPastelColorsButton: TButton;
+ MWSetPastelColorsButton: TBitBtn;
MWShowFPCMsgLinesCompiledCheckBox: TCheckBox;
MWShowIconsCheckBox: TCheckBox;
MWMaxProcsLabel: TLabel;
@@ -229,6 +229,7 @@
MWSetDefaultColorsButton.Caption:=lisLazarusDefault;
IDEImages.AssignImage(MWSetDefaultColorsButton, 'restore_defaults');
MWSetPastelColorsButton.Caption:=lisPastelColors;
+ IDEImages.AssignImage(MWSetPastelColorsButton, 'pastel_colors');
MWSetEditorColorsButton.Caption:=lisEditorColors;
MWShowIconsCheckBox.Caption:=dlgShowMessagesIcons;
MWShowIconsCheckBox.Hint:=dlgAnIconForErrorWarningHintIsShown;
Index: images/copyright.txt
===================================================================
--- images/copyright.txt (revision 59713)
+++ images/copyright.txt (working copy)
@@ -26,6 +26,7 @@
laz_open_recent.png
laz_open_unit.png
laz_save.png
+ pastel_colors.png
restore_default.png
restore_defaults.png
Index: images/laz_images_list.txt
===================================================================
--- images/laz_images_list.txt (revision 59713)
+++ images/laz_images_list.txt (working copy)
@@ -88,6 +88,9 @@
actions/laz_wand.png
actions/laz_wand_150.png
actions/laz_wand_200.png
+actions/pastel_colors.png
+actions/pastel_colors_150.png
+actions/pastel_colors_200.png
actions/preferences.png
actions/preferences_150.png
actions/preferences_200.png
|
|
|
|
I don't like the yellow on the new "pastel colors" icon. Looking not very carefully it reminds me of the "File open" icon and is confusing from this point of view. What about choosing a pair of less strongly biased colors, e.g. blue and pale blue, red and pale red? |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
I think blue is not good because difference between two blue colors in list is very small. Such difference between icon and real behaviour would be unpleasant.
For images I used real colors from list. So, suitable are green and red.
New icons and examples are attached. |
|
|
|
|
|
|
|
|
|
|
|
Version 3.
Button "Pastel colors" does not change current colors but restores some set of colors. Although this set is not default but it is predefined. Thus we can use icon similar to "Resore defaults".
Attached files:
screenshot_v3.png
images_v3.zip |
|
|
|
example_red.png is better, IMO. |
|
|
|
I selected the "red" version. Thank you. Please test and close if ok. |
|
|
|
Thank you. |
|
