Changeset 128

Timestamp:

Apr 8, 2022, 9:43:55 PM (2 years ago)

Author:

chronos

Message:

• Modified: Use Generics.Collection instead of fgl for better Delphi compatibility.

Location:

trunk

Files:

• Forms/UFormCompare.lfm (modified) (15 diffs)
• Forms/UFormContact.lfm (modified) (46 diffs)
• Forms/UFormContacts.lfm (modified) (9 diffs)
• Forms/UFormContacts.pas (modified) (5 diffs)
• Forms/UFormFind.lfm (modified) (3 diffs)
• Forms/UFormFind.pas (modified) (1 diff)
• Forms/UFormFindDuplicity.lfm (modified) (7 diffs)
• Forms/UFormFindDuplicity.pas (modified) (4 diffs)
• Forms/UFormImage.lfm (modified) (9 diffs)
• Forms/UFormProperties.pas (modified) (3 diffs)
• Forms/UFormTest.pas (modified) (1 diff)
• Packages/Common/Common.lpk (modified) (1 diff)
• Packages/Common/UDebugLog.pas (modified) (5 diffs)
• Packages/Common/UFindFile.pas (modified) (3 diffs)
• Packages/Common/UJobProgressView.pas (modified) (2 diffs)
• Packages/Common/ULanguages.pas (modified) (2 diffs)
• Packages/Common/UListViewSort.pas (modified) (7 diffs)
• Packages/Common/UMetaCanvas.pas (modified) (2 diffs)
• Packages/Common/UPool.pas (modified) (3 diffs)
• Packages/Common/UScaleDPI.pas (modified) (2 diffs)
• Packages/Common/UTheme.pas (modified) (2 diffs)
• Packages/Common/UThreading.pas (modified) (3 diffs)
• Packages/Common/UTranslator.pas (modified) (3 diffs)
• Packages/SynEditEx/SynEditEx.lpk (modified) (1 diff)
• Packages/SynEditEx/USynEditEx.pas (modified) (1 diff)
• Packages/lazbarcodes/demo (modified) (1 prop)
• UContact.pas (modified) (10 diffs)
• UDataFile.pas (modified) (2 diffs)
• UTest.pas (modified) (2 diffs)
• vCardStudio.lpi (modified) (3 diffs)

trunk/Forms/UFormCompare.lfm

@@ -1 +1 @@
 object FormCompare: TFormCompare
   Left = 574
-  Height = 925
+  Height = 888
   Top = 322
-  Width = 1241
+  Width = 1191
   Caption = 'Compare'
-  ClientHeight = 890
-  ClientWidth = 1241
-  DesignTimePPI = 150
+  ClientHeight = 854
+  ClientWidth = 1191
+  DesignTimePPI = 144
   Menu = MainMenu1
   OnActivate = FormActivate
@@ -18 +18 @@
   object PanelLeft: TPanel
     Left = 0
-    Height = 890
+    Height = 854
     Top = 0
-    Width = 608
+    Width = 584
     Align = alLeft
     BevelOuter = bvNone
-    ClientHeight = 890
-    ClientWidth = 608
+    ClientHeight = 854
+    ClientWidth = 584
     TabOrder = 0
     object EditLeftFileName: TEdit
-      Left = 16
-      Height = 43
+      Left = 15
+      Height = 42
       Top = 11
-      Width = 544
+      Width = 523
       Anchors = [akTop, akLeft, akRight]
       ReadOnly = True
@@ -36 +36 @@
     end
     inline SynEditLeft: TSynEditEx
-      Left = 16
-      Height = 813
-      Top = 64
-      Width = 585
+      Left = 15
+      Height = 781
+      Top = 61
+      Width = 562
       Anchors = [akTop, akLeft, akRight, akBottom]
-      Font.Height = 13
+      Font.Height = 12
       Font.Name = 'DejaVu Sans Mono'
       Font.Pitch = fpFixed
@@ -48 +48 @@
       ParentFont = False
       TabOrder = 1
-      Gutter.Width = 80
+      Gutter.Width = 75
       Gutter.MouseActions = <>
       RightGutter.Width = 0
@@ -499 +499 @@
       inline SynLeftGutterPartList1: TSynGutterPartList
         object SynGutterMarks1: TSynGutterMarks
-          Width = 38
+          Width = 36
           MouseActions = <>
         end
         object SynGutterLineNumber1: TSynGutterLineNumber
-          Width = 17
+          Width = 15
           MouseActions = <>
           MarkupInfo.Background = clBtnFace
@@ -525 +525 @@
         end
         object SynGutterCodeFolding1: TSynGutterCodeFolding
-          Width = 16
+          Width = 15
           MouseActions = <>
           MarkupInfo.Background = clNone
@@ -535 +535 @@
     end
     object SpeedButtonOpenLeft: TSpeedButton
-      Left = 565
-      Height = 34
-      Top = 15
-      Width = 36
+      Left = 542
+      Height = 33
+      Top = 14
+      Width = 35
       Action = AFileOpenLeft
       Anchors = [akTop, akRight]
@@ -547 +547 @@
   end
   object Splitter1: TSplitter
-    Left = 608
-    Height = 890
+    Left = 584
+    Height = 854
     Top = 0
     Width = 8
   end
   object PanelRight: TPanel
-    Left = 616
-    Height = 890
+    Left = 592
+    Height = 854
     Top = 0
-    Width = 625
+    Width = 599
     Align = alClient
     BevelOuter = bvNone
-    ClientHeight = 890
-    ClientWidth = 625
+    ClientHeight = 854
+    ClientWidth = 599
     TabOrder = 2
     object EditRightFileName: TEdit
       Left = 12
-      Height = 43
+      Height = 42
       Top = 11
-      Width = 551
+      Width = 527
       Anchors = [akTop, akLeft, akRight]
       ReadOnly = True
@@ -572 +572 @@
     end
     inline SynEditRight: TSynEditEx
-      Left = 16
-      Height = 813
-      Top = 64
-      Width = 595
+      Left = 15
+      Height = 781
+      Top = 61
+      Width = 571
       Anchors = [akTop, akLeft, akRight, akBottom]
-      Font.Height = 13
+      Font.Height = 12
       Font.Name = 'DejaVu Sans Mono'
       Font.Pitch = fpFixed
@@ -584 +584 @@
       ParentFont = False
       TabOrder = 1
-      Gutter.Width = 80
+      Gutter.Width = 75
       Gutter.MouseActions = <>
       RightGutter.Width = 0
@@ -1035 +1035 @@
       inline SynLeftGutterPartList1: TSynGutterPartList
         object SynGutterMarks1: TSynGutterMarks
-          Width = 38
+          Width = 36
           MouseActions = <>
         end
         object SynGutterLineNumber1: TSynGutterLineNumber
-          Width = 17
+          Width = 15
           MouseActions = <>
           MarkupInfo.Background = clBtnFace
@@ -1061 +1061 @@
         end
         object SynGutterCodeFolding1: TSynGutterCodeFolding
-          Width = 16
+          Width = 15
           MouseActions = <>
           MarkupInfo.Background = clNone
@@ -1071 +1071 @@
     end
     object SpeedButtonOpenRight: TSpeedButton
-      Left = 575
-      Height = 34
-      Top = 16
-      Width = 36
+      Left = 551
+      Height = 33
+      Top = 15
+      Width = 35
       Action = AFileOpenRight
       Anchors = [akTop, akRight]
@@ -1083 +1083 @@
   end
   object OpenDialogSide: TOpenDialog
-    Left = 336
-    Top = 360
+    Left = 323
+    Top = 346
   end
   object MainMenu1: TMainMenu
     Images = Core.ImageList1
-    Left = 344
-    Top = 496
+    Left = 330
+    Top = 476
     object MenuItem1: TMenuItem
       Caption = 'File'
@@ -1112 +1112 @@
   object ActionList1: TActionList
     Images = Core.ImageList1
-    Left = 764
-    Top = 360
+    Left = 733
+    Top = 346
     object AFileOpenLeft: TAction
       Caption = 'Open left file'

trunk/Forms/UFormContact.lfm

@@ -1 +1 @@
 object FormContact: TFormContact
   Left = 1043
-  Height = 769
+  Height = 738
   Top = 446
-  Width = 1033
+  Width = 992
   Caption = 'Contact'
-  ClientHeight = 769
-  ClientWidth = 1033
-  DesignTimePPI = 150
+  ClientHeight = 738
+  ClientWidth = 992
+  DesignTimePPI = 144
   OnClose = FormClose
   OnCreate = FormCreate
@@ -14 +14 @@
   LCLVersion = '2.2.0.4'
   object ButtonCancel: TButton
-    Left = 901
-    Height = 39
-    Top = 716
-    Width = 120
+    Left = 865
+    Height = 37
+    Top = 688
+    Width = 115
     Anchors = [akRight, akBottom]
     Caption = 'Cancel'
@@ -25 +25 @@
   end
   object ButtonOk: TButton
-    Left = 760
-    Height = 39
-    Top = 716
-    Width = 124
+    Left = 730
+    Height = 37
+    Top = 688
+    Width = 119
     Anchors = [akRight, akBottom]
     Caption = 'OK'
@@ -37 +37 @@
   object ButtonPrevious: TButton
     Left = 8
-    Height = 39
-    Top = 716
-    Width = 124
+    Height = 37
+    Top = 688
+    Width = 119
     Anchors = [akLeft, akBottom]
     Caption = 'Previous'
@@ -48 +48 @@
   end
   object ButtonNext: TButton
-    Left = 150
-    Height = 39
-    Top = 716
-    Width = 120
+    Left = 144
+    Height = 37
+    Top = 688
+    Width = 115
     Anchors = [akLeft, akBottom]
     Caption = 'Next'
@@ -61 +61 @@
   object PageControlContact: TPageControl
     Left = 8
-    Height = 692
+    Height = 664
     Top = 8
-    Width = 1010
+    Width = 970
     ActivePage = TabSheetOthers
     Anchors = [akTop, akLeft, akRight, akBottom]
@@ -71 +71 @@
     object TabSheetGeneral: TTabSheet
       Caption = 'General'
-      ClientHeight = 651
-      ClientWidth = 1000
+      ClientHeight = 624
+      ClientWidth = 960
       OnHide = TabSheetGeneralHide
       OnShow = TabSheetGeneralShow
       ParentFont = False
       object Label2: TLabel
-        Left = 17
-        Height = 27
-        Top = 260
-        Width = 66
+        Left = 16
+        Height = 26
+        Top = 250
+        Width = 63
         Caption = 'Mobile:'
         ParentFont = False
       end
       object EditMobile: TEdit
-        Left = 150
-        Height = 43
-        Top = 250
-        Width = 265
+        Left = 144
+        Height = 42
+        Top = 240
+        Width = 254
         ParentFont = False
         TabOrder = 3
       end
       object EditPhone: TEdit
