Remove user info page from Code Import wizard dialogue box

Author: delphidabbler

Src/FmCodeImportDlg.dfm

@@ -1,19 +1,23 @@
 inherited CodeImportDlg: TCodeImportDlg
   Caption = 'Import Wizard'
   ExplicitWidth = 565
-  ExplicitHeight = 433
+  ExplicitHeight = 436
   PixelsPerInch = 96
   TextHeight = 13
   inherited pnlBody: TPanel
     Height = 321
     ExplicitHeight = 321
     inherited pcWizard: TPageControl
       Height = 288
-      ActivePage = tsUpdate
+      ActivePage = tsFile
       ExplicitHeight = 288
       object tsInfo: TTabSheet
         Caption = 'tsInfo'
         TabVisible = False
+        ExplicitLeft = 0
+        ExplicitTop = 0
+        ExplicitWidth = 0
+        ExplicitHeight = 0
         object lblIntro: TLabel
           Left = 0
           Top = 8
@@ -33,15 +37,15 @@ inherited CodeImportDlg: TCodeImportDlg
         object lblFile: TLabel
           Left = 0
           Top = 8
-          Width = 220
+          Width = 230
           Height = 13
           Caption = 'Open import &file: (click button to browse for file)'
           FocusControl = edFile
         end
         object lblLoadFile: TLabel
           Left = 0
           Top = 72
-          Width = 172
+          Width = 179
           Height = 13
           Caption = 'Click the Next button to read the file.'
         end
@@ -67,76 +71,22 @@ inherited CodeImportDlg: TCodeImportDlg
           TabOrder = 1
         end
       end
-      object tsUserInfo: TTabSheet
-        Caption = 'tsUserInfo'
-        ImageIndex = 2
-        TabVisible = False
-        object lblName: TLabel
-          Left = 0
-          Top = 8
-          Width = 31
-          Height = 13
-          Caption = 'Name:'
-        end
-        object lblEmail: TLabel
-          Left = 0
-          Top = 45
-          Width = 28
-          Height = 13
-          Caption = 'Email:'
-        end
-        object lblComments: TLabel
-          Left = 0
-          Top = 85
-          Width = 52
-          Height = 13
-          Caption = 'Comments:'
-        end
-        object edComments: TMemo
-          Left = 72
-          Top = 82
-          Width = 297
-          Height = 154
-          ParentColor = True
-          ReadOnly = True
-          ScrollBars = ssVertical
-          TabOrder = 2
-        end
-        object edName: TEdit
-          Left = 72
-          Top = 3
-          Width = 297
-          Height = 21
-          ParentColor = True
-          ReadOnly = True
-          TabOrder = 0
-        end
-        object edEmail: TEdit
-          Left = 72
-          Top = 42
-          Width = 297
-          Height = 21
-          ParentColor = True
-          ReadOnly = True
-          TabOrder = 1
-        end
-      end
       object tsUpdate: TTabSheet
         Caption = 'tsUpdate'
         ImageIndex = 3
         TabVisible = False
         object lblImportList: TLabel
           Left = 0
           Top = 53
-          Width = 86
+          Width = 91
           Height = 13
           Caption = 'Imported &snippets:'
           FocusControl = lvImports
         end
         object lblSelectedSnippet: TLabel
           Left = 0
           Top = 217
-          Width = 82
+          Width = 83
           Height = 13
           Caption = 'S&elected snippet:'
           FocusControl = edRename
@@ -203,6 +153,10 @@ inherited CodeImportDlg: TCodeImportDlg
         Caption = 'tsFinish'
         ImageIndex = 5
         TabVisible = False
+        ExplicitLeft = 0
+        ExplicitTop = 0
+        ExplicitWidth = 0
+        ExplicitHeight = 0
         object lblFinish: TLabel
           Left = 0
           Top = 8

Src/FmCodeImportDlg.pas

@@ -17,9 +17,17 @@ interface
 
 uses
   // Delphi
-  Classes, ActnList, Controls, ComCtrls, StdCtrls, ExtCtrls, Forms,
+  Classes,
+  ActnList,
+  Controls,
+  ComCtrls,
+  StdCtrls,
+  ExtCtrls,
+  Forms,
   // Project
