Browse Source

More (all of UninstProgressForm).

Martijn Laan 6 years ago
parent
commit
91d8c6423c
3 changed files with 46 additions and 62 deletions
  1. 1 32
      Projects/ScriptClasses_R.pas
  2. 16 16
      Projects/UninstProgressForm.dfm
  3. 29 14
      Projects/UninstProgressForm.pas

+ 1 - 32
Projects/ScriptClasses_R.pas

@@ -211,40 +211,9 @@ begin
   end;
 end;
 
-procedure TUninstallProgressFormOuterNotebook_R(Self: TUninstallProgressForm; var T: TNewNotebook); begin T := Self.OuterNotebook; end;
-procedure TUninstallProgressFormInnerPage_R(Self: TUninstallProgressForm; var T: TNewNotebookPage); begin T := Self.InnerPage; end;
-procedure TUninstallProgressFormInnerNotebook_R(Self: TUninstallProgressForm; var T: TNewNotebook); begin T := Self.InnerNotebook; end;
-procedure TUninstallProgressFormInstallingPage_R(Self: TUninstallProgressForm; var T: TNewNotebookPage); begin T := Self.InstallingPage; end;
-procedure TUninstallProgressFormMainPanel_R(Self: TUninstallProgressForm; var T: TPanel); begin T := Self.MainPanel; end;
-procedure TUninstallProgressFormPageNameLabel_R(Self: TUninstallProgressForm; var T: TNewStaticText); begin T := Self.PageNameLabel; end;
-procedure TUninstallProgressFormPageDescriptionLabel_R(Self: TUninstallProgressForm; var T: TNewStaticText); begin T := Self.PageDescriptionLabel; end;
-procedure TUninstallProgressFormWizardSmallBitmapImage_R(Self: TUninstallProgressForm; var T: TBitmapImage); begin T := Self.WizardSmallBitmapImage; end;
-procedure TUninstallProgressFormBevel1_R(Self: TUninstallProgressForm; var T: TBevel); begin T := Self.Bevel1; end;
-procedure TUninstallProgressFormStatusLabel_R(Self: TUninstallProgressForm; var T: TNewStaticText); begin T := Self.StatusLabel; end;
-procedure TUninstallProgressFormProgressBar_R(Self: TUninstallProgressForm; var T: TNewProgressBar); begin T := Self.ProgressBar; end;
-procedure TUninstallProgressFormBeveledLabel_R(Self: TUninstallProgressForm; var T: TNewStaticText); begin T := Self.BeveledLabel; end;
-procedure TUninstallProgressFormBevel_R(Self: TUninstallProgressForm; var T: TBevel); begin T := Self.Bevel; end;
-procedure TUninstallProgressFormCancelButton_R(Self: TUninstallProgressForm; var T: TNewButton); begin T := Self.CancelButton; end;
-
 procedure RegisterUninstallProgressForm_R(Cl: TPSRuntimeClassImporter);
 begin