-        Left = 150
-        Height = 43
-        Top = 298
-        Width = 265
+        Left = 144
+        Height = 42
+        Top = 286
+        Width = 254
         ParentFont = False
         TabOrder = 5
       end
       object Label3: TLabel
-        Left = 17
-        Height = 27
-        Top = 302
-        Width = 62
+        Left = 16
+        Height = 26
+        Top = 290
+        Width = 59
         Caption = 'Phone:'
         ParentFont = False
       end
       object EditEmail: TEdit
-        Left = 150
-        Height = 43
-        Top = 342
-        Width = 216
+        Left = 144
+        Height = 42
+        Top = 328
+        Width = 207
         ParentFont = False
         TabOrder = 7
       end
       object Label4: TLabel
-        Left = 17
-        Height = 27
-        Top = 350
-        Width = 60
+        Left = 16
+        Height = 26
+        Top = 336
+        Width = 58
         Caption = 'E-mail:'
         ParentFont = False
       end
       object EditBirthday: TEdit
-        Left = 150
-        Height = 43
-        Top = 442
-        Width = 216
+        Left = 144
+        Height = 42
+        Top = 424
+        Width = 207
         ParentFont = False
         TabOrder = 10
       end
       object Label22: TLabel
-        Left = 17
-        Height = 27
-        Top = 450
-        Width = 82
+        Left = 16
+        Height = 26
+        Top = 432
+        Width = 76
         Caption = 'Birthday:'
         ParentFont = False
       end
       object ImagePhoto: TImage
-        Left = 17
-        Height = 219
-        Top = 17
-        Width = 216
+        Left = 16
+        Height = 210
+        Top = 16
+        Width = 207
         Center = True
         OnClick = ImagePhotoClick
@@ -152 +152 @@
       end
       object Label24: TLabel
-        Left = 250
-        Height = 27
-        Top = 33
-        Width = 94
+        Left = 240
+        Height = 26
+        Top = 32
+        Width = 88
         Caption = 'Full name:'
         ParentFont = False
       end
       object EditFullName: TEdit
-        Left = 375
-        Height = 43
-        Top = 25
-        Width = 354
+        Left = 360
+        Height = 42
+        Top = 24
+        Width = 340
         OnChange = EditFullNameChange
         ParentFont = False
@@ -169 +169 @@
       end
       object Label44: TLabel
-        Left = 250
-        Height = 27
-        Top = 88
+        Left = 240
+        Height = 26
+        Top = 84
+        Width = 91
+        Caption = 'Nickname:'
+        ParentFont = False
+      end
+      object EditNickName: TEdit
+        Left = 361
+        Height = 42
+        Top = 77
+        Width = 215
+        ParentFont = False
+        TabOrder = 2
+      end
+      object Label45: TLabel
+        Left = 432
+        Height = 26
+        Top = 432
+        Width = 105
+        Caption = 'Anniversary:'
+        ParentFont = False
+      end
+      object EditAniversary: TEdit
+        Left = 575
+        Height = 42
+        Top = 424
+        Width = 208
+        ParentFont = False
+        TabOrder = 11
+      end
+      object Label9: TLabel
+        Left = 432
+        Height = 26
+        Top = 248
+        Width = 34
+        Caption = 'Fax:'
+        ParentFont = False
+      end
+      object EditFax: TEdit
+        Left = 575
+        Height = 42
+        Top = 240
+        Width = 254
+        ParentFont = False
+        TabOrder = 4
+      end
+      object EditPager: TEdit
+        Left = 575
+        Height = 42
+        Top = 286
+        Width = 254
+        ParentFont = False
+        TabOrder = 6
+      end
+      object Label10: TLabel
+        Left = 432
+        Height = 26
+        Top = 290
+        Width = 54
+        Caption = 'Pager:'
+        ParentFont = False
+      end
+      object Label46: TLabel
+        Left = 16
+        Height = 26
+        Top = 384
+        Width = 114
+        Caption = 'Web address:'
+        ParentFont = False
+      end
+      object EditWeb: TEdit
+        Left = 144
+        Height = 42
+        Top = 376
+        Width = 639
+        ParentFont = False
+        TabOrder = 9
+      end
+      object Label49: TLabel
+        Left = 432
+        Height = 26
+        Top = 332
+        Width = 67
+        Caption = 'Gender:'
+        ParentFont = False
+      end
+      object EditGender: TEdit
+        Left = 575
+        Height = 42
+        Top = 328
+        Width = 254
+        ParentFont = False
+        TabOrder = 8
+      end
+      object Label56: TLabel
+        Left = 16
+        Height = 26
+        Top = 480
         Width = 95
-        Caption = 'Nickname:'
-        ParentFont = False
-      end
-      object EditNickName: TEdit
-        Left = 376
-        Height = 43
-        Top = 80
-        Width = 224
-        ParentFont = False
-        TabOrder = 2
-      end
-      object Label45: TLabel
-        Left = 450
-        Height = 27
-        Top = 450
-        Width = 113
-        Caption = 'Anniversary:'
-        ParentFont = False
-      end
-      object EditAniversary: TEdit
-        Left = 599
-        Height = 43
-        Top = 442
-        Width = 217
-        ParentFont = False
-        TabOrder = 11
-      end
-      object Label9: TLabel
-        Left = 450
-        Height = 27
-        Top = 258
-        Width = 36
-        Caption = 'Fax:'
-        ParentFont = False
-      end
-      object EditFax: TEdit
-        Left = 599
-        Height = 43
-        Top = 250
-        Width = 265
-        ParentFont = False
-        TabOrder = 4
-      end
-      object EditPager: TEdit
-        Left = 599
-        Height = 43
-        Top = 298
-        Width = 265
-        ParentFont = False
-        TabOrder = 6
-      end
-      object Label10: TLabel
-        Left = 450
-        Height = 27
-        Top = 302
-        Width = 58
-        Caption = 'Pager:'
-        ParentFont = False
-      end
-      object Label46: TLabel
-        Left = 17
-        Height = 27
-        Top = 400
-        Width = 121
-        Caption = 'Web address:'
-        ParentFont = False
-      end
-      object EditWeb: TEdit
-        Left = 150
-        Height = 43
-        Top = 392
-        Width = 666
-        ParentFont = False
-        TabOrder = 9
-      end
-      object Label49: TLabel
-        Left = 450
-        Height = 27
-        Top = 346
-        Width = 73
-        Caption = 'Gender:'
-        ParentFont = False
-      end
-      object EditGender: TEdit
-        Left = 599
-        Height = 43
-        Top = 342
-        Width = 265
-        ParentFont = False
-        TabOrder = 8
-      end
-      object Label56: TLabel
-        Left = 17
-        Height = 27
-        Top = 500
-        Width = 102
         Caption = 'Categories:'
         ParentFont = False
       end
       object EditCategories: TEdit
-        Left = 150
-        Height = 43
-        Top = 492
-        Width = 265
+        Left = 144
+        Height = 42
+        Top = 472
+        Width = 254
         ParentFont = False
         TabOrder = 12
       end
       object SpeedButtonWeb: TSpeedButton
-        Left = 821
-        Height = 43
+        Left = 788
+        Height = 41
         Hint = 'Open in web browser'
-        Top = 392
-        Width = 43
+        Top = 376
+        Width = 41
         Images = Core.ImageList1
         ImageIndex = 15
@@ -293 +293 @@
       end
       object SpeedButtonEmail: TSpeedButton
-        Left = 372
-        Height = 43
+        Left = 357
+        Height = 41
         Hint = 'Open in email client'
-        Top = 342
-        Width = 43
+        Top = 328
+        Width = 41
         Images = Core.ImageList1
         ImageIndex = 16
@@ -305 +305 @@
       end
       object SpeedButtonBirthDay: TSpeedButton
-        Left = 372
-        Height = 43
+        Left = 357
+        Height = 41
         Hint = 'Select date'
-        Top = 442
-        Width = 43
+        Top = 424
+        Width = 41
         Images = Core.ImageList1
         ImageIndex = 17
@@ -317 +317 @@
       end
       object SpeedButtonAniversary: TSpeedButton
-        Left = 821
-        Height = 43
+        Left = 788
+        Height = 41
         Hint = 'Select date'
-        Top = 442
-        Width = 43
+        Top = 424
+        Width = 41
         Images = Core.ImageList1
         ImageIndex = 17
@@ -329 +329 @@
       end
       object ButtonNameDetails: TButton
-        Left = 735
-        Height = 43
-        Top = 25
-        Width = 125
+        Left = 706
+        Height = 41
+        Top = 24
+        Width = 120
         Caption = 'Details'
         OnClick = ButtonNameDetailsClick
@@ -340 +340 @@
     object TabSheetHome: TTabSheet
       Caption = 'Home'
-      ClientHeight = 651
-      ClientWidth = 1000
+      ClientHeight = 624
+      ClientWidth = 960
       OnHide = TabSheetHomeHide
       OnShow = TabSheetHomeShow
       ParentFont = False
       object Label7: TLabel
-        Left = 17
-        Height = 27
-        Top = 119
-        Width = 60
+        Left = 16
+        Height = 26
+        Top = 114
+        Width = 58
         Caption = 'E-mail:'
         ParentFont = False
       end
       object EditHomeEmail: TEdit
-        Left = 180
-        Height = 43
-        Top = 117
-        Width = 216
+        Left = 173
+        Height = 42
+        Top = 112
+        Width = 207
         ParentFont = False
         TabOrder = 4
       end
       object Label11: TLabel
-        Left = 467
-        Height = 27
-        Top = 19
-        Width = 36
+        Left = 448
+        Height = 26
+        Top = 18
+        Width = 34
         Caption = 'Fax:'
         ParentFont = False
       end
       object EditHomeFax: TEdit
-        Left = 630
-        Height = 43
-        Top = 17
-        Width = 265
+        Left = 605
+        Height = 42
+        Top = 16
+        Width = 254
         ParentFont = False
         TabOrder = 1
       end
       object EditHomeMobile: TEdit
-        Left = 180
-        Height = 43
-        Top = 63
-        Width = 265
+        Left = 173
+        Height = 42
+        Top = 60
+        Width = 254
         ParentFont = False
         TabOrder = 2
       end
       object EditHomePhone: TEdit
-        Left = 180
-        Height = 43
-        Top = 17
-        Width = 265
+        Left = 173
+        Height = 42
+        Top = 16
+        Width = 254
         ParentFont = False
         TabOrder = 0
       end
       object Label14: TLabel
-        Left = 467
-        Height = 27
-        Top = 71
-        Width = 58
+        Left = 448
+        Height = 26
+        Top = 68
+        Width = 54
         Caption = 'Pager:'
         ParentFont = False
       end
       object EditHomePager: TEdit