-  FmWizardDlg, UBaseObjects, UCodeImportMgr;
+  FmWizardDlg,
+  UBaseObjects,
+  UCodeImportMgr;
 
 type
   ///  <summary>
@@ -30,21 +38,14 @@ interface
   TCodeImportDlg = class(TWizardDlg, INoPublicConstruct)
     tsInfo: TTabSheet;
     tsFile: TTabSheet;
-    tsUserInfo: TTabSheet;
     tsUpdate: TTabSheet;
     lblIntro: TLabel;
     lblFile: TLabel;
     edFile: TEdit;
     btnBrowse: TButton;
     tsFinish: TTabSheet;
-    lblName: TLabel;
-    lblEmail: TLabel;
-    lblComments: TLabel;
-    edComments: TMemo;
     lvImports: TListView;
     lblImportList: TLabel;
-    edName: TEdit;
-    edEmail: TEdit;
     lblLoadFile: TLabel;
     btnRename: TButton;
     edRename: TEdit;
@@ -71,13 +72,12 @@   TCodeImportDlg = class(TWizardDlg, INoPublicConstruct)
   strict private
     const
       // Indices of wizard pages
-      cIntroPage = 0;
-      cFilePage = 1;
-      cUserInfoPage = 2;  // displayed only there is user info
-      cUpdatePage = 3;
-      cFinishPage = 4;
+      cIntroPage    = 0;
+      cFilePage     = 1;
+      cUpdatePage   = 2;
+      cFinishPage   = 3;
       // Index of subitems in list view
-      cLVActionIdx = 1;
+      cLVActionIdx  = 1;
       cLVImportName = 0;
     var
       ///  <summary>Reference to import manager object used to perform import
@@ -100,8 +100,6 @@   TCodeImportDlg = class(TWizardDlg, INoPublicConstruct)
     ///  error message if not.</summary>
     class procedure CanOpenDialogClose(Sender: TObject;
       var CanClose: Boolean);
-    ///  <summary>Populates controls on user information page.</summary>
-    procedure InitUserInfo;
     ///  <summary>Displays current details of all snippets in import file in
     ///  list view on update page.</summary>
     procedure InitImportInfo;
@@ -153,14 +151,6 @@   TCodeImportDlg = class(TWizardDlg, INoPublicConstruct)
     ///  <remarks>Overridden method called from ancestor class.</remarks>
     procedure MoveForward(const PageIdx: Integer; var CanMove: Boolean);
       override;
-    ///  <summary>Determines index of page following page indexed by PageIdx.
-    ///  Skips user info page if there is no user info.</summary>
-    ///  <remarks>Overridden method called from ancestor class.</remarks>
-    function NextPage(const PageIdx: Integer): Integer; override;
-    ///  <summary>Determines index of page preceding page indexed by PageIdx.
-    ///  Skips user info page if there is no user info.</summary>
-    ///  <remarks>Overridden method called from ancestor class.</remarks>
-    function PrevPage(const PageIdx: Integer): Integer; override;
   public
     ///  <summary>Displays wizard, passing a reference to import manager object
     ///  to be used for import operations. Returns True if wizard finishes or
@@ -175,10 +165,16 @@ implementation
 
 uses
   // Delphi
-  SysUtils, Dialogs,
+  SysUtils,
+  Dialogs,
   // Project
-  UCtrlArranger, UExceptions, UMessageBox, UOpenDialogEx, UOpenDialogHelper,
-  USnippetValidator, UStrUtils;
+  UCtrlArranger,
+  UExceptions,
+  UMessageBox,
+  UOpenDialogEx,
+  UOpenDialogHelper,
+  USnippetValidator,
+  UStrUtils;
 
 {$R *.dfm}
 
@@ -232,34 +228,32 @@ procedure TCodeImportDlg.actRenameUpdate(Sender: TObject);
 procedure TCodeImportDlg.ArrangeForm;
 begin
   TCtrlArranger.SetLabelHeights(Self);
+
   // Arrange controls on tab sheets
+
   // tsInfo
-  { nothing to do }
+  // nothing to do
+
   // tsFile
   TCtrlArranger.AlignVCentres(
     TCtrlArranger.BottomOf(lblFile, 6), [edFile, btnBrowse]
   );
   lblLoadFile.Top := TCtrlArranger.BottomOf([edFile, btnBrowse], 12);
