Browse Source

More (all of WizardForm).

Martijn Laan 6 years ago
parent
commit
14d7a5c952
3 changed files with 257 additions and 341 deletions
  1. 1 167
      Projects/ScriptClasses_R.pas
  2. 87 87
      Projects/Wizard.dfm
  3. 169 87
      Projects/Wizard.pas

+ 1 - 167
Projects/ScriptClasses_R.pas

@@ -201,179 +201,13 @@ begin
   end;
   end;
 end;
 end;
 
 
-procedure TWizardFormCancelButton_R(Self: TWizardForm; var T: TNewButton); begin T := Self.CancelButton; end;
-procedure TWizardFormNextButton_R(Self: TWizardForm; var T: TNewButton); begin T := Self.NextButton; end;
-procedure TWizardFormBackButton_R(Self: TWizardForm; var T: TNewButton); begin T := Self.BackButton; end;
-procedure TWizardFormOuterNotebook_R(Self: TWizardForm; var T: TNewNotebook); begin T := Self.OuterNotebook; end;
-procedure TWizardFormInnerNotebook_R(Self: TWizardForm; var T: TNewNotebook); begin T := Self.InnerNotebook; end;
-procedure TWizardFormInfoAfterPage_R(Self: TWizardForm; var T: TNewNotebookPage); begin T := Self.InfoAfterPage; end;
-procedure TWizardFormInstallingPage_R(Self: TWizardForm; var T: TNewNotebookPage); begin T := Self.InstallingPage; end;
-procedure TWizardFormPreparingPage_R(Self: TWizardForm; var T: TNewNotebookPage); begin T := Self.PreparingPage; end;
-procedure TWizardFormReadyPage_R(Self: TWizardForm; var T: TNewNotebookPage); begin T := Self.ReadyPage; end;
-procedure TWizardFormSelectTasksPage_R(Self: TWizardForm; var T: TNewNotebookPage); begin T := Self.SelectTasksPage; end;
-procedure TWizardFormSelectProgramGroupPage_R(Self: TWizardForm; var T: TNewNotebookPage); begin T := Self.SelectProgramGroupPage; end;
-procedure TWizardFormSelectComponentsPage_R(Self: TWizardForm; var T: TNewNotebookPage); begin T := Self.SelectComponentsPage; end;
-procedure TWizardFormSelectDirPage_R(Self: TWizardForm; var T: TNewNotebookPage); begin T := Self.SelectDirPage; end;
-procedure TWizardFormUserInfoPage_R(Self: TWizardForm; var T: TNewNotebookPage); begin T := Self.UserInfoPage; end;
-procedure TWizardFormInfoBeforePage_R(Self: TWizardForm; var T: TNewNotebookPage); begin T := Self.InfoBeforePage; end;
-procedure TWizardFormPasswordPage_R(Self: TWizardForm; var T: TNewNotebookPage); begin T := Self.PasswordPage; end;
-procedure TWizardFormLicensePage_R(Self: TWizardForm; var T: TNewNotebookPage); begin T := Self.LicensePage; end;
-procedure TWizardFormFinishedPage_R(Self: TWizardForm; var T: TNewNotebookPage); begin T := Self.FinishedPage; end;
-procedure TWizardFormInnerPage_R(Self: TWizardForm; var T: TNewNotebookPage); begin T := Self.InnerPage; end;
-procedure TWizardFormWelcomePage_R(Self: TWizardForm; var T: TNewNotebookPage); begin T := Self.WelcomePage; end;
-procedure TWizardFormDiskSpaceLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.DiskSpaceLabel; end;
-procedure TWizardFormDirEdit_R(Self: TWizardForm; var T: TEdit); begin T := Self.DirEdit; end;
-procedure TWizardFormGroupEdit_R(Self: TWizardForm; var T: TNewEdit); begin T := Self.GroupEdit; end;
-procedure TWizardFormNoIconsCheck_R(Self: TWizardForm; var T: TNewCheckBox); begin T := Self.NoIconsCheck; end;
-procedure TWizardFormPasswordLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.PasswordLabel; end;
-procedure TWizardFormPasswordEdit_R(Self: TWizardForm; var T: TPASSWORDEDIT); begin T := Self.PasswordEdit; end;
-procedure TWizardFormPasswordEditLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.PasswordEditLabel; end;
-procedure TWizardFormReadyMemo_R(Self: TWizardForm; var T: TNewMemo); begin T := Self.ReadyMemo; end;
-procedure TWizardFormTypesCombo_R(Self: TWizardForm; var T: TNewComboBox); begin T := Self.TypesCombo; end;
-procedure TWizardFormBevel_R(Self: TWizardForm; var T: TBevel); begin T := Self.Bevel; end;
-procedure TWizardFormWizardBitmapImage_R(Self: TWizardForm; var T: TBitmapImage); begin T := Self.WizardBitmapImage; end;
-procedure TWizardFormWelcomeLabel1_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.WelcomeLabel1; end;
-procedure TWizardFormInfoBeforeMemo_R(Self: TWizardForm; var T: TRichEditViewer); begin T := Self.InfoBeforeMemo; end;
-procedure TWizardFormInfoBeforeClickLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.InfoBeforeClickLabel; end;
-procedure TWizardFormMainPanel_R(Self: TWizardForm; var T: TPanel); begin T := Self.MainPanel; end;
-procedure TWizardFormBevel1_R(Self: TWizardForm; var T: TBevel); begin T := Self.Bevel1; end;
-procedure TWizardFormPageNameLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.PageNameLabel; end;
-procedure TWizardFormPageDescriptionLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.PageDescriptionLabel; end;
-procedure TWizardFormWizardSmallBitmapImage_R(Self: TWizardForm; var T: TBitmapImage); begin T := Self.WizardSmallBitmapImage; end;
-procedure TWizardFormReadyLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.ReadyLabel; end;
-procedure TWizardFormFinishedLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.FinishedLabel; end;
-procedure TWizardFormYesRadio_R(Self: TWizardForm; var T: TNewRadioButton); begin T := Self.YesRadio; end;
-procedure TWizardFormNoRadio_R(Self: TWizardForm; var T: TNewRadioButton); begin T := Self.NoRadio; end;
-procedure TWizardFormWizardBitmapImage2_R(Self: TWizardForm; var T: TBitmapImage); begin T := Self.WizardBitmapImage2; end;
-procedure TWizardFormWelcomeLabel2_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.WelcomeLabel2; end;
-procedure TWizardFormLicenseLabel1_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.LicenseLabel1; end;
-procedure TWizardFormLicenseMemo_R(Self: TWizardForm; var T: TRichEditViewer); begin T := Self.LicenseMemo; end;
-procedure TWizardFormInfoAfterMemo_R(Self: TWizardForm; var T: TRichEditViewer); begin T := Self.InfoAfterMemo; end;
-procedure TWizardFormInfoAfterClickLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.InfoAfterClickLabel; end;
-procedure TWizardFormComponentsList_R(Self: TWizardForm; var T: TNewCheckListBox); begin T := Self.ComponentsList; end;
-procedure TWizardFormComponentsDiskSpaceLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.ComponentsDiskSpaceLabel; end;
-procedure TWizardFormBeveledLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.BeveledLabel; end;
-procedure TWizardFormStatusLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.StatusLabel; end;
-procedure TWizardFormFilenameLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.FilenameLabel; end;
-procedure TWizardFormProgressGauge_R(Self: TWizardForm; var T: TNewProgressBar); begin T := Self.ProgressGauge; end;
-procedure TWizardFormSelectDirLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.SelectDirLabel; end;
-procedure TWizardFormSelectStartMenuFolderLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.SelectStartMenuFolderLabel; end;
-procedure TWizardFormSelectComponentsLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.SelectComponentsLabel; end;
-procedure TWizardFormSelectTasksLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.SelectTasksLabel; end;
-procedure TWizardFormLicenseAcceptedRadio_R(Self: TWizardForm; var T: TNewRadioButton); begin T := Self.LicenseAcceptedRadio; end;
-procedure TWizardFormLicenseNotAcceptedRadio_R(Self: TWizardForm; var T: TNewRadioButton); begin T := Self.LicenseNotAcceptedRadio; end;
-procedure TWizardFormUserInfoNameLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.UserInfoNameLabel; end;
-procedure TWizardFormUserInfoNameEdit_R(Self: TWizardForm; var T: TNewEdit); begin T := Self.UserInfoNameEdit; end;
-procedure TWizardFormUserInfoOrgLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.UserInfoOrgLabel; end;
-procedure TWizardFormUserInfoOrgEdit_R(Self: TWizardForm; var T: TNewEdit); begin T := Self.UserInfoOrgEdit; end;
-procedure TWizardFormPreparingErrorBitmapImage_R(Self: TWizardForm; var T: TBitmapImage); begin T := Self.PreparingErrorBitmapImage; end;
-procedure TWizardFormPreparingLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.PreparingLabel; end;
-procedure TWizardFormFinishedHeadingLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.FinishedHeadingLabel; end;
-procedure TWizardFormUserInfoSerialLabel_R(Self: TWizardForm; var T: TNewStaticText); begin T := Self.UserInfoSerialLabel; end;
-procedure TWizardFormUserInfoSerialEdit_R(Self: TWizardForm; var T: TNewEdit); begin T := Self.UserInfoSerialEdit; end;
-procedure TWizardFormTasksList_R(Self: TWizardForm; var T: TNewCheckListBox); begin T := Self.TasksList; end;
-procedure TWizardFormRunList_R(Self: TWizardForm; var T: TNewCheckListBox); begin T := Self.RunList; end;
-procedure TWizardFormCurPageID_R(Self: TWizardForm; var T: Integer); begin T := Self.CurPageID; end;
-procedure TWizardFormDirBrowseButton_R(Self: TWizardForm; var T: TNewButton); begin T := Self.DirBrowseButton; end;
-procedure TWizardFormGroupBrowseButton_R(Self: TWizardForm; var T: TNewButton); begin T := Self.GroupBrowseButton; end;
-procedure TWizardFormSelectDirBitmapImage(Self: TWizardForm; var T: TBitmapImage); begin T := Self.SelectDirBitmapImage; end;
-procedure TWizardFormSelectGroupBitmapImage(Self: TWizardForm; var T: TBitmapImage); begin T := Self.SelectGroupBitmapImage; end;
-procedure TWizardFormSelectDirBrowseLabel(Self: TWizardForm; var T: TNewStaticText); begin T := Self.SelectDirBrowseLabel; end;
-procedure TWizardFormSelectStartMenuFolderBrowseLabel(Self: TWizardForm; var T: TNewStaticText); begin T := Self.SelectStartMenuFolderBrowseLabel; end;
-procedure TWizardFormPreparingYesRadio_R(Self: TWizardForm; var T: TNewRadioButton); begin T := Self.PreparingYesRadio; end;
-procedure TWizardFormPreparingNoRadio_R(Self: TWizardForm; var T: TNewRadioButton); begin T := Self.PreparingNoRadio; end;
-procedure TWizardFormPreparingMemo_R(Self: TWizardForm; var T: TNewMemo); begin T := Self.PreparingMemo; end;
-procedure TWizardFormPrevAppDir_R(Self: TWizardForm; var T: String); begin T := Self.PrevAppDir; end;
-
 procedure RegisterWizardForm_R(Cl: TPSRuntimeClassImporter);
 procedure RegisterWizardForm_R(Cl: TPSRuntimeClassImporter);
 begin
 begin
   with Cl.Add(TWizardForm) do
   with Cl.Add(TWizardForm) do
   begin
   begin
