Updated info about SWAG database + some UI tweaks

Author: delphidabbler

Src/FmSWAGImportDlg.dfm

@@ -19,16 +19,12 @@ inherited SWAGImportDlg: TSWAGImportDlg
     inherited pcWizard: TPageControl
       Width = 671
       Height = 456
-      ActivePage = tsCategories
+      ActivePage = tsFinish
       ExplicitWidth = 671
       ExplicitHeight = 456
       object tsIntro: TTabSheet
         Caption = 'tsIntro'
         TabVisible = False
-        ExplicitLeft = 0
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         inline frmIntro: THTMLTpltDlgFrame
           Left = 0
           Top = 0
@@ -59,37 +55,41 @@ inherited SWAGImportDlg: TSWAGImportDlg
         Caption = 'tsFolder'
         ImageIndex = 4
         TabVisible = False
-        ExplicitLeft = 0
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         object lblFolder: TLabel
           Left = 0
           Top = 8
-          Width = 393
+          Width = 383
           Height = 13
           Caption = 
-            'Enter the SWAG database download &folder: (click the button to b' +
-            'rowse for folder)'
+            'Enter the SWAG database download &folder - you need the '#39'swag'#39' s' +
+            'ub-directory:'
           FocusControl = edPath
         end
-        object lblFolderPageInfo: TLabel
+        object lblFolderPageInfo2: TLabel
           Left = 0
           Top = 72
           Width = 267
           Height = 13
           Caption = 'Click the Next button to choose which packets to import'
         end
-        object edPath: TEdit
+        object lblFolderPageInfo1: TLabel
           Left = 0
-          Top = 28
+          Top = 26
+          Width = 208
+          Height = 13
+          Caption = 'Click the ... button to browse for the folder'
+          FocusControl = edPath
+        end
+        object edPath: TEdit
+          Left = 3
+          Top = 45
           Width = 484
           Height = 21
           TabOrder = 0
         end
         object btnBrowse: TButton
-          Left = 490
-          Top = 28
+          Left = 493
+          Top = 45
           Width = 27
           Height = 21
           Action = actBrowse
@@ -184,10 +184,6 @@ inherited SWAGImportDlg: TSWAGImportDlg
         Caption = 'tsUpdate'
         ImageIndex = 2
         TabVisible = False
-        ExplicitLeft = 0
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         object lblUpdateDesc: TLabel
           Left = 0
           Top = 3
@@ -231,10 +227,6 @@ inherited SWAGImportDlg: TSWAGImportDlg
         Caption = 'tsFinish'
         ImageIndex = 3
         TabVisible = False
-        ExplicitLeft = 0
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         inline frmOutro: THTMLTpltDlgFrame
           Left = 0
           Top = 0

Src/FmSWAGImportDlg.pas

@@ -65,11 +65,12 @@   TSWAGImportDlg = class(TWizardDlg, INoPublicConstruct)
     tsFolder: TTabSheet;
     lblFolder: TLabel;
     edPath: TEdit;
-    lblFolderPageInfo: TLabel;
+    lblFolderPageInfo2: TLabel;
     btnBrowse: TButton;
     actBrowse: TAction;
     frmIntro: THTMLTpltDlgFrame;
     lblVersionNumber: TLabel;
+    lblFolderPageInfo1: TLabel;
     ///  <summary>Handles clicks on the check boxes next to packets in the
     ///  packet selection list box by selecting and deselecting packets for
     ///  inclusion in the import.</summary>
@@ -315,8 +316,12 @@ procedure TSWAGImportDlg.ArrangeForm;
   TCtrlArranger.AlignVCentres(
     TCtrlArranger.BottomOf(lblFolder, 6), [edPath, btnBrowse]
   );
+  TCtrlArranger.AlignLefts(
+    [lblFolder, edPath, lblFolderPageInfo1, lblFolderPageInfo2], 0
+  );
   TCtrlArranger.MoveToRightOf(edPath, btnBrowse, 8);
-  lblFolderPageInfo.Top := TCtrlArranger.BottomOf([edPath, btnBrowse], 12);
+  lblFolderPageInfo1.Top := TCtrlArranger.BottomOf([edPath, btnBrowse], 12);
+  lblFolderPageInfo2.Top := TCtrlArranger.BottomOf(lblFolderPageInfo1, 8);
 
   // tsCategories
   lblCategoriesDesc.Width := tsCategories.ClientWidth;
@@ -423,7 +428,8 @@ procedure TSWAGImportDlg.BuildCSS(Sender: TObject;
   with CSSBuilder.AddSelector('.framed') do
   begin
     AddProperty(TCSS.BorderProp(cssAll, 1, cbsSolid, clBorder));
-    AddProperty(TCSS.PaddingProp(4));
+    AddProperty(TCSS.PaddingProp(0, 4, 4, 4));
+    AddProperty(TCSS.MarginProp(cssTop, 4));
   end;
 end;
 
@@ -461,6 +467,8 @@ procedure TSWAGImportDlg.clbSelectPacketsKeyDown(Sender: TObject;
 end;
 
 procedure TSWAGImportDlg.ConfigForm;
+resourcestring
+  sVersions = 'v%0:s to v%1:s';
 begin
   inherited;
   pcWizard.ActivePage := tsFinish;
@@ -485,6 +493,16 @@ procedure TSWAGImportDlg.ConfigForm;
         'SWAGReleaseURL',
         TURL.SWAGReleases
       );
+      Tplt.ResolvePlaceholderText(
+        'SupportedSWAGVersions',
+        Format(
+          sVersions,
+          [
+            string(TSWAGVersion.LowestSupportedVersion),
+            string(TSWAGVersion.LowestUnSupportedVersion)
+          ]
+        )
+      );
     end
   );
 end;
