From 56b4fca0a9aae6d2a5943d2172b337dee69ee81e Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 5 Jun 2020 00:13:02 +0000 Subject: [PATCH] IDE: Build in FpDoc edit, add word wrap / amend some SynEdit opts git-svn-id: trunk@63296 - --- ide/fpdoceditwindow.lfm | 1519 ++++++++++++++++++++------------------- ide/fpdoceditwindow.pas | 16 +- 2 files changed, 780 insertions(+), 755 deletions(-) diff --git a/ide/fpdoceditwindow.lfm b/ide/fpdoceditwindow.lfm index 133bca5d06..467cb740d7 100644 --- a/ide/fpdoceditwindow.lfm +++ b/ide/fpdoceditwindow.lfm @@ -12,7 +12,7 @@ object FPDocEditor: TFPDocEditor OnDestroy = FormDestroy OnKeyDown = FormKeyDown OnShow = FormShow - LCLVersion = '1.9.0.0' + LCLVersion = '2.1.0.0' object PageControl: TPageControl Left = 32 Height = 326 @@ -727,6 +727,9 @@ object FPDocEditor: TFPDocEditor Lines.Strings = ( 'DescrSynEdit' ) + Options = [eoAutoIndent, eoBracketHighlight, eoGroupUndo, eoHideRightMargin, eoKeepCaretX, eoTabsToSpaces, eoTrimTrailingSpaces, eoDragDropEditing, eoDoubleClickSelectsLine] + Options2 = [eoCaretSkipTab, eoOverwriteBlock] + MouseOptions = [emDragDropEditing, emDoubleClickSelectsLine] VisibleSpecialChars = [vscSpace, vscTabAtLast] ScrollBars = ssAutoBoth SelectedColor.BackPriority = 50 @@ -836,456 +839,456 @@ object FPDocEditor: TFPDocEditor TabOrder = 0 Gutter.Visible = False Gutter.Width = 55 - Gutter.MouseActions = < + Gutter.MouseActions = < item ClickCount = ccAny ClickDir = cdDown Command = emcOnMainGutterClick - end + end item Button = mbRight Command = emcContextMenu end> RightGutter.Width = 0 - RightGutter.MouseActions = < + RightGutter.MouseActions = < item ClickCount = ccAny ClickDir = cdDown Command = emcOnMainGutterClick - end + end item Button = mbRight Command = emcContextMenu end> Highlighter = SynXMLSyn1 - Keystrokes = < + Keystrokes = < item Command = ecUp ShortCut = 38 - end + end item Command = ecSelUp ShortCut = 8230 - end + end item Command = ecScrollUp ShortCut = 16422 - end + end item Command = ecDown ShortCut = 40 - end + end item Command = ecSelDown ShortCut = 8232 - end + end item Command = ecScrollDown ShortCut = 16424 - end + end item Command = ecLeft ShortCut = 37 - end + end item Command = ecSelLeft ShortCut = 8229 - end + end item Command = ecWordLeft ShortCut = 16421 - end + end item Command = ecSelWordLeft ShortCut = 24613 - end + end item Command = ecRight ShortCut = 39 - end + end item Command = ecSelRight ShortCut = 8231 - end + end item Command = ecWordRight ShortCut = 16423 - end + end item Command = ecSelWordRight ShortCut = 24615 - end + end item Command = ecPageDown ShortCut = 34 - end + end item Command = ecSelPageDown ShortCut = 8226 - end + end item Command = ecPageBottom ShortCut = 16418 - end + end item Command = ecSelPageBottom ShortCut = 24610 - end + end item Command = ecPageUp ShortCut = 33 - end + end item Command = ecSelPageUp ShortCut = 8225 - end + end item Command = ecPageTop ShortCut = 16417 - end + end item Command = ecSelPageTop ShortCut = 24609 - end + end item Command = ecLineStart ShortCut = 36 - end + end item Command = ecSelLineStart ShortCut = 8228 - end + end item Command = ecEditorTop ShortCut = 16420 - end + end item Command = ecSelEditorTop ShortCut = 24612 - end + end item Command = ecLineEnd ShortCut = 35 - end + end item Command = ecSelLineEnd ShortCut = 8227 - end + end item Command = ecEditorBottom ShortCut = 16419 - end + end item Command = ecSelEditorBottom ShortCut = 24611 - end + end item Command = ecToggleMode ShortCut = 45 - end + end item Command = ecCopy ShortCut = 16429 - end + end item Command = ecPaste ShortCut = 8237 - end + end item Command = ecDeleteChar ShortCut = 46 - end + end item Command = ecCut ShortCut = 8238 - end + end item Command = ecDeleteLastChar ShortCut = 8 - end + end item Command = ecDeleteLastChar ShortCut = 8200 - end + end item Command = ecDeleteLastWord ShortCut = 16392 - end + end item Command = ecUndo ShortCut = 32776 - end + end item Command = ecRedo ShortCut = 40968 - end + end item Command = ecLineBreak ShortCut = 13 - end + end item Command = ecSelectAll ShortCut = 16449 - end + end item Command = ecCopy ShortCut = 16451 - end + end item Command = ecBlockIndent ShortCut = 24649 - end + end item Command = ecLineBreak ShortCut = 16461 - end + end item Command = ecInsertLine ShortCut = 16462 - end + end item Command = ecDeleteWord ShortCut = 16468 - end + end item Command = ecBlockUnindent ShortCut = 24661 - end + end item Command = ecPaste ShortCut = 16470 - end + end item Command = ecCut ShortCut = 16472 - end + end item Command = ecDeleteLine ShortCut = 16473 - end + end item Command = ecDeleteEOL ShortCut = 24665 - end + end item Command = ecUndo ShortCut = 16474 - end + end item Command = ecRedo ShortCut = 24666 - end + end item Command = ecGotoMarker0 ShortCut = 16432 - end + end item Command = ecGotoMarker1 ShortCut = 16433 - end + end item Command = ecGotoMarker2 ShortCut = 16434 - end + end item Command = ecGotoMarker3 ShortCut = 16435 - end + end item Command = ecGotoMarker4 ShortCut = 16436 - end + end item Command = ecGotoMarker5 ShortCut = 16437 - end + end item Command = ecGotoMarker6 ShortCut = 16438 - end + end item Command = ecGotoMarker7 ShortCut = 16439 - end + end item Command = ecGotoMarker8 ShortCut = 16440 - end + end item Command = ecGotoMarker9 ShortCut = 16441 - end + end item Command = ecSetMarker0 ShortCut = 24624 - end + end item Command = ecSetMarker1 ShortCut = 24625 - end + end item Command = ecSetMarker2 ShortCut = 24626 - end + end item Command = ecSetMarker3 ShortCut = 24627 - end + end item Command = ecSetMarker4 ShortCut = 24628 - end + end item Command = ecSetMarker5 ShortCut = 24629 - end + end item Command = ecSetMarker6 ShortCut = 24630 - end + end item Command = ecSetMarker7 ShortCut = 24631 - end + end item Command = ecSetMarker8 ShortCut = 24632 - end + end item Command = ecSetMarker9 ShortCut = 24633 - end + end item Command = EcFoldLevel1 ShortCut = 41009 - end + end item Command = EcFoldLevel2 ShortCut = 41010 - end + end item Command = EcFoldLevel1 ShortCut = 41011 - end + end item Command = EcFoldLevel1 ShortCut = 41012 - end + end item Command = EcFoldLevel1 ShortCut = 41013 - end + end item Command = EcFoldLevel6 ShortCut = 41014 - end + end item Command = EcFoldLevel7 ShortCut = 41015 - end + end item Command = EcFoldLevel8 ShortCut = 41016 - end + end item Command = EcFoldLevel9 ShortCut = 41017 - end + end item Command = EcFoldLevel0 ShortCut = 41008 - end + end item Command = EcFoldCurrent ShortCut = 41005 - end + end item Command = EcUnFoldCurrent ShortCut = 41003 - end + end item Command = EcToggleMarkupWord ShortCut = 32845 - end + end item Command = ecNormalSelect ShortCut = 24654 - end + end item Command = ecColumnSelect ShortCut = 24643 - end + end item Command = ecLineSelect ShortCut = 24652 - end + end item Command = ecTab ShortCut = 9 - end + end item Command = ecShiftTab ShortCut = 8201 - end + end item Command = ecMatchBracket ShortCut = 24642 - end + end item Command = ecColSelUp ShortCut = 40998 - end + end item Command = ecColSelDown ShortCut = 41000 - end + end item Command = ecColSelLeft ShortCut = 40997 - end + end item Command = ecColSelRight ShortCut = 40999 - end + end item Command = ecColSelPageDown ShortCut = 40994 - end + end item Command = ecColSelPageBottom ShortCut = 57378 - end + end item Command = ecColSelPageUp ShortCut = 40993 - end + end item Command = ecColSelPageTop ShortCut = 57377 - end + end item Command = ecColSelLineStart ShortCut = 40996 - end + end item Command = ecColSelLineEnd ShortCut = 40995 - end + end item Command = ecColSelEditorTop ShortCut = 57380 - end + end item Command = ecColSelEditorBottom ShortCut = 57379 end> - MouseActions = < + MouseActions = < item ShiftMask = [ssShift, ssAlt] ClickDir = cdDown Command = emcStartSelections MoveCaret = True - end + end item Shift = [ssShift] ShiftMask = [ssShift, ssAlt] @@ -1293,14 +1296,14 @@ object FPDocEditor: TFPDocEditor Command = emcStartSelections MoveCaret = True Option = 1 - end + end item Shift = [ssAlt] ShiftMask = [ssShift, ssAlt] ClickDir = cdDown Command = emcStartColumnSelections MoveCaret = True - end + end item Shift = [ssShift, ssAlt] ShiftMask = [ssShift, ssAlt] @@ -1308,42 +1311,42 @@ object FPDocEditor: TFPDocEditor Command = emcStartColumnSelections MoveCaret = True Option = 1 - end + end item Button = mbRight Command = emcContextMenu - end + end item ClickCount = ccDouble ClickDir = cdDown Command = emcSelectWord MoveCaret = True - end + end item ClickCount = ccTriple ClickDir = cdDown Command = emcSelectLine MoveCaret = True - end + end item ClickCount = ccQuad ClickDir = cdDown Command = emcSelectPara MoveCaret = True - end + end item Button = mbMiddle ClickDir = cdDown Command = emcPasteSelection MoveCaret = True - end + end item Shift = [ssCtrl] ShiftMask = [ssShift, ssAlt, ssCtrl] Command = emcMouseLink end> MouseTextActions = <> - MouseSelActions = < + MouseSelActions = < item ClickDir = cdDown Command = emcStartDragMove @@ -1351,6 +1354,9 @@ object FPDocEditor: TFPDocEditor Lines.Strings = ( 'ErrorsSynEdit' ) + Options = [eoAutoIndent, eoBracketHighlight, eoGroupUndo, eoHideRightMargin, eoKeepCaretX, eoTabsToSpaces, eoTrimTrailingSpaces, eoDragDropEditing, eoDoubleClickSelectsLine] + Options2 = [eoCaretSkipTab, eoOverwriteBlock] + MouseOptions = [emDragDropEditing, emDoubleClickSelectsLine] VisibleSpecialChars = [vscSpace, vscTabAtLast] ScrollBars = ssAutoBoth SelectedColor.BackPriority = 50 @@ -1428,456 +1434,456 @@ object FPDocEditor: TFPDocEditor TabOrder = 0 Gutter.Visible = False Gutter.Width = 55 - Gutter.MouseActions = < + Gutter.MouseActions = < item ClickCount = ccAny ClickDir = cdDown Command = emcOnMainGutterClick - end + end item Button = mbRight Command = emcContextMenu end> RightGutter.Width = 0 - RightGutter.MouseActions = < + RightGutter.MouseActions = < item ClickCount = ccAny ClickDir = cdDown Command = emcOnMainGutterClick - end + end item Button = mbRight Command = emcContextMenu end> Highlighter = SynXMLSyn1 - Keystrokes = < + Keystrokes = < item Command = ecUp ShortCut = 38 - end + end item Command = ecSelUp ShortCut = 8230 - end + end item Command = ecScrollUp ShortCut = 16422 - end + end item Command = ecDown ShortCut = 40 - end + end item Command = ecSelDown ShortCut = 8232 - end + end item Command = ecScrollDown ShortCut = 16424 - end + end item Command = ecLeft ShortCut = 37 - end + end item Command = ecSelLeft ShortCut = 8229 - end + end item Command = ecWordLeft ShortCut = 16421 - end + end item Command = ecSelWordLeft ShortCut = 24613 - end + end item Command = ecRight ShortCut = 39 - end + end item Command = ecSelRight ShortCut = 8231 - end + end item Command = ecWordRight ShortCut = 16423 - end + end item Command = ecSelWordRight ShortCut = 24615 - end + end item Command = ecPageDown ShortCut = 34 - end + end item Command = ecSelPageDown ShortCut = 8226 - end + end item Command = ecPageBottom ShortCut = 16418 - end + end item Command = ecSelPageBottom ShortCut = 24610 - end + end item Command = ecPageUp ShortCut = 33 - end + end item Command = ecSelPageUp ShortCut = 8225 - end + end item Command = ecPageTop ShortCut = 16417 - end + end item Command = ecSelPageTop ShortCut = 24609 - end + end item Command = ecLineStart ShortCut = 36 - end + end item Command = ecSelLineStart ShortCut = 8228 - end + end item Command = ecEditorTop ShortCut = 16420 - end + end item Command = ecSelEditorTop ShortCut = 24612 - end + end item Command = ecLineEnd ShortCut = 35 - end + end item Command = ecSelLineEnd ShortCut = 8227 - end + end item Command = ecEditorBottom ShortCut = 16419 - end + end item Command = ecSelEditorBottom ShortCut = 24611 - end + end item Command = ecToggleMode ShortCut = 45 - end + end item Command = ecCopy ShortCut = 16429 - end + end item Command = ecPaste ShortCut = 8237 - end + end item Command = ecDeleteChar ShortCut = 46 - end + end item Command = ecCut ShortCut = 8238 - end + end item Command = ecDeleteLastChar ShortCut = 8 - end + end item Command = ecDeleteLastChar ShortCut = 8200 - end + end item Command = ecDeleteLastWord ShortCut = 16392 - end + end item Command = ecUndo ShortCut = 32776 - end + end item Command = ecRedo ShortCut = 40968 - end + end item Command = ecLineBreak ShortCut = 13 - end + end item Command = ecSelectAll ShortCut = 16449 - end + end item Command = ecCopy ShortCut = 16451 - end + end item Command = ecBlockIndent ShortCut = 24649 - end + end item Command = ecLineBreak ShortCut = 16461 - end + end item Command = ecInsertLine ShortCut = 16462 - end + end item Command = ecDeleteWord ShortCut = 16468 - end + end item Command = ecBlockUnindent ShortCut = 24661 - end + end item Command = ecPaste ShortCut = 16470 - end + end item Command = ecCut ShortCut = 16472 - end + end item Command = ecDeleteLine ShortCut = 16473 - end + end item Command = ecDeleteEOL ShortCut = 24665 - end + end item Command = ecUndo ShortCut = 16474 - end + end item Command = ecRedo ShortCut = 24666 - end + end item Command = ecGotoMarker0 ShortCut = 16432 - end + end item Command = ecGotoMarker1 ShortCut = 16433 - end + end item Command = ecGotoMarker2 ShortCut = 16434 - end + end item Command = ecGotoMarker3 ShortCut = 16435 - end + end item Command = ecGotoMarker4 ShortCut = 16436 - end + end item Command = ecGotoMarker5 ShortCut = 16437 - end + end item Command = ecGotoMarker6 ShortCut = 16438 - end + end item Command = ecGotoMarker7 ShortCut = 16439 - end + end item Command = ecGotoMarker8 ShortCut = 16440 - end + end item Command = ecGotoMarker9 ShortCut = 16441 - end + end item Command = ecSetMarker0 ShortCut = 24624 - end + end item Command = ecSetMarker1 ShortCut = 24625 - end + end item Command = ecSetMarker2 ShortCut = 24626 - end + end item Command = ecSetMarker3 ShortCut = 24627 - end + end item Command = ecSetMarker4 ShortCut = 24628 - end + end item Command = ecSetMarker5 ShortCut = 24629 - end + end item Command = ecSetMarker6 ShortCut = 24630 - end + end item Command = ecSetMarker7 ShortCut = 24631 - end + end item Command = ecSetMarker8 ShortCut = 24632 - end + end item Command = ecSetMarker9 ShortCut = 24633 - end + end item Command = EcFoldLevel1 ShortCut = 41009 - end + end item Command = EcFoldLevel2 ShortCut = 41010 - end + end item Command = EcFoldLevel1 ShortCut = 41011 - end + end item Command = EcFoldLevel1 ShortCut = 41012 - end + end item Command = EcFoldLevel1 ShortCut = 41013 - end + end item Command = EcFoldLevel6 ShortCut = 41014 - end + end item Command = EcFoldLevel7 ShortCut = 41015 - end + end item Command = EcFoldLevel8 ShortCut = 41016 - end + end item Command = EcFoldLevel9 ShortCut = 41017 - end + end item Command = EcFoldLevel0 ShortCut = 41008 - end + end item Command = EcFoldCurrent ShortCut = 41005 - end + end item Command = EcUnFoldCurrent ShortCut = 41003 - end + end item Command = EcToggleMarkupWord ShortCut = 32845 - end + end item Command = ecNormalSelect ShortCut = 24654 - end + end item Command = ecColumnSelect ShortCut = 24643 - end + end item Command = ecLineSelect ShortCut = 24652 - end + end item Command = ecTab ShortCut = 9 - end + end item Command = ecShiftTab ShortCut = 8201 - end + end item Command = ecMatchBracket ShortCut = 24642 - end + end item Command = ecColSelUp ShortCut = 40998 - end + end item Command = ecColSelDown ShortCut = 41000 - end + end item Command = ecColSelLeft ShortCut = 40997 - end + end item Command = ecColSelRight ShortCut = 40999 - end + end item Command = ecColSelPageDown ShortCut = 40994 - end + end item Command = ecColSelPageBottom ShortCut = 57378 - end + end item Command = ecColSelPageUp ShortCut = 40993 - end + end item Command = ecColSelPageTop ShortCut = 57377 - end + end item Command = ecColSelLineStart ShortCut = 40996 - end + end item Command = ecColSelLineEnd ShortCut = 40995 - end + end item Command = ecColSelEditorTop ShortCut = 57380 - end + end item Command = ecColSelEditorBottom ShortCut = 57379 end> - MouseActions = < + MouseActions = < item ShiftMask = [ssShift, ssAlt] ClickDir = cdDown Command = emcStartSelections MoveCaret = True - end + end item Shift = [ssShift] ShiftMask = [ssShift, ssAlt] @@ -1885,14 +1891,14 @@ object FPDocEditor: TFPDocEditor Command = emcStartSelections MoveCaret = True Option = 1 - end + end item Shift = [ssAlt] ShiftMask = [ssShift, ssAlt] ClickDir = cdDown Command = emcStartColumnSelections MoveCaret = True - end + end item Shift = [ssShift, ssAlt] ShiftMask = [ssShift, ssAlt] @@ -1900,42 +1906,42 @@ object FPDocEditor: TFPDocEditor Command = emcStartColumnSelections MoveCaret = True Option = 1 - end + end item Button = mbRight Command = emcContextMenu - end + end item ClickCount = ccDouble ClickDir = cdDown Command = emcSelectWord MoveCaret = True - end + end item ClickCount = ccTriple ClickDir = cdDown Command = emcSelectLine MoveCaret = True - end + end item ClickCount = ccQuad ClickDir = cdDown Command = emcSelectPara MoveCaret = True - end + end item Button = mbMiddle ClickDir = cdDown Command = emcPasteSelection MoveCaret = True - end + end item Shift = [ssCtrl] ShiftMask = [ssShift, ssAlt, ssCtrl] Command = emcMouseLink end> MouseTextActions = <> - MouseSelActions = < + MouseSelActions = < item ClickDir = cdDown Command = emcStartDragMove @@ -1943,6 +1949,9 @@ object FPDocEditor: TFPDocEditor Lines.Strings = ( 'SeeAlsoSynEdit' ) + Options = [eoAutoIndent, eoBracketHighlight, eoGroupUndo, eoHideRightMargin, eoKeepCaretX, eoTabsToSpaces, eoTrimTrailingSpaces, eoDragDropEditing, eoDoubleClickSelectsLine] + Options2 = [eoCaretSkipTab, eoOverwriteBlock] + MouseOptions = [emDragDropEditing, emDoubleClickSelectsLine] VisibleSpecialChars = [vscSpace, vscTabAtLast] ScrollBars = ssAutoBoth SelectedColor.BackPriority = 50 @@ -2094,7 +2103,6 @@ object FPDocEditor: TFPDocEditor OnEnter = TopicControlEnter ScrollWidth = 168 TabOrder = 1 - TopIndex = -1 end end object Panel3: TPanel @@ -2135,518 +2143,521 @@ object FPDocEditor: TFPDocEditor OnEnter = TopicControlEnter Gutter.Visible = False Gutter.Width = 55 - Gutter.MouseActions = < - item - ClickCount = ccAny - ClickDir = cdDown - Command = emcOnMainGutterClick - end - item - Button = mbRight - Command = emcContextMenu - end> - RightGutter.Width = 0 - RightGutter.MouseActions = < - item - ClickCount = ccAny - ClickDir = cdDown - Command = emcOnMainGutterClick - end - item - Button = mbRight - Command = emcContextMenu - end> - Highlighter = SynXMLSyn1 - Keystrokes = < - item - Command = ecUp - ShortCut = 38 - end - item - Command = ecSelUp - ShortCut = 8230 - end - item - Command = ecScrollUp - ShortCut = 16422 - end - item - Command = ecDown - ShortCut = 40 - end - item - Command = ecSelDown - ShortCut = 8232 - end - item - Command = ecScrollDown - ShortCut = 16424 - end - item - Command = ecLeft - ShortCut = 37 - end - item - Command = ecSelLeft - ShortCut = 8229 - end - item - Command = ecWordLeft - ShortCut = 16421 - end - item - Command = ecSelWordLeft - ShortCut = 24613 - end - item - Command = ecRight - ShortCut = 39 - end - item - Command = ecSelRight - ShortCut = 8231 - end - item - Command = ecWordRight - ShortCut = 16423 - end - item - Command = ecSelWordRight - ShortCut = 24615 - end - item - Command = ecPageDown - ShortCut = 34 - end - item - Command = ecSelPageDown - ShortCut = 8226 - end - item - Command = ecPageBottom - ShortCut = 16418 - end - item - Command = ecSelPageBottom - ShortCut = 24610 - end - item - Command = ecPageUp - ShortCut = 33 - end - item - Command = ecSelPageUp - ShortCut = 8225 - end - item - Command = ecPageTop - ShortCut = 16417 - end - item - Command = ecSelPageTop - ShortCut = 24609 - end - item - Command = ecLineStart - ShortCut = 36 - end - item - Command = ecSelLineStart - ShortCut = 8228 - end - item - Command = ecEditorTop - ShortCut = 16420 - end - item - Command = ecSelEditorTop - ShortCut = 24612 - end - item - Command = ecLineEnd - ShortCut = 35 - end - item - Command = ecSelLineEnd - ShortCut = 8227 - end - item - Command = ecEditorBottom - ShortCut = 16419 - end - item - Command = ecSelEditorBottom - ShortCut = 24611 - end - item - Command = ecToggleMode - ShortCut = 45 - end - item - Command = ecCopy - ShortCut = 16429 - end - item - Command = ecPaste - ShortCut = 8237 - end - item - Command = ecDeleteChar - ShortCut = 46 - end - item - Command = ecCut - ShortCut = 8238 - end - item - Command = ecDeleteLastChar - ShortCut = 8 - end - item - Command = ecDeleteLastChar - ShortCut = 8200 - end - item - Command = ecDeleteLastWord - ShortCut = 16392 - end - item - Command = ecUndo - ShortCut = 32776 - end - item - Command = ecRedo - ShortCut = 40968 - end - item - Command = ecLineBreak - ShortCut = 13 - end - item - Command = ecSelectAll - ShortCut = 16449 - end - item - Command = ecCopy - ShortCut = 16451 - end - item - Command = ecBlockIndent - ShortCut = 24649 - end - item - Command = ecLineBreak - ShortCut = 16461 - end - item - Command = ecInsertLine - ShortCut = 16462 - end - item - Command = ecDeleteWord - ShortCut = 16468 - end - item - Command = ecBlockUnindent - ShortCut = 24661 - end - item - Command = ecPaste - ShortCut = 16470 - end - item - Command = ecCut - ShortCut = 16472 - end - item - Command = ecDeleteLine - ShortCut = 16473 - end - item - Command = ecDeleteEOL - ShortCut = 24665 - end - item - Command = ecUndo - ShortCut = 16474 - end - item - Command = ecRedo - ShortCut = 24666 - end - item - Command = ecGotoMarker0 - ShortCut = 16432 - end - item - Command = ecGotoMarker1 - ShortCut = 16433 - end - item - Command = ecGotoMarker2 - ShortCut = 16434 - end - item - Command = ecGotoMarker3 - ShortCut = 16435 - end - item - Command = ecGotoMarker4 - ShortCut = 16436 - end - item - Command = ecGotoMarker5 - ShortCut = 16437 - end - item - Command = ecGotoMarker6 - ShortCut = 16438 - end - item - Command = ecGotoMarker7 - ShortCut = 16439 - end - item - Command = ecGotoMarker8 - ShortCut = 16440 - end - item - Command = ecGotoMarker9 - ShortCut = 16441 - end - item - Command = ecSetMarker0 - ShortCut = 24624 - end - item - Command = ecSetMarker1 - ShortCut = 24625 - end - item - Command = ecSetMarker2 - ShortCut = 24626 - end - item - Command = ecSetMarker3 - ShortCut = 24627 - end - item - Command = ecSetMarker4 - ShortCut = 24628 - end - item - Command = ecSetMarker5 - ShortCut = 24629 - end - item - Command = ecSetMarker6 - ShortCut = 24630 - end - item - Command = ecSetMarker7 - ShortCut = 24631 - end - item - Command = ecSetMarker8 - ShortCut = 24632 - end - item - Command = ecSetMarker9 - ShortCut = 24633 - end - item - Command = EcFoldLevel1 - ShortCut = 41009 - end - item - Command = EcFoldLevel2 - ShortCut = 41010 - end - item - Command = EcFoldLevel1 - ShortCut = 41011 - end - item - Command = EcFoldLevel1 - ShortCut = 41012 - end - item - Command = EcFoldLevel1 - ShortCut = 41013 - end - item - Command = EcFoldLevel6 - ShortCut = 41014 - end - item - Command = EcFoldLevel7 - ShortCut = 41015 - end - item - Command = EcFoldLevel8 - ShortCut = 41016 - end - item - Command = EcFoldLevel9 - ShortCut = 41017 - end - item - Command = EcFoldLevel0 - ShortCut = 41008 - end - item - Command = EcFoldCurrent - ShortCut = 41005 - end - item - Command = EcUnFoldCurrent - ShortCut = 41003 - end - item - Command = EcToggleMarkupWord - ShortCut = 32845 - end - item - Command = ecNormalSelect - ShortCut = 24654 - end - item - Command = ecColumnSelect - ShortCut = 24643 - end - item - Command = ecLineSelect - ShortCut = 24652 - end - item - Command = ecTab - ShortCut = 9 - end - item - Command = ecShiftTab - ShortCut = 8201 - end - item - Command = ecMatchBracket - ShortCut = 24642 - end - item - Command = ecColSelUp - ShortCut = 40998 - end - item - Command = ecColSelDown - ShortCut = 41000 - end - item - Command = ecColSelLeft - ShortCut = 40997 - end - item - Command = ecColSelRight - ShortCut = 40999 - end - item - Command = ecColSelPageDown - ShortCut = 40994 - end - item - Command = ecColSelPageBottom - ShortCut = 57378 - end - item - Command = ecColSelPageUp - ShortCut = 40993 - end - item - Command = ecColSelPageTop - ShortCut = 57377 - end - item - Command = ecColSelLineStart - ShortCut = 40996 - end - item - Command = ecColSelLineEnd - ShortCut = 40995 - end - item - Command = ecColSelEditorTop - ShortCut = 57380 - end - item - Command = ecColSelEditorBottom - ShortCut = 57379 - end> - MouseActions = < - item - ShiftMask = [ssShift, ssAlt] - ClickDir = cdDown - Command = emcStartSelections - MoveCaret = True - end - item - Shift = [ssShift] - ShiftMask = [ssShift, ssAlt] - ClickDir = cdDown - Command = emcStartSelections - MoveCaret = True - Option = 1 - end - item - Shift = [ssAlt] - ShiftMask = [ssShift, ssAlt] - ClickDir = cdDown - Command = emcStartColumnSelections - MoveCaret = True - end - item - Shift = [ssShift, ssAlt] - ShiftMask = [ssShift, ssAlt] - ClickDir = cdDown - Command = emcStartColumnSelections - MoveCaret = True - Option = 1 - end - item - Button = mbRight - Command = emcContextMenu - end - item - ClickCount = ccDouble - ClickDir = cdDown - Command = emcSelectWord - MoveCaret = True - end - item - ClickCount = ccTriple - ClickDir = cdDown - Command = emcSelectLine - MoveCaret = True - end - item - ClickCount = ccQuad - ClickDir = cdDown - Command = emcSelectPara - MoveCaret = True - end - item - Button = mbMiddle - ClickDir = cdDown - Command = emcPasteSelection - MoveCaret = True - end - item - Shift = [ssCtrl] - ShiftMask = [ssShift, ssAlt, ssCtrl] - Command = emcMouseLink - end> - MouseTextActions = <> - MouseSelActions = < - item - ClickDir = cdDown - Command = emcStartDragMove - end> + Gutter.MouseActions = < + item + ClickCount = ccAny + ClickDir = cdDown + Command = emcOnMainGutterClick + end + item + Button = mbRight + Command = emcContextMenu + end> + RightGutter.Width = 0 + RightGutter.MouseActions = < + item + ClickCount = ccAny + ClickDir = cdDown + Command = emcOnMainGutterClick + end + item + Button = mbRight + Command = emcContextMenu + end> + Highlighter = SynXMLSyn1 + Keystrokes = < + item + Command = ecUp + ShortCut = 38 + end + item + Command = ecSelUp + ShortCut = 8230 + end + item + Command = ecScrollUp + ShortCut = 16422 + end + item + Command = ecDown + ShortCut = 40 + end + item + Command = ecSelDown + ShortCut = 8232 + end + item + Command = ecScrollDown + ShortCut = 16424 + end + item + Command = ecLeft + ShortCut = 37 + end + item + Command = ecSelLeft + ShortCut = 8229 + end + item + Command = ecWordLeft + ShortCut = 16421 + end + item + Command = ecSelWordLeft + ShortCut = 24613 + end + item + Command = ecRight + ShortCut = 39 + end + item + Command = ecSelRight + ShortCut = 8231 + end + item + Command = ecWordRight + ShortCut = 16423 + end + item + Command = ecSelWordRight + ShortCut = 24615 + end + item + Command = ecPageDown + ShortCut = 34 + end + item + Command = ecSelPageDown + ShortCut = 8226 + end + item + Command = ecPageBottom + ShortCut = 16418 + end + item + Command = ecSelPageBottom + ShortCut = 24610 + end + item + Command = ecPageUp + ShortCut = 33 + end + item + Command = ecSelPageUp + ShortCut = 8225 + end + item + Command = ecPageTop + ShortCut = 16417 + end + item + Command = ecSelPageTop + ShortCut = 24609 + end + item + Command = ecLineStart + ShortCut = 36 + end + item + Command = ecSelLineStart + ShortCut = 8228 + end + item + Command = ecEditorTop + ShortCut = 16420 + end + item + Command = ecSelEditorTop + ShortCut = 24612 + end + item + Command = ecLineEnd + ShortCut = 35 + end + item + Command = ecSelLineEnd + ShortCut = 8227 + end + item + Command = ecEditorBottom + ShortCut = 16419 + end + item + Command = ecSelEditorBottom + ShortCut = 24611 + end + item + Command = ecToggleMode + ShortCut = 45 + end + item + Command = ecCopy + ShortCut = 16429 + end + item + Command = ecPaste + ShortCut = 8237 + end + item + Command = ecDeleteChar + ShortCut = 46 + end + item + Command = ecCut + ShortCut = 8238 + end + item + Command = ecDeleteLastChar + ShortCut = 8 + end + item + Command = ecDeleteLastChar + ShortCut = 8200 + end + item + Command = ecDeleteLastWord + ShortCut = 16392 + end + item + Command = ecUndo + ShortCut = 32776 + end + item + Command = ecRedo + ShortCut = 40968 + end + item + Command = ecLineBreak + ShortCut = 13 + end + item + Command = ecSelectAll + ShortCut = 16449 + end + item + Command = ecCopy + ShortCut = 16451 + end + item + Command = ecBlockIndent + ShortCut = 24649 + end + item + Command = ecLineBreak + ShortCut = 16461 + end + item + Command = ecInsertLine + ShortCut = 16462 + end + item + Command = ecDeleteWord + ShortCut = 16468 + end + item + Command = ecBlockUnindent + ShortCut = 24661 + end + item + Command = ecPaste + ShortCut = 16470 + end + item + Command = ecCut + ShortCut = 16472 + end + item + Command = ecDeleteLine + ShortCut = 16473 + end + item + Command = ecDeleteEOL + ShortCut = 24665 + end + item + Command = ecUndo + ShortCut = 16474 + end + item + Command = ecRedo + ShortCut = 24666 + end + item + Command = ecGotoMarker0 + ShortCut = 16432 + end + item + Command = ecGotoMarker1 + ShortCut = 16433 + end + item + Command = ecGotoMarker2 + ShortCut = 16434 + end + item + Command = ecGotoMarker3 + ShortCut = 16435 + end + item + Command = ecGotoMarker4 + ShortCut = 16436 + end + item + Command = ecGotoMarker5 + ShortCut = 16437 + end + item + Command = ecGotoMarker6 + ShortCut = 16438 + end + item + Command = ecGotoMarker7 + ShortCut = 16439 + end + item + Command = ecGotoMarker8 + ShortCut = 16440 + end + item + Command = ecGotoMarker9 + ShortCut = 16441 + end + item + Command = ecSetMarker0 + ShortCut = 24624 + end + item + Command = ecSetMarker1 + ShortCut = 24625 + end + item + Command = ecSetMarker2 + ShortCut = 24626 + end + item + Command = ecSetMarker3 + ShortCut = 24627 + end + item + Command = ecSetMarker4 + ShortCut = 24628 + end + item + Command = ecSetMarker5 + ShortCut = 24629 + end + item + Command = ecSetMarker6 + ShortCut = 24630 + end + item + Command = ecSetMarker7 + ShortCut = 24631 + end + item + Command = ecSetMarker8 + ShortCut = 24632 + end + item + Command = ecSetMarker9 + ShortCut = 24633 + end + item + Command = EcFoldLevel1 + ShortCut = 41009 + end + item + Command = EcFoldLevel2 + ShortCut = 41010 + end + item + Command = EcFoldLevel1 + ShortCut = 41011 + end + item + Command = EcFoldLevel1 + ShortCut = 41012 + end + item + Command = EcFoldLevel1 + ShortCut = 41013 + end + item + Command = EcFoldLevel6 + ShortCut = 41014 + end + item + Command = EcFoldLevel7 + ShortCut = 41015 + end + item + Command = EcFoldLevel8 + ShortCut = 41016 + end + item + Command = EcFoldLevel9 + ShortCut = 41017 + end + item + Command = EcFoldLevel0 + ShortCut = 41008 + end + item + Command = EcFoldCurrent + ShortCut = 41005 + end + item + Command = EcUnFoldCurrent + ShortCut = 41003 + end + item + Command = EcToggleMarkupWord + ShortCut = 32845 + end + item + Command = ecNormalSelect + ShortCut = 24654 + end + item + Command = ecColumnSelect + ShortCut = 24643 + end + item + Command = ecLineSelect + ShortCut = 24652 + end + item + Command = ecTab + ShortCut = 9 + end + item + Command = ecShiftTab + ShortCut = 8201 + end + item + Command = ecMatchBracket + ShortCut = 24642 + end + item + Command = ecColSelUp + ShortCut = 40998 + end + item + Command = ecColSelDown + ShortCut = 41000 + end + item + Command = ecColSelLeft + ShortCut = 40997 + end + item + Command = ecColSelRight + ShortCut = 40999 + end + item + Command = ecColSelPageDown + ShortCut = 40994 + end + item + Command = ecColSelPageBottom + ShortCut = 57378 + end + item + Command = ecColSelPageUp + ShortCut = 40993 + end + item + Command = ecColSelPageTop + ShortCut = 57377 + end + item + Command = ecColSelLineStart + ShortCut = 40996 + end + item + Command = ecColSelLineEnd + ShortCut = 40995 + end + item + Command = ecColSelEditorTop + ShortCut = 57380 + end + item + Command = ecColSelEditorBottom + ShortCut = 57379 + end> + MouseActions = < + item + ShiftMask = [ssShift, ssAlt] + ClickDir = cdDown + Command = emcStartSelections + MoveCaret = True + end + item + Shift = [ssShift] + ShiftMask = [ssShift, ssAlt] + ClickDir = cdDown + Command = emcStartSelections + MoveCaret = True + Option = 1 + end + item + Shift = [ssAlt] + ShiftMask = [ssShift, ssAlt] + ClickDir = cdDown + Command = emcStartColumnSelections + MoveCaret = True + end + item + Shift = [ssShift, ssAlt] + ShiftMask = [ssShift, ssAlt] + ClickDir = cdDown + Command = emcStartColumnSelections + MoveCaret = True + Option = 1 + end + item + Button = mbRight + Command = emcContextMenu + end + item + ClickCount = ccDouble + ClickDir = cdDown + Command = emcSelectWord + MoveCaret = True + end + item + ClickCount = ccTriple + ClickDir = cdDown + Command = emcSelectLine + MoveCaret = True + end + item + ClickCount = ccQuad + ClickDir = cdDown + Command = emcSelectPara + MoveCaret = True + end + item + Button = mbMiddle + ClickDir = cdDown + Command = emcPasteSelection + MoveCaret = True + end + item + Shift = [ssCtrl] + ShiftMask = [ssShift, ssAlt, ssCtrl] + Command = emcMouseLink + end> + MouseTextActions = <> + MouseSelActions = < + item + ClickDir = cdDown + Command = emcStartDragMove + end> + Options = [eoAutoIndent, eoBracketHighlight, eoGroupUndo, eoHideRightMargin, eoKeepCaretX, eoTabsToSpaces, eoTrimTrailingSpaces, eoDragDropEditing, eoDoubleClickSelectsLine] + Options2 = [eoCaretSkipTab, eoOverwriteBlock] + MouseOptions = [emDragDropEditing, emDoubleClickSelectsLine] VisibleSpecialChars = [vscSpace, vscTabAtLast] SelectedColor.BackPriority = 50 SelectedColor.ForePriority = 50 diff --git a/ide/fpdoceditwindow.pas b/ide/fpdoceditwindow.pas index 0057c8ac63..3feb26c9b4 100644 --- a/ide/fpdoceditwindow.pas +++ b/ide/fpdoceditwindow.pas @@ -38,7 +38,7 @@ uses LResources, StdCtrls, Buttons, ComCtrls, Controls, Dialogs, ExtCtrls, Forms, Graphics, LCLType, LCLProc, // Synedit - SynEdit, SynHighlighterXML, + SynEdit, SynHighlighterXML, SynEditFoldedView, SynEditWrappedView, // codetools FileProcs, CodeCache, CodeToolManager, CTXMLFixFragment, // IDEIntf @@ -248,6 +248,15 @@ begin end; procedure TFPDocEditor.FormCreate(Sender: TObject); + procedure UpdateSynEdit(ASynEd: TSynEdit); + var + fld: TSynEditFoldedView; + begin + fld := TSynEditFoldedView(ASynEd.TextViewsManager.SynTextViewByClass[TSynEditFoldedView]); + if fld <> nil then + fld.FoldProvider.Enabled := False; + TLazSynEditLineWrapPlugin.Create(ASynEd); + end; begin Caption := lisCodeHelpMainFormCaption; @@ -307,6 +316,11 @@ begin SourceEditorManagerIntf.RegisterChangeEvent(semEditorStatus, @DoEditorUpdate); SourceEditorManagerIntf.RegisterChangeEvent(semEditorMouseUp, @DoEditorMouseUp); + UpdateSynEdit(TopicDescrSynEdit); + UpdateSynEdit(DescrSynEdit); + UpdateSynEdit(ErrorsSynEdit); + UpdateSynEdit(SeeAlsoSynEdit); + FollowCursor:=true; IdleConnected:=true; end;