Changeset 21

Timestamp:

May 8, 2019, 12:11:40 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Build under Lazarus 2.0.
• Modified: Used .lrj files instead of .lrt files.
• Removed: TemplateGenerics package.

Location:

trunk

Files:

• Forms (modified) (1 prop)
• Forms/UFormAbout.lfm (modified) (1 diff)
• Forms/UFormAbout.lrj (added)
• Forms/UFormAbout.lrt (deleted)
• Forms/UFormContact.lfm (modified) (4 diffs)
• Forms/UFormContact.lrj (added)
• Forms/UFormContacts.lfm (modified) (5 diffs)
• Forms/UFormContacts.lrj (added)
• Forms/UFormFindDuplicity.lfm (modified) (3 diffs)
• Forms/UFormFindDuplicity.lrj (added)
• Forms/UFormGenerate.lfm (modified) (1 diff)
• Forms/UFormGenerate.lrj (added)
• Forms/UFormMain.lfm (modified) (11 diffs)
• Forms/UFormMain.lrj (added)
• Forms/UFormMain.pas (modified) (1 diff)
• Forms/UFormSettings.lfm (modified) (2 diffs)
• Forms/UFormSettings.lrj (added)
• Forms/UFormSettings.lrt (deleted)
• Languages/vCardStudio.cs.po (modified) (2 diffs)
• Languages/vCardStudio.po (modified) (4 diffs)
• Packages/Common/Common.lpk (modified) (4 diffs)
• Packages/Common/Common.pas (modified) (2 diffs)
• Packages/Common/Languages/UFindFile.cs.po (added)
• Packages/Common/Languages/UJobProgressView.cs.po (modified) (2 diffs)
• Packages/Common/Languages/UJobProgressView.po (modified) (1 diff)
• Packages/Common/Languages/UScaleDPI.cs.po (added)
• Packages/Common/Languages/UThreading.po (modified) (1 diff)
• Packages/Common/UApplicationInfo.pas (modified) (3 diffs)
• Packages/Common/UCommon.pas (modified) (6 diffs)
• Packages/Common/UDebugLog.pas (modified) (4 diffs)
• Packages/Common/UFindFile.pas (modified) (3 diffs)
• Packages/Common/UJobProgressView.lfm (modified) (9 diffs)
• Packages/Common/UJobProgressView.lrt (deleted)
• Packages/Common/UJobProgressView.pas (modified) (24 diffs)
• Packages/Common/ULastOpenedList.pas (modified) (6 diffs)
• Packages/Common/UListViewSort.pas (modified) (9 diffs)
• Packages/Common/UMemory.pas (modified) (2 diffs)
• Packages/Common/UPersistentForm.pas (modified) (6 diffs)
• Packages/Common/UPool.pas (modified) (3 diffs)
• Packages/Common/UPrefixMultiplier.pas (modified) (3 diffs)
• Packages/Common/URegistry.pas (modified) (3 diffs)
• Packages/Common/UResetableThread.pas (modified) (1 diff)
• Packages/Common/UScaleDPI.pas (modified) (4 diffs)
• Packages/Common/UStringTable.pas (added)
• Packages/Common/UTheme.pas (modified) (3 diffs)
• Packages/Common/UThreading.pas (modified) (5 diffs)
• Packages/Common/UURI.pas (modified) (3 diffs)
• Packages/Common/UXMLUtils.pas (modified) (16 diffs)
• Packages/CoolTranslator/UCoolTranslator.pas (modified) (5 diffs)
• Packages/TemplateGenerics (deleted)
• UContact.pas (modified) (1 diff)
• UCore.lfm (modified) (4 diffs)
• UCore.pas (modified) (1 diff)
• vCardStudio.lpi (modified) (6 diffs)
• vCardStudio.lpr (modified) (3 diffs)

trunk/Forms

@@ -1 @@
-*.lrj
+

@@ -1 @@
-*.lrj
+

trunk/Forms/UFormAbout.lfm

@@ -1 +1 @@
 object FormAbout: TFormAbout
   Left = 522
-  Height = 387
+  Height = 580
   Top = 335
-  Width = 524
+  Width = 786
   Caption = 'About'
-  ClientHeight = 387
-  ClientWidth = 524
+  ClientHeight = 580
+  ClientWidth = 786
+  DesignTimePPI = 144
   OnCreate = FormCreate
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '1.8.0.4'
+  LCLVersion = '2.0.0.4'
   object LabelDescription: TLabel
-    Left = 25
-    Height = 40
-    Top = 137
-    Width = 474
+    Left = 38
+    Height = 60
+    Top = 206
+    Width = 710
     Align = alTop
     AutoSize = False
-    BorderSpacing.Around = 25
+    BorderSpacing.Around = 38
     ParentColor = False
+    ParentFont = False
     WordWrap = True
   end
   object ButtonClose: TButton
-    Left = 383
-    Height = 31
-    Top = 337
-    Width = 116
+    Left = 574
+    Height = 46
+    Top = 506
+    Width = 174
     Anchors = [akRight, akBottom]
     Caption = 'Close'
     ModalResult = 1
+    ParentFont = False
     TabOrder = 0
   end
   object LabelContent: TLabel
-    Left = 25
+    Left = 38
     Height = 26
-    Top = 202
-    Width = 474
+    Top = 304
+    Width = 710
     Align = alTop
-    BorderSpacing.Around = 25
+    BorderSpacing.Around = 38
     Caption = '   '
     ParentColor = False
+    ParentFont = False
   end
   object ButtonHomePage: TButton
-    Left = 20
-    Height = 31
-    Top = 337
-    Width = 220
+    Left = 30
+    Height = 46
+    Top = 506
+    Width = 330
     Anchors = [akLeft, akBottom]
     Caption = 'Home page'
     OnClick = ButtonHomePageClick
+    ParentFont = False
     TabOrder = 1
   end
   object PanelTitle: TPanel
     Left = 0
-    Height = 112
+    Height = 168
     Top = 0
-    Width = 524
+    Width = 786
     Align = alTop
     BevelOuter = bvNone
-    ClientHeight = 112
-    ClientWidth = 524
+    ClientHeight = 168
+    ClientWidth = 786
+    ParentFont = False
     TabOrder = 2
     object LabelAppName: TLabel
       Left = 112
-      Height = 80
+      Height = 136
       Top = 24
-      Width = 394
+      Width = 656
       Align = alCustom
       Anchors = [akTop, akLeft, akRight, akBottom]
       AutoSize = False
-      BorderSpacing.Around = 25
-      Font.Height = -50
+      BorderSpacing.Around = 38
+      Font.Height = -75
       ParentColor = False
       ParentFont = False
     end
     object Image1: TImage
-      Left = 24
-      Height = 64
-      Top = 24
-      Width = 64
+      Left = 36
+      Height = 96
+      Top = 36
+      Width = 96
       Proportional = True
       Stretch = True

trunk/Forms/UFormContact.lfm

@@ -1 +1 @@
 object FormContact: TFormContact
   Left = 423
-  Height = 490
+  Height = 588
   Top = 271
-  Width = 762
+  Width = 914
   Caption = 'Contact'
-  ClientHeight = 490
-  ClientWidth = 762
-  DesignTimePPI = 120
+  ClientHeight = 588
+  ClientWidth = 914
+  DesignTimePPI = 144
   OnClose = FormClose
   OnCreate = FormCreate
   OnShow = FormShow
-  LCLVersion = '1.8.0.6'
+  LCLVersion = '2.0.0.4'
   object PageControlContact: TPageControl
-    Left = 8
-    Height = 424
-    Top = 8
-    Width = 744
+    Left = 10
+    Height = 508
+    Top = 10
+    Width = 892
     ActivePage = TabSheetAll
     Anchors = [akTop, akLeft, akRight, akBottom]
+    ParentFont = False
     TabIndex = 2
     TabOrder = 0
     object TabSheetGeneral: TTabSheet
       Caption = 'General'
-      ClientHeight = 391
-      ClientWidth = 736
+      ClientHeight = 468
+      ClientWidth = 882
+      ParentFont = False
       object Label1: TLabel
-        Left = 13
-        Height = 20
-        Top = 13
+        Left = 16
+        Height = 20
+        Top = 16
         Width = 43
         Caption = 'Name:'
         ParentColor = False
+        ParentFont = False
       end
       object EditName: TEdit
-        Left = 120
-        Height = 28
-        Top = 16
-        Width = 212
+        Left = 144
+        Height = 28
+        Top = 19
+        Width = 254
+        ParentFont = False
         TabOrder = 0
       end
       object Label2: TLabel
-        Left = 13
-        Height = 20
-        Top = 47
+        Left = 16
+        Height = 20
+        Top = 56
         Width = 74
         Caption = 'Cell phone:'
         ParentColor = False
+        ParentFont = False
       end
       object EditCellPhone: TEdit
-        Left = 120
-        Height = 28
-        Top = 47
-        Width = 212
+        Left = 144
+        Height = 28
+        Top = 56
+        Width = 254
+        ParentFont = False
         TabOrder = 1
       end
       object EditPhone: TEdit
-        Left = 120
-        Height = 28
-        Top = 83
-        Width = 212
+        Left = 144
+        Height = 28
+        Top = 100
+        Width = 254
+        ParentFont = False
         TabOrder = 2
       end
       object Label3: TLabel
-        Left = 13
-        Height = 20
-        Top = 81
+        Left = 16
+        Height = 20
+        Top = 97
         Width = 44
         Caption = 'Phone:'
         ParentColor = False
+        ParentFont = False
       end
       object EditEmail: TEdit
-        Left = 479
-        Height = 28
-        Top = 49
-        Width = 212
+        Left = 575
+        Height = 28
+        Top = 59
+        Width = 254
+        ParentFont = False
         TabOrder = 3
       end
       object Label4: TLabel
-        Left = 360
-        Height = 20
-        Top = 47
+        Left = 432
+        Height = 20
+        Top = 56
         Width = 46
         Caption = 'E-mail:'
         ParentColor = False
+        ParentFont = False
       end
       object EditSurname: TEdit
-        Left = 479
-        Height = 28
-        Top = 15
-        Width = 212
+        Left = 575
+        Height = 28
+        Top = 18
+        Width = 254
+        ParentFont = False
         TabOrder = 4
       end
       object Label5: TLabel
-        Left = 360
-        Height = 20
-        Top = 13
+        Left = 432
+        Height = 20
+        Top = 16
         Width = 61
         Caption = 'Surname:'
         ParentColor = False
+        ParentFont = False
       end
       object MemoNotes: TMemo
-        Left = 13
-        Height = 185
-        Top = 192
-        Width = 708
+        Left = 16
+        Height = 146
+        Top = 230
+        Width = 702
         Anchors = [akTop, akLeft, akRight, akBottom]
+        ParentFont = False
         TabOrder = 5
       end
       object Label6: TLabel
-        Left = 16
-        Height = 20
-        Top = 168
+        Left = 19
+        Height = 20
+        Top = 202
         Width = 42
         Caption = 'Notes:'
         ParentColor = False
+        ParentFont = False
       end
       object EditEmailHome: TEdit
-        Left = 479
-        Height = 28
-        Top = 83
-        Width = 212
+        Left = 575
+        Height = 28
+        Top = 100
+        Width = 254
+        ParentFont = False
         TabOrder = 6
       end
       object Label20: TLabel
-        Left = 360
-        Height = 20
-        Top = 80
+        Left = 432
+        Height = 20
+        Top = 96
         Width = 101
         Caption = 'E-mail (Home):'
         ParentColor = False
+        ParentFont = False
       end
       object EditEmailWork: TEdit
-        Left = 479
-        Height = 28
-        Top = 122
-        Width = 212
+        Left = 575
+        Height = 28
+        Top = 146
+        Width = 254
+        ParentFont = False
         TabOrder = 7
       end
       object Label21: TLabel
-        Left = 360
-        Height = 20
-        Top = 120
+        Left = 432
+        Height = 20
+        Top = 144
         Width = 95
         Caption = 'E-mail (Work):'
         ParentColor = False
+        ParentFont = False
       end
       object EditBirthday: TEdit
-        Left = 120
-        Height = 28
-        Top = 120
-        Width = 212
+        Left = 144
+        Height = 28
+        Top = 144
+        Width = 254
+        ParentFont = False
         TabOrder = 8
       end
       object Label22: TLabel
-        Left = 13
-        Height = 20
-        Top = 120
+        Left = 16
+        Height = 20
+        Top = 144
         Width = 58
         Caption = 'Birthday:'
         ParentColor = False
+        ParentFont = False
       end
     end
     object TabSheetDetails: TTabSheet
       Caption = 'Details'
-      ClientHeight = 391
-      ClientWidth = 736
+      ClientHeight = 468
+      ClientWidth = 882
+      ParentFont = False
       object Label7: TLabel
-        Left = 8
-        Height = 20
-        Top = 15
+        Left = 10
+        Height = 20
+        Top = 18
         Width = 99
         Caption = 'Phone (Home):'
         ParentColor = False
+        ParentFont = False
       end
       object EditPhoneHome: TEdit
-        Left = 144
-        Height = 28
-        Top = 15
-        Width = 212
+        Left = 173
+        Height = 28
+        Top = 18
+        Width = 254
+        ParentFont = False
         TabOrder = 0
       end
       object Label8: TLabel
-        Left = 8
-        Height = 20
-        Top = 51
+        Left = 10
+        Height = 20
+        Top = 61
         Width = 93
         Caption = 'Phone (Work):'
         ParentColor = False
+        ParentFont = False
       end
       object EditPhoneWork: TEdit
-        Left = 144
-        Height = 28
-        Top = 51
-        Width = 212
+        Left = 173
+        Height = 28
+        Top = 61
+        Width = 254
+        ParentFont = False
         TabOrder = 1
       end
       object Label9: TLabel