-    RegisterPropertyHelper(@TWizardFormCancelButton_R, nil, 'CancelButton');
-    RegisterPropertyHelper(@TWizardFormNextButton_R, nil, 'NextButton');
-    RegisterPropertyHelper(@TWizardFormBackButton_R, nil, 'BackButton');
-    RegisterPropertyHelper(@TWizardFormOuterNotebook_R, nil, 'OuterNotebook');
-    RegisterPropertyHelper(@TWizardFormInnerNotebook_R, nil, 'InnerNotebook');
-    RegisterPropertyHelper(@TWizardFormWelcomePage_R,nil,'WelcomePage');
-    RegisterPropertyHelper(@TWizardFormInnerPage_R,nil,'InnerPage');
-    RegisterPropertyHelper(@TWizardFormFinishedPage_R,nil,'FinishedPage');
-    RegisterPropertyHelper(@TWizardFormLicensePage_R,nil,'LicensePage');
-    RegisterPropertyHelper(@TWizardFormPasswordPage_R,nil,'PasswordPage');
-    RegisterPropertyHelper(@TWizardFormInfoBeforePage_R,nil,'InfoBeforePage');
-    RegisterPropertyHelper(@TWizardFormUserInfoPage_R,nil,'UserInfoPage');
-    RegisterPropertyHelper(@TWizardFormSelectDirPage_R,nil,'SelectDirPage');
-    RegisterPropertyHelper(@TWizardFormSelectComponentsPage_R,nil,'SelectComponentsPage');
-    RegisterPropertyHelper(@TWizardFormSelectProgramGroupPage_R,nil,'SelectProgramGroupPage');
-    RegisterPropertyHelper(@TWizardFormSelectTasksPage_R,nil,'SelectTasksPage');
-    RegisterPropertyHelper(@TWizardFormReadyPage_R,nil,'ReadyPage');
-    RegisterPropertyHelper(@TWizardFormPreparingPage_R,nil,'PreparingPage');
-    RegisterPropertyHelper(@TWizardFormInstallingPage_R,nil,'InstallingPage');
-    RegisterPropertyHelper(@TWizardFormInfoAfterPage_R,nil,'InfoAfterPage');
-    RegisterPropertyHelper(@TWizardFormDiskSpaceLabel_R, nil, 'DiskSpaceLabel');
-    RegisterPropertyHelper(@TWizardFormDirEdit_R, nil, 'DirEdit');
-    RegisterPropertyHelper(@TWizardFormGroupEdit_R, nil, 'GroupEdit');
-    RegisterPropertyHelper(@TWizardFormNoIconsCheck_R, nil, 'NoIconsCheck');
-    RegisterPropertyHelper(@TWizardFormPasswordLabel_R, nil, 'PasswordLabel');
-    RegisterPropertyHelper(@TWizardFormPasswordEdit_R, nil, 'PasswordEdit');
-    RegisterPropertyHelper(@TWizardFormPasswordEditLabel_R, nil, 'PasswordEditLabel');
-    RegisterPropertyHelper(@TWizardFormReadyMemo_R, nil, 'ReadyMemo');
-    RegisterPropertyHelper(@TWizardFormTypesCombo_R, nil, 'TypesCombo');
-    RegisterPropertyHelper(@TWizardFormBevel_R, nil, 'Bevel');
-    RegisterPropertyHelper(@TWizardFormWizardBitmapImage_R, nil, 'WizardBitmapImage');
-    RegisterPropertyHelper(@TWizardFormWelcomeLabel1_R, nil, 'WelcomeLabel1');
-    RegisterPropertyHelper(@TWizardFormInfoBeforeMemo_R, nil, 'InfoBeforeMemo');
-    RegisterPropertyHelper(@TWizardFormInfoBeforeClickLabel_R, nil, 'InfoBeforeClickLabel');
-    RegisterPropertyHelper(@TWizardFormMainPanel_R, nil, 'MainPanel');
-    RegisterPropertyHelper(@TWizardFormBevel1_R, nil, 'Bevel1');
-    RegisterPropertyHelper(@TWizardFormPageNameLabel_R, nil, 'PageNameLabel');
-    RegisterPropertyHelper(@TWizardFormPageDescriptionLabel_R, nil, 'PageDescriptionLabel');
-    RegisterPropertyHelper(@TWizardFormWizardSmallBitmapImage_R, nil, 'WizardSmallBitmapImage');
-    RegisterPropertyHelper(@TWizardFormReadyLabel_R, nil, 'ReadyLabel');
-    RegisterPropertyHelper(@TWizardFormFinishedLabel_R, nil, 'FinishedLabel');
-    RegisterPropertyHelper(@TWizardFormYesRadio_R, nil, 'YesRadio');
-    RegisterPropertyHelper(@TWizardFormNoRadio_R, nil, 'NoRadio');
-    RegisterPropertyHelper(@TWizardFormWizardBitmapImage2_R, nil, 'WizardBitmapImage2');
-    RegisterPropertyHelper(@TWizardFormWelcomeLabel2_R, nil, 'WelcomeLabel2');
-    RegisterPropertyHelper(@TWizardFormLicenseLabel1_R, nil, 'LicenseLabel1');
-    RegisterPropertyHelper(@TWizardFormLicenseMemo_R, nil, 'LicenseMemo');
-    RegisterPropertyHelper(@TWizardFormInfoAfterMemo_R, nil, 'InfoAfterMemo');
-    RegisterPropertyHelper(@TWizardFormInfoAfterClickLabel_R, nil, 'InfoAfterClickLabel');
-    RegisterPropertyHelper(@TWizardFormComponentsList_R, nil, 'ComponentsList');
-    RegisterPropertyHelper(@TWizardFormComponentsDiskSpaceLabel_R, nil, 'ComponentsDiskSpaceLabel');
-    RegisterPropertyHelper(@TWizardFormBeveledLabel_R, nil, 'BeveledLabel');
-    RegisterPropertyHelper(@TWizardFormStatusLabel_R, nil, 'StatusLabel');
-    RegisterPropertyHelper(@TWizardFormFilenameLabel_R, nil, 'FilenameLabel');
-    RegisterPropertyHelper(@TWizardFormProgressGauge_R, nil, 'ProgressGauge');
-    RegisterPropertyHelper(@TWizardFormSelectDirLabel_R, nil, 'SelectDirLabel');
-    RegisterPropertyHelper(@TWizardFormSelectStartMenuFolderLabel_R, nil, 'SelectStartMenuFolderLabel');
-    RegisterPropertyHelper(@TWizardFormSelectComponentsLabel_R, nil, 'SelectComponentsLabel');
-    RegisterPropertyHelper(@TWizardFormSelectTasksLabel_R, nil, 'SelectTasksLabel');
-    RegisterPropertyHelper(@TWizardFormLicenseAcceptedRadio_R, nil, 'LicenseAcceptedRadio');
-    RegisterPropertyHelper(@TWizardFormLicenseNotAcceptedRadio_R, nil, 'LicenseNotAcceptedRadio');
-    RegisterPropertyHelper(@TWizardFormUserInfoNameLabel_R, nil, 'UserInfoNameLabel');
-    RegisterPropertyHelper(@TWizardFormUserInfoNameEdit_R, nil, 'UserInfoNameEdit');
-    RegisterPropertyHelper(@TWizardFormUserInfoOrgLabel_R, nil, 'UserInfoOrgLabel');
-    RegisterPropertyHelper(@TWizardFormUserInfoOrgEdit_R, nil, 'UserInfoOrgEdit');
-    RegisterPropertyHelper(@TWizardFormPreparingErrorBitmapImage_R, nil, 'PreparingErrorBitmapImage');
-    RegisterPropertyHelper(@TWizardFormPreparingLabel_R, nil, 'PreparingLabel');
-    RegisterPropertyHelper(@TWizardFormFinishedHeadingLabel_R, nil, 'FinishedHeadingLabel');
-    RegisterPropertyHelper(@TWizardFormUserInfoSerialLabel_R, nil, 'UserInfoSerialLabel');
-    RegisterPropertyHelper(@TWizardFormUserInfoSerialEdit_R, nil, 'UserInfoSerialEdit');
-    RegisterPropertyHelper(@TWizardFormTasksList_R, nil, 'TasksList');
-    RegisterPropertyHelper(@TWizardFormRunList_R, nil, 'RunList');
-    RegisterPropertyHelper(@TWizardFormDirBrowseButton_R, nil, 'DirBrowseButton');
-    RegisterPropertyHelper(@TWizardFormGroupBrowseButton_R, nil, 'GroupBrowseButton');
-    RegisterPropertyHelper(@TWizardFormSelectDirBitmapImage, nil, 'SelectDirBitmapImage');
-    RegisterPropertyHelper(@TWizardFormSelectGroupBitmapImage, nil, 'SelectGroupBitmapImage');
-    RegisterPropertyHelper(@TWizardFormSelectDirBrowseLabel, nil, 'SelectDirBrowseLabel');
-    RegisterPropertyHelper(@TWizardFormSelectStartMenuFolderBrowseLabel, nil,'SelectStartMenuFolderBrowseLabel');
-    RegisterPropertyHelper(@TWizardFormPreparingYesRadio_R, nil, 'PreparingYesRadio');
-    RegisterPropertyHelper(@TWizardFormPreparingNoRadio_R, nil, 'PreparingNoRadio');
-    RegisterPropertyHelper(@TWizardFormPreparingMemo_R, nil, 'PreparingMemo');
-    RegisterPropertyHelper(@TWizardFormCurPageID_R, nil, 'CurPageID');
+
     RegisterMethod(@TWizardForm.AdjustLabelHeight, 'AdjustLabelHeight');
     RegisterMethod(@TWizardForm.AdjustLabelHeight, 'AdjustLabelHeight');
     RegisterMethod(@TWizardForm.IncTopDecHeight, 'IncTopDecHeight');
     RegisterMethod(@TWizardForm.IncTopDecHeight, 'IncTopDecHeight');
