Changeset 133

Timestamp:

Apr 10, 2022, 1:39:35 PM (2 years ago)

Author:

chronos

Message:

• Modified: Show number of removed duplicates.
• Fixed: Set document as modified only if data are really changed.

Location:

trunk

Files:

• Forms/UFormContact.lfm (modified) (1 diff)
• Forms/UFormContact.pas (modified) (1 diff)
• Forms/UFormContacts.pas (modified) (1 diff)
• Forms/UFormProperties.lfm (modified) (9 diffs)
• Forms/UFormProperties.pas (modified) (4 diffs)
• Languages/vCardStudio.cs.po (modified) (3 diffs)
• Languages/vCardStudio.pot (modified) (2 diffs)
• Languages/vCardStudio.sv.po (modified) (2 diffs)
• Packages/VCard/UVCard.pas (modified) (2 diffs)
• UCore.pas (modified) (2 diffs)
• UDataFile.pas (modified) (1 diff)

trunk/Forms/UFormContact.lfm

@@ -64 +64 @@
     Top = 8
     Width = 970
-    ActivePage = TabSheetOthers
+    ActivePage = TabSheetGeneral
     Anchors = [akTop, akLeft, akRight, akBottom]
     ParentFont = False
-    TabIndex = 5
+    TabIndex = 0
     TabOrder = 4
     object TabSheetGeneral: TTabSheet

trunk/Forms/UFormContact.pas

@@ -502 +502 @@
 procedure TFormContact.TabSheetGeneralShow(Sender: TObject);
 begin
-  EditFullName.Text := Contact.Fields[cfFullName];
+  UpdateEditNoOnChange(EditFullName, Contact.Fields[cfFullName]);
   EditNickName.Text := Contact.Fields[cfNickName];
   EditEmail.Text := Contact.Fields[cfEmail];

trunk/Forms/UFormContacts.pas

@@ -471 +471 @@
       FormContact.OnGetNext := GetNextContact;
       if FormContact.ShowModal = mrOK then begin
+        if not TContact(ListView1.Selected.Data).CompareTo(Contact) then
+          Core.DataFile.Modified := True;
         TContact(ListView1.Selected.Data).Assign(Contact);
-        Core.DataFile.Modified := True;
         ReloadList;
         UpdateInterface;

trunk/Forms/UFormProperties.lfm

@@ -1 +1 @@
 object FormProperties: TFormProperties
   Left = 400
-  Height = 946
+  Height = 908
   Top = 212
-  Width = 1260
+  Width = 1210
   Caption = 'Contacts'
-  ClientHeight = 946
-  ClientWidth = 1260
-  DesignTimePPI = 150
+  ClientHeight = 908
+  ClientWidth = 1210
+  DesignTimePPI = 144
   OnClose = FormClose
   OnCreate = FormCreate
@@ -14 +14 @@
   object ListView1: TListView
     Left = 0
-    Height = 844
+    Height = 810
     Top = 0
-    Width = 1260
+    Width = 1210
     Align = alClient
     Columns = <    
       item
         Caption = 'Name'
-        Width = 312
+        Width = 300
       end    
       item
         Caption = 'Attributes'
-        Width = 156
+        Width = 150
       end    
       item
         Caption = 'Values'
-        Width = 777
+        Width = 746
       end>
     MultiSelect = True
@@ -45 +45 @@
   object ToolBar1: TToolBar
     Left = 0
-    Height = 41
-    Top = 877
-    Width = 1260
+    Height = 39
+    Top = 842
+    Width = 1210
     Align = alBottom
     Images = Core.ImageList1
@@ -60 +60 @@
     end
     object ToolButton2: TToolButton
-      Left = 37
+      Left = 36
       Top = 2
       Action = AModify
     end
     object ToolButton3: TToolButton
-      Left = 109
+      Left = 106
       Top = 2
       Action = ARemove
     end
     object ToolButton4: TToolButton
-      Left = 73
+      Left = 71
       Top = 2
       Action = AClone
     end
     object ToolButton5: TToolButton
-      Left = 145
-      Height = 34
+      Left = 141
+      Height = 33
       Top = 2
       Style = tbsSeparator
     end
     object ToolButton6: TToolButton
-      Left = 153
+      Left = 149
       Top = 2
       Action = ALoadValueFromFile
     end
     object ToolButton7: TToolButton
-      Left = 189
+      Left = 184
       Top = 2
       Action = ASaveValueToFile
@@ -93 +93 @@
   object ListViewFilter1: TListViewFilter
     Left = 0
-    Height = 33
-    Top = 844
-    Width = 1260
+    Height = 32
+    Top = 810
+    Width = 1210
     OnChange = ListViewFilter1Change
     Align = alBottom
@@ -101 +101 @@
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 28
-    Top = 918
-    Width = 1260
+    Height = 27
+    Top = 881
+    Width = 1210
     Panels = <    
       item
-        Width = 52
+        Width = 50
       end>
     SimplePanel = False
@@ -112 +112 @@
   object PopupMenuField: TPopupMenu
     Images = Core.ImageList1
-    Left = 453
-    Top = 274
+    Left = 435
+    Top = 263
     object MenuItem1: TMenuItem
       Action = AAdd