-        Left = 8
-        Height = 20
-        Top = 88
+        Left = 10
+        Height = 20
+        Top = 106
         Width = 129
         Caption = 'Cell phone (Home):'
         ParentColor = False
+        ParentFont = False
       end
       object EditCellPhoneHome: TEdit
-        Left = 144
-        Height = 28
-        Top = 90
-        Width = 212
+        Left = 173
+        Height = 28
+        Top = 108
+        Width = 254
+        ParentFont = False
         TabOrder = 2
       end
       object Label10: TLabel
-        Left = 8
-        Height = 20
-        Top = 122
+        Left = 10
+        Height = 20
+        Top = 146
         Width = 123
         Caption = 'Cell phone (Work):'
         ParentColor = False
+        ParentFont = False
       end
       object EditCellPhoneWork: TEdit
-        Left = 144
-        Height = 28
-        Top = 122
-        Width = 212
+        Left = 173
+        Height = 28
+        Top = 146
+        Width = 254
+        ParentFont = False
         TabOrder = 3
       end
       object Label11: TLabel
-        Left = 376
-        Height = 20
-        Top = 13
+        Left = 451
+        Height = 20
+        Top = 16
         Width = 25
         Caption = 'Fax:'
         ParentColor = False
+        ParentFont = False
       end
       object EditFax: TEdit
-        Left = 487
-        Height = 28
-        Top = 15
-        Width = 212
+        Left = 584
+        Height = 28
+        Top = 18
+        Width = 254
+        ParentFont = False
         TabOrder = 4
       end
       object Label12: TLabel
-        Left = 376
-        Height = 20
-        Top = 48
+        Left = 451
+        Height = 20
+        Top = 58
         Width = 80
         Caption = 'Fax (Home):'
         ParentColor = False
+        ParentFont = False
       end
       object EditFaxHome: TEdit
-        Left = 487
-        Height = 28
-        Top = 51
-        Width = 212
+        Left = 584
+        Height = 28
+        Top = 61
+        Width = 254
+        ParentFont = False
         TabOrder = 5
       end
       object Label13: TLabel
-        Left = 376
-        Height = 20
-        Top = 88
+        Left = 451
+        Height = 20
+        Top = 106
         Width = 74
         Caption = 'Fax (Work):'
         ParentColor = False
+        ParentFont = False
       end
       object EditFaxWork: TEdit
-        Left = 487
-        Height = 28
-        Top = 90
-        Width = 212
+        Left = 584
+        Height = 28
+        Top = 108
+        Width = 254
+        ParentFont = False
         TabOrder = 6
       end
       object Label14: TLabel
-        Left = 376
-        Height = 20
-        Top = 120
+        Left = 451
+        Height = 20
+        Top = 144
         Width = 41
         Caption = 'Pager:'
         ParentColor = False
+        ParentFont = False
       end
       object EditPager: TEdit
-        Left = 487
-        Height = 28
-        Top = 122
-        Width = 212
+        Left = 584
+        Height = 28
+        Top = 146
+        Width = 254
+        ParentFont = False
         TabOrder = 7
       end
       object Label15: TLabel
-        Left = 8
-        Height = 20
-        Top = 184
+        Left = 10
+        Height = 20
+        Top = 221
         Width = 72
         Caption = 'Web page:'
         ParentColor = False
+        ParentFont = False
       end
       object EditWebPage: TEdit
-        Left = 144
-        Height = 28
-        Top = 184
-        Width = 212
+        Left = 173
+        Height = 28
+        Top = 221
+        Width = 254
+        ParentFont = False
         TabOrder = 8
       end
       object Label16: TLabel
-        Left = 8
-        Height = 20
-        Top = 216
+        Left = 10
+        Height = 20
+        Top = 259
         Width = 127
         Caption = 'Web page (Home):'
         ParentColor = False
+        ParentFont = False
       end
       object EditWebPageHome: TEdit
-        Left = 144
-        Height = 28
-        Top = 216
-        Width = 212
+        Left = 173
+        Height = 28
+        Top = 259
+        Width = 254
+        ParentFont = False
         TabOrder = 9
       end
       object Label17: TLabel
-        Left = 8
-        Height = 20
-        Top = 248
+        Left = 10
+        Height = 20
+        Top = 298
         Width = 121
         Caption = 'Web page (Work):'
         ParentColor = False
+        ParentFont = False
       end
       object EditWebPageWork: TEdit
-        Left = 144
-        Height = 28
-        Top = 248
-        Width = 212
+        Left = 173
+        Height = 28
+        Top = 298
+        Width = 254
+        ParentFont = False
         TabOrder = 10
       end
       object Label18: TLabel
-        Left = 375
-        Height = 20
-        Top = 184
+        Left = 450
+        Height = 20
+        Top = 221
         Width = 32
         Caption = 'Title:'
         ParentColor = False
+        ParentFont = False
       end
       object EditTitle: TEdit
-        Left = 487
-        Height = 28
-        Top = 184
-        Width = 212
+        Left = 584
+        Height = 28
+        Top = 221
+        Width = 254
+        ParentFont = False
         TabOrder = 11
       end
       object Label19: TLabel
-        Left = 375
-        Height = 20
-        Top = 216
+        Left = 450
+        Height = 20
+        Top = 259
         Width = 56
         Caption = 'Address:'
         ParentColor = False
+        ParentFont = False
       end
       object EditAddress: TEdit
-        Left = 488
-        Height = 28
-        Top = 216
-        Width = 212
+        Left = 586
+        Height = 28
+        Top = 259
+        Width = 254
+        ParentFont = False
         TabOrder = 12
       end
       object LabelOrganization: TLabel
-        Left = 376
-        Height = 20
-        Top = 248
+        Left = 451
+        Height = 20
+        Top = 298
         Width = 89
         Caption = 'Organization:'
         ParentColor = False
+        ParentFont = False
       end
       object EditOrganization: TEdit
-        Left = 487
-        Height = 28
-        Top = 248
-        Width = 212
+        Left = 584
+        Height = 28
+        Top = 298
+        Width = 254
+        ParentFont = False
         TabOrder = 13
       end
@@ -379 +428 @@
     object TabSheetAll: TTabSheet
       Caption = 'All fields'
-      ClientHeight = 391
-      ClientWidth = 736
+      ClientHeight = 468
+      ClientWidth = 882
       OnShow = TabSheetAllShow
+      ParentFont = False
       object ListView1: TListView
-        Left = 8
-        Height = 368
-        Top = 16
-        Width = 721
+        Left = 10
+        Height = 441
+        Top = 19
+        Width = 864
         Anchors = [akTop, akLeft, akRight, akBottom]
         Columns = <        
           item
             Caption = 'Item'
-            Width = 200
+            Width = 240
           end        
           item
             Caption = 'Value'
-            Width = 200
+            Width = 609
           end>
         OwnerData = True
+        ParentFont = False
         PopupMenu = PopupMenu1
         ReadOnly = True
@@ -409 +460 @@
   end
   object ButtonCancel: TButton
-    Left = 656
-    Height = 31
-    Top = 448
-    Width = 96
+    Left = 787
+    Height = 37
+    Top = 538
+    Width = 115
     Anchors = [akRight, akBottom]
     Caption = 'Cancel'
     ModalResult = 2
+    ParentFont = False
     TabOrder = 1
   end
   object ButtonOk: TButton
-    Left = 544
-    Height = 31
-    Top = 448
-    Width = 99
+    Left = 652
+    Height = 37
+    Top = 538
+    Width = 119
     Anchors = [akRight, akBottom]
     Caption = 'OK'
     ModalResult = 1
+    ParentFont = False
     TabOrder = 2
   end
   object ActionList1: TActionList
     Images = Core.ImageList1
-    left = 317
-    top = 157
+    left = 380
+    top = 188
     object AEditField: TAction
       Caption = 'Edit'
@@ -439 +492 @@
   object PopupMenu1: TPopupMenu
     Images = Core.ImageList1
-    left = 172
-    top = 159
+    left = 206
+    top = 191
     object MenuItem1: TMenuItem
       Action = AEditField

trunk/Forms/UFormContacts.lfm

@@ -1 +1 @@
 object FormContacts: TFormContacts
   Left = 400
-  Height = 605
+  Height = 908
   Top = 212
-  Width = 807
+  Width = 1210
   Caption = 'Contacts'
-  ClientHeight = 605
-  ClientWidth = 807
+  ClientHeight = 908
+  ClientWidth = 1210
+  DesignTimePPI = 144
   OnClose = FormClose
   OnCreate = FormCreate
   OnShow = FormShow
-  LCLVersion = '1.8.0.4'
+  LCLVersion = '2.0.0.4'
   object ListView1: TListView
     Left = 0
-    Height = 579
+    Height = 869
     Top = 0
-    Width = 807
+    Width = 1210
     Align = alClient
     Columns = <    
       item
         Caption = 'Full Name'
-        Width = 200
+        Width = 300
       end    
       item
         Caption = 'First name'
-        Width = 100
+        Width = 150
       end    
       item
         Caption = 'Middle name'
-        Width = 100
+        Width = 150
       end    
       item
         Caption = 'Last Name'
-        Width = 100
+        Width = 150
       end    
       item
         Caption = 'Cell phone'
-        Width = 100
+        Width = 150
       end    
       item
         Caption = 'Home phone'
-        Width = 187
+        Width = 295
       end>
     MultiSelect = True
     OwnerData = True
+    ParentFont = False
     PopupMenu = PopupMenuContact
     ReadOnly = True
@@ -55 +57 @@
   object ToolBar1: TToolBar
     Left = 0
-    Height = 26
-    Top = 579
-    Width = 807
+    Height = 39
+    Top = 869
+    Width = 1210
     Align = alBottom
     Images = Core.ImageList1
+    ParentFont = False
     TabOrder = 1
     object ToolButton1: TToolButton
@@ -67 +70 @@
     end
     object ToolButton2: TToolButton
-      Left = 30
+      Left = 36
       Top = 2
       Action = AModify
     end
     object ToolButton3: TToolButton
-      Left = 59
+      Left = 71
       Top = 2
       Action = ARemove
@@ -79 +82 @@
   object PopupMenuContact: TPopupMenu
     Images = Core.ImageList1
-    left = 290
-    top = 175
+    left = 435
+    top = 263
     object MenuItem1: TMenuItem
       Action = AAdd
@@ -96 +99 @@
   object ActionList1: TActionList
     Images = Core.ImageList1
-    left = 488
-    top = 171
+    left = 732
+    top = 257
     object AAdd: TAction
       Caption = 'Add'

trunk/Forms/UFormFindDuplicity.lfm

@@ -1 +1 @@
 object FormFindDuplicity: TFormFindDuplicity
   Left = 455
-  Height = 401
+  Height = 481
   Top = 397
-  Width = 584
+  Width = 701
   Caption = 'Find duplicities'
-  ClientHeight = 401
-  ClientWidth = 584
-  DesignTimePPI = 120
+  ClientHeight = 481
+  ClientWidth = 701
+  DesignTimePPI = 144
   OnClose = FormClose
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '1.8.0.6'
+  LCLVersion = '2.0.0.4'
   object ListView1: TListView
-    Left = 4
-    Height = 345
-    Top = 52
-    Width = 576
+    Left = 5
+    Height = 413
+    Top = 63
+    Width = 691
     Align = alClient
-    BorderSpacing.Around = 4
+    BorderSpacing.Around = 5
     Columns = <    
       item
         Caption = 'Field'
-        Width = 150
+        Width = 180
       end    
       item
         Caption = 'Contacts'
-        Width = 300
+        Width = 360
       end    
       item
         Caption = 'Count'
-        Width = 70
+        Width = 136
       end>
     OwnerData = True
+    ParentFont = False
     PopupMenu = PopupMenu1
     ReadOnly = True
@@ -44 +45 @@
   object Panel1: TPanel
     Left = 0
-    Height = 48
+    Height = 58
     Top = 0
-    Width = 584
+    Width = 701
     Align = alTop
     BevelOuter = bvNone
-    ClientHeight = 48
-    ClientWidth = 584
+    ClientHeight = 58
+    ClientWidth = 701
+    ParentFont = False
     TabOrder = 1
     object ComboBoxField: TComboBox
-      Left = 144
-      Height = 28
-      Top = 12
-      Width = 272
-      ItemHeight = 20
+      Left = 173
+      Height = 42
+      Top = 14
+      Width = 326
+      ItemHeight = 0
       OnChange = ComboBoxFieldChange
+      ParentFont = False
       Style = csDropDownList
       TabOrder = 0
     end
     object Label1: TLabel
-      Left = 11
-      Height = 20
-      Top = 16
-      Width = 88
+      Left = 13
+      Height = 26
+      Top = 19
+      Width = 113
       Caption = 'Contact field:'
       ParentColor = False
+      ParentFont = False
     end
   end
   object ActionList1: TActionList
-    left = 218
-    top = 128
+    left = 262
+    top = 154
     object AShowContacts: TAction
       Caption = 'Show contacts'
@@ -80 +84 @@
   end
   object PopupMenu1: TPopupMenu
-    left = 75
-    top = 124
+    left = 90
+    top = 149
     object MenuItem1: TMenuItem
       Action = AShowContacts

trunk/Forms/UFormGenerate.lfm

@@ -1 +1 @@
 object FormGenerate: TFormGenerate
   Left = 464
-  Height = 468
+  Height = 562
   Top = 368
-  Width = 677
+  Width = 812
   Caption = 'Generate contacts'
-  ClientHeight = 468
-  ClientWidth = 677
-  DesignTimePPI = 120
+  ClientHeight = 562
+  ClientWidth = 812
+  DesignTimePPI = 144
   OnClose = FormClose
   OnCreate = FormCreate
   OnShow = FormShow
