Changeset 20 for trunk/Forms

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.

Location:

trunk/Forms

Files:

• UFormCategories.lfm (modified) (1 diff)
• UFormCategories.pas (modified) (3 diffs)
• UFormImportSource.lfm (added)
• UFormImportSource.lrt (added)
• UFormImportSource.pas (added)
• UFormImportSources.lfm (added)
• UFormImportSources.lrt (added)
• UFormImportSources.pas (added)
• UFormMain.lfm (modified) (3 diffs)
• UFormMain.lrt (modified) (1 diff)
• UFormMain.pas (modified) (8 diffs)

trunk/Forms/UFormCategories.lfm

@@ -10 +10 @@
   LCLVersion = '1.6.0.4'
   object ListViewCategories: TListView
-    Left = 16
+    Left = 9
     Height = 432
     Top = 8
-    Width = 760
+    Width = 767
     Anchors = [akTop, akLeft, akRight, akBottom]
     Columns = <    

trunk/Forms/UFormCategories.pas

@@ -36 +36 @@
     { private declarations }
   public
+    Categories: TAcronymCategories;
     procedure UpdateList;
     procedure UpdateInterface;
@@ -53 +54 @@
   SCategory = 'Category';
   SCategoryQuery = 'Enter name of category';
-  SRemoveCategory = 'Remove category';
-  SRemoveCategoryQuery = 'Do you really want to remove category?';
+  SRemoveCategory = 'Remove categories';
+  SRemoveCategoryQuery = 'Do you really want to remove selected categories?';
   SCategoryAlreadyExists = 'Category %s already exists!';
 
@@ -95 +96 @@
 
 procedure TFormCategories.ARemoveExecute(Sender: TObject);
+var
+  I: Integer;
 begin
   if Assigned(ListViewCategories.Selected) then begin
     if MessageDlg(SRemoveCategory, SRemoveCategoryQuery,
     TMsgDlgType.mtConfirmation, [mbCancel, mbOk], 0) = mrOk then begin
-      FormMain.AcronymDb.Categories.Remove(ListViewCategories.Selected.Data);
+      for I := ListViewCategories.Items.Count - 1 downto 0 do
+      if ListViewCategories.Items[I].Selected then
+        Categories.Remove(ListViewCategories.Items[I].Data);
       UpdateList;
     end;

trunk/Forms/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 393
+  Left = 427
   Height = 446
-  Top = 405
+  Top = 423
   Width = 631
   Caption = 'Acronym Decoder'
@@ -4416 +4416 @@
       OnExecute = AShowAcronymsExecute
     end
+    object AShowImportSources: TAction
+      Caption = 'Import sources'
+      OnExecute = AShowImportSourcesExecute
+    end
   end
   object PersistentForm1: TPersistentForm
@@ -4462 +4466 @@
         Action = AShowCategories
       end
+      object MenuItem4: TMenuItem
+        Action = AShowImportSources
+      end
     end
     object MenuItem16: TMenuItem

trunk/Forms/UFormMain.lrt

@@ -15 +15 @@
 TFORMMAIN.ASHOWCATEGORIES.CAPTION=Categories
 TFORMMAIN.ASHOWACRONYMS.CAPTION=Acronyms
+TFORMMAIN.ASHOWIMPORTSOURCES.CAPTION=Import sources
 TFORMMAIN.MENUITEM8.CAPTION=File
 TFORMMAIN.MENUITEMOPENRECENT.CAPTION=Open recent

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;