Minimap: improved config frame layout, i18n-ed

This commit is contained in:
Maxim Ganetsky 2024-09-30 19:49:51 +03:00
parent 66b94d7af1
commit 1925dbb6c2
5 changed files with 114 additions and 77 deletions

View File

@ -9,41 +9,40 @@ object MiniMapConfigFrame: TMiniMapConfigFrame
DesignLeft = 652 DesignLeft = 652
DesignTop = 343 DesignTop = 343
object cbEnabled: TCheckBox object cbEnabled: TCheckBox
AnchorSideLeft.Control = Owner
AnchorSideTop.Control = Owner AnchorSideTop.Control = Owner
Left = 152 Left = 8
Height = 23 Height = 23
Top = 8 Top = 8
Width = 123 Width = 112
BorderSpacing.Left = 8
BorderSpacing.Top = 8 BorderSpacing.Top = 8
Caption = 'Show minimap' Caption = 'Show minimap'
TabOrder = 0 TabOrder = 0
end end
object lblMapWidth: TLabel object lblMapWidth: TLabel
AnchorSideTop.Control = seWidth AnchorSideLeft.Control = cbAlignLeft
AnchorSideRight.Control = seWidth AnchorSideTop.Control = cbAlignLeft
AnchorSideBottom.Control = seWidth AnchorSideTop.Side = asrBottom
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 16 Left = 8
Height = 34 Height = 16
Top = 70 Top = 70
Width = 128 Width = 60
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Top = 8
AutoSize = False
BorderSpacing.Right = 8
Caption = 'Map width' Caption = 'Map width'
FocusControl = seWidth FocusControl = seWidth
Layout = tlCenter Layout = tlCenter
end end
object seWidth: TSpinEditEx object seWidth: TSpinEditEx
AnchorSideLeft.Control = cbEnabled AnchorSideLeft.Control = lblMapWidth
AnchorSideTop.Control = cbAlignLeft AnchorSideTop.Control = lblMapWidth
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 152 Left = 8
Height = 34 Height = 33
Top = 70 Top = 86
Width = 64 Width = 80
BorderSpacing.Top = 8
MaxLength = 0 MaxLength = 0
SpinButtonWidth = 17 SpinButtonWidth = 17
TabOrder = 1 TabOrder = 1
@ -53,14 +52,13 @@ object MiniMapConfigFrame: TMiniMapConfigFrame
Value = 100 Value = 100
end end
object seInitialFontSize: TSpinEditEx object seInitialFontSize: TSpinEditEx
AnchorSideLeft.Control = cbEnabled AnchorSideLeft.Control = lblInitialFontSize
AnchorSideTop.Control = seWidth AnchorSideTop.Control = lblInitialFontSize
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 152 Left = 8
Height = 34 Height = 33
Top = 112 Top = 143
Width = 60 Width = 80
BorderSpacing.Top = 8
MaxLength = 0 MaxLength = 0
SpinButtonWidth = 17 SpinButtonWidth = 17
TabOrder = 2 TabOrder = 2
@ -70,79 +68,71 @@ object MiniMapConfigFrame: TMiniMapConfigFrame
Value = 1 Value = 1
end end
object lblInitialFontSize: TLabel object lblInitialFontSize: TLabel
AnchorSideTop.Control = seInitialFontSize AnchorSideLeft.Control = seWidth
AnchorSideRight.Control = seInitialFontSize AnchorSideTop.Control = seWidth
AnchorSideBottom.Control = seInitialFontSize AnchorSideTop.Side = asrBottom
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 16 Left = 8
Height = 34 Height = 16
Top = 112 Top = 127
Width = 128 Width = 85
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Top = 8
AutoSize = False
BorderSpacing.Right = 8
Caption = 'Initial font size' Caption = 'Initial font size'
FocusControl = seInitialFontSize FocusControl = seInitialFontSize
Layout = tlCenter Layout = tlCenter
end end
object cbViewWindow: TColorBox object cbViewWindow: TColorBox
AnchorSideLeft.Control = cbEnabled AnchorSideLeft.Control = lblViewWindowColor
AnchorSideTop.Control = seInitialFontSize AnchorSideTop.Control = lblViewWindowColor
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 152 Left = 8
Height = 29 Height = 28
Top = 154 Top = 200
Width = 128 Width = 235
Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeNone, cbCustomColor] Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbIncludeNone, cbCustomColor]
ColorDialog = CDView ColorDialog = CDView
BorderSpacing.Top = 8
ItemHeight = 0 ItemHeight = 0
TabOrder = 3 TabOrder = 3
end end
object lblViewWindowColor: TLabel object lblViewWindowColor: TLabel
AnchorSideTop.Control = cbViewWindow AnchorSideLeft.Control = seInitialFontSize
AnchorSideRight.Control = cbViewWindow AnchorSideTop.Control = seInitialFontSize
AnchorSideBottom.Control = cbViewWindow AnchorSideTop.Side = asrBottom
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 16 Left = 8
Height = 29 Height = 16
Top = 154 Top = 184
Width = 125 Width = 109
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akLeft, akBottom] BorderSpacing.Top = 8
AutoSize = False
BorderSpacing.Right = 8
Caption = 'View window color' Caption = 'View window color'
Layout = tlCenter Layout = tlCenter
end end
object lblViewWindowTextColor: TLabel object lblViewWindowTextColor: TLabel
AnchorSideTop.Control = cbViewText AnchorSideLeft.Control = cbViewWindow
AnchorSideRight.Control = cbViewText AnchorSideTop.Control = cbViewWindow
AnchorSideBottom.Control = cbViewText AnchorSideTop.Side = asrBottom
AnchorSideBottom.Side = asrBottom AnchorSideBottom.Side = asrBottom
Left = 16 Left = 8
Height = 29 Height = 16
Top = 191 Top = 236
Width = 128 Width = 87
Alignment = taRightJustify Alignment = taRightJustify
Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Top = 8
AutoSize = False
BorderSpacing.Right = 8
Caption = 'View text color' Caption = 'View text color'
Layout = tlCenter Layout = tlCenter
end end
object cbViewText: TColorBox object cbViewText: TColorBox
AnchorSideLeft.Control = cbEnabled AnchorSideLeft.Control = lblViewWindowTextColor
AnchorSideTop.Control = cbViewWindow AnchorSideTop.Control = lblViewWindowTextColor
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 152 Left = 8
Height = 29 Height = 28
Top = 191 Top = 252
Width = 123 Width = 235
Style = [cbStandardColors, cbSystemColors, cbIncludeNone, cbCustomColor] Style = [cbStandardColors, cbSystemColors, cbIncludeNone, cbCustomColor]
ColorDialog = CDView ColorDialog = CDView
BorderSpacing.Top = 8
ItemHeight = 0 ItemHeight = 0
TabOrder = 4 TabOrder = 4
end end
@ -150,10 +140,10 @@ object MiniMapConfigFrame: TMiniMapConfigFrame
AnchorSideLeft.Control = cbEnabled AnchorSideLeft.Control = cbEnabled
AnchorSideTop.Control = cbEnabled AnchorSideTop.Control = cbEnabled
AnchorSideTop.Side = asrBottom AnchorSideTop.Side = asrBottom
Left = 152 Left = 8
Height = 23 Height = 23
Top = 39 Top = 39
Width = 428 Width = 371
BorderSpacing.Top = 8 BorderSpacing.Top = 8
Caption = 'Put map left of editor (requires IDE restart for existing tabs)' Caption = 'Put map left of editor (requires IDE restart for existing tabs)'
TabOrder = 5 TabOrder = 5
@ -182,7 +172,7 @@ object MiniMapConfigFrame: TMiniMapConfigFrame
'ColorS=F0FBFF' 'ColorS=F0FBFF'
'ColorT=A4A0A0' 'ColorT=A4A0A0'
) )
Left = 301 Left = 288
Top = 124 Top = 96
end end
end end

