diff --git a/src/ce_d2syn.pas b/src/ce_d2syn.pas index 5ff55185..e07b8754 100644 --- a/src/ce_d2syn.pas +++ b/src/ce_d2syn.pas @@ -82,19 +82,20 @@ type function GetIdentChars: TSynIdentChars; override; published property foldKinds: TFoldKinds read fFoldKinds write setFoldKinds; - property whites: TSynHighlighterAttributes read fWhiteAttrib write setWhiteAttrib; - property numbers: TSynHighlighterAttributes read fNumbrAttrib write setNumbrAttrib; - property symbols: TSynHighlighterAttributes read fSymblAttrib write setSymblAttrib; - property identifiers: TSynHighlighterAttributes read fIdentAttrib write setIdentAttrib; - property comments: TSynHighlighterAttributes read fCommtAttrib write setCommtAttrib; - property strings: TSynHighlighterAttributes read fStrngAttrib write setStrngAttrib; - property keywords: TSynHighlighterAttributes read fKeywdAttrib write setKeywdAttrib; - property ddoc: TSynHighlighterAttributes read fDDocsAttrib write setDDocsAttrib; - property inlineAsm: TSynHighlighterAttributes read fAsblrAttrib write setAsblrAttrib; - property special: TSynHighlighterAttributes read fSpeckAttrib write setSpeckAttrib; - property errors: TSynHighlighterAttributes read fErrorAttrib write setErrorAttrib; - property attributes: TSynHighlighterAttributes read fAttriAttrib write setAttriAttrib; + property whites: TSynHighlighterAttributes read fWhiteAttrib write setWhiteAttrib stored true; + property numbers: TSynHighlighterAttributes read fNumbrAttrib write setNumbrAttrib stored true; + property symbols: TSynHighlighterAttributes read fSymblAttrib write setSymblAttrib stored true; + property identifiers: TSynHighlighterAttributes read fIdentAttrib write setIdentAttrib stored true; + property comments: TSynHighlighterAttributes read fCommtAttrib write setCommtAttrib stored true; + property strings: TSynHighlighterAttributes read fStrngAttrib write setStrngAttrib stored true; + property keywords: TSynHighlighterAttributes read fKeywdAttrib write setKeywdAttrib stored true; + property ddoc: TSynHighlighterAttributes read fDDocsAttrib write setDDocsAttrib stored true; + property inlineAsm: TSynHighlighterAttributes read fAsblrAttrib write setAsblrAttrib stored true; + property special: TSynHighlighterAttributes read fSpeckAttrib write setSpeckAttrib stored true; + property errors: TSynHighlighterAttributes read fErrorAttrib write setErrorAttrib stored true; + property attributes: TSynHighlighterAttributes read fAttriAttrib write setAttriAttrib stored true; property DefaultFilter stored false; + property enabled stored false; public constructor create(aOwner: TComponent); override; destructor destroy; override; diff --git a/src/ce_d2synpresets.pas b/src/ce_d2synpresets.pas index 79468db8..141a581a 100644 --- a/src/ce_d2synpresets.pas +++ b/src/ce_d2synpresets.pas @@ -324,7 +324,7 @@ begin selection.Background:= 15984598; selection.Foreground:= clNone; // - currentLine.Background:= 15727098; + currentLine.Background:= 15789545; currentLine.Foreground:= clNone; end; with fPresets.addPreset do @@ -422,16 +422,17 @@ begin folding.Background := clNone; folding.Foreground := clNone; folding.FrameColor := clBlack; - identifierMatch.Background := 14145500; + identifierMatch.Background := clNone; identifierMatch.Foreground := clNone; - identifierMatch.BackPriority := 2; + identifierMatch.FrameColor := clGray; + identifierMatch.BackPriority := 10; mouseLink.Background := clNone; mouseLink.Foreground := clNone; mouseLink.FrameColor := 3166415; mouseLink.FrameEdges := sfeBottom; - selection.Background := 14014190; + selection.Background := 12837345; selection.Foreground := clNone; - selection.BackPriority := 1; + selection.BackPriority := 10; end; with fPresets.addPreset do begin @@ -467,7 +468,6 @@ begin selection.Foreground := clNone; end; end; - // TODO-cd2synpresets: add more presets // fEditor := TSynEdit.Create(self); fEditor.Parent:= self; diff --git a/src/ce_dlangmaps.pas b/src/ce_dlangmaps.pas index c1eb8bd0..d14c0404 100644 --- a/src/ce_dlangmaps.pas +++ b/src/ce_dlangmaps.pas @@ -143,6 +143,7 @@ type false, false, false, false, false, false, false, false, false, false, false, false, false, false, false ); + // 100017a const fCoeffs: array[0..255] of Byte = ( 93, 12, 147, 37, 246, 76, 204, 47, 77, 0, 217, 84, 225, 244, 62, 63, 81, 2, diff --git a/src/ce_editoroptions.pas b/src/ce_editoroptions.pas index 214c355b..37f2e68e 100644 --- a/src/ce_editoroptions.pas +++ b/src/ce_editoroptions.pas @@ -201,6 +201,9 @@ begin fFoldedColor.Foreground := clDkGray; fFoldedColor.FrameColor := clDkGray; // + fSelAttribs.Background := 13421772; + fSelAttribs.Foreground := clNone; + // fMouseLinkAttribs.Style := [fsUnderline, fsBold]; fMouseLinkAttribs.StyleMask := []; fMouseLinkAttribs.Foreground := clNone; @@ -227,7 +230,7 @@ begin fBackground := clWhite; fRightEdgeColor := clSilver; // - fCurrLineAttribs.Background := fBackground - $080808; + fCurrLineAttribs.Background := 15789545; fCurrLineAttribs.Foreground := clNone; // options1 := diff --git a/src/ce_main.lfm b/src/ce_main.lfm index fb9b83ef..20243021 100644 --- a/src/ce_main.lfm +++ b/src/ce_main.lfm @@ -3832,6 +3832,42 @@ object CEMainForm: TCEMainForm end object MenuItem98: TMenuItem Action = actProjGroupCompileSync + Bitmap.Data = { + 36040000424D3604000000000000360000002800000010000000100000000100 + 2000000000000004000064000000640000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 001F000000080000003300000033000000040000002400000000000000000000 + 0000000000000000000000000000000000330000003300000033000000332D73 + BAAF1B3D60523F93D4FF3F93D4FF102438413578BAC300000024000000000000 + 0000000000230000002F00000000B88445FFC89451FFCE934AFF6D8192FF40A9 + EAFF429EDDFF52D0F8FF52D0F8FF439EDCFF48AAE2FF3980C8B6000000000000 + 0023AA7A3EBFB68243ED00000033B58142FFF5C378FFFCC371FFAD7E49FF3B9E + E3FF4ECFFBFF41B0EDFF42B1EDFF50CFFAFF439EDCFF1B3D5F5200000000AA7A + 3FBED2A76FFFD7A561FFB88241FFD39F58FFEDB96BFFF7B962FF288DE3FF4CCF + FCFF40B0EDFFC39F7BFF987653CB42B1EEFF52D0F9FF3F92D5FF00000000B984 + 43E9DDBB8CFFEEC486FFE8B466FFF1CC96FFF7DCB5FFFFDEADFF288CDFFF4CCE + FBFF3FAFEDFFFAB66DFFC7751FCE41B1EFFF52D0F9FF3F92D5FF000000330000 + 0033B78242FFE4B163FFEBC68EFFEACFA9FFD1A774FFD9A970FFCCBBA4FF399C + E1FF4CCEFBFF3FB0EEFF40B1EFFF4FCFFCFF429EDCFF16324E31B98545FFB782 + 42FFC8934EFFDFAB5EFFE4C494FFB68245DAB8813F3CBE823B2561809CFF37A8 + EFFF399DE3FF4CCFFDFF4AC7F8FF3D9EE1FF45AAE4FF3982CB9FC38F4EFFE2B5 + 72FFDEB06AFFDBA658FFC59555FF926935300000000000000000AA7333436A83 + 99FFCD9F5FFF298DE2FF2B8FE1FFB48B5AFF3081D29100000000C5995FFFF1DC + BBFFECD2ACFFD6A152FFC18C49FF70502A620000000C0000000C704F2861C88D + 44FFDFA24CFFEACEA6FFF1D7B2FFD79A51FF0000000000000000B98442FFB680 + 3EFFCEA673FFDBAE6EFFCB954BFFB88344FF6E4F2A616E4F2A61B88344FFCD97 + 4AFFDCAE6DFFD0A772FFB9813CFFBE843FFF0000000000000000000000000000 + 002FBA8547FFCE9949FFDAB276FFC9944BFFBE8943FFBE8943FFC9944BFFDAB2 + 76FFCE9949FFBA8546FF0000002F00000000000000000000000000000000B782 + 42ECD3AE7CFFE7CBA4FFEAD4B2FFE8D0ADFFCF9D56FFCF9D56FFE8D0ADFFEAD4 + B2FFE7CBA4FFD3AE7CFFB78242EC00000000000000000000000000000000B985 + 44AFCCA26CFFD4B080FFB98343FFCCA470FFC9984EFFC9984EFFCCA470FFB983 + 43FFD4B080FFCCA26CFFB98544AF000000000000000000000000000000000000 + 0000B98544AFB98443E900000000B78140FFE9D4B4FFE9D4B4FFB78140FF0000 + 0000B98443E9B98544AF00000000000000000000000000000000000000000000 + 0000000000000000000000000000BA8545FFB9843FFFB9843FFFBA8545FF0000 + 0000000000000000000000000000000000000000000000000000 + } end object MenuItem88: TMenuItem Action = actProjGroupCompile @@ -4393,6 +4429,42 @@ object CEMainForm: TCEMainForm end object MenuItem99: TMenuItem Action = actProjGroupCompileSync + Bitmap.Data = { + 36040000424D3604000000000000360000002800000010000000100000000100 + 2000000000000004000064000000640000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 001F000000080000003300000033000000040000002400000000000000000000 + 0000000000000000000000000000000000330000003300000033000000332D73 + BAAF1B3D60523F93D4FF3F93D4FF102438413578BAC300000024000000000000 + 0000000000230000002F00000000B88445FFC89451FFCE934AFF6D8192FF40A9 + EAFF429EDDFF52D0F8FF52D0F8FF439EDCFF48AAE2FF3980C8B6000000000000 + 0023AA7A3EBFB68243ED00000033B58142FFF5C378FFFCC371FFAD7E49FF3B9E + E3FF4ECFFBFF41B0EDFF42B1EDFF50CFFAFF439EDCFF1B3D5F5200000000AA7A + 3FBED2A76FFFD7A561FFB88241FFD39F58FFEDB96BFFF7B962FF288DE3FF4CCF + FCFF40B0EDFFC39F7BFF987653CB42B1EEFF52D0F9FF3F92D5FF00000000B984 + 43E9DDBB8CFFEEC486FFE8B466FFF1CC96FFF7DCB5FFFFDEADFF288CDFFF4CCE + FBFF3FAFEDFFFAB66DFFC7751FCE41B1EFFF52D0F9FF3F92D5FF000000330000 + 0033B78242FFE4B163FFEBC68EFFEACFA9FFD1A774FFD9A970FFCCBBA4FF399C + E1FF4CCEFBFF3FB0EEFF40B1EFFF4FCFFCFF429EDCFF16324E31B98545FFB782 + 42FFC8934EFFDFAB5EFFE4C494FFB68245DAB8813F3CBE823B2561809CFF37A8 + EFFF399DE3FF4CCFFDFF4AC7F8FF3D9EE1FF45AAE4FF3982CB9FC38F4EFFE2B5 + 72FFDEB06AFFDBA658FFC59555FF926935300000000000000000AA7333436A83 + 99FFCD9F5FFF298DE2FF2B8FE1FFB48B5AFF3081D29100000000C5995FFFF1DC + BBFFECD2ACFFD6A152FFC18C49FF70502A620000000C0000000C704F2861C88D + 44FFDFA24CFFEACEA6FFF1D7B2FFD79A51FF0000000000000000B98442FFB680 + 3EFFCEA673FFDBAE6EFFCB954BFFB88344FF6E4F2A616E4F2A61B88344FFCD97 + 4AFFDCAE6DFFD0A772FFB9813CFFBE843FFF0000000000000000000000000000 + 002FBA8547FFCE9949FFDAB276FFC9944BFFBE8943FFBE8943FFC9944BFFDAB2 + 76FFCE9949FFBA8546FF0000002F00000000000000000000000000000000B782 + 42ECD3AE7CFFE7CBA4FFEAD4B2FFE8D0ADFFCF9D56FFCF9D56FFE8D0ADFFEAD4 + B2FFE7CBA4FFD3AE7CFFB78242EC00000000000000000000000000000000B985 + 44AFCCA26CFFD4B080FFB98343FFCCA470FFC9984EFFC9984EFFCCA470FFB983 + 43FFD4B080FFCCA26CFFB98544AF000000000000000000000000000000000000 + 0000B98544AFB98443E900000000B78140FFE9D4B4FFE9D4B4FFB78140FF0000 + 0000B98443E9B98544AF00000000000000000000000000000000000000000000 + 0000000000000000000000000000BA8545FFB9843FFFB9843FFFBA8545FF0000 + 0000000000000000000000000000000000000000000000000000 + } end object MenuItem89: TMenuItem Action = actProjGroupCompile diff --git a/src/ce_main.pas b/src/ce_main.pas index 399d80e3..bbc6d575 100644 --- a/src/ce_main.pas +++ b/src/ce_main.pas @@ -1146,7 +1146,7 @@ begin DockMaster.HeaderStyle := adhsPoints; DockMaster.HideHeaderCaptionFloatingControl := true; - // this is a fix copied from Laz. + // this is a fix (?) copied from Laz. if DockManager is TAnchorDockManager then begin aManager:=TAnchorDockManager(DockManager); aManager.PreferredSiteSizeAsSiteMinimum:=false; @@ -1169,14 +1169,30 @@ begin // center DockMaster.ManualDock(DockMaster.GetAnchorSite(fEditWidg), DockMaster.GetSite(Self), alBottom); DockMaster.ManualDock(DockMaster.GetAnchorSite(fMesgWidg), DockMaster.GetSite(fEditWidg), alBottom); + DockMaster.ManualDock(DockMaster.GetAnchorSite(fLibMWidg), DockMaster.GetSite(fMesgWidg), alClient, fMesgWidg); + DockMaster.ManualDock(DockMaster.GetAnchorSite(fTodolWidg), DockMaster.GetSite(fMesgWidg), alClient, fMesgWidg); + fMesgWidg.showWidget; // left - DockMaster.GetAnchorSite(fSymlWidg).Width := 160; - DockMaster.GetAnchorSite(fFindWidg).Width := 160; + DockMaster.GetAnchorSite(fSymlWidg).Width := 120; + DockMaster.GetAnchorSite(fFindWidg).Width := 120; DockMaster.ManualDock(DockMaster.GetAnchorSite(fSymlWidg), DockMaster.GetSite(fEditWidg), alLeft); DockMaster.ManualDock(DockMaster.GetAnchorSite(fFindWidg), DockMaster.GetAnchorSite(fSymlWidg), alBottom, fSymlWidg); + DockMaster.ManualDock(DockMaster.GetAnchorSite(fPrInpWidg), DockMaster.GetAnchorSite(fFindWidg), alTop, fFindWidg); + DockMaster.ManualDock(DockMaster.GetAnchorSite(fExplWidg), DockMaster.GetSite(fSymlWidg), alClient, fSymlWidg); + if GetDockSplitter(DockMaster.GetSite(fFindWidg), akTop, topsplt) then + begin + topsplt.MoveSplitter(40); + topsplt := nil; + end; + if GetDockSplitter(DockMaster.GetSite(fPrInpWidg), akTop, topsplt) then + begin + topsplt.MoveSplitter(40); + topsplt := nil; + end; + fSymlWidg.showWidget; // right - DockMaster.GetAnchorSite(fProjWidg).Width := 260; - DockMaster.GetAnchorSite(fPrjCfWidg).Width := 260; + DockMaster.GetAnchorSite(fProjWidg).Width := 190; + DockMaster.GetAnchorSite(fPrjCfWidg).Width := 190; DockMaster.ManualDock(DockMaster.GetAnchorSite(fProjWidg), DockMaster.GetSite(fEditWidg), alRight); DockMaster.ManualDock(DockMaster.GetAnchorSite(fPrjCfWidg), DockMaster.GetAnchorSite(fProjWidg), alBottom, fProjWidg); // close remaining and header to top @@ -1188,6 +1204,7 @@ begin if not DockMaster.GetAnchorSite(widg).HasParent then DockMaster.GetAnchorSite(widg).Close; end; + WindowState:= wsMaximized; end; // lock space between the menu and the widgets