Changeset 20 for trunk/Forms/UFormMain.pas

Timestamp:

May 4, 2016, 6:50:29 PM (9 years ago)

Author:

chronos

Message:

• Added: Concept of ImportFormats and ImportSources to store information about multiple import sources.

File:

• trunk/Forms/UFormMain.pas (modified) (8 diffs)

trunk/Forms/UFormMain.pas

@@ -16 +16 @@
 
   TFormMain = class(TForm)
+    AShowImportSources: TAction;
     AShowAcronyms: TAction;
     AShowCategories: TAction;
@@ -50 +51 @@
     MenuItem21: TMenuItem;
     MenuItem22: TMenuItem;
+    MenuItem4: TMenuItem;
     MenuItemOpenRecent: TMenuItem;
     MenuItem2: TMenuItem;
@@ -71 +73 @@
     procedure AShowCategoriesExecute(Sender: TObject);
     procedure AShowExecute(Sender: TObject);
+    procedure AShowImportSourcesExecute(Sender: TObject);
     procedure CheckBoxExactMathChange(Sender: TObject);
     procedure EditSearchChange(Sender: TObject);
@@ -111 +114 @@
 
 uses
-  UFormImport, UFormAcronym, UFormSettings, UFormCategories, UFormAcronyms;
+  UFormImport, UFormAcronym, UFormSettings, UFormCategories, UFormAcronyms,
+  UFormImportSource, UFormImportSources;
 
 resourcestring
@@ -155 +159 @@
 var
   ModalResult: TModalResult;
-begin
-  if Assigned(AcronymDb) and AcronymDb.Modified then begin
-    ModalResult := MessageDlg(SAppExit, SAppExitQuery,
-      mtConfirmation, [mbYes, mbNo, mbCancel], 0);
-    if ModalResult = mrYes then begin
-      AFileSave.Execute;
-      FreeAndNil(AcronymDb);
-      UpdateAcronymsList;
-      UpdateInterface;
-      ProjectClosed := True;
-    end
-    else if ModalResult = mrNo then begin
-      FreeAndNil(AcronymDb);
-      UpdateAcronymsList;
-      UpdateInterface;
-      ProjectClosed := True;
-    end else ProjectClosed := False;
-  end else ProjectClosed := True;
+  DoClose: Boolean;
+begin
+  DoClose := False;
+  if Assigned(AcronymDb) then begin
+    if AcronymDb.Modified then begin
+       ModalResult := MessageDlg(SAppExit, SAppExitQuery,
+       mtConfirmation, [mbYes, mbNo, mbCancel], 0);
+      if ModalResult = mrYes then begin
+        AFileSave.Execute;
+        DoClose := True;
+      end
+      else if ModalResult = mrNo then begin
+        DoClose := True;
+      end else ProjectClosed := False;
+    end else DoClose := True;
+  end;
+  if DoClose then begin
+    FreeAndNil(AcronymDb);
+    UpdateAcronymsList;
+    UpdateInterface;
+    ProjectClosed := True;
+  end;
 end;
 
@@ -245 +253 @@
 procedure TFormMain.AShowCategoriesExecute(Sender: TObject);
 begin
+  FormCategories.Categories := AcronymDb.Categories;
   FormCategories.ShowModal;
   UpdateAcronymsList;
@@ -253 +262 @@
 begin
   Show;
+end;
+
+procedure TFormMain.AShowImportSourcesExecute(Sender: TObject);
+begin
+  FormImportSources.ImportSources := AcronymDb.ImportSources;
+  FormImportSources.ShowModal;
+  UpdateInterface;
 end;
 
@@ -418 +434 @@
   AImport.Enabled := Assigned(AcronymDb);
   AShowCategories.Enabled := Assigned(AcronymDb);
+  AShowAcronyms.Enabled := Assigned(AcronymDb);
+  AShowImportSources.Enabled := Assigned(AcronymDb);
 
   Title := Application.Title;