-  // tsUserInfo
-  TCtrlArranger.AlignVCentres(8, [lblName, edName]);
-  TCtrlArranger.AlignVCentres(
-    TCtrlArranger.BottomOf([lblName, edName], 8), [lblEmail, edEmail]
-  );
-  lblComments.Top := TCtrlArranger.BottomOf([lblEmail, edEmail], 8);
-  edComments.Top := lblComments.Top;
+
   // tsUpdate
   lblImportList.Top := TCtrlArranger.BottomOf(lblModifyInstructions, 8);
   lvImports.Top := TCtrlArranger.BottomOf(lblImportList, 6);
   lblSelectedSnippet.Top := TCtrlArranger.BottomOf(lvImports, 8);
   TCtrlArranger.AlignVCentres(
     TCtrlArranger.BottomOf(lblSelectedSnippet, 6), [edRename, btnRename]
   );
+
   // tsFinish
   sbFinish.Top := TCtrlArranger.BottomOf(lblFinish, 6);
 
   // Size body
   pnlBody.ClientHeight := TCtrlArranger.MaxContainerHeight(
-    [tsInfo, tsFile, tsUserInfo, tsUpdate, tsFinish]
+    [tsInfo, tsFile, tsUpdate, tsFinish]
   ) + pnlBody.ClientHeight - tsInfo.Height;
 
   // Arrange inherited controls and size the form
@@ -269,7 +263,6 @@ procedure TCodeImportDlg.ArrangeForm;
 procedure TCodeImportDlg.BeginPage(const PageIdx: Integer);
 begin
   case PageIdx of
-    cUserInfoPage: InitUserInfo;
     cUpdatePage: InitImportInfo;
     cFinishPage: PresentResults;
   end;
@@ -329,14 +322,12 @@ function TCodeImportDlg.HeadingText(const PageIdx: Integer): string;
   // Page headings
   sIntroPageheading = 'Import snippets from a file';
   sFilePage = 'Choose import file';
-  sUserInfoPage = 'User information';
   sUpdatePage = 'Edit import and update database';
   sFinishPage = 'Import complete';
 begin
   case PageIdx of
     cIntroPage:     Result := sIntroPageheading;
     cFilePage:      Result := sFilePage;
-    cUserInfoPage:  Result := sUserInfoPage;
     cUpdatePage:    Result := sUpdatePage;
     cFinishPage:    Result := sFinishPage;
   end;
@@ -377,13 +368,6 @@ procedure TCodeImportDlg.InitImportInfo;
   end;
 end;
 
-procedure TCodeImportDlg.InitUserInfo;
-begin
-  edName.Text := fImportMgr.UserInfo.Details.Name;
-  edEmail.Text := fImportMgr.UserInfo.Details.Email;
-  edComments.Text := fImportMgr.UserInfo.Comments;
-end;
-
 constructor TCodeImportDlg.InternalCreate(AOwner: TComponent;
   const ImportMgr: TCodeImportMgr);
 begin
@@ -427,16 +411,6 @@ procedure TCodeImportDlg.MoveForward(const PageIdx: Integer;
   end;
 end;
 
-function TCodeImportDlg.NextPage(const PageIdx: Integer): Integer;
-begin
-  case PageIdx of
-    cFilePage:
-      if fImportMgr.UserInfo.IsNul then
-        Exit(cUpdatePage);
-  end;
-  Result := inherited NextPage(PageIdx);
-end;
-
 procedure TCodeImportDlg.PresentResults;
 
   // ---------------------------------------------------------------------------
@@ -468,16 +442,6 @@ procedure TCodeImportDlg.PresentResults;
   end;
 end;
 
-function TCodeImportDlg.PrevPage(const PageIdx: Integer): Integer;
-begin
-  case PageIdx of
-    cUpdatePage:
-      if fImportMgr.UserInfo.IsNul then
-        Exit(cFilePage);
-  end;
-  Result := inherited PrevPage(PageIdx);
-end;
-
 procedure TCodeImportDlg.ReadImportFile;
 begin
   fImportMgr.Import(GetFileNameFromEditCtrl);