Changeset 56 for trunk

Timestamp:

Dec 8, 2021, 4:44:21 PM (3 years ago)

Author:

chronos

Message:

• Added: Show textual name of contact field in contact field form and prefill field name and attributes. Update that name back according used field name and attributes.

Location:

trunk

Files:

• Forms/UFormProperty.lfm (modified) (9 diffs)
• Forms/UFormProperty.lrj (modified) (1 diff)
• Forms/UFormProperty.pas (modified) (6 diffs)
• Languages/vCardStudio.cs.po (modified) (2 diffs)
• Languages/vCardStudio.po (modified) (1 diff)
• UContact.pas (modified) (5 diffs)
• UCore.pas (modified) (1 diff)

trunk/Forms/UFormProperty.lfm

@@ -1 +1 @@
 object FormProperty: TFormProperty
   Left = 760
-  Height = 525
-  Top = 469
-  Width = 802
+  Height = 418
+  Top = 576
+  Width = 726
   Caption = 'Field'
-  ClientHeight = 525
-  ClientWidth = 802
+  ClientHeight = 418
+  ClientWidth = 726
   DesignTimePPI = 144
   OnClose = FormClose
@@ -13 +13 @@
   LCLVersion = '2.0.12.0'
   object ButtonOk: TButton
-    Left = 536
+    Left = 460
     Height = 37
-    Top = 472
+    Top = 365
     Width = 119
     Anchors = [akRight, akBottom]
@@ -25 +25 @@
   end
   object ButtonCancel: TButton
-    Left = 672
+    Left = 596
     Height = 37
-    Top = 472
+    Top = 365
     Width = 115
     Anchors = [akRight, akBottom]
@@ -38 +38 @@
     Left = 24
     Height = 24
-    Top = 20
+    Top = 80
     Width = 56
     Caption = 'Name:'
@@ -44 +44 @@
   end
   object EditName: TEdit
-    Left = 166
+    Left = 168
     Height = 42
-    Top = 20
-    Width = 322
+    Top = 72
+    Width = 532
+    Anchors = [akTop, akLeft, akRight]
+    OnChange = EditNameChange
     TabOrder = 2
   end
@@ -53 +55 @@
     Left = 24
     Height = 24
-    Top = 72
+    Top = 128
     Width = 88
     Caption = 'Attributes:'
@@ -59 +61 @@
   end
   object EditAttributes: TEdit
-    Left = 166
+    Left = 168
     Height = 42
-    Top = 72
-    Width = 322
+    Top = 124
+    Width = 532
+    Anchors = [akTop, akLeft, akRight]
+    OnChange = EditAttributesChange
     TabOrder = 3
   end
@@ -68 +72 @@
     Left = 24
     Height = 24
-    Top = 128
+    Top = 180
     Width = 60
     Caption = 'Values:'
@@ -74 +78 @@
   end
   object EditValues: TEdit
-    Left = 166
+    Left = 168
     Height = 42
-    Top = 120
-    Width = 322
+    Top = 172
+    Width = 532
+    Anchors = [akTop, akLeft, akRight]
     TabOrder = 4
   end
+  object Label4: TLabel
+    Left = 24
+    Height = 24
+    Top = 32
+    Width = 45
+    Caption = 'Field:'
+    ParentColor = False
+  end
+  object ComboBoxField: TComboBox
+    Left = 168
+    Height = 42
+    Top = 24
+    Width = 532
+    Anchors = [akTop, akLeft, akRight]
+    ItemHeight = 0
+    OnChange = ComboBoxFieldChange
+    Style = csDropDownList
+    TabOrder = 5
+  end
 end

trunk/Forms/UFormProperty.lrj

@@ -5 +5 @@
 {"hash":5538698,"name":"tformproperty.label1.caption","sourcebytes":[78,97,109,101,58],"value":"Name:"},
 {"hash":265557994,"name":"tformproperty.label2.caption","sourcebytes":[65,116,116,114,105,98,117,116,101,115,58],"value":"Attributes:"},
-{"hash":209959994,"name":"tformproperty.label3.caption","sourcebytes":[86,97,108,117,101,115,58],"value":"Values:"}
+{"hash":209959994,"name":"tformproperty.label3.caption","sourcebytes":[86,97,108,117,101,115,58],"value":"Values:"},
+{"hash":80724602,"name":"tformproperty.label4.caption","sourcebytes":[70,105,101,108,100,58],"value":"Field:"}
 ]}

trunk/Forms/UFormProperty.pas

@@ -15 +15 @@
     ButtonCancel: TButton;
     ButtonOk: TButton;
+    ComboBoxField: TComboBox;
     EditName: TEdit;
     EditAttributes: TEdit;
@@ -21 +22 @@
     Label2: TLabel;
     Label3: TLabel;
+    Label4: TLabel;
     procedure ButtonOkClick(Sender: TObject);