View File

@ -52,12 +52,17 @@ uses CtrlMiniMap, StrMiniMap;
function TMiniMapConfigFrame.GetTitle: String; function TMiniMapConfigFrame.GetTitle: String;
begin begin
Result:=SMinimapConfigTitle Result:=SMinimapConfigTitle;
end; end;
procedure TMiniMapConfigFrame.Setup(ADialog: TAbstractOptionsEditorDialog); procedure TMiniMapConfigFrame.Setup(ADialog: TAbstractOptionsEditorDialog);
begin begin
// nothing cbEnabled.Caption:=SShowMinimap;
cbAlignLeft.Caption:=SPutMapLeftOfEditorRe;
lblMapWidth.Caption:=SMapWidth;
lblInitialFontSize.Caption:=SInitialFontSize;
lblViewWindowColor.Caption:=SViewWindowColor;
lblViewWindowTextColor.Caption:=SViewWindowTextColor;
end; end;
procedure TMiniMapConfigFrame.ReadSettings(AOptions: TAbstractIDEOptions); procedure TMiniMapConfigFrame.ReadSettings(AOptions: TAbstractIDEOptions);

View File

@ -0,0 +1,31 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
#: strminimap.sinitialfontsize
msgid "Initial font size"
msgstr ""
#: strminimap.smapwidth
msgid "Minimap width"
msgstr ""
#: strminimap.sminimapconfigtitle
msgid "Minimap"
msgstr ""
#: strminimap.sputmapleftofeditorre
msgid "Put minimap left of editor (requires IDE restart for existing tabs)"
msgstr ""
#: strminimap.sshowminimap
msgid "Show minimap"
msgstr ""
#: strminimap.sviewwindowcolor
msgid "View window color"
msgstr ""
#: strminimap.sviewwindowtextcolor
msgid "View window text color"
msgstr ""

View File

@ -37,6 +37,10 @@
<UnitName Value="CtrlMiniMap"/> <UnitName Value="CtrlMiniMap"/>
</Item> </Item>
</Files> </Files>
<i18n>
<EnableI18N Value="True"/>
<OutDir Value="languages"/>
</i18n>
<RequiredPkgs> <RequiredPkgs>
<Item> <Item>
<PackageName Value="LazControlDsgn"/> <PackageName Value="LazControlDsgn"/>

View File

@ -14,8 +14,15 @@ const
KeyViewWindowTextColor = 'ViewWindowTextColor'; KeyViewWindowTextColor = 'ViewWindowTextColor';
KeyInitialFontSize = 'InitialFontSize'; KeyInitialFontSize = 'InitialFontSize';
Resourcestring resourcestring
SMinimapConfigTitle = 'MiniMap'; SMinimapConfigTitle = 'Minimap';
SShowMinimap = 'Show minimap';
SPutMapLeftOfEditorRe = 'Put minimap left of editor (requires IDE restart for '
+'existing tabs)';
SMapWidth = 'Minimap width';
SInitialFontSize = 'Initial font size';
SViewWindowColor = 'View window color';
SViewWindowTextColor = 'View window text color';
implementation implementation