-  LCLVersion = '1.8.0.6'
+  LCLVersion = '2.0.0.4'
   object Label1: TLabel
-    Left = 16
-    Height = 20
-    Top = 16
-    Width = 42
+    Left = 19
+    Height = 26
+    Top = 19
+    Width = 56
     Caption = 'Count:'
     ParentColor = False
+    ParentFont = False
   end
   object SpinEditCount: TSpinEdit
-    Left = 129
-    Height = 28
-    Top = 15
-    Width = 127
+    Left = 155
+    Height = 43
+    Top = 18
+    Width = 152
     MaxValue = 1000000000
     MinValue = 1
+    ParentFont = False
     TabOrder = 0
     Value = 1
   end
   object ButtonGenerate: TButton
-    Left = 16
-    Height = 31
-    Top = 144
-    Width = 94
+    Left = 19
+    Height = 37
+    Top = 173
+    Width = 113
     Caption = 'Generate'
     OnClick = ButtonGenerateClick
+    ParentFont = False
     TabOrder = 1
   end

trunk/Forms/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
   Left = 601
-  Height = 531
+  Height = 796
   Top = 447
-  Width = 785
+  Width = 1178
   Caption = 'vCard Studio'
-  ClientHeight = 497
-  ClientWidth = 785
+  ClientHeight = 762
+  ClientWidth = 1178
+  DesignTimePPI = 144
   Menu = MainMenu1
   OnClose = FormClose
@@ -13 +14 @@
   OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '1.8.0.4'
+  LCLVersion = '2.0.0.4'
   object CoolBar1: TCoolBar
     Left = 0
-    Height = 38
+    Height = 43
     Top = 0
-    Width = 785
+    Width = 1178
     AutoSize = True
     Bands = <    
@@ -32 +33 @@
         Width = 64
       end>
+    ParentFont = False
     object ToolBarFile: TToolBar
       AnchorSideLeft.Control = CoolBar1
       AnchorSideTop.Control = CoolBar1
       Left = 24
-      Height = 28
+      Height = 33
       Top = 5
-      Width = 132
+      Width = 159
       Align = alNone
       AutoSize = True
@@ -46 +48 @@
       EdgeOuter = esNone
       Images = Core.ImageList1
+      ParentFont = False
       ParentShowHint = False
       ShowHint = True
@@ -56 +59 @@
       end
       object ToolButton2: TToolButton
-        Left = 30
+        Left = 36
         Top = 0
         Action = Core.AFileOpen
@@ -63 +66 @@
       end
       object ToolButton3: TToolButton
-        Left = 74
+        Left = 89
         Top = 0
         Action = Core.AFileSave
       end
       object ToolButton4: TToolButton
-        Left = 103
+        Left = 124
         Top = 0
         Action = Core.AFileClose
@@ -77 +80 @@
       AnchorSideTop.Control = CoolBar1
       Left = 188
-      Height = 28
+      Height = 33
       Top = 5
-      Width = 59
+      Width = 71
       Align = alNone
       AutoSize = True
@@ -87 +90 @@
       EdgeOuter = esNone
       Images = Core.ImageList1
+      ParentFont = False
       ParentShowHint = False
       ShowHint = True
@@ -92 +96 @@
       Transparent = True
       object ToolButton5: TToolButton
-        Left = 30
+        Left = 36
         Top = 0
         Action = Core.ASettings
@@ -105 +109 @@
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 30
-    Top = 467
-    Width = 785
+    Height = 28
+    Top = 734
+    Width = 1178
     Panels = <    
       item
-        Width = 200
+        Width = 300
       end>
+    ParentFont = False
     SimplePanel = False
   end
   object MainMenu1: TMainMenu
     Images = Core.ImageList1
-    left = 128
-    top = 80
+    left = 192
+    top = 120
     object MenuItemFile: TMenuItem
       Caption = 'File'
@@ -182 +187 @@
   end
   object PopupMenuOpenRecent: TPopupMenu
-    left = 280
-    top = 80
+    left = 420
+    top = 120
   end
 end

trunk/Forms/UFormMain.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus,
+  Classes, SysUtils, LazFileUtils, Forms, Controls, Graphics, Dialogs, Menus,
   ComCtrls;
 

trunk/Forms/UFormSettings.lfm

@@ -1 +1 @@
 object FormSettings: TFormSettings
   Left = 798
-  Height = 300
+  Height = 360
   Top = 367
-  Width = 481
+  Width = 577
   Caption = 'Settings'
-  ClientHeight = 300
-  ClientWidth = 481
-  Constraints.MinHeight = 300
-  Constraints.MinWidth = 400
-  DesignTimePPI = 120
+  ClientHeight = 360
+  ClientWidth = 577
+  Constraints.MinHeight = 360
+  Constraints.MinWidth = 480
+  DesignTimePPI = 144
   OnClose = FormClose
   OnCreate = FormCreate
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '1.8.0.6'
+  LCLVersion = '2.0.0.4'
   object ComboBoxLanguage: TComboBox
-    Left = 160
-    Height = 28
-    Top = 30
-    Width = 260
-    ItemHeight = 20
+    Left = 192
+    Height = 42
+    Top = 36
+    Width = 312
+    ItemHeight = 0
+    ParentFont = False
     Style = csDropDownList
     TabOrder = 0
   end
   object Label1: TLabel
-    Left = 20
-    Height = 20
-    Top = 30
-    Width = 68
+    Left = 24
+    Height = 26
+    Top = 36
+    Width = 88
     Caption = 'Language:'
     ParentColor = False
+    ParentFont = False
   end
   object ButtonOk: TButton
-    Left = 376
-    Height = 31
-    Top = 256
-    Width = 94
+    Left = 451
+    Height = 37
+    Top = 307
+    Width = 113
     Anchors = [akRight, akBottom]
     Caption = 'Ok'
     ModalResult = 1
     OnClick = ButtonOkClick
+    ParentFont = False
     TabOrder = 2
   end
   object ButtonCancel: TButton
-    Left = 256
-    Height = 31
-    Top = 256
-    Width = 94
+    Left = 307
+    Height = 37
+    Top = 307
+    Width = 113
     Anchors = [akRight, akBottom]
     Caption = 'Cancel'
     ModalResult = 2
+    ParentFont = False
     TabOrder = 1
   end
   object CheckBoxAutomaticDPI: TCheckBox
-    Left = 16
-    Height = 24
-    Top = 104
-    Width = 120
+    Left = 19
+    Height = 30
+    Top = 125
+    Width = 150
     Caption = 'Automatic DPI'
     OnChange = CheckBoxAutomaticDPIChange
+    ParentFont = False
     TabOrder = 3
     Visible = False
   end
   object SpinEditDPI: TSpinEdit
-    Left = 160
-    Height = 28
-    Top = 144
-    Width = 121
+    Left = 192
+    Height = 43
+    Top = 173
+    Width = 145
     MaxValue = 300
     MinValue = 96
+    ParentFont = False
     TabOrder = 4
     Value = 96
@@ -75 +81 @@
   end
   object LabelDPI: TLabel
-    Left = 80
-    Height = 20
-    Top = 152
-    Width = 26
+    Left = 96
+    Height = 26
+    Top = 182
+    Width = 35
     Caption = 'DPI:'
     ParentColor = False
+    ParentFont = False
     Visible = False
   end
   object CheckBoxReopenLastFileOnStart: TCheckBox
-    Left = 16
-    Height = 24
-    Top = 72
-    Width = 181
+    Left = 19
+    Height = 30
+    Top = 86
+    Width = 229
     Caption = 'Reopen last file on start'
+    ParentFont = False
     TabOrder = 5
   end
   object Bevel1: TBevel
-    Left = 10
+    Left = 12
     Height = 2
-    Top = 240
-    Width = 456
+    Top = 288
+    Width = 547
     Anchors = [akLeft, akRight, akBottom]
   end
   object Label2: TLabel
-    Left = 20
-    Height = 20
-    Top = 184
-    Width = 48
+    Left = 24
+    Height = 26
+    Top = 221
+    Width = 63
     Caption = 'Theme:'
     ParentColor = False
+    ParentFont = False
   end
   object ComboBoxTheme: TComboBox
-    Left = 160
-    Height = 28
-    Top = 184
-    Width = 260
-    ItemHeight = 20
+    Left = 192
+    Height = 42
+    Top = 221
+    Width = 312
+    ItemHeight = 0
+    ParentFont = False
     Style = csDropDownList
     TabOrder = 6

trunk/Languages/vCardStudio.cs.po

@@ -374 +374 @@
 msgstr "DPI:"
 
-#: ucontact.sunknowncommand
-msgid "Unknown command: %s"
-msgstr "Neznámý příkaz: %s"
-
 #: ucontact.sunsupportedcontactfieldsindex
 msgid "Unsupported contact field index"
@@ -449 +445 @@
 msgstr "Upraveno"
 
-#: uvcf.svcardfile
-msgctxt "uvcf.svcardfile"
-msgid "vCard file"
-msgstr "Soubor vCard"

trunk/Languages/vCardStudio.po

@@ -100 +100 @@
 
 #: tformcontact.label10.caption
-msgctxt "tformcontact.label10.caption"
 msgid "Cell phone (Work):"
 msgstr ""
@@ -121 +120 @@
 
 #: tformcontact.label15.caption
-msgctxt "tformcontact.label15.caption"
 msgid "Web page:"
 msgstr ""
 
 #: tformcontact.label16.caption
-msgctxt "tformcontact.label16.caption"
 msgid "Web page (Home):"
 msgstr ""
 
 #: tformcontact.label17.caption
-msgctxt "tformcontact.label17.caption"
 msgid "Web page (Work):"
 msgstr ""
@@ -362 +358 @@
 msgstr ""
 
-#: ucontact.sunknowncommand
-msgid "Unknown command: %s"
-msgstr ""
-
 #: ucontact.sunsupportedcontactfieldsindex
 msgid "Unsupported contact field index"
@@ -437 +429 @@
 msgstr ""
 
-#: uvcf.svcardfile
-msgctxt "uvcf.svcardfile"
-msgid "vCard file"
-msgstr ""
-

trunk/Packages/Common/Common.lpk

@@ -40 +40 @@
     <License Value="GNU/GPL"/>
     <Version Minor="7"/>
-    <Files Count="21">
+    <Files Count="22">
       <Item1>
         <Filename Value="StopWatch.pas"/>
@@ -60 +60 @@
       <Item5>
         <Filename Value="UPrefixMultiplier.pas"/>
+        <HasRegisterProc Value="True"/>
         <UnitName Value="UPrefixMultiplier"/>
       </Item5>
@@ -134 +135 @@
         <UnitName Value="UTheme"/>
       </Item21>
+      <Item22>
+        <Filename Value="UStringTable.pas"/>
+        <UnitName Value="UStringTable"/>
+      </Item22>
     </Files>
     <i18n>
@@ -140 +145 @@
       <EnableI18NForLFM Value="True"/>
     </i18n>
-    <RequiredPkgs Count="3">
+    <RequiredPkgs Count="2">
       <Item1>
         <PackageName Value="LCL"/>
       </Item1>
       <Item2>
-        <PackageName Value="TemplateGenerics"/>
-      </Item2>
-      <Item3>
         <PackageName Value="FCL"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item3>
+      </Item2>
     </RequiredPkgs>
     <UsageOptions>

trunk/Packages/Common/Common.pas

@@ -5 +5 @@
 unit Common;
 
+{$warn 5023 off : no warning about unused units}
 interface
 
 uses
-  StopWatch, UCommon, UDebugLog, UDelay, UPrefixMultiplier, UURI, UThreading,
-  UMemory, UResetableThread, UPool, ULastOpenedList, URegistry,
-  UJobProgressView, UXMLUtils, UApplicationInfo, USyncCounter, UListViewSort,
-  UPersistentForm, UFindFile, UScaleDPI, UTheme, LazarusPackageIntf;
+  StopWatch, UCommon, UDebugLog, UDelay, UPrefixMultiplier, UURI, UThreading, 
+  UMemory, UResetableThread, UPool, ULastOpenedList, URegistry, 
+  UJobProgressView, UXMLUtils, UApplicationInfo, USyncCounter, UListViewSort, 
+  UPersistentForm, UFindFile, UScaleDPI, UTheme, UStringTable, 
+  LazarusPackageIntf;
 
 implementation
@@ -18 +20 @@
 begin
   RegisterUnit('UDebugLog', @UDebugLog.Register);
+  RegisterUnit('UPrefixMultiplier', @UPrefixMultiplier.Register);
   RegisterUnit('ULastOpenedList', @ULastOpenedList.Register);
   RegisterUnit('UJobProgressView', @UJobProgressView.Register);

trunk/Packages/Common/Languages/UJobProgressView.cs.po

@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.8\n"
+"X-Generator: Poedit 2.2\n"
 
 #: ujobprogressview.sestimatedtime
@@ -24 +24 @@
 msgstr "Dokončené"
 
-#: ujobprogressview.soperations
-msgid "Operations"
-msgstr "Operace"
-
 #: ujobprogressview.spleasewait
 msgid "Please wait..."

trunk/Packages/Common/Languages/UJobProgressView.po

@@ -14 +14 @@
 msgstr ""
 
-#: ujobprogressview.soperations
-msgid "Operations"
-msgstr ""
-
 #: ujobprogressview.spleasewait
 msgid "Please wait..."

trunk/Packages/Common/Languages/UThreading.po

@@ -3 +3 @@
 
 #: uthreading.scurrentthreadnotfound
+#, fuzzy,badformat
 msgid "Current thread ID %d not found in virtual thread list."
 msgstr "Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8"