-    RegisterPropertyHelper(@TWizardFormPrevAppDir_R, nil, 'PrevAppDir');
   end;
   end;
 end;
 end;
 
 

+ 87 - 87
Projects/Wizard.dfm

@@ -21,7 +21,7 @@ object WizardForm: TWizardForm
     360)
     360)
   PixelsPerInch = 96
   PixelsPerInch = 96
   TextHeight = 13
   TextHeight = 13
-  object Bevel: TBevel
+  object FBevel: TBevel
     Left = 0
     Left = 0
     Top = 313
     Top = 313
     Width = 497
     Width = 497
@@ -29,7 +29,7 @@ object WizardForm: TWizardForm
     Anchors = [akLeft, akRight, akBottom]
     Anchors = [akLeft, akRight, akBottom]
     Shape = bsTopLine
     Shape = bsTopLine
   end
   end
-  object CancelButton: TNewButton
+  object FCancelButton: TNewButton
     Left = 464
     Left = 464
     Top = 327
     Top = 327
     Width = 17
     Width = 17
@@ -40,7 +40,7 @@ object WizardForm: TWizardForm
     TabOrder = 4
     TabOrder = 4
     OnClick = CancelButtonClick
     OnClick = CancelButtonClick
   end
   end
-  object NextButton: TNewButton
+  object FNextButton: TNewButton
     Left = 440
     Left = 440
     Top = 327
     Top = 327
     Width = 17
     Width = 17
@@ -51,7 +51,7 @@ object WizardForm: TWizardForm
     TabOrder = 3
     TabOrder = 3
     OnClick = NextButtonClick
     OnClick = NextButtonClick
   end
   end
-  object BackButton: TNewButton
+  object FBackButton: TNewButton
     Left = 424
     Left = 424
     Top = 327
     Top = 327
     Width = 16
     Width = 16
@@ -61,23 +61,23 @@ object WizardForm: TWizardForm
     TabOrder = 2
     TabOrder = 2
     OnClick = BackButtonClick
     OnClick = BackButtonClick
   end
   end
-  object OuterNotebook: TNewNotebook
+  object FOuterNotebook: TNewNotebook
     Left = 0
     Left = 0
     Top = 0
     Top = 0
     Width = 497
     Width = 497
     Height = 313
     Height = 313
-    ActivePage = InnerPage
+    ActivePage = FInnerPage
     Anchors = [akLeft, akTop, akRight, akBottom]
     Anchors = [akLeft, akTop, akRight, akBottom]
     Color = clBtnFace
     Color = clBtnFace
     ParentColor = False
     ParentColor = False
     TabOrder = 0
     TabOrder = 0
-    object WelcomePage: TNewNotebookPage
+    object FWelcomePage: TNewNotebookPage
       Color = clWindow
       Color = clWindow
       ParentColor = False
       ParentColor = False
       DesignSize = (
       DesignSize = (
         497
         497
         313)
         313)
-      object WizardBitmapImage: TBitmapImage
+      object FWizardBitmapImage: TBitmapImage
         Left = 0
         Left = 0
         Top = 0
         Top = 0
         Width = 164
         Width = 164
@@ -85,7 +85,7 @@ object WizardForm: TWizardForm
         Anchors = [akLeft, akTop, akBottom]
         Anchors = [akLeft, akTop, akBottom]
         BackColor = clWindow
         BackColor = clWindow
       end
       end
-      object WelcomeLabel2: TNewStaticText
+      object FWelcomeLabel2: TNewStaticText
         Left = 176
         Left = 176
         Top = 76
         Top = 76
         Width = 301
         Width = 301
@@ -97,7 +97,7 @@ object WizardForm: TWizardForm
         TabOrder = 1
         TabOrder = 1
         WordWrap = True
         WordWrap = True
       end
       end
-      object WelcomeLabel1: TNewStaticText
+      object FWelcomeLabel1: TNewStaticText
         Left = 176
         Left = 176
         Top = 16
         Top = 16
         Width = 301
         Width = 301
@@ -110,11 +110,11 @@ object WizardForm: TWizardForm
         WordWrap = True
         WordWrap = True
       end
       end
     end
     end
-    object InnerPage: TNewNotebookPage
+    object FInnerPage: TNewNotebookPage
       DesignSize = (
       DesignSize = (
         497
         497
         313)
         313)
-      object Bevel1: TBevel
+      object FBevel1: TBevel
         Left = 0
         Left = 0
         Top = 58
         Top = 58
         Width = 499
         Width = 499
@@ -122,19 +122,19 @@ object WizardForm: TWizardForm
         Anchors = [akLeft, akTop, akRight]
         Anchors = [akLeft, akTop, akRight]
         Shape = bsTopLine
         Shape = bsTopLine
       end
       end
-      object InnerNotebook: TNewNotebook
+      object FInnerNotebook: TNewNotebook
         Left = 40
         Left = 40
         Top = 72
         Top = 72
         Width = 417
         Width = 417
         Height = 237
         Height = 237
