Merge branch 'feature/fixup-ui' into develop

Author: delphidabbler

Src/CodeSnip.todo

@@ -1,2 +1 @@
-{TODO -cUI : Remove unused tool bar button in main window}
 {TODO -cPreRelease : Remove -[**dev**] from product and file versions in .vi files before bumping release number}

Src/DB.UMetaData.pas

@@ -391,10 +391,10 @@   TLaterDBMetaFiles = class sealed(TDBMetaFiles)
   end;
 
   ///  <summary>Class that is present to represent unknown database meta file
-  ///  formats.</summary>
+  ///  formats. Also used when database is not present.</summary>
   ///  <remarks>Accesses no files and returns null results for all methods
   ///  except IsVersionSupported.</remarks>
-  TUnknownMetaFiles = class sealed(TDBMetaFiles)
+  TUnknownOrMissingMetaFiles = class sealed(TDBMetaFiles)
   public
     ///  <summary>Returns the empty string.</summary>
     ///  <remarks>The file format is unknown, so the version file cannot be read
@@ -852,37 +852,37 @@ function TLaterDBMetaFiles.Version: string;
   Result := StrTrim(ReadFileText(cVersionFile));
 end;
 
-{ TUnknownMetaFiles }
+{ TUnknownOrMissingMetaFiles }
 
-function TUnknownMetaFiles.AreAllFilesPresent: Boolean;
+function TUnknownOrMissingMetaFiles.AreAllFilesPresent: Boolean;
 resourcestring
   sNotSupportedError = 'Calling %s.AreAllFilesPresent is not supported for an '
-    + 'unrecognised database format';
+    + 'unrecognised database format or missing database';
 begin
   raise ENotSupportedException.CreateFmt(sNotSupportedError, [ClassName]);
 end;
 
-function TUnknownMetaFiles.Contributors: TStringDynArray;
+function TUnknownOrMissingMetaFiles.Contributors: TStringDynArray;
 begin
   SetLength(Result, 0);
 end;
 
-function TUnknownMetaFiles.LicenseInfo: TStringDynArray;
+function TUnknownOrMissingMetaFiles.LicenseInfo: TStringDynArray;
 begin
   SetLength(Result, 0);
 end;
 
-function TUnknownMetaFiles.LicenseText: string;
+function TUnknownOrMissingMetaFiles.LicenseText: string;
 begin
   Result := '';
 end;
 
-function TUnknownMetaFiles.Testers: TStringDynArray;
+function TUnknownOrMissingMetaFiles.Testers: TStringDynArray;
 begin
   SetLength(Result, 0);
 end;
 
-function TUnknownMetaFiles.Version: string;
+function TUnknownOrMissingMetaFiles.Version: string;
 begin
   Result := '';
 end;
@@ -891,16 +891,15 @@ function TUnknownMetaFiles.Version: string;
 
 class function TDBMetaFilesFactory.GetInstance(const DBDir: string):
   TDBMetaFiles;
-resourcestring
-  sBadDirError = 'Database directory "%s" does not exist';
 var
   VersionFile: string;
   VersionStr: string;
   Version: TVersionNumber;
   DBPath: string;
 begin
   if not TDirectory.Exists(ExcludeTrailingPathDelimiter(DBDir)) then
-    raise EDBMetaData.CreateFmt(sBadDirError, [DBDir]);
+    // Database is not installed
+    Exit(TUnknownOrMissingMetaFiles.Create(DBDir));
 
   DBPath := IncludeTrailingPathDelimiter(DBDir);
 
@@ -917,7 +916,7 @@ class function TDBMetaFilesFactory.GetInstance(const DBDir: string):
   begin
     VersionStr := TFileIO.ReadAllText(VersionFile, TEncoding.UTF8, True);
     if not TVersionNumber.TryStrToVersionNumber(VersionStr, Version) then
-      Result := TUnknownMetaFiles.Create(DBDir)
+      Result := TUnknownOrMissingMetaFiles.Create(DBDir)
     else if Version.V1 = 2 then
       Result := TV2DBMetaFiles.Create(DBDir)
     else
@@ -929,7 +928,7 @@ class function TDBMetaFilesFactory.GetInstance(const DBDir: string):
       and TFile.Exists(DBPath + TDBMetaFileNames.TestersV1, False) then
       Result := TV1DBMetaFiles.Create(DBDir)
     else
-      Result := TUnknownMetaFiles.Create(DBDir);
+      Result := TUnknownOrMissingMetaFiles.Create(DBDir);
   end;
 end;
 

Src/FmCodeImportDlg.dfm

@@ -9,15 +9,11 @@ inherited CodeImportDlg: TCodeImportDlg
     ExplicitHeight = 321
     inherited pcWizard: TPageControl
       Height = 288
-      ActivePage = tsFile
+      ActivePage = tsInfo
       ExplicitHeight = 288
       object tsInfo: TTabSheet
         Caption = 'tsInfo'
         TabVisible = False
-        ExplicitLeft = 0
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         object lblIntro: TLabel
           Left = 0
           Top = 8
