Changeset 8 for trunk/UFormMain.pas

Timestamp:

Apr 21, 2016, 1:12:45 PM (8 years ago)

Author:

chronos

Message:

• Added: Also allow to edit acronym detailed description.
• Added: Import from CSV file.

File:

• trunk/UFormMain.pas (modified) (5 diffs)

trunk/UFormMain.pas

@@ -136 +136 @@
     'Acronyms were modified. Do you want to save them to file before exit?',
       mtConfirmation, [mbYes, mbNo, mbCancel], 0);
-    if ModalResult = mrYes then AFileSave.Execute
-    else if ModalResult = mrNo then CanClose := True
-    else CanClose := False;
+    if ModalResult = mrYes then begin
+      AFileSave.Execute;
+      CanClose := True;
+    end
+    else if ModalResult = mrNo then begin
+      CanClose := True;
+      AcronymDb.Modified := False;
+    end else CanClose := False;
   end;
 end;
@@ -202 +207 @@
 var
   TempEntry: TAcronymEntry;
+  Meaning: TAcronymMeaning;
 begin
   if Assigned(ListViewAcronyms.Selected) then
@@ -208 +214 @@
     TempEntry.Name := Acronym.Name;
     TempEntry.Meaning := Name;
+    TempEntry.Description := Description;
     FormAcronym.Load(TempEntry);
     if FormAcronym.ShowModal = mrOk then begin
       FormAcronym.Save(TempEntry);
       if (TempEntry.Name <> Acronym.Name) or
-      (TempEntry.Meaning <> Name) then begin
+      (TempEntry.Meaning <> Name) or
+      (TempEntry.Description <> Description) then begin
         // TODO: Update item inplace if possible
         AcronymDb.RemoveAcronym(Acronym.Name, Name);
-        AcronymDb.AddAcronym(TempEntry.Name, TempEntry.Meaning);
+        Meaning := AcronymDb.AddAcronym(TempEntry.Name, TempEntry.Meaning);
+        Meaning.Description := TempEntry.Description;
         UpdateAcronymsList;
         UpdateInterface;
@@ -250 +259 @@
 var
   TempEntry: TAcronymEntry;
+  Meaning: TAcronymMeaning;
 begin
   TempEntry := TAcronymEntry.Create;
   TempEntry.Name := '';
   TempEntry.Meaning := '';
+  TempEntry.Description := '';
   FormAcronym.Load(TempEntry);
   if FormAcronym.ShowModal = mrOk then begin
     FormAcronym.Save(TempEntry);
-    AcronymDb.AddAcronym(TempEntry.Name, TempEntry.Meaning);
+    Meaning := AcronymDb.AddAcronym(TempEntry.Name, TempEntry.Meaning);
+    Meaning.Description := TempEntry.Description;
     UpdateAcronymsList;
     UpdateInterface;
@@ -267 +279 @@
   FormImport.ShowModal;
   UpdateAcronymsList;
+  UpdateInterface;
 end;