-        ActivePage = LicensePage
+        ActivePage = FLicensePage
         Anchors = [akLeft, akTop, akRight, akBottom]
         Anchors = [akLeft, akTop, akRight, akBottom]
         TabOrder = 1
         TabOrder = 1
-        object LicensePage: TNewNotebookPage
+        object FLicensePage: TNewNotebookPage
           DesignSize = (
           DesignSize = (
             417
             417
             237)
             237)
-          object LicenseNotAcceptedRadio: TNewRadioButton
+          object FLicenseNotAcceptedRadio: TNewRadioButton
             Left = 0
             Left = 0
             Top = 216
             Top = 216
             Width = 417
             Width = 417
@@ -146,7 +146,7 @@ object WizardForm: TWizardForm
             TabStop = True
             TabStop = True
             OnClick = LicenseNotAcceptedRadioClick
             OnClick = LicenseNotAcceptedRadioClick
           end
           end
-          object LicenseAcceptedRadio: TNewRadioButton
+          object FLicenseAcceptedRadio: TNewRadioButton
             Left = 0
             Left = 0
             Top = 196
             Top = 196
             Width = 417
             Width = 417
@@ -156,7 +156,7 @@ object WizardForm: TWizardForm
             TabOrder = 2
             TabOrder = 2
             OnClick = LicenseAcceptedRadioClick
             OnClick = LicenseAcceptedRadioClick
           end
           end
-          object LicenseMemo: TRichEditViewer
+          object FLicenseMemo: TRichEditViewer
             Left = 0
             Left = 0
             Top = 24
             Top = 24
             Width = 417
             Width = 417
@@ -170,7 +170,7 @@ object WizardForm: TWizardForm
             WantReturns = False
             WantReturns = False
             UseRichEdit = False
             UseRichEdit = False
           end
           end
-          object LicenseLabel1: TNewStaticText
+          object FLicenseLabel1: TNewStaticText
             Left = 0
             Left = 0
             Top = 0
             Top = 0
             Width = 417
             Width = 417
@@ -183,11 +183,11 @@ object WizardForm: TWizardForm
             WordWrap = True
             WordWrap = True
           end
           end
         end
         end
-        object PasswordPage: TNewNotebookPage
+        object FPasswordPage: TNewNotebookPage
           DesignSize = (
           DesignSize = (
             417
             417
             237)
             237)
-          object PasswordEdit: TPasswordEdit
+          object FPasswordEdit: TPasswordEdit
             Left = 0
             Left = 0
             Top = 40
             Top = 40
             Width = 265
             Width = 265
@@ -195,7 +195,7 @@ object WizardForm: TWizardForm
             Anchors = [akLeft, akTop, akRight]
             Anchors = [akLeft, akTop, akRight]
             TabOrder = 2
             TabOrder = 2
           end
           end
-          object PasswordEditLabel: TNewStaticText
+          object FPasswordEditLabel: TNewStaticText
             Left = 0
             Left = 0
             Top = 24
             Top = 24
             Width = 417
             Width = 417
@@ -203,11 +203,11 @@ object WizardForm: TWizardForm
             Anchors = [akLeft, akTop, akRight]
             Anchors = [akLeft, akTop, akRight]
             AutoSize = False
             AutoSize = False
             Caption = '*'
             Caption = '*'
-            FocusControl = PasswordEdit
+            FocusControl = FPasswordEdit
             TabOrder = 1
             TabOrder = 1
             WordWrap = True
             WordWrap = True
           end
           end
-          object PasswordLabel: TNewStaticText
+          object FPasswordLabel: TNewStaticText
             Left = 0
             Left = 0
             Top = 0
             Top = 0
             Width = 417
             Width = 417
@@ -220,11 +220,11 @@ object WizardForm: TWizardForm
             WordWrap = True
             WordWrap = True
           end
           end
         end
         end
-        object InfoBeforePage: TNewNotebookPage
+        object FInfoBeforePage: TNewNotebookPage
           DesignSize = (
           DesignSize = (
             417
             417
             237)
             237)
-          object InfoBeforeMemo: TRichEditViewer
+          object FInfoBeforeMemo: TRichEditViewer
             Left = 0
             Left = 0
             Top = 24
             Top = 24
             Width = 417
             Width = 417
@@ -238,7 +238,7 @@ object WizardForm: TWizardForm
             WantReturns = False
             WantReturns = False
             UseRichEdit = False
             UseRichEdit = False
           end
           end
-          object InfoBeforeClickLabel: TNewStaticText
+          object FInfoBeforeClickLabel: TNewStaticText
             Left = 0
             Left = 0
             Top = 0
             Top = 0
             Width = 417
             Width = 417
@@ -251,11 +251,11 @@ object WizardForm: TWizardForm
             WordWrap = True
             WordWrap = True
           end
           end
         end
         end
-        object UserInfoPage: TNewNotebookPage
+        object FUserInfoPage: TNewNotebookPage
           DesignSize = (
           DesignSize = (
             417
             417
             237)
             237)
-          object UserInfoSerialEdit: TNewEdit
+          object FUserInfoSerialEdit: TNewEdit
             Left = 0
             Left = 0
             Top = 120
             Top = 120
             Width = 417
             Width = 417
@@ -265,7 +265,7 @@ object WizardForm: TWizardForm
             TabOrder = 5
             TabOrder = 5
             OnChange = UserInfoEditChange
             OnChange = UserInfoEditChange
           end
           end
-          object UserInfoSerialLabel: TNewStaticText
+          object FUserInfoSerialLabel: TNewStaticText
             Left = 0
             Left = 0
             Top = 104
             Top = 104
             Width = 417
             Width = 417
@@ -273,11 +273,11 @@ object WizardForm: TWizardForm
             Anchors = [akLeft, akTop, akRight]
             Anchors = [akLeft, akTop, akRight]
             AutoSize = False
             AutoSize = False
             Caption = '*'
             Caption = '*'
-            FocusControl = UserInfoSerialEdit
+            FocusControl = FUserInfoSerialEdit
             TabOrder = 4
             TabOrder = 4
             WordWrap = True
             WordWrap = True
           end
           end
-          object UserInfoOrgEdit: TNewEdit
+          object FUserInfoOrgEdit: TNewEdit
             Left = 0
             Left = 0
             Top = 68
             Top = 68
             Width = 417
             Width = 417
@@ -287,7 +287,7 @@ object WizardForm: TWizardForm
             TabOrder = 3
             TabOrder = 3
             OnChange = UserInfoEditChange
             OnChange = UserInfoEditChange
           end
           end
-          object UserInfoOrgLabel: TNewStaticText
+          object FUserInfoOrgLabel: TNewStaticText
             Left = 0
             Left = 0
             Top = 52
             Top = 52
             Width = 417
             Width = 417
@@ -295,11 +295,11 @@ object WizardForm: TWizardForm
             Anchors = [akLeft, akTop, akRight]
             Anchors = [akLeft, akTop, akRight]
             AutoSize = False
             AutoSize = False
             Caption = '*'
             Caption = '*'
-            FocusControl = UserInfoOrgEdit
+            FocusControl = FUserInfoOrgEdit
             TabOrder = 2
             TabOrder = 2
             WordWrap = True
             WordWrap = True
           end
           end
-          object UserInfoNameEdit: TNewEdit
+          object FUserInfoNameEdit: TNewEdit
             Left = 0
             Left = 0
             Top = 16
             Top = 16
             Width = 417
             Width = 417
@@ -309,7 +309,7 @@ object WizardForm: TWizardForm
             TabOrder = 1
             TabOrder = 1
             OnChange = UserInfoEditChange
             OnChange = UserInfoEditChange
           end
           end
-          object UserInfoNameLabel: TNewStaticText
+          object FUserInfoNameLabel: TNewStaticText
             Left = 0
             Left = 0
             Top = 0
             Top = 0
             Width = 417
             Width = 417
@@ -317,22 +317,22 @@ object WizardForm: TWizardForm
             Anchors = [akLeft, akTop, akRight]
             Anchors = [akLeft, akTop, akRight]
             AutoSize = False
             AutoSize = False
             Caption = '*'
             Caption = '*'
-            FocusControl = UserInfoNameEdit
+            FocusControl = FUserInfoNameEdit
             TabOrder = 0
             TabOrder = 0
             WordWrap = True
             WordWrap = True
           end
           end
         end
         end
-        object SelectDirPage: TNewNotebookPage
+        object FSelectDirPage: TNewNotebookPage
           DesignSize = (
           DesignSize = (
             417
             417
             237)
             237)
-          object SelectDirBitmapImage: TBitmapImage
+          object FSelectDirBitmapImage: TBitmapImage
             Left = 0
             Left = 0
             Top = 0
             Top = 0
             Width = 32
             Width = 32
             Height = 32
             Height = 32
           end
           end
-          object DiskSpaceLabel: TNewStaticText
+          object FDiskSpaceLabel: TNewStaticText
             Left = 0
             Left = 0
             Top = 216
             Top = 216
             Width = 417
             Width = 417