trunk/Packages/Common/UApplicationInfo.pas

@@ -6 +6 @@
 
 uses
-  SysUtils, Registry, Classes, Forms, URegistry;
+  SysUtils, Classes, Forms, URegistry, Controls;
 
 type
@@ -14 +14 @@
   TApplicationInfo = class(TComponent)
   private
-    FDescription: string;
+    FDescription: TCaption;
     FIdentification: Byte;
     FLicense: string;
@@ -57 +57 @@
 
 implementation
-                        
+
 procedure Register;
 begin

trunk/Packages/Common/UCommon.pas

@@ -28 +28 @@
     unfDNSDomainName = 11);
 
-  TFilterMethodMethod = function (FileName: string): Boolean of object;
+  TFilterMethod = function (FileName: string): Boolean of object;
+  TFileNameMethod = procedure (FileName: string) of object;
+
 var
   ExceptionHandler: TExceptionEvent;
@@ -72 +74 @@
 function MergeArray(A, B: array of string): TArrayOfString;
 function LoadFileToStr(const FileName: TFileName): AnsiString;
+procedure SaveStringToFile(S, FileName: string);
 procedure SearchFiles(AList: TStrings; Dir: string;
-  FilterMethod: TFilterMethodMethod);
+  FilterMethod: TFilterMethod = nil; FileNameMethod: TFileNameMethod = nil);
+function GetStringPart(var Text: string; Separator: string): string;
+function StripTags(const S: string): string;
+function PosFromIndex(SubStr: string; Text: string;
+  StartIndex: Integer): Integer;
+function PosFromIndexReverse(SubStr: string; Text: string;
+  StartIndex: Integer): Integer;
+procedure CopyStringArray(Dest: TStringArray; Source: array of string);
 
 
@@ -101 +111 @@
   I: Integer;
 begin
+  Result := '';
   for I := 1 to Length(Source) do begin
     Result := Result + LowerCase(IntToHex(Ord(Source[I]), 2));
@@ -522 +533 @@
 end;
 
+procedure SaveStringToFile(S, FileName: string);
+var
+  F: TextFile;
+begin
+  AssignFile(F, FileName);
+  try
+    ReWrite(F);
+    Write(F, S);
+  finally
+    CloseFile(F);
+  end;
+end;
+
 procedure SearchFiles(AList: TStrings; Dir: string;
-  FilterMethod: TFilterMethodMethod);
+  FilterMethod: TFilterMethod = nil; FileNameMethod: TFileNameMethod = nil);
 var
   SR: TSearchRec;
@@ -531 +555 @@
     try
       repeat
-        if (SR.Name = '.') or (SR.Name = '..') or not FilterMethod(SR.Name) then Continue;
+        if (SR.Name = '.') or (SR.Name = '..') or (Assigned(FilterMethod) and (not FilterMethod(SR.Name) or
+          not FilterMethod(Copy(Dir, 3, Length(Dir)) + SR.Name))) then Continue;
+        if Assigned(FileNameMethod) then
+          FileNameMethod(Dir + SR.Name);
         AList.Add(Dir + SR.Name);
         if (SR.Attr and faDirectory) <> 0 then
@@ -541 +568 @@
 end;
 
+function GetStringPart(var Text: string; Separator: string): string;
+var
+  P: Integer;
+begin
+  P := Pos(Separator, Text);
+  if P > 0 then begin
+    Result := Copy(Text, 1, P - 1);
+    Delete(Text, 1, P - 1 + Length(Separator));
+  end else begin
+    Result := Text;
+    Text := '';
+  end;
+  Result := Trim(Result);
+  Text := Trim(Text);
+end;
+
+function StripTags(const S: string): string;
+var
+  Len: Integer;
+
+  function ReadUntil(const ReadFrom: Integer; const C: Char): Integer;
+  var
+    J: Integer;
+  begin
+    for J := ReadFrom to Len do
+      if (S[j] = C) then
+      begin
+        Result := J;
+        Exit;
+      end;
+    Result := Len + 1;
+  end;
+
+var
+  I, APos: Integer;
+begin
+  Len := Length(S);
+  I := 0;
+  Result := '';
+  while (I <= Len) do begin
+    Inc(I);
+    APos := ReadUntil(I, '<');
+    Result := Result + Copy(S, I, APos - i);
+    I := ReadUntil(APos + 1, '>');
+  end;
+end;
+
+function PosFromIndex(SubStr: string; Text: string;
+  StartIndex: Integer): Integer;
+var
+  I, MaxLen: SizeInt;
+  Ptr: PAnsiChar;
+begin
+  Result := 0;
+  if (StartIndex < 1) or (StartIndex > Length(Text) - Length(SubStr)) then Exit;
+  if Length(SubStr) > 0 then begin
+    MaxLen := Length(Text) - Length(SubStr) + 1;
+    I := StartIndex;
+    Ptr := @Text[StartIndex];
+    while (I <= MaxLen) do begin
+      if (SubStr[1] = Ptr^) and (CompareByte(Substr[1], Ptr^, Length(SubStr)) = 0) then begin
+        Result := I;
+        Exit;
+      end;
+      Inc(I);
+      Inc(Ptr);
+    end;
+  end;
+end;
+
+function PosFromIndexReverse(SubStr: string; Text: string;
+  StartIndex: Integer): Integer;
+var
+  I: SizeInt;
+  Ptr: PAnsiChar;
+begin
+  Result := 0;
+  if (StartIndex < 1) or (StartIndex > Length(Text)) then Exit;
+  if Length(SubStr) > 0 then begin
+    I := StartIndex;
+    Ptr := @Text[StartIndex];
+    while (I > 0) do begin
+      if (SubStr[1] = Ptr^) and (CompareByte(Substr[1], Ptr^, Length(SubStr)) = 0) then begin
+        Result := I;
+        Exit;
+      end;
+      Dec(I);
+      Dec(Ptr);
+    end;
+  end;
+end;
+
+procedure CopyStringArray(Dest: TStringArray; Source: array of string);
+var
+  I: Integer;
+begin
+  SetLength(Dest, Length(Source));
+  for I := 0 to Length(Dest) - 1 do
+    Dest[I] := Source[I];
+end;
+
 
 initialization

trunk/Packages/Common/UDebugLog.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, FileUtil, SpecializedList, SyncObjs;
+  Classes, SysUtils, FileUtil, fgl, SyncObjs;
 
 type
@@ -29 +29 @@
     procedure SetMaxCount(const AValue: Integer);
   public
-    Items: TListObject;
+    Items: TFPGObjectList<TDebugLogItem>;
     Lock: TCriticalSection;
     procedure Add(Text: string; Group: string = '');
@@ -104 +104 @@
     if ExtractFileDir(FileName) <> '' then
       ForceDirectories(ExtractFileDir(FileName));
-    if FileExists(FileName) then LogFile := TFileStream.Create(UTF8Decode(FileName), fmOpenWrite)
-      else LogFile := TFileStream.Create(UTF8Decode(FileName), fmCreate);
+    if FileExists(FileName) then LogFile := TFileStream.Create(FileName, fmOpenWrite)
+      else LogFile := TFileStream.Create(FileName, fmCreate);
     LogFile.Seek(0, soFromEnd);
     Text := FormatDateTime('hh:nn:ss.zzz', Now) + ': ' + Text + LineEnding;
@@ -117 +117 @@
 begin
   inherited;
-  Items := TListObject.Create;
+  Items := TFPGObjectList<TDebugLogItem>.Create;
   Lock := TCriticalSection.Create;
   MaxCount := 100;

trunk/Packages/Common/UFindFile.pas

@@ -24 +24 @@
 
 uses
-  SysUtils, Classes, Graphics, Controls, Forms, Dialogs, FileCtrl;
+  SysUtils, Classes, Graphics, Controls, Forms, Dialogs;
 
 type
@@ -117 +117 @@
   Attr := 0;
   if ffaReadOnly in FileAttr then Attr := Attr + faReadOnly;
-  if ffaHidden in FileAttr then Attr := Attr + faHidden;
-  if ffaSysFile in FileAttr then Attr := Attr + faSysFile;
-  if ffaVolumeID in FileAttr then Attr := Attr + faVolumeID;
+  if ffaHidden in FileAttr then Attr := Attr + 2; //faHidden; use constant to avoid platform warning
+  if ffaSysFile in FileAttr then Attr := Attr + 4; //faSysFile; use constant to avoid platform warning
+  // Deprecated: if ffaVolumeID in FileAttr then Attr := Attr + faVolumeID;
   if ffaDirectory in FileAttr then Attr := Attr + faDirectory;
   if ffaArchive in FileAttr then Attr := Attr + faArchive;
   if ffaAnyFile in FileAttr then Attr := Attr + faAnyFile;
 
-  if SysUtils.FindFirst(UTF8Decode(inPath + FileMask), Attr, Rec) = 0 then
+  if SysUtils.FindFirst(inPath + FileMask, Attr, Rec) = 0 then
   try
     repeat
-      s.Add(inPath + UTF8Encode(Rec.Name));
+      s.Add(inPath + Rec.Name);
     until SysUtils.FindNext(Rec) <> 0;
   finally
@@ -135 +135 @@
   If not InSubFolders then Exit;
 
-  if SysUtils.FindFirst(UTF8Decode(inPath + FilterAll), faDirectory, Rec) = 0 then
+  if SysUtils.FindFirst(inPath + FilterAll, faDirectory, Rec) = 0 then
   try
     repeat
       if ((Rec.Attr and faDirectory) > 0) and (Rec.Name <> '.')
       and (Rec.Name <> '..') then
-        FileSearch(IncludeTrailingBackslash(inPath + UTF8Encode(Rec.Name)));
+        FileSearch(IncludeTrailingBackslash(inPath + Rec.Name));
     until SysUtils.FindNext(Rec) <> 0;
   finally

trunk/Packages/Common/UJobProgressView.lfm

@@ -1 +1 @@
 object FormJobProgressView: TFormJobProgressView
-  Left = 656
-  Height = 246
-  Top = 354
-  Width = 328
+  Left = 467
+  Height = 345
+  Top = 252
+  Width = 539
   BorderIcons = [biSystemMenu]
-  ClientHeight = 246
-  ClientWidth = 328
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
+  ClientHeight = 345
+  ClientWidth = 539
+  DesignTimePPI = 120
   OnClose = FormClose
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  OnHide = FormHide
+  OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '1.6.0.4'
+  LCLVersion = '2.0.2.0'
   object PanelOperationsTitle: TPanel
     Left = 0
-    Height = 24
+    Height = 32
     Top = 0
-    Width = 328
-    Align = alTop
-    BevelOuter = bvNone
-    ClientHeight = 24
-    ClientWidth = 328
+    Width = 539
+    Align = alTop
+    BevelOuter = bvNone
+    ClientHeight = 32
+    ClientWidth = 539
     FullRepaint = False
     TabOrder = 0
     object LabelOperation: TLabel
       Left = 8
-      Height = 13
+      Height = 20
       Top = 8
-      Width = 66
+      Width = 76
       Caption = 'Operations:'
-      Font.Height = -11
-      Font.Name = 'MS Sans Serif'
-      Font.Style = [fsBold]
       ParentColor = False
       ParentFont = False
@@ -41 +39 @@
   object PanelLog: TPanel
     Left = 0
-    Height = 122
-    Top = 124
-    Width = 328
+    Height = 133
+    Top = 212
+    Width = 539
     Align = alClient
     BevelOuter = bvSpace
-    ClientHeight = 122
-    ClientWidth = 328
+    ClientHeight = 133
+    ClientWidth = 539
     TabOrder = 1
     object MemoLog: TMemo
       Left = 8
-      Height = 106
+      Height = 117
       Top = 8
-      Width = 312
+      Width = 523
       Anchors = [akTop, akLeft, akRight, akBottom]
       ReadOnly = True
@@ -62 +60 @@
   object PanelProgress: TPanel
     Left = 0
-    Height = 38
-    Top = 50
-    Width = 328
-    Align = alTop
-    BevelOuter = bvNone
-    ClientHeight = 38
-    ClientWidth = 328
+    Height = 54
+    Top = 106
+    Width = 539
+    Align = alTop
+    BevelOuter = bvNone
+    ClientHeight = 54
+    ClientWidth = 539
     TabOrder = 2
     object ProgressBarPart: TProgressBar
-      Left = 8
-      Height = 17
-      Top = 16
-      Width = 312
+      Left = 10
+      Height = 24
+      Top = 24
+      Width = 523
       Anchors = [akTop, akLeft, akRight]
       TabOrder = 0
@@ -80 +78 @@
     object LabelEstimatedTimePart: TLabel
       Left = 8
-      Height = 13
+      Height = 20
       Top = -2
-      Width = 71
+      Width = 103
       Caption = 'Estimated time:'
       ParentColor = False
@@ -89 +87 @@
   object PanelOperations: TPanel
     Left = 0
-    Height = 26
-    Top = 24
-    Width = 328
-    Align = alTop
-    BevelOuter = bvNone
-    ClientHeight = 26
-    ClientWidth = 328
+    Height = 42
+    Top = 64
+    Width = 539
+    Align = alTop
+    BevelOuter = bvNone
+    ClientHeight = 42
+    ClientWidth = 539
     FullRepaint = False
     TabOrder = 3
     object ListViewJobs: TListView
       Left = 8
-      Height = 16
+      Height = 32
       Top = 5
-      Width = 312
+      Width = 523
       Anchors = [akTop, akLeft, akRight, akBottom]
       AutoWidthLastColumn = True
@@ -109 +107 @@
       Columns = <      
         item
-          Width = 312
+          Width = 523
         end>
       OwnerData = True
@@ -122 +120 @@
   object PanelProgressTotal: TPanel
     Left = 0
