Changeset 61 for trunk

Timestamp:

Dec 9, 2021, 12:31:17 AM (3 years ago)

Author:

chronos

Message:

• Fixed: Build with older FPC version.
• Added: Show also normal phone and work phone in the contact list.

Location:

trunk

Files:

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

trunk/Forms/UFormContacts.lfm

@@ -14 +14 @@
   object ListView1: TListView
     Left = 0
-    Height = 801
+    Height = 810
     Top = 0
     Width = 1210
@@ -36 +36 @@
       end    
       item
-        Caption = 'Cell phone'
+        Caption = 'Phone'
+        Width = 150
+      end    
+      item
+        Caption = 'Mobile'
         Width = 150
       end    
       item
         Caption = 'Home phone'
-        Width = 295
+        Width = 150
+      end    
+      item
+        Caption = 'Work phone'
+        Width = 150
       end>
     MultiSelect = True
@@ -58 +66 @@
     Left = 0
     Height = 39
-    Top = 833
+    Top = 842
     Width = 1210
     Align = alBottom
@@ -106 +114 @@
     Left = 0
     Height = 32
-    Top = 801
+    Top = 810
     Width = 1210
     OnChange = ListViewFilter1Change
@@ -113 +121 @@
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 36
-    Top = 872
+    Height = 27
+    Top = 881
     Width = 1210
     Panels = <    

trunk/Forms/UFormContacts.lrj

@@ -5 +5 @@
 {"hash":36093573,"name":"tformcontacts.listview1.columns[2].caption","sourcebytes":[77,105,100,100,108,101,32,110,97,109,101],"value":"Middle name"},
 {"hash":174397109,"name":"tformcontacts.listview1.columns[3].caption","sourcebytes":[76,97,115,116,32,78,97,109,101],"value":"Last Name"},
-{"hash":242387557,"name":"tformcontacts.listview1.columns[4].caption","sourcebytes":[67,101,108,108,32,112,104,111,110,101],"value":"Cell phone"},
-{"hash":124920949,"name":"tformcontacts.listview1.columns[5].caption","sourcebytes":[72,111,109,101,32,112,104,111,110,101],"value":"Home phone"},
+{"hash":5699141,"name":"tformcontacts.listview1.columns[4].caption","sourcebytes":[80,104,111,110,101],"value":"Phone"},
+{"hash":88444965,"name":"tformcontacts.listview1.columns[5].caption","sourcebytes":[77,111,98,105,108,101],"value":"Mobile"},
+{"hash":124920949,"name":"tformcontacts.listview1.columns[6].caption","sourcebytes":[72,111,109,101,32,112,104,111,110,101],"value":"Home phone"},
+{"hash":225645765,"name":"tformcontacts.listview1.columns[7].caption","sourcebytes":[87,111,114,107,32,112,104,111,110,101],"value":"Work phone"},
 {"hash":18340,"name":"tformcontacts.aadd.caption","sourcebytes":[65,100,100],"value":"Add"},
 {"hash":88453081,"name":"tformcontacts.amodify.caption","sourcebytes":[77,111,100,105,102,121],"value":"Modify"},

trunk/Forms/UFormContacts.pas

@@ -120 +120 @@
     AddItem(Fields[cfMiddleName]);
     AddItem(Fields[cfLastName]);
+    AddItem(Fields[cfTel]);
     AddItem(Fields[cfTelCell]);
     AddItem(Fields[cfTelHome]);
+    AddItem(Fields[cfTelWork]);
     Item.Data := ListViewSort1.List[Item.Index];
   end;
@@ -158 +160 @@
       2: Result := CompareString(TContact(Item1).Fields[cfMiddleName], TContact(Item2).Fields[cfMiddleName]);
       3: Result := CompareString(TContact(Item1).Fields[cfLastName], TContact(Item2).Fields[cfLastName]);
-      4: Result := CompareString(TContact(Item1).Fields[cfTelCell], TContact(Item2).Fields[cfTelCell]);
-      5: Result := CompareString(TContact(Item1).Fields[cfTelHome], TContact(Item2).Fields[cfTelHome]);
+      4: Result := CompareString(TContact(Item1).Fields[cfTel], TContact(Item2).Fields[cfTel]);
+      5: Result := CompareString(TContact(Item1).Fields[cfTelCell], TContact(Item2).Fields[cfTelCell]);
+      6: Result := CompareString(TContact(Item1).Fields[cfTelHome], TContact(Item2).Fields[cfTelHome]);
+      7: Result := CompareString(TContact(Item1).Fields[cfTelWork], TContact(Item2).Fields[cfTelWork]);
     end;
     if ListViewSort1.Order = soDown then Result := -Result;