-        Left = 630
-        Height = 43
-        Top = 63
-        Width = 265
+        Left = 605
+        Height = 42
+        Top = 60
+        Width = 254
         ParentFont = False
         TabOrder = 3
       end
       object Label40: TLabel
-        Left = 17
-        Height = 27
-        Top = 175
-        Width = 121
+        Left = 16
+        Height = 26
+        Top = 168
+        Width = 114
         Caption = 'Web address:'
         ParentFont = False
       end
       object EditHomeWeb: TEdit
-        Left = 180
-        Height = 43
-        Top = 168
-        Width = 668
+        Left = 173
+        Height = 42
+        Top = 161
+        Width = 641
         ParentFont = False
         TabOrder = 5
@@ -427 +427 @@
       object GroupBox1: TGroupBox
         Left = 10
-        Height = 287
-        Top = 225
-        Width = 898
+        Height = 276
+        Top = 216
+        Width = 862
         Anchors = [akTop, akLeft, akRight]
         Caption = 'Address'
-        ClientHeight = 285
-        ClientWidth = 896
+        ClientHeight = 274
+        ClientWidth = 860
         TabOrder = 6
         object Label36: TLabel
           Left = 10
-          Height = 27
-          Top = 19
-          Width = 58
+          Height = 26
+          Top = 18
+          Width = 54
           Caption = 'Street:'
           ParentFont = False
@@ -445 +445 @@
         object Label37: TLabel
           Left = 10
-          Height = 27
-          Top = 69
-          Width = 147
+          Height = 26
+          Top = 66
+          Width = 137
           Caption = 'Extended street:'
           ParentFont = False
         end
         object EditHomeAddressStreetExtended: TEdit
-          Left = 180
-          Height = 43
-          Top = 58
-          Width = 265
+          Left = 173
+          Height = 42
+          Top = 56
+          Width = 254
           ParentFont = False
           TabOrder = 2
         end
         object EditHomeAddressStreet: TEdit
-          Left = 180
-          Height = 43
+          Left = 173
+          Height = 42
           Top = 8
-          Width = 265
+          Width = 254
           ParentFont = False
           TabOrder = 0
@@ -469 +469 @@
         object Label38: TLabel
           Left = 10
-          Height = 27
-          Top = 117
-          Width = 68
+          Height = 26
+          Top = 112
+          Width = 64
           Caption = 'Region:'
           ParentFont = False
         end
         object EditHomeAddressRegion: TEdit
-          Left = 180
-          Height = 43
-          Top = 108
-          Width = 265
+          Left = 173
+          Height = 42
+          Top = 104
+          Width = 254
           ParentFont = False
           TabOrder = 4
         end
         object EditHomeAddressCountry: TEdit
-          Left = 180
-          Height = 43
-          Top = 158
-          Width = 265
+          Left = 173
+          Height = 42
+          Top = 152
+          Width = 254
           ParentFont = False
           TabOrder = 5
@@ -493 +493 @@
         object Label39: TLabel
           Left = 10
-          Height = 27
-          Top = 167
-          Width = 77
+          Height = 26
+          Top = 160
+          Width = 71
           Caption = 'Country:'
           ParentFont = False
         end
         object Label41: TLabel
-          Left = 470
-          Height = 27
-          Top = 167
-          Width = 107
+          Left = 451
+          Height = 26
+          Top = 160
+          Width = 103
           Caption = 'Postal code:'
           ParentFont = False
         end
         object EditHomeAddressPostalCode: TEdit
-          Left = 612
-          Height = 43
-          Top = 158
-          Width = 265
+          Left = 588
+          Height = 42
+          Top = 152
+          Width = 254
           ParentFont = False
           TabOrder = 6
         end
         object EditHomeAddressCity: TEdit
-          Left = 612
-          Height = 43
-          Top = 58
-          Width = 265
+          Left = 588
+          Height = 42
+          Top = 56
+          Width = 254
           ParentFont = False
           TabOrder = 3
         end
         object Label42: TLabel
-          Left = 470
-          Height = 27
-          Top = 67
-          Width = 39
+          Left = 451
+          Height = 26
+          Top = 64
+          Width = 36
           Caption = 'City:'
           ParentFont = False
         end
         object Label43: TLabel
-          Left = 470
-          Height = 27
-          Top = 17
-          Width = 135
+          Left = 451
+          Height = 26
+          Top = 16
+          Width = 131
           Caption = 'Post office box:'
           ParentFont = False
         end
         object EditHomeAddressPostOfficeBox: TEdit
-          Left = 612
-          Height = 43
+          Left = 588
+          Height = 42
           Top = 8
-          Width = 265
+          Width = 254
           ParentFont = False
           TabOrder = 1
@@ -549 +549 @@
         object ButtonHomeAddressShow: TButton
           Left = 10
-          Height = 39
-          Top = 208
-          Width = 182
+          Height = 37
+          Top = 200
+          Width = 175
           Caption = 'Show on map'
           OnClick = ButtonHomeAddressShowClick
@@ -558 +558 @@
       end
       object Label12: TLabel
-        Left = 17
-        Height = 27
-        Top = 67
-        Width = 66
+        Left = 16
+        Height = 26
+        Top = 64
+        Width = 63
         Caption = 'Mobile:'
         ParentFont = False
       end
       object Label13: TLabel
-        Left = 17
-        Height = 27
-        Top = 21
-        Width = 62
+        Left = 16
+        Height = 26
+        Top = 20
+        Width = 59
         Caption = 'Phone:'
         ParentFont = False
       end
       object SpeedButtonHomeWeb: TSpeedButton
-        Left = 852
-        Height = 43
+        Left = 818
+        Height = 41
         Hint = 'Open in web browser'
-        Top = 167
-        Width = 43
+        Top = 160
+        Width = 41
         Images = Core.ImageList1
         ImageIndex = 15
@@ -586 +586 @@
       end
       object SpeedButtonHomeEmail: TSpeedButton
-        Left = 402
-        Height = 43
+        Left = 386
+        Height = 41
         Hint = 'Open in email client'
-        Top = 117
-        Width = 43
+        Top = 112
+        Width = 41
         Images = Core.ImageList1
         ImageIndex = 16
@@ -600 +600 @@
     object TabSheetWork: TTabSheet
       Caption = 'Work'
-      ClientHeight = 651
-      ClientWidth = 1000
+      ClientHeight = 624
+      ClientWidth = 960
       OnHide = TabSheetWorkHide
       OnShow = TabSheetWorkShow
       object EditOrganization: TEdit
-        Left = 180
-        Height = 43
-        Top = 67
-        Width = 265
+        Left = 173
+        Height = 42
+        Top = 64
+        Width = 254
         ParentFont = False
         TabOrder = 2
@@ -614 +614 @@
       object LabelOrganization: TLabel
         Left = 10
-        Height = 27
-        Top = 73
-        Width = 123
+        Height = 26
+        Top = 70
+        Width = 114
         Caption = 'Organization:'
         ParentFont = False
       end
       object LabelOrganization1: TLabel
-        Left = 470
-        Height = 27
-        Top = 25
-        Width = 116
+        Left = 451
+        Height = 26
+        Top = 24
+        Width = 106
         Caption = 'Department:'
         ParentFont = False
       end
       object EditDepartment: TEdit
-        Left = 633
-        Height = 43
-        Top = 21
-        Width = 265
+        Left = 608
+        Height = 42
+        Top = 20
+        Width = 254
         ParentFont = False
         TabOrder = 1
@@ -638 +638 @@
       object Label18: TLabel
         Left = 10
-        Height = 27
-        Top = 21
-        Width = 43
+        Height = 26
+        Top = 20
+        Width = 41
         Caption = 'Title:'
         ParentFont = False
       end
       object EditTitle: TEdit
-        Left = 180
-        Height = 43
-        Top = 17
-        Width = 265
+        Left = 173
+        Height = 42
+        Top = 16
+        Width = 254
         ParentFont = False
         TabOrder = 0
       end
       object EditWorkWeb: TEdit
-        Left = 180
-        Height = 43
-        Top = 267
-        Width = 668
+        Left = 173
+        Height = 42
+        Top = 256
+        Width = 641
         ParentFont = False
         TabOrder = 8
@@ -662 +662 @@
       object Label32: TLabel
         Left = 10
-        Height = 27
-        Top = 275
-        Width = 121
+        Height = 26
+        Top = 264
+        Width = 114
         Caption = 'Web address:'
         ParentFont = False
@@ -670 +670 @@
       object GroupBox2: TGroupBox
         Left = 8
-        Height = 283
-        Top = 325
-        Width = 920
+        Height = 272
+        Top = 312
+        Width = 883
         Caption = 'Address'
-        ClientHeight = 281
-        ClientWidth = 918
+        ClientHeight = 270
+        ClientWidth = 881
         TabOrder = 9
         object Label31: TLabel
           Left = 10
-          Height = 27
-          Top = 167
-          Width = 77
+          Height = 26
+          Top = 160
+          Width = 71
           Caption = 'Country:'
           ParentFont = False
         end
         object EditWorkAddressCountry: TEdit
-          Left = 180
-          Height = 43
-          Top = 158
-          Width = 265
+          Left = 173
+          Height = 42
+          Top = 152
+          Width = 254
           ParentFont = False
           TabOrder = 5
         end
         object EditWorkAddressRegion: TEdit
-          Left = 180
-          Height = 43
-          Top = 108
-          Width = 265
+          Left = 173
+          Height = 42
+          Top = 104
+          Width = 254
           ParentFont = False
           TabOrder = 4
@@ -703 +703 @@
         object Label30: TLabel
           Left = 10
-          Height = 27
-          Top = 117
-          Width = 68
+          Height = 26
+          Top = 112
+          Width = 64
           Caption = 'Region:'
           ParentFont = False
@@ -711 +711 @@
         object Label35: TLabel
           Left = 10
-          Height = 27
-          Top = 67
-          Width = 147
+          Height = 26
+          Top = 64
+          Width = 137
           Caption = 'Extended street:'
           ParentFont = False
         end
         object EditWorkAddressStreetExtended: TEdit
-          Left = 180
-          Height = 43
-          Top = 58
-          Width = 265
+          Left = 173
+          Height = 42
+          Top = 56
+          Width = 254
           ParentFont = False
           TabOrder = 2
@@ -727 +727 @@
         object Label28: TLabel
           Left = 10
-          Height = 27
-          Top = 19
-          Width = 58
+          Height = 26
+          Top = 18
+          Width = 54
           Caption = 'Street:'
           ParentFont = False
         end
         object EditWorkAddressStreet: TEdit
-          Left = 180
-          Height = 43
+          Left = 173
+          Height = 42
           Top = 8
-          Width = 265
+          Width = 254
           ParentFont = False
           TabOrder = 0
         end
         object Label34: TLabel