@@ -344,7 +344,7 @@ object WizardForm: TWizardForm
             TabOrder = 4
             TabOrder = 4
             WordWrap = True
             WordWrap = True
           end
           end
-          object DirBrowseButton: TNewButton
+          object FDirBrowseButton: TNewButton
             Left = 400
             Left = 400
             Top = 67
             Top = 67
             Width = 17
             Width = 17
@@ -354,7 +354,7 @@ object WizardForm: TWizardForm
             TabOrder = 3
             TabOrder = 3
             OnClick = DirBrowseButtonClick
             OnClick = DirBrowseButtonClick
           end
           end
-          object DirEdit: TEdit
+          object FDirEdit: TEdit
             Left = 0
             Left = 0
             Top = 68
             Top = 68
             Width = 397
             Width = 397
@@ -363,7 +363,7 @@ object WizardForm: TWizardForm
             TabOrder = 2
             TabOrder = 2
             Text = 'DirEdit'
             Text = 'DirEdit'
           end
           end
-          object SelectDirBrowseLabel: TNewStaticText
+          object FSelectDirBrowseLabel: TNewStaticText
             Left = 0
             Left = 0
             Top = 44
             Top = 44
             Width = 417
             Width = 417
@@ -375,7 +375,7 @@ object WizardForm: TWizardForm
             TabOrder = 1
             TabOrder = 1
             WordWrap = True
             WordWrap = True
           end
           end
-          object SelectDirLabel: TNewStaticText
+          object FSelectDirLabel: TNewStaticText
             Left = 44
             Left = 44
             Top = 0
             Top = 0
             Width = 373
             Width = 373
@@ -388,11 +388,11 @@ object WizardForm: TWizardForm
             WordWrap = True
             WordWrap = True
           end
           end
         end
         end
-        object SelectComponentsPage: TNewNotebookPage
+        object FSelectComponentsPage: TNewNotebookPage
           DesignSize = (
           DesignSize = (
             417
             417
             237)
             237)
-          object ComponentsDiskSpaceLabel: TNewStaticText
+          object FComponentsDiskSpaceLabel: TNewStaticText
             Left = 0
             Left = 0
             Top = 216
             Top = 216
             Width = 417
             Width = 417
@@ -403,7 +403,7 @@ object WizardForm: TWizardForm
             ShowAccelChar = False
             ShowAccelChar = False
             TabOrder = 3
             TabOrder = 3
           end
           end
-          object ComponentsList: TNewCheckListBox
+          object FComponentsList: TNewCheckListBox
             Left = 0
             Left = 0
             Top = 48
             Top = 48
             Width = 417
             Width = 417
@@ -414,7 +414,7 @@ object WizardForm: TWizardForm
             RequireRadioSelection = True
             RequireRadioSelection = True
             TabOrder = 2
             TabOrder = 2
           end
           end
-          object TypesCombo: TNewComboBox
+          object FTypesCombo: TNewComboBox
             Left = 0
             Left = 0
             Top = 24
             Top = 24
             Width = 417
             Width = 417
@@ -424,7 +424,7 @@ object WizardForm: TWizardForm
             TabOrder = 1
             TabOrder = 1
             OnChange = TypesComboChange
             OnChange = TypesComboChange
           end
           end
-          object SelectComponentsLabel: TNewStaticText
+          object FSelectComponentsLabel: TNewStaticText
             Left = 0
             Left = 0
             Top = 0
             Top = 0
             Width = 417
             Width = 417
@@ -437,17 +437,17 @@ object WizardForm: TWizardForm
             WordWrap = True
             WordWrap = True
           end
           end
         end
         end
-        object SelectProgramGroupPage: TNewNotebookPage
+        object FSelectProgramGroupPage: TNewNotebookPage
           DesignSize = (
           DesignSize = (
             417
             417
             237)
             237)
-          object SelectGroupBitmapImage: TBitmapImage
+          object FSelectGroupBitmapImage: TBitmapImage
             Left = 0
             Left = 0
             Top = 0
             Top = 0
             Width = 32
             Width = 32
             Height = 32
             Height = 32
           end
           end
-          object NoIconsCheck: TNewCheckBox
+          object FNoIconsCheck: TNewCheckBox
             Left = 0
             Left = 0
             Top = 215
             Top = 215
             Width = 417
             Width = 417
@@ -457,7 +457,7 @@ object WizardForm: TWizardForm
             TabOrder = 4
             TabOrder = 4
             OnClick = NoIconsCheckClick
             OnClick = NoIconsCheckClick
           end
           end
-          object GroupBrowseButton: TNewButton
+          object FGroupBrowseButton: TNewButton
             Left = 400
             Left = 400
             Top = 67
             Top = 67
             Width = 17
             Width = 17
@@ -467,7 +467,7 @@ object WizardForm: TWizardForm
             TabOrder = 3
             TabOrder = 3
             OnClick = GroupBrowseButtonClick
             OnClick = GroupBrowseButtonClick
           end
           end
-          object GroupEdit: TNewEdit
+          object FGroupEdit: TNewEdit
             Left = 0
             Left = 0
             Top = 68
             Top = 68
             Width = 397
             Width = 397
@@ -476,7 +476,7 @@ object WizardForm: TWizardForm
             TabOrder = 2
             TabOrder = 2
             Text = 'GroupEdit'
             Text = 'GroupEdit'
           end
           end
-          object SelectStartMenuFolderBrowseLabel: TNewStaticText
+          object FSelectStartMenuFolderBrowseLabel: TNewStaticText
             Left = 0
             Left = 0
             Top = 44
             Top = 44
             Width = 417
             Width = 417
@@ -488,7 +488,7 @@ object WizardForm: TWizardForm
             TabOrder = 1
             TabOrder = 1
             WordWrap = True
             WordWrap = True
           end
           end
-          object SelectStartMenuFolderLabel: TNewStaticText
+          object FSelectStartMenuFolderLabel: TNewStaticText
             Left = 44
             Left = 44
             Top = 0
             Top = 0
             Width = 373
             Width = 373
@@ -501,11 +501,11 @@ object WizardForm: TWizardForm
             WordWrap = True
             WordWrap = True
           end
           end
         end
         end
-        object SelectTasksPage: TNewNotebookPage
+        object FSelectTasksPage: TNewNotebookPage
           DesignSize = (
           DesignSize = (
             417
             417
             237)
             237)
-          object TasksList: TNewCheckListBox
+          object FTasksList: TNewCheckListBox
             Left = 0
             Left = 0
             Top = 24
             Top = 24
             Width = 417
             Width = 417
@@ -517,7 +517,7 @@ object WizardForm: TWizardForm
             TabOrder = 1
             TabOrder = 1
             WantTabs = True
             WantTabs = True
           end
           end
-          object SelectTasksLabel: TNewStaticText
+          object FSelectTasksLabel: TNewStaticText
             Left = 0
             Left = 0
             Top = 0
             Top = 0
             Width = 417
             Width = 417
@@ -530,11 +530,11 @@ object WizardForm: TWizardForm
             WordWrap = True
             WordWrap = True
           end
           end
         end
         end
-        object ReadyPage: TNewNotebookPage
+        object FReadyPage: TNewNotebookPage
           DesignSize = (
           DesignSize = (
             417
             417
             237)
             237)
-          object ReadyMemo: TNewMemo
+          object FReadyMemo: TNewMemo
             Left = 0
             Left = 0
             Top = 24
             Top = 24
             Width = 417
             Width = 417
@@ -547,7 +547,7 @@ object WizardForm: TWizardForm
             WantReturns = False
             WantReturns = False
             WordWrap = False
             WordWrap = False
           end
           end
-          object ReadyLabel: TNewStaticText
+          object FReadyLabel: TNewStaticText
             Left = 0
             Left = 0
             Top = 0
             Top = 0
             Width = 417
             Width = 417
@@ -560,18 +560,18 @@ object WizardForm: TWizardForm
             WordWrap = True
             WordWrap = True
           end
           end
         end
         end
-        object PreparingPage: TNewNotebookPage
+        object FPreparingPage: TNewNotebookPage
           DesignSize = (
           DesignSize = (
             417
             417
             237)
             237)
-          object PreparingErrorBitmapImage: TBitmapImage
+          object FPreparingErrorBitmapImage: TBitmapImage
             Left = 0
             Left = 0
             Top = 0
             Top = 0
             Width = 16
             Width = 16
             Height = 16
             Height = 16
             Visible = False
             Visible = False
           end
           end
-          object PreparingLabel: TNewStaticText
+          object FPreparingLabel: TNewStaticText
             Left = 24
             Left = 24
             Top = 0
             Top = 0
             Width = 393
             Width = 393
@@ -584,7 +584,7 @@ object WizardForm: TWizardForm
             Visible = False
             Visible = False
             WordWrap = True
             WordWrap = True
           end
           end