-    Height = 36
-    Top = 88
-    Width = 328
-    Align = alTop
-    BevelOuter = bvNone
-    ClientHeight = 36
-    ClientWidth = 328
+    Height = 52
+    Top = 160
+    Width = 539
+    Align = alTop
+    BevelOuter = bvNone
+    ClientHeight = 52
+    ClientWidth = 539
     TabOrder = 4
     object LabelEstimatedTimeTotal: TLabel
       Left = 8
-      Height = 13
+      Height = 20
       Top = 0
-      Width = 97
+      Width = 141
       Caption = 'Total estimated time:'
       ParentColor = False
@@ -140 +138 @@
     object ProgressBarTotal: TProgressBar
       Left = 8
-      Height = 16
-      Top = 16
-      Width = 312
+      Height = 24
+      Top = 24
+      Width = 523
       Anchors = [akTop, akLeft, akRight]
       TabOrder = 0
+    end
+  end
+  object PanelText: TPanel
+    Left = 0
+    Height = 32
+    Top = 32
+    Width = 539
+    Align = alTop
+    BevelOuter = bvNone
+    ClientHeight = 32
+    ClientWidth = 539
+    TabOrder = 5
+    object LabelText: TLabel
+      Left = 8
+      Height = 24
+      Top = 8
+      Width = 525
+      Anchors = [akTop, akLeft, akRight]
+      AutoSize = False
+      ParentColor = False
     end
   end
@@ -223 +241 @@
     Interval = 100
     OnTimer = TimerUpdateTimer
-    left = 264
+    left = 320
     top = 8
   end

trunk/Packages/Common/UJobProgressView.pas

@@ -7 +7 @@
 uses
   SysUtils, Variants, Classes, Graphics, Controls, Forms, Syncobjs,
-  Dialogs, ComCtrls, StdCtrls, ExtCtrls, Contnrs, UThreading,
+  Dialogs, ComCtrls, StdCtrls, ExtCtrls, Contnrs, UThreading, Math,
   DateUtils;
 
@@ -13 +13 @@
   EstimatedTimeShowTreshold = 4;
   EstimatedTimeShowTresholdTotal = 1;
-  MemoLogHeight = 200;
   UpdateInterval = 100; // ms
 
@@ -24 +23 @@
     FLock: TCriticalSection;
     FOnChange: TNotifyEvent;
+    FText: string;
     FValue: Integer;
     FMax: Integer;
     procedure SetMax(const AValue: Integer);
+    procedure SetText(AValue: string);
     procedure SetValue(const AValue: Integer);
   public
@@ -35 +36 @@
     property Value: Integer read FValue write SetValue;
     property Max: Integer read FMax write SetMax;
+    property Text: string read FText write SetText;
     property OnChange: TNotifyEvent read FOnChange write FOnChange;
   end;
@@ -69 +71 @@
   end;
 
+  TJobs = class(TObjectList)
+  end;
+
   TJobThread = class(TListedThread)
     procedure Execute; override;
@@ -80 +85 @@
   TFormJobProgressView = class(TForm)
     ImageList1: TImageList;
+    LabelText: TLabel;
     Label2: TLabel;
     LabelOperation: TLabel;
@@ -86 +92 @@
     ListViewJobs: TListView;
     MemoLog: TMemo;
+    PanelText: TPanel;
     PanelProgressTotal: TPanel;
     PanelOperationsTitle: TPanel;
@@ -94 +101 @@
     ProgressBarTotal: TProgressBar;
     TimerUpdate: TTimer;
+    procedure FormHide(Sender: TObject);
+    procedure FormShow(Sender: TObject);
+    procedure ReloadJobList;
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormDestroy(Sender: TObject);
@@ -100 +110 @@
     procedure FormCreate(Sender: TObject);
     procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
+    procedure UpdateHeight;
   public
     JobProgressView: TJobProgressView;
@@ -118 +129 @@
     TotalStartTime: TDateTime;
     Log: TStringList;
+    FForm: TFormJobProgressView;
     procedure SetTerminate(const AValue: Boolean);
     procedure UpdateProgress;
-    procedure ReloadJobList;
-    procedure StartJobs;
-    procedure UpdateHeight;
     procedure JobProgressChange(Sender: TObject);
   public
-    Form: TFormJobProgressView;
-    Jobs: TObjectList; // TListObject<TJob>
+    Jobs: TJobs;
     CurrentJob: TJob;
     CurrentJobIndex: Integer;
@@ -132 +140 @@
     destructor Destroy; override;
     procedure Clear;
-    procedure AddJob(Title: string; Method: TJobProgressViewMethod;
-      NoThreaded: Boolean = False; WaitFor: Boolean = False);
-    procedure Start(AAutoClose: Boolean = True);
+    function AddJob(Title: string; Method: TJobProgressViewMethod;
+      NoThreaded: Boolean = False; WaitFor: Boolean = False): TJob;
+    procedure Start;
     procedure Stop;
     procedure TermSleep(Delay: Integer);
+    property Form: TFormJobProgressView read FForm;
     property Terminate: Boolean read FTerminate write SetTerminate;
   published
@@ -166 +175 @@
   STotalEstimatedTime = 'Total estimated time: %s';
   SFinished = 'Finished';
-  SOperations = 'Operations';
 
 procedure Register;
@@ -172 +180 @@
   RegisterComponents('Common', [TJobProgressView]);
 end;
+
+{ TJobThread }
 
 procedure TJobThread.Execute;
@@ -190 +200 @@
 end;
 
-procedure TJobProgressView.AddJob(Title: string; Method: TJobProgressViewMethod;
-  NoThreaded: Boolean = False; WaitFor: Boolean = False);
+{ TFormJobProgressView }
+
+procedure TFormJobProgressView.UpdateHeight;
 var
-  NewJob: TJob;
-begin
-  NewJob := TJob.Create;
-  NewJob.ProgressView := Self;
-  NewJob.Title := Title;
-  NewJob.Method := Method;
-  NewJob.NoThreaded := NoThreaded;
-  NewJob.WaitFor := WaitFor;
-  NewJob.Progress.Max := 100;
-  NewJob.Progress.Reset;
-  NewJob.Progress.OnChange := JobProgressChange;
-  Jobs.Add(NewJob);
+  H: Integer;
+  PanelOperationsVisible: Boolean;
+  PanelOperationsHeight: Integer;
+  PanelProgressVisible: Boolean;
+  PanelProgressTotalVisible: Boolean;
+  PanelLogVisible: Boolean;
+  MemoLogHeight: Integer = 200;
+  I: Integer;
+  ItemRect: TRect;
+  MaxH: Integer;
+begin
+    H := PanelOperationsTitle.Height;
+    PanelOperationsVisible := JobProgressView.Jobs.Count > 0;
+    if PanelOperationsVisible <> PanelOperations.Visible then
+      PanelOperations.Visible := PanelOperationsVisible;
+    if ListViewJobs.Items.Count > 0 then begin
+      Maxh := 0;
+      for I := 0 to ListViewJobs.Items.Count - 1 do
+      begin
+        ItemRect := ListViewJobs.Items[i].DisplayRect(drBounds);
+        Maxh := Max(Maxh, ItemRect.Top + (ItemRect.Bottom - ItemRect.Top));
+      end;
+      PanelOperationsHeight := Scale96ToScreen(12) + Maxh;
+    end else PanelOperationsHeight := Scale96ToScreen(8);
+    if PanelOperationsHeight <> PanelOperations.Height then
+      PanelOperations.Height := PanelOperationsHeight;
+    if PanelOperationsVisible then
+      H := H + PanelOperations.Height;
+
+    PanelProgressVisible := (JobProgressView.Jobs.Count > 0) and not JobProgressView.Finished;
+    if PanelProgressVisible <> PanelProgress.Visible then
+      PanelProgress.Visible := PanelProgressVisible;
+    if PanelProgressVisible then
+      H := H + PanelProgress.Height;
+    PanelProgressTotalVisible := (JobProgressView.Jobs.Count > 1) and not JobProgressView.Finished;
+    if PanelProgressTotalVisible <> PanelProgressTotal.Visible then
+      PanelProgressTotal.Visible := PanelProgressTotalVisible;
+    if PanelProgressTotalVisible then
+      H := H + PanelProgressTotal.Height;
+    Constraints.MinHeight := H;
+    PanelLogVisible := MemoLog.Lines.Count > 0;
+    if PanelLogVisible <> PanelLog.Visible then
+      PanelLog.Visible := PanelLogVisible;
+    if PanelLogVisible then
+      H := H + Scale96ToScreen(MemoLogHeight);
+    if PanelText.Visible then
+      H := H + PanelText.Height;
+    if Height <> H then begin
+      Height := H;
+      Top := (Screen.Height - H) div 2;
+    end;
+end;
+
+procedure TFormJobProgressView.TimerUpdateTimer(Sender: TObject);
+var
+  ProgressBarPartVisible: Boolean;
+  ProgressBarTotalVisible: Boolean;
+begin
+  JobProgressView.UpdateProgress;
+  if Visible and (not ProgressBarPart.Visible) and
+  Assigned(JobProgressView.CurrentJob) and
+  (JobProgressView.CurrentJob.Progress.Value > 0) then begin
+    ProgressBarPartVisible := True;
+    if ProgressBarPartVisible <> ProgressBarPart.Visible then
+      ProgressBarPart.Visible := ProgressBarPartVisible;
+    ProgressBarTotalVisible := True;
+    if ProgressBarTotalVisible <> ProgressBarTotal.Visible then
+      ProgressBarTotal.Visible := ProgressBarTotalVisible;
+  end;
+  if not Visible then begin
+    TimerUpdate.Interval := UpdateInterval;
+    if not JobProgressView.OwnerDraw then Show;
+  end;
+  if Assigned(JobProgressView.CurrentJob) then begin
+    LabelText.Caption := JobProgressView.CurrentJob.Progress.Text;
+    if LabelText.Caption <> '' then begin
+      PanelText.Visible := True;
+      UpdateHeight;
+    end;
+  end;
+end;
+
+procedure TFormJobProgressView.FormDestroy(Sender:TObject);
+begin
+end;
+
+procedure TFormJobProgressView.ListViewJobsData(Sender: TObject; Item: TListItem);
+begin
+  if (Item.Index >= 0) and (Item.Index < JobProgressView.Jobs.Count) then
+  with TJob(JobProgressView.Jobs[Item.Index]) do begin
+    Item.Caption := Title;
+    if Item.Index = JobProgressView.CurrentJobIndex then Item.ImageIndex := 1
+      else if Finished then Item.ImageIndex := 0
+      else Item.ImageIndex := 2;
+    Item.Data := JobProgressView.Jobs[Item.Index];
+  end;
+end;
+
+procedure TFormJobProgressView.FormClose(Sender: TObject;
+  var CloseAction: TCloseAction);
+begin
+end;
+
+procedure TFormJobProgressView.FormCreate(Sender: TObject);
+begin
+  Caption := SPleaseWait;
+  try
+    //Animate1.FileName := ExtractFileDir(UTF8Encode(Application.ExeName)) +
+    //  DirectorySeparator + 'horse.avi';
+    //Animate1.Active := True;
+  except
+
+  end;
+end;
+
+procedure TFormJobProgressView.ReloadJobList;
+begin
+  // Workaround for not showing first line
+  //Form.ListViewJobs.Items.Count := Jobs.Count + 1;
+  //Form.ListViewJobs.Refresh;
+
+  if ListViewJobs.Items.Count <> JobProgressView.Jobs.Count then
+    ListViewJobs.Items.Count := JobProgressView.Jobs.Count;
+  ListViewJobs.Refresh;
+  Application.ProcessMessages;
+  UpdateHeight;
+end;
+
+procedure TFormJobProgressView.FormShow(Sender: TObject);
+begin
+  ReloadJobList;
+end;
+
+procedure TFormJobProgressView.FormHide(Sender: TObject);
+begin
+  JobProgressView.Jobs.Clear;
+  ReloadJobList;
+end;
+
+procedure TFormJobProgressView.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
+begin
+  CanClose := JobProgressView.Finished;
+  JobProgressView.Terminate := True;
+  Caption := SPleaseWait + STerminate;
+end;
+
+
+{ TJobProgressView }
+
+function TJobProgressView.AddJob(Title: string; Method: TJobProgressViewMethod;
+  NoThreaded: Boolean = False; WaitFor: Boolean = False): TJob;
+begin
+  Result := TJob.Create;
+  Result.ProgressView := Self;
+  Result.Title := Title;
+  Result.Method := Method;
+  Result.NoThreaded := NoThreaded;
+  Result.WaitFor := WaitFor;
+  Result.Progress.Max := 100;
+  Result.Progress.Reset;
+  Result.Progress.OnChange := JobProgressChange;
+  Jobs.Add(Result);
   //ReloadJobList;
 end;
 
-procedure TJobProgressView.Start(AAutoClose: Boolean = True);
-begin
-  AutoClose := AAutoClose;
-  StartJobs;
-end;
-
-procedure TJobProgressView.StartJobs;
+procedure TJobProgressView.Start;
 var
   I: Integer;
@@ -229 +384 @@
     Form.MemoLog.Clear;
 
+    Form.PanelText.Visible := False;
     Form.LabelEstimatedTimePart.Visible := False;
     Form.LabelEstimatedTimeTotal.Visible := False;
@@ -258 +414 @@
       Form.ProgressBarPart.Visible := False;
       //Show;
-      ReloadJobList;
+      Form.ReloadJobList;
       Application.ProcessMessages;
       if NoThreaded then begin
@@ -296 +452 @@
     //if Visible then Hide;
     Form.MemoLog.Lines.Assign(Log);