@@ -196 +200 @@
              UTF8LowerCase(TContact(List.Items[I]).Fields[cfLastName])) > 0 then Inc(FoundCount);
            if Pos(UTF8LowerCase(StringGrid.Cells[4, 0]),
+             UTF8LowerCase(TContact(List.Items[I]).Fields[cfTel])) > 0 then Inc(FoundCount);
+           if Pos(UTF8LowerCase(StringGrid.Cells[5, 0]),
              UTF8LowerCase(TContact(List.Items[I]).Fields[cfTelCell])) > 0 then Inc(FoundCount);
-           if Pos(UTF8LowerCase(StringGrid.Cells[5, 0]),
+           if Pos(UTF8LowerCase(StringGrid.Cells[6, 0]),
              UTF8LowerCase(TContact(List.Items[I]).Fields[cfTelHome])) > 0 then Inc(FoundCount);
+           if Pos(UTF8LowerCase(StringGrid.Cells[7, 0]),
+             UTF8LowerCase(TContact(List.Items[I]).Fields[cfTelWork])) > 0 then Inc(FoundCount);
            if FoundCount <> EnteredCount then List.Delete(I);
          end;

trunk/Languages/vCardStudio.cs.po

@@ -508 +508 @@
 #: tformcontacts.listview1.columns[4].caption
 msgctxt "tformcontacts.listview1.columns[4].caption"
-msgid "Cell phone"
-msgstr "Mobilní telefon"
+msgid "Phone"
+msgstr "Telefon"
 
 #: tformcontacts.listview1.columns[5].caption
 msgctxt "tformcontacts.listview1.columns[5].caption"
+msgid "Mobile"
+msgstr "Mobil"
+
+#: tformcontacts.listview1.columns[6].caption
+msgctxt "tformcontacts.listview1.columns[6].caption"
 msgid "Home phone"
 msgstr "Domácí telefon"
+
+#: tformcontacts.listview1.columns[7].caption
+msgctxt "tformcontacts.listview1.columns[7].caption"
+msgid "Work phone"
+msgstr "Pracovní telefon"
 
 #: tformerror.caption
@@ -1031 +1041 @@
 
 #: ucontact.sworkphone
+msgctxt "ucontact.sworkphone"
 msgid "Work phone"
 msgstr "Pracovní telefon"
@@ -1128 +1139 @@
 msgid "Invalid line length for encoded text"
 msgstr "Neplatná délka řádky kódovaného textu"
-

trunk/Languages/vCardStudio.po

@@ -498 +498 @@
 #: tformcontacts.listview1.columns[4].caption
 msgctxt "tformcontacts.listview1.columns[4].caption"
-msgid "Cell phone"
+msgid "Phone"
 msgstr ""
 
 #: tformcontacts.listview1.columns[5].caption
 msgctxt "tformcontacts.listview1.columns[5].caption"
+msgid "Mobile"
+msgstr ""
+
+#: tformcontacts.listview1.columns[6].caption
+msgctxt "tformcontacts.listview1.columns[6].caption"
 msgid "Home phone"
+msgstr ""
+
+#: tformcontacts.listview1.columns[7].caption
+msgctxt "tformcontacts.listview1.columns[7].caption"
+msgid "Work phone"
 msgstr ""
 
@@ -1019 +1029 @@
 
 #: ucontact.sworkphone
+msgctxt "ucontact.sworkphone"
 msgid "Work phone"
 msgstr ""

trunk/UContact.pas

@@ -640 +640 @@
 var
   I: Integer;
-  C: Integer;
-begin
-  C := Count;
+begin
   I := 0;
   while (I < Count) and (Items[I].SysName <> SysName) do Inc(I);
@@ -653 +651 @@
 var
   I: Integer;
-  C: Integer;
-begin
-  C := Count;
+begin
   I := 0;
   while (I < Count) and not Items[I].Match(SysName, Groups) do Inc(I);
@@ -951 +947 @@
   try
     Lines.LoadFromFile(FileName);
+    {$IF FPC_FULLVERSION>=30200}
     if (Length(Lines.Text) > 0) and (Pos(VCardBegin, Lines.Text) = 0) then begin
       Lines.LoadFromFile(FileName, TEncoding.Unicode);
@@ -957 +954 @@
       end;
     end;
+    {$ENDIF}
     LoadFromStrings(Lines);
   finally
@@ -1124 +1122 @@
   Lines := TStringList.Create;
   Lines.LoadFromFile(FileName);
+  {$IF FPC_FULLVERSION>=30200}
   if (Length(Lines.Text) > 0) and (Pos(VCardBegin, Lines.Text) = 0) then begin
     Lines.LoadFromFile(FileName, TEncoding.Unicode);
@@ -1130 +1129 @@
     end;
   end;
+  {$ENDIF}
   try
     I := 0;

trunk/UCore.lfm

@@ -501 +501 @@
     AppName = 'vCard Studio'
     Description = 'vCard files management tool'
-    ReleaseDate = 44524
+    ReleaseDate = 44539
     RegistryKey = '\Software\Chronosoft\vCard Studio'
     RegistryRoot = rrKeyCurrentUser