@@ -98,9 +94,9 @@ inherited CodeImportDlg: TCodeImportDlg
           Height = 40
           AutoSize = False
           Caption = 
-            'The imported functions are listed below. Select, deselect and re' +
-            'name as required then click the "Update" button to update the da' +
-            'tabase. Use "Cancel" to abandon the import.'
+            'The functions to be imported are listed below. Select, deselect ' +
+            'and rename as required then click the "Update" button to update ' +
+            'the database. Use "Cancel" to abandon the import.'
           WordWrap = True
         end
         object lvImports: TListView
@@ -153,10 +149,6 @@ 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/FmDBUpdateDlg.dfm

@@ -3,6 +3,8 @@ inherited DBUpdateDlg: TDBUpdateDlg
   Top = 0
   Caption = 'Install or Update DelphiDabbler Snippets Database'
   Position = poDesigned
+  ExplicitWidth = 565
+  ExplicitHeight = 436
   PixelsPerInch = 96
   TextHeight = 13
   inherited pnlBody: TPanel
@@ -14,15 +16,11 @@ inherited DBUpdateDlg: TDBUpdateDlg
     end
     inherited pcWizard: TPageControl
       Width = 409
-      ActivePage = tsFinish
+      ActivePage = tsFolder
       ExplicitWidth = 409
       object tsIntro: TTabSheet
         Caption = 'tsIntro'
         TabVisible = False
-        ExplicitLeft = 0
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         inline frmIntro: THTMLTpltDlgFrame
           Left = 0
           Top = 0
@@ -52,10 +50,6 @@ inherited DBUpdateDlg: TDBUpdateDlg
         Caption = 'tsFolder'
         ImageIndex = 1
         TabVisible = False
-        ExplicitLeft = 0
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         object lblFolder: TLabel
           Left = 0
           Top = 8
@@ -69,9 +63,9 @@ inherited DBUpdateDlg: TDBUpdateDlg
         object lblFolderPageInfo: TLabel
           Left = 0
           Top = 72
-          Width = 246
+          Width = 220
           Height = 13
-          Caption = 'Click the Next button to update the local database.'
+          Caption = 'Click the Next button when ready to proceed.'
         end
         object edPath: TEdit
           Left = 0
@@ -99,10 +93,6 @@ inherited DBUpdateDlg: TDBUpdateDlg
         Caption = 'tsLoad'
         ImageIndex = 2
         TabVisible = False
-        ExplicitLeft = 0
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         inline frmLoad: TFixedHTMLDlgFrame
           Left = 0
           Top = 0
@@ -126,10 +116,6 @@ inherited DBUpdateDlg: TDBUpdateDlg
         Caption = 'tsFinish'
         ImageIndex = 3
         TabVisible = False
-        ExplicitLeft = 0
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         inline frmFinish: TFixedHTMLDlgFrame
           Left = 0
           Top = 0
@@ -166,9 +152,6 @@ inherited DBUpdateDlg: TDBUpdateDlg
       end
     end
   end
-  inherited btnHelp: TButton
-    Visible = False
-  end
   object alMain: TActionList
     Left = 448
     Top = 208

Src/FmMain.dfm

@@ -166,21 +166,8 @@ inherited MainForm: TMainForm
       ImageIndex = 12
       Style = tbsSeparator
     end
-    object tbUpdateDbase: TToolButton
-      Left = 423
-      Top = 0
-      Action = actUpdateDbase
-    end
-    object tbSpacer4: TToolButton
-      Left = 446
-      Top = 0
-      Width = 8
-      Caption = 'tbSpacer4'
-      ImageIndex = 12
-      Style = tbsSeparator
-    end
     object tbHelpContents: TToolButton
-      Left = 454
+      Left = 423
       Top = 0
       Action = actHelpContents
     end
@@ -323,7 +310,7 @@ inherited MainForm: TMainForm
       Caption = 'Save Annotated Source...'
       Hint = 
         'Save annotated source code|Save the annotated source code of the' +
-        ' selected snippet or category to a file'
+        ' selected routine or category to a file'
       ImageIndex = 18
       ShortCut = 24654
       OnExecute = actSaveSnippetExecute
@@ -354,8 +341,8 @@ inherited MainForm: TMainForm
       Category = 'File'
       Caption = 'Save Unit...'
       Hint = 
-        'Save unit|Generate and save a Pascal unit containing the snippet' +
-        's in the current selection'
+        'Save unit|Generate and save a Pascal unit containing valid snipp' +
+        'ets in the current selection'
       ImageIndex = 14
       ShortCut = 16469
       OnExecute = actSaveUnitExecute
@@ -450,7 +437,7 @@ inherited MainForm: TMainForm
       Caption = 'Copy Annotated Source'
       Hint = 
         'Copy annotated source code|Copy the annotated source code of the' +
-        ' selected snippet or category to the clipboard'
+        ' selected routine or category to the clipboard'
       ShortCut = 16462
       OnExecute = actCopySnippetExecute
       OnUpdate = actCopySnippetUpdate