-          Left = 470
-          Height = 27
-          Top = 19
-          Width = 135
+          Left = 451
+          Height = 26
+          Top = 18
+          Width = 131
           Caption = 'Post office box:'
           ParentFont = False
         end
         object EditWorkAddressPostOfficeBox: TEdit
-          Left = 633
-          Height = 43
+          Left = 608
+          Height = 42
           Top = 8
-          Width = 265
+          Width = 254
           ParentFont = False
           TabOrder = 1
         end
         object EditWorkAddressCity: TEdit
-          Left = 633
-          Height = 43
-          Top = 58
-          Width = 265
+          Left = 608
+          Height = 42
+          Top = 56
+          Width = 254
           ParentFont = False
           TabOrder = 3
         end
         object Label29: TLabel
-          Left = 470
-          Height = 27
-          Top = 67
-          Width = 39
+          Left = 451
+          Height = 26
+          Top = 64
+          Width = 36
           Caption = 'City:'
           ParentFont = False
         end
         object EditWorkAddressPostalCode: TEdit
-          Left = 633
-          Height = 43
-          Top = 148
-          Width = 265
+          Left = 608
+          Height = 42
+          Top = 142
+          Width = 254
           ParentFont = False
           TabOrder = 6
         end
         object Label33: TLabel
-          Left = 470
-          Height = 27
-          Top = 156
-          Width = 107
+          Left = 451
+          Height = 26
+          Top = 150
+          Width = 103
           Caption = 'Postal code:'
           ParentFont = False
@@ -791 +791 @@
         object ButtonWorkAddressShow: TButton
           Left = 10
-          Height = 39
-          Top = 208
-          Width = 182
+          Height = 37
+          Top = 200
+          Width = 175
           Caption = 'Show on map'
           OnClick = ButtonWorkAddressShowClick
@@ -801 +801 @@
       object Label15: TLabel
         Left = 10
-        Height = 27
-        Top = 121
-        Width = 62
+        Height = 26
+        Top = 116
+        Width = 59
         Caption = 'Phone:'
         ParentFont = False
       end
       object EditWorkPhone: TEdit
-        Left = 180
-        Height = 43
-        Top = 117
-        Width = 265
+        Left = 173
+        Height = 42
+        Top = 112
+        Width = 254
         ParentFont = False
         TabOrder = 3
       end
       object Label16: TLabel
-        Left = 470
-        Height = 27
-        Top = 117
-        Width = 36
+        Left = 451
+        Height = 26
+        Top = 112
+        Width = 34
         Caption = 'Fax:'
         ParentFont = False
       end
       object EditWorkFax: TEdit
-        Left = 633
-        Height = 43
-        Top = 117
-        Width = 265
+        Left = 608
+        Height = 42
+        Top = 112
+        Width = 254
         ParentFont = False
         TabOrder = 4
       end
       object EditWorkPager: TEdit
-        Left = 633
-        Height = 43
-        Top = 162
-        Width = 265
+        Left = 608
+        Height = 42
+        Top = 156
+        Width = 254
         ParentFont = False
         TabOrder = 6
       end
       object Label17: TLabel
-        Left = 467
-        Height = 27
-        Top = 167
+        Left = 448
+        Height = 26
+        Top = 160
+        Width = 54
+        Caption = 'Pager:'
+        ParentFont = False
+      end
+      object EditWorkMobile: TEdit
+        Left = 173
+        Height = 42
+        Top = 160
+        Width = 254
+        ParentFont = False
+        TabOrder = 5
+      end
+      object Label19: TLabel
+        Left = 10
+        Height = 26
+        Top = 160
+        Width = 63
+        Caption = 'Mobile:'
+        ParentFont = False
+      end
+      object Label8: TLabel
+        Left = 10
+        Height = 26
+        Top = 210
         Width = 58
-        Caption = 'Pager:'
-        ParentFont = False
-      end
-      object EditWorkMobile: TEdit
-        Left = 180
-        Height = 43
-        Top = 167
-        Width = 265
-        ParentFont = False
-        TabOrder = 5
-      end
-      object Label19: TLabel
-        Left = 10
-        Height = 27
-        Top = 167
-        Width = 66
-        Caption = 'Mobile:'
-        ParentFont = False
-      end
-      object Label8: TLabel
-        Left = 10
-        Height = 27
-        Top = 219
-        Width = 60
         Caption = 'E-mail:'
         ParentFont = False
       end
       object EditWorkEmail: TEdit
-        Left = 180
-        Height = 43
-        Top = 219
-        Width = 218
+        Left = 173
+        Height = 42
+        Top = 210
+        Width = 209
         ParentFont = False
         TabOrder = 7
       end
       object SpeedButtonWorkWeb: TSpeedButton
-        Left = 855
-        Height = 43
+        Left = 821
+        Height = 41
         Hint = 'Open in web browser'
-        Top = 267
-        Width = 43
+        Top = 256
+        Width = 41
         Images = Core.ImageList1
         ImageIndex = 15
@@ -892 +892 @@
       end
       object SpeedButtonWorkEmail: TSpeedButton
-        Left = 402
-        Height = 43
+        Left = 386
+        Height = 41
         Hint = 'Open in email client'
-        Top = 219
-        Width = 43
+        Top = 210
+        Width = 41
         Images = Core.ImageList1
         ImageIndex = 16
@@ -906 +906 @@
     object TabSheetChat: TTabSheet
       Caption = 'Chat'
-      ClientHeight = 651
-      ClientWidth = 1000
+      ClientHeight = 624
+      ClientWidth = 960
       OnHide = TabSheetChatHide
       OnShow = TabSheetChatShow
       object Label20: TLabel
         Left = 10
-        Height = 27
-        Top = 25
-        Width = 64
+        Height = 26
+        Top = 24
+        Width = 59
         Caption = 'Jabber:'
         ParentFont = False
       end
       object EditJabber: TEdit
-        Left = 180
-        Height = 43
-        Top = 17
-        Width = 265
+        Left = 173
+        Height = 42
+        Top = 16
+        Width = 254
         ParentFont = False
         TabOrder = 0
@@ -928 +928 @@
       object LabelOrganization2: TLabel
         Left = 10
-        Height = 27
-        Top = 275
-        Width = 58
+        Height = 26
+        Top = 264
+        Width = 55
         Caption = 'Skype:'
         ParentFont = False
       end
       object EditSkype: TEdit
-        Left = 180
-        Height = 43
-        Top = 267
-        Width = 265
+        Left = 173
+        Height = 42
+        Top = 256
+        Width = 254
         ParentFont = False
         TabOrder = 10
@@ -944 +944 @@
       object Label21: TLabel
         Left = 10
-        Height = 27
-        Top = 75
-        Width = 46
+        Height = 26
+        Top = 72
+        Width = 45
         Caption = 'MSN:'
         ParentFont = False
       end
       object EditMsn: TEdit
-        Left = 180
-        Height = 43
-        Top = 67
-        Width = 265
+        Left = 173
+        Height = 42
+        Top = 64
+        Width = 254
         ParentFont = False
         TabOrder = 2
       end
       object LabelOrganization3: TLabel
-        Left = 470
-        Height = 27
-        Top = 75
-        Width = 37
+        Left = 451
+        Height = 26
+        Top = 72
+        Width = 36
         Caption = 'ICQ:'
         ParentFont = False
       end
       object EditIcq: TEdit
-        Left = 633
-        Height = 43
-        Top = 71
-        Width = 265
+        Left = 608
+        Height = 42
+        Top = 68
+        Width = 254
         ParentFont = False
         TabOrder = 3
@@ -976 +976 @@
       object Label23: TLabel
         Left = 10
-        Height = 27
-        Top = 125
-        Width = 35
+        Height = 26
+        Top = 120
+        Width = 33
         Caption = 'IRC:'
         ParentFont = False
       end
       object EditIrc: TEdit
-        Left = 180
-        Height = 43
-        Top = 117
-        Width = 265
+        Left = 173
+        Height = 42
+        Top = 112
+        Width = 254
         ParentFont = False
         TabOrder = 4
       end
       object LabelOrganization4: TLabel
-        Left = 470
-        Height = 27
-        Top = 125
-        Width = 40
+        Left = 451
+        Height = 26
+        Top = 120
+        Width = 39
         Caption = 'AIM:'
         ParentFont = False
       end
       object EditAim: TEdit
-        Left = 633
-        Height = 43
-        Top = 121
-        Width = 265
+        Left = 608
+        Height = 42
+        Top = 116
+        Width = 254
         ParentFont = False
         TabOrder = 5
@@ -1008 +1008 @@
       object Label47: TLabel
         Left = 10
-        Height = 27
-        Top = 175
-        Width = 109
+        Height = 26
+        Top = 168
+        Width = 105
         Caption = 'Google Talk:'
         ParentFont = False
       end
       object EditGoogleTalk: TEdit
-        Left = 180
-        Height = 43
-        Top = 167
-        Width = 265
+        Left = 173
+        Height = 42
+        Top = 160
+        Width = 254
         ParentFont = False
         TabOrder = 6
       end
       object LabelOrganization5: TLabel
-        Left = 470
-        Height = 27
-        Top = 175
-        Width = 65
+        Left = 451
+        Height = 26
+        Top = 168
+        Width = 62
         Caption = 'Yahoo!:'
         ParentFont = False
       end
       object EditYahoo: TEdit
-        Left = 633
-        Height = 43
-        Top = 171
-        Width = 265
+        Left = 608
+        Height = 42
+        Top = 164
+        Width = 254
         ParentFont = False
         TabOrder = 7
@@ -1040 +1040 @@
       object Label48: TLabel
         Left = 10
-        Height = 27
-        Top = 225
-        Width = 127
+        Height = 26
+        Top = 216
+        Width = 121
         Caption = 'Windows Live:'
         ParentFont = False
       end
       object EditWindowsLive: TEdit
-        Left = 180
-        Height = 43
-        Top = 217
-        Width = 265
+        Left = 173
+        Height = 42
+        Top = 208
+        Width = 254
         ParentFont = False
         TabOrder = 8
       end
       object LabelOrganization6: TLabel
-        Left = 470
-        Height = 27
-        Top = 225
-        Width = 35
+        Left = 451
+        Height = 26
+        Top = 216
+        Width = 33
         Caption = 'QQ:'
         ParentFont = False
       end
       object EditQq: TEdit
-        Left = 633
-        Height = 43
-        Top = 221
-        Width = 265
+        Left = 608
+        Height = 42
+        Top = 212
+        Width = 254
         ParentFont = False
         TabOrder = 9
       end
       object Label55: TLabel
-        Left = 470
-        Height = 27
-        Top = 25
-        Width = 63
+        Left = 451
+        Height = 26
+        Top = 24
+        Width = 59
         Caption = 'Matrix:'
         ParentFont = False
       end
       object EditMatrix: TEdit