@@ -615,7 +633,6 @@ procedure TSWAGImportDlg.InitSelectionPage;
 var
   Cats: TList<TSWAGCategory>;
   Idx: Integer;
-  VerNumStr: string;
 resourcestring
   sLblVersionNumberCaption = 'SWAG version %s';
 begin

Src/Res/HTML/dlg-swag-import-intro-tplt.html

@@ -24,35 +24,45 @@
   <body>
 
     <p>
-      This wizard enables you to import snippets from the <a
+      This wizard enables you to import &quot;packets&quot; (SWAG's equivalent of CodeSnip's snippets) from the <a
         class="help-link"
         href="help:AboutSWAG"
       >SWAG database</a> into your local user database.
     </p>
 
-    <p class="framed">
-      You must have a copy of a specially prepared version of SWAG on your local system before continuing. If you haven't already got it then you need to download it from the <em>delphidabbler/swag</em> repository on GitHub. Go to <a
-        class="external-link"
-        href="<%SWAGReleaseURL%>"
-      ><%SWAGReleaseURL%></a> and find the latest release of the XML version of SWAG. The file name will be in the form <code>swag-xml-vX.X.X</code> where <code>X.X.X</code> is the version number. Download the file and unzip it into a folder on your computer. Make a note of the folder's location - it will be needed in the next step.
+    <div class="framed">
+      <p>
+				You must have a copy of a specially prepared version of SWAG on your local system before continuing. If you haven't already got it then you need to download it from the <em>delphidabbler/swag</em> repository on GitHub.
+			</p>
+			<p>
+				Go to <a class="external-link" href="<%SWAGReleaseURL%>" ><%SWAGReleaseURL%></a> and find the latest supported release&dagger;. The file name will be in the form <code>dd-swag-vX.Y.Z</code> where <code>X.Y.Z</code> is the version number. Download the file and unzip it into a folder on your computer. Make a note of the folder's location - it will be needed in the next step.
+			</p>
+			<p class="indent">
+				&dagger; Currently CodeSnip supports SWAG versions <%SupportedSWAGVersions%>.
+			</p>
+		</div>
+
+		<p>
+			<strong class="warning">Warning:</strong> Although importing snippets should be safe, you may wish to take a backup of your user database before going any further. You can do this from the <em>Database | Backup User Database</em> menu option.
+		</p>
 
     <p>
-      On the next page of the wizard you will be asked for the location of the folder containing the SWAG database. <em>CodeSnip</em> will then open the database and display all SWAG's categories on the following page. From there you can browse and display the snippets in each category before selecting those you want to import. You get a chance to review these before importing.
+      On the next page of the wizard you will be asked for the location of the folder containing the SWAG database. <strong>Note</strong> that you will need to specify the <strong><code>swag</code></strong> sub-directory of the download. <em>CodeSnip</em> will then open the database and display all SWAG's categories on the following page. From there you can browse and display the packets in each category before selecting those you want to import. You get a chance to review these before importing.
     </p>
 
     <p>
-      All snippets are imported as <a
+      All packets are imported as <a
         class="help-link"
         href="help:SnippetFreeform"
-      >freeform</a>.
+      >freeform</a> snippets.
     </p>
 
     <p>
-      <em>CodeSnip</em> does not keep a track of snippets imported from SWAG &ndash; it treats them just like any other user defined snippet. This means it is possible to import the same snippet more than once. It's up to you to keep track of this.
+			<em>CodeSnip</em> does not keep a track of packets imported from SWAG &ndash; it treats them just like any other user defined snippet. This means it is possible to import the same packet more than once. It's up to you to keep track of this.
     </p>
 
     <p>
-      <strong>Note:</strong> It can take quite some time to import snippets from SWAG. You are advised not to import more than about 20 snippets in one go. If you want to import a lot of snippets you should run this wizard more than once.
+      <strong>Note:</strong> It can take quite some time to import packets from SWAG. You are advised not to import more than about 20 packets in one go. If you want to import a lot of packets you should run this wizard more than once.
     </p>
 
   </body>

Src/Res/HTML/dlg-swag-import-outro-tplt.html

@@ -23,12 +23,12 @@
   <body>
 
     <p>
-      All the selected snippets have now been imported into the
-      <em><%SWAGCategory%></em> category.
+      All the selected SWAG packets have now been converted to CodeSnip snippets
+			and imported into the <em><%SWAGCategory%></em> category.
     </p>
 
     <p>
-      The imported snippets can be edited as required.
+      The snippets can be edited as required.
     </p>
 
     <p>