-          object PreparingYesRadio: TNewRadioButton
+          object FPreparingYesRadio: TNewRadioButton
             Left = 24
             Left = 24
             Top = 28
             Top = 28
             Width = 393
             Width = 393
@@ -596,7 +596,7 @@ object WizardForm: TWizardForm
             TabStop = True
             TabStop = True
             Visible = False
             Visible = False
           end
           end
-          object PreparingNoRadio: TNewRadioButton
+          object FPreparingNoRadio: TNewRadioButton
             Left = 24
             Left = 24
             Top = 56
             Top = 56
             Width = 393
             Width = 393
@@ -606,7 +606,7 @@ object WizardForm: TWizardForm
             TabOrder = 3
             TabOrder = 3
             Visible = False
             Visible = False
           end
           end
-          object PreparingMemo: TNewMemo
+          object FPreparingMemo: TNewMemo
             Left = 24
             Left = 24
             Top = 88
             Top = 88
             Width = 393
             Width = 393
@@ -622,11 +622,11 @@ object WizardForm: TWizardForm
             WordWrap = False
             WordWrap = False
           end
           end
         end
         end
-        object InstallingPage: TNewNotebookPage
+        object FInstallingPage: TNewNotebookPage
           DesignSize = (
           DesignSize = (
             417
             417
             237)
             237)
-          object FilenameLabel: TNewStaticText
+          object FFilenameLabel: TNewStaticText
             Left = 0
             Left = 0
             Top = 16
             Top = 16
             Width = 417
             Width = 417
@@ -637,7 +637,7 @@ object WizardForm: TWizardForm
             ShowAccelChar = False
             ShowAccelChar = False
             TabOrder = 1
             TabOrder = 1
           end
           end
-          object StatusLabel: TNewStaticText
+          object FStatusLabel: TNewStaticText
             Left = 0
             Left = 0
             Top = 0
             Top = 0
             Width = 417
             Width = 417
@@ -647,7 +647,7 @@ object WizardForm: TWizardForm
             ShowAccelChar = False
             ShowAccelChar = False
             TabOrder = 0
             TabOrder = 0
           end
           end
-          object ProgressGauge: TNewProgressBar
+          object FProgressGauge: TNewProgressBar
             Left = 0
             Left = 0
             Top = 42
             Top = 42
             Width = 417
             Width = 417
@@ -658,11 +658,11 @@ object WizardForm: TWizardForm
             Style = npbstNormal
             Style = npbstNormal
           end
           end
         end
         end
-        object InfoAfterPage: TNewNotebookPage
+        object FInfoAfterPage: TNewNotebookPage
           DesignSize = (
           DesignSize = (
             417
             417
             237)
             237)
-          object InfoAfterMemo: TRichEditViewer
+          object FInfoAfterMemo: TRichEditViewer
             Left = 0
             Left = 0
             Top = 24
             Top = 24
             Width = 417
             Width = 417
@@ -676,7 +676,7 @@ object WizardForm: TWizardForm
             WantReturns = False
             WantReturns = False
             UseRichEdit = False
             UseRichEdit = False
           end
           end
-          object InfoAfterClickLabel: TNewStaticText
+          object FInfoAfterClickLabel: TNewStaticText
             Left = 0
             Left = 0
             Top = 0
             Top = 0
             Width = 417
             Width = 417
@@ -690,7 +690,7 @@ object WizardForm: TWizardForm
           end
           end
         end
         end
       end
       end
-      object MainPanel: TPanel
+      object FMainPanel: TPanel
         Left = 0
         Left = 0
         Top = 0
         Top = 0
         Width = 497
         Width = 497
@@ -702,7 +702,7 @@ object WizardForm: TWizardForm
         DesignSize = (
         DesignSize = (
           497
           497
           58)
           58)
-        object WizardSmallBitmapImage: TBitmapImage
+        object FWizardSmallBitmapImage: TBitmapImage
           Left = 440
           Left = 440
           Top = 0
           Top = 0
           Width = 55
           Width = 55
@@ -710,7 +710,7 @@ object WizardForm: TWizardForm
           Anchors = [akTop, akRight]
           Anchors = [akTop, akRight]
           BackColor = clWindow
           BackColor = clWindow
         end
         end
-        object PageDescriptionLabel: TNewStaticText
+        object FPageDescriptionLabel: TNewStaticText
           Left = 40
           Left = 40
           Top = 26
           Top = 26
           Width = 389
           Width = 389
@@ -722,7 +722,7 @@ object WizardForm: TWizardForm
           TabOrder = 1
           TabOrder = 1
           WordWrap = True
           WordWrap = True
         end
         end
-        object PageNameLabel: TNewStaticText
+        object FPageNameLabel: TNewStaticText
           Left = 24
           Left = 24
           Top = 10
           Top = 10
           Width = 405
           Width = 405
@@ -735,13 +735,13 @@ object WizardForm: TWizardForm
         end
         end
       end
       end
     end
     end
-    object FinishedPage: TNewNotebookPage
+    object FFinishedPage: TNewNotebookPage
       Color = clWindow
       Color = clWindow
       ParentColor = False
       ParentColor = False
       DesignSize = (
       DesignSize = (
         497
         497
         313)
         313)
-      object WizardBitmapImage2: TBitmapImage
+      object FWizardBitmapImage2: TBitmapImage
         Left = 0
         Left = 0
         Top = 0
         Top = 0
         Width = 164
         Width = 164
@@ -749,7 +749,7 @@ object WizardForm: TWizardForm
         Anchors = [akLeft, akTop, akBottom]
         Anchors = [akLeft, akTop, akBottom]
         BackColor = clWindow
         BackColor = clWindow
       end
       end
-      object RunList: TNewCheckListBox
+      object FRunList: TNewCheckListBox
         Left = 176
         Left = 176
         Top = 156
         Top = 156
         Width = 301
         Width = 301
@@ -761,7 +761,7 @@ object WizardForm: TWizardForm
         Visible = False
         Visible = False
         WantTabs = True
         WantTabs = True
       end
       end
-      object NoRadio: TNewRadioButton
+      object FNoRadio: TNewRadioButton
         Left = 176
         Left = 176
         Top = 184
         Top = 184
         Width = 301
         Width = 301
@@ -771,7 +771,7 @@ object WizardForm: TWizardForm
         TabOrder = 4
         TabOrder = 4
         Visible = False
         Visible = False
       end
       end
-      object YesRadio: TNewRadioButton
+      object FYesRadio: TNewRadioButton
         Left = 176
         Left = 176
         Top = 156
         Top = 156
         Width = 301
         Width = 301
@@ -783,7 +783,7 @@ object WizardForm: TWizardForm
         TabStop = True
         TabStop = True
         Visible = False
         Visible = False
       end
       end
-      object FinishedLabel: TNewStaticText
+      object FFinishedLabel: TNewStaticText
         Left = 176
         Left = 176
         Top = 76
         Top = 76
         Width = 301
         Width = 301
@@ -795,7 +795,7 @@ object WizardForm: TWizardForm
         TabOrder = 1
         TabOrder = 1
         WordWrap = True
         WordWrap = True
       end
       end
-      object FinishedHeadingLabel: TNewStaticText
+      object FFinishedHeadingLabel: TNewStaticText
         Left = 176
         Left = 176
         Top = 16
         Top = 16
         Width = 301
         Width = 301
@@ -809,7 +809,7 @@ object WizardForm: TWizardForm
       end
       end
     end
     end
   end
   end
-  object BeveledLabel: TNewStaticText
+  object FBeveledLabel: TNewStaticText
     Left = 0
     Left = 0
     Top = 306
     Top = 306
     Width = 5
     Width = 5

+ 169 - 87
Projects/Wizard.pas

@@ -79,87 +79,87 @@ type
   end;
   end;
 
 
   TWizardForm = class(TSetupForm)
   TWizardForm = class(TSetupForm)
