Changeset 18

Timestamp:

Feb 28, 2018, 1:43:45 PM (7 years ago)

Author:

chronos

Message:

• Added: From Find duplicities form it is possible to open the list of duplicit contacts for further modification/addition/removal.

Location:

trunk

Files:

• Forms/UFormFindDuplicity.lfm (modified) (3 diffs)
• Forms/UFormFindDuplicity.pas (modified) (5 diffs)
• Forms/UFormGenerate.pas (modified) (1 diff)
• Languages/vCardStudio.cs.po (modified) (4 diffs)
• Languages/vCardStudio.po (modified) (1 diff)
• UCore.pas (modified) (1 diff)

trunk/Forms/UFormFindDuplicity.lfm

@@ -34 +34 @@
       end>
     OwnerData = True
+    PopupMenu = PopupMenu1
     ReadOnly = True
     RowSelect = True
@@ -39 +40 @@
     ViewStyle = vsReport
     OnData = ListView1Data
+    OnDblClick = AShowContactsExecute
   end
   object Panel1: TPanel
@@ -69 +71 @@
     end
   end
+  object ActionList1: TActionList
+    left = 218
+    top = 128
+    object AShowContacts: TAction
+      Caption = 'Show contacts'
+      OnExecute = AShowContactsExecute
+    end
+  end
+  object PopupMenu1: TPopupMenu
+    left = 75
+    top = 124
+    object MenuItem1: TMenuItem
+      Action = AShowContacts
+    end
+  end
 end

trunk/Forms/UFormFindDuplicity.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  ExtCtrls, StdCtrls, Contnrs, UContact;
+  ExtCtrls, StdCtrls, ActnList, Menus, Contnrs, UContact;
 
 type
@@ -29 +29 @@
 
   TFormFindDuplicity = class(TForm)
+    AShowContacts: TAction;
+    ActionList1: TActionList;
     ComboBoxField: TComboBox;
     Label1: TLabel;
     ListView1: TListView;
+    MenuItem1: TMenuItem;
     Panel1: TPanel;
+    PopupMenu1: TPopupMenu;
+    procedure AShowContactsExecute(Sender: TObject);
     procedure ComboBoxFieldChange(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
@@ -59 +64 @@
 
 uses
-  UCore;
+  UCore, UFormContacts;
 
 { TFoundItems }
@@ -95 +100 @@
   with TFoundItem(FoundItems[Item.Index]) do begin
     Item.Caption := Field;
+    Item.Data := FoundItems[Item.Index];
     Item.SubItems.Add(Contacts.ToString);
     Item.SubItems.Add(IntToStr(Contacts.Count));
@@ -156 +162 @@
 end;
 
+procedure TFormFindDuplicity.AShowContactsExecute(Sender: TObject);
+var
+  Form: TFormContacts;
+  I: Integer;
+begin
+  if Assigned(ListView1.Selected) then begin
+    Form := TFormContacts.Create(nil);
+    Form.Contacts := TContacts.Create(False);
+    Form.Contacts.ContactsFile := Contacts.ContactsFile;
+    with TFoundItem(ListView1.Selected.Data) do
+      for I := 0 to Contacts.Count - 1 do
+        Form.Contacts.Add(Contacts[I]);
+    Form.ShowModal;
+    with TFoundItem(ListView1.Selected.Data) do begin
+      // Remove all deleted
+      for I := 0 to Contacts.Count - 1 do
+        if Form.Contacts.IndexOf(Contacts[I]) = -1 then begin
+          Form.Contacts.Remove(Contacts[I]);
+          Self.Contacts.Remove(Contacts[I]);
+          Self.Contacts.ContactsFile.Modified := True;
+        end;
+
+      // Add newly added
+      for I := 0 to Form.Contacts.Count - 1 do
+        if Contacts.IndexOf(Form.Contacts[I]) = -1 then begin
+          Form.Contacts.Add(Form.Contacts[I]);
+          Self.Contacts.Add(Form.Contacts[I]);
+          Self.Contacts.ContactsFile.Modified := True;
+        end;
+    end;
+    Form.Contacts.Free;
+    Form.Free;
+    Find;
+  end;
+end;
+
 procedure TFormFindDuplicity.FormClose(Sender: TObject;
   var CloseAction: TCloseAction);

trunk/Forms/UFormGenerate.pas

@@ -49 +49 @@
     Contact.FirstName := 'First ' + IntToStr(Random(10000));
     Contact.LastName := 'Last ' + IntToStr(Random(10000));
-    Contact.FullName := Contact.FirstName + ' ' + Contact.LastName;
+    Contact.FullName := 'FullName ' + IntToStr(Random(100));
     Contact.TelCell := IntToStr(Random(1000000000));
     Contact.TelHome := IntToStr(Random(1000000000));

trunk/Languages/vCardStudio.cs.po

@@ -58 +58 @@
 msgctxt "tcore.agenerate.caption"
 msgid "Generate contacts"
-msgstr ""
+msgstr "Generovat kontakty"
 
 #: tcore.ahomepage.caption
@@ -262 +262 @@
 #: tformcontacts.listview1.columns[4].caption
 msgid "Cell phone"
-msgstr ""
+msgstr "Mobilní telefon"
 
 #: tformcontacts.listview1.columns[5].caption
 msgid "Home phone"
-msgstr ""
+msgstr "Domácí telefon"
+
+#: tformfindduplicity.ashowcontacts.caption
+msgid "Show contacts"
+msgstr "Ukázat kontakty"
 
 #: tformfindduplicity.caption
@@ -292 +296 @@
 #: tformgenerate.buttongenerate.caption
 msgid "Generate"
-msgstr ""
+msgstr "Generovat"
 
 #: tformgenerate.caption
 msgctxt "tformgenerate.caption"
 msgid "Generate contacts"
-msgstr ""
+msgstr "Generovat kontakty"
 
 #: tformgenerate.label1.caption
-#, fuzzy
 msgctxt "tformgenerate.label1.caption"
 msgid "Count:"
@@ -450 +453 @@
 msgid "vCard file"
 msgstr "Soubor vCard"
-

trunk/Languages/vCardStudio.po

@@ -258 +258 @@
 msgstr ""
 
+#: tformfindduplicity.ashowcontacts.caption
+msgid "Show contacts"
+msgstr ""
+
 #: tformfindduplicity.caption
 msgctxt "tformfindduplicity.caption"

trunk/UCore.pas

@@ -181 +181 @@
     Contacts := TContactsFile(DataFile).Contacts;
     ShowModal;
+    FormContacts.ReloadList;
+    FormMain.UpdateInterface;
     Free;
   end;