-    if (Form.MemoLog.Lines.Count = 0) and AutoClose then begin
+    if (Form.MemoLog.Lines.Count = 0) and FAutoClose then begin
       Form.Hide;
     end;
-    Clear;
+    if not Form.Visible then Clear;
     Form.Caption := SFinished;
     //LabelEstimatedTimePart.Visible := False;
     Finished := True;
     CurrentJobIndex := -1;
-    ReloadJobList;
-  end;
-end;
-
-procedure TJobProgressView.UpdateHeight;
-var
-  H: Integer;
-  PanelOperationsVisible: Boolean;
-  PanelOperationsHeight: Integer;
-  PanelProgressVisible: Boolean;
-  PanelProgressTotalVisible: Boolean;
-  PanelLogVisible: Boolean;
-begin
-  with Form do begin
-  H := PanelOperationsTitle.Height;
-  PanelOperationsVisible := Jobs.Count > 0;
-  if PanelOperationsVisible <> PanelOperations.Visible then
-    PanelOperations.Visible := PanelOperationsVisible;
-  PanelOperationsHeight := 8 + 18 * Jobs.Count;
-  if PanelOperationsHeight <> PanelOperations.Height then
-    PanelOperations.Height := PanelOperationsHeight;
-  if PanelOperationsVisible then
-    H := H + PanelOperations.Height;
-
-  PanelProgressVisible := (Jobs.Count > 0) and not Finished;
-  if PanelProgressVisible <> PanelProgress.Visible then
-    PanelProgress.Visible := PanelProgressVisible;
-  if PanelProgressVisible then
-    H := H + PanelProgress.Height;
-  PanelProgressTotalVisible := (Jobs.Count > 1) and not Finished;
-  if PanelProgressTotalVisible <> PanelProgressTotal.Visible then
-    PanelProgressTotal.Visible := PanelProgressTotalVisible;
-  if PanelProgressTotalVisible then
-    H := H + PanelProgressTotal.Height;
-  Constraints.MinHeight := H;
-  PanelLogVisible := MemoLog.Lines.Count > 0;
-  if PanelLogVisible <> PanelLog.Visible then
-    PanelLog.Visible := PanelLogVisible;
-  if PanelLogVisible then
-    H := H + MemoLogHeight;
-  if Height <> H then Height := H;
+    Form.ReloadJobList;
   end;
 end;
@@ -352 +468 @@
   if Assigned(FOnOwnerDraw) then
     FOnOwnerDraw(Self);
-end;
-
-procedure TFormJobProgressView.TimerUpdateTimer(Sender: TObject);
-var
-  ProgressBarPartVisible: Boolean;
-  ProgressBarTotalVisible: Boolean;
-begin
-  JobProgressView.UpdateProgress;
-  if Visible and (not ProgressBarPart.Visible) and
-  Assigned(JobProgressView.CurrentJob) and
-  (JobProgressView.CurrentJob.Progress.Value > 0) then begin
-    ProgressBarPartVisible := True;
-    if ProgressBarPartVisible <> ProgressBarPart.Visible then
-      ProgressBarPart.Visible := ProgressBarPartVisible;
-    ProgressBarTotalVisible := True;
-    if ProgressBarTotalVisible <> ProgressBarTotal.Visible then
-      ProgressBarTotal.Visible := ProgressBarTotalVisible;
-  end;
-  if not Visible then begin
-    TimerUpdate.Interval := UpdateInterval;
-    if not JobProgressView.OwnerDraw then Show;
-  end;
-end;
-
-procedure TFormJobProgressView.FormDestroy(Sender:TObject);
-begin
-end;
-
-procedure TFormJobProgressView.ListViewJobsData(Sender: TObject; Item: TListItem);
-begin
-  if (Item.Index >= 0) and (Item.Index < JobProgressView.Jobs.Count) then
-  with TJob(JobProgressView.Jobs[Item.Index]) do begin
-    Item.Caption := Title;
-    if Item.Index = JobProgressView.CurrentJobIndex then Item.ImageIndex := 1
-      else if Finished then Item.ImageIndex := 0
-      else Item.ImageIndex := 2;
-    Item.Data := JobProgressView.Jobs[Item.Index];
-  end;
-end;
-
-procedure TFormJobProgressView.FormClose(Sender: TObject;
-  var CloseAction: TCloseAction);
-begin
-  ListViewJobs.Clear;
-end;
-
-procedure TFormJobProgressView.FormCreate(Sender: TObject);
-begin
-  Caption := SPleaseWait;
-  try
-    //Animate1.FileName := ExtractFileDir(UTF8Encode(Application.ExeName)) +
-    //  DirectorySeparator + 'horse.avi';
-    //Animate1.Active := True;
-  except
-
-  end;
 end;
 
@@ -426 +486 @@
     Sleep(Quantum);
   end;
-end;
-
-procedure TFormJobProgressView.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
-begin
-  CanClose := JobProgressView.Finished;
-  JobProgressView.Terminate := True;
-  Caption := SPleaseWait + STerminate;
 end;
 
@@ -490 +543 @@
 end;
 
-procedure TJobProgressView.ReloadJobList;
-begin
-  UpdateHeight;
-  // Workaround for not showing first line
-  Form.ListViewJobs.Items.Count := Jobs.Count + 1;
-  Form.ListViewJobs.Refresh;
-
-  if Form.ListViewJobs.Items.Count <> Jobs.Count then
-    Form.ListViewJobs.Items.Count := Jobs.Count;
-  Form.ListViewJobs.Refresh;
-  //Application.ProcessMessages;
-end;
-
 constructor TJobProgressView.Create(TheOwner: TComponent);
 begin
   inherited;
   if not (csDesigning in ComponentState) then begin
-    Form := TFormJobProgressView.Create(Self);
-    Form.JobProgressView := Self;
-  end;
-  Jobs := TObjectList.Create;
+    FForm := TFormJobProgressView.Create(Self);
+    FForm.JobProgressView := Self;
+  end;
+  Jobs := TJobs.Create;
   Log := TStringList.Create;
   //PanelOperationsTitle.Height := 80;
-  ShowDelay := 0; //1000; // ms
+  AutoClose := True;
+  ShowDelay := 0;
 end;
 
@@ -519 +560 @@
 begin
   Jobs.Clear;
+  Log.Clear;
   //ReloadJobList;
 end;
@@ -528 +570 @@
   inherited;
 end;
+
+{ TProgress }
 
 procedure TProgress.SetMax(const AValue: Integer);
@@ -536 +580 @@
     if FMax < 1 then FMax := 1;
     if FValue >= FMax then FValue := FMax;
+  finally
+    FLock.Release;
+  end;
+end;
+
+procedure TProgress.SetText(AValue: string);
+begin
+  try
+    FLock.Acquire;
+    if FText = AValue then Exit;
+    FText := AValue;
   finally
     FLock.Release;
@@ -563 +618 @@
 end;
 
-{ TProgress }
-
 procedure TProgress.Increment;
 begin

trunk/Packages/Common/ULastOpenedList.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Registry, URegistry, Menus, XMLConf;
+  Classes, SysUtils, Registry, URegistry, Menus, XMLConf, DOM;
 
 type
@@ -30 +30 @@
     procedure SaveToXMLConfig(XMLConfig: TXMLConfig; Path: string);
     procedure AddItem(FileName: string);
+    function GetFirstFileName: string;
   published
     property MaxCount: Integer read FMaxCount write SetMaxCount;
@@ -139 +140 @@
     OpenKey(Context.Key, True);
     for I := 0 to Items.Count - 1 do
-      WriteString('File' + IntToStr(I), UTF8Decode(Items[I]));
+      WriteString('File' + IntToStr(I), Items[I]);
   finally
     Free;
@@ -153 +154 @@
 begin
   with XMLConfig do begin
-    Count := GetValue(Path + '/Count', 0);
+    Count := GetValue(DOMString(Path + '/Count'), 0);
     if Count > MaxCount then Count := MaxCount;
     Items.Clear;
     for I := 0 to Count - 1 do begin
-      Value := GetValue(Path + '/File' + IntToStr(I), '');
+      Value := string(GetValue(DOMString(Path + '/File' + IntToStr(I)), ''));
       if Trim(Value) <> '' then Items.Add(Value);
     end;
@@ -170 +171 @@
 begin
   with XMLConfig do begin
-    SetValue(Path + '/Count', Items.Count);
+    SetValue(DOMString(Path + '/Count'), Items.Count);
     for I := 0 to Items.Count - 1 do
-      SetValue(Path + '/File' + IntToStr(I), Items[I]);
+      SetValue(DOMString(Path + '/File' + IntToStr(I)), DOMString(Items[I]));
     Flush;
   end;
@@ -185 +186 @@
 end;
 
+function TLastOpenedList.GetFirstFileName: string;
+begin
+  if Items.Count > 0 then Result := Items[0]
+    else Result := '';
+end;
+
 end.
 

trunk/Packages/Common/UListViewSort.pas

@@ -9 +9 @@
 uses
   {$IFDEF Windows}Windows, CommCtrl, {$ENDIF}Classes, Graphics, ComCtrls, SysUtils,
-  Controls, DateUtils, Dialogs, SpecializedList, Forms, Grids, StdCtrls, ExtCtrls,
+  Controls, DateUtils, Dialogs, fgl, Forms, Grids, StdCtrls, ExtCtrls,
   LclIntf, LMessages, LclType, LResources;
 
@@ -52 +52 @@
     {$ENDIF}
   public
-    List: TListObject;
-    Source: TListObject;
+    List: TFPGObjectList<TObject>;
+    Source: TFPGObjectList<TObject>;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -98 +98 @@
   end;
 
+  { TListViewEx }
+
+  TListViewEx = class(TWinControl)
+  private
+    FFilter: TListViewFilter;
+    FListView: TListView;
+    FListViewSort: TListViewSort;
+    procedure ResizeHanlder;
+  public
+    constructor Create(TheOwner: TComponent); override;
+    destructor Destroy; override;
+  published
+    property ListView: TListView read FListView write FListView;
+    property ListViewSort: TListViewSort read FListViewSort write FListViewSort;
+    property Filter: TListViewFilter read FFilter write FFilter;
+    property Visible;
+  end;
+
 procedure Register;
 
@@ -105 +123 @@
 procedure Register;
 begin
-  RegisterComponents('Common', [TListViewSort, TListViewFilter]);
+  RegisterComponents('Common', [TListViewSort, TListViewFilter, TListViewEx]);
+end;
+
+{ TListViewEx }
+
+procedure TListViewEx.ResizeHanlder;
+begin
+end;
+
+constructor TListViewEx.Create(TheOwner: TComponent);
+begin
+  inherited Create(TheOwner);
+  Filter := TListViewFilter.Create(Self);
+  Filter.Parent := Self;
+  Filter.Align := alBottom;
+  ListView := TListView.Create(Self);
+  ListView.Parent := Self;
+  ListView.Align := alClient;
+  ListViewSort := TListViewSort.Create(Self);
+  ListViewSort.ListView := ListView;
+end;
+
+destructor TListViewEx.Destroy;
+begin
+  inherited Destroy;
 end;
 
@@ -142 +184 @@
 var
   I: Integer;
+  R: TRect;
 begin
   with FStringGrid1 do begin
-    Options := Options - [goEditing, goAlwaysShowEditor];
-    //Columns.Clear;
     while Columns.Count > ListView.Columns.Count do Columns.Delete(Columns.Count - 1);
     while Columns.Count < ListView.Columns.Count do Columns.Add;
     for I := 0 to ListView.Columns.Count - 1 do begin
       Columns[I].Width := ListView.Columns[I].Width;
+      if Selection.Left = I then begin
+        R := CellRect(I, 0);
+        Editor.Left := R.Left + 2;
+        Editor.Width := R.Width - 4;
+      end;
     end;
-    Options := Options + [goEditing, goAlwaysShowEditor];
   end;
 end;
@@ -274 +319 @@
 end;
 
+var
+  ListViewSortCompare: TCompareEvent;
+
+function ListViewCompare(const Item1, Item2: TObject): Integer;
+begin
+  Result := ListViewSortCompare(Item1, Item2);
+end;
+
 procedure TListViewSort.Sort(Compare: TCompareEvent);
 begin
+  // TODO: Because TFLGObjectList compare handler is not class method,
+  // it is necessary to use simple function compare handler with local variable
+  ListViewSortCompare := Compare;
   if (List.Count > 0) then
-    List.Sort(Compare);
+    List.Sort(ListViewCompare);
 end;
 
@@ -340 +396 @@
 begin
   inherited;
-  List := TListObject.Create;
-  List.OwnsObjects := False;
+  List := TFPGObjectList<TObject>.Create;
+  List.FreeObjects := False;
 end;
 
@@ -381 +437 @@
   ItemLeft := Item.Left;
   ItemLeft := 23; // Windows 7 workaround
-  
+
   Rect1.Left := ItemLeft - CheckWidth - BiasLeft + 1 + XBias;
   //ShowMessage(IntToStr(Tp1.Y) + ', ' + IntToStr(BiasTop) + ', ' + IntToStr(XBias));
@@ -480 +536 @@
     FHeaderHandle := ListView_GetHeader(FListView.Handle);
     for I := 0 to FListView.Columns.Count - 1 do begin
+      {$push}{$warn 5057 off}
       FillChar(Item, SizeOf(THDItem), 0);
+      {$pop}
       Item.Mask := HDI_FORMAT;
       Header_GetItem(FHeaderHandle, I, Item);

trunk/Packages/Common/UMemory.pas

@@ -24 +24 @@
     constructor Create;
     destructor Destroy; override;
+    procedure WriteMemory(Position: Integer; Memory: TMemory);
+    procedure ReadMemory(Position: Integer; Memory: TMemory);
     property Data: PByte read FData;
     property Size: Integer read FSize write SetSize;