-        Left = 633
-        Height = 43
-        Top = 21
-        Width = 265
+        Left = 608
+        Height = 42
+        Top = 20
+        Width = 254
         ParentFont = False
         TabOrder = 1
@@ -1088 +1088 @@
       object Label57: TLabel
         Left = 10
-        Height = 27
-        Top = 325
-        Width = 103
+        Height = 26
+        Top = 312
+        Width = 99
         Caption = 'GroupWise:'
         ParentFont = False
       end
       object EditGroupWise: TEdit
-        Left = 180
-        Height = 43
-        Top = 317
-        Width = 265
+        Left = 173
+        Height = 42
+        Top = 304
+        Width = 254
         ParentFont = False
         TabOrder = 11
       end
       object LabelOrganization12: TLabel
-        Left = 470
-        Height = 27
-        Top = 325
-        Width = 103
+        Left = 451
+        Height = 26
+        Top = 312
+        Width = 95
         Caption = 'GaduGadu:'
         ParentFont = False
       end
       object EditGaduGadu: TEdit
-        Left = 633
-        Height = 43
-        Top = 321
-        Width = 265
+        Left = 608
+        Height = 42
+        Top = 308
+        Width = 254
         ParentFont = False
         TabOrder = 12
@@ -1121 +1121 @@
     object TabSheetSocial: TTabSheet
       Caption = 'Social'
-      ClientHeight = 651
-      ClientWidth = 1000
+      ClientHeight = 624
+      ClientWidth = 960
       OnHide = TabSheetSocialHide
       OnShow = TabSheetSocialShow
       object Label50: TLabel
-        Left = 470
-        Height = 27
-        Top = 171
+        Left = 451
+        Height = 26
+        Top = 164
+        Width = 79
+        Caption = 'Myspace:'
+        ParentFont = False
+      end
+      object EditMySpace: TEdit
+        Left = 608
+        Height = 42
+        Top = 160
+        Width = 254
+        ParentFont = False
+        TabOrder = 7
+      end
+      object EditTwitter: TEdit
+        Left = 173
+        Height = 42
+        Top = 64
+        Width = 254
+        ParentFont = False
+        TabOrder = 2
+      end
+      object Label51: TLabel
+        Left = 10
+        Height = 26
+        Top = 68
+        Width = 63
+        Caption = 'Twitter:'
+        ParentFont = False
+      end
+      object Label52: TLabel
+        Left = 10
+        Height = 26
+        Top = 116
+        Width = 92
+        Caption = 'Instagram:'
+        ParentFont = False
+      end
+      object Label53: TLabel
+        Left = 10
+        Height = 26
+        Top = 164
+        Width = 78
+        Caption = 'LinkedIn:'
+        ParentFont = False
+      end
+      object Label54: TLabel
+        Left = 10
+        Height = 26
+        Top = 212
+        Width = 83
+        Caption = 'Snapchat:'
+        ParentFont = False
+      end
+      object EditSnapchat: TEdit
+        Left = 173
+        Height = 42
+        Top = 208
+        Width = 254
+        ParentFont = False
+        TabOrder = 8
+      end
+      object EditLinkedIn: TEdit
+        Left = 173
+        Height = 42
+        Top = 160
+        Width = 254
+        ParentFont = False
+        TabOrder = 6
+      end
+      object EditInstagram: TEdit
+        Left = 173
+        Height = 42
+        Top = 112
+        Width = 254
+        ParentFont = False
+        TabOrder = 4
+      end
+      object LabelOrganization7: TLabel
+        Left = 451
+        Height = 26
+        Top = 24
         Width = 84
-        Caption = 'Myspace:'
-        ParentFont = False
-      end
-      object EditMySpace: TEdit
-        Left = 633
-        Height = 43
-        Top = 167
-        Width = 265
-        ParentFont = False
-        TabOrder = 7
-      end
-      object EditTwitter: TEdit
-        Left = 180
-        Height = 43
-        Top = 67
-        Width = 265
-        ParentFont = False
-        TabOrder = 2
-      end
-      object Label51: TLabel
-        Left = 10
-        Height = 27
-        Top = 71
-        Width = 68
-        Caption = 'Twitter:'
-        ParentFont = False
-      end
-      object Label52: TLabel
-        Left = 10
-        Height = 27
-        Top = 121
-        Width = 98
-        Caption = 'Instagram:'
-        ParentFont = False
-      end
-      object Label53: TLabel
-        Left = 10
-        Height = 27
-        Top = 171
-        Width = 83
-        Caption = 'LinkedIn:'
-        ParentFont = False
-      end
-      object Label54: TLabel
-        Left = 10
-        Height = 27
-        Top = 221
-        Width = 89
-        Caption = 'Snapchat:'
-        ParentFont = False
-      end
-      object EditSnapchat: TEdit
-        Left = 180
-        Height = 43
-        Top = 217
-        Width = 265
-        ParentFont = False
-        TabOrder = 8
-      end
-      object EditLinkedIn: TEdit
-        Left = 180
-        Height = 43
-        Top = 167
-        Width = 265
-        ParentFont = False
-        TabOrder = 6
-      end
-      object EditInstagram: TEdit
-        Left = 180
-        Height = 43
-        Top = 117
-        Width = 265
-        ParentFont = False
-        TabOrder = 4
-      end
-      object LabelOrganization7: TLabel
-        Left = 470
-        Height = 27
-        Top = 25
+        Caption = 'PeerTube:'
+        ParentFont = False
+      end
+      object LabelOrganization8: TLabel
+        Left = 451
+        Height = 26
+        Top = 116
+        Width = 77
+        Caption = 'YouTube:'
+        ParentFont = False
+      end
+      object EditMastodon: TEdit
+        Left = 171
+        Height = 42
+        Top = 16
+        Width = 254
+        ParentFont = False
+        TabOrder = 0
+      end
+      object LabelOrganization9: TLabel
+        Left = 10
+        Height = 26
+        Top = 24
         Width = 90
-        Caption = 'PeerTube:'
-        ParentFont = False
-      end
-      object LabelOrganization8: TLabel
-        Left = 470
-        Height = 27
-        Top = 121
-        Width = 82
-        Caption = 'YouTube:'
-        ParentFont = False
-      end
-      object EditMastodon: TEdit
-        Left = 178
-        Height = 43
-        Top = 17
-        Width = 265
-        ParentFont = False
-        TabOrder = 0
-      end
-      object LabelOrganization9: TLabel
-        Left = 10
-        Height = 27
-        Top = 25
-        Width = 95
         Caption = 'Mastodon:'
         ParentFont = False
       end
       object LabelOrganization10: TLabel
-        Left = 470
-        Height = 27
-        Top = 221
-        Width = 64
+        Left = 451
+        Height = 26
+        Top = 212
+        Width = 59
         Caption = 'Reddit:'
         ParentFont = False
       end
       object EditReddit: TEdit
-        Left = 633
-        Height = 43
-        Top = 217
-        Width = 265
+        Left = 608
+        Height = 42
+        Top = 208
+        Width = 254
         ParentFont = False
         TabOrder = 9
       end
       object EditPeerTube: TEdit
-        Left = 633
-        Height = 43
-        Top = 17
-        Width = 265
+        Left = 608
+        Height = 42
+        Top = 16
+        Width = 254
         ParentFont = False
         TabOrder = 1
       end
       object EditYouTube: TEdit
-        Left = 633
-        Height = 43
-        Top = 117
-        Width = 265
+        Left = 608
+        Height = 42
+        Top = 112
+        Width = 254
         ParentFont = False
         TabOrder = 5
       end
       object EditFacebook: TEdit
-        Left = 633
-        Height = 43
-        Top = 67
-        Width = 265
+        Left = 608
+        Height = 42
+        Top = 64
+        Width = 254
         ParentFont = False
         TabOrder = 3
       end
       object LabelOrganization11: TLabel
-        Left = 470
-        Height = 27
-        Top = 71
-        Width = 90
+        Left = 451
+        Height = 26
+        Top = 68
+        Width = 86
         Caption = 'Facebook:'
         ParentFont = False
@@ -1288 +1288 @@
     object TabSheetOthers: TTabSheet
       Caption = 'Others'
-      ClientHeight = 651
-      ClientWidth = 1000
+      ClientHeight = 624
+      ClientWidth = 960
       OnHide = TabSheetOthersHide
       OnShow = TabSheetOthersShow
       object MemoNotes: TMemo
-        Left = 17
-        Height = 289
-        Top = 50
-        Width = 671
+        Left = 16
+        Height = 276
+        Top = 48
+        Width = 644
         Anchors = [akTop, akLeft, akRight, akBottom]
         ParentFont = False
@@ -1304 +1304 @@
       end
       object Label6: TLabel
-        Left = 17
-        Height = 27
-        Top = 17
-        Width = 57
+        Left = 16
+        Height = 26
+        Top = 16
+        Width = 55
         Caption = 'Notes:'
         ParentFont = False
       end
       object BarcodeQR1: TBarcodeQR
-        Left = 704
-        Height = 286
-        Top = 50
-        Width = 280
+        Left = 676
+        Height = 275
+        Top = 48
+        Width = 269
         ParentColor = False
         Text = 'TBarcodeQR'
       end
       object Label1: TLabel
-        Left = 704
-        Height = 27
-        Top = 16
-        Width = 80
+        Left = 677
+        Height = 26
+        Top = 15
+        Width = 76
         Anchors = [akTop, akRight]
         Caption = 'QR code:'
@@ -1336 +1336 @@
   object ActionList1: TActionList
     Images = Core.ImageList1
-    Left = 632
-    Top = 608
+    Left = 607
+    Top = 584
     object APhotoLoad: TAction
       Caption = 'Load from file'
@@ -1361 +1361 @@
   object PopupMenuPhoto: TPopupMenu
     Images = Core.ImageList1
-    Left = 864
-    Top = 608
+    Left = 829
+    Top = 584
     object MenuItem4: TMenuItem
       Action = APhotoShow
@@ -1381 +1381 @@
   object OpenPictureDialog1: TOpenPictureDialog
     Title = 'Open existing file'
-    Left = 175
-    Top = 575
+    Left = 168
+    Top = 552
   end
   object SavePictureDialog1: TSavePictureDialog
     Title = 'Save file as'
-    Left = 176
-    Top = 488
+    Left = 169
+    Top = 468
   end
   object CalendarDialog1: TCalendarDialog
@@ -1394 +1394 @@
     OKCaption = '&OK'
     CancelCaption = 'Cancel'
-    Left = 448
-    Top = 608
+    Left = 430
+    Top = 584
   end
   object PopupMenuQrCode: TPopupMenu
-    Left = 528
-    Top = 472
+    Left = 507
+    Top = 453
     object MenuItemSaveQrToFile: TMenuItem
       Caption = 'Save to file'