@@ -495,7 +482,7 @@ inherited MainForm: TMainForm
     object actHelpQuickStart: TAction
       Category = 'Help'
       Caption = 'QuickStart Guide'
-      Hint = 'QuickStart guide|Display the QuickStart help page'
+      Hint = 'QuickStart guide|Display the QuickStart help topic'
       OnExecute = actHelpQuickStartExecute
     end
     object actCompilers: TAction
@@ -531,7 +518,7 @@ inherited MainForm: TMainForm
     object actLicense: TAction
       Category = 'Help'
       Caption = 'License'
-      Hint = 'View license|View the end user license agreement'
+      Hint = 'View license|View a summary of the end user license agreement'
       ImageIndex = 35
       OnExecute = actLicenseExecute
     end
@@ -695,7 +682,7 @@ inherited MainForm: TMainForm
       Caption = 'Dependencies...'
       Hint = 
         'View dependencies|Display the names of snippets that depend on, ' +
-        'or are required, by the selected snippet'
+        'or are required by, the selected snippet'
       ImageIndex = 31
       ShortCut = 16452
       OnExecute = actViewDependenciesExecute
@@ -794,12 +781,12 @@ inherited MainForm: TMainForm
       Caption = 'FAQs'
       Hint = 
         'FAQs|Display CodeSnip'#39's online Frequently Asked Questions in the' +
-        ' default browser'
+        ' default web browser'
       ImageIndex = 6
     end
     object actDuplicateSnippet: TAction
       Category = 'Snippets'
-      Caption = 'Duplicate Snippet'
+      Caption = 'Duplicate Snippet...'
       Hint = 
         'Duplicate snippet|Duplicate the selected snippet and add it to t' +
         'he user-defined database'
@@ -812,8 +799,8 @@ inherited MainForm: TMainForm
       Category = 'File'
       Caption = 'Save Selection...'
       Hint = 
-        'Save current selection|Save information about the current snippe' +
-        't selection to a file'
+        'Save current selection|Save information about the currently sele' +
+        'cted snippets to a file'
       ShortCut = 41043
       OnExecute = actSaveSelectionExecute
       OnUpdate = actSaveSelectionUpdate
@@ -833,7 +820,7 @@ inherited MainForm: TMainForm
       Caption = 'Close All Other Tabs'
       Hint = 
         'Close all other tabs|Close all tabs in the Details pane except f' +
-        'or the current tab'
+        'or the current one'
       ShortCut = 24691
       OnExecute = actCloseUnselectedDetailsTabsExecute
       OnUpdate = actCloseDetailsTabsUpdate
@@ -874,7 +861,7 @@ inherited MainForm: TMainForm
       Caption = 'Import Snippets From SWAG...'
       Hint = 
         'Import snippets from SWAG|Import one or more snippets into the u' +
-        'ser database from the online SWAG database'
+        'ser database from the SWAG database'
       OnExecute = actSWAGImportExecute
     end
     object actBlog: TBrowseURL

Src/FmMain.pas

@@ -233,13 +233,11 @@   TMainForm = class(THelpAwareForm)
     tbSelectSnippets: TToolButton;
     tbSpacer1: TToolButton;
     tbSpacer3: TToolButton;
-    tbSpacer4: TToolButton;
     tbSpacer5: TToolButton;
     tbSpacer6: TToolButton;
     tbSpacer7: TToolButton;
     tbSpacer8: TToolButton;
     tbTestCompile: TToolButton;
-    tbUpdateDbase: TToolButton;
     actBlog: TBrowseURL;
     miBlog: TMenuItem;
     ///  <summary>Displays About Box.</summary>

Src/FmSWAGImportDlg.dfm

@@ -19,7 +19,7 @@ inherited SWAGImportDlg: TSWAGImportDlg
     inherited pcWizard: TPageControl
       Width = 671
       Height = 456
-      ActivePage = tsIntro
+      ActivePage = tsUpdate
       ExplicitWidth = 671
       ExplicitHeight = 456
       object tsIntro: TTabSheet
@@ -33,10 +33,10 @@ inherited SWAGImportDlg: TSWAGImportDlg
           Align = alTop
           TabOrder = 0
           TabStop = True
-          ExplicitLeft = 8
-          ExplicitTop = 8
+          ExplicitWidth = 663
           inherited pnlBrowser: TPanel
             Width = 663
+            ExplicitWidth = 663
             inherited wbBrowser: TWebBrowser
               Width = 663
               ExplicitWidth = 320
@@ -178,10 +178,10 @@ inherited SWAGImportDlg: TSWAGImportDlg
           AutoSize = False
           Caption = 
             'You have chosen to import the following SWAG snippets. They will' +
-            ' be imported with the given Display Names and Unique IDs. You ca' +
-            'n change these if you wish using the Snippets Editor. To make ch' +
-            'anges go back to the previous page. When you are ready to import' +
-            ' the snippets click "Import". This step can'#39't be undone.'
+            ' 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.'
           WordWrap = True
         end
         object lvImports: TListView