@@ -108 +110 @@
 end;
 
+procedure TMemory.WriteMemory(Position: Integer; Memory: TMemory);
+begin
+  Move(Memory.FData, PByte(PByte(@FData) + Position)^, Memory.Size);
+end;
+
+procedure TMemory.ReadMemory(Position: Integer; Memory: TMemory);
+begin
+  Move(PByte(PByte(@FData) + Position)^, Memory.FData, Memory.Size);
+end;
+
 end.
 

trunk/Packages/Common/UPersistentForm.pas

@@ -8 +8 @@
 
 uses
-  Classes, SysUtils, Forms, URegistry, LCLIntf, Registry, Controls, ComCtrls;
+  Classes, SysUtils, Forms, URegistry, LCLIntf, Registry, Controls, ComCtrls,
+  ExtCtrls;
 
 type
@@ -56 +57 @@
   I: Integer;
   WinControl: TWinControl;
-  Count: Integer;
 begin
   if Control is TListView then begin
@@ -72 +72 @@
   end;
 
+  if (Control is TPanel) then begin
+    with Form, TRegistryEx.Create do
+    try
+      RootKey := RegistryContext.RootKey;
+      OpenKey(RegistryContext.Key + '\Forms\' + Form.Name + '\' + Control.Name, True);
+      if (TPanel(Control).Align = alRight) or (TPanel(Control).Align = alLeft) then begin
+        if ValueExists('Width') then
+          TPanel(Control).Width := ReadInteger('Width');
+      end;
+      if (TPanel(Control).Align = alTop) or (TPanel(Control).Align = alBottom) then begin
+        if ValueExists('Height') then
+          TPanel(Control).Height := ReadInteger('Height');
+      end;
+    finally
+      Free;
+    end;
+  end;
+
   if Control is TWinControl then begin
     WinControl := TWinControl(Control);
@@ -96 +114 @@
       for I := 0 to TListView(Control).Columns.Count - 1 do begin
         WriteInteger('ColWidth' + IntToStr(I), TListView(Control).Columns[I].Width);
+      end;
+    finally
+      Free;
+    end;
+  end;
+
+  if (Control is TPanel) then begin
+    with Form, TRegistryEx.Create do
+    try
+      RootKey := RegistryContext.RootKey;
+      OpenKey(RegistryContext.Key + '\Forms\' + Form.Name + '\' + Control.Name, True);
+      if (TPanel(Control).Align = alRight) or (TPanel(Control).Align = alLeft) then begin
+        WriteInteger('Width', TPanel(Control).Width);
+      end;
+      if (TPanel(Control).Align = alTop) or (TPanel(Control).Align = alBottom) then begin
+        WriteInteger('Height', TPanel(Control).Height);
       end;
     finally
@@ -217 +251 @@
 
 procedure TPersistentForm.Load(Form: TForm; DefaultMaximized: Boolean = False);
-var
-  LoadDefaults: Boolean;
 begin
   Self.Form := Form;
@@ -230 +262 @@
 
   if not EqualRect(FormNormalSize, FormRestoredSize) or
-    (LoadDefaults and DefaultMaximized) then begin
+    DefaultMaximized then begin
     // Restore to maximized state
     Form.WindowState := wsNormal;

trunk/Packages/Common/UPool.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, syncobjs, SpecializedList, UThreading;
+  Classes, SysUtils, syncobjs, fgl, UThreading;
 
 type
@@ -22 +22 @@
     function NewItemObject: TObject; virtual;
   public
-    Items: TListObject;
-    FreeItems: TListObject;
+    Items: TFPGObjectList<TObject>;
+    FreeItems: TFPGObjectList<TObject>;
     function Acquire: TObject; virtual;
     procedure Release(Item: TObject); virtual;
@@ -185 +185 @@
 begin
   inherited;
-  Items := TListObject.Create;
-  FreeItems := TListObject.Create;
-  FreeItems.OwnsObjects := False;
+  Items := TFPGObjectList<TObject>.Create;
+  FreeItems := TFPGObjectList<TObject>.Create;
+  FreeItems.FreeObjects := False;
   FReleaseEvent := TEvent.Create(nil, False, False, '');
 end;

trunk/Packages/Common/UPrefixMultiplier.pas

@@ -21 +21 @@
   { TPrefixMultiplier }
 
-  TPrefixMultiplier = class
+  TPrefixMultiplier = class(TComponent)
   private
-    function TruncateDigits(Value:Double;Digits:Integer=3):Double;
+    function TruncateDigits(Value: Double; Digits: Integer = 3): Double;
   public
     function Add(Value: Double; PrefixMultipliers: TPrefixMultiplierDef;
@@ -72 +72 @@
   );
 
+procedure Register;
+
+
 implementation
+
+procedure Register;
+begin
+  RegisterComponents('Common', [TPrefixMultiplier]);
+end;
 
 { TPrefixMultiplier }
@@ -92 +100 @@
 end;
 
-function TPrefixMultiplier.Add(Value:Double;PrefixMultipliers:TPrefixMultiplierDef
-  ;UnitText:string;Digits:Integer):string;
+function TPrefixMultiplier.Add(Value: Double; PrefixMultipliers: TPrefixMultiplierDef
+  ; UnitText:string; Digits: Integer): string;
 var
   I: Integer;

trunk/Packages/Common/URegistry.pas

@@ -29 +29 @@
     procedure SetCurrentContext(AValue: TRegistryContext);
   public
+    function ReadChar(const Name: string): Char;
+    procedure WriteChar(const Name: string; Value: Char);
     function ReadBoolWithDefault(const Name: string;
       DefaultValue: Boolean): Boolean;
     function ReadIntegerWithDefault(const Name: string; DefaultValue: Integer): Integer;
     function ReadStringWithDefault(const Name: string; DefaultValue: string): string;
+    function ReadCharWithDefault(const Name: string; DefaultValue: Char): Char;
     function ReadFloatWithDefault(const Name: string;
       DefaultValue: Double): Double;
@@ -89 +92 @@
 end;
 
+function TRegistryEx.ReadCharWithDefault(const Name: string; DefaultValue: Char
+  ): Char;
+begin
+  if ValueExists(Name) then Result := ReadChar(Name)
+    else begin
+      WriteChar(Name, DefaultValue);
+      Result := DefaultValue;
+    end;
+end;
+
 function TRegistryEx.ReadFloatWithDefault(const Name: string;
   DefaultValue: Double): Double;
@@ -137 +150 @@
 end;
 
+function TRegistryEx.ReadChar(const Name: string): Char;
+var
+  S: string;
+begin
+  S := ReadString(Name);
+  if Length(S) > 0 then Result := S[1]
+    else Result := #0;
+end;
+
+procedure TRegistryEx.WriteChar(const Name: string; Value: Char);
+begin
+  WriteString(Name, Value);
+end;
+
 function TRegistryEx.ReadBoolWithDefault(const Name: string;
   DefaultValue: Boolean): Boolean;

trunk/Packages/Common/UResetableThread.pas

@@ -156 +156 @@
   FThread.Name := 'ResetableThread';
   FThread.Parent := Self;
-  FThread.Resume;
+  FThread.Start;
 end;
 

trunk/Packages/Common/UScaleDPI.pas

@@ -215 +215 @@
   I: Integer;
 begin
+  ImgList.BeginUpdate;
   NewWidth := ScaleX(ImgList.Width, FromDPI.X);
   NewHeight := ScaleY(ImgList.Height, FromDPI.Y);
@@ -248 +249 @@
     Temp[i].Free;
   end;
+  ImgList.EndUpdate;
 end;
 
@@ -287 +289 @@
   //OldAutoSize: Boolean;
 begin
+  //if not (Control is TCustomPage) then
+  // Resize childs first
+  if Control is TWinControl then begin
+    WinControl := TWinControl(Control);
+    if WinControl.ControlCount > 0 then begin
+      for I := 0 to WinControl.ControlCount - 1 do begin
+        if WinControl.Controls[I] is TControl then begin
+          ScaleControl(WinControl.Controls[I], FromDPI);
+        end;
+      end;
+    end;
+  end;
+
   //if Control is TMemo then Exit;
   //if Control is TForm then
@@ -338 +353 @@
   end;
 
-  //if not (Control is TCustomPage) then
-  if Control is TWinControl then begin
-    WinControl := TWinControl(Control);
-    if WinControl.ControlCount > 0 then begin
-      for I := 0 to WinControl.ControlCount - 1 do begin
-        if WinControl.Controls[I] is TControl then begin
-          ScaleControl(WinControl.Controls[I], FromDPI);
-        end;
-      end;
-    end;
-  end;
   //if Control is TForm then
   //  Control.EnableAutoSizing;

trunk/Packages/Common/UTheme.pas

@@ -132 +132 @@
   I: Integer;
 begin
-  for I := 0 to Component.ComponentCount - 1 do
-    ApplyTheme(Component.Components[I]);
+  if Component is TWinControl then begin
+    for I := 0 to TWinControl(Component).ControlCount - 1 do
+      ApplyTheme(TWinControl(Component).Controls[I]);
+  end;
 
   if Component is TControl then begin
@@ -139 +141 @@
     if (Control is TEdit) or (Control is TSpinEdit) or (Control is TComboBox) and
     (Control is TMemo) or (Control is TListView) or (Control is TCustomDrawGrid) or
-    (Control is TCheckBox) then begin
+    (Control is TCheckBox) or (Control is TPageControl) or (Control is TRadioButton) then begin
       Control.Color := FTheme.ColorWindow;
       Control.Font.Color := FTheme.ColorWindowText;
@@ -150 +152 @@
       (Control as TCustomDrawGrid).Editor.Color := FTheme.ColorWindow;
       (Control as TCustomDrawGrid).Editor.Font.Color := FTheme.ColorWindowText;
+    end;
+
+    if Control is TPageControl then begin
+      for I := 0 to TPageControl(Component).PageCount - 1 do
+        ApplyTheme(TPageControl(Component).Pages[I]);
+    end;
+
+    if Control is TCoolBar then begin
+      (Control as TCoolBar).Themed := False;
     end;
   end;

trunk/Packages/Common/UThreading.pas

@@ -30 +30 @@
     Name: string;
     procedure Execute; virtual; abstract;
-    procedure Resume; virtual; abstract;
-    procedure Suspend; virtual; abstract;
     procedure Start; virtual; abstract;
     procedure Terminate; virtual; abstract;
@@ -81 +79 @@
     procedure Sleep(Delay: Integer); override;
     procedure Execute; override;
-    procedure Resume; override;
-    procedure Suspend; override;
     procedure Start; override;
     procedure Terminate; override;
@@ -134 +130 @@
     Thread.FreeOnTerminate := False;
     Thread.Method := Method;
-    Thread.Resume;
+    Thread.Start;
     while (Thread.State = ttsRunning) or (Thread.State = ttsReady) do begin
       if MainThreadID = ThreadID then Application.ProcessMessages;
@@ -155 +151 @@
     Thread.Method := Method;
     Thread.OnFinished := CallBack;
-    Thread.Resume;
+    Thread.Start;
     //if Thread.State = ttsExceptionOccured then
     //  raise Exception.Create(Thread.ExceptionMessage);
@@ -313 +309 @@
 procedure TListedThread.Execute;
 begin
-end;
-
-procedure TListedThread.Resume;
-begin
-  FThread.Resume;
-end;
-
-procedure TListedThread.Suspend;
-begin
-  FThread.Suspend;
 end;
 

trunk/Packages/Common/UURI.pas

@@ -89 +89 @@
 function LeftCutString(var Source: string; out Output: string; Delimiter: string; Allowed: string = ''): Boolean;
 var
-  I, J: Integer;
+  I: Integer;
   Matched: Boolean;
 begin
@@ -113 +113 @@
 function RightCutString(var Source: string; out Output: string; Delimiter: string; Allowed: string = ''): Boolean;
 var
-  I, J: Integer;
+  I: Integer;
   Matched: Boolean;
 begin
@@ -202 +202 @@
 
 procedure TURI.SetAsString(Value: string);
-var
-  HostAddr: string;
-  HostPort: string;
 begin
   LeftCutString(Value, Scheme, ':');

trunk/Packages/Common/UXMLUtils.pas

@@ -7 +7 @@
 uses
   {$IFDEF WINDOWS}Windows,{$ENDIF}
-  Classes, SysUtils, DateUtils, XMLRead, XMLWrite, DOM;
+  Classes, SysUtils, DateUtils, DOM, xmlread;
 
 function XMLTimeToDateTime(XMLDateTime: string): TDateTime;
-function DateTimeToXMLTime(Value: TDateTime; ApplyLocalBias: Boolean = True): WideString;
+function DateTimeToXMLTime(Value: TDateTime; ApplyLocalBias: Boolean = True): string;
 procedure WriteInteger(Node: TDOMNode; Name: string; Value: Integer);
 procedure WriteInt64(Node: TDOMNode; Name: string; Value: Int64);
@@ -21 +21 @@
 function ReadString(Node: TDOMNode; Name: string; DefaultValue: string): string;
 function ReadDateTime(Node: TDOMNode; Name: string; DefaultValue: TDateTime): TDateTime;
+procedure ReadXMLFileParser(out Doc: TXMLDocument; FileName: string);
 
 
 implementation
+
+procedure ReadXMLFileParser(out Doc: TXMLDocument; FileName: string);
+var
+  Parser: TDOMParser;
+  Src: TXMLInputSource;
+  InFile: TFileStream;
+begin
+  try
+    InFile := TFileStream.Create(FileName, fmOpenRead);
+    Src := TXMLInputSource.Create(InFile);
+    Parser := TDOMParser.Create;
+    Parser.Options.PreserveWhitespace := True;
+    Parser.Parse(Src, Doc);
+  finally
+    Src.Free;
+    Parser.Free;
+    InFile.Free;
+  end;
+end;
 
 function GetTimeZoneBias: Integer;
@@ -30 +50 @@
   TimeZoneInfo: TTimeZoneInformation;
 begin
+  {$push}{$warn 5057 off}
   case GetTimeZoneInformation(TimeZoneInfo) of
-  TIME_ZONE_ID_STANDARD: Result := TimeZoneInfo.Bias + TimeZoneInfo.StandardBias;
-  TIME_ZONE_ID_DAYLIGHT: Result := TimeZoneInfo.Bias + TimeZoneInfo.DaylightBias;
+    TIME_ZONE_ID_STANDARD: Result := TimeZoneInfo.Bias + TimeZoneInfo.StandardBias;
+    TIME_ZONE_ID_DAYLIGHT: Result := TimeZoneInfo.Bias + TimeZoneInfo.DaylightBias;
   else
     Result := 0;
   end;
+  {$pop}
 end;
 {$ELSE}
@@ -45 +67 @@
 function LeftCutString(var Source: string; out Output: string; Delimiter: string; Allowed: string = ''): Boolean;
 var
-  I, J: Integer;
+  I: Integer;
   Matched: Boolean;
 begin
@@ -99 +121 @@
       if Pos('Z', XMLDateTime) > 0 then
         LeftCutString(XMLDateTime, Part, 'Z');
-      SecondFraction := StrToFloat('0' + DecimalSeparator + Part);
+      SecondFraction := StrToFloat('0' + DefaultFormatSettings.DecimalSeparator + Part);
       Millisecond := Trunc(SecondFraction * 1000);
     end else begin
@@ -118 +140 @@
 end;
 
-function DateTimeToXMLTime(Value: TDateTime; ApplyLocalBias: Boolean = True): WideString;
+function DateTimeToXMLTime(Value: TDateTime; ApplyLocalBias: Boolean = True): string;
 const
   Neg: array[Boolean] of string =  ('+', '-');
@@ -139 +161 @@
   NewNode: TDOMNode;
 begin
-  NewNode := Node.OwnerDocument.CreateElement(Name);
-  NewNode.TextContent := IntToStr(Value);
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(Name));
+  NewNode.TextContent := DOMString(IntToStr(Value));
   Node.AppendChild(NewNode);
 end;
@@ -148 +170 @@
   NewNode: TDOMNode;
 begin
-  NewNode := Node.OwnerDocument.CreateElement(Name);
-  NewNode.TextContent := IntToStr(Value);
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(Name));
+  NewNode.TextContent := DOMString(IntToStr(Value));
   Node.AppendChild(NewNode);
 end;