trunk/Forms/UFormContacts.lfm

@@ -1 +1 @@
 object FormContacts: TFormContacts
   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
@@ -16 +16 @@
   object ListView1: TListView
     Left = 0
-    Height = 844
+    Height = 810
     Top = 0
-    Width = 1260
+    Width = 1210
     Align = alClient
     Columns = <    
       item
         Caption = 'Full Name'
-        Width = 312
+        Width = 300
       end    
       item
         Caption = 'First name'
-        Width = 156
+        Width = 150
       end    
       item
         Caption = 'Middle name'
-        Width = 156
+        Width = 150
       end    
       item
         Caption = 'Last Name'
-        Width = 156
+        Width = 150
       end    
       item
         Caption = 'Phone'
-        Width = 156
+        Width = 150
       end    
       item
         Caption = 'Mobile'
-        Width = 156
+        Width = 150
       end    
       item
         Caption = 'Home phone'
-        Width = 156
+        Width = 150
       end    
       item
         Caption = 'Work phone'
-        Width = 156
+        Width = 150
       end>
     MultiSelect = True
@@ -67 +67 @@
   object ToolBar1: TToolBar
     Left = 0
-    Height = 41
-    Top = 877
-    Width = 1260
+    Height = 39
+    Top = 842
+    Width = 1210
     Align = alBottom
     Images = Core.ImageList1
@@ -82 +82 @@
     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 = ALoadFromFile
     end
     object ToolButton7: TToolButton
-      Left = 189
+      Left = 184
       Top = 2
       Action = ASaveToFile
@@ -115 +115 @@
   object ListViewFilter1: TListViewFilter
     Left = 0
-    Height = 33
-    Top = 844
-    Width = 1260
+    Height = 32
+    Top = 810
+    Width = 1210
     OnChange = ListViewFilter1Change
     Align = alBottom
@@ -123 +123 @@
   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
@@ -134 +134 @@
   object PopupMenuContact: TPopupMenu
     Images = Core.ImageList1
-    Left = 453
-    Top = 274
+    Left = 435
+    Top = 263
     object MenuItem1: TMenuItem
       Action = AAdd
@@ -175 +175 @@
   object ActionList1: TActionList
     Images = Core.ImageList1
-    Left = 763
-    Top = 268
+    Left = 732
+    Top = 257
     object AAdd: TAction
       Caption = 'Add'
@@ -241 +241 @@
     Column = 0
     Order = soNone
-    Left = 550
-    Top = 446
+    Left = 528
+    Top = 428
   end
   object SaveDialog1: TSaveDialog
-    Left = 750
-    Top = 425
+    Left = 720
+    Top = 408
   end
   object OpenDialog1: TOpenDialog
-    Left = 750
-    Top = 500
+    Left = 720
+    Top = 480
   end
 end

trunk/Forms/UFormContacts.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  Menus, ActnList, UContact, UListViewSort, fgl, LazUTF8, Clipbrd;
+  Menus, ActnList, UContact, UListViewSort, LazUTF8, Clipbrd,
+  Generics.Collections;
 
 type
@@ -76 +77 @@
     FContacts: TContacts;
     FUpdateCount: Integer;
-    procedure FilterList(List: TFPGObjectList<TObject>);
+    procedure FilterList(List: TObjectList<TObject>);
     procedure SetContacts(AValue: TContacts);
     function GetPreviousContact(Contact: TContact): TContact;
@@ -188 +189 @@
 end;
 
-procedure TFormContacts.FilterList(List: TFPGObjectList<TObject>);
+procedure TFormContacts.FilterList(List: TObjectList<TObject>);
 var
   I: Integer;
@@ -194 +195 @@
   K: Integer;
   FoundCount: Integer;
+  Item: TContact;
 begin
   for I := List.Count - 1 downto 0 do begin
     if List.Items[I] is TContact then begin
-      with TContact(List.Items[I]) do begin
+      Item := TContact(List.Items[I]);
+      with Item do begin
         FoundCount := 0;
         for J := 0 to FilterItems.Count - 1 do
         if FilterItems[J].FieldIndex = cfNone then begin
-          for K := 0 to TContact(List.Items[I]).GetFields.Count - 1 do begin
+          for K := 0 to Item.GetFields.Count - 1 do begin
             if Pos(UTF8LowerCase(FilterItems[J].Value),
-              UTF8LowerCase(TContact(List.Items[I]).Fields[TContact.GetFields[K].Index])) > 0 then begin
+              UTF8LowerCase(Item.Fields[TContact.GetFields[K].Index])) > 0 then begin
                 Inc(FoundCount);
                 Break;
@@ -210 +213 @@
         end else begin
           if Pos(UTF8LowerCase(FilterItems[J].Value),
-            UTF8LowerCase(TContact(List.Items[I]).Fields[FilterItems[J].FieldIndex])) > 0 then
+            UTF8LowerCase(Item.Fields[FilterItems[J].FieldIndex])) > 0 then
               Inc(FoundCount);
         end;

trunk/Forms/UFormFind.lfm

@@ -1 +1 @@
 object FormFind: TFormFind
   Left = 469
-  Height = 545
+  Height = 523
   Top = 407
-  Width = 841
+  Width = 807
   ActiveControl = EditValue
   Caption = 'Find'
-  ClientHeight = 545
-  ClientWidth = 841
-  DesignTimePPI = 150
+  ClientHeight = 523
+  ClientWidth = 807
+  DesignTimePPI = 144
   OnClose = FormClose
   OnCreate = FormCreate
@@ -16 +16 @@
   object Panel1: TPanel
     Left = 0
-    Height = 60
+    Height = 58
     Top = 0
-    Width = 841
+    Width = 807
     Align = alTop
     BevelOuter = bvNone
-    ClientHeight = 60
-    ClientWidth = 841
+    ClientHeight = 58
+    ClientWidth = 807
     ParentFont = False
     TabOrder = 0
     object ComboBoxField: TComboBox
-      Left = 192
-      Height = 42
-      Top = 17
-      Width = 250
+      Left = 184
+      Height = 41
+      Top = 16
+      Width = 240
       ItemHeight = 0
       OnChange = ComboBoxFieldChange
@@ -37 +37 @@
     end
     object Label1: TLabel
-      Left = 14
-      Height = 27
-      Top = 20
-      Width = 142
+      Left = 13
+      Height = 26
+      Top = 19
+      Width = 135
       Caption = 'By contact field:'
       ParentFont = False
     end
     object EditValue: TEdit
-      Left = 458
-      Height = 43
-      Top = 17
-      Width = 217
+      Left = 440
+      Height = 42
+      Top = 16
+      Width = 208
       OnKeyPress = EditValueKeyPress
       TabOrder = 1
     end
     object ButtonFind: TButton
-      Left = 692
-      Height = 40
-      Top = 17
-      Width = 118
+      Left = 664
+      Height = 38
+      Top = 16
+      Width = 113
       Caption = 'Find'
       OnClick = ButtonFindClick

trunk/Forms/UFormFind.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  ExtCtrls, StdCtrls, ActnList, Menus, fgl, UContact, UFormContacts;
+  ExtCtrls, StdCtrls, ActnList, Menus, UContact, UFormContacts;
 
 type

trunk/Forms/UFormFindDuplicity.lfm

@@ -1 +1 @@
 object FormFindDuplicity: TFormFindDuplicity
   Left = 455
-  Height = 545
+  Height = 523
   Top = 355
-  Width = 841
+  Width = 807
   Caption = 'Find duplicities'
-  ClientHeight = 545
-  ClientWidth = 841
-  DesignTimePPI = 150
+  ClientHeight = 523
+  ClientWidth = 807
+  DesignTimePPI = 144
   OnClose = FormClose
   OnCreate = FormCreate
@@ -15 +15 @@
   object ListView1: TListView
     Left = 5
-    Height = 475
-    Top = 65
-    Width = 831
+    Height = 455
+    Top = 63
+    Width = 797
     Align = alClient
     BorderSpacing.Around = 5
@@ -23 +23 @@
       item
         Caption = 'Field'
-        Width = 188
+        Width = 180
       end    
       item
         Caption = 'Contacts'
-        Width = 375
+        Width = 360
       end    
       item
         Caption = 'Count'
-        Width = 253
+        Width = 243
       end>
     OwnerData = True
@@ -45 +45 @@
   object Panel1: TPanel
     Left = 0
-    Height = 60
+    Height = 58
     Top = 0
-    Width = 841
+    Width = 807
     Align = alTop
     BevelOuter = bvNone
-    ClientHeight = 60
-    ClientWidth = 841
+    ClientHeight = 58
+    ClientWidth = 807
     ParentFont = False
     TabOrder = 1
     object ComboBoxField: TComboBox
-      Left = 167
-      Height = 42
-      Top = 17
-      Width = 340
+      Left = 160
+      Height = 41
+      Top = 16
+      Width = 326
       ItemHeight = 0
       OnChange = ComboBoxFieldChange
@@ -66 +66 @@
     end
     object Label1: TLabel
-      Left = 14
-      Height = 27
-      Top = 20
-      Width = 142
+      Left = 13
+      Height = 26
+      Top = 19
+      Width = 135
       Caption = 'By contact field:'
       ParentFont = False
     end
     object ButtonMerge: TButton
-      Left = 517
-      Height = 40
-      Top = 15
-      Width = 118
+      Left = 496
+      Height = 38
+      Top = 14
+      Width = 113
       Caption = 'Merge'
       OnClick = ButtonMergeClick
@@ -84 +84 @@
   end
   object ActionList1: TActionList
-    Left = 273
-    Top = 160
+    Left = 262
+    Top = 154
     object AShowContacts: TAction
       Caption = 'Show contacts'
@@ -92 +92 @@
   end
   object PopupMenu1: TPopupMenu
-    Left = 94
-    Top = 155
+    Left = 90
+    Top = 149
     object MenuItem1: TMenuItem
       Action = AShowContacts

trunk/Forms/UFormFindDuplicity.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  ExtCtrls, StdCtrls, ActnList, Menus, fgl, UContact;
+  ExtCtrls, StdCtrls, ActnList, Menus, UContact, Generics.Collections,
+  Generics.Defaults;
 
 type
@@ -20 +21 @@
   { TFoundItems }
 
-  TFoundItems = class(TFPGObjectList<TFoundItem>)
+  TFoundItems = class(TObjectList<TFoundItem>)
     function SearchByField(Field: string): TFoundItem;
   end;
@@ -135 +136 @@
 end;
 
-function FoundItemsSort(const Item1, Item2: TFoundItem): Integer;
+function FoundItemsSort(constref Item1, Item2: TFoundItem): Integer;
 begin
   if Item1.Contacts.Count < Item2.Contacts.Count then Result := 1
@@ -161 +162 @@
     end;
   end;