-  with Cl.Add(TUninstallProgressForm) do
-  begin
-    RegisterPropertyHelper(@TUninstallProgressFormOuterNotebook_R, nil, 'OuterNotebook');
-    RegisterPropertyHelper(@TUninstallProgressFormInnerPage_R, nil, 'InnerPage');
-    RegisterPropertyHelper(@TUninstallProgressFormInnerNotebook_R, nil, 'InnerNotebook');
-    RegisterPropertyHelper(@TUninstallProgressFormInstallingPage_R, nil, 'InstallingPage');
-    RegisterPropertyHelper(@TUninstallProgressFormMainPanel_R, nil, 'MainPanel');
-    RegisterPropertyHelper(@TUninstallProgressFormPageNameLabel_R, nil, 'PageNameLabel');
-    RegisterPropertyHelper(@TUninstallProgressFormPageDescriptionLabel_R, nil, 'PageDescriptionLabel');
-    RegisterPropertyHelper(@TUninstallProgressFormWizardSmallBitmapImage_R, nil, 'WizardSmallBitmapImage');
-    RegisterPropertyHelper(@TUninstallProgressFormBevel1_R, nil, 'Bevel1');
-    RegisterPropertyHelper(@TUninstallProgressFormStatusLabel_R, nil, 'StatusLabel');
-    RegisterPropertyHelper(@TUninstallProgressFormProgressBar_R, nil, 'ProgressBar');
-    RegisterPropertyHelper(@TUninstallProgressFormBeveledLabel_R, nil, 'BeveledLabel');
-    RegisterPropertyHelper(@TUninstallProgressFormBevel_R, nil, 'Bevel');
-    RegisterPropertyHelper(@TUninstallProgressFormCancelButton_R, nil, 'CancelButton');
-  end;
+  Cl.Add(TUninstallProgressForm);
 end;
 
 procedure RegisterWizardPage_R(Cl: TIFPSRuntimeClassImporter);

+ 16 - 16
Projects/UninstProgressForm.dfm

@@ -19,7 +19,7 @@ object UninstallProgressForm: TUninstallProgressForm
     360)
   PixelsPerInch = 96
   TextHeight = 13
-  object Bevel: TBevel
+  object FBevel: TBevel
     Left = 0
     Top = 313
     Width = 497
@@ -27,7 +27,7 @@ object UninstallProgressForm: TUninstallProgressForm
     Anchors = [akLeft, akRight, akBottom]
     Shape = bsTopLine
   end
-  object CancelButton: TNewButton
+  object FCancelButton: TNewButton
     Left = 410
     Top = 327
     Width = 75
@@ -38,21 +38,21 @@ object UninstallProgressForm: TUninstallProgressForm
     Enabled = False
     TabOrder = 2
   end
-  object OuterNotebook: TNewNotebook
+  object FOuterNotebook: TNewNotebook
     Left = 0
     Top = 0
     Width = 497
     Height = 313
-    ActivePage = InnerPage
+    ActivePage = FInnerPage
     Anchors = [akLeft, akTop, akRight, akBottom]
     Color = clBtnFace
     ParentColor = False
     TabOrder = 0
-    object InnerPage: TNewNotebookPage
+    object FInnerPage: TNewNotebookPage
       DesignSize = (
         497
         313)
-      object Bevel1: TBevel
+      object FBevel1: TBevel
         Left = 0
         Top = 58
         Width = 499
@@ -60,19 +60,19 @@ object UninstallProgressForm: TUninstallProgressForm
         Anchors = [akLeft, akTop, akRight]
         Shape = bsTopLine
       end
-      object InnerNotebook: TNewNotebook
+      object FInnerNotebook: TNewNotebook
         Left = 4
         Top = 64
         Width = 489
         Height = 245
-        ActivePage = InstallingPage
+        ActivePage = FInstallingPage
         Anchors = [akLeft, akTop, akRight, akBottom]
         TabOrder = 1
-        object InstallingPage: TNewNotebookPage
+        object FInstallingPage: TNewNotebookPage
           DesignSize = (
             489
             245)
-          object ProgressBar: TNewProgressBar
+          object FProgressBar: TNewProgressBar
             Left = 36
             Top = 56
             Width = 417
@@ -82,7 +82,7 @@ object UninstallProgressForm: TUninstallProgressForm
             Max = 400
             Style = npbstNormal
           end
-          object StatusLabel: TNewStaticText
+          object FStatusLabel: TNewStaticText
             Left = 36
             Top = 12
             Width = 417
@@ -95,7 +95,7 @@ object UninstallProgressForm: TUninstallProgressForm
           end
         end
       end
-      object MainPanel: TPanel
+      object FMainPanel: TPanel
         Left = 0
         Top = 0
         Width = 497
@@ -107,7 +107,7 @@ object UninstallProgressForm: TUninstallProgressForm
         DesignSize = (
           497
           58)
