Changeset 29 for trunk

Timestamp:

Jul 12, 2016, 4:41:03 PM (8 years ago)

Author:

chronos

Message:

• Added: New import source state called Enabled to allow to select only currently needed imports for importing from all sources.

Location:

trunk

Files:

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

trunk/Forms/UFormImportSource.lfm

@@ -1 +1 @@
 object FormImportSource: TFormImportSource
   Left = 506
-  Height = 422
+  Height = 282
   Top = 363
-  Width = 599
+  Width = 507
   Caption = 'Import source'
-  ClientHeight = 422
-  ClientWidth = 599
+  ClientHeight = 282
+  ClientWidth = 507
   LCLVersion = '1.6.0.4'
   object EditName: TEdit
@@ -12 +12 @@
     Height = 28
     Top = 10
-    Width = 432
+    Width = 340
     Anchors = [akTop, akLeft, akRight]
     TabOrder = 0
@@ -36 +36 @@
     Height = 28
     Top = 49
-    Width = 432
+    Width = 340
     Anchors = [akTop, akLeft, akRight]
     TabOrder = 1
   end
   object ButtonOk: TButton
-    Left = 504
+    Left = 412
     Height = 25
-    Top = 384
+    Top = 244
     Width = 75
     Anchors = [akRight, akBottom]
@@ -51 +51 @@
   end
   object ButtonCancel: TButton
-    Left = 408
+    Left = 316
     Height = 25
-    Top = 384
+    Top = 244
     Width = 75
     Anchors = [akRight, akBottom]
@@ -72 +72 @@
     Height = 28
     Top = 91
-    Width = 304
+    Width = 212
     Anchors = [akTop, akLeft, akRight]
     ItemHeight = 20
@@ -79 +79 @@
   end
   object ButtonShowFormat: TButton
-    Left = 472
+    Left = 380
     Height = 25
     Top = 91
@@ -88 +88 @@
     TabOrder = 5
   end
+  object CheckBoxEnabled: TCheckBox
+    Left = 11
+    Height = 24
+    Top = 136
+    Width = 78
+    Caption = 'Enabled'
+    TabOrder = 6
+  end
 end

trunk/Forms/UFormImportSource.lrt

@@ -6 +6 @@
 TFORMIMPORTSOURCE.LABEL3.CAPTION=Data format:
 TFORMIMPORTSOURCE.BUTTONSHOWFORMAT.CAPTION=Configure
+TFORMIMPORTSOURCE.CHECKBOXENABLED.CAPTION=Enabled

trunk/Forms/UFormImportSource.pas

@@ -17 +17 @@
     ButtonOk: TButton;
     ButtonCancel: TButton;
+    CheckBoxEnabled: TCheckBox;
     ComboBox1: TComboBox;
     EditName: TEdit;
@@ -78 +79 @@
   if (ComboBox1.ItemIndex = -1) and (ComboBox1.Items.Count > 0) then
     ComboBox1.ItemIndex := 0;
+  CheckBoxEnabled.Checked := ImportSource.Enabled;
 end;
 
@@ -85 +87 @@
   ImportSource.URL := EditURL.Text;
   ImportSource.Format := TImportFormat(ComboBox1.Items.Objects[ComboBox1.ItemIndex]);
+  ImportSource.Enabled := CheckBoxEnabled.Checked;
 end;
 

trunk/Forms/UFormImportSources.lfm

@@ -15 +15 @@
     Width = 577
     Anchors = [akTop, akLeft, akRight, akBottom]
+    Checkboxes = True
     Columns = <    
       item

trunk/Forms/UFormImportSources.pas

@@ -67 +67 @@
     Item.Data := ImportSources[Item.Index];
     Item.SubItems.Add(URL);
+    Item.Checked := Enabled;
   end;
 end;

trunk/Forms/UFormMain.pas

@@ -259 +259 @@
 begin
   TotalItemCount := 0;
-  for I := 0 to AcronymDb.ImportSources.Count - 1 do begin
-    TImportSource(AcronymDb.ImportSources[I]).Process;
-    TotalItemCount := TotalItemCount + TImportSource(AcronymDb.ImportSources[I]).ItemCount;
+  for I := 0 to AcronymDb.ImportSources.Count - 1 do
+  with TImportSource(AcronymDb.ImportSources[I]) do
+  if Enabled then begin
+    Process;
+    TotalItemCount := TotalItemCount + ItemCount;
   end;
   ShowMessage(Format(SAddedCount, [TotalItemCount]));

trunk/Languages/AcronymDecoder.cs.po

@@ -200 +200 @@
 #: tformimportformat.amovedown.caption
 msgid "Move down"
-msgstr ""
+msgstr "Přesunout níže"
 
 #: tformimportformat.amoveup.caption
 msgid "Move up"
