From 1c9902694a4505c59182604abe4a471aec21afb7 Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Sun, 13 Dec 2015 00:31:48 +0100 Subject: [PATCH] info, added gdc & ldc, updated version --- cesetup/cesetup.coedit | 8 +++--- cesetup/cesetup.d | 2 +- cesetup/version.txt | 2 +- src/ce_infos.lfm | 48 ++++++++++++++++++------------------ src/ce_infos.pas | 56 ++++++++++++++++++++++++++++++++++-------- 5 files changed, 76 insertions(+), 40 deletions(-) diff --git a/cesetup/cesetup.coedit b/cesetup/cesetup.coedit index c3c775eb..51b3a627 100644 --- a/cesetup/cesetup.coedit +++ b/cesetup/cesetup.coedit @@ -7,7 +7,7 @@ object CurrentProject: TCENativeProject outputOptions.boundsCheck = offAlways outputOptions.optimizations = True outputOptions.release = True - pathsOptions.outputFilename = 'output/coedit.2alpha2.win32.setup' + pathsOptions.outputFilename = 'output/coedit.2alpha3.win32.setup' pathsOptions.importStringPaths.Strings = ( 'win32/' ) @@ -29,7 +29,7 @@ object CurrentProject: TCENativeProject outputOptions.boundsCheck = offAlways outputOptions.optimizations = True outputOptions.release = True - pathsOptions.outputFilename = 'output/coedit.2alpha2.linux32.setup' + pathsOptions.outputFilename = 'output/coedit.2alpha3.linux32.setup' pathsOptions.importStringPaths.Strings = ( 'nux32/' ) @@ -51,7 +51,7 @@ object CurrentProject: TCENativeProject outputOptions.boundsCheck = offAlways outputOptions.optimizations = True outputOptions.release = True - pathsOptions.outputFilename = 'output/coedit.2alpha2.linux64.setup' + pathsOptions.outputFilename = 'output/coedit.2alpha3.linux64.setup' pathsOptions.importStringPaths.Strings = ( 'nux64/' ) @@ -74,7 +74,7 @@ object CurrentProject: TCENativeProject outputOptions.boundsCheck = offAlways outputOptions.optimizations = True outputOptions.release = True - pathsOptions.outputFilename = 'output/coedit.2alpha2.win32.setup' + pathsOptions.outputFilename = 'output/coedit.2alpha3.win32.setup' pathsOptions.importStringPaths.Strings = ( 'win32/' ) diff --git a/cesetup/cesetup.d b/cesetup/cesetup.d index fc5cb14b..8897c407 100644 --- a/cesetup/cesetup.d +++ b/cesetup/cesetup.d @@ -146,7 +146,7 @@ void main(string[] args) return; } - if (!uninstall) Formater.justify!'C'("Coedit 2 alpha 2 - setup"); + if (!uninstall) Formater.justify!'C'("Coedit 2 alpha 3 - setup"); else Formater.justify!'C'("Coedit uninstaller"); Formater.separate; diff --git a/cesetup/version.txt b/cesetup/version.txt index 2ea0a4b8..4c227f29 100644 --- a/cesetup/version.txt +++ b/cesetup/version.txt @@ -1 +1 @@ -2alpha2 \ No newline at end of file +2alpha3 \ No newline at end of file diff --git a/src/ce_infos.lfm b/src/ce_infos.lfm index 021bc6a6..307cffee 100644 --- a/src/ce_infos.lfm +++ b/src/ce_infos.lfm @@ -1,42 +1,42 @@ inherited CEInfoWidget: TCEInfoWidget Left = 713 - Height = 378 + Height = 401 Top = 245 - Width = 389 + Width = 406 BorderIcons = [biSystemMenu, biMinimize, biMaximize] Caption = 'About' - ClientHeight = 378 - ClientWidth = 389 + ClientHeight = 401 + ClientWidth = 406 inherited Back: TPanel - Height = 378 - Width = 389 - ClientHeight = 378 - ClientWidth = 389 + Height = 401 + Width = 406 + ClientHeight = 401 + ClientWidth = 406 inherited Content: TPanel - Height = 378 - Width = 389 - ClientHeight = 378 - ClientWidth = 389 + Height = 401 + Width = 406 + ClientHeight = 401 + ClientWidth = 406 object GroupBox1: TGroupBox[0] Left = 4 Height = 105 Top = 4 - Width = 381 + Width = 398 Align = alTop BorderSpacing.Around = 4 Caption = 'about' - ClientHeight = 85 - ClientWidth = 377 + ClientHeight = 75 + ClientWidth = 394 TabOrder = 0 object Label1: TLabel Left = 0 - Height = 85 + Height = 75 Top = 0 - Width = 377 + Width = 394 Align = alClient Alignment = taCenter AutoSize = False - Caption = 'Coedit 2 - alpha 1' + Caption = 'Coedit 2 - alpha 3' Font.Height = -16 Font.Style = [fsBold] Layout = tlCenter @@ -46,20 +46,20 @@ inherited CEInfoWidget: TCEInfoWidget end object GroupBox2: TGroupBox[1] Left = 4 - Height = 261 + Height = 284 Top = 113 - Width = 381 + Width = 398 Align = alClient BorderSpacing.Around = 4 Caption = 'tools status' - ClientHeight = 241 - ClientWidth = 377 + ClientHeight = 254 + ClientWidth = 394 TabOrder = 1 object boxTools: TScrollBox Left = 4 - Height = 233 + Height = 246 Top = 4 - Width = 369 + Width = 386 HorzScrollBar.Page = 1 VertScrollBar.Page = 1 Align = alClient diff --git a/src/ce_infos.pas b/src/ce_infos.pas index c33e23e8..3f3bb8fe 100644 --- a/src/ce_infos.pas +++ b/src/ce_infos.pas @@ -10,7 +10,7 @@ uses type - TToolInfoKind = (tikRunning, tikFindable); + TToolInfoKind = (tikRunning, tikFindable, tikOptional); TToolInfo = class(TWinControl) private @@ -23,7 +23,8 @@ type protected procedure SetVisible(Value: Boolean); override; public - constructor Construct(TheOwner: TComponent; kind: TToolInfoKind;const toolName: string); + constructor Construct(TheOwner: TComponent; kind: TToolInfoKind; + const toolName, description: string); procedure refreshStatus; procedure Update; override; end; @@ -48,7 +49,8 @@ implementation {$R *.lfm} -constructor TToolInfo.Construct(TheOwner: TComponent; kind: TToolInfoKind;const toolName: string); +constructor TToolInfo.Construct(TheOwner: TComponent; kind: TToolInfoKind; + const toolName, description: string); begin Inherited create(TheOwner); Align := alTop; @@ -61,6 +63,8 @@ begin fLabel.Align:= alLeft; fLabel.Width:= 70; fLabel.BorderSpacing.Around := 2; + fLabel.Hint:= description; + fLabel.ShowHint:=true; // fIco := TSpeedButton.Create(self); fIco.Parent := self; @@ -79,6 +83,8 @@ begin fStatus.BorderStyle := sbsSunken; fStatus.AutoSize:=false; fStatus.Width:= 800; + fStatus.Hint:=description; + fStatus.ShowHint:=true; // fKind:=kind; fToolName:=toolName; @@ -124,6 +130,20 @@ begin AssignPng(fIco, 'bullet_green'); end; end; + tikOptional: + begin + pth := exeFullName(fToolName + exeExt); + if pth = '' then + begin + fStatus.Caption:= ' the tool cannot be found'; + AssignPng(fIco, 'bullet_yellow'); + end + else + begin + fStatus.Caption:= ' the tool is available'; + AssignPng(fIco, 'bullet_green'); + end; + end; tikRunning: begin pth := exeFullName(fToolName + exeExt); @@ -156,25 +176,41 @@ begin fIsModal := true; fIsDockable := false; // - toolItem := TToolInfo.Construct(self, tikFindable, 'ddemangle'); + toolItem := TToolInfo.Construct(self, tikOptional, 'gdc', + 'optional, the GDC D compiler'); toolItem.Parent := boxTools; toolItem.ReAlign; - toolItem := TToolInfo.Construct(self, tikRunning, 'dcd-server'); + toolItem := TToolInfo.Construct(self, tikOptional, 'ldc2', + 'optional, the LDC D compiler'); toolItem.Parent := boxTools; toolItem.ReAlign; - toolItem := TToolInfo.Construct(self, tikFindable, 'dcd-client'); + toolItem := TToolInfo.Construct(self, tikOptional, 'ddemangle', + 'optional, allows to demangle cryptic symbols in the message widget'); toolItem.Parent := boxTools; toolItem.ReAlign; - toolItem := TToolInfo.Construct(self, tikFindable, 'cesyms'); + toolItem := TToolInfo.Construct(self, tikRunning, 'dcd-server', + 'mandatory, provides IDE-level features such as the completion'); toolItem.Parent := boxTools; toolItem.ReAlign; - toolItem := TToolInfo.Construct(self, tikFindable, 'cetodo'); + toolItem := TToolInfo.Construct(self, tikFindable, 'dcd-client', + 'mandatory, provides IDE-level features such as the completion'); toolItem.Parent := boxTools; toolItem.ReAlign; - toolItem := TToolInfo.Construct(self, tikFindable, 'dub'); + toolItem := TToolInfo.Construct(self, tikFindable, 'cesyms', + 'background tool that collects information for the symbol list widget'); toolItem.Parent := boxTools; toolItem.ReAlign; - toolItem := TToolInfo.Construct(self, tikFindable, 'dmd'); + toolItem := TToolInfo.Construct(self, tikFindable, 'cetodo', + 'background tool that collects information for the todo list widget'); + toolItem.Parent := boxTools; + toolItem.ReAlign; + toolItem := TToolInfo.Construct(self, tikOptional, 'dub', + 'the D package manager, mandatory to compile project in DUB format'); + toolItem.Parent := boxTools; + toolItem.ReAlign; + toolItem := TToolInfo.Construct(self, tikFindable, 'dmd', + 'the reference D compiler, mandatory to compile native projects, ' + + 'to unittest and to launch runnable modules'); toolItem.Parent := boxTools; toolItem.ReAlign; //