Menu
▾
▴
[JVCL-Checkins] dev/JVCL3/install/JVCLInstall/Helpers AHCompBrowseFolderDlg.pas,1.2,1.3 CapExec.pas,1.5,1.6 HtHint.pas,1.4,1.5 JVCLConfiguration.pas,1.4,1.5 MainConfig.dfm,1.4,1.5 MainConfig.pas,1.5,1.6 - New jvcl.inc structure Debug Units Quickreport detection Per
|
From: Andreas H. <ah...@us...> - 2004-12-23 00:25:27
|
Update of /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Helpers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24608/install/JVCLInstall/Helpers Modified Files: AHCompBrowseFolderDlg.pas CapExec.pas HtHint.pas JVCLConfiguration.pas MainConfig.dfm MainConfig.pas Log Message: New jvcl.inc structure Debug Units Quickreport detection Personal Edition compilation option Index: AHCompBrowseFolderDlg.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Helpers/AHCompBrowseFolderDlg.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AHCompBrowseFolderDlg.pas 9 Apr 2004 22:22:33 -0000 1.2 --- AHCompBrowseFolderDlg.pas 23 Dec 2004 00:25:13 -0000 1.3 *************** *** 25,37 **** // $Id$ {$I jvcl.inc} {$I windowsonly.inc} - unit AHCompBrowseFolderDlg; {$IFDEF COMPILER6_UP} {$WARN UNIT_PLATFORM OFF} {$WARN SYMBOL_PLATFORM OFF} {$ENDIF} interface uses Windows, Messages, SysUtils, Graphics, Controls, Forms, Classes, Dialogs, --- 25,40 ---- // $Id$ + unit AHCompBrowseFolderDlg; + {$I jvcl.inc} {$I windowsonly.inc} {$IFDEF COMPILER6_UP} {$WARN UNIT_PLATFORM OFF} {$WARN SYMBOL_PLATFORM OFF} {$ENDIF} + interface + uses Windows, Messages, SysUtils, Graphics, Controls, Forms, Classes, Dialogs, Index: MainConfig.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Helpers/MainConfig.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MainConfig.pas 14 May 2004 17:08:06 -0000 1.5 --- MainConfig.pas 23 Dec 2004 00:25:13 -0000 1.6 *************** *** 25,32 **** // $Id$ - {$I jvcl.inc} - unit MainConfig; interface --- 25,32 ---- // $Id$ unit MainConfig; + {$I jvcl.inc} + interface *************** *** 51,55 **** BevelHeader: TBevel; PanelSpace: TPanel; - Label1: TLabel; PaintBoxWhite: TPaintBox; BtnCancel: TButton; --- 51,54 ---- *************** *** 62,69 **** --- 61,74 ---- procedure FormDestroy(Sender: TObject); private + function GetCurrentItem: TJVCLConfigItem; + private FConfig: TJVCLConfig; + FSavedCaption: string; FFileName: string; + property CurrentItem: TJVCLConfigItem read GetCurrentItem; public + function Execute(const Version: String): Boolean; procedure UpdateCheckStates; + property FileName: string read FFileName write FFileName; property Config: TJVCLConfig read FConfig; *************** *** 79,83 **** procedure TFormJvclIncConfig.CheckListBoxClick(Sender: TObject); begin ! LblComment.Caption := FConfig.Items[CheckListBox.ItemIndex].Comment; LblComment.Font.Color := clWindowText; end; --- 84,88 ---- procedure TFormJvclIncConfig.CheckListBoxClick(Sender: TObject); begin ! LblComment.Caption := CurrentItem.Comment; LblComment.Font.Color := clWindowText; end; *************** *** 85,101 **** procedure TFormJvclIncConfig.CheckListBoxClickCheck(Sender: TObject); begin ! FConfig.Items[CheckListBox.ItemIndex].Enabled := ! CheckListBox.Checked[CheckListBox.ItemIndex]; end; procedure TFormJvclIncConfig.UpdateCheckStates; var ! I: Integer; begin CheckListBox.Clear; for I := 0 to FConfig.ItemCount - 1 do begin ! CheckListBox.Items.Add(FConfig.Items[I].Name); ! CheckListBox.Checked[I] := FConfig.Items[I].Enabled; end; end; --- 90,108 ---- procedure TFormJvclIncConfig.CheckListBoxClickCheck(Sender: TObject); begin ! CurrentItem.Enabled := CheckListBox.Checked[CheckListBox.ItemIndex]; end; procedure TFormJvclIncConfig.UpdateCheckStates; var ! I, J: Integer; begin CheckListBox.Clear; for I := 0 to FConfig.ItemCount - 1 do begin ! if not FConfig.Items[I].Hidden then ! begin ! J := CheckListBox.Items.AddObject(FConfig.Items[I].Name, FConfig.Items[I]); ! CheckListBox.Checked[J] := FConfig.Items[I].Enabled ! end; end; end; *************** *** 115,119 **** procedure TFormJvclIncConfig.PaintBoxWhitePaint(Sender: TObject); begin ! // XP Theming makes the panel gray so we paint a white rectangle PaintBoxWhite.Canvas.Brush.Color := clWindow; PaintBoxWhite.Canvas.FillRect(PaintBoxWhite.ClientRect); --- 122,126 ---- procedure TFormJvclIncConfig.PaintBoxWhitePaint(Sender: TObject); begin ! // XP Theming makes the panel gray so we paint a white rectangle PaintBoxWhite.Canvas.Brush.Color := clWindow; PaintBoxWhite.Canvas.FillRect(PaintBoxWhite.ClientRect); *************** *** 123,129 **** begin {$IFDEF USE_DXGETTEXT} ! TranslateComponent(Label1, 'JVCLInstall'); {$ENDIF USE_DXGETTEXT} FConfig := TJVCLConfig.Create; end; --- 130,138 ---- begin {$IFDEF USE_DXGETTEXT} ! TranslateComponent(Self, 'JVCLInstall'); {$ENDIF USE_DXGETTEXT} FConfig := TJVCLConfig.Create; + FSavedCaption := Caption; + LblComment.Caption := ''; end; *************** *** 133,135 **** --- 142,163 ---- end; + function TFormJvclIncConfig.GetCurrentItem: TJVCLConfigItem; + begin + if CheckListBox.ItemIndex >= 0 then + Result := TJVCLConfigItem(CheckListBox.Items.Objects[CheckListBox.ItemIndex]) + else + Result := nil; + end; + + function TFormJvclIncConfig.Execute(const Version: String): Boolean; + begin + if Version <> '' then + Caption := FSavedCaption + ' - ' + Version + else + Caption := FSavedCaption; + + UpdateCheckStates; + Result := ShowModal = mrOk; + end; + end. Index: JVCLConfiguration.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Helpers/JVCLConfiguration.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JVCLConfiguration.pas 22 Jul 2004 19:26:46 -0000 1.4 --- JVCLConfiguration.pas 23 Dec 2004 00:25:13 -0000 1.5 *************** *** 25,32 **** // $Id$ - {$I jvcl.inc} - unit JVCLConfiguration; interface --- 25,32 ---- // $Id$ unit JVCLConfiguration; + {$I jvcl.inc} + interface *************** *** 44,47 **** --- 44,48 ---- FDirective: string; FLine: Integer; + FHidden: Boolean; function GetEnabled: Boolean; function GetName: string; *************** *** 49,60 **** public constructor Create(AOwner: TJVCLConfig; const AComment, ADirective: string; ! ALine: Integer); property Line: Integer read FLine; property Enabled: Boolean read GetEnabled write SetEnabled; property Name: string read GetName; property Comment: string read FComment; end; ! // Do not edit the lines directly. If you must then call Parse after you had // done your changes. TJVCLConfig = class(TStringList) --- 50,62 ---- public constructor Create(AOwner: TJVCLConfig; const AComment, ADirective: string; ! ALine: Integer; AHidden: Boolean); property Line: Integer read FLine; property Enabled: Boolean read GetEnabled write SetEnabled; property Name: string read GetName; property Comment: string read FComment; + property Hidden: Boolean read FHidden; end; ! // Do not edit the lines directly. If you must then call Parse after you have // done your changes. TJVCLConfig = class(TStringList) *************** *** 63,66 **** --- 65,69 ---- FItems: TObjectList; FFilename: string; + FNextHidden: Boolean; procedure ParseComment(Token: PTokenInfo; var LastCommentToken: string; var InAutoConfig: Integer); *************** *** 84,88 **** property Enabled[Index: string]: Boolean read GetEnabled write SetEnabled; property Modified: Boolean read FModified write FModified; ! property Filename: string read FFilename; end; --- 87,91 ---- property Enabled[Index: string]: Boolean read GetEnabled write SetEnabled; property Modified: Boolean read FModified write FModified; ! property Filename: string read FFilename write FFilename; end; *************** *** 113,121 **** end; - //=== TJVCLConfigItem ======================================================== constructor TJVCLConfigItem.Create(AOwner: TJVCLConfig; ! const AComment, ADirective: string; ALine: Integer); begin inherited Create; --- 116,123 ---- end; //=== TJVCLConfigItem ======================================================== constructor TJVCLConfigItem.Create(AOwner: TJVCLConfig; ! const AComment, ADirective: string; ALine: Integer; AHidden: Boolean); begin inherited Create; *************** *** 123,126 **** --- 125,129 ---- FLine := ALine; FComment := AComment; + FHidden := AHidden; FDirective := ADirective; end; *************** *** 228,231 **** --- 231,235 ---- LastCommentToken := ''; InAutoConfig := 0; + FNextHidden := False; while Parser.GetToken(Token) do begin *************** *** 247,250 **** --- 251,257 ---- S := Trim(RemoveCommentBrackets(Token.Value)); + if IsDirective(S, '%hidden%') then + FNextHidden := True; + if IsDirective(S, '$IFDEF') or IsDirective(S, '$IF') or // do not localize IsDirective(S, '$IFNDEF') then // do not localize *************** *** 255,265 **** if InAutoConfig = 0 then if IsDirective(S, '$DEFINE') or IsDirective(S, '.$DEFINE') then // do not localize begin ! Item := TJVCLConfigItem.Create(Self, LastCommentToken, S, Token.StartLine - 1); FItems.Add(Item); end else LastCommentToken := S; end; --- 262,275 ---- if InAutoConfig = 0 then + begin if IsDirective(S, '$DEFINE') or IsDirective(S, '.$DEFINE') then // do not localize begin ! Item := TJVCLConfigItem.Create(Self, LastCommentToken, S, Token.StartLine - 1, FNextHidden); FItems.Add(Item); + FNextHidden := False; end else LastCommentToken := S; + end; end; Index: HtHint.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Helpers/HtHint.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** HtHint.pas 29 Nov 2004 19:17:32 -0000 1.4 --- HtHint.pas 23 Dec 2004 00:25:13 -0000 1.5 *************** *** 25,32 **** // $Id$ - {$I jvcl.inc} - unit HtHint; interface --- 25,32 ---- // $Id$ unit HtHint; + {$I jvcl.inc} + interface Index: MainConfig.dfm =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Helpers/MainConfig.dfm,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MainConfig.dfm 13 Jun 2004 04:27:58 -0000 1.4 --- MainConfig.dfm 23 Dec 2004 00:25:13 -0000 1.5 *************** *** 26,46 **** Height = 141 end - object Label1: TLabel - Left = 280 - Top = 200 - Width = 457 - Height = 49 - AutoSize = False - Caption = - 'jvcl.inc changes are global to all installed Delphi/BCB versions' + - '.' - Font.Charset = DEFAULT_CHARSET - Font.Color = clRed - Font.Height = -13 - Font.Name = 'MS Sans Serif' - Font.Style = [fsBold] - ParentFont = False - WordWrap = True - end object CheckListBox: TCheckListBox Left = 0 --- 26,29 ---- *************** *** 59,63 **** Top = 49 Width = 457 ! Height = 137 BorderStyle = bsNone TabOrder = 1 --- 42,46 ---- Top = 49 Width = 457 ! Height = 136 BorderStyle = bsNone TabOrder = 1 *************** *** 79,82 **** --- 62,68 ---- Color = clWindow TabOrder = 2 + DesignSize = ( + 744 + 44) object PaintBoxWhite: TPaintBox Left = 0 Index: CapExec.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Helpers/CapExec.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CapExec.pas 14 May 2004 17:08:06 -0000 1.5 --- CapExec.pas 23 Dec 2004 00:25:13 -0000 1.6 *************** *** 25,33 **** // $Id$ {$I jvcl.inc} {$I windowsonly.inc} - unit CapExec; - interface --- 25,33 ---- // $Id$ + unit CapExec; + {$I jvcl.inc} {$I windowsonly.inc} interface |
