diff --git a/ide/checklfmdlg.lfm b/ide/checklfmdlg.lfm index 73c4ef5884..3d2e92a126 100644 --- a/ide/checklfmdlg.lfm +++ b/ide/checklfmdlg.lfm @@ -7,11 +7,12 @@ object CheckLFMDialog: TCheckLFMDialog Caption = 'Repair LFM file' ClientHeight = 580 ClientWidth = 552 + OnClose = FormClose OnCreate = CheckLFMDialogCreate - LCLVersion = '0.9.29' + LCLVersion = '1.1' object NoteLabel: TLabel Left = 0 - Height = 16 + Height = 15 Top = 0 Width = 552 Align = alTop @@ -21,19 +22,19 @@ object CheckLFMDialog: TCheckLFMDialog end object LFMGroupBox: TGroupBox Left = 0 - Height = 412 - Top = 16 + Height = 416 + Top = 15 Width = 552 Align = alClient Caption = 'LFM file' - ClientHeight = 390 - ClientWidth = 542 + ClientHeight = 398 + ClientWidth = 548 TabOrder = 0 inline LFMSynEdit: TSynEdit Left = 0 - Height = 390 + Height = 398 Top = 0 - Width = 542 + Width = 548 Align = alClient Font.Height = -15 Font.Name = 'courier' @@ -45,27 +46,16 @@ object CheckLFMDialog: TCheckLFMDialog Gutter.Width = 59 Gutter.MouseActions = < item - Shift = [] - ShiftMask = [] - Button = mbLeft ClickCount = ccAny ClickDir = cdDown - Command = 13 - MoveCaret = False - Option = 0 - Priority = 0 + Command = emcOnMainGutterClick end item - Shift = [] - ShiftMask = [] Button = mbRight - ClickCount = ccSingle - ClickDir = cdUp - Command = 12 - MoveCaret = False - Option = 0 - Priority = 0 + Command = emcContextMenu end> + RightGutter.Width = 0 + RightGutter.MouseActions = <> Highlighter = SynLFMSyn1 Keystrokes = < item @@ -390,135 +380,92 @@ object CheckLFMDialog: TCheckLFMDialog end> MouseActions = < item - Shift = [] ShiftMask = [ssShift, ssAlt] - Button = mbLeft - ClickCount = ccSingle ClickDir = cdDown - Command = 1 + Command = emcStartSelections MoveCaret = True - Option = 0 - Priority = 0 end item Shift = [ssShift] ShiftMask = [ssShift, ssAlt] - Button = mbLeft - ClickCount = ccSingle ClickDir = cdDown - Command = 1 + Command = emcStartSelections MoveCaret = True Option = 1 - Priority = 0 end item Shift = [ssAlt] ShiftMask = [ssShift, ssAlt] - Button = mbLeft - ClickCount = ccSingle ClickDir = cdDown - Command = 3 + Command = emcStartColumnSelections MoveCaret = True - Option = 0 - Priority = 0 end item Shift = [ssShift, ssAlt] ShiftMask = [ssShift, ssAlt] - Button = mbLeft - ClickCount = ccSingle ClickDir = cdDown - Command = 3 + Command = emcStartColumnSelections MoveCaret = True Option = 1 - Priority = 0 end item - Shift = [] - ShiftMask = [] Button = mbRight - ClickCount = ccSingle - ClickDir = cdUp - Command = 12 - MoveCaret = False - Option = 0 - Priority = 0 + Command = emcContextMenu end item - Shift = [] - ShiftMask = [] - Button = mbLeft ClickCount = ccDouble ClickDir = cdDown - Command = 6 + Command = emcSelectWord MoveCaret = True - Option = 0 - Priority = 0 end item - Shift = [] - ShiftMask = [] - Button = mbLeft ClickCount = ccTriple ClickDir = cdDown - Command = 7 + Command = emcSelectLine MoveCaret = True - Option = 0 - Priority = 0 end item - Shift = [] - ShiftMask = [] - Button = mbLeft ClickCount = ccQuad ClickDir = cdDown - Command = 8 + Command = emcSelectPara MoveCaret = True - Option = 0 - Priority = 0 end item - Shift = [] - ShiftMask = [] Button = mbMiddle - ClickCount = ccSingle ClickDir = cdDown - Command = 10 + Command = emcPasteSelection MoveCaret = True - Option = 0 - Priority = 0 end item Shift = [ssCtrl] ShiftMask = [ssShift, ssAlt, ssCtrl] - Button = mbLeft - ClickCount = ccSingle - ClickDir = cdUp - Command = 11 - MoveCaret = False - Option = 0 - Priority = 0 + Command = emcMouseLink end> MouseSelActions = < item - Shift = [] - ShiftMask = [] - Button = mbLeft - ClickCount = ccSingle ClickDir = cdDown - Command = 9 - MoveCaret = False - Option = 0 - Priority = 0 + Command = emcStartDragMove end> Lines.Strings = ( 'LFMSynEdit' ) + VisibleSpecialChars = [vscSpace, vscTabAtLast] BracketHighlightStyle = sbhsBoth + BracketMatchColor.Background = clNone + BracketMatchColor.Foreground = clNone + BracketMatchColor.Style = [fsBold] + FoldedCodeColor.Background = clNone + FoldedCodeColor.Foreground = clGray + FoldedCodeColor.FrameColor = clGray + MouseLinkColor.Background = clNone + MouseLinkColor.Foreground = clBlue + LineHighlightColor.Background = clNone + LineHighlightColor.Foreground = clNone OnSpecialLineMarkup = LFMSynEditSpecialLineMarkup inline TSynGutterPartList object TSynGutterMarks - Width = 23 + Width = 24 + MouseActions = <> end object TSynGutterLineNumber Width = 19 @@ -532,35 +479,26 @@ object CheckLFMDialog: TCheckLFMDialog end object TSynGutterChanges Width = 4 + MouseActions = <> ModifiedColor = 59900 SavedColor = clGreen end object TSynGutterSeparator Width = 2 + MouseActions = <> end object TSynGutterCodeFolding MouseActions = < item - Shift = [] - ShiftMask = [] Button = mbRight - ClickCount = ccSingle - ClickDir = cdUp - Command = 16 - MoveCaret = False - Option = 0 - Priority = 0 + Command = emcCodeFoldContextMenu end item - Shift = [] ShiftMask = [ssShift] Button = mbMiddle ClickCount = ccAny ClickDir = cdDown - Command = 14 - MoveCaret = False - Option = 0 - Priority = 0 + Command = emcCodeFoldCollaps end item Shift = [ssShift] @@ -568,58 +506,36 @@ object CheckLFMDialog: TCheckLFMDialog Button = mbMiddle ClickCount = ccAny ClickDir = cdDown - Command = 14 - MoveCaret = False + Command = emcCodeFoldCollaps Option = 1 - Priority = 0 end item - Shift = [] - ShiftMask = [] - Button = mbLeft ClickCount = ccAny ClickDir = cdDown - Command = 0 - MoveCaret = False - Option = 0 - Priority = 0 + Command = emcNone end> MarkupInfo.Background = clNone MarkupInfo.Foreground = clGray MouseActionsExpanded = < item - Shift = [] - ShiftMask = [] - Button = mbLeft ClickCount = ccAny ClickDir = cdDown - Command = 14 - MoveCaret = False - Option = 0 - Priority = 0 + Command = emcCodeFoldCollaps end> MouseActionsCollapsed = < item Shift = [ssCtrl] ShiftMask = [ssCtrl] - Button = mbLeft ClickCount = ccAny ClickDir = cdDown - Command = 15 - MoveCaret = False - Option = 0 - Priority = 0 + Command = emcCodeFoldExpand end item - Shift = [] ShiftMask = [ssCtrl] - Button = mbLeft ClickCount = ccAny ClickDir = cdDown - Command = 15 - MoveCaret = False + Command = emcCodeFoldExpand Option = 1 - Priority = 0 end> end end @@ -628,18 +544,18 @@ object CheckLFMDialog: TCheckLFMDialog object ErrorsGroupBox: TGroupBox Left = 0 Height = 104 - Top = 428 + Top = 431 Width = 552 Align = alBottom Caption = 'Errors' - ClientHeight = 82 - ClientWidth = 542 + ClientHeight = 86 + ClientWidth = 548 TabOrder = 1 object ErrorsListBox: TListBox Left = 0 - Height = 82 + Height = 86 Top = 0 - Width = 542 + Width = 548 Align = alClient ItemHeight = 0 OnClick = ErrorsListBoxClick @@ -648,20 +564,20 @@ object CheckLFMDialog: TCheckLFMDialog end object BtnPanel: TPanel Left = 0 - Height = 48 - Top = 532 + Height = 45 + Top = 535 Width = 552 Align = alBottom AutoSize = True BevelOuter = bvNone - ClientHeight = 48 + ClientHeight = 45 ClientWidth = 552 TabOrder = 2 object CancelButton: TBitBtn - Left = 465 - Height = 36 + Left = 464 + Height = 33 Top = 6 - Width = 81 + Width = 82 Align = alRight AutoSize = True BorderSpacing.Around = 6 @@ -673,10 +589,10 @@ object CheckLFMDialog: TCheckLFMDialog TabOrder = 0 end object RemoveAllButton: TBitBtn - Left = 284 - Height = 36 + Left = 301 + Height = 33 Top = 6 - Width = 175 + Width = 157 Align = alRight AutoSize = True BorderSpacing.Around = 6 @@ -689,6 +605,12 @@ object CheckLFMDialog: TCheckLFMDialog object SynLFMSyn1: TSynLFMSyn DefaultFilter = 'Lazarus Form Files (*.lfm)|*.lfm' Enabled = False + CommentAttri.FrameEdges = sfeAround + IdentifierAttri.FrameEdges = sfeAround + KeyAttri.FrameEdges = sfeAround + NumberAttri.FrameEdges = sfeAround + SpaceAttri.FrameEdges = sfeAround + StringAttri.FrameEdges = sfeAround left = 129 top = 104 end diff --git a/ide/checklfmdlg.pas b/ide/checklfmdlg.pas index 9f05d1e81a..c5b59dc08a 100644 --- a/ide/checklfmdlg.pas +++ b/ide/checklfmdlg.pas @@ -109,6 +109,7 @@ type RemoveAllButton: TBitBtn; SynLFMSyn1: TSynLFMSyn; procedure ErrorsListBoxClick(Sender: TObject); + procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); procedure LFMSynEditSpecialLineMarkup(Sender: TObject; Line: integer; var Special: boolean; AMarkup: TSynSelectedColor); procedure RemoveAllButtonClick(Sender: TObject); @@ -769,6 +770,11 @@ begin fLfmChecker.JumpToError(fLfmChecker.FindListBoxError); end; +procedure TCheckLFMDialog.FormClose(Sender: TObject; var CloseAction: TCloseAction); +begin + IDEDialogLayoutList.SaveLayout(Self); +end; + procedure TCheckLFMDialog.LFMSynEditSpecialLineMarkup(Sender: TObject; Line: integer; var Special: boolean; AMarkup: TSynSelectedColor); var