-msgstr ""
+msgstr "Přesounout výše"
 
 #: tformimportformat.aremove.caption
@@ -247 +247 @@
 #: tformimportformat.listviewitemrules.columns[0].caption
 msgid "Start string"
-msgstr ""
+msgstr "Počáteční řetězec"
 
 #: tformimportformat.listviewitemrules.columns[1].caption
 msgid "End string"
-msgstr ""
+msgstr "Koncový řetězec"
 
 #: tformimportformat.listviewitemrules.columns[2].caption
 msgid "Action"
-msgstr ""
+msgstr "Akce"
 
 #: tformimportformat.listviewitemrules.columns[3].caption
 msgid "Variable"
-msgstr ""
+msgstr "Proměnná"
 
 #: tformimportformat.listviewitemrules.columns[4].caption
 msgctxt "tformimportformat.listviewitemrules.columns[4].caption"
 msgid "Repetition"
-msgstr ""
+msgstr "Opakování"
 
 #: tformimportformats.aadd.caption
@@ -305 +305 @@
 #: tformimportpattern.caption
 msgid "Import pattern"
-msgstr ""
+msgstr "Vzor importu"
 
 #: tformimportpattern.checkboxrepetition.caption
 msgctxt "tformimportpattern.checkboxrepetition.caption"
 msgid "Repetition"
-msgstr ""
+msgstr "Opakování"
 
 #: tformimportpattern.label10.caption
 msgid "Action:"
-msgstr ""
+msgstr "Akce"
 
 #: tformimportpattern.label11.caption
 msgid "Variable:"
-msgstr ""
+msgstr "Proměnná"
 
 #: tformimportpattern.label8.caption
 msgid "Start string:"
-msgstr ""
+msgstr "Počáteční řetězec"
 
 #: tformimportpattern.label9.caption
 msgid "End string:"
-msgstr ""
+msgstr "Koncový řetězec"
 
 #: tformimportsource.buttoncancel.caption
@@ -340 +340 @@
 #: tformimportsource.buttonshowformat.caption
 msgid "Configure"
-msgstr ""
+msgstr "Nastavit"
 
 #: tformimportsource.caption
@@ -347 +347 @@
 msgstr "Zdroj importu"
 
+#: tformimportsource.checkboxenabled.caption
+msgid "Enabled"
+msgstr ""
+
 #: tformimportsource.label1.caption
 msgctxt "tformimportsource.label1.caption"
@@ -603 +607 @@
 #: uformimportformat.sno
 msgid "No"
-msgstr ""
+msgstr "Ne"
 
 #: uformimportformat.sremoveimportpattern
 msgid "Remove import pattern"
-msgstr ""
+msgstr "Odstranit vzory importu"
 
 #: uformimportformat.sremoveimportpatternquery
 msgid "Do you really want to remove selected import patterns?"
-msgstr ""
+msgstr "Opravdu chcete odstranit vybrané vzory importu?"
 
 #: uformimportformat.syes
 msgid "Yes"
-msgstr ""
+msgstr "Ano"
 
 #: uformimportformats.simportformatalreadyexists
@@ -646 +650 @@
 #: uformmain.saddedcount
 msgid "Imported %d acronyms"
-msgstr ""
+msgstr "Importováno %d zkratek"
 
 #: uformmain.sappexit

trunk/Languages/AcronymDecoder.po

@@ -330 +330 @@
 msgstr ""
 
+#: tformimportsource.checkboxenabled.caption
+msgid "Enabled"
+msgstr ""
+
 #: tformimportsource.label1.caption
 msgctxt "TFORMIMPORTSOURCE.LABEL1.CAPTION"

trunk/UAcronym.pas

@@ -163 +163 @@
     procedure DoPassword(Sender: TObject; var RepeatRequest : Boolean);
   public
+    Enabled: Boolean;
     Name: string;
     URL: string;
@@ -618 +619 @@
 procedure TImportSource.Assign(Source: TImportSource);
 begin
+  Enabled := Source.Enabled;
   Name := Source.Name;
   URL := Source.URL;
   Format := Source.Format;
+  LastTime := Source.LastTime;
+  ItemCount := Source.ItemCount;
 end;
 
@@ -629 +633 @@
   if Assigned(Format) then WriteInteger(Node, 'ImportFormat', Format.Id)
     else WriteInteger(Node, 'ImportFormat', -1);
+  WriteBoolean(Node, 'Enabled', Enabled);
 end;
 
@@ -636 +641 @@
   URL := ReadString(Node, 'URL', '');
   Format := Sources.AcronymDb.ImportFormats.SearchById(ReadInteger(Node, 'ImportFormat', -1));
+  Enabled := ReadBoolean(Node, 'Enabled', True);
 end;
 
@@ -641 +647 @@
 begin
   Format := nil;
+  Enabled := True;
 end;