mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-12-04 06:07:29 +01:00
IDE: Editor-Options, new captions - added info text
This commit is contained in:
parent
3ba594f827
commit
6c33c117ba
@ -2010,8 +2010,10 @@ resourcestring
|
||||
dlgUnsavedLineColor = 'Unsaved line';
|
||||
dlgSavedLineColor = 'Saved line';
|
||||
dlgGutterCollapsedColor = 'Collapsed';
|
||||
dlgCaretForeColor = 'Color (Main-Caret / NotXor)';
|
||||
dlgCaretBackColor = 'Multi-Caret-Mode (2ndary C.)';
|
||||
dlgCaretForeColor = 'Main or primary caret';
|
||||
dlgCaretBackColor = 'Secondary carets (multi-caret mode)';
|
||||
dlgCaretColorInfo = 'The caret color depends on the colors of text and background under the caret. '
|
||||
+ 'Each pixel''s RGB are bitwise inverted and XOR''ed with the chosen color''s RGB.';
|
||||
dlgOverviewGutterBack1Color = 'Background 1';
|
||||
dlgOverviewGutterBack2Color = 'Background 2';
|
||||
dlgOverviewGutterPageColor = 'Page';
|
||||
@ -2209,7 +2211,7 @@ resourcestring
|
||||
dlgAddHiAttrOutlineLevel10Color = 'Level 10';
|
||||
dlgAddHiSpecialVisibleChars = 'Visualized Special Chars';
|
||||
dlgTopInfoHint = 'Current Class/Proc Hint';
|
||||
dlgCaretColor = 'Caret';
|
||||
dlgCaretColor = 'Caret (Text-Cursor)';
|
||||
dlgOverviewGutterColor = 'Overview Gutter';
|
||||
dlgIfDefBlockInactive = 'Inactive $IFDEF code';
|
||||
dlgIfDefBlockActive = 'Active $IFDEF code';
|
||||
|
||||
@ -763,4 +763,22 @@ object SynColorAttrEditor: TSynColorAttrEditor
|
||||
TabOrder = 21
|
||||
Text = 'slsSolid'
|
||||
end
|
||||
object lblInfo: TLabel
|
||||
AnchorSideLeft.Control = Owner
|
||||
AnchorSideTop.Control = pnlUnderline
|
||||
AnchorSideTop.Side = asrBottom
|
||||
AnchorSideRight.Control = Owner
|
||||
AnchorSideRight.Side = asrBottom
|
||||
Left = 6
|
||||
Height = 15
|
||||
Top = 170
|
||||
Width = 746
|
||||
Anchors = [akTop, akLeft, akRight]
|
||||
BorderSpacing.Left = 6
|
||||
BorderSpacing.Top = 3
|
||||
BorderSpacing.Right = 6
|
||||
Caption = 'lblInfo'
|
||||
Visible = False
|
||||
WordWrap = True
|
||||
end
|
||||
end
|
||||
|
||||
@ -26,6 +26,7 @@ type
|
||||
ColumnPosBevel: TPanel;
|
||||
ForePriorLabel: TLabel;
|
||||
ForePriorSpin: TSpinEdit;
|
||||
lblInfo: TLabel;
|
||||
MarkupFoldStyleBox: TComboBox;
|
||||
MarkupFoldAlphaSpin: TSpinEdit;
|
||||
MarkupFoldAlphaLabel: TLabel;
|
||||
@ -455,7 +456,7 @@ begin
|
||||
CheckControl(MarkupFoldColorUseDefaultCheckBox);
|
||||
|
||||
ColumnPosBevel.AnchorSide[akLeft].Control := MinAnchor;
|
||||
Constraints.MinHeight := pnlItalic.Top + pnlItalic.Height;
|
||||
Constraints.MinHeight := lblInfo.Top + lblInfo.Height;
|
||||
S := BackPriorSpin;
|
||||
if not S.Visible then
|
||||
S := BackAlphaSpin;
|
||||
@ -739,6 +740,12 @@ begin
|
||||
TextUnderlineCheckBox.Checked := fsUnderline in FCurHighlightElement.Style;
|
||||
end;
|
||||
|
||||
lblInfo.Visible := False;
|
||||
if IsAhaElement(FCurHighlightElement, ahaCaretColor) then begin
|
||||
lblInfo.Caption := dlgCaretColorInfo;
|
||||
lblInfo.Visible := True;
|
||||
end;
|
||||
|
||||
UpdatingColor := False;
|
||||
finally
|
||||
EnableAlign;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user