+    procedure ComboBoxFieldChange(Sender: TObject);
+    procedure EditAttributesChange(Sender: TObject);
+    procedure EditNameChange(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
@@ -27 +32 @@
   private
     FContactProperty: TContactProperty;
+    procedure UpdateField;
     procedure SetContactProperty(AValue: TContactProperty);
     procedure LoadData;
@@ -51 +57 @@
 end;
 
+procedure TFormProperty.ComboBoxFieldChange(Sender: TObject);
+var
+  Field: TContactField;
+  Attributes: TStringList;
+  I: Integer;
+begin
+  if ComboBoxField.ItemIndex <> -1 then begin
+    Field := TContactsFile(Core.DataFile).Fields[ComboBoxField.ItemIndex];
+    if Assigned(Field) then begin
+      EditName.Text := Field.SysName;
+      Attributes := TStringList.Create;
+      try
+        Attributes.NameValueSeparator := '=';
+        Attributes.Delimiter := ';';
+        Attributes.StrictDelimiter := True;
+        for I := 0 to Length(Field.Groups) - 1 do
+          Attributes.Add(Field.Groups[I]);
+        EditAttributes.Text := Attributes.DelimitedText;
+      finally
+        Attributes.Free;
+      end;
+    end;
+  end;
+end;
+
+procedure TFormProperty.EditAttributesChange(Sender: TObject);
+begin
+  UpdateField;
+end;
+
+procedure TFormProperty.EditNameChange(Sender: TObject);
+begin
+  UpdateField;
+end;
+
 procedure TFormProperty.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin
@@ -61 +102 @@
   Core.ThemeManager1.UseTheme(Self);
   FContactProperty := nil;
+  TContactsFile(Core.DataFile).Fields.LoadToStrings(ComboBoxField.Items);
 end;
 
@@ -66 +108 @@
 begin
   Core.PersistentForm1.Load(Self);
+end;
+
+procedure TFormProperty.UpdateField;
+var
+  Field: TContactField;
+  Groups: TStringList;
+  GroupsArray: TStringArray;
+  I: Integer;
+begin
+  Groups := TStringList.Create;
+  try
+    Groups.NameValueSeparator := '=';
+    Groups.Delimiter := ';';
+    Groups.StrictDelimiter := True;
+    Groups.DelimitedText := EditAttributes.Text;
+    SetLength(GroupsArray, Groups.Count);
+    for I := 0 to Groups.Count - 1 do
+      GroupsArray[I] := Groups[I];
+  finally
+    Groups.Free;
+  end;
+  Field := TContactsFile(Core.DataFile).Fields.GetBySysNameGroups(EditName.Text,
+    GroupsArray);
+  if Assigned(Field) then
+    ComboBoxField.ItemIndex := TContactsFile(Core.DataFile).Fields.IndexOf(Field);
 end;
 

trunk/Languages/vCardStudio.cs.po

@@ -572 +572 @@
 msgstr "Hodnoty:"
 
+#: tformproperty.label4.caption
+msgid "Field:"
+msgstr "Pole:"
+
 #: tformsettings.buttoncancel.caption
 msgctxt "tformsettings.buttoncancel.caption"
@@ -832 +836 @@
 #: ucontact.sworkaddresspostofficebox
 msgid "Work address post office box"
-msgstr "Pracovní adresa číslo schárnky"
+msgstr "Pracovní adresa číslo schránky"
 
 #: ucontact.sworkaddressregion

trunk/Languages/vCardStudio.po

@@ -560 +560 @@
 msgstr ""
 
+#: tformproperty.label4.caption
+msgid "Field:"
+msgstr ""
+
 #: tformsettings.buttoncancel.caption
 msgctxt "tformsettings.buttoncancel.caption"

trunk/UContact.pas

@@ -30 +30 @@
     cfVersion, cfAnniversary);
 
+  { TContactField }
+
   TContactField = class
     SysName: string;
@@ -38 +40 @@
     ValueIndex: Integer;
     DataType: TDataType;
+    function GroupsContain(Name: string): Boolean;
+    function Match(ASysName: string; AGroups: TStringArray): Boolean;
   end;
 
@@ -46 +50 @@
       Title: string; Index: TContactFieldIndex; DataType:
       TDataType; ValueIndex: Integer = -1): TContactField;
+    function GetBySysName(SysName: string): TContactField;
+    function GetBySysNameGroups(SysName: string; Groups: TStringArray): TContactField;
     function GetByIndex(Index: TContactFieldIndex): TContactField;
     procedure LoadToStrings(AItems: TStrings);
@@ -238 +244 @@
 end;
 
+{ TContactField }
+
+function TContactField.GroupsContain(Name: string): Boolean;
+var
+  I: Integer;
+begin
+  Result := False;
+  for I := 0 to Length(Groups) - 1 do
+    if Groups[I] = Name then begin
+      Result := True;
+      Break;
+    end;
+end;
+
+function TContactField.Match(ASysName: string; AGroups: TStringArray): Boolean;
+var
+  I: Integer;
+begin
+  Result := ASysName = SysName;
+  if Result then begin
+    for I := 0 to Length(AGroups) - 1 do begin
+      if not GroupsContain(AGroups[I]) then begin
+        Result := False;
+        Break;
+      end;
+    end;
+  end;
+end;
+
 { TContactProperties }
 
@@ -491 +526 @@
   Result.DataType := DataType;
   Add(Result);
+end;
+
+function TContactFields.GetBySysName(SysName: string): TContactField;
+var
+  I: Integer;
+  C: Integer;
+begin
+  C := Count;
+  I := 0;
+  while (I < Count) and (Items[I].SysName <> SysName) do Inc(I);
+  if I < Count then Result := Items[I]
+    else Result := nil;
+end;
+
+function TContactFields.GetBySysNameGroups(SysName: string; Groups: TStringArray
+  ): TContactField;
+var
+  I: Integer;
+  C: Integer;
+begin
+  C := Count;
+  I := 0;
+  while (I < Count) and not Items[I].Match(SysName, Groups) do Inc(I);
+  if I < Count then Result := Items[I]
+    else Result := nil;
 end;
 

trunk/UCore.pas

@@ -356 +356 @@
     if Assigned(DataFile) then FreeAndNil(DataFile);
     FileClosed := True;
+    UpdateFile;
   end;
 end;