Merge branch 'feature/issue#45-move-database-bug' into develop

Author: delphidabbler

Src/DB.USnippet.pas

@@ -3,7 +3,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at https://mozilla.org/MPL/2.0/
  *
- * Copyright (C) 2011-2021, Peter Johnson (gravatar.com/delphidabbler).
+ * Copyright (C) 2011-2022, Peter Johnson (gravatar.com/delphidabbler).
  *
  * Objects, records etc that encapsulate a code snippet, its data and lists of
  * code snippets.
@@ -328,10 +328,17 @@   TSnippetList = class(TObject)
       {Counts number of snippets in list.
         @return Number of snippets in list.
       }
-    function IsEmpty: Boolean; inline;
+    function IsEmpty: Boolean; overload; inline;
       {Checks if list is empty.
         @return True if list is empty, False otehrwise.
       }
+    function IsEmpty(const UserDefined: Boolean): Boolean; overload; inline;
+      {Checks if sub-set of list from either from or not from use defined
+      database is empty.
+        @param UserDefined [in] Flags whether to check for snippets in user
+          database (True) or in main database (False).
+        @return True if required subset is empty, False if not empty.
+      }
     property Items[Idx: Integer]: TSnippet read GetItem; default;
       {List of snippets}
   end;
@@ -764,6 +771,11 @@ function TSnippetList.IsEmpty: Boolean;
   Result := Count = 0;
 end;
 
+function TSnippetList.IsEmpty(const UserDefined: Boolean): Boolean;
+begin
+  Result := Count(UserDefined) = 0;
+end;
+
 function TSnippetList.IsEqual(const AList: TSnippetList): Boolean;
   {Checks if this list contains same snippets as another list.
     @param AList [in] List of snippets to compare.

Src/FmMain.dfm

@@ -619,6 +619,7 @@ inherited MainForm: TMainForm
       Hint = 'Backup user database|Backup the user-defined snippet database'
       ImageIndex = 33
       OnExecute = actBackupDatabaseExecute
+      OnUpdate = ActNonEmptyUserDBUpdate
     end
     object actRestoreDatabase: TAction
       Category = 'Database'
@@ -849,6 +850,7 @@ inherited MainForm: TMainForm
         'Move user database|Move the user-defined snippet database to a n' +
         'ew directory'
       OnExecute = actMoveUserDatabaseExecute
+      OnUpdate = ActNonEmptyUserDBUpdate
     end
     object actSWAGImport: TAction
       Category = 'Snippets'
@@ -873,6 +875,7 @@ inherited MainForm: TMainForm
         'Delete User Database|Deletes the user'#39's snippets database - USE ' +
         'WITH CAUTION'
       OnExecute = actDeleteUserDatabaseExecute
+      OnUpdate = ActNonEmptyUserDBUpdate
     end
   end
   object mnuMain: TMainMenu

Src/FmMain.pas

@@ -495,6 +495,7 @@   TMainForm = class(THelpAwareForm)
     ///  position is permitted and blocks the move if not.</summary>
     procedure splitVertCanResize(Sender: TObject; var NewSize: Integer;
       var Accept: Boolean);
+    procedure ActNonEmptyUserDBUpdate(Sender: TObject);
   strict private
     var
       ///  <summary>Object that notifies user-initiated events by triggering
@@ -621,7 +622,10 @@ procedure TMainForm.actAddSnippetExecute(Sender: TObject);
 
 procedure TMainForm.actBackupDatabaseExecute(Sender: TObject);
 begin
+  if (Database as IDatabaseEdit).Updated then
+    TUserDBMgr.Save(Self);
   TUserDBMgr.BackupDatabase(Self);
+  fStatusBarMgr.Update;
 end;
 
 procedure TMainForm.actBugReportExecute(Sender: TObject);
@@ -721,8 +725,13 @@ procedure TMainForm.actDeleteSnippetExecute(Sender: TObject);
 
 procedure TMainForm.actDeleteUserDatabaseExecute(Sender: TObject);
 begin
+  if (Database as IDatabaseEdit).Updated then
+    TUserDBMgr.Save(Self);
   if TUserDBMgr.DeleteDatabase then
+  begin
     ReloadDatabase;
+    fStatusBarMgr.Update;
+  end;
 end;
 
 procedure TMainForm.actDuplicateSnippetExecute(Sender: TObject);
@@ -902,6 +911,8 @@ procedure TMainForm.actLoadSelectionExecute(Sender: TObject);
 
 procedure TMainForm.actMoveUserDatabaseExecute(Sender: TObject);
 begin
+  if (Database as IDatabaseEdit).Updated then
+    TUserDBMgr.Save(Self);
   TUserDBMgr.MoveDatabase;
 end;
 
@@ -920,6 +931,11 @@ procedure TMainForm.ActNonEmptyDBUpdate(Sender: TObject);
   (Sender as TAction).Enabled := not Database.Snippets.IsEmpty;
 end;
 
+procedure TMainForm.ActNonEmptyUserDBUpdate(Sender: TObject);
+begin
+  (Sender as TAction).Enabled := not Database.Snippets.IsEmpty(True);
+end;
+
 procedure TMainForm.ActOverviewTabExecute(Sender: TObject);
 begin
   // Action's Tag property specifies index of tab being selected
@@ -979,7 +995,10 @@ procedure TMainForm.actRenameCategoryUpdate(Sender: TObject);
 procedure TMainForm.actRestoreDatabaseExecute(Sender: TObject);
 begin
   if TUserDBMgr.RestoreDatabase(Self) then
+  begin
     ReloadDatabase;
+    fStatusBarMgr.Update;
+  end;
 end;
 
 procedure TMainForm.actSaveDatabaseExecute(Sender: TObject);