-        object WizardSmallBitmapImage: TBitmapImage
+        object FWizardSmallBitmapImage: TBitmapImage
           Left = 440
           Top = 1
           Width = 55
@@ -116,7 +116,7 @@ object UninstallProgressForm: TUninstallProgressForm
           BackColor = clWindow
           Center = True
         end
-        object PageDescriptionLabel: TNewStaticText
+        object FPageDescriptionLabel: TNewStaticText
           Left = 40
           Top = 26
           Width = 389
@@ -128,7 +128,7 @@ object UninstallProgressForm: TUninstallProgressForm
           TabOrder = 1
           WordWrap = True
         end
-        object PageNameLabel: TNewStaticText
+        object FPageNameLabel: TNewStaticText
           Left = 24
           Top = 10
           Width = 405
@@ -141,7 +141,7 @@ object UninstallProgressForm: TUninstallProgressForm
       end
     end
   end
-  object BeveledLabel: TNewStaticText
+  object FBeveledLabel: TNewStaticText
     Left = 0
     Top = 306
     Width = 5

+ 29 - 14
Projects/UninstProgressForm.pas

@@ -20,20 +20,20 @@ uses
 
 type
   TUninstallProgressForm = class(TSetupForm)
-    OuterNotebook: TNewNotebook;
-    InnerPage: TNewNotebookPage;
-    InnerNotebook: TNewNotebook;
-    InstallingPage: TNewNotebookPage;
-    MainPanel: TPanel;
-    PageNameLabel: TNewStaticText;
-    PageDescriptionLabel: TNewStaticText;
-    WizardSmallBitmapImage: TBitmapImage;
-    Bevel1: TBevel;
-    StatusLabel: TNewStaticText;
-    ProgressBar: TNewProgressBar;
-    BeveledLabel: TNewStaticText;
-    Bevel: TBevel;
-    CancelButton: TNewButton;
+    FOuterNotebook: TNewNotebook;
+    FInnerPage: TNewNotebookPage;
+    FInnerNotebook: TNewNotebook;
+    FInstallingPage: TNewNotebookPage;
+    FMainPanel: TPanel;
+    FPageNameLabel: TNewStaticText;
+    FPageDescriptionLabel: TNewStaticText;
+    FWizardSmallBitmapImage: TBitmapImage;
+    FBevel1: TBevel;
+    FStatusLabel: TNewStaticText;
+    FProgressBar: TNewProgressBar;
+    FBeveledLabel: TNewStaticText;
+    FBevel: TBevel;
+    FCancelButton: TNewButton;
   private
     { Private declarations }
   protected
@@ -44,6 +44,21 @@ type
     destructor Destroy; override;
     procedure Initialize(const ATitle, AAppName: String; const AModernStyle: Boolean);
     procedure UpdateProgress(const AProgress, ARange: Integer);
+  published
+    property OuterNotebook: TNewNotebook read FOuterNotebook;
+    property InnerPage: TNewNotebookPage read FInnerPage;
+    property InnerNotebook: TNewNotebook read FInnerNotebook;
+    property InstallingPage: TNewNotebookPage read FInstallingPage;
+    property MainPanel: TPanel read FMainPanel;
+    property PageNameLabel: TNewStaticText read FPageNameLabel;
+    property PageDescriptionLabel: TNewStaticText read FPageDescriptionLabel;
+    property WizardSmallBitmapImage: TBitmapImage read FWizardSmallBitmapImage;
+    property Bevel1: TBevel read FBevel1;
+    property StatusLabel: TNewStaticText read FStatusLabel;
+    property ProgressBar: TNewProgressBar read FProgressBar;
+    property BeveledLabel: TNewStaticText read FBeveledLabel;
+    property Bevel: TBevel read FBevel;
+    property CancelButton: TNewButton read FCancelButton;
   end;
 
 var