-  FoundItems.Sort(FoundItemsSort);
+  FoundItems.Sort(TComparer<TFoundItem>.Construct(FoundItemsSort));
   ReloadList;
 end;

trunk/Forms/UFormImage.lfm

@@ -1 +1 @@
 object FormImage: TFormImage
   Left = 761
-  Height = 546
+  Height = 524
   Top = 539
-  Width = 741
+  Width = 711
   Caption = 'Photo'
-  ClientHeight = 546
-  ClientWidth = 741
-  Constraints.MinHeight = 178
-  Constraints.MinWidth = 741
-  DesignTimePPI = 150
+  ClientHeight = 524
+  ClientWidth = 711
+  Constraints.MinHeight = 171
+  Constraints.MinWidth = 711
+  DesignTimePPI = 144
   OnClose = FormClose
   OnCreate = FormCreate
@@ -16 +16 @@
   LCLVersion = '2.2.0.4'
   object ImagePhoto: TImage
-    Left = 16
-    Height = 412
-    Top = 16
-    Width = 707
+    Left = 15
+    Height = 396
+    Top = 15
+    Width = 679
     Anchors = [akTop, akLeft, akRight, akBottom]
     Center = True
@@ -26 +26 @@
   end
   object ButtonLoad: TButton
-    Left = 16
-    Height = 39
-    Top = 492
-    Width = 176
+    Left = 15
+    Height = 37
+    Top = 473
+    Width = 169
     Anchors = [akLeft, akBottom]
     Caption = 'Load from file'
@@ -36 +36 @@
   end
   object ButtonSave: TButton
-    Left = 200
-    Height = 39
-    Top = 491
-    Width = 168
+    Left = 192
+    Height = 37
+    Top = 472
+    Width = 161
     Anchors = [akLeft, akBottom]
     Caption = 'Save to file'
@@ -46 +46 @@
   end
   object ButtonClear: TButton
-    Left = 376
-    Height = 39
-    Top = 492
-    Width = 104
+    Left = 361
+    Height = 37
+    Top = 473
+    Width = 100
     Anchors = [akLeft, akBottom]
     Caption = 'Clear'
@@ -56 +56 @@
   end
   object EditUrl: TEdit
-    Left = 88
-    Height = 43
-    Top = 435
-    Width = 635
+    Left = 84
+    Height = 42
+    Top = 417
+    Width = 610
     Anchors = [akLeft, akRight, akBottom]
     OnChange = EditUrlChange
@@ -65 +65 @@
   end
   object ButtonCancel: TButton
-    Left = 504
-    Height = 39
-    Top = 492
-    Width = 104
+    Left = 483
+    Height = 37
+    Top = 473
+    Width = 100
     Anchors = [akRight, akBottom]
     Caption = 'Cancel'
@@ -75 +75 @@
   end
   object ButtonOk: TButton
-    Left = 619
-    Height = 39
-    Top = 492
-    Width = 104
+    Left = 594
+    Height = 37
+    Top = 473
+    Width = 100
     Anchors = [akRight, akBottom]
     Caption = 'OK'
@@ -85 +85 @@
   end
   object Label1: TLabel
-    Left = 16
-    Height = 27
-    Top = 443
-    Width = 41
+    Left = 15
+    Height = 26
+    Top = 425
+    Width = 38
     Anchors = [akLeft, akBottom]
     Caption = 'URL:'
   end
   object OpenPictureDialog1: TOpenPictureDialog
-    Left = 132
-    Top = 216
+    Left = 127
+    Top = 207
   end
   object SavePictureDialog1: TSavePictureDialog
-    Left = 320
-    Top = 216
+    Left = 307
+    Top = 207
   end
 end

trunk/Forms/UFormProperties.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  Menus, ActnList, UContact, UDataFile, UListViewSort, fgl, LazUTF8;
+  Menus, ActnList, UContact, UDataFile, UListViewSort, LazUTF8,
+  Generics.Collections;
 
 type
@@ -64 +65 @@
     FProperties: TContactProperties;
     FUpdateCount: Integer;
-    procedure FilterList(List: TFPGObjectList<TObject>);
+    procedure FilterList(List: TObjectList<TObject>);
     procedure SetProperties(AValue: TContactProperties);
     procedure DoUpdateInterface;
@@ -167 +168 @@
 end;
 
-procedure TFormProperties.FilterList(List: TFPGObjectList<TObject>);
+procedure TFormProperties.FilterList(List: TObjectList<TObject>);
 var
   I: Integer;

trunk/Forms/UFormTest.pas

@@ -49 +49 @@
 
 uses
-  UCore, UFormTestCase, UContact, UTestCases;
+  UCore, UFormTestCase, UContact;
 
 { TFormTest }

trunk/Packages/Common/Common.lpk

@@ -33 +33 @@
       <Other>
         <CompilerMessages>
-          <IgnoredMessages idx6058="True" idx5024="True" idx3124="True" idx3123="True"/>
+          <IgnoredMessages idx6058="True" idx5071="True" idx5024="True" idx3124="True" idx3123="True"/>
         </CompilerMessages>
       </Other>

trunk/Packages/Common/UDebugLog.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, FileUtil, fgl, SyncObjs;
+  Classes, SysUtils, FileUtil, Generics.Collections, SyncObjs;
 
 type
@@ -13 +13 @@
     Group: string;
     Text: string;
+  end;
+
+  TDebugLogItems = class(TObjectList<TDebugLogItem>)
   end;
 
@@ -27 +30 @@
     procedure SetMaxCount(const AValue: Integer);
   public
-    Items: TFPGObjectList<TDebugLogItem>;
+    Items: TDebugLogItems;
     Lock: TCriticalSection;
     procedure Add(Text: string; Group: string = '');
@@ -116 +119 @@
 begin
   inherited;
-  Items := TFPGObjectList<TDebugLogItem>.Create;
+  Items := TDebugLogItems.Create;
   Lock := TCriticalSection.Create;
   MaxCount := 100;
@@ -125 +128 @@
 destructor TDebugLog.Destroy;
 begin
-  Items.Free;
-  Lock.Free;
+  FreeAndNil(Items);
+  FreeAndNil(Lock);
   inherited;
 end;

trunk/Packages/Common/UFindFile.pas

@@ -35 +35 @@
   private
     s : TStringList;
-
     fSubFolder : boolean;
     fAttr: TFileAttrib;
     fPath : string;
     fFileMask : string;
-
     procedure SetPath(Value: string);
     procedure FileSearch(const inPath : string);
@@ -46 +44 @@
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
-
     function SearchForFiles: TStringList;
   published
@@ -64 +61 @@
 
 procedure Register;
+
 
 implementation

trunk/Packages/Common/UJobProgressView.pas

@@ -5 +5 @@
 uses
   SysUtils, Variants, Classes, Graphics, Controls, Forms, Syncobjs,
-  Dialogs, ComCtrls, StdCtrls, ExtCtrls, fgl, UThreading, Math,
+  Dialogs, ComCtrls, StdCtrls, ExtCtrls, Generics.Collections, UThreading, Math,
   DateUtils;
 
@@ -69 +69 @@
   end;
 
-  TJobs = class(TFPGObjectList<TJob>)
+  TJobs = class(TObjectList<TJob>)
   end;
 

trunk/Packages/Common/ULanguages.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, fgl;
+  Classes, SysUtils, Generics.Collections;
 
 type
@@ -15 +15 @@
   { TLanguages }
 
-  TLanguages = class(TFPGObjectList<TLanguage>)
+  TLanguages = class(TObjectList<TLanguage>)
     function SearchByCode(ACode: string): TLanguage;
     procedure AddNew(Code: string; Name: string);

trunk/Packages/Common/UListViewSort.pas

@@ -7 +7 @@
 uses
   {$IFDEF Windows}Windows, CommCtrl, LMessages, {$ENDIF}Classes, Graphics, ComCtrls, SysUtils,
-  Controls, DateUtils, Dialogs, fgl, Forms, Grids, StdCtrls, ExtCtrls,
-  LclIntf, LclType, LResources;
+  Controls, DateUtils, Dialogs, Forms, Grids, StdCtrls, ExtCtrls,
+  LclIntf, LclType, LResources, Generics.Collections, Generics.Defaults;
 
 type
@@ -17 +17 @@
   TCompareEvent = function (Item1, Item2: TObject): Integer of object;
   TListFilterEvent = procedure (ListViewSort: TListViewSort) of object;
+
+  TObjects = TObjectList<TObject>;
 
   { TListViewSort }
@@ -50 +52 @@
     {$ENDIF}
   public
-    List: TFPGObjectList<TObject>;
-    Source: TFPGObjectList<TObject>;
+    Source: TObjects;
+    List: TObjects;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -336 +338 @@
   ListViewSortCompare: TCompareEvent;
 
-function ListViewCompare(const Item1, Item2: TObject): Integer;
+function ListViewCompare(constref Item1, Item2: TObject): Integer;
 begin
   Result := ListViewSortCompare(Item1, Item2);
@@ -347 +349 @@
   ListViewSortCompare := Compare;
   if (List.Count > 0) then
-    List.Sort(ListViewCompare);
+    List.Sort(TComparer<TObject>.Construct(ListViewCompare));
 end;
 
@@ -353 +355 @@
 begin
   if Assigned(FOnFilter) then FOnFilter(Self)
-  else if Assigned(Source) then
-    List.Assign(Source) else
+  else if Assigned(Source) then begin
     List.Clear;
+    List.AddRange(Source);
+  end else List.Clear;
   if ListView.Items.Count <> List.Count then
     ListView.Items.Count := List.Count;
@@ -410 +413 @@
 begin
   inherited;
-  List := TFPGObjectList<TObject>.Create;
-  List.FreeObjects := False;
+  List := TObjects.Create;
+  List.OwnsObjects := False;
 end;
 
 destructor TListViewSort.Destroy;
 begin
-  List.Free;
+  FreeAndNil(List);
   inherited;
 end;

trunk/Packages/Common/UMetaCanvas.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Graphics, Types, fgl;
+  Classes, SysUtils, Graphics, Types, Generics.Collections;
 
 type
@@ -17 +17 @@
   end;
 
-  TCanvasObjects = class(TFPGObjectList<TCanvasObject>)
+  TCanvasObjects = class(TObjectList<TCanvasObject>)
   end;
 

trunk/Packages/Common/UPool.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, syncobjs, fgl, UThreading;
+  Classes, SysUtils, syncobjs, Generics.Collections, UThreading;
 
 type
@@ -20 +20 @@
     function NewItemObject: TObject; virtual;
   public
-    Items: TFPGObjectList<TObject>;
-    FreeItems: TFPGObjectList<TObject>;
+    Items: TObjectList<TObject>;
+    FreeItems: TObjectList<TObject>;
     function Acquire: TObject; virtual;
     procedure Release(Item: TObject); virtual;
