|
From: Andreas H. <ah...@us...> - 2004-12-23 00:25:27
|
Update of /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24608/install/JVCLInstall/Frames Modified Files: FrmConfigPage.dfm FrmConfigPage.pas FrmDirEditBrowse.pas FrmInstall.dfm FrmInstall.pas FrmPackageSelection.dfm FrmPackageSelection.pas FrmUninstall.dfm FrmUninstall.pas Log Message: New jvcl.inc structure Debug Units Quickreport detection Personal Edition compilation option Index: FrmDirEditBrowse.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmDirEditBrowse.pas,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FrmDirEditBrowse.pas 24 May 2004 11:32:58 -0000 1.8 --- FrmDirEditBrowse.pas 23 Dec 2004 00:25:12 -0000 1.9 *************** *** 25,32 **** // $Id$ - {$I jvcl.inc} - unit FrmDirEditBrowse; interface --- 25,32 ---- // $Id$ unit FrmDirEditBrowse; + {$I jvcl.inc} + interface Index: FrmConfigPage.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmConfigPage.pas,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** FrmConfigPage.pas 17 Dec 2004 21:14:36 -0000 1.16 --- FrmConfigPage.pas 23 Dec 2004 00:25:12 -0000 1.17 *************** *** 25,32 **** // $Id$ - {$I jvcl.inc} - unit FrmConfigPage; interface --- 25,32 ---- // $Id$ unit FrmConfigPage; + {$I jvcl.inc} + interface *************** *** 45,62 **** CheckBoxDxgettextSupport: TCheckBox; CheckBoxRegisterJvGif: TCheckBox; - LblDxgettextHomepage: TLabel; CheckBoxUseJVCL: TCheckBox; GroupBoxInstallOptions: TGroupBox; CheckBoxDeveloperInstall: TCheckBox; CheckBoxCleanPalettes: TCheckBox; - LblOptionsFor: TLabel; - ComboBoxTargetIDE: TComboBox; ImageListTargets: TImageList; CheckBoxBuild: TCheckBox; ! CheckBoxCompileOnly: TCheckBox; FrameDirEditBrowseBPL: TFrameDirEditBrowse; FrameDirEditBrowseDCP: TFrameDirEditBrowse; FrameDirEditBrowseHPP: TFrameDirEditBrowse; - BtnEditJvclInc: TButton; LblBCBGuide: TLabel; CheckBoxCompileJclDcp: TCheckBox; --- 45,58 ---- CheckBoxDxgettextSupport: TCheckBox; CheckBoxRegisterJvGif: TCheckBox; CheckBoxUseJVCL: TCheckBox; GroupBoxInstallOptions: TGroupBox; CheckBoxDeveloperInstall: TCheckBox; CheckBoxCleanPalettes: TCheckBox; ImageListTargets: TImageList; CheckBoxBuild: TCheckBox; ! CheckBoxIDERegister: TCheckBox; FrameDirEditBrowseBPL: TFrameDirEditBrowse; FrameDirEditBrowseDCP: TFrameDirEditBrowse; FrameDirEditBrowseHPP: TFrameDirEditBrowse; LblBCBGuide: TLabel; CheckBoxCompileJclDcp: TCheckBox; *************** *** 65,68 **** --- 61,69 ---- CheckBoxUnitVersioning: TCheckBox; CheckBoxIgnoreMakeErrors: TCheckBox; + ComboBoxTargetIDE: TComboBox; + BtnEditJvclInc: TButton; + PanelBk: TPanel; + LblOptionsFor: TLabel; + CheckBoxDebugUnits: TCheckBox; procedure CheckBoxDeveloperInstallClick(Sender: TObject); procedure CheckBoxXPThemingClick(Sender: TObject); *************** *** 84,87 **** --- 85,90 ---- procedure DcpDirChanged(Sender: TObject; UserData: TObject; var Dir: string); procedure HppDirChanged(Sender: TObject; UserData: TObject; var Dir: string); + procedure SetJVCLConfig(const Id: string; CheckBox: TCheckBox); + procedure GetJVCLConfig(const Id: string; CheckBox: TCheckBox); protected property Installer: TInstaller read FInstaller; *************** *** 95,99 **** uses ! InstallerConsts, Core, MainConfig, Main, Utils, Math; {$R *.dfm} --- 98,102 ---- uses ! InstallerConsts, Core, MainConfig, Main, Utils, Math, JVCLConfiguration; {$R *.dfm} *************** *** 197,211 **** end; ComboBoxTargetIDEChange(ComboBoxTargetIDE); - - // jvcl.inc - LblDxgettextHomepage.Left := CheckBoxDxgettextSupport.Left + 16; - LblDxgettextHomepage.Top := CheckBoxDxgettextSupport.Top; - LblDxgettextHomepage.OnClick := Installer.DoHomepageClick; - LblDxgettextHomepage.Caption := CheckBoxDxgettextSupport.Caption; - //CheckBoxDxgettextSupport.Visible := Installer.Data.IsDxgettextInstalled; - LblDxgettextHomepage.Visible := not CheckBoxDxgettextSupport.Visible; - - // common options if not CommonCompiledJcl then Installer.Data.CompileJclDcp := True; --- 200,204 ---- *************** *** 213,217 **** CheckBoxCompileJclDcp.Enabled := CommonCompiledJcl; CheckBoxCompileJclDcp.Visible := HasBCB; ! CheckBoxVerbose.Checked := Installer.Data.Verbose; CheckBoxIgnoreMakeErrors.Checked := Installer.Data.IgnoreMakeErrors; --- 206,210 ---- CheckBoxCompileJclDcp.Enabled := CommonCompiledJcl; CheckBoxCompileJclDcp.Visible := HasBCB; ! CheckBoxVerbose.Checked := Installer.Data.Verbose; CheckBoxIgnoreMakeErrors.Checked := Installer.Data.IgnoreMakeErrors; *************** *** 232,237 **** TCheckBox(Sender).State := cbChecked; ! CheckBoxDeveloperInstall.Enabled := CheckBoxCompileOnly.Checked; ! CheckBoxCleanPalettes.Enabled := CheckBoxCompileOnly.Checked; if ComboBoxTargetIDE.ItemIndex <= 0 then --- 225,230 ---- TCheckBox(Sender).State := cbChecked; ! CheckBoxDebugUnits.Enabled := not CheckBoxDeveloperInstall.Checked; ! CheckBoxCleanPalettes.Enabled := CheckBoxIDERegister.Checked; if ComboBoxTargetIDE.ItemIndex <= 0 then *************** *** 239,248 **** if Sender = CheckBoxDeveloperInstall then Installer.Data.DeveloperInstall := Integer(CheckBoxDeveloperInstall.Checked) else if Sender = CheckBoxCleanPalettes then Installer.Data.CleanPalettes := Integer(CheckBoxCleanPalettes.Checked) else if Sender = CheckBoxBuild then Installer.Data.Build := Integer(CheckBoxBuild.Checked) ! else if Sender = CheckBoxCompileOnly then ! Installer.Data.CompileOnly := Integer(not CheckBoxCompileOnly.Checked) else if Sender = CheckBoxGenerateMapFiles then Installer.Data.GenerateMapFiles := Integer(CheckBoxGenerateMapFiles.Checked) --- 232,243 ---- if Sender = CheckBoxDeveloperInstall then Installer.Data.DeveloperInstall := Integer(CheckBoxDeveloperInstall.Checked) + else if Sender = CheckBoxDebugUnits then + Installer.Data.DebugUnits := Integer(CheckBoxDebugUnits.Checked) else if Sender = CheckBoxCleanPalettes then Installer.Data.CleanPalettes := Integer(CheckBoxCleanPalettes.Checked) else if Sender = CheckBoxBuild then Installer.Data.Build := Integer(CheckBoxBuild.Checked) ! else if Sender = CheckBoxIDERegister then ! Installer.Data.CompileOnly := Integer(not CheckBoxIDERegister.Checked) else if Sender = CheckBoxGenerateMapFiles then Installer.Data.GenerateMapFiles := Integer(CheckBoxGenerateMapFiles.Checked) *************** *** 254,267 **** if Sender = CheckBoxDeveloperInstall then TargetConfig.DeveloperInstall := CheckBoxDeveloperInstall.Checked else if Sender = CheckBoxCleanPalettes then TargetConfig.CleanPalettes := CheckBoxCleanPalettes.Checked else if Sender = CheckBoxBuild then TargetConfig.Build := CheckBoxBuild.Checked ! else if Sender = CheckBoxCompileOnly then ! TargetConfig.CompileOnly := not CheckBoxCompileOnly.Checked else if Sender = CheckBoxGenerateMapFiles then TargetConfig.GenerateMapFiles := CheckBoxGenerateMapFiles.Checked ; end; PackageInstaller.UpdatePages; end; --- 249,265 ---- if Sender = CheckBoxDeveloperInstall then TargetConfig.DeveloperInstall := CheckBoxDeveloperInstall.Checked + else if Sender = CheckBoxDebugUnits then + TargetConfig.DebugUnits := CheckBoxDebugUnits.Checked else if Sender = CheckBoxCleanPalettes then TargetConfig.CleanPalettes := CheckBoxCleanPalettes.Checked else if Sender = CheckBoxBuild then TargetConfig.Build := CheckBoxBuild.Checked ! else if Sender = CheckBoxIDERegister then ! TargetConfig.CompileOnly := not CheckBoxIDERegister.Checked else if Sender = CheckBoxGenerateMapFiles then TargetConfig.GenerateMapFiles := CheckBoxGenerateMapFiles.Checked ; end; + PackageInstaller.UpdatePages; end; *************** *** 280,294 **** end; ! procedure TFrameConfigPage.UpdateJvclIncSettings; begin ! with Installer.Data do begin ! CheckBoxXPTheming.Checked := JVCLConfig.Enabled['JVCLThemesEnabled']; ! CheckBoxRegisterGlobalDesignEditors.Checked := JVCLConfig.Enabled['JVCL_REGISTER_GLOBAL_DESIGNEDITORS']; ! CheckBoxDxgettextSupport.Checked := JVCLConfig.Enabled['USE_DXGETTEXT']; ! CheckBoxRegisterJvGif.Checked := JVCLConfig.Enabled['USE_JV_GIF']; ! CheckBoxUseJVCL.Checked := JVCLConfig.Enabled['USEJVCL']; ! CheckBoxUnitVersioning.Checked := JVCLConfig.Enabled['UNITVERSIONING']; ! end; end; --- 278,342 ---- end; ! procedure TFrameConfigPage.GetJVCLConfig(const Id: string; CheckBox: TCheckBox); ! var ! i, e, Count: Integer; begin ! CheckBox.AllowGrayed := False; ! ! if SelTargetConfig = nil then begin ! // for all ! e := 0; ! Count := 0; ! for i := 0 to Installer.SelTargetCount - 1 do ! if Installer.SelTargets[i].InstallJVCL then ! begin ! Inc(Count); ! if Installer.SelTargets[i].JVCLConfig.Enabled[Id] then ! Inc(e); ! end; ! ! if e = 0 then ! CheckBox.Checked := False ! else if e = Count then ! CheckBox.Checked := True ! else ! begin ! CheckBox.AllowGrayed := True; ! CheckBox.State := cbGrayed; ! end; ! end ! else ! CheckBox.Checked := SelTargetConfig.JVCLConfig.Enabled[Id]; ! end; ! ! procedure TFrameConfigPage.SetJVCLConfig(const Id: string; CheckBox: TCheckBox); ! var ! i: Integer; ! begin ! if SelTargetConfig = nil then ! begin ! // for all ! for i := 0 to Installer.SelTargetCount - 1 do ! begin ! if Installer.SelTargets[i].InstallJVCL and (CheckBox.State <> cbGrayed) then ! begin ! Installer.SelTargets[i].JVCLConfig.Enabled[Id] := CheckBox.Checked; ! CheckBox.AllowGrayed := False; ! end; ! end; ! end ! else ! SelTargetConfig.JVCLConfig.Enabled[Id] := CheckBox.Checked; ! end; ! ! procedure TFrameConfigPage.UpdateJvclIncSettings; ! begin ! GetJVCLConfig('JVCLThemesEnabled', CheckBoxXPTheming); ! GetJVCLConfig('JVCL_REGISTER_GLOBAL_DESIGNEDITORS', CheckBoxRegisterGlobalDesignEditors); ! GetJVCLConfig('USE_DXGETTEXT', CheckBoxDxgettextSupport); ! GetJVCLConfig('USE_JV_GIF', CheckBoxRegisterJvGif); ! GetJVCLConfig('USEJVCL', CheckBoxUseJVCL); ! GetJVCLConfig('UNITVERSIONING', CheckBoxUnitVersioning); end; *************** *** 324,335 **** end; ! with Installer.Data do ! begin ! JVCLConfig.Enabled['JVCLThemesEnabled'] := CheckBoxXPTheming.Checked; ! JVCLConfig.Enabled['JVCL_REGISTER_GLOBAL_DESIGNEDITORS'] := CheckBoxRegisterGlobalDesignEditors.Checked; ! JVCLConfig.Enabled['USE_DXGETTEXT'] := CheckBoxDxgettextSupport.Checked; ! JVCLConfig.Enabled['USE_JV_GIF'] := CheckBoxRegisterJvGif.Checked; ! JVCLConfig.Enabled['USEJVCL'] := CheckBoxUseJVCL.Checked; ! JVCLConfig.Enabled['UNITVERSIONING'] := CheckBoxUnitVersioning.Checked; end; end; --- 372,385 ---- end; ! try ! SetJVCLConfig('JVCLThemesEnabled', CheckBoxXPTheming); ! SetJVCLConfig('JVCL_REGISTER_GLOBAL_DESIGNEDITORS', CheckBoxRegisterGlobalDesignEditors); ! SetJVCLConfig('USE_DXGETTEXT', CheckBoxDxgettextSupport); ! SetJVCLConfig('USE_JV_GIF', CheckBoxRegisterJvGif); ! SetJVCLConfig('USEJVCL', CheckBoxUseJVCL); ! SetJVCLConfig('UNITVERSIONING', CheckBoxUnitVersioning); ! except ! on E: Exception do ! MessageDlg(RsJVCLConfigurationError, mtError, [mbOk], 0); end; end; *************** *** 346,368 **** if ItemIndex <= 0 then begin CheckBoxDeveloperInstall.State := TCheckBoxState(Installer.Data.DeveloperInstall); CheckBoxCleanPalettes.State := TCheckBoxState(Installer.Data.CleanPalettes); CheckBoxBuild.State := TCheckBoxState(Installer.Data.Build); case TCheckBoxState(Installer.Data.CompileOnly) of ! cbUnchecked: CheckBoxCompileOnly.State := cbChecked; // invert ! cbChecked: CheckBoxCompileOnly.State := cbUnchecked; // invert else ! CheckBoxCompileOnly.State := cbGrayed; end; CheckBoxGenerateMapFiles.State := TCheckBoxState(Installer.Data.GenerateMapFiles); end else begin TargetConfig := SelTargetConfig; CheckBoxDeveloperInstall.Checked := TargetConfig.DeveloperInstall; CheckBoxCleanPalettes.Checked := TargetConfig.CleanPalettes; CheckBoxBuild.Checked := TargetConfig.Build; ! CheckBoxCompileOnly.Checked := not TargetConfig.CompileOnly; CheckBoxGenerateMapFiles.Checked := TargetConfig.GenerateMapFiles; --- 396,428 ---- if ItemIndex <= 0 then begin + // for all CheckBoxDeveloperInstall.State := TCheckBoxState(Installer.Data.DeveloperInstall); CheckBoxCleanPalettes.State := TCheckBoxState(Installer.Data.CleanPalettes); CheckBoxBuild.State := TCheckBoxState(Installer.Data.Build); case TCheckBoxState(Installer.Data.CompileOnly) of ! cbUnchecked: ! CheckBoxIDERegister.State := cbChecked; // invert ! cbChecked: ! CheckBoxIDERegister.State := cbUnchecked; // invert else ! CheckBoxIDERegister.State := cbGrayed; end; + BtnEditJvclInc.Visible := False; CheckBoxGenerateMapFiles.State := TCheckBoxState(Installer.Data.GenerateMapFiles); + + CheckBoxDebugUnits.State := TCheckBoxState(Installer.Data.DebugUnits); end else begin + // for selected TargetConfig := SelTargetConfig; + BtnEditJvclInc.Caption := Format(RsEditJvclInc, [LowerCase(TargetTypes[TargetConfig.Target.IsBCB]), TargetConfig.Target.Version]); + BtnEditJvclInc.Visible := True; CheckBoxDeveloperInstall.Checked := TargetConfig.DeveloperInstall; + CheckBoxDebugUnits.Checked := TargetConfig.DebugUnits; CheckBoxCleanPalettes.Checked := TargetConfig.CleanPalettes; CheckBoxBuild.Checked := TargetConfig.Build; ! CheckBoxIDERegister.Checked := not TargetConfig.CompileOnly; CheckBoxGenerateMapFiles.Checked := TargetConfig.GenerateMapFiles; *************** *** 373,380 **** --- 433,444 ---- end; + CheckBoxCleanPalettes.Enabled := CheckBoxIDERegister.Checked; + CheckBoxDebugUnits.Enabled := not CheckBoxDeveloperInstall.Checked; FrameDirEditBrowseBPL.Visible := ItemIndex > 0; FrameDirEditBrowseDCP.Visible := ItemIndex > 0; FrameDirEditBrowseHPP.Visible := (ItemIndex > 0) and SelTargetConfig.Target.IsBCB; LblBCBGuide.Visible := FrameDirEditBrowseHPP.Visible; + + UpdateJvclIncSettings; finally Dec(FInitializing); *************** *** 412,427 **** procedure TFrameConfigPage.BtnEditJvclIncClick(Sender: TObject); begin if FormJvclIncConfig.imgProjectJEDI.Picture.Graphic = nil then FormJvclIncConfig.imgProjectJEDI.Picture.Assign(FormMain.ImageLogo.Picture); ! FormJvclIncConfig.Config.Assign(Installer.Data.JVCLConfig); ! ! FormJvclIncConfig.UpdateCheckStates; ! if FormJvclIncConfig.ShowModal = mrOk then begin if FormJvclIncConfig.Config.Modified then begin ! Installer.Data.JVCLConfig.Assign(FormJvclIncConfig.Config); ! Installer.Data.JVCLConfig.Modified := True; end; end; --- 476,491 ---- procedure TFrameConfigPage.BtnEditJvclIncClick(Sender: TObject); begin + Assert(SelTargetConfig <> nil); + if FormJvclIncConfig.imgProjectJEDI.Picture.Graphic = nil then FormJvclIncConfig.imgProjectJEDI.Picture.Assign(FormMain.ImageLogo.Picture); ! FormJvclIncConfig.Config.Assign(SelTargetConfig.JVCLConfig); ! if FormJvclIncConfig.Execute(SelTargetConfig.Target.Name + ' ' + SelTargetConfig.Target.VersionStr) then begin if FormJvclIncConfig.Config.Modified then begin ! SelTargetConfig.JVCLConfig.Assign(FormJvclIncConfig.Config); ! SelTargetConfig.JVCLConfig.Modified := True; end; end; Index: FrmUninstall.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmUninstall.pas,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FrmUninstall.pas 7 May 2004 22:52:43 -0000 1.5 --- FrmUninstall.pas 23 Dec 2004 00:25:12 -0000 1.6 *************** *** 25,32 **** // $Id$ - {$I jvcl.inc} - unit FrmUninstall; interface --- 25,32 ---- // $Id$ unit FrmUninstall; + {$I jvcl.inc} + interface Index: FrmUninstall.dfm =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmUninstall.dfm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FrmUninstall.dfm 9 Apr 2004 22:22:33 -0000 1.2 --- FrmUninstall.dfm 23 Dec 2004 00:25:12 -0000 1.3 *************** *** 3,11 **** Top = 0 Width = 518 ! Height = 335 TabOrder = 0 object LblTarget: TLabel Left = 8 ! Top = 112 Width = 55 Height = 13 --- 3,11 ---- Top = 0 Width = 518 ! Height = 348 TabOrder = 0 object LblTarget: TLabel Left = 8 ! Top = 120 Width = 55 Height = 13 *************** *** 20,24 **** object LblFilename: TLabel Left = 8 ! Top = 160 Width = 68 Height = 13 --- 20,24 ---- object LblFilename: TLabel Left = 8 ! Top = 168 Width = 68 Height = 13 *************** *** 33,37 **** object ProgressBar: TProgressBar Left = 8 ! Top = 128 Width = 505 Height = 17 --- 33,37 ---- object ProgressBar: TProgressBar Left = 8 ! Top = 136 Width = 505 Height = 17 *************** *** 39,44 **** end object ProgressBarDelete: TProgressBar ! Left = 5 ! Top = 176 Width = 505 Height = 17 --- 39,44 ---- end object ProgressBarDelete: TProgressBar ! Left = 8 ! Top = 184 Width = 505 Height = 17 Index: FrmPackageSelection.dfm =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmPackageSelection.dfm,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FrmPackageSelection.dfm 14 Oct 2004 20:04:53 -0000 1.4 --- FrmPackageSelection.dfm 23 Dec 2004 00:25:12 -0000 1.5 *************** *** 3,7 **** Top = 0 Width = 518 ! Height = 335 TabOrder = 0 object LblTarget: TLabel --- 3,7 ---- Top = 0 Width = 518 ! Height = 348 TabOrder = 0 object LblTarget: TLabel *************** *** 49,53 **** Top = 120 Width = 505 ! Height = 209 OnClickCheck = CheckListBoxPackagesClickCheck AllowGrayed = True --- 49,53 ---- Top = 120 Width = 505 ! Height = 225 OnClickCheck = CheckListBoxPackagesClickCheck AllowGrayed = True Index: FrmPackageSelection.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmPackageSelection.pas,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FrmPackageSelection.pas 17 May 2004 21:45:02 -0000 1.8 --- FrmPackageSelection.pas 23 Dec 2004 00:25:12 -0000 1.9 *************** *** 25,32 **** // $Id$ - {$I jvcl.inc} - unit FrmPackageSelection; interface --- 25,32 ---- // $Id$ unit FrmPackageSelection; + {$I jvcl.inc} + interface Index: FrmConfigPage.dfm =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmConfigPage.dfm,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** FrmConfigPage.dfm 17 Dec 2004 21:14:35 -0000 1.17 --- FrmConfigPage.dfm 23 Dec 2004 00:25:12 -0000 1.18 *************** *** 3,10 **** Top = 0 Width = 518 ! Height = 335 TabOrder = 0 object LblBCBGuide: TLabel ! Left = 264 Top = 312 Width = 102 --- 3,10 ---- Top = 0 Width = 518 ! Height = 348 TabOrder = 0 object LblBCBGuide: TLabel ! Left = 272 Top = 312 Width = 102 *************** *** 28,59 **** object GroupBoxJvclInc: TGroupBox Left = 272 ! Top = 8 Width = 241 ! Height = 185 ! Caption = ' Global options for all IDEs ' TabOrder = 1 - object LblDxgettextHomepage: TLabel - Left = 8 - Top = 74 - Width = 146 - Height = 13 - Cursor = crHandPoint - Hint = - 'http://dxgettext.sourceforge.net|Download from <c:blue>http://dx' + - 'gettext.sourceforge.net<c:black>'#13#10'<c:red>The gnugettext.pas unit' + - ' will be added to the contains list'#13#10'of the JvCore-R package. Th' + - 'at means that you cannot add'#13#10'it to another package.' - Caption = 'dxgettext &support (not required)' - Font.Charset = DEFAULT_CHARSET - Font.Color = clBlue - Font.Height = -11 - Font.Name = 'MS Sans Serif' - Font.Style = [fsUnderline] - ParentFont = False - ParentShowHint = False - ShowHint = True - Visible = False - OnClick = LblDxgettextHomepageClick - end object CheckBoxXPTheming: TCheckBox Left = 8 --- 28,36 ---- object GroupBoxJvclInc: TGroupBox Left = 272 ! Top = 33 Width = 241 ! Height = 160 ! Caption = ' JVCL Options ' TabOrder = 1 object CheckBoxXPTheming: TCheckBox Left = 8 *************** *** 136,151 **** OnClick = CheckBoxXPThemingClick end - object BtnEditJvclInc: TButton - Left = 152 - Top = 154 - Width = 81 - Height = 25 - Hint = 'Edit all compile time conditions that are in the jvcl.inc file.' - Caption = 'Edit jvcl.inc' - ParentShowHint = False - ShowHint = True - TabOrder = 5 - OnClick = BtnEditJvclIncClick - end object CheckBoxUnitVersioning: TCheckBox Left = 8 --- 113,116 ---- *************** *** 160,164 **** ParentShowHint = False ShowHint = True ! TabOrder = 6 OnClick = CheckBoxXPThemingClick end --- 125,129 ---- ParentShowHint = False ShowHint = True ! TabOrder = 5 OnClick = CheckBoxXPThemingClick end *************** *** 166,186 **** object GroupBoxInstallOptions: TGroupBox Left = 8 ! Top = 8 Width = 249 ! Height = 321 Caption = ' Installation options ' TabOrder = 0 - object LblOptionsFor: TLabel - Left = 8 - Top = 20 - Width = 54 - Height = 13 - Caption = '&Options for:' - FocusControl = ComboBoxTargetIDE - end object CheckBoxDeveloperInstall: TCheckBox ! Left = 16 ! Top = 115 ! Width = 225 Height = 17 Hint = --- 131,143 ---- object GroupBoxInstallOptions: TGroupBox Left = 8 ! Top = 33 Width = 249 ! Height = 312 Caption = ' Installation options ' TabOrder = 0 object CheckBoxDeveloperInstall: TCheckBox ! Left = 8 ! Top = 88 ! Width = 233 Height = 17 Hint = *************** *** 192,202 **** ParentShowHint = False ShowHint = True ! TabOrder = 4 OnClick = CheckBoxDeveloperInstallClick end object CheckBoxCleanPalettes: TCheckBox ! Left = 16 ! Top = 91 ! Width = 225 Height = 17 Hint = --- 149,159 ---- ParentShowHint = False ShowHint = True ! TabOrder = 3 OnClick = CheckBoxDeveloperInstallClick end object CheckBoxCleanPalettes: TCheckBox ! Left = 24 ! Top = 64 ! Width = 217 Height = 17 Hint = *************** *** 207,227 **** ParentShowHint = False ShowHint = True ! TabOrder = 3 OnClick = CheckBoxDeveloperInstallClick end - object ComboBoxTargetIDE: TComboBox - Left = 72 - Top = 16 - Width = 169 - Height = 22 - Style = csOwnerDrawFixed - ItemHeight = 16 - TabOrder = 0 - OnChange = ComboBoxTargetIDEChange - OnDrawItem = ComboBoxTargetIDEDrawItem - end object CheckBoxBuild: TCheckBox Left = 8 ! Top = 43 Width = 233 Height = 17 --- 164,173 ---- ParentShowHint = False ShowHint = True ! TabOrder = 2 OnClick = CheckBoxDeveloperInstallClick end object CheckBoxBuild: TCheckBox Left = 8 ! Top = 16 Width = 233 Height = 17 *************** *** 234,243 **** ParentShowHint = False ShowHint = True ! TabOrder = 1 OnClick = CheckBoxDeveloperInstallClick end ! object CheckBoxCompileOnly: TCheckBox Left = 8 ! Top = 67 Width = 233 Height = 17 --- 180,189 ---- ParentShowHint = False ShowHint = True ! TabOrder = 0 OnClick = CheckBoxDeveloperInstallClick end ! object CheckBoxIDERegister: TCheckBox Left = 8 ! Top = 40 Width = 233 Height = 17 *************** *** 249,258 **** ParentShowHint = False ShowHint = True ! TabOrder = 2 OnClick = CheckBoxDeveloperInstallClick end inline FrameDirEditBrowseBPL: TFrameDirEditBrowse Left = 2 ! Top = 160 Width = 239 Height = 49 --- 195,204 ---- ParentShowHint = False ShowHint = True ! TabOrder = 1 OnClick = CheckBoxDeveloperInstallClick end inline FrameDirEditBrowseBPL: TFrameDirEditBrowse Left = 2 ! Top = 155 Width = 239 Height = 49 *************** *** 278,282 **** inline FrameDirEditBrowseDCP: TFrameDirEditBrowse Left = 2 ! Top = 208 Width = 239 Height = 49 --- 224,228 ---- inline FrameDirEditBrowseDCP: TFrameDirEditBrowse Left = 2 ! Top = 203 Width = 239 Height = 49 *************** *** 302,306 **** inline FrameDirEditBrowseHPP: TFrameDirEditBrowse Left = 2 ! Top = 264 Width = 239 Height = 49 --- 248,252 ---- inline FrameDirEditBrowseHPP: TFrameDirEditBrowse Left = 2 ! Top = 259 Width = 239 Height = 49 *************** *** 334,338 **** object CheckBoxGenerateMapFiles: TCheckBox Left = 8 ! Top = 139 Width = 233 Height = 17 --- 280,284 ---- object CheckBoxGenerateMapFiles: TCheckBox Left = 8 ! Top = 136 Width = 233 Height = 17 *************** *** 349,352 **** --- 295,314 ---- OnClick = CheckBoxDeveloperInstallClick end + object CheckBoxDebugUnits: TCheckBox + Left = 24 + Top = 112 + Width = 217 + Height = 17 + Hint = + 'Activate this option if you also want to compile debug units.'#13#10'J' + + 'VCL Developer installations units do not need this because'#13#10'they' + + ' are compiled with debug information included.' + AllowGrayed = True + Caption = 'Compile debug units' + ParentShowHint = False + ShowHint = True + TabOrder = 4 + OnClick = CheckBoxDeveloperInstallClick + end end object CheckBoxCompileJclDcp: TCheckBox *************** *** 393,396 **** --- 355,398 ---- OnClick = CheckBoxCompileJclDcpClick end + object ComboBoxTargetIDE: TComboBox + Left = 80 + Top = 8 + Width = 177 + Height = 22 + Style = csOwnerDrawFixed + ItemHeight = 16 + TabOrder = 5 + OnChange = ComboBoxTargetIDEChange + OnDrawItem = ComboBoxTargetIDEDrawItem + end + object BtnEditJvclInc: TButton + Left = 384 + Top = 7 + Width = 129 + Height = 25 + Hint = 'Edit all compile time conditions that are in the jvcl.inc file.' + Caption = 'Edit jvcl%s%d.inc' + ParentShowHint = False + ShowHint = True + TabOrder = 6 + OnClick = BtnEditJvclIncClick + end + object PanelBk: TPanel + Left = 0 + Top = 8 + Width = 78 + Height = 22 + BevelOuter = bvNone + TabOrder = 7 + object LblOptionsFor: TLabel + Left = 8 + Top = 4 + Width = 54 + Height = 13 + Caption = '&Options for:' + FocusControl = ComboBoxTargetIDE + Transparent = False + end + end object ImageListTargets: TImageList Left = 200 Index: FrmInstall.dfm =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmInstall.dfm,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FrmInstall.dfm 10 May 2004 16:57:59 -0000 1.3 --- FrmInstall.dfm 23 Dec 2004 00:25:12 -0000 1.4 *************** *** 3,7 **** Top = 0 Width = 518 ! Height = 335 TabOrder = 0 object LblTarget: TLabel --- 3,7 ---- Top = 0 Width = 518 ! Height = 348 TabOrder = 0 object LblTarget: TLabel *************** *** 27,31 **** object LblOpenFile: TLabel Left = 8 ! Top = 320 Width = 505 Height = 13 --- 27,31 ---- object LblOpenFile: TLabel Left = 8 ! Top = 331 Width = 505 Height = 13 *************** *** 62,66 **** Top = 128 Width = 505 ! Height = 193 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText --- 62,66 ---- Top = 128 Width = 505 ! Height = 201 Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText Index: FrmInstall.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/install/JVCLInstall/Frames/FrmInstall.pas,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** FrmInstall.pas 17 Dec 2004 21:14:36 -0000 1.16 --- FrmInstall.pas 23 Dec 2004 00:25:12 -0000 1.17 *************** *** 25,33 **** // $Id$ {$I jvcl.inc} {$I windowsonly.inc} - unit FrmInstall; - interface --- 25,33 ---- // $Id$ + unit FrmInstall; + {$I jvcl.inc} {$I windowsonly.inc} interface |