Changeset 15 for trunk/UFormMain.pas

Timestamp:

Apr 29, 2016, 12:09:44 AM (9 years ago)

Author:

chronos

Message:

• Modified: Now project file have XML structure. Loading and saving old format is still supported using .csv extension.
• Fixed: Question before closing modified unsaved project.

File:

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

trunk/UFormMain.pas

@@ -97 +97 @@
     FoundAcronyms: TAcronymMeanings;
     RegistryContext: TRegistryContext;
+    ProjectClosed: Boolean;
     procedure OpenRecentClick(Sender: TObject);
     procedure UpdateAcronymsList;
@@ -146 +147 @@
 procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
-  AFileClose.Execute;
   PersistentForm1.Save(Self);
   SaveConfig;
@@ -152 +152 @@
 
 procedure TFormMain.FormCloseQuery(Sender: TObject; var CanClose: boolean);
+begin
+  AFileClose.Execute;
+  CanClose := ProjectClosed;
+end;
+
+procedure TFormMain.AExitExecute(Sender: TObject);
+begin
+  Close;
+end;
+
+procedure TFormMain.AFileCloseExecute(Sender: TObject);
 var
   ModalResult: TModalResult;
@@ -160 +171 @@
     if ModalResult = mrYes then begin
       AFileSave.Execute;
-      CanClose := True;
+      FreeAndNil(AcronymDb);
+      UpdateAcronymsList;
+      UpdateInterface;
+      ProjectClosed := True;
     end
     else if ModalResult = mrNo then begin
-      CanClose := True;
-      AcronymDb.Modified := False;
-    end else CanClose := False;
-  end;
-end;
-
-procedure TFormMain.AExitExecute(Sender: TObject);
-begin
-  Close;
-end;
-
-procedure TFormMain.AFileCloseExecute(Sender: TObject);
-begin
-  if Assigned(AcronymDb) then begin
-    if AcronymDb.Modified then AFileSave.Execute;
-    FreeAndNil(AcronymDb);
+      FreeAndNil(AcronymDb);
+      UpdateAcronymsList;
+      UpdateInterface;
+      ProjectClosed := True;
+    end else ProjectClosed := False;
+  end else ProjectClosed := True;
+end;
+
+procedure TFormMain.AFileNewExecute(Sender: TObject);
+begin
+  AFileClose.Execute;
+  if ProjectClosed  then begin
+    AcronymDb := TAcronymDb.Create;
+    AcronymDb.FileName := DefaultFileName;
+    AcronymDb.Acronyms.Clear;
     UpdateAcronymsList;
     UpdateInterface;
   end;
-end;
-
-procedure TFormMain.AFileNewExecute(Sender: TObject);
-begin
-  AFileClose.Execute;
-  AcronymDb := TAcronymDb.Create;
-  AcronymDb.FileName := DefaultFileName;
-  AcronymDb.Acronyms.Clear;
-  UpdateAcronymsList;
-  UpdateInterface;
 end;
 
@@ -201 +204 @@
   if OpenDialog1.Execute then begin
     AFileClose.Execute;
-    AFileNew.Execute;
-    AcronymDb.LoadFromFile(OpenDialog1.FileName);
-    LastOpenedList1.AddItem(OpenDialog1.FileName);
-    UpdateAcronymsList;
-    UpdateInterface;
+    if ProjectClosed then begin
+      AFileNew.Execute;
+      AcronymDb.LoadFromFile(OpenDialog1.FileName);
+      LastOpenedList1.AddItem(OpenDialog1.FileName);
+      UpdateAcronymsList;
+      UpdateInterface;
+    end;
   end;
 end;
@@ -333 +338 @@
 begin
   FormCategories.ShowModal;
+  UpdateAcronymsList;
+  UpdateInterface;
 end;
 
@@ -424 +431 @@
 begin
   AFileClose.Execute;
-  AFileNew.Execute;
-  AcronymDb.LoadFromFile(TMenuItem(Sender).Caption);
-  LastOpenedList1.AddItem(TMenuItem(Sender).Caption);
-  UpdateAcronymsList;
-  UpdateInterface;
+  if ProjectClosed then begin
+    AFileNew.Execute;
+    AcronymDb.LoadFromFile(TMenuItem(Sender).Caption);
+    LastOpenedList1.AddItem(TMenuItem(Sender).Caption);
+    UpdateAcronymsList;
+    UpdateInterface;
+  end;
 end;