-    CancelButton: TNewButton;
-    NextButton: TNewButton;
-    BackButton: TNewButton;
-    OuterNotebook: TNewNotebook;
-    InnerNotebook: TNewNotebook;
-    WelcomePage: TNewNotebookPage;
-    InnerPage: TNewNotebookPage;
-    FinishedPage: TNewNotebookPage;
-    LicensePage: TNewNotebookPage;
-    PasswordPage: TNewNotebookPage;
-    InfoBeforePage: TNewNotebookPage;
-    UserInfoPage: TNewNotebookPage;
-    SelectDirPage: TNewNotebookPage;
-    SelectComponentsPage: TNewNotebookPage;
-    SelectProgramGroupPage: TNewNotebookPage;
-    SelectTasksPage: TNewNotebookPage;
-    ReadyPage: TNewNotebookPage;
-    PreparingPage: TNewNotebookPage;
-    InstallingPage: TNewNotebookPage;
-    InfoAfterPage: TNewNotebookPage;
-    DiskSpaceLabel: TNewStaticText;
-    DirEdit: TEdit;
-    GroupEdit: TNewEdit;
-    NoIconsCheck: TNewCheckBox;
-    PasswordLabel: TNewStaticText;
-    PasswordEdit: TPasswordEdit;
-    PasswordEditLabel: TNewStaticText;
-    ReadyMemo: TNewMemo;
-    TypesCombo: TNewComboBox;
-    Bevel: TBevel;
-    WizardBitmapImage: TBitmapImage;
-    WelcomeLabel1: TNewStaticText;
-    InfoBeforeMemo: TRichEditViewer;
-    InfoBeforeClickLabel: TNewStaticText;
-    MainPanel: TPanel;
-    Bevel1: TBevel;
-    PageNameLabel: TNewStaticText;
-    PageDescriptionLabel: TNewStaticText;
-    WizardSmallBitmapImage: TBitmapImage;
-    ReadyLabel: TNewStaticText;
-    FinishedLabel: TNewStaticText;
-    YesRadio: TNewRadioButton;
-    NoRadio: TNewRadioButton;
-    WizardBitmapImage2: TBitmapImage;
-    WelcomeLabel2: TNewStaticText;
-    LicenseLabel1: TNewStaticText;
-    LicenseMemo: TRichEditViewer;
-    InfoAfterMemo: TRichEditViewer;
-    InfoAfterClickLabel: TNewStaticText;
-    ComponentsList: TNewCheckListBox;
-    ComponentsDiskSpaceLabel: TNewStaticText;
-    BeveledLabel: TNewStaticText;
-    StatusLabel: TNewStaticText;
-    FilenameLabel: TNewStaticText;
-    ProgressGauge: TNewProgressBar;
-    SelectDirLabel: TNewStaticText;
-    SelectStartMenuFolderLabel: TNewStaticText;
-    SelectComponentsLabel: TNewStaticText;
-    SelectTasksLabel: TNewStaticText;
-    LicenseAcceptedRadio: TNewRadioButton;
-    LicenseNotAcceptedRadio: TNewRadioButton;
-    UserInfoNameLabel: TNewStaticText;
-    UserInfoNameEdit: TNewEdit;
-    UserInfoOrgLabel: TNewStaticText;
-    UserInfoOrgEdit: TNewEdit;
-    PreparingErrorBitmapImage: TBitmapImage;
-    PreparingLabel: TNewStaticText;
-    FinishedHeadingLabel: TNewStaticText;
-    UserInfoSerialLabel: TNewStaticText;
-    UserInfoSerialEdit: TNewEdit;
-    TasksList: TNewCheckListBox;
-    RunList: TNewCheckListBox;
-    DirBrowseButton: TNewButton;
-    GroupBrowseButton: TNewButton;
-    SelectDirBitmapImage: TBitmapImage;
-    SelectGroupBitmapImage: TBitmapImage;
-    SelectDirBrowseLabel: TNewStaticText;
-    SelectStartMenuFolderBrowseLabel: TNewStaticText;
-    PreparingYesRadio: TNewRadioButton;
-    PreparingNoRadio: TNewRadioButton;
-    PreparingMemo: TNewMemo;
+    FCancelButton: TNewButton;
+    FNextButton: TNewButton;
+    FBackButton: TNewButton;
+    FOuterNotebook: TNewNotebook;
+    FInnerNotebook: TNewNotebook;
+    FWelcomePage: TNewNotebookPage;
+    FInnerPage: TNewNotebookPage;
+    FFinishedPage: TNewNotebookPage;
+    FLicensePage: TNewNotebookPage;
+    FPasswordPage: TNewNotebookPage;
+    FInfoBeforePage: TNewNotebookPage;
+    FUserInfoPage: TNewNotebookPage;
+    FSelectDirPage: TNewNotebookPage;
+    FSelectComponentsPage: TNewNotebookPage;
+    FSelectProgramGroupPage: TNewNotebookPage;
+    FSelectTasksPage: TNewNotebookPage;
+    FReadyPage: TNewNotebookPage;
+    FPreparingPage: TNewNotebookPage;
+    FInstallingPage: TNewNotebookPage;
+    FInfoAfterPage: TNewNotebookPage;
+    FDiskSpaceLabel: TNewStaticText;
+    FDirEdit: TEdit;
+    FGroupEdit: TNewEdit;
+    FNoIconsCheck: TNewCheckBox;
+    FPasswordLabel: TNewStaticText;
+    FPasswordEdit: TPasswordEdit;
+    FPasswordEditLabel: TNewStaticText;
+    FReadyMemo: TNewMemo;
+    FTypesCombo: TNewComboBox;
+    FBevel: TBevel;
+    FWizardBitmapImage: TBitmapImage;
+    FWelcomeLabel1: TNewStaticText;
+    FInfoBeforeMemo: TRichEditViewer;
+    FInfoBeforeClickLabel: TNewStaticText;
+    FMainPanel: TPanel;
+    FBevel1: TBevel;
+    FPageNameLabel: TNewStaticText;
+    FPageDescriptionLabel: TNewStaticText;
+    FWizardSmallBitmapImage: TBitmapImage;
+    FReadyLabel: TNewStaticText;
+    FFinishedLabel: TNewStaticText;
+    FYesRadio: TNewRadioButton;
+    FNoRadio: TNewRadioButton;
+    FWizardBitmapImage2: TBitmapImage;
+    FWelcomeLabel2: TNewStaticText;
+    FLicenseLabel1: TNewStaticText;
+    FLicenseMemo: TRichEditViewer;
+    FInfoAfterMemo: TRichEditViewer;
+    FInfoAfterClickLabel: TNewStaticText;
+    FComponentsList: TNewCheckListBox;
+    FComponentsDiskSpaceLabel: TNewStaticText;
+    FBeveledLabel: TNewStaticText;
+    FStatusLabel: TNewStaticText;
+    FFilenameLabel: TNewStaticText;
+    FProgressGauge: TNewProgressBar;
+    FSelectDirLabel: TNewStaticText;
+    FSelectStartMenuFolderLabel: TNewStaticText;
+    FSelectComponentsLabel: TNewStaticText;
+    FSelectTasksLabel: TNewStaticText;
+    FLicenseAcceptedRadio: TNewRadioButton;
+    FLicenseNotAcceptedRadio: TNewRadioButton;
+    FUserInfoNameLabel: TNewStaticText;
+    FUserInfoNameEdit: TNewEdit;
+    FUserInfoOrgLabel: TNewStaticText;
+    FUserInfoOrgEdit: TNewEdit;
+    FPreparingErrorBitmapImage: TBitmapImage;
+    FPreparingLabel: TNewStaticText;
+    FFinishedHeadingLabel: TNewStaticText;
+    FUserInfoSerialLabel: TNewStaticText;
+    FUserInfoSerialEdit: TNewEdit;
+    FTasksList: TNewCheckListBox;
+    FRunList: TNewCheckListBox;
+    FDirBrowseButton: TNewButton;
+    FGroupBrowseButton: TNewButton;
+    FSelectDirBitmapImage: TBitmapImage;
+    FSelectGroupBitmapImage: TBitmapImage;
+    FSelectDirBrowseLabel: TNewStaticText;
+    FSelectStartMenuFolderBrowseLabel: TNewStaticText;
+    FPreparingYesRadio: TNewRadioButton;
+    FPreparingNoRadio: TNewRadioButton;
+    FPreparingMemo: TNewMemo;
     procedure NextButtonClick(Sender: TObject);
     procedure NextButtonClick(Sender: TObject);
     procedure BackButtonClick(Sender: TObject);
     procedure BackButtonClick(Sender: TObject);
     procedure CancelButtonClick(Sender: TObject);
     procedure CancelButtonClick(Sender: TObject);
@@ -176,9 +176,9 @@ type
   private
   private
     { Private declarations }
     { Private declarations }
     FPageList: TList;
     FPageList: TList;
-    FNextPageID: Integer;
+    FCurPageID, FNextPageID: Integer;
     ExpandedDefaultDirName, ExpandedDefaultGroupName: String;
     ExpandedDefaultDirName, ExpandedDefaultGroupName: String;
-    PrevGroup, PrevSetupType, PrevUserInfoName, PrevUserInfoOrg, PrevUserInfoSerial: String;
+    FPrevAppDir, PrevGroup, PrevSetupType, PrevUserInfoName, PrevUserInfoOrg, PrevUserInfoSerial: String;
     PrevNoIcons: Boolean;
     PrevNoIcons: Boolean;
     PrevSelectedComponents, PrevDeselectedComponents: TStringList;
     PrevSelectedComponents, PrevDeselectedComponents: TStringList;
     PrevSelectedTasks, PrevDeselectedTasks: TStringList;
     PrevSelectedTasks, PrevDeselectedTasks: TStringList;
