Merge branch 'feature/swag-api-changes' into develop

Author: delphidabbler

Src/CodeSnip.dpr

@@ -179,7 +179,8 @@ uses
   SWAG.UCommon in 'SWAG.UCommon.pas',
   SWAG.UImporter in 'SWAG.UImporter.pas',
   SWAG.UReader in 'SWAG.UReader.pas',
-  SWAG.USnippetCache in 'SWAG.USnippetCache.pas',
+  SWAG.UPacketCache in 'SWAG.UPacketCache.pas',
+  SWAG.UVersion in 'SWAG.UVersion.pas',
   SWAG.UXMLProcessor in 'SWAG.UXMLProcessor.pas',
   UActionFactory in 'UActionFactory.pas',
   UAnchors in 'UAnchors.pas',

Src/CodeSnip.dproj

@@ -376,7 +376,8 @@
 			<DCCReference Include="SWAG.UCommon.pas"/>
 			<DCCReference Include="SWAG.UImporter.pas"/>
 			<DCCReference Include="SWAG.UReader.pas"/>
-			<DCCReference Include="SWAG.USnippetCache.pas"/>
+			<DCCReference Include="SWAG.UPacketCache.pas"/>
+			<DCCReference Include="SWAG.UVersion.pas"/>
 			<DCCReference Include="SWAG.UXMLProcessor.pas"/>
 			<DCCReference Include="UActionFactory.pas"/>
 			<DCCReference Include="UAnchors.pas"/>
@@ -565,6 +566,7 @@
 			<DCCReference Include="UXMLDocConsts.pas"/>
 			<DCCReference Include="UXMLDocHelper.pas"/>
 			<DCCReference Include="UXMLDocumentEx.pas"/>
+			<DCCReference Include="SWAG.UVersion.pas"/>
 			<None Include="CodeSnip.todo"/>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>

Src/FmSWAGImportDlg.dfm

@@ -19,7 +19,7 @@ inherited SWAGImportDlg: TSWAGImportDlg
     inherited pcWizard: TPageControl
       Width = 671
       Height = 456
-      ActivePage = tsUpdate
+      ActivePage = tsFinish
       ExplicitWidth = 671
       ExplicitHeight = 456
       object tsIntro: TTabSheet
@@ -58,30 +58,38 @@ inherited SWAGImportDlg: TSWAGImportDlg
         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 = 270
+          Width = 267
           Height = 13
-          Caption = 'Click the Next button to choose which snippets to import'
+          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
@@ -113,20 +121,26 @@ inherited SWAGImportDlg: TSWAGImportDlg
           Height = 36
           AutoSize = False
           Caption = 
-            'Select a category from the list on the left and click "Show Snip' +
-            'pets In Category" (or double click the category) to display a li' +
-            'st of its snippets in the right hand list. Tick the snippets you' +
-            ' want to import. Repeat with as many categories as you wish. Whe' +
-            'n you are ready to import click "Next".'
+            'Select a category from the list on the left and click "Show Pack' +
+            'ets In Category" (or double click the category) to display a lis' +
+            't of its packets in the right hand list. Tick the packet(s) you ' +
+            'want to import. Repeat with as many categories as you wish. When' +
+            ' you are ready to import click "Next".'
           WordWrap = True
         end
-        object lblSelectSnippets: TLabel
+        object lblSelectPackets: TLabel
           Left = 256
           Top = 45
-          Width = 119
+          Width = 116
+          Height = 13
+          Caption = '&Select required packets:'
+          FocusControl = clbSelectPackets
+        end
+        object lblVersionNumber: TLabel
+          Left = 2
+          Top = 427
+          Width = 3
           Height = 13
-          Caption = '&Select required snippets:'
-          FocusControl = clbSelectSnippets
         end
         object lbCategories: TListBox
           Left = 0
@@ -138,16 +152,16 @@ inherited SWAGImportDlg: TSWAGImportDlg
           OnDblClick = lbCategoriesDblClick
           OnKeyDown = lbCategoriesKeyDown
         end
-        object clbSelectSnippets: TCheckListBox
-          Left = 256
+        object clbSelectPackets: TCheckListBox
+          Left = 240
           Top = 64
           Width = 404
           Height = 321
-          OnClickCheck = clbSelectSnippetsClickCheck
+          OnClickCheck = clbSelectPacketsClickCheck
           ItemHeight = 13
           TabOrder = 2
-          OnDblClick = clbSelectSnippetsDblClick
-          OnKeyDown = clbSelectSnippetsKeyDown
+          OnDblClick = clbSelectPacketsDblClick
+          OnKeyDown = clbSelectPacketsKeyDown
         end
         object btnDisplayCategory: TButton
           Left = 30
@@ -157,12 +171,12 @@ inherited SWAGImportDlg: TSWAGImportDlg
           Action = actDisplayCategory
           TabOrder = 1
         end
-        object btnDisplaySnippet: TButton
+        object btnDisplayPacket: TButton
           Left = 280
           Top = 391
           Width = 185
           Height = 25
-          Action = actDisplaySnippet
+          Action = actDisplayPacket
           TabOrder = 3
         end
       end
@@ -177,11 +191,12 @@ inherited SWAGImportDlg: TSWAGImportDlg
           Height = 36
           AutoSize = False
           Caption = 
-            'You have chosen to import the following SWAG snippets. They will' +
-            ' be imported with the given Display Names and Snippet IDs. You c' +
-            'an change these if you wish using the Snippets Editor. To make c' +
-            'hanges go back to the previous page. When you are ready to impor' +
-            't the snippets click "Import". This step can'#39't be undone.'
+            'You have chosen to import the following SWAG packets as CodeSnip' +
+            ' snippets. They will be imported with the given Display Names an' +
+            'd Packet IDs. You can change these if you wish using the Snippet' +
+            's Editor. To make changes go back to the previous page. When you' +
+            ' are ready to import the packets click "Import". This step can'#39't' +
+            ' be undone.'
           WordWrap = True
         end
         object lvImports: TListView
@@ -191,11 +206,11 @@ inherited SWAGImportDlg: TSWAGImportDlg
           Height = 317
           Columns = <
             item
-              Caption = 'Snippet Title (Display Name)'
+              Caption = 'Packet Title '#8594' Snippet Display Name'
               Width = 400
             end
             item
-              Caption = 'Snippet ID (Name)'
+              Caption = 'Snippet Name from SWAG ID'
               Width = 200
             end>
           ColumnClick = False
@@ -250,14 +265,14 @@ inherited SWAGImportDlg: TSWAGImportDlg
     Left = 336
     Top = 256
     object actDisplayCategory: TAction
-      Caption = 'S&how Snippets In Category'
+      Caption = 'S&how Packets In Category'
       OnExecute = actDisplayCategoryExecute
       OnUpdate = actDisplayCategoryUpdate
     end
-    object actDisplaySnippet: TAction
-      Caption = '&Preview Selected Snippet...'
-      OnExecute = actDisplaySnippetExecute
-      OnUpdate = actDisplaySnippetUpdate
+    object actDisplayPacket: TAction
+      Caption = '&Preview Selected Packet...'
+      OnExecute = actDisplayPacketExecute
+      OnUpdate = actDisplayPacketUpdate
     end
     object actBrowse: TAction
       Caption = '...'