diff --git a/src/ce_dubprojeditor.lfm b/src/ce_dubprojeditor.lfm index b8f35af9..c79823cf 100644 --- a/src/ce_dubprojeditor.lfm +++ b/src/ce_dubprojeditor.lfm @@ -12,23 +12,23 @@ inherited CEDubProjectEditorWidget: TCEDubProjectEditorWidget ClientHeight = 424 ClientWidth = 411 inherited Content: TPanel - Height = 390 + Height = 388 Width = 411 - ClientHeight = 390 + ClientHeight = 388 ClientWidth = 411 object PageControl1: TPageControl[0] Left = 4 - Height = 382 + Height = 380 Top = 4 Width = 403 - ActivePage = TabSheet2 + ActivePage = TabSheet1 Align = alClient BorderSpacing.Around = 4 - TabIndex = 1 + TabIndex = 0 TabOrder = 0 object TabSheet1: TTabSheet Caption = 'Inspector' - ClientHeight = 346 + ClientHeight = 344 ClientWidth = 395 object pnlToolBar1: TPanel Left = 4 @@ -71,7 +71,7 @@ inherited CEDubProjectEditorWidget: TCEDubProjectEditorWidget end object treeInspect: TTreeView Left = 4 - Height = 310 + Height = 308 Top = 32 Width = 387 Align = alClient @@ -95,11 +95,11 @@ inherited CEDubProjectEditorWidget: TCEDubProjectEditorWidget end object TabSheet2: TTabSheet Caption = 'Editor' - ClientHeight = 346 + ClientHeight = 344 ClientWidth = 395 object propTree: TTreeView Left = 4 - Height = 282 + Height = 280 Top = 32 Width = 387 Align = alClient @@ -166,7 +166,7 @@ inherited CEDubProjectEditorWidget: TCEDubProjectEditorWidget object Panel1: TPanel Left = 2 Height = 26 - Top = 318 + Top = 316 Width = 391 Align = alBottom BorderSpacing.Around = 2 @@ -199,7 +199,7 @@ inherited CEDubProjectEditorWidget: TCEDubProjectEditorWidget end end inherited toolbar: TCEToolBar - Width = 407 + Width = 403 end end inherited contextMenu: TPopupMenu diff --git a/src/ce_editoroptions.pas b/src/ce_editoroptions.pas index 526ae4b2..a0ab5f4d 100644 --- a/src/ce_editoroptions.pas +++ b/src/ce_editoroptions.pas @@ -58,7 +58,7 @@ type fCompletionMenuCaseCare: boolean; fCompletionMenuWidth: integer; fCompletionMenuLines: Byte; - fAutoCLoseCurlyBrace: TBraceAutoCloseStyle; + fAutoCloseCurlyBrace: TBraceAutoCloseStyle; fPhobosDocRoot: TCEPathname; fAlwaysAdvancedFeatures: boolean; fAutoClosedPairs: TAutoClosePairs; @@ -80,7 +80,7 @@ type procedure setLineNumEvery(value: integer); published property alwaysAdvancedFeatures: boolean read fAlwaysAdvancedFeatures write fAlwaysAdvancedFeatures; - property autoCloseCurlyBrace: TBraceAutoCloseStyle read fAutoCLoseCurlyBrace write fAutoCLoseCurlyBrace default TBraceAutoCloseStyle.autoCloseNever; + property autoCloseCurlyBrace: TBraceAutoCloseStyle read fAutoCloseCurlyBrace write fAutoCloseCurlyBrace default TBraceAutoCloseStyle.autoCloseNever; property autoClosedPairs: TAutoClosePairs read fAutoClosedPairs write fAutoClosedPairs default[]; property autoDotDelay: integer read fAutoDotDelay write SetautoDotDelay; property background: TColor read fBackground write fBackground default clWhite; @@ -214,7 +214,10 @@ begin fIdentifierMarkup.BackAlpha:=70; fIdentiMatchOpts := [caseSensitive]; // - fCompletionMenuWidth:= 160; + fAutoCloseCurlyBrace:= autoCloseOnNewLineLexically; + fAutoClosedPairs:= [autoCloseSquareBracket]; + // + fCompletionMenuWidth:= 250; fCompletionMenuLines:= 15; // fLineNumEvery := 5; @@ -631,7 +634,7 @@ begin if not fResetFontSize then anEditor.Font.Size := savedSize; - anEditor.autoCloseCurlyBrace := fAutoCLoseCurlyBrace; + anEditor.autoCloseCurlyBrace := fAutoCloseCurlyBrace; anEditor.autoClosedPairs := fAutoClosedPairs; anEditor.completionMenu.TheForm.Width := fCompletionMenuWidth; anEditor.completionMenu.LinesInWindow := fCompletionMenuLines; diff --git a/src/ce_main.lfm b/src/ce_main.lfm index 9204d9ef..1cc02a37 100644 --- a/src/ce_main.lfm +++ b/src/ce_main.lfm @@ -1553,6 +1553,42 @@ object CEMainForm: TCEMainForm end object MenuItem97: TMenuItem Action = actFileNewDubScript + Bitmap.Data = { + 36040000424D3604000000000000360000002800000010000000100000000100 + 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000 + 00010000000100000001FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00000000010000000100000001FFFFFF00FFFFFF00FFFFFF000000002A0000 + 00BA000000BA000000BA000000910000001A00000046000000AA000000AC0000 + 005E000000A4000000BA000000BA000000A500000030000000010000003C0000 + 00FF000000A20000009A000000DD0000009E000000FB000001B6000001B60000 + 00FC000000930000009800000098000000C9000000E80000000F0000003C0000 + 00FF00000018FFFFFF0000000012000000D000000FA80000C8980000CF850000 + 0BA4000000CB00000003FFFFFF0000000027000000FF000000350000003C0000 + 00FF00000018FFFFFF0000000005000000E400002A8C0000BEE70000C2CD0000 + 2384000000E50000007500000092000000C4000000E80000000E0000003C0000 + 00FF00000018FFFFFF0000000006000000E5000000690000AA420000B4730000 + 2E8B000000E50000009D000000C5000000E3000000DA000000090000003C0000 + 00FF00000018FFFFFF000000001F000000F900000052FFFFFF0000007F0A0000 + 076E000000E400000007000000020000002F000000FF000000350000003C0000 + 00FF000000A20000009A000000DF000000D70000000CFFFFFF00FFFFFF000000 + 0069000000F40000009A00000098000000C3000000EE000000120000002A0000 + 00BA000000BA000000B9000000900000001AFFFFFF00FFFFFF00FFFFFF000000 + 004B000000BA000000BA000000BA000000AD0000003A00000001FFFFFF000000 + 00010000000100000001FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00000000010000000100000001FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 + } end object MenuItem2: TMenuItem Action = actFileOpen diff --git a/src/ce_main.pas b/src/ce_main.pas index 1c5318bd..dcf59381 100644 --- a/src/ce_main.pas +++ b/src/ce_main.pas @@ -542,6 +542,7 @@ begin fSplitterScrollSpeed := 2; fMaxRecentProjs := 10; fMaxRecentDocs :=10; + fFlatLook:=true; end; function TCEApplicationOptionsBase.getDubCompiler: TCECompiler; @@ -941,6 +942,7 @@ begin fProjectGroup := getProjectGroup; // getCMdParams; + fAppliOpts.assignTo(self); // fInitialized := true; end; diff --git a/src/ce_messages.lfm b/src/ce_messages.lfm index f20ffc54..7b7a0050 100644 --- a/src/ce_messages.lfm +++ b/src/ce_messages.lfm @@ -26,10 +26,6 @@ inherited CEMessagesWidget: TCEMessagesWidget Align = alClient BorderSpacing.Around = 2 DefaultItemHeight = 16 - Font.Height = -12 - Font.Name = 'Courier New' - Font.Quality = fqProof - Font.Style = [fsBold] HideSelection = False Images = imgList MultiSelect = True diff --git a/src/ce_messages.pas b/src/ce_messages.pas index 753ac3e8..1efa0b2e 100644 --- a/src/ce_messages.pas +++ b/src/ce_messages.pas @@ -192,6 +192,8 @@ constructor TCEMessagesOptions.Create(AOwner: TComponent); begin inherited; fFont := TFont.Create; + fAutoSelect:=true; + fMaxCount := 1000; end; destructor TCEMessagesOptions.destroy; @@ -259,6 +261,7 @@ var fname: string; begin fMaxMessCnt := 500; + fAutoSelect := true; fCtxt := amcAll; // fActAutoSel := TAction.Create(self); @@ -313,8 +316,8 @@ begin fBtns[amcMisc]:= btnSelMisc; fBtns[amcProj]:= btnSelProj; // - // reminder: a tollbar button can be used here because it would have the - // same size as the buttons used to select a category. + // reminder: a toolbar button can be used here because it would have the + // same size as the buttons used to select the categories. btnClearCat.OnClick := @actClearCurCatExecute; AssignPng(btnClearCat, 'CLEAN'); // diff --git a/src/ce_synmemo.pas b/src/ce_synmemo.pas index f48cda25..397c6dc3 100644 --- a/src/ce_synmemo.pas +++ b/src/ce_synmemo.pas @@ -564,6 +564,7 @@ begin fCompletion.TheForm.ShowInTaskBar:=stNever; fCompletion.ShortCut:=0; fCompletion.LinesInWindow:=15; + fCompletion.Width:= 250; fCallTipStrings:= TStringList.Create; // MouseLinkColor.Style:= [fsUnderline]; @@ -598,6 +599,9 @@ begin LineHighlightColor.Background := color - $080808; LineHighlightColor.Foreground := clNone; // + fAutoCloseCurlyBrace:= autoCloseOnNewLineLexically; + fAutoClosedPairs:= [autoCloseSquareBracket]; + // fDastWorxExename:= exeFullName('dastworx' + exeExt); // subjDocNew(TCEMultiDocSubject(fMultiDocSubject), self);