Changeset 90 for trunk/Forms

Timestamp:

Aug 10, 2016, 11:24:45 PM (8 years ago)

Author:

chronos

Message:

• Added: Acronym export action in menu Tools - Export. Supported formats are CSV and MediaWiki list/table.

Location:

trunk/Forms

Files:

• UFormExport.lfm (added)
• UFormExport.lrt (added)
• UFormExport.pas (added)
• UFormImport.lfm (modified) (4 diffs)
• UFormImport.lrt (modified) (1 diff)
• UFormImport.pas (modified) (3 diffs)
• UFormMain.lfm (modified) (11 diffs)
• UFormMain.lrt (modified) (3 diffs)
• UFormMain.pas (modified) (10 diffs)

trunk/Forms/UFormImport.lfm

@@ -9 +9 @@
   Position = poScreenCenter
   LCLVersion = '1.6.0.4'
-  object ButtonImport: TButton
+  object ButtonProcess: TButton
     Left = 16
     Height = 25
@@ -15 +15 @@
     Width = 107
     Caption = 'Process'
-    OnClick = ButtonImportClick
+    OnClick = ButtonProcessClick
     TabOrder = 0
   end
@@ -29 +29 @@
   object ComboBoxDataFormat: TComboBox
     Left = 264
-    Height = 28
+    Height = 34
     Top = 5
     Width = 140
-    ItemHeight = 20
+    ItemHeight = 0
     ItemIndex = 0
     Items.Strings = (
@@ -44 +44 @@
   object Label1: TLabel
     Left = 153
-    Height = 20
+    Height = 24
     Top = 9
-    Width = 84
+    Width = 108
     Caption = 'Data format:'
     ParentColor = False

trunk/Forms/UFormImport.lrt

@@ -1 +1 @@
 TFORMIMPORT.CAPTION=Import
-TFORMIMPORT.BUTTONIMPORT.CAPTION=Process
+TFORMIMPORT.BUTTONPROCESS.CAPTION=Process
 TFORMIMPORT.COMBOBOXDATAFORMAT.TEXT=CSV
 TFORMIMPORT.LABEL1.CAPTION=Data format:

trunk/Forms/UFormImport.pas

@@ -15 +15 @@
   TFormImport = class(TForm)
     ButtonLoadFromFile: TButton;
-    ButtonImport: TButton;
+    ButtonProcess: TButton;
     ComboBoxDataFormat: TComboBox;
     Label1: TLabel;
     Memo1: TMemo;
     OpenDialog1: TOpenDialog;
-    procedure ButtonImportClick(Sender: TObject);
+    procedure ButtonProcessClick(Sender: TObject);
     procedure ButtonLoadFromFileClick(Sender: TObject);
   private
@@ -45 +45 @@
 { TFormImport }
 
-procedure TFormImport.ButtonImportClick(Sender: TObject);
+procedure TFormImport.ButtonProcessClick(Sender: TObject);
 begin
   if ComboBoxDataFormat.ItemIndex = 0 then ImportCSV;
@@ -53 +53 @@
 procedure TFormImport.ButtonLoadFromFileClick(Sender: TObject);
 begin
+  if ComboBoxDataFormat.ItemIndex = 0 then OpenDialog1.DefaultExt := '.csv';
+  if ComboBoxDataFormat.ItemIndex = 1 then OpenDialog1.DefaultExt := '.txt';
   if OpenDialog1.Execute then
     Memo1.Lines.LoadFromFile(OpenDialog1.FileName);

trunk/Forms/UFormMain.lfm

@@ -3 +3 @@
   Height = 446
   Top = 342
-  Width = 631
+  Width = 782
   Caption = 'Acronym Decoder'
-  ClientHeight = 421
-  ClientWidth = 631
+  ClientHeight = 414
+  ClientWidth = 782
   Menu = MainMenu1
   OnClose = FormClose
@@ -17 +17 @@
   object Panel1: TPanel
     Left = 0
-    Height = 395
+    Height = 388
     Top = 26
-    Width = 631
+    Width = 782
     Align = alClient
     BevelOuter = bvNone
-    ClientHeight = 395
-    ClientWidth = 631
+    ClientHeight = 388
+    ClientWidth = 782
     TabOrder = 1
     object CheckBoxExactMath: TCheckBox
       Left = 8
-      Height = 24
+      Height = 28
       Top = 3
-      Width = 104
+      Width = 129
       Caption = 'Exact match'
       OnChange = CheckBoxExactMathChange
@@ -38 +38 @@
       Height = 30
       Top = 32
-      Width = 616
+      Width = 767
       OnChange = ListViewFilter1Change
       Anchors = [akTop, akLeft, akRight]
@@ -44 +44 @@
     object ListViewAcronyms: TListView
       Left = 8
-      Height = 323
+      Height = 316
       Top = 64
-      Width = 616
+      Width = 767
       Anchors = [akTop, akLeft, akRight, akBottom]
       Columns = <      
@@ -54 +54 @@
         end      
         item
-          Caption = 'Description'
+          Caption = 'Meaning'
           Width = 300
         end      
         item
           Caption = 'Categories'
-          Width = 300
+          Width = 347
         end>
       OwnerData = True
@@ -75 +75 @@
     Height = 26
     Top = 0
-    Width = 631
+    Width = 782
     Caption = 'ToolBar1'
     Images = ImageList1
@@ -699 +699 @@
     end
     object MenuItem3: TMenuItem
-      Action = AManualImport
+      Action = AImport
     end
     object MenuItem19: TMenuItem
@@ -793 +793 @@
       OnExecute = AShowExecute
     end
-    object AManualImport: TAction
-      Caption = 'Manual import'
-      OnExecute = AManualImportExecute
+    object AImport: TAction
+      Caption = 'Import'
+      OnExecute = AImportExecute
     end
     object AFileOpen: TAction
@@ -866 +866 @@
       OnExecute = AProcessImportsExecute
       ShortCut = 119
+    end
+    object AExport: TAction
+      Caption = 'Export'
+      OnExecute = AExportExecute
     end
   end
@@ -1290 +1294 @@
       Caption = 'Tools'
       object MenuItem17: TMenuItem
-        Action = AManualImport
+        Action = AImport
+      end
+      object MenuItem25: TMenuItem
+        Action = AExport
       end
       object MenuItem23: TMenuItem
@@ -2002 +2009 @@
   end
   object PopupMenuOpenRecent: TPopupMenu
-    left = 379
-    top = 136
+    left = 672
+    top = 144
   end
 end

trunk/Forms/UFormMain.lrt

@@ -2 +2 @@
 TFORMMAIN.CHECKBOXEXACTMATH.CAPTION=Exact match
 TFORMMAIN.LISTVIEWACRONYMS.COLUMNS[0].CAPTION=Name
-TFORMMAIN.LISTVIEWACRONYMS.COLUMNS[1].CAPTION=Description
+TFORMMAIN.LISTVIEWACRONYMS.COLUMNS[1].CAPTION=Meaning
 TFORMMAIN.LISTVIEWACRONYMS.COLUMNS[2].CAPTION=Categories
 TFORMMAIN.TOOLBAR1.CAPTION=ToolBar1
@@ -9 +9 @@
 TFORMMAIN.AEXIT.CAPTION=Exit
 TFORMMAIN.ASHOW.CAPTION=Show
-TFORMMAIN.AMANUALIMPORT.CAPTION=Manual import
+TFORMMAIN.AIMPORT.CAPTION=Import
 TFORMMAIN.AFILEOPEN.CAPTION=Open
 TFORMMAIN.AFILENEW.CAPTION=New
@@ -22 +22 @@
 TFORMMAIN.ASHOWIMPORTFORMATS.CAPTION=Import formats
 TFORMMAIN.APROCESSIMPORTS.CAPTION=Process imports
+TFORMMAIN.AEXPORT.CAPTION=Export
 TFORMMAIN.MENUITEM8.CAPTION=File
 TFORMMAIN.MENUITEMOPENRECENT.CAPTION=Open recent

trunk/Forms/UFormMain.pas

@@ -16 +16 @@
 
   TFormMain = class(TForm)
+    AExport: TAction;
     AProcessImports: TAction;
     AShowImportFormats: TAction;
@@ -28 +29 @@
     AFileNew: TAction;
     AFileOpen: TAction;
-    AManualImport: TAction;
+    AImport: TAction;
     AShow: TAction;
     AExit: TAction;
@@ -57 +58 @@
     MenuItem23: TMenuItem;
     MenuItem24: TMenuItem;
+    MenuItem25: TMenuItem;
     MenuItemToolbar: TMenuItem;
     MenuItem4: TMenuItem;
@@ -88 +90 @@
     TrayIcon1: TTrayIcon;
     procedure AExitExecute(Sender: TObject);
+    procedure AExportExecute(Sender: TObject);
     procedure AFileCloseExecute(Sender: TObject);
     procedure AFileNewExecute(Sender: TObject);
@@ -93 +96 @@
     procedure AFileSaveAsExecute(Sender: TObject);
     procedure AFileSaveExecute(Sender: TObject);
-    procedure AManualImportExecute(Sender: TObject);
+    procedure AImportExecute(Sender: TObject);
     procedure AProcessImportsExecute(Sender: TObject);
     procedure ASettingsExecute(Sender: TObject);
@@ -150 +153 @@
 
 uses
-  UFormImport, UFormSettings, UFormCategories, UFormAcronyms,
+  UFormImport, UFormSettings, UFormCategories, UFormAcronyms, UFormExport,
   UFormImportSources, UFormAbout, UFormImportFormats, UCore;
 
@@ -199 +202 @@
 begin
   Close;
+end;
+
+procedure TFormMain.AExportExecute(Sender: TObject);
+begin
+  FormExport.ShowModal;
 end;
 
@@ -270 +278 @@
 end;
 
-procedure TFormMain.AManualImportExecute(Sender: TObject);
+procedure TFormMain.AImportExecute(Sender: TObject);
 begin
   FormImport.ShowModal;
@@ -421 +429 @@
     case Column of
       0: Result := CompareString(TAcronymMeaning(Item1).Acronym.Name, TAcronymMeaning(Item2).Acronym.Name);
-      1: Result := CompareString(TAcronymMeaning(Item1).Description, TAcronymMeaning(Item2).Description);
+      1: Result := CompareString(TAcronymMeaning(Item1).Name, TAcronymMeaning(Item2).Name);
       2: Result := CompareString(TAcronymMeaning(Item1).Categories.GetString, TAcronymMeaning(Item2).Categories.GetString);
     end;
@@ -543 +551 @@
   AFileSave.Enabled := Assigned(Core.AcronymDb) and Core.AcronymDb.Modified;
   AFileSaveAs.Enabled := Assigned(Core.AcronymDb);
-  AManualImport.Enabled := Assigned(Core.AcronymDb);
+  AImport.Enabled := Assigned(Core.AcronymDb);
+  AExport.Enabled := Assigned(Core.AcronymDb);
   AProcessImports.Enabled := Assigned(Core.AcronymDb);
   AShowCategories.Enabled := Assigned(Core.AcronymDb);