diff --git a/ide/frames/compiler_buildmacro_options.lfm b/ide/frames/compiler_buildmacro_options.lfm index 634e9299cf..16f1b2553a 100644 --- a/ide/frames/compiler_buildmacro_options.lfm +++ b/ide/frames/compiler_buildmacro_options.lfm @@ -1,5 +1,7 @@ -inherited CompOptBuildMacrosFrame: TCompOptBuildMacrosFrame +object CompOptBuildMacrosFrame: TCompOptBuildMacrosFrame + Left = 0 Height = 444 + Top = 0 Width = 514 ClientHeight = 444 ClientWidth = 514 @@ -7,15 +9,15 @@ inherited CompOptBuildMacrosFrame: TCompOptBuildMacrosFrame Visible = False DesignLeft = 304 DesignTop = 213 - object MacrosGroupBox: TGroupBox[0] + object MacrosGroupBox: TGroupBox Left = 0 Height = 243 Top = 0 Width = 514 Align = alTop Caption = 'MacrosGroupBox' - ClientHeight = 223 - ClientWidth = 508 + ClientHeight = 225 + ClientWidth = 510 TabOrder = 0 object BuildMacrosTreeView: TTreeView AnchorSideLeft.Control = MacrosGroupBox @@ -25,7 +27,7 @@ inherited CompOptBuildMacrosFrame: TCompOptBuildMacrosFrame AnchorSideBottom.Control = MacrosGroupBox AnchorSideBottom.Side = asrBottom Left = 0 - Height = 201 + Height = 203 Top = 22 Width = 227 Anchors = [akTop, akLeft, akBottom] @@ -43,7 +45,7 @@ inherited CompOptBuildMacrosFrame: TCompOptBuildMacrosFrame AnchorSideBottom.Control = MacrosGroupBox AnchorSideBottom.Side = asrBottom Left = 233 - Height = 223 + Height = 225 Top = 0 Width = 5 Align = alNone @@ -53,35 +55,45 @@ inherited CompOptBuildMacrosFrame: TCompOptBuildMacrosFrame AnchorSideLeft.Control = Splitter1 AnchorSideLeft.Side = asrBottom Left = 244 - Height = 223 + Height = 225 Top = 0 - Width = 264 + Width = 266 Align = alRight Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Left = 6 Caption = 'BuildMacroSelectedGroupBox' - ClientHeight = 203 - ClientWidth = 258 + ClientHeight = 207 + ClientWidth = 262 TabOrder = 2 object BuildMacroDefaultLabel: TLabel + AnchorSideLeft.Control = BuildMacroSelectedGroupBox + AnchorSideTop.Control = BMAddMacroValueSpeedButton + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = BuildMacroSelectedGroupBox + AnchorSideRight.Side = asrBottom + AnchorSideBottom.Control = BuildMacroSelectedGroupBox + AnchorSideBottom.Side = asrBottom Left = 6 - Height = 129 - Top = 68 - Width = 246 - Align = alBottom + Height = 122 + Top = 79 + Width = 250 + Anchors = [akTop, akLeft, akRight, akBottom] AutoSize = False - BorderSpacing.Top = 15 BorderSpacing.Around = 6 Caption = 'BuildMacroDefaultLabel' ParentColor = False WordWrap = True end object BuildMacroDescriptionLabel: TLabel + AnchorSideLeft.Control = BuildMacroSelectedGroupBox + AnchorSideTop.Control = BuildMacroSelectedGroupBox + AnchorSideRight.Control = BuildMacroSelectedGroupBox + AnchorSideRight.Side = asrBottom Left = 6 Height = 16 Top = 6 - Width = 246 - Align = alTop + Width = 250 + Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Top = 6 BorderSpacing.Right = 6 @@ -89,11 +101,16 @@ inherited CompOptBuildMacrosFrame: TCompOptBuildMacrosFrame ParentColor = False end object BuildMacroDescriptionEdit: TEdit + AnchorSideLeft.Control = BuildMacroSelectedGroupBox + AnchorSideTop.Control = BuildMacroDescriptionLabel + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = BuildMacroSelectedGroupBox + AnchorSideRight.Side = asrBottom Left = 6 Height = 23 Top = 22 - Width = 246 - Align = alTop + Width = 250 + Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Right = 6 OnExit = BuildMacroDescriptionEditExit @@ -101,11 +118,14 @@ inherited CompOptBuildMacrosFrame: TCompOptBuildMacrosFrame Text = 'BuildMacroDescriptionEdit' end object BMAddMacroValueSpeedButton: TSpeedButton + AnchorSideLeft.Control = BuildMacroSelectedGroupBox + AnchorSideTop.Control = BuildMacroDescriptionEdit + AnchorSideTop.Side = asrBottom Left = 6 Height = 22 - Top = 48 + Top = 51 Width = 23 - BorderSpacing.Left = 6 + BorderSpacing.Around = 6 NumGlyphs = 0 OnClick = BMAddMacroValueSpeedButtonClick ShowHint = True @@ -138,7 +158,7 @@ inherited CompOptBuildMacrosFrame: TCompOptBuildMacrosFrame ParentShowHint = False end end - object MacrosSplitter: TSplitter[1] + object MacrosSplitter: TSplitter Cursor = crVSplit Left = 0 Height = 5 @@ -147,21 +167,21 @@ inherited CompOptBuildMacrosFrame: TCompOptBuildMacrosFrame Align = alTop ResizeAnchor = akTop end - object ConditionalsGroupBox: TGroupBox[2] + object ConditionalsGroupBox: TGroupBox Left = 0 Height = 196 Top = 248 Width = 514 Align = alClient Caption = 'ConditionalsGroupBox' - ClientHeight = 176 - ClientWidth = 508 + ClientHeight = 178 + ClientWidth = 510 TabOrder = 2 inline CondSynEdit: TSynEdit Left = 0 - Height = 156 + Height = 155 Top = 0 - Width = 508 + Width = 510 Align = alClient Font.Height = 9 Font.Name = '-misc-dejavu sans mono-*-*-*-*-*-*-*-*-*-*-iso10646-1' @@ -170,55 +190,28 @@ inherited CompOptBuildMacrosFrame: TCompOptBuildMacrosFrame ParentColor = False ParentFont = False TabOrder = 0 - OnKeyDown = CondSynEditKeyDown OnKeyPress = CondSynEditKeyPress - Gutter.Width = 51 + Gutter.Width = 57 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 = < 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> Keystrokes = < item @@ -643,141 +636,96 @@ inherited CompOptBuildMacrosFrame: TCompOptBuildMacrosFrame 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 = ( 'CondSynEdit' ) 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 OnChange = CondSynEditChange - OnProcessCommand = CondSynEditProcessCommand OnProcessUserCommand = CondSynEditProcessUserCommand inline SynLeftGutterPartList1: TSynGutterPartList object SynGutterMarks1: TSynGutterMarks Width = 24 + MouseActions = <> end object SynGutterLineNumber1: TSynGutterLineNumber - Width = 11 + Width = 17 MouseActions = <> MarkupInfo.Background = clBtnFace MarkupInfo.Foreground = clNone @@ -788,35 +736,26 @@ inherited CompOptBuildMacrosFrame: TCompOptBuildMacrosFrame end object SynGutterChanges1: TSynGutterChanges Width = 4 + MouseActions = <> ModifiedColor = 59900 SavedColor = clGreen end object SynGutterSeparator1: TSynGutterSeparator Width = 2 + MouseActions = <> end object SynGutterCodeFolding1: 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] @@ -824,67 +763,45 @@ inherited CompOptBuildMacrosFrame: TCompOptBuildMacrosFrame 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 end object CondStatusbar: TStatusBar Left = 0 - Height = 20 - Top = 156 - Width = 508 + Height = 23 + Top = 155 + Width = 510 Panels = < item Width = 80 diff --git a/ide/frames/compiler_buildmacro_options.pas b/ide/frames/compiler_buildmacro_options.pas index 1db4387730..47b4e800b9 100644 --- a/ide/frames/compiler_buildmacro_options.pas +++ b/ide/frames/compiler_buildmacro_options.pas @@ -76,11 +76,7 @@ type var AllowEdit: Boolean); procedure BuildMacrosTreeViewSelectionChanged(Sender: TObject); procedure CondSynEditChange(Sender: TObject); - procedure CondSynEditKeyDown(Sender: TObject; var Key: Word; - Shift: TShiftState); procedure CondSynEditKeyPress(Sender: TObject; var Key: char); - procedure CondSynEditProcessCommand(Sender: TObject; - var Command: TSynEditorCommand; var AChar: TUTF8Char; Data: pointer); procedure CondSynEditProcessUserCommand(Sender: TObject; var Command: TSynEditorCommand; var AChar: TUTF8Char; Data: pointer); procedure CondSynEditStatusChange(Sender: TObject; @@ -168,23 +164,12 @@ begin IdleConnected:=true; end; -procedure TCompOptBuildMacrosFrame.CondSynEditKeyDown(Sender: TObject; - var Key: Word; Shift: TShiftState); -begin -end; - procedure TCompOptBuildMacrosFrame.CondSynEditKeyPress(Sender: TObject; var Key: char); begin //debugln(['TCompOptBuildMacrosFrame.CondSynEditKeyPress ',ord(Key)]); end; -procedure TCompOptBuildMacrosFrame.CondSynEditProcessCommand(Sender: TObject; - var Command: TSynEditorCommand; var AChar: TUTF8Char; Data: pointer); -begin - -end; - procedure TCompOptBuildMacrosFrame.CondSynEditProcessUserCommand( Sender: TObject; var Command: TSynEditorCommand; var AChar: TUTF8Char; Data: pointer);