Changeset 56 for trunk

Timestamp:

Jul 26, 2016, 2:13:41 PM (8 years ago)

Author:

chronos

Message:

• Added: Show how many new acronyms were imported.

Location:

trunk

Files:

• Forms/UFormAbout.lfm (modified) (2 diffs)
• Forms/UFormAbout.lrt (modified) (1 diff)
• Forms/UFormImportSources.pas (modified) (1 diff)
• Forms/UFormMain.lfm (modified) (1 diff)
• Forms/UFormMain.pas (modified) (4 diffs)
• Languages/AcronymDecoder.cs.po (modified) (5 diffs)
• Languages/AcronymDecoder.po (modified) (2 diffs)
• UAcronym.pas (modified) (7 diffs)

trunk/Forms/UFormAbout.lfm

@@ -29 +29 @@
     Align = alTop
     BorderSpacing.Around = 20
-    Caption = 'Simple tool for quick search of meaning for various acronyms and abbreviations.'
+    Caption = 'Simple tool for quick searching of meaning for various acronyms and abbreviations.'
     ParentColor = False
     WordWrap = True
@@ -73 +73 @@
     EmailContact = 'robie@centrum.cz'
     AppName = 'Acronym Decoder'
-    ReleaseDate = 42565
+    ReleaseDate = 42577
     RegistryKey = '\Software\'
     RegistryRoot = rrKeyCurrentUser

trunk/Forms/UFormAbout.lrt

@@ -1 +1 @@
 TFORMABOUT.CAPTION=About
 TFORMABOUT.LABELAPPNAME.CAPTION=Acronym Decoder
-TFORMABOUT.LABELDESCRIPTION.CAPTION=Simple tool for quick search of meaning for various acronyms and abbreviations.
+TFORMABOUT.LABELDESCRIPTION.CAPTION=Simple tool for quick searching of meaning for various acronyms and abbreviations.
 TFORMABOUT.BUTTONCLOSE.CAPTION=Close
 TFORMABOUT.LABELCONTENT.CAPTION=   

trunk/Forms/UFormImportSources.pas

@@ -162 +162 @@
 begin
   if Assigned(ListView1.Selected) then begin
+    FormMain.AcronymDb.AddedCount := 0;
     JobProgressView1.AddJob(SProcessSelectedSource, ProcessImportJob);
     JobProgressView1.Start;
-    ShowMessage(Format(SAddedCount, [TImportSource(ListView1.Selected.Data).ItemCount]));
+    ShowMessage(Format(SAddedCount, [TImportSource(ListView1.Selected.Data).ItemCount, FormMain.AcronymDb.AddedCount]));
   end;
 end;

trunk/Forms/UFormMain.lfm

@@ -66 +66 @@
       ViewStyle = vsReport
       OnData = ListViewAcronymsData
+      OnResize = ListViewAcronymsResize
       OnSelectItem = ListViewAcronymsSelectItem
     end

trunk/Forms/UFormMain.pas

@@ -110 +110 @@
     procedure LastOpenedList1Change(Sender: TObject);
     procedure ListViewAcronymsData(Sender: TObject; Item: TListItem);
+    procedure ListViewAcronymsResize(Sender: TObject);
     procedure ListViewAcronymsSelectItem(Sender: TObject; Item: TListItem;
       Selected: Boolean);
@@ -140 +141 @@
 
 resourcestring
-  SAddedCount = 'Imported %d acronyms';
+  SAddedCount = 'Imported %d acronyms. Added %d new.';
   SProcessImportSources = 'Process import sources';
 
@@ -277 +278 @@
 begin
   ImportTotalItemCount := 0;
+  AcronymDb.AddedCount := 0;
   JobProgressView1.AddJob(SProcessImportSources, ProcessImportsJob);
   JobProgressView1.Start;
-  ShowMessage(Format(SAddedCount, [ImportTotalItemCount]));
+  ShowMessage(Format(SAddedCount, [ImportTotalItemCount, AcronymDb.AddedCount]));
   UpdateAcronymsList;
   UpdateInterface;
@@ -393 +395 @@
     Item.SubItems.Add(Categories.GetString);
   end;
+end;
+
+procedure TFormMain.ListViewAcronymsResize(Sender: TObject);
+begin
+  ListViewFilter1.UpdateFromListView(ListViewAcronyms);
 end;
 

trunk/Languages/AcronymDecoder.cs.po

@@ -5 +5 @@
 "POT-Creation-Date: \n"
 "PO-Revision-Date: \n"
-"Last-Translator: \n"
+"Last-Translator: Chronos <robie@centrum.cz>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -626 +626 @@
 msgstr "Popis"
 
+#: uacronym.sfilenotfound
+msgid "File %s not found"
+msgstr "Soubor %s nenalezen"
+
 #: uacronym.smeaning
 msgctxt "uacronym.smeaning"
@@ -781 +785 @@
 #: uformimportsources.sprocessselectedsource
 msgid "Process selected import source"
-msgstr ""
+msgstr "Zpracovat vybrané zdroje importu"
 
 #: uformimportsources.sremoveimportsource
@@ -794 +798 @@
 
 #: uformmain.saddedcount
-msgid "Imported %d acronyms"
-msgstr "Importováno %d zkratek"
+msgid "Imported %d acronyms. Added %d new."
+msgstr "Importováno %d zkratek. Přidáno %d nových."
 
 #: uformmain.sappexit
@@ -812 +816 @@
 msgid "Process import sources"
 msgstr "Zpracovat zdroje importu"
-

trunk/Languages/AcronymDecoder.po

@@ -616 +616 @@
 msgstr ""
 
+#: uacronym.sfilenotfound
+msgid "File %s not found"
+msgstr ""
+
 #: uacronym.smeaning
 msgctxt "uacronym.smeaning"
@@ -784 +788 @@
 
 #: uformmain.saddedcount
-msgid "Imported %d acronyms"
+msgid "Imported %d acronyms. Added %d new."
 msgstr ""
 

trunk/UAcronym.pas

@@ -216 +216 @@
     ImportFormats: TImportFormats;
     Modified: Boolean;
+    AddedCount: Integer;
     constructor Create;
     destructor Destroy; override;
@@ -250 +251 @@
   SRemoveOnStart = 'Remove on start';
   SUnsupportedAuthMethod = 'Unsupported HTTP authorization method';
+  SFileNotFound = 'File %s not found';
 
 
@@ -323 +325 @@
       NewAcronym.Name := SQLQuery1.FieldByName('Acronym').AsString;
       NewAcronym.Meaning := SQLQuery1.FieldByName('Meaning').AsString;
-      Sources.AcronymDb.AddAcronym(NewAcronym.Name, NewAcronym.Meaning);
+      if (NewAcronym.Name <> '') and (NewAcronym.Meaning <> '') then
+        Sources.AcronymDb.AddAcronym(NewAcronym.Name, NewAcronym.Meaning);
       SQLQuery1.Next;
       Inc(ItemCount);
@@ -489 +492 @@
           Delete(S, 1, P + Length(EndString) - 1);
 
-          if (Flag = ipfNewItem) and (Trim(NewAcronym.Name) <> '') and
-            (Trim(NewAcronym.Meaning) <> '') then begin
+          if (Flag = ipfNewItem) and (NewAcronym.Name <> '') and
+            (NewAcronym.Meaning <> '') then begin
               AddedAcronym := Sources.AcronymDb.AddAcronym(NewAcronym.Name, NewAcronym.Meaning);
               AddedAcronym.Description := NewAcronym.Description;
@@ -749 +752 @@
       S.Free;
     end;
-  end else ShowMessage('File ' + URL + ' not found');
+  end else ShowMessage(SysUtils.Format(SFileNotFound, [URL]));
 end;
 
@@ -823 +826 @@
 begin
   Categories := TStringList.Create;
+  Name := '';
+  Meaning := '';
+  Description := '';
 end;
 
@@ -1432 +1438 @@
     Meaning.Acronym := Acronym;
     Acronym.Meanings.Add(Meaning);
+    Inc(AddedCount);
   end;
   Result := Meaning;