@@ -213,9 +213,7 @@ type
     procedure CreateParams(var Params: TCreateParams); override;
     procedure CreateParams(var Params: TCreateParams); override;
   public
   public
     { Public declarations }
     { Public declarations }
-    CurPageID: Integer;
     PrepareToInstallFailureMessage: String;
     PrepareToInstallFailureMessage: String;
-    PrevAppDir: String;
     constructor Create(AOwner: TComponent); override;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     destructor Destroy; override;
     procedure AddPage(const APage: TWizardPage; const AfterID: Integer);
     procedure AddPage(const APage: TWizardPage; const AfterID: Integer);
@@ -241,6 +239,90 @@ type
     procedure UpdateRunList(const SelectedComponents, SelectedTasks: TStringList);
     procedure UpdateRunList(const SelectedComponents, SelectedTasks: TStringList);
     function ValidateDirEdit: Boolean;
     function ValidateDirEdit: Boolean;
     function ValidateGroupEdit: Boolean;
     function ValidateGroupEdit: Boolean;
+  published
+    property CurPageID: Integer read FCurPageID;
+    property PrevAppDir: String read FPrevAppDir;
+    property CancelButton: TNewButton read FCancelButton;
+    property NextButton: TNewButton read FNextButton;
+    property BackButton: TNewButton read FBackButton;
+    property OuterNotebook: TNewNotebook read FOuterNotebook;
+    property InnerNotebook: TNewNotebook read FInnerNotebook;
+    property WelcomePage: TNewNotebookPage read FWelcomePage;
+    property InnerPage: TNewNotebookPage read FInnerPage;
+    property FinishedPage: TNewNotebookPage read FFinishedPage;
+    property LicensePage: TNewNotebookPage read FLicensePage;
+    property PasswordPage: TNewNotebookPage read FPasswordPage;
+    property InfoBeforePage: TNewNotebookPage read FInfoBeforePage;
+    property UserInfoPage: TNewNotebookPage read FUserInfoPage;
+    property SelectDirPage: TNewNotebookPage read FSelectDirPage;
+    property SelectComponentsPage: TNewNotebookPage read FSelectComponentsPage;
+    property SelectProgramGroupPage: TNewNotebookPage read FSelectProgramGroupPage;
+    property SelectTasksPage: TNewNotebookPage read FSelectTasksPage;
+    property ReadyPage: TNewNotebookPage read FReadyPage;
+    property PreparingPage: TNewNotebookPage read FPreparingPage;
+    property InstallingPage: TNewNotebookPage read FInstallingPage;
+    property InfoAfterPage: TNewNotebookPage read FInfoBeforePage;
+    property DiskSpaceLabel: TNewStaticText read FDiskSpaceLabel;
+    property DirEdit: TEdit read FDirEdit;
+    property GroupEdit: TNewEdit read FGroupEdit;
+    property NoIconsCheck: TNewCheckBox read FNoIconsCheck;
+    property PasswordLabel: TNewStaticText read FPasswordLabel;
+    property PasswordEdit: TPasswordEdit read FPasswordEdit;
+    property PasswordEditLabel: TNewStaticText read FPasswordEditLabel;
+    property ReadyMemo: TNewMemo read FReadyMemo;
+    property TypesCombo: TNewComboBox read FTypesCombo;
+    property Bevel: TBevel read FBevel;
+    property WizardBitmapImage: TBitmapImage read FWizardBitmapImage;
+    property WelcomeLabel1: TNewStaticText read FWelcomeLabel1;
+    property InfoBeforeMemo: TRichEditViewer read FInfoBeforeMemo;
+    property InfoBeforeClickLabel: TNewStaticText read FInfoBeforeClickLabel;
+    property MainPanel: TPanel read FMainPanel;
+    property Bevel1: TBevel read FBevel1;
+    property PageNameLabel: TNewStaticText read FPageNameLabel;
+    property PageDescriptionLabel: TNewStaticText read FPageDescriptionLabel;
+    property WizardSmallBitmapImage: TBitmapImage read FWizardSmallBitmapImage;
+    property ReadyLabel: TNewStaticText read FReadyLabel;
+    property FinishedLabel: TNewStaticText read FFinishedLabel;
+    property YesRadio: TNewRadioButton read FYesRadio;
+    property NoRadio: TNewRadioButton read FNoRadio;
+    property WizardBitmapImage2: TBitmapImage read FWizardBitmapImage2;
+    property WelcomeLabel2: TNewStaticText read FWelcomeLabel2;
+    property LicenseLabel1: TNewStaticText read FLicenseLabel1;
+    property LicenseMemo: TRichEditViewer read FLicenseMemo;
+    property InfoAfterMemo: TRichEditViewer read FInfoAfterMemo;
+    property InfoAfterClickLabel: TNewStaticText read FInfoAfterClickLabel;
+    property ComponentsList: TNewCheckListBox read FComponentsList;
+    property ComponentsDiskSpaceLabel: TNewStaticText read FComponentsDiskSpaceLabel;
+    property BeveledLabel: TNewStaticText read FBeveledLabel;
+    property StatusLabel: TNewStaticText read FStatusLabel;
+    property FilenameLabel: TNewStaticText read FFileNameLabel;
+    property ProgressGauge: TNewProgressBar read FProgressGauge;
+    property SelectDirLabel: TNewStaticText read FSelectDirLabel;
+    property SelectStartMenuFolderLabel: TNewStaticText read FSelectStartMenuFolderLabel;
+    property SelectComponentsLabel: TNewStaticText read FSelectComponentsLabel;
+    property SelectTasksLabel: TNewStaticText read FSelectTasksLabel;
+    property LicenseAcceptedRadio: TNewRadioButton read FLicenseAcceptedRadio;
+    property LicenseNotAcceptedRadio: TNewRadioButton read FLicenseNotAcceptedRadio;
+    property UserInfoNameLabel: TNewStaticText read FUserInfoNameLabel;
+    property UserInfoNameEdit: TNewEdit read FUserInfoNameEdit;
+    property UserInfoOrgLabel: TNewStaticText read FUserInfoOrgLabel;
+    property UserInfoOrgEdit: TNewEdit read FUserInfoOrgEdit;
+    property PreparingErrorBitmapImage: TBitmapImage read FPreparingErrorBitmapImage;
+    property PreparingLabel: TNewStaticText read FPreparingLabel;
+    property FinishedHeadingLabel: TNewStaticText read FFinishedHeadingLabel;
+    property UserInfoSerialLabel: TNewStaticText read FUserInfoSerialLabel;
+    property UserInfoSerialEdit: TNewEdit read FUserInfoSerialEdit;
+    property TasksList: TNewCheckListBox read FTasksList;
+    property RunList: TNewCheckListBox read FRunList;
+    property DirBrowseButton: TNewButton read FDirBrowseButton;
+    property GroupBrowseButton: TNewButton read FGroupBrowseButton;
+    property SelectDirBitmapImage: TBitmapImage read FSelectDirBitmapImage;
+    property SelectGroupBitmapImage: TBitmapImage read FSelectGroupBitmapImage;
+    property SelectDirBrowseLabel: TNewStaticText read FSelectDirBrowseLabel;
+    property SelectStartMenuFolderBrowseLabel: TNewStaticText read FSelectStartMenuFolderBrowseLabel;
+    property PreparingYesRadio: TNewRadioButton read FPreparingYesRadio;
+    property PreparingNoRadio: TNewRadioButton read FPreparingNoRadio;
+    property PreparingMemo: TNewMemo read FPreparingMemo;
   end;
   end;
 
 
 var
 var
@@ -1332,7 +1414,7 @@ begin
       try
       try
         { do not localize or change the following strings }
         { do not localize or change the following strings }
         if shUsePreviousAppDir in SetupHeader.Options then
         if shUsePreviousAppDir in SetupHeader.Options then
-          RegQueryStringValue(H, 'Inno Setup: App Path', PrevAppDir);
+          RegQueryStringValue(H, 'Inno Setup: App Path', FPrevAppDir);
         if shUsePreviousGroup in SetupHeader.Options then begin
         if shUsePreviousGroup in SetupHeader.Options then begin
           RegQueryStringValue(H, 'Inno Setup: Icon Group', PrevGroup);
           RegQueryStringValue(H, 'Inno Setup: Icon Group', PrevGroup);
           if RegValueExists(H, 'Inno Setup: No Icons') then
           if RegValueExists(H, 'Inno Setup: No Icons') then
@@ -2047,7 +2129,7 @@ var
   Page: TWizardPage;
   Page: TWizardPage;
 begin
 begin
   Page := PageFromID(NewPageID);
   Page := PageFromID(NewPageID);
-  CurPageID := NewPageID;
+  FCurPageID := NewPageID;
 
 
   { Select the page in the notebooks }
   { Select the page in the notebooks }
   if Assigned(Page.InnerNotebookPage) then
   if Assigned(Page.InnerNotebookPage) then