@@ -141 +141 @@
   object ActionList1: TActionList
     Images = Core.ImageList1
-    Left = 763
-    Top = 268
+    Left = 732
+    Top = 257
     object AAdd: TAction
       Caption = 'Add'
@@ -189 +189 @@
     Column = 0
     Order = soNone
-    Left = 550
-    Top = 446
+    Left = 528
+    Top = 428
   end
   object SaveDialog1: TSaveDialog
-    Left = 792
-    Top = 467
+    Left = 760
+    Top = 448
   end
   object OpenDialog1: TOpenDialog
-    Left = 792
-    Top = 542
+    Left = 760
+    Top = 520
   end
 end

trunk/Forms/UFormProperties.pas

@@ -226 +226 @@
         Properties.Add(ContactProperty);
         ContactProperty := nil;
-        Core.DataFile.Modified := True;
         ReloadList;
         UpdateInterface;
@@ -253 +252 @@
         Properties.Add(ContactProperty);
         ContactProperty := nil;
-        Core.DataFile.Modified := True;
         ReloadList;
         UpdateInterface;
@@ -294 +292 @@
       if FormProperty.ShowModal = mrOK then begin
         TContactProperty(ListView1.Selected.Data).Assign(ContactProperty);
-        Core.DataFile.Modified := True;
         ReloadList;
         UpdateInterface;
@@ -317 +314 @@
         Properties.Delete(Properties.IndexOf(ListView1.Items[I].Data));
       end;
-    Core.DataFile.Modified := True;
     ReloadList;
     UpdateInterface;

trunk/Languages/vCardStudio.cs.po

@@ -1114 +1114 @@
 msgstr "Řádek %d: %s"
 
+#: ucore.sremovedduplicates
+#, object-pascal-format
+msgid "Removed %d duplicates."
+msgstr "Odstraněno %d duplikátů."
+
 #: udatafile.sallfiles
 msgctxt "udatafile.sallfiles"
@@ -1121 +1126 @@
 #: udatafile.sdatafilename
 msgctxt "udatafile.sdatafilename"
-msgid "File"
-msgstr "Soubor"
+msgid "Data file"
+msgstr "Datový soubor"
 
 #: uformcontact.scontact
@@ -1239 +1244 @@
 msgid "vCard file"
 msgstr "Soubor vCard"
-

trunk/Languages/vCardStudio.pot

@@ -1087 +1087 @@
 msgstr ""
 
+#: ucore.sremovedduplicates
+#, object-pascal-format
+msgid "Removed %d duplicates."
+msgstr ""
+
 #: udatafile.sallfiles
 msgctxt "udatafile.sallfiles"
@@ -1094 +1099 @@
 #: udatafile.sdatafilename
 msgctxt "udatafile.sdatafilename"
-msgid "File"
+msgid "Data file"
 msgstr ""
 

trunk/Languages/vCardStudio.sv.po

@@ -1124 +1124 @@
 msgstr "Linje %d: %s"
 
+#: ucore.sremovedduplicates
+#, object-pascal-format
+msgid "Removed %d duplicates."
+msgstr ""
+
 #: udatafile.sallfiles
 msgctxt "udatafile.sallfiles"
@@ -1130 +1135 @@
 
 #: udatafile.sdatafilename
+#, fuzzy
+#| msgid "File"
 msgctxt "udatafile.sdatafilename"
-msgid "File"
+msgid "Data file"
 msgstr "Fil"
 

trunk/Packages/VCard/UVCard.pas

@@ -209 +209 @@
     procedure Merge(Contact: TContact; FieldIndex: TContactFieldIndex);
     function ToString: ansistring; override;
-    procedure RemoveExactDuplicates;
+    function RemoveExactDuplicates: Integer;
     procedure Sort;
   end;
@@ -1242 +1242 @@
 end;
 
-procedure TContacts.RemoveExactDuplicates;
+function TContacts.RemoveExactDuplicates: Integer;
 var
   I: Integer;
   J: Integer;
 begin
+  Result := 0;
   for I := 0 to Count - 1 do
     for J := Count - 1 downto I + 1 do
       if Items[I].CompareTo(Items[J]) then begin
         Remove(Items[J]);
+        Inc(Result);
       end;
 end;

trunk/UCore.pas

@@ -127 +127 @@
   SCombinedContacts = 'Combined %d contact files.';
   SLine = 'Line %d: %s';
+  SRemovedDuplicates = 'Removed %d duplicates.';
 
 { TCore }
@@ -298 +299 @@
 
 procedure TCore.ARemoveExactDuplicatesExecute(Sender: TObject);
-begin
-  TVCardFile(DataFile).VCard.Contacts.RemoveExactDuplicates;
-  UpdateFile;
+var
+  RemovedCount: Integer;
+begin
+  RemovedCount := TVCardFile(DataFile).VCard.Contacts.RemoveExactDuplicates;
+  ShowMessage(Format(SRemovedDuplicates, [RemovedCount]));
+  if RemovedCount > 0 then begin
+    DataFile.Modified := True;
+    UpdateFile;
+  end;
 end;
 

trunk/UDataFile.pas

@@ -36 +36 @@
 
 resourcestring
-  SDataFileName = 'File';
+  SDataFileName = 'Data file';
   SAllFiles = 'All files';