@@ -183 +183 @@
 begin
   inherited;
-  Items := TFPGObjectList<TObject>.Create;
-  FreeItems := TFPGObjectList<TObject>.Create;
-  FreeItems.FreeObjects := False;
+  Items := TObjectList<TObject>.Create;
+  FreeItems := TObjectList<TObject>.Create;
+  FreeItems.OwnsObjects := False;
   FReleaseEvent := TEvent.Create(nil, False, False, '');
 end;

trunk/Packages/Common/UScaleDPI.pas

@@ -6 +6 @@
 
 uses
-  Classes, Forms, Graphics, Controls, ComCtrls, LCLType, SysUtils, fgl;
+  Classes, Forms, Graphics, Controls, ComCtrls, LCLType, SysUtils,
+  Generics.Collections;
 
 type
@@ -26 +27 @@
   end;
 
-  TControlDimensions = class(TFPGObjectList<TControlDimension>)
+  TControlDimensions = class(TObjectList<TControlDimension>)
   end;
 

trunk/Packages/Common/UTheme.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, Graphics, ComCtrls, Controls, ExtCtrls, Menus, StdCtrls,
-  Spin, Forms, fgl, Grids;
+  Spin, Forms, Generics.Collections, Grids;
 
 type
@@ -19 +19 @@
   { TThemes }
 
-  TThemes = class(TFPGObjectList<TTheme>)
+  TThemes = class(TObjectList<TTheme>)
     function AddNew(Name: string): TTheme;
     function FindByName(Name: string): TTheme;

trunk/Packages/Common/UThreading.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Forms, fgl, SyncObjs;
+  Classes, SysUtils, Forms, Generics.Collections, SyncObjs;
 
 type
@@ -99 +99 @@
   { TThreadList }
 
-  TThreadList = class(TFPGObjectList<TVirtualThread>)
+  TThreadList = class(TObjectList<TVirtualThread>)
     function FindById(Id: TThreadID): TVirtualThread;
     constructor Create; virtual;
@@ -358 +358 @@
 ThreadListLock := TCriticalSection.Create;
 ThreadList := TThreadList.Create;
-ThreadList.FreeObjects := False;
+ThreadList.OwnsObjects := False;
 
 finalization

trunk/Packages/Common/UTranslator.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Forms, ExtCtrls, Controls, fgl, LazFileUtils, LazUTF8,
+  Classes, SysUtils, Forms, ExtCtrls, Controls, LazFileUtils, LazUTF8,
   Translations, TypInfo, Dialogs, FileUtil, LCLProc, ULanguages, LCLType,
-  LCLVersion;
+  LCLVersion, Generics.Collections;
 
 type
   THandleStringEvent = function (AValue: string): string of object;
 
-  TPoFiles = class(TFPGObjectList<TPOFile>)
+  TPoFiles = class(TObjectList<TPOFile>)
   end;
 
@@ -25 +25 @@
   { TComponentExcludesList }
 
-  TComponentExcludesList = class(TFPGObjectList<TComponentExcludes>)
+  TComponentExcludesList = class(TObjectList<TComponentExcludes>)
     function FindByClassType(AClassType: TClass): TComponentExcludes;
     procedure DumpToStrings(Strings: TStrings);
@@ -288 +288 @@
   Item := Component.ClassType;
   while Assigned(Item) do begin
-    //ShowMessage(Component.Name + ', ' + Component.ClassName + ', ' + Item.ClassName + ', ' + PropertyName);
     Excludes := ComponentExcludes.FindByClassType(Item.ClassType);
     if Assigned(Excludes) then begin

trunk/Packages/SynEditEx/SynEditEx.lpk

@@ -7 +7 @@
       <Version Value="11"/>
       <SearchPaths>
-        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
       </SearchPaths>
+      <Parsing>
+        <SyntaxOptions>
+          <SyntaxMode Value="Delphi"/>
+          <CStyleOperator Value="False"/>
+          <AllowLabel Value="False"/>
+          <CPPInline Value="False"/>
+        </SyntaxOptions>
+      </Parsing>
+      <CodeGeneration>
+        <Optimizations>
+          <OptimizationLevel Value="0"/>
+        </Optimizations>
+      </CodeGeneration>
+      <Linking>
+        <Debugging>
+          <GenerateDebugInfo Value="False"/>
+        </Debugging>
+      </Linking>
     </CompilerOptions>
     <Files>

trunk/Packages/SynEditEx/USynEditEx.pas

@@ -1 +1 @@
 unit USynEditEx;
-
-{$mode delphi}{$H+}
 
 interface

trunk/UContact.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, fgl, Dialogs, UDataFile, LazUTF8, Base64, Graphics;
+  Classes, SysUtils, Generics.Collections, Generics.Defaults, Dialogs,
+  UDataFile, LazUTF8, Base64, Graphics, UListViewSort;
 
 type
@@ -62 +63 @@
     cfPeerTube, cfLinkedIn, cfMastodon, cfMySpace, cfReddit);
 
-  TContactFieldIndexes = TFPGList<TContactFieldIndex>;
+  TContactFieldIndexes = TList<TContactFieldIndex>;
 
   TContactFilterItem = class
@@ -71 +72 @@
   { TContactFilterItems }
 
-  TContactFilterItems = class(TFPGObjectList<TContactFilterItem>)
+  TContactFilterItems = class(TObjectList<TContactFilterItem>)
     function AddNew(FieldIndex: TContactFieldIndex; Value: string): TContactFilterItem;
   end;
@@ -98 +99 @@
   { TContactFields }
 
-  TContactFields = class(TFPGObjectList<TContactField>)
+  TContactFields = class(TObjectList<TContactField>)
   private
     Indexes: array[TContactFieldIndex] of TContactField;
@@ -143 +144 @@
   { TContactProperties }
 
-  TContactProperties = class(TFPGObjectList<TContactProperty>)
+  TContactProperties = class(TObjectList<TContactProperty>)
     function AddNew(Name, Value: string): TContactProperty;
     procedure Assign(Source: TContactProperties);
-    procedure AssignToList(List: TFPGObjectList<TObject>);
+    procedure AssignToList(List: TObjects);
     function GetByName(Name: string): TContactProperty;
     function GetByNameGroups(Name: string; Groups: TStringArray;
@@ -197 +198 @@
   { TContacts }
 
-  TContacts = class(TFPGObjectList<TContact>)
+  TContacts = class(TObjectList<TContact>)
     ContactsFile: TContactsFile;
     procedure Assign(Source: TContacts);
     procedure AddContacts(Contacts: TContacts);
     procedure InsertContacts(Index: Integer; Contacts: TContacts);
-    procedure AssignToList(List: TFPGObjectList<TObject>);
+    procedure AssignToList(List: TObjects);
     function AddNew: TContact;
     function Search(Text: string; FieldIndex: TContactFieldIndex): TContact;
@@ -854 +855 @@
 end;
 
-procedure TContactProperties.AssignToList(List: TFPGObjectList<TObject>);
+procedure TContactProperties.AssignToList(List: TObjects);
 var
   I: Integer;
@@ -1126 +1127 @@
 end;
 
-procedure TContacts.AssignToList(List: TFPGObjectList<TObject>);
-var
-  I: Integer;
-begin
-  while List.Count > Count do List.Delete(List.Count - 1);
-  while List.Count < Count do List.Add(nil);
-  for I := 0 to Count - 1 do
+procedure TContacts.AssignToList(List: TObjects);
+var
+  I: Integer;
+begin
+  while List.Count > Count do
+    List.Delete(List.Count - 1);
+  for I := 0 to List.Count - 1 do
     List[I] := Items[I];
+  while List.Count < Count do
+    List.Add(Items[List.Count]);
 end;
 
@@ -1906 +1909 @@
 end;
 
-function CompareContactFullName(const Item1, Item2: TContact): Integer;
+function CompareContactFullName(constref Item1, Item2: TContact): Integer;
 begin
   Result := CompareStr(Item1.Fields[cfFullName], Item2.Fields[cfFullName]);
 end;
 
-function ComparePropertyName(const Item1, Item2: TContactProperty): Integer;
+function ComparePropertyName(constref Item1, Item2: TContactProperty): Integer;
 begin
   Result := CompareStr(Item1.Name + ';' + Item1.Attributes.Text,
@@ -1921 +1924 @@
   I: Integer;
 begin
-  Contacts.Sort(CompareContactFullName);
+  Contacts.Sort(TComparer<TContact>.Construct(CompareContactFullName));
   for I := 0 to Contacts.Count - 1 do
-    Contacts[I].Properties.Sort(ComparePropertyName);
+    Contacts[I].Properties.Sort(TComparer<TContactProperty>.Construct(ComparePropertyName));
 end;
 

trunk/UDataFile.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, fgl;
+  Classes, SysUtils, Generics.Collections;
 
 type
@@ -32 +32 @@
   TDataFileClass = class of TDataFile;
 
-  TDataFiles = class(TFPGObjectList<TDataFile>)
+  TDataFiles = class(TObjectList<TDataFile>)
   end;
 

trunk/UTest.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, fgl, UContact;
+  Classes, SysUtils, Generics.Collections, UContact;
 
 type
@@ -26 +26 @@
   { TTestCases }
 
-  TTestCases = class(TFPGObjectList<TTestCase>)
+  TTestCases = class(TObjectList<TTestCase>)
     function AddNew(Name: string; TestClass: TTestCaseClass): TTestCase;
   end;

trunk/vCardStudio.lpi

@@ -69 +69 @@
           <Other>
             <CompilerMessages>
-              <IgnoredMessages idx6058="True" idx5024="True" idx3124="True" idx3123="True"/>
+              <IgnoredMessages idx6058="True" idx5071="True" idx5024="True" idx3124="True" idx3123="True"/>
             </CompilerMessages>
           </Other>
@@ -75 +75 @@
       </Item2>
       <SharedMatrixOptions Count="2">
-        <Item1 ID="186308868222" Targets="Common" Modes="Debug" Value="-g -gl -gh -CirotR -O1"/>
-        <Item2 ID="035947176865" Targets="Common" Modes="Release" Value="-CX -XX -O3"/>
+        <Item1 ID="186308868222" Targets="Common,SynEditEx" Modes="Debug" Value="-g -gl -gh -CirotR -O1"/>
+        <Item2 ID="035947176865" Targets="Common,SynEditEx" Modes="Release" Value="-CX -XX -O3"/>
       </SharedMatrixOptions>
     </BuildModes>
@@ -320 +320 @@
     <Other>
       <CompilerMessages>
-        <IgnoredMessages idx6058="True" idx5024="True" idx3124="True" idx3123="True"/>
+        <IgnoredMessages idx6058="True" idx5071="True" idx5024="True" idx3124="True" idx3123="True"/>
       </CompilerMessages>
     </Other>