@@ -157 +179 @@
   NewNode: TDOMNode;
 begin
-  NewNode := Node.OwnerDocument.CreateElement(Name);
-  NewNode.TextContent := BoolToStr(Value);
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(Name));
+  NewNode.TextContent := DOMString(BoolToStr(Value));
   Node.AppendChild(NewNode);
 end;
@@ -166 +188 @@
   NewNode: TDOMNode;
 begin
-  NewNode := Node.OwnerDocument.CreateElement(Name);
-  NewNode.TextContent := Value;
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(Name));
+  NewNode.TextContent := DOMString(Value);
   Node.AppendChild(NewNode);
 end;
@@ -175 +197 @@
   NewNode: TDOMNode;
 begin
-  NewNode := Node.OwnerDocument.CreateElement(Name);
-  NewNode.TextContent := DateTimeToXMLTime(Value);
+  NewNode := Node.OwnerDocument.CreateElement(DOMString(Name));
+  NewNode.TextContent := DOMString(DateTimeToXMLTime(Value));
   Node.AppendChild(NewNode);
 end;
@@ -185 +207 @@
 begin
   Result := DefaultValue;
-  NewNode := Node.FindNode(Name);
-  if Assigned(NewNode) then
-    Result := StrToInt(NewNode.TextContent);
+  NewNode := Node.FindNode(DOMString(Name));
+  if Assigned(NewNode) then
+    Result := StrToInt(string(NewNode.TextContent));
 end;
 
@@ -195 +217 @@
 begin
   Result := DefaultValue;
-  NewNode := Node.FindNode(Name);
-  if Assigned(NewNode) then
-    Result := StrToInt64(NewNode.TextContent);
+  NewNode := Node.FindNode(DOMString(Name));
+  if Assigned(NewNode) then
+    Result := StrToInt64(string(NewNode.TextContent));
 end;
 
@@ -205 +227 @@
 begin
   Result := DefaultValue;
-  NewNode := Node.FindNode(Name);
-  if Assigned(NewNode) then
-    Result := StrToBool(NewNode.TextContent);
+  NewNode := Node.FindNode(DOMString(Name));
+  if Assigned(NewNode) then
+    Result := StrToBool(string(NewNode.TextContent));
 end;
 
@@ -215 +237 @@
 begin
   Result := DefaultValue;
-  NewNode := Node.FindNode(Name);
-  if Assigned(NewNode) then
-    Result := NewNode.TextContent;
+  NewNode := Node.FindNode(DOMString(Name));
+  if Assigned(NewNode) then
+    Result := string(NewNode.TextContent);
 end;
 
@@ -226 +248 @@
 begin
   Result := DefaultValue;
-  NewNode := Node.FindNode(Name);
-  if Assigned(NewNode) then
-    Result := XMLTimeToDateTime(NewNode.TextContent);
+  NewNode := Node.FindNode(DOMString(Name));
+  if Assigned(NewNode) then
+    Result := XMLTimeToDateTime(string(NewNode.TextContent));
 end;
 

trunk/Packages/CoolTranslator/UCoolTranslator.pas

@@ -127 +127 @@
   I, J: Integer;
   Po: TPoFile;
+  Item: TPOFileItem;
 begin
   TranslateComponentRecursive(Application);
@@ -136 +137 @@
     with TPoFile(FPoFiles[I]) do
       for J := 0 to Items.Count - 1 do
-      with TPoFileItem(Items[J]) do
-        Po.Add(IdentifierLow, Original, Translation, Comments, Context,
+      with TPoFileItem(Items[J]) do begin
+        Item := nil;
+        Po.FillItem(Item, IdentifierLow, Original, Translation, Comments, Context,
           Flags, PreviousID);
+      end;
     Translations.TranslateResourceStrings(Po);
   finally
@@ -249 +252 @@
           if (UpperCase(PropType.Name) = 'TTRANSLATESTRING') then
           //if not IsExcluded(Component, PropInfo^.Name) then
-              SetStrProp(Component, PropInfo, TranslateText(PropInfo^.Name, GetWideStrProp(Component, PropInfo)));
+              SetStrProp(Component, PropInfo, TranslateText(PropInfo^.Name, string(GetWideStrProp(Component, PropInfo))));
         end;
         tkClass: begin
@@ -294 +297 @@
   Result := FPOFilesFolder;
   if Copy(Result, 1, 1) <> DirectorySeparator then
-    Result := ExtractFileDir(UTF8Encode(Application.ExeName)) +
+    Result := ExtractFileDir(Application.ExeName) +
       DirectorySeparator + Result;
 end;
@@ -411 +414 @@
         Lang := ParamStr(i + 1);
   end;
-  if Lang = '' then
+  if Lang = '' then begin
+    T := '';
     LazGetLanguageIDs(Lang, T);
+  end;
 
   if Assigned(Language) and (Language.Code = '') and Assigned(FOnAutomaticLanguage) then begin

trunk/UContact.pas

@@ -118 +118 @@
 resourcestring
   SVCardFile = 'vCard file';
-  SUnknownCommand = 'Unknown command: %s';
   SUnsupportedContactFieldsIndex = 'Unsupported contact field index';
 

trunk/UCore.lfm

@@ -3 +3 @@
   OnDestroy = DataModuleDestroy
   OldCreateOrder = False
-  Height = 441
-  HorizontalOffset = 384
-  VerticalOffset = 299
-  Width = 605
-  PPI = 120
+  Height = 529
+  HorizontalOffset = 461
+  VerticalOffset = 359
+  Width = 726
+  PPI = 144
   object ImageList1: TImageList
-    left = 96
-    top = 168
+    left = 115
+    top = 202
     Bitmap = {
       4C690C0000001000000010000000000000000000000000000000000000000000
@@ -401 +401 @@
   object ActionList1: TActionList
     Images = ImageList1
-    left = 320
-    top = 168
+    left = 384
+    top = 202
     object AExit: TAction
       Caption = 'Exit'
@@ -479 +479 @@
     MaxCount = 10
     OnChange = LastOpenedList1Change
-    left = 320
-    top = 240
+    left = 384
+    top = 288
   end
   object OpenDialog1: TOpenDialog
-    left = 320
-    top = 304
+    left = 384
+    top = 365
   end
   object SaveDialog1: TSaveDialog
-    left = 96
-    top = 304
+    left = 115
+    top = 365
   end
   object ApplicationInfo1: TApplicationInfo
@@ -501 +501 @@
     AppName = 'vCard Studio'
     Description = 'vCard files management tool'
-    ReleaseDate = 43158
+    ReleaseDate = 43593
     RegistryKey = '\Software\Chronosoft\vCard Studio'
     RegistryRoot = rrKeyCurrentUser
     License = 'CC0'
-    left = 96
-    top = 240
+    left = 115
+    top = 288
   end
   object PersistentForm1: TPersistentForm
     MinVisiblePart = 50
     EntireVisible = False
-    left = 320
-    top = 104
+    left = 384
+    top = 125
   end
   object CoolTranslator1: TCoolTranslator
     POFilesFolder = 'Languages'
-    left = 96
-    top = 40
+    left = 115
+    top = 48
   end
   object ScaleDPI1: TScaleDPI
     AutoDetect = False
-    left = 320
-    top = 40
+    left = 384
+    top = 48
   end
   object ThemeManager1: TThemeManager
-    left = 96
-    top = 104
+    left = 115
+    top = 125
   end
 end

trunk/UCore.pas

@@ -460 +460 @@
       AFileNew.Execute;
       DataFile.LoadFromFile(LastOpenedList1.Items[0])
-    end;
+    end else AFileNew.Execute;
 
     UpdateFile;

trunk/vCardStudio.lpi

@@ -2 +2 @@
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
@@ -8 +8 @@
       <MainUnit Value="0"/>
       <Title Value="vCard Studio"/>
+      <Scaled Value="True"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
@@ -71 +72 @@
       </Item2>
       <SharedMatrixOptions Count="2">
-        <Item1 ID="186308868222" Targets="Common,CoolTranslator,TemplateGenerics" Modes="Debug" Value="-g -gl -gh -CirotR -O1"/>
-        <Item2 ID="035947176865" Targets="Common,CoolTranslator,TemplateGenerics" Modes="Release" Value="-CX -XX -O3"/>
+        <Item1 ID="186308868222" Targets="Common,CoolTranslator" Modes="Debug" Value="-g -gl -gh -CirotR -O1"/>
+        <Item2 ID="035947176865" Targets="Common,CoolTranslator" Modes="Release" Value="-CX -XX -O3"/>
       </SharedMatrixOptions>
     </BuildModes>
@@ -80 +81 @@
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <CommandLineParams Value="--data-dir=..\.."/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <CommandLineParams Value="--data-dir=..\.."/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="4">
+    <RequiredPackages Count="3">
       <Item1>
-        <PackageName Value="TemplateGenerics"/>
-        <DefaultFilename Value="Packages\TemplateGenerics\TemplateGenerics.lpk" Prefer="True"/>
+        <PackageName Value="CoolTranslator"/>
+        <DefaultFilename Value="Packages\CoolTranslator\CoolTranslator.lpk" Prefer="True"/>
       </Item1>
       <Item2>
-        <PackageName Value="CoolTranslator"/>
-        <DefaultFilename Value="Packages\CoolTranslator\CoolTranslator.lpk" Prefer="True"/>
+        <PackageName Value="Common"/>
+        <DefaultFilename Value="Packages\Common\Common.lpk" Prefer="True"/>
       </Item2>
       <Item3>
-        <PackageName Value="Common"/>
-        <DefaultFilename Value="Packages\Common\Common.lpk" Prefer="True"/>
+        <PackageName Value="LCL"/>
       </Item3>
-      <Item4>
-        <PackageName Value="LCL"/>
-      </Item4>
     </RequiredPackages>
     <Units Count="11">
@@ -167 +171 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormGenerate"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit10>
@@ -214 +219 @@
         <IgnoredMessages idx5024="True"/>
       </CompilerMessages>
-      <CustomOptions Value="-dDEBUG"/>
     </Other>
   </CompilerOptions>

trunk/vCardStudio.lpr

@@ -8 +8 @@
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, UFormMain, UCore, Common, CoolTranslator, UDataFile, TemplateGenerics,
+  Forms, UFormMain, UCore, Common, CoolTranslator, UDataFile,
   SysUtils, UFormContacts, UFormContact, UFormFindDuplicity, UFormGenerate
   { you can add units after this };
@@ -14 +14 @@
 {$R *.res}
 
-{$IFDEF DEBUG}
+{$if declared(UseHeapTrace)}
 const
   HeapTraceLog = 'heaptrclog.trc';
@@ -20 +20 @@
 
 begin
-  Application.Title := 'vCard Studio';
-  {$IFDEF DEBUG}
-  // Heap trace
+  Application.Scaled:=True;
+  Application.Title:='vCard Studio';
+  {$if declared(UseHeapTrace)}
   DeleteFile(ExtractFilePath(ParamStr(0)) + HeapTraceLog);
   SetHeapTraceOutput(ExtractFilePath(ParamStr(0)) + HeapTraceLog);

@@ -1 @@
-*.lrj
+