Changeset 93 for trunk/Packages

Timestamp:

Jul 20, 2018, 10:25:06 AM (6 years ago)

Author:

chronos

Message:

• Modified: Updated Common, CoolTranslator and TemplateGenerics packages.
• Fixed: FormMain initialization was not completed if last opened file was not found.

Location:

trunk

Files:

• . (modified) (1 prop)
• Packages/Common/Common.lpk (modified) (2 diffs)
• Packages/Common/Common.pas (modified) (3 diffs)
• Packages/Common/Languages (modified) (1 prop)
• Packages/Common/Languages/UDebugLog.cs.mo (deleted)
• Packages/Common/Languages/UFindFile.cs.po (added)
• Packages/Common/Languages/UJobProgressView.cs.po (added)
• Packages/Common/Languages/UJobProgressView.po (modified) (1 diff)
• Packages/Common/Languages/UPool.cs.mo (deleted)
• Packages/Common/Languages/UResetableThread.cs.mo (deleted)
• Packages/Common/Languages/UScaleDPI.cs.po (added)
• Packages/Common/UApplicationInfo.pas (modified) (6 diffs)
• Packages/Common/UCommon.pas (modified) (7 diffs)
• Packages/Common/UDebugLog.pas (modified) (1 diff)
• Packages/Common/UFindFile.pas (modified) (3 diffs)
• Packages/Common/UJobProgressView.lfm (modified) (8 diffs)
• Packages/Common/UJobProgressView.pas (modified) (24 diffs)
• Packages/Common/ULastOpenedList.pas (modified) (4 diffs)
• Packages/Common/UListViewSort.pas (modified) (11 diffs)
• Packages/Common/UMemory.pas (modified) (2 diffs)
• Packages/Common/UPersistentForm.pas (modified) (7 diffs)
• Packages/Common/URegistry.pas (modified) (4 diffs)
• Packages/Common/UResetableThread.pas (modified) (1 diff)
• Packages/Common/UScaleDPI.pas (modified) (5 diffs)
• Packages/Common/UStringTable.pas (added)
• Packages/Common/UTheme.pas (added)
• Packages/Common/UThreading.pas (modified) (5 diffs)
• Packages/Common/UURI.pas (modified) (3 diffs)
• Packages/Common/UXMLUtils.pas (modified) (15 diffs)
• Packages/CoolTranslator/CoolTranslator.pas (modified) (2 diffs)
• Packages/CoolTranslator/Demo/Languages/TranslatorDemo.cs.po (modified) (1 diff)
• Packages/CoolTranslator/Demo/Languages/TranslatorDemo.de.po (modified) (1 diff)
• Packages/CoolTranslator/Demo/Languages/TranslatorDemo.po (modified) (1 diff)
• Packages/CoolTranslator/Demo/TranslatorDemo.lpi (modified) (5 diffs)
• Packages/CoolTranslator/Demo/UMainForm.lfm (modified) (6 diffs)
• Packages/CoolTranslator/Languages/ULanguages.cs.mo (deleted)
• Packages/TemplateGenerics/Additional/UBinarySerializer.pas (modified) (22 diffs)
• Packages/TemplateGenerics/Demo/heaptrclog.trc (deleted)
• Packages/TemplateGenerics/Generic/GenericBitmap.inc (modified) (2 diffs)
• Packages/TemplateGenerics/Generic/GenericDictionary.inc (modified) (2 diffs)
• Packages/TemplateGenerics/Generic/GenericFileList.inc (added)
• Packages/TemplateGenerics/Generic/GenericList.inc (modified) (12 diffs)
• Packages/TemplateGenerics/Generic/GenericListAbstract.inc (added)
• Packages/TemplateGenerics/Generic/GenericListObject.inc (modified) (4 diffs)
• Packages/TemplateGenerics/Generic/GenericListString.inc (modified) (2 diffs)
• Packages/TemplateGenerics/Generic/GenericMatrix.inc (modified) (33 diffs)
• Packages/TemplateGenerics/Generic/GenericQueue.inc (modified) (2 diffs)
• Packages/TemplateGenerics/Generic/GenericSet.inc (modified) (2 diffs)
• Packages/TemplateGenerics/Generic/GenericStack.inc (modified) (2 diffs)
• Packages/TemplateGenerics/Generic/GenericStream.inc (modified) (2 diffs)
• Packages/TemplateGenerics/Generic/GenericTree.inc (modified) (2 diffs)
• Packages/TemplateGenerics/Specialized/SpecializedDictionary.pas (modified) (4 diffs)
• Packages/TemplateGenerics/Specialized/SpecializedList.pas (modified) (27 diffs)
• Packages/TemplateGenerics/Specialized/SpecializedMatrix.pas (modified) (6 diffs)
• Packages/TemplateGenerics/Specialized/SpecializedPoint.pas (modified) (1 diff)
• Packages/TemplateGenerics/Specialized/SpecializedQueue.pas (modified) (6 diffs)
• Packages/TemplateGenerics/Specialized/SpecializedSet.pas (modified) (4 diffs)
• Packages/TemplateGenerics/Specialized/SpecializedStack.pas (modified) (4 diffs)
• Packages/TemplateGenerics/Specialized/SpecializedStream.pas (modified) (8 diffs)
• Packages/TemplateGenerics/Specialized/SpecializedTree.pas (modified) (6 diffs)
• Packages/TemplateGenerics/TemplateGenerics.lpk (modified) (3 diffs)

trunk

@@ -6 +6 @@
 compiled
 heaptrclog.trc
+LazFuck.dbg

@@ -6 +6 @@
 compiled
 heaptrclog.trc
+LazFuck.dbg

trunk/Packages/Common/Common.lpk

@@ -11 +11 @@
       <PathDelim Value="\"/>
       <SearchPaths>
-        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+        <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
       </SearchPaths>
+      <Parsing>
+        <SyntaxOptions>
+          <SyntaxMode Value="Delphi"/>
+          <CStyleOperator Value="False"/>
+          <AllowLabel Value="False"/>
+          <CPPInline Value="False"/>
+        </SyntaxOptions>
+      </Parsing>
+      <CodeGeneration>
+        <Optimizations>
+          <OptimizationLevel Value="0"/>
+        </Optimizations>
+      </CodeGeneration>
+      <Linking>
+        <Debugging>
+          <GenerateDebugInfo Value="False"/>
+        </Debugging>
+      </Linking>
+      <Other>
+        <CompilerMessages>
+          <IgnoredMessages idx5024="True"/>
+        </CompilerMessages>
+      </Other>
     </CompilerOptions>
     <Description Value="Various libraries"/>
     <License Value="GNU/GPL"/>
     <Version Minor="7"/>
-    <Files Count="20">
+    <Files Count="22">
       <Item1>
         <Filename Value="StopWatch.pas"/>
@@ -106 +129 @@
         <UnitName Value="UScaleDPI"/>
       </Item20>
+      <Item21>
+        <Filename Value="UTheme.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="UTheme"/>
+      </Item21>
+      <Item22>
+        <Filename Value="UStringTable.pas"/>
+        <UnitName Value="UStringTable"/>
+      </Item22>
     </Files>
     <i18n>

trunk/Packages/Common/Common.pas

@@ -5 +5 @@
 unit Common;
 
+{$warn 5023 off : no warning about unused units}
 interface
 
@@ -11 +12 @@
   UMemory, UResetableThread, UPool, ULastOpenedList, URegistry, 
   UJobProgressView, UXMLUtils, UApplicationInfo, USyncCounter, UListViewSort, 
-  UPersistentForm, UFindFile, UScaleDPI, LazarusPackageIntf;
+  UPersistentForm, UFindFile, UScaleDPI, UTheme, UStringTable, 
+  LazarusPackageIntf;
 
 implementation
@@ -25 +27 @@
   RegisterUnit('UFindFile', @UFindFile.Register);
   RegisterUnit('UScaleDPI', @UScaleDPI.Register);
+  RegisterUnit('UTheme', @UTheme.Register);
 end;
 

trunk/Packages/Common/Languages/UJobProgressView.po

@@ -15 +15 @@
 
 #: ujobprogressview.soperations
-msgid "Operations"
+msgid "Operations:"
 msgstr ""
 

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: TCaption;
     FIdentification: Byte;
     FLicense: string;
@@ -33 +34 @@
     constructor Create(AOwner: TComponent); override;
     property Version: string read GetVersion;
+    function GetRegistryContext: TRegistryContext;
   published
     property Identification: Byte read FIdentification write FIdentification;
@@ -45 +47 @@
     property EmailContact: string read FEmailContact write FEmailContact;
     property AppName: string read FAppName write FAppName;
+    property Description: string read FDescription write FDescription;
     property ReleaseDate: TDateTime read FReleaseDate write FReleaseDate;
     property RegistryKey: string read FRegistryKey write FRegistryKey;
@@ -54 +57 @@
 
 implementation
-                        
+
 procedure Register;
 begin
@@ -79 +82 @@
 end;
 
+function TApplicationInfo.GetRegistryContext: TRegistryContext;
+begin
+  Result := TRegistryContext.Create(RegistryRoot, RegistryKey);
+end;
+
 end.

trunk/Packages/Common/UCommon.pas

@@ -28 +28 @@
     unfDNSDomainName = 11);
 
+  TFilterMethodMethod = function (FileName: string): Boolean of object;
 var
   ExceptionHandler: TExceptionEvent;
@@ -63 +64 @@
 procedure OpenWebPage(URL: string);
 procedure OpenFileInShell(FileName: string);
-procedure ExecuteProgram(CommandLine: string);
+procedure ExecuteProgram(Executable: string; Parameters: array of string);
 procedure FreeThenNil(var Obj);
 function RemoveQuotes(Text: string): string;
@@ -71 +72 @@
 function MergeArray(A, B: array of string): TArrayOfString;
 function LoadFileToStr(const FileName: TFileName): AnsiString;
+procedure SearchFiles(AList: TStrings; Dir: string;
+  FilterMethod: TFilterMethodMethod = nil);
+function GetStringPart(var Text: string; Separator: string): string;
+function PosFromIndex(SubStr: string; Text: string;
+  StartIndex: Integer): Integer;
+function PosFromIndexReverse(SubStr: string; Text: string;
+  StartIndex: Integer): Integer;
 
 
@@ -112 +120 @@
   Path := IncludeTrailingPathDelimiter(APath);
 
-  Find := FindFirst(UTF8Decode(Path + AFileSpec), faAnyFile xor faDirectory, SearchRec);
+  Find := FindFirst(Path + AFileSpec, faAnyFile xor faDirectory, SearchRec);
   while Find = 0 do begin
-    DeleteFile(Path + UTF8Encode(SearchRec.Name));
+    DeleteFile(Path + SearchRec.Name);
 
     Find := SysUtils.FindNext(SearchRec);
@@ -429 +437 @@
 end;
 
-procedure ExecuteProgram(CommandLine: string);
+procedure ExecuteProgram(Executable: string; Parameters: array of string);
 var
   Process: TProcess;
+  I: Integer;
 begin
   try
     Process := TProcess.Create(nil);
-    Process.CommandLine := CommandLine;
+    Process.Executable := Executable;
+    for I := 0 to Length(Parameters) - 1 do
+      Process.Parameters.Add(Parameters[I]);
     Process.Options := [poNoConsole];
     Process.Execute;
@@ -456 +467 @@
 procedure OpenFileInShell(FileName: string);
 begin
-  ExecuteProgram('cmd.exe /c start "' + FileName + '"');
+  ExecuteProgram('cmd.exe', ['/c', 'start', FileName]);
 end;
 
@@ -511 +522 @@
 end;
 
-
+function DefaultSearchFilter(const FileName: string): Boolean;
+begin
+  Result := True;
+end;
+
+procedure SearchFiles(AList: TStrings; Dir: string;
+  FilterMethod: TFilterMethodMethod = nil);
+var
+  SR: TSearchRec;
+begin
+  Dir := IncludeTrailingPathDelimiter(Dir);
+  if FindFirst(Dir + '*', faAnyFile, SR) = 0 then
+    try
+      repeat
+        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;
+        AList.Add(Dir + SR.Name);
+        if (SR.Attr and faDirectory) <> 0 then
+          SearchFiles(AList, Dir + SR.Name, FilterMethod);
+      until FindNext(SR) <> 0;
+    finally
+      FindClose(SR);
+    end;
+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 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;
 
 initialization

trunk/Packages/Common/UDebugLog.pas

@@ -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;

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 = 467
-  Height = 246
+  Height = 345
   Top = 252
-  Width = 328
+  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 = '1.8.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

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';
+  SOperations = 'Operations:';
 
 procedure Register;
@@ -172 +181 @@
   RegisterComponents('Common', [TJobProgressView]);
 end;
+
+{ TJobThread }
 
 procedure TJobThread.Execute;
@@ -190 +201 @@
 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 +385 @@
     Form.MemoLog.Clear;
 
+    Form.PanelText.Visible := False;
     Form.LabelEstimatedTimePart.Visible := False;
     Form.LabelEstimatedTimeTotal.Visible := False;
@@ -258 +415 @@
       Form.ProgressBarPart.Visible := False;
       //Show;
-      ReloadJobList;
+      Form.ReloadJobList;
       Application.ProcessMessages;
       if NoThreaded then begin
@@ -296 +453 @@
     //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 +469 @@
   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 +487 @@
     Sleep(Quantum);
   end;
-end;
-
-procedure TFormJobProgressView.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
-begin
-  CanClose := JobProgressView.Finished;
-  JobProgressView.Terminate := True;
-  Caption := SPleaseWait + STerminate;
 end;
 
@@ -490 +544 @@
 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 +561 @@
 begin
   Jobs.Clear;
+  Log.Clear;
   //ReloadJobList;
 end;
@@ -528 +571 @@
   inherited;
 end;
+
+{ TProgress }
 
 procedure TProgress.SetMax(const AValue: Integer);
@@ -536 +581 @@
     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 +619 @@
 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
@@ -139 +139 @@
     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 +153 @@
 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 +170 @@
 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;

trunk/Packages/Common/UListViewSort.pas

@@ -81 +81 @@
     FOnChange: TNotifyEvent;
     FStringGrid1: TStringGrid;
-    procedure DoOnKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
-    procedure DoOnResize(Sender: TObject);
+    procedure GridDoOnKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure GridDoOnResize(Sender: TObject);
   public
     constructor Create(AOwner: TComponent); override;
@@ -110 +110 @@
 { TListViewFilter }
 
-procedure TListViewFilter.DoOnKeyUp(Sender: TObject; var Key: Word;
+procedure TListViewFilter.GridDoOnKeyUp(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
@@ -117 +117 @@
 end;
 
-procedure TListViewFilter.DoOnResize(Sender: TObject);
+procedure TListViewFilter.GridDoOnResize(Sender: TObject);
 begin
   FStringGrid1.DefaultRowHeight := FStringGrid1.Height;
@@ -135 +135 @@
   FStringGrid1.Options := [goFixedHorzLine, goFixedVertLine, goVertLine,
     goHorzLine, goRangeSelect, goEditing, goAlwaysShowEditor, goSmoothScroll];
-  FStringGrid1.OnKeyUp := DoOnKeyUp;
-  FStringGrid1.OnResize := DoOnResize;
+  FStringGrid1.OnKeyUp := GridDoOnKeyUp;
+  FStringGrid1.OnResize := GridDoOnResize;
 end;
 
@@ -142 +142 @@
 var
   I: Integer;
+  R: TRect;
 begin
   with FStringGrid1 do begin
-    //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;
   end;
@@ -197 +202 @@
   if AMsg.Msg = WM_NOTIFY then
   begin
-    Code := PHDNotify(vMsgNotify.NMHdr)^.Hdr.Code;
+    Code := NMHDR(PHDNotify(vMsgNotify.NMHdr)^.Hdr).Code;
     case Code of
       HDN_ENDTRACKA, HDN_ENDTRACKW:
@@ -353 +358 @@
   TP1: TPoint;
   XBias, YBias: Integer;
-  OldColor: TColor;
+  PenColor: TColor;
+  BrushColor: TColor;
   BiasTop, BiasLeft: Integer;
   Rect1: TRect;
@@ -365 +371 @@
   Item.Left := 0;
   GetCheckBias(XBias, YBias, BiasTop, BiasLeft, ListView);
-  OldColor := ListView.Canvas.Pen.Color;
+  PenColor := ListView.Canvas.Pen.Color;
+  BrushColor := ListView.Canvas.Brush.Color;
   //TP1 := Item.GetPosition;
   lRect := Item.DisplayRect(drBounds); // Windows 7 workaround
@@ -377 +384 @@
   ItemLeft := Item.Left;
   ItemLeft := 23; // Windows 7 workaround
-  
+
   Rect1.Left := ItemLeft - CheckWidth - BiasLeft + 1 + XBias;
   //ShowMessage(IntToStr(Tp1.Y) + ', ' + IntToStr(BiasTop) + ', ' + IntToStr(XBias));
@@ -408 +415 @@
   end;
   //ListView.Canvas.Brush.Color := ListView.Color;
-  ListView.Canvas.Brush.Color := clWindow;
-  ListView.Canvas.Pen.Color := OldColor;
+  ListView.Canvas.Brush.Color := BrushColor;
+  ListView.Canvas.Pen.Color := PenColor;
 end;
 
@@ -476 +483 @@
     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(@FData + Position)^, Memory.Size);
+end;
+
+procedure TMemory.ReadMemory(Position: Integer; Memory: TMemory);
+begin
+  Move(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
@@ -26 +27 @@
     FormWindowState: TWindowState;
     Form: TForm;
-    DefaultFormWindowState: TWindowState;
     procedure LoadFromRegistry(RegistryContext: TRegistryContext);
     procedure SaveToRegistry(RegistryContext: TRegistryContext);
     function CheckEntireVisible(Rect: TRect): TRect;
     function CheckPartVisible(Rect: TRect; Part: Integer): TRect;
-    procedure Load(Form: TForm; DefaultFormWindowState: TWindowState = wsNormal);
+    procedure Load(Form: TForm; DefaultMaximized: Boolean = False);
     procedure Save(Form: TForm);
     constructor Create(AOwner: TComponent); override;
@@ -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
@@ -135 +169 @@
       + FormRestoredSize.Top;
     // Other state
-    FormWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(DefaultFormWindowState)));
+    FormWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(wsNormal)));
   finally
     Free;
@@ -216 +250 @@
 end;
 
-procedure TPersistentForm.Load(Form: TForm; DefaultFormWindowState: TWindowState = wsNormal);
+procedure TPersistentForm.Load(Form: TForm; DefaultMaximized: Boolean = False);
 begin
   Self.Form := Form;
-  Self.DefaultFormWindowState := DefaultFormWindowState;
-
   // Set default
   FormNormalSize := Bounds((Screen.Width - Form.Width) div 2,
@@ -230 +262 @@
 
   if not EqualRect(FormNormalSize, FormRestoredSize) or
-    (FormWindowState = wsMaximized) then begin
+    DefaultMaximized then begin
     // Restore to maximized state
     Form.WindowState := wsNormal;

trunk/Packages/Common/URegistry.pas

@@ -9 +9 @@
 
 type
-  TRegistryRoot = (rrKeyClassesRoot = HKEY($80000000),
-    rrKeyCurrentUser = HKEY($80000001),
-    rrKeyLocalMachine = HKEY($80000002),
-    rrKeyUsers = HKEY($80000003),
-    rrKeyPerformanceData = HKEY($80000004),
-    rrKeyCurrentConfig = HKEY($80000005),
-    rrKeyDynData = HKEY($80000006));
+  TRegistryRoot = (rrKeyClassesRoot, rrKeyCurrentUser, rrKeyLocalMachine,
+    rrKeyUsers, rrKeyPerformanceData, rrKeyCurrentConfig, rrKeyDynData);
 
   { TRegistryContext }
@@ -23 +18 @@
     Key: string;
     class operator Equal(A, B: TRegistryContext): Boolean;
+    function Create(RootKey: TRegistryRoot; Key: string): TRegistryContext; overload;
+    function Create(RootKey: HKEY; Key: string): TRegistryContext; overload;
   end;
 
@@ -43 +40 @@
   end;
 
-function RegContext(RootKey: HKEY; Key: string): TRegistryContext;
-
+const
+  RegistryRootHKEY: array[TRegistryRoot] of HKEY = (HKEY_CLASSES_ROOT,
+    HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_PERFORMANCE_DATA,
+    HKEY_CURRENT_CONFIG, HKEY_DYN_DATA);
 
 implementation
 
-function RegContext(RootKey: HKEY; Key: string): TRegistryContext;
-begin
-  Result.RootKey := RootKey;
-  Result.Key := Key;
-end;
 
 { TRegistryContext }
@@ -59 +53 @@
 begin
   Result := (A.Key = B.Key) and (A.RootKey = B.RootKey);
+end;
+
+function TRegistryContext.Create(RootKey: TRegistryRoot; Key: string): TRegistryContext;
+begin
+  Result.RootKey := RegistryRootHKEY[RootKey];
+  Result.Key := Key;
+end;
+
+function TRegistryContext.Create(RootKey: HKEY; Key: string): TRegistryContext;
+begin
+  Result.RootKey := RootKey;
+  Result.Key := Key;
 end;
 

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);
@@ -226 +227 @@
     Temp[I] := TBitmap.Create;
     Temp[I].SetSize(NewWidth, NewHeight);
-    {$ifdef linux}
-    Temp[I].PixelFormat := pf24bit;
-    {$else}
     Temp[I].PixelFormat := pf32bit;
-    {$endif}
     Temp[I].TransparentColor := TempBmp.TransparentColor;
     //Temp[I].TransparentMode := TempBmp.TransparentMode;
@@ -252 +249 @@
     Temp[i].Free;
   end;
+  ImgList.EndUpdate;
 end;
 
@@ -288 +286 @@
   WinControl: TWinControl;
   ToolBarControl: TToolBar;
-  OldAnchors: TAnchors;
-  OldAutoSize: Boolean;
+  //OldAnchors: TAnchors;
+  //OldAutoSize: Boolean;
 begin
   //if Control is TMemo then Exit;
@@ -320 +318 @@
         MinWidth := ScaleX(MinWidth, FromDPI.X);
         MinHeight := ScaleY(MinHeight, FromDPI.Y);
-        Width := ScaleX(Width, FromDPI.X);
+        // Workaround to bad band width auto sizing
+        //Width := ScaleX(Width, FromDPI.X);
+        Width := ScaleX(Control.Width + 28, FromDPI.X);
         //Control.Invalidate;
       end;
+    // Workaround for bad autosizing of coolbar
+    if AutoSize then begin
+      AutoSize := False;
+      Height := ScaleY(Height, FromDPI.Y);
+      AutoSize := True;
+    end;
     EndUpdate;
   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;
 
 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);
@@ -30 +30 @@
   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 +47 @@
 function LeftCutString(var Source: string; out Output: string; Delimiter: string; Allowed: string = ''): Boolean;
 var
-  I, J: Integer;
+  I: Integer;
   Matched: Boolean;
 begin
@@ -99 +101 @@
       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 +120 @@
 end;
 
-function DateTimeToXMLTime(Value: TDateTime; ApplyLocalBias: Boolean = True): WideString;
+function DateTimeToXMLTime(Value: TDateTime; ApplyLocalBias: Boolean = True): string;
 const
   Neg: array[Boolean] of string =  ('+', '-');
@@ -139 +141 @@
   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 +150 @@
   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 +159 @@
   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 +168 @@
   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 +177 @@
   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 +187 @@
 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 +197 @@
 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 +207 @@
 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 +217 @@
 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 +228 @@
 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/CoolTranslator.pas

@@ -3 +3 @@
  }
 
-unit CoolTranslator;
+unit CoolTranslator; 
 
 interface
@@ -12 +12 @@
 implementation
 
-procedure Register;
+procedure Register; 
 begin
-  RegisterUnit('UCoolTranslator', @UCoolTranslator.Register);
-end;
+  RegisterUnit('UCoolTranslator', @UCoolTranslator.Register); 
+end; 
 
 initialization
-  RegisterPackage('CoolTranslator', @Register);
+  RegisterPackage('CoolTranslator', @Register); 
 end.

trunk/Packages/CoolTranslator/Demo/Languages/TranslatorDemo.cs.po

@@ -10 +10 @@
 "Content-Transfer-Encoding: 8bit\n"
 
-#: TFORM1.FORM1.CAPTION
+#: tform1.form1.caption
 msgctxt "TFORM1.FORM1.CAPTION"
 msgid "Translator Demo"
 msgstr "Ukázka Translatoru"
 
-#: TMAINFORM.BUTTON1.CAPTION
+#: tmainform.button1.caption
 msgid "Show MainForm.Name"
 msgstr "Ukázat MainForm.Name"
 
-#: TMAINFORM.CAPTION
+#: tmainform.caption
 msgctxt "TMAINFORM.CAPTION"
 msgid "Translator Demo"
 msgstr "Ukázka Translatoru"
 
-#: TMAINFORM.LABEL1.CAPTION
+#: tmainform.label1.caption
 msgid "MainForm"
 msgstr "HlavníFormulář"
 
-#: TMAINFORM.LABEL2.CAPTION
+#: tmainform.label2.caption
 msgid "Form name as label caption:"
 msgstr "Jméno formuláře jako titulek textu:"
 
-#: TMAINFORM.LABEL3.CAPTION
+#: tmainform.label3.caption
 msgid "Language list:"
 msgstr ""
 
-#: TMAINFORM.LABEL4.CAPTION
+#: tmainform.label4.caption
 msgid "Excludes:"
 msgstr ""

trunk/Packages/CoolTranslator/Demo/Languages/TranslatorDemo.de.po

@@ -2 +2 @@
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: TFORM1.FORM1.CAPTION
+#: tform1.form1.caption
 msgctxt "TFORM1.FORM1.CAPTION"
 msgid "Translator Demo"
 msgstr ""
 
-#: TMAINFORM.BUTTON1.CAPTION
+#: tmainform.button1.caption
 msgid "Show MainForm.Name"
 msgstr ""
 
-#: TMAINFORM.CAPTION
+#: tmainform.caption
 msgctxt "TMAINFORM.CAPTION"
 msgid "Translator Demo"
 msgstr ""
 
-#: TMAINFORM.LABEL1.CAPTION
+#: tmainform.label1.caption
 msgid "MainForm"
 msgstr ""
 
-#: TMAINFORM.LABEL2.CAPTION
+#: tmainform.label2.caption
 msgid "Form name as label caption:"
 msgstr ""
 
-#: TMAINFORM.LABEL3.CAPTION
+#: tmainform.label3.caption
 msgid "Language list:"
 msgstr ""
 
-#: TMAINFORM.LABEL4.CAPTION
+#: tmainform.label4.caption
 msgid "Excludes:"
 msgstr ""

trunk/Packages/CoolTranslator/Demo/Languages/TranslatorDemo.po

@@ -2 +2 @@
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-#: TFORM1.FORM1.CAPTION
+#: tform1.form1.caption
 msgctxt "TFORM1.FORM1.CAPTION"
 msgid "Translator Demo"
 msgstr ""
 
-#: TMAINFORM.BUTTON1.CAPTION
+#: tmainform.button1.caption
 msgid "Show MainForm.Name"
 msgstr ""
 
-#: TMAINFORM.CAPTION
+#: tmainform.caption
 msgctxt "TMAINFORM.CAPTION"
 msgid "Translator Demo"
 msgstr ""
 
-#: TMAINFORM.LABEL1.CAPTION
+#: tmainform.label1.caption
 msgid "MainForm"
 msgstr ""
 
-#: TMAINFORM.LABEL2.CAPTION
+#: tmainform.label2.caption
 msgid "Form name as label caption:"
 msgstr ""
 
-#: TMAINFORM.LABEL3.CAPTION
+#: tmainform.label3.caption
 msgid "Language list:"
 msgstr ""
 
-#: TMAINFORM.LABEL4.CAPTION
+#: tmainform.label4.caption
 msgid "Excludes:"
 msgstr ""

trunk/Packages/CoolTranslator/Demo/TranslatorDemo.lpi

@@ -51 +51 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="MainForm"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UMainForm"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
@@ -79 +81 @@
         <Filename Value="..\UCoolTranslator.pas"/>
         <UnitName Value="UCoolTranslator"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
         <TopLine Value="274"/>
-        <CursorPos X="1" Y="286"/>
+        <CursorPos X="33" Y="288"/>
         <UsageCount Value="11"/>
         <Loaded Value="True"/>
@@ -265 +266 @@
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <Target>
@@ -275 +276 @@
     </SearchPaths>
     <Linking>
-      <Debugging>
-        <GenerateDebugInfo Value="True"/>
-        <DebugInfoType Value="dsAuto"/>
-      </Debugging>
       <Options>
         <Win32>
@@ -305 +302 @@
     </Exceptions>
   </Debugging>
+  <EditorMacros Count="0"/>
 </CONFIG>

trunk/Packages/CoolTranslator/Demo/UMainForm.lfm

@@ -8 +8 @@
   ClientWidth = 466
   OnCreate = FormCreate
-  LCLVersion = '0.9.31'
+  LCLVersion = '1.1'
   object ListBox1: TListBox
     Left = 171
@@ -29 +29 @@
   object Label1: TLabel
     Left = 10
-    Height = 14
+    Height = 13
     Top = 24
-    Width = 47
+    Width = 46
     Caption = 'MainForm'
     ParentColor = False
@@ -37 +37 @@
   object Label2: TLabel
     Left = 10
-    Height = 14
+    Height = 13
     Top = 6
-    Width = 135
+    Width = 134
     Caption = 'Form name as label caption:'
     ParentColor = False
@@ -45 +45 @@
   object Label3: TLabel
     Left = 171
-    Height = 14
+    Height = 13
     Top = 8
-    Width = 68
+    Width = 67
     Caption = 'Language list:'
     ParentColor = False
@@ -61 +61 @@
   object Label4: TLabel
     Left = 321
-    Height = 14
+    Height = 13
     Top = 10
-    Width = 47
+    Width = 46
     Caption = 'Excludes:'
     ParentColor = False
@@ -69 +69 @@
   object CoolTranslator1: TCoolTranslator
     POFilesFolder = 'Languages'
-    left = 64
-    top = 40
+    left = 72
+    top = 72
   end
 end

trunk/Packages/TemplateGenerics/Additional/UBinarySerializer.pas

@@ -1 +1 @@
 unit UBinarySerializer;
 
-{$mode objfpc}{$H+}
+{$mode delphi}{$H+}
 
 interface
@@ -15 +15 @@
   TBinarySerializer = class
   private
-    FStream: TStreamByte;
+    FGrow: Boolean;
+    FList: TListByte;
     FEndianness: TEndianness;
     SwapData: Boolean;
+    procedure SetList(const AValue: TListByte);
     procedure SetEndianness(const AValue: TEndianness);
     procedure ReverseByteOrder(var Buffer; Count: Integer);
   public
+    Position: Integer;
+    OwnsList: Boolean;
+    procedure Write(var Buffer; Count: Integer); //inline;
+    procedure Read(var Buffer; Count: Integer); //inline;
+
     procedure Assign(Source: TBinarySerializer);
     procedure WriteByte(Data: Byte);
@@ -48 +55 @@
     procedure ReadStream(AStream: TStream; Count: Integer);
     procedure ReadStreamPart(AStream: TStream; Count: Integer);
+    procedure ReadList(List: TListByte; StartIndex, Count: Integer);
     constructor Create; overload;
-    constructor Create(AStream: TStreamByte); overload;
     procedure Clear;
     destructor Destroy; override;
     property Endianness: TEndianness read FEndianness write SetEndianness;
-    property Stream: TStreamByte read FStream write FStream;
+    property List: TListByte read FList write SetList;
+    property Grow: Boolean read FGrow write FGrow;
   end;
 
@@ -65 +73 @@
   StringLength: Longint;
 begin
-  StringLength  := 0;
-  FStream.ReadBuffer(StringLength, SizeOf(StringLength));
+  StringLength := 0;
+  Read(StringLength, SizeOf(StringLength));
   Result := ReadString(StringLength);
 end;
@@ -76 +84 @@
   OldPosition: Integer;
 begin
-  OldPosition := FStream.Position;
+  OldPosition := Position;
   Result := '';
   I := 1;
   repeat
-    if FStream.Position >= FStream.Size then Break;
+    if Position >= FList.Count then Break;
     Data := Chr(ReadByte);
     if Data <> Terminator[I] then begin
@@ -89 +97 @@
   if not (I > Length(Terminator)) then begin
     Result := '';
-    FStream.Position := OldPosition;
+    Position := OldPosition;
   end;
 end;
@@ -96 +104 @@
 begin
   Result := 0;
-  FStream.ReadBuffer(Result, SizeOf(Byte));
+  Read(Result, SizeOf(Byte));
 end;
 
@@ -102 +110 @@
 begin
   Result := 0;
-  FStream.ReadBuffer(Result, SizeOf(Cardinal));
+  Read(Result, SizeOf(Cardinal));
   if SwapData then Result := SwapEndian(Result);
 end;
@@ -109 +117 @@
 begin
   Result := 0;
-  FStream.ReadBuffer(Result, SizeOf(Int64));
+  Read(Result, SizeOf(Int64));
   if SwapData then Result := SwapEndian(Result);
 end;
@@ -117 +125 @@
   if Length > 0 then begin
     SetLength(Result, Length);
-    FStream.ReadBuffer(Result[1], Length);
+    Read(Result[1], Length);
   end else Result := '';
 end;
@@ -126 +134 @@
 begin
   Count := 0;
-  FStream.ReadBuffer(Count, 1);
+  Read(Count, 1);
   Result := ReadString(Count);
 end;
@@ -136 +144 @@
   if Count > 0 then begin
     SetLength(Buffer, Count);
-    FStream.ReadBuffer(Buffer[0], Count);
+    Read(Buffer[0], Count);
     AStream.Size := Count;
     AStream.Position := 0;
@@ -149 +157 @@
   if Count > 0 then begin
     SetLength(Buffer, Count);
-    FStream.ReadBuffer(Buffer[0], Count);
+    Read(Buffer[0], Count);
     if AStream.Size < (AStream.Position + Count) then
       AStream.Size := AStream.Position + Count;
-    AStream.Write(Buffer[0], Count);
+    Write(Buffer[0], Count);
+  end;
+end;
+
+procedure TBinarySerializer.ReadList(List: TListByte; StartIndex, Count: Integer
+  );
+var
+  Buffer: array of Byte;
+begin
+  if Count > (List.Count - StartIndex) then Count := (List.Count - StartIndex); // Limit max. stream size
+  if Count > 0 then begin
+    SetLength(Buffer, Count);
+    Read(Pointer(Buffer)^, Count);
+    List.ReplaceBuffer(StartIndex, Pointer(Buffer)^, Count);
   end;
 end;
@@ -164 +185 @@
     SetLength(Buffer, Count);
     AStream.ReadBuffer(Pointer(Buffer)^, Count);
-    FStream.WriteBuffer(Pointer(Buffer)^, Count);
+    Write(Pointer(Buffer)^, Count);
   end;
 end;
@@ -172 +193 @@
   Buffer: array of Byte;
 begin
-  if Count > (List.Count - StartIndex) then Count := (List.Count - StartIndex); // Limit max. stream size
-  if Count > 0 then begin
-    SetLength(Buffer, Count);
-    List.ReadBuffer(Pointer(Buffer)^, Count);
-    FStream.WriteBuffer(Pointer(Buffer)^, Count);
+//  if Count > (List.Count - StartIndex) then Count := (List.Count - StartIndex); // Limit max. stream size
+  if Count > 0 then begin
+    SetLength(Buffer, Count);
+    List.GetBuffer(StartIndex, PByte(Buffer)^, Count);
+    Write(Pointer(Buffer)^, Count);
   end;
 end;
@@ -184 +205 @@
   inherited;
   Endianness := enLittle;
-  FStream := nil;
-end;
-
-constructor TBinarySerializer.Create(AStream: TStreamByte);
-begin
-  inherited Create;
-  Endianness := enLittle;
-  FStream := AStream;
+  FList := nil;
+  FGrow := True;
 end;
 
 procedure TBinarySerializer.Clear;
 begin
-  Stream.Size := 0;
+  FList.Count := 0;
+  Position := 0;
 end;
 
 destructor TBinarySerializer.Destroy;
 begin
+  if OwnsList then FList.Free;
   inherited Destroy;
 end;
@@ -212 +229 @@
 begin
   Result := 0;
-  FStream.ReadBuffer(Result, SizeOf(Double));
+  Read(Result, SizeOf(Double));
 end;
 
@@ -218 +235 @@
 begin
   Result := 0;
-  FStream.ReadBuffer(Result, SizeOf(Single));
+  Read(Result, SizeOf(Single));
 end;
 
@@ -224 +241 @@
 begin
   Result := 0;
-  FStream.ReadBuffer(Result, SizeOf(Word));
+  Read(Result, SizeOf(Word));
   if SwapData then Result := SwapEndian(Result);
+end;
+
+procedure TBinarySerializer.SetList(const AValue: TListByte);
+begin
+  if OwnsList then FList.Free;
+  FList := AValue;
 end;
 
@@ -254 +277 @@
 end;
 
+procedure TBinarySerializer.Write(var Buffer; Count: Integer);
+var
+  NewCount: Integer;
+begin
+  if FGrow then begin
+    NewCount := Position + Count;
+    if FList.Count < NewCount then
+      FList.Count := NewCount;
+  end;
+  FList.ReplaceBuffer(Position, Buffer, Count);
+  Inc(Position, Count);
+end;
+
+procedure TBinarySerializer.Read(var Buffer; Count: Integer);
+begin
+  FList.GetBuffer(Position, Buffer, Count);
+  Inc(Position, Count);
+end;
+
 procedure TBinarySerializer.Assign(Source: TBinarySerializer);
 begin
-  FStream := Source.FStream;
+  FList := Source.FList;
 end;
 
@@ -270 +312 @@
 procedure TBinarySerializer.WriteByte(Data: Byte);
 begin
-  Data := 0;
-  FStream.WriteBuffer(Data, SizeOf(Byte));
+  Write(Data, SizeOf(Byte));
 end;
 
@@ -307 +348 @@
     SetLength(Buffer, Count);
     AStream.ReadBuffer(Pointer(Buffer)^, Count);
-    FStream.WriteBuffer(Pointer(Buffer)^, Count);
+    Write(Pointer(Buffer)^, Count);
   end;
 end;

trunk/Packages/TemplateGenerics/Generic/GenericBitmap.inc

@@ -8 +8 @@
 {$DEFINE TGMatrixRow := TGBitmapRow}
 {$DEFINE TGMatrix := TGBitmapMatrix}
-{$DEFINE TGMatrixSortCompare := TGBitmapSortCompare}
-{$DEFINE TGMatrixToStringConverter := TGBitmapToStringConverter}
-{$DEFINE TGMatrixFromStringConverter := TGBitmapFromStringConverter}
-{$DEFINE TGMatrixMerge := TGBitmapMerge}
 {$DEFINE INTERFACE}
 {$I 'GenericMatrix.inc'}
@@ -49 +45 @@
 {$DEFINE TGMatrixRow := TGBitmapRow}
 {$DEFINE TGMatrix := TGBitmapMatrix}
-{$DEFINE TGMatrixSortCompare := TGBitmapSortCompare}
-{$DEFINE TGMatrixToStringConverter := TGBitmapToStringConverter}
-{$DEFINE TGMatrixFromStringConverter := TGBitmapFromStringConverter}
-{$DEFINE TGMatrixMerge := TGBitmapMerge}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericMatrix.inc'}

trunk/Packages/TemplateGenerics/Generic/GenericDictionary.inc

@@ -11 +11 @@
 {$DEFINE TGListItem := TGPair}
 {$DEFINE TGList := TGDictionaryList}
-{$DEFINE TGListSortCompare := TGDictionarySortCompare}
-{$DEFINE TGListToStringConverter := TGDictionaryToStringConverter}
-{$DEFINE TGListFromStringConverter := TGDictionaryFromStringConverter}
-{$DEFINE TGListItemArray := TGDictionaryItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericList.inc'}
@@ -49 +45 @@
 {$DEFINE TGListItem := TGPair}
 {$DEFINE TGList := TGDictionaryList}
-{$DEFINE TGListSortCompare := TGDictionarySortCompare}
-{$DEFINE TGListToStringConverter := TGDictionaryToStringConverter}
-{$DEFINE TGListFromStringConverter := TGDictionaryFromStringConverter}
-{$DEFINE TGListItemArray := TGDictionaryItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericList.inc'}

trunk/Packages/TemplateGenerics/Generic/GenericList.inc

@@ -12 +12 @@
   // - all items operations (Clear, Reverse, Sort)
 
-  TGList = class;
-
-  TGListSortCompare = function(Item1, Item2: TGListItem): Integer of object;
-  TGListToStringConverter = function(Item: TGListItem): string;
-  TGListFromStringConverter = function(Text: string): TGListItem;
-  TGListItemArray = array of TGListItem;
+  //TGAbstractList = class
+
+  //end;
 
   // TGList<TGListIndex, TGListItem> = class
-  TGList = class
+  TGList = class//(TGAbstractList)
+  public
+    type
+      PItem = ^TGListItem;
+      TSortCompare = function(Item1, Item2: TGListItem): Integer of object;
+      TToStringConverter = function(Item: TGListItem): string;
+      TFromStringConverter = function(Text: string): TGListItem;
+      TItemArray = array of TGListItem;
   private
     FItems: array of TGListItem;
@@ -34 +38 @@
     procedure SetLast(AValue: TGListItem);
     procedure SetFirst(AValue: TGListItem);
-    procedure QuickSort(L, R : TGListIndex; Compare: TGListSortCompare);
+    procedure QuickSort(L, R : TGListIndex; Compare: TSortCompare);
+    procedure DoUpdate;
   protected
     procedure Put(Index: TGListIndex; const AValue: TGListItem); virtual;
@@ -51 +56 @@
     function EqualTo(List: TGList): Boolean;
     procedure Exchange(Index1, Index2: TGListIndex);
-    procedure Explode(Text, Separator: string; Converter: TGListFromStringConverter; SlicesCount: Integer = -1);
+    procedure Explode(Text, Separator: string; Converter: TFromStringConverter; SlicesCount: Integer = -1);
     function Extract(Item: TGListItem): TGListItem;
     property First: TGListItem read GetFirst write SetFirst;
     procedure Fill(Start, Count: TGListIndex; Value: TGListItem);
-    function GetArray(Index, ACount: TGListIndex): TGListItemArray;
+    function GetArray(Index, ACount: TGListIndex): TItemArray;
     procedure GetList(List: TGList; Index, ACount: TGListIndex);
-    function Implode(Separator: string; Converter: TGListToStringConverter): string;
+    procedure GetBuffer(Index: TGListIndex; var Buffer; Count: TGListIndex);
+    function Implode(Separator: string; Converter: TToStringConverter): string;
     function IndexOf(Item: TGListItem; Start: TGListIndex = 0): TGListIndex; virtual;
     function IndexOfList(List: TGList; Start: TGListIndex = 0): TGListIndex;
@@ -73 +79 @@
     procedure ReplaceListPart(Index: TGListIndex; Source: TGList;
       SourceIndex, SourceCount: TGListIndex);
-    procedure Sort(Compare: TGListSortCompare);
+    procedure ReplaceBuffer(Index: TGListIndex; var Buffer; Count: TGListIndex);
+    procedure Sort(Compare: TSortCompare);
     procedure SetArray(Values: array of TGListItem);
     procedure BeginUpdate;
@@ -82 +89 @@
     property Items[Index: TGListIndex]: TGListItem read Get write Put; default;
     property Last: TGListItem read GetLast write SetLast;
-  end;
-  
+    property OnUpdate: TNotifyEvent read FOnUpdate write FOnUpdate;
+  end;
+
 {$UNDEF INTERFACE}
 {$ENDIF}
@@ -102 +110 @@
 begin
   FCount := 0;
+  FUpdateCount := 0;
+end;
+
+procedure TGList.GetBuffer(Index: TGListIndex; var Buffer; Count: TGListIndex);
+var
+  P: PItem;
+  I: TGListIndex;
+begin
+  if (Index + Count) > FCount then
+    raise EListError.CreateFmt(SListIndexError, [Index + Count]);
+  P := PItem(@Buffer);
+  I := 0;
+  while I < Count do begin
+    P^ := Items[Index + I];
+    Inc(P, 1);
+    I := I + 1;
+  end;
+end;
+
+procedure TGList.ReplaceBuffer(Index: TGListIndex; var Buffer; Count: TGListIndex);
+var
+  P: PItem;
+  I: TGListIndex;
+begin
+  if (Index + Count) > FCount then
+    raise EListError.CreateFmt(SListIndexError, [Index + Count]);
+  P := PItem(@Buffer);
+  I := 0;
+  while I < Count do begin
+    Items[Index + I] := P^;
+    Inc(P, 1);
+    I := I + 1;
+  end;
 end;
 
@@ -200 +241 @@
 end;
 
-function TGList.GetArray(Index, ACount: TGListIndex): TGListItemArray;
+function TGList.GetArray(Index, ACount: TGListIndex): TItemArray;
 var
   I: Integer;
@@ -218 +259 @@
 end;
 
-procedure TGList.QuickSort(L, R: TGListIndex; Compare: TGListSortCompare);
+procedure TGList.QuickSort(L, R: TGListIndex; Compare: TSortCompare);
 var
   I, J: TGListIndex;
@@ -302 +343 @@
   if (Index < 0) or (Index > FCount) then
     raise EListError.CreateFmt(SListIndexError, [Index]);
-  InsertCount(Index, 1);
-  FItems[Index] := Item;
-  Update;
+  try
+    BeginUpdate;
+    InsertCount(Index, 1);
+    FItems[Index] := Item;
+  finally
+    EndUpdate;
+  end;
 end;
 
@@ -487 +532 @@
 end;
 
-procedure TGList.Sort(Compare: TGListSortCompare);
+procedure TGList.Sort(Compare: TSortCompare);
 begin
   if FCount > 1 then
@@ -525 +570 @@
 procedure TGList.EndUpdate;
 begin
-  Dec(FUpdateCount);
-  Update;
+  if FUpdateCount > 0 then Dec(FUpdateCount);
+  if FUpdateCount = 0 then DoUpdate;
+end;
+
+procedure TGList.DoUpdate;
+begin
+  if Assigned(FOnUpdate) then FOnUpdate(Self);
 end;
 
 procedure TGList.Update;
 begin
-  if Assigned(FOnUpdate) and (FUpdateCount = 0) then FOnUpdate(Self);
-end;
-
-function TGList.Implode(Separator: string; Converter: TGListToStringConverter): string;
+  if FUpdateCount = 0 then DoUpdate;
+end;
+
+function TGList.Implode(Separator: string; Converter: TToStringConverter): string;
 var
   I: TGListIndex;
@@ -548 +598 @@
 end;
 
-procedure TGList.Explode(Text, Separator: string; Converter: TGListFromStringConverter; SlicesCount: Integer = -1);
+procedure TGList.Explode(Text, Separator: string; Converter: TFromStringConverter; SlicesCount: Integer = -1);
 begin
   Clear;

trunk/Packages/TemplateGenerics/Generic/GenericListObject.inc

@@ -4 +4 @@
 {$DEFINE TGListItem := TGListObjectItem}
 {$DEFINE TGList := TGListObjectList}
-{$DEFINE TGListSortCompare := TGListObjectSortCompare}
-{$DEFINE TGListToStringConverter := TGListObjectToStringConverter}
-{$DEFINE TGListFromStringConverter := TGListObjectFromStringConverter}
-{$DEFINE TGListItemArray := TGListObjectItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericList.inc'}
@@ -42 +38 @@
 {$DEFINE TGListItem := TGListObjectItem}
 {$DEFINE TGList := TGListObjectList}
-{$DEFINE TGListSortCompare := TGListObjectSortCompare}
-{$DEFINE TGListToStringConverter := TGListObjectToStringConverter}
-{$DEFINE TGListFromStringConverter := TGListObjectFromStringConverter}
-{$DEFINE TGListItemArray := TGListObjectItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericList.inc'}
@@ -96 +88 @@
     end;
   end;
+  I := FCount;
   inherited;
+  // Nil newly allocated items
+  while I < AValue do begin
+    FItems[I] := nil;
+    I := I + 1;
+  end;
 end;
 
@@ -108 +106 @@
 begin
   Clear;
-  inherited Destroy;
+  inherited;
 end;
 

trunk/Packages/TemplateGenerics/Generic/GenericListString.inc

@@ -4 +4 @@
 {$DEFINE TGListItem := TGListStringItem}
 {$DEFINE TGList := TGListStringList}
-{$DEFINE TGListSortCompare := TGListStringSortCompare}
-{$DEFINE TGListToStringConverter := TGListStringToStringConverter}
-{$DEFINE TGListFromStringConverter := TGListStringFromStringConverter}
-{$DEFINE TGListItemArray := TGListStringItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericList.inc'}
@@ -39 +35 @@
 {$DEFINE TGListItem := TGListStringItem}
 {$DEFINE TGList := TGListStringList}
-{$DEFINE TGListSortCompare := TGListStringSortCompare}
-{$DEFINE TGListToStringConverter := TGListStringToStringConverter}
-{$DEFINE TGListFromStringConverter := TGListStringFromStringConverter}
-{$DEFINE TGListItemArray := TGListStringItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericList.inc'}

trunk/Packages/TemplateGenerics/Generic/GenericMatrix.inc

@@ +1 @@
+// Work in progress...
+
 {$IFDEF INTERFACE}
-
-  TGMatrix = class;
-
-  TGMatrixSortCompare = function(const Item1, Item2: TGMatrixItem): Integer of object;
-  TGMatrixToStringConverter = function(Item: TGMatrixItem): string;
-  TGMatrixFromStringConverter = function(Text: string): TGMatrixItem;
-  TGMatrixRow = array of TGMatrixItem;
-  TGMatrixMerge = function(Item1, Item2: TGMatrixItem): TGMatrixItem of object;
-
-  TGMatrixIndex = record
-    X: TGMatrixIndexX;
-    Y: TGMatrixIndexY;
-  end;
 
   // TGMatrix<TGMatrixIndex, TGMatrixIndex, TGMatrixItem> = class
   TGMatrix = class
+  public
+    type
+      TSortCompare = function(const Item1, Item2: TGMatrixItem): Integer of object;
+      TToStringConverter = function(Item: TGMatrixItem): string;
+      TFromStringConverter = function(Text: string): TGMatrixItem;
+      TRow = array of TGMatrixItem;
+      TMerge = function(Item1, Item2: TGMatrixItem): TGMatrixItem of object;
+
+      TIndex = record
+        X: TGMatrixIndexX;
+        Y: TGMatrixIndexY;
+      end;
   private
     FItems: array of array of TGMatrixItem;
-    FCount: TGMatrixIndex;
+    FCount: TIndex;
     function GetItemXY(X: TGMatrixIndexX; Y: TGMatrixIndexY): TGMatrixItem;
-    function GetItem(Index: TGMatrixIndex): TGMatrixItem;
-    function GetCapacity: TGMatrixIndex;
+    function GetItem(Index: TIndex): TGMatrixItem;
+    function GetCapacity: TIndex;
     function GetLast: TGMatrixItem;
     function GetFirst: TGMatrixItem;
-    procedure SetCapacity(const AValue: TGMatrixIndex);
+    procedure SetCapacity(const AValue: TIndex);
     procedure SetLast(AValue: TGMatrixItem);
     procedure SetFirst(AValue: TGMatrixItem);
     procedure PutItemXY(X: TGMatrixIndexX; Y: TGMatrixIndexY; const AValue: TGMatrixItem); virtual;
-    procedure PutItem(Index: TGMatrixIndex; const AValue: TGMatrixItem); virtual;
-    procedure SetCount(const AValue: TGMatrixIndex);
+    procedure PutItem(Index: TIndex; const AValue: TGMatrixItem); virtual;
+    procedure SetCount(const AValue: TIndex);
   public
-    function Add(Item: TGMatrixItem): TGMatrixIndex;
-    procedure AddMatrix(Values: array of TGMatrixRow);
+    function Add(Item: TGMatrixItem): TIndex;
+    procedure AddMatrix(Values: array of TRow);
     procedure AddList(List: TGMatrix);
     procedure Assign(Source: TGMatrix);
     procedure Clear; virtual;
     procedure Contract;
-    function CreateIndex(X: TGMatrixIndexY; Y: TGMatrixIndexX): TGMatrixIndex;
-    procedure Delete(Index: TGMatrixIndex); virtual;
-    procedure DeleteItems(Index, Count: TGMatrixIndex);
+    function CreateIndex(X: TGMatrixIndexY; Y: TGMatrixIndexX): TIndex;
+    procedure Delete(Index: TIndex); virtual;
+    procedure DeleteItems(Index, Count: TIndex);
     function EqualTo(List: TGMatrix): Boolean;
     procedure Expand;
     function Extract(Item: TGMatrixItem): TGMatrixItem;
-    procedure Exchange(Index1, Index2: TGMatrixIndex);
+    procedure Exchange(Index1, Index2: TIndex);
     property First: TGMatrixItem read GetFirst write SetFirst;
     procedure FillAll(Value: TGMatrixItem);
-    procedure Fill(Start, Count: TGMatrixIndex; Value: TGMatrixItem);
-    function Implode(RowSeparator, ColSeparator: string; Converter: TGMatrixToStringConverter): string;
-    procedure Explode(Text, Separator: string; Converter: TGMatrixFromStringConverter; SlicesCount: Integer = -1);
-    function IndexOf(Item: TGMatrixItem; Start: TGMatrixIndex): TGMatrixIndex;
-    function IndexOfList(List: TGMatrix; Start: TGMatrixIndex): TGMatrixIndex;
-    procedure Insert(Index: TGMatrixIndex; Item: TGMatrixItem);
-    procedure InsertList(Index: TGMatrixIndex; List: TGMatrix);
-    procedure InsertArray(Index: TGMatrixIndex; Values: array of TGMatrixItem);
-    procedure Move(CurIndex, NewIndex: TGMatrixIndex);
-    procedure MoveItems(CurIndex, NewIndex, Count: TGMatrixIndex);
-    procedure Merge(Index: TGMatrixIndex; Source: TGMatrix; Proc: TGMatrixMerge);
-    procedure Replace(Index: TGMatrixIndex; Source: TGMatrix);
-    function Remove(Item: TGMatrixItem): TGMatrixIndex;
+    procedure Fill(Start, Count: TIndex; Value: TGMatrixItem);
+    function Implode(RowSeparator, ColSeparator: string; Converter: TToStringConverter): string;
+    procedure Explode(Text, Separator: string; Converter: TFromStringConverter; SlicesCount: Integer = -1);
+    function IndexOf(Item: TGMatrixItem; Start: TIndex): TIndex;
+    function IndexOfList(List: TGMatrix; Start: TIndex): TIndex;
+    procedure Insert(Index: TIndex; Item: TGMatrixItem);
+    procedure InsertList(Index: TIndex; List: TGMatrix);
+    procedure InsertArray(Index: TIndex; Values: array of TGMatrixItem);
+    procedure Move(CurIndex, NewIndex: TIndex);
+    procedure MoveItems(CurIndex, NewIndex, Count: TIndex);
+    procedure Merge(Index: TIndex; Source: TGMatrix; Proc: TMerge);
+    procedure Replace(Index: TIndex; Source: TGMatrix);
+    function Remove(Item: TGMatrixItem): TIndex;
     procedure Reverse;
     procedure ReverseHorizontal;
     procedure ReverseVertical;
-    procedure Sort(Compare: TGMatrixSortCompare);
+    procedure Sort(Compare: TSortCompare);
     procedure SetArray(Values: array of TGMatrixItem);
-    property Count: TGMatrixIndex read FCount write SetCount;
-    property Capacity: TGMatrixIndex read GetCapacity write SetCapacity;
+    property Count: TIndex read FCount write SetCount;
+    property Capacity: TIndex read GetCapacity write SetCapacity;
     property ItemsXY[X: TGMatrixIndexX; Y: TGMatrixIndexY]: TGMatrixItem
       read GetItemXY write PutItemXY; default;
-    property Items[Index: TGMatrixIndex]: TGMatrixItem
+    property Items[Index: TIndex]: TGMatrixItem
       read GetItem write PutItem;
     property Last: TGMatrixItem read GetLast write SetLast;
@@ -91 +92 @@
 { TGMatrix }
 
-procedure TGMatrix.Replace(Index: TGMatrixIndex; Source: TGMatrix);
+procedure TGMatrix.Replace(Index: TIndex; Source: TGMatrix);
 var
   X: TGMatrixIndexX;
@@ -107 +108 @@
 end;
 
-procedure TGMatrix.Merge(Index: TGMatrixIndex; Source: TGMatrix; Proc: TGMatrixMerge);
+procedure TGMatrix.Merge(Index: TIndex; Source: TGMatrix; Proc: TMerge);
 var
   X: TGMatrixIndexX;
@@ -123 +124 @@
 end;
 
-function TGMatrix.CreateIndex(X: TGMatrixIndexY; Y: TGMatrixIndexX): TGMatrixIndex;
+function TGMatrix.CreateIndex(X: TGMatrixIndexY; Y: TGMatrixIndexX): TIndex;
 begin
   Result.X := X;
@@ -129 +130 @@
 end;
 
-function TGMatrix.GetCapacity: TGMatrixIndex;
+function TGMatrix.GetCapacity: TIndex;
 begin
   Result.Y := Length(FItems);
@@ -135 +136 @@
 end;
 
-procedure TGMatrix.SetCapacity(const AValue: TGMatrixIndex);
+procedure TGMatrix.SetCapacity(const AValue: TIndex);
 var
   Y: TGMatrixIndexY;
@@ -160 +161 @@
 end;
 
-function TGMatrix.GetItem(Index: TGMatrixIndex): TGMatrixItem;
+function TGMatrix.GetItem(Index: TIndex): TGMatrixItem;
 begin
   if (Index.X < 0) or (Index.X >= Count.X) or
@@ -176 +177 @@
 end;
 
-procedure TGMatrix.PutItem(Index: TGMatrixIndex; const AValue: TGMatrixItem);
+procedure TGMatrix.PutItem(Index: TIndex; const AValue: TGMatrixItem);
 begin
   if (Index.X < 0) or (Index.X >= Count.X) or
@@ -184 +185 @@
 end;
 
-procedure TGMatrix.SetCount(const AValue: TGMatrixIndex);
+procedure TGMatrix.SetCount(const AValue: TIndex);
 begin
   Capacity := AValue;
@@ -192 +193 @@
 procedure TGMatrix.Assign(Source: TGMatrix);
 var
-  Index: TGMatrixIndex;
+  Index: TIndex;
 begin
   Count := Source.Count;
@@ -208 +209 @@
 procedure TGMatrix.Expand;
 var
-  IncSize: TGMatrixIndex;
-  NewCapacity: TGMatrixIndex;
+  IncSize: TIndex;
+  NewCapacity: TIndex;
 begin
   if (FCount.X = Capacity.X) then begin
@@ -230 +231 @@
 procedure TGMatrix.Contract;
 var
-  NewCapacity: TGMatrixIndex;
+  NewCapacity: TIndex;
 begin
   if (Capacity.X > 256) and (FCount.X < Capacity.X shr 2) then
@@ -245 +246 @@
 function TGMatrix.Extract(Item: TGMatrixItem): TGMatrixItem;
 var
-  I: TGMatrixIndex;
+  I: TIndex;
 begin
 (*  I := IndexOf(Item);
@@ -256 +257 @@
 end;
 
-function TGMatrix.IndexOf(Item: TGMatrixItem; Start: TGMatrixIndex): TGMatrixIndex;
+function TGMatrix.IndexOf(Item: TGMatrixItem; Start: TIndex): TIndex;
 begin
 (*  Result := Start;
@@ -266 +267 @@
 end;
 
-procedure TGMatrix.Insert(Index: TGMatrixIndex; Item: TGMatrixItem);
+procedure TGMatrix.Insert(Index: TIndex; Item: TGMatrixItem);
 begin
 (*  if (Index < 0) or (Index > FCount ) then
@@ -278 +279 @@
 end;
 
-procedure TGMatrix.InsertList(Index: TGMatrixIndex; List: TGMatrix);
-var
-  I: TGMatrixIndex;
+procedure TGMatrix.InsertList(Index: TIndex; List: TGMatrix);
+var
+  I: TIndex;
 begin
 (*  I := 0;
@@ -290 +291 @@
 end;
 
-function TGMatrix.IndexOfList(List: TGMatrix; Start: TGMatrixIndex): TGMatrixIndex;
-var
-  I: TGMatrixIndex;
+function TGMatrix.IndexOfList(List: TGMatrix; Start: TIndex): TIndex;
+var
+  I: TIndex;
 begin
 (*  if List.Count > 0 then begin
@@ -346 +347 @@
 end;
 
-procedure TGMatrix.Move(CurIndex, NewIndex: TGMatrixIndex);
+procedure TGMatrix.Move(CurIndex, NewIndex: TIndex);
 var
   Temp: TGMatrixItem;
@@ -366 +367 @@
 end;
 
-procedure TGMatrix.MoveItems(CurIndex, NewIndex, Count: TGMatrixIndex);
+procedure TGMatrix.MoveItems(CurIndex, NewIndex, Count: TIndex);
 var
   S: Integer;
@@ -391 +392 @@
 end;
 
-function TGMatrix.Remove(Item: TGMatrixItem): TGMatrixIndex;
+function TGMatrix.Remove(Item: TGMatrixItem): TIndex;
 begin
 (*  Result := IndexOf(Item);
@@ -400 +401 @@
 function TGMatrix.EqualTo(List: TGMatrix): Boolean;
 var
-  I: TGMatrixIndex;
+  I: TIndex;
 begin
 (*  Result := Count = List.Count;
@@ -463 +464 @@
 end;
 
-procedure TGMatrix.Sort(Compare: TGMatrixSortCompare);
+procedure TGMatrix.Sort(Compare: TSortCompare);
 begin
 (*  if FCount > 1 then
@@ -469 +470 @@
 end;
 
-procedure TGMatrix.AddMatrix(Values: array of TGMatrixRow);
-var
-  I: TGMatrixIndex;
+procedure TGMatrix.AddMatrix(Values: array of TRow);
+var
+  I: TIndex;
 begin
 (*  I := 0;
@@ -482 +483 @@
 procedure TGMatrix.SetArray(Values: array of TGMatrixItem);
 var
-  I: TGMatrixIndex;
+  I: TIndex;
 begin
 (*  Clear;
@@ -492 +493 @@
 end;
 
-procedure TGMatrix.InsertArray(Index: TGMatrixIndex; Values: array of TGMatrixItem);
-var
-  I: TGMatrixIndex;
+procedure TGMatrix.InsertArray(Index: TIndex; Values: array of TGMatrixItem);
+var
+  I: TIndex;
 begin
 (*  I := 0;
@@ -503 +504 @@
 end;
 
-function TGMatrix.Implode(RowSeparator, ColSeparator: string; Converter: TGMatrixToStringConverter): string;
+function TGMatrix.Implode(RowSeparator, ColSeparator: string; Converter: TToStringConverter): string;
 var
   Y: TGMatrixIndexY;
@@ -524 +525 @@
 end;
 
-procedure TGMatrix.Explode(Text, Separator: string; Converter: TGMatrixFromStringConverter; SlicesCount: Integer = -1);
+procedure TGMatrix.Explode(Text, Separator: string; Converter: TFromStringConverter; SlicesCount: Integer = -1);
 begin
 (*  Clear;
@@ -535 +536 @@
 end;
 
-function TGMatrix.Add(Item: TGMatrixItem): TGMatrixIndex;
+function TGMatrix.Add(Item: TGMatrixItem): TIndex;
 begin
 (*  if FCount = Capacity then
@@ -546 +547 @@
 procedure TGMatrix.AddList(List: TGMatrix);
 var
-  I: TGMatrixIndex;
+  I: TIndex;
 begin
 (*  I := 0;
@@ -561 +562 @@
 end;
 
-procedure TGMatrix.Delete(Index: TGMatrixIndex);
+procedure TGMatrix.Delete(Index: TIndex);
 begin
 (*  if (Index < 0) or (Index >= FCount) then
@@ -571 +572 @@
 end;
 
-procedure TGMatrix.DeleteItems(Index, Count: TGMatrixIndex);
-var
-  I: TGMatrixIndex;
+procedure TGMatrix.DeleteItems(Index, Count: TIndex);
+var
+  I: TIndex;
 begin
 (*  I := Index;
@@ -583 +584 @@
 end;
 
-procedure TGMatrix.Fill(Start, Count: TGMatrixIndex; Value: TGMatrixItem);
+procedure TGMatrix.Fill(Start, Count: TIndex; Value: TGMatrixItem);
 var
   X: TGMatrixIndexX;
@@ -604 +605 @@
 end;
 
-procedure TGMatrix.Exchange(Index1, Index2: TGMatrixIndex);
+procedure TGMatrix.Exchange(Index1, Index2: TIndex);
 var
   Temp: TGMatrixItem;

trunk/Packages/TemplateGenerics/Generic/GenericQueue.inc

@@ -4 +4 @@
 {$DEFINE TGListItem := TGQueueItem}
 {$DEFINE TGList := TGQueueList}
-{$DEFINE TGListSortCompare := TGQueueSortCompare}
-{$DEFINE TGListToStringConverter := TGQueueToStringConverter}
-{$DEFINE TGListFromStringConverter := TGQueueFromStringConverter}
-{$DEFINE TGListItemArray := TGQueueItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericList.inc'}
@@ -44 +40 @@
 {$DEFINE TGListItem := TGQueueItem}
 {$DEFINE TGList := TGQueueList}
-{$DEFINE TGListSortCompare := TGQueueSortCompare}
-{$DEFINE TGListToStringConverter := TGQueueToStringConverter}
-{$DEFINE TGListFromStringConverter := TGQueueFromStringConverter}
-{$DEFINE TGListItemArray := TGQueueItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericList.inc'}

trunk/Packages/TemplateGenerics/Generic/GenericSet.inc

@@ -4 +4 @@
 {$DEFINE TGListItem := TGSetItem}
 {$DEFINE TGList := TGSetList}
-{$DEFINE TGListSortCompare := TGSetSortCompare}
-{$DEFINE TGListToStringConverter := TGSetToStringConverter}
-{$DEFINE TGListFromStringConverter := TGSetFromStringConverter}
-{$DEFINE TGListItemArray := TGSetItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericList.inc'}
@@ -38 +34 @@
 {$DEFINE TGListItem := TGSetItem}
 {$DEFINE TGList := TGSetList}
-{$DEFINE TGListSortCompare := TGSetSortCompare}
-{$DEFINE TGListToStringConverter := TGSetToStringConverter}
-{$DEFINE TGListFromStringConverter := TGSetFromStringConverter}
-{$DEFINE TGListItemArray := TGSetItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericList.inc'}

trunk/Packages/TemplateGenerics/Generic/GenericStack.inc

@@ -4 +4 @@
 {$DEFINE TGListItem := TGStackItem}
 {$DEFINE TGList := TGStackList}
-{$DEFINE TGListSortCompare := TGStackSortCompare}
-{$DEFINE TGListToStringConverter := TGStackToStringConverter}
-{$DEFINE TGListFromStringConverter := TGStackFromStringConverter}
-{$DEFINE TGListItemArray := TGStackItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericList.inc'}
@@ -39 +35 @@
 {$DEFINE TGListItem := TGStackItem}
 {$DEFINE TGList := TGStackList}
-{$DEFINE TGListSortCompare := TGStackSortCompare}
-{$DEFINE TGListToStringConverter := TGStackToStringConverter}
-{$DEFINE TGListFromStringConverter := TGStackFromStringConverter}
-{$DEFINE TGListItemArray := TGStackItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericList.inc'}

trunk/Packages/TemplateGenerics/Generic/GenericStream.inc

@@ -1 +1 @@
 {$IFDEF INTERFACE}
 
-TGStreamItemArray = array of TGStreamItem;
 
 // TGStream<TGStreamIndex, TGStreamItem> = class
 TGStream = class
-  procedure SetSize(AValue: TGStreamIndex);
+public
+  type
+    TItemArray = array of TGStreamItem;
+private
+procedure SetSize(AValue: TGStreamIndex);
   function GetSize: TGStreamIndex;
   procedure SetPosition(AValue: TGStreamIndex);
@@ -15 +18 @@
   procedure WriteStream(Stream: TGStream; Count: TGStreamIndex); virtual; abstract;
   function Read: TGStreamItem; virtual; abstract;
-  function ReadArray(Count: TGStreamIndex): TGStreamItemArray; virtual; abstract;
+  function ReadArray(Count: TGStreamIndex): TItemArray; virtual; abstract;
   function ReadStream(Stream: TGStream; Count: TGStreamIndex): TGStreamIndex; virtual; abstract;
   function Insert(Count: TGStreamIndex): TGStreamIndex; virtual; abstract;

trunk/Packages/TemplateGenerics/Generic/GenericTree.inc

@@ -6 +6 @@
 {$DEFINE TGListItem := TGTreeNode}
 {$DEFINE TGList := TGTreeNodeList}
-{$DEFINE TGListSortCompare := TGTreeSortCompare}
-{$DEFINE TGListToStringConverter := TGTreeToStringConverter}
-{$DEFINE TGListFromStringConverter := TGTreeFromStringConverter}
-{$DEFINE TGListItemArray := TGTreeItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericList.inc'}
@@ -44 +40 @@
 {$DEFINE TGListItem := TGTreeNode}
 {$DEFINE TGList := TGTreeNodeList}
-{$DEFINE TGListSortCompare := TGTreeSortCompare}
-{$DEFINE TGListToStringConverter := TGTreeToStringConverter}
-{$DEFINE TGListFromStringConverter := TGTreeFromStringConverter}
-{$DEFINE TGListItemArray := TGTreeItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericList.inc'}

trunk/Packages/TemplateGenerics/Specialized/SpecializedDictionary.pas

@@ -18 +18 @@
 {$DEFINE TGDictionary := TDictionaryStringString}
 {$DEFINE TGDictionaryList := TDictionaryStringStringList}
-{$DEFINE TGDictionarySortCompare := TDictionaryStringStringSortCompare}
-{$DEFINE TGDictionaryToStringConverter := TDictionaryStringStringToStringConverter}
-{$DEFINE TGDictionaryFromStringConverter := TDictionaryStringStringFromStringConverter}
-{$DEFINE TGDictionaryItemArray := TDictionaryStringStringItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericDictionary.inc'}
@@ -32 +28 @@
 {$DEFINE TGDictionary := TDictionaryIntegerString}
 {$DEFINE TGDictionaryList := TDictionaryIntegerStringList}
-{$DEFINE TGDictionarySortCompare := TDictionaryIntegerStringSortCompare}
-{$DEFINE TGDictionaryToStringConverter := TDictionaryIntegerStringToStringConverter}
-{$DEFINE TGDictionaryFromStringConverter := TDictionaryIntegerStringFromStringConverter}
-{$DEFINE TGDictionaryItemArray := TDictionaryIntegerStringItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericDictionary.inc'}
@@ -53 +45 @@
 {$DEFINE TGDictionary := TDictionaryStringString}
 {$DEFINE TGDictionaryList := TDictionaryStringStringList}
-{$DEFINE TGDictionarySortCompare := TDictionaryStringStringSortCompare}
-{$DEFINE TGDictionaryToStringConverter := TDictionaryStringStringToStringConverter}
-{$DEFINE TGDictionaryFromStringConverter := TDictionaryStringStringFromStringConverter}
-{$DEFINE TGDictionaryItemArray := TDictionaryStringStringItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericDictionary.inc'}
@@ -67 +55 @@
 {$DEFINE TGDictionary := TDictionaryIntegerString}
 {$DEFINE TGDictionaryList := TDictionaryIntegerStringList}
-{$DEFINE TGDictionarySortCompare := TDictionaryIntegerStringSortCompare}
-{$DEFINE TGDictionaryToStringConverter := TDictionaryIntegerStringToStringConverter}
-{$DEFINE TGDictionaryFromStringConverter := TDictionaryIntegerStringFromStringConverter}
-{$DEFINE TGDictionaryItemArray := TDictionaryIntegerStringItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericDictionary.inc'}

trunk/Packages/TemplateGenerics/Specialized/SpecializedList.pas

@@ -15 +15 @@
 {$DEFINE TGListItem := Integer}
 {$DEFINE TGList := TListInteger}
-{$DEFINE TGListSortCompare := TListIntegerSortCompare}
-{$DEFINE TGListToStringConverter := TListIntegerToStringConverter}
-{$DEFINE TGListFromStringConverter := TListIntegerFromStringConverter}
-{$DEFINE TGListItemArray := TListIntegerItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericList.inc'}
@@ -26 +22 @@
 {$DEFINE TGListItem := Boolean}
 {$DEFINE TGList := TListBoolean}
-{$DEFINE TGListSortCompare := TListBooleanSortCompare}
-{$DEFINE TGListToStringConverter := TListBooleanToStringConverter}
-{$DEFINE TGListFromStringConverter := TListBooleanFromStringConverter}
-{$DEFINE TGListItemArray := TListBooleanItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericList.inc'}
@@ -37 +29 @@
 {$DEFINE TGListItem := SmallInt}
 {$DEFINE TGList := TListSmallInt}
-{$DEFINE TGListSortCompare := TListSmallIntSortCompare}
-{$DEFINE TGListToStringConverter := TListSmallIntToStringConverter}
-{$DEFINE TGListFromStringConverter := TListSmallIntFromStringConverter}
-{$DEFINE TGListItemArray := TListSmallIntItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericList.inc'}
@@ -48 +36 @@
 {$DEFINE TGListItem := Double}
 {$DEFINE TGList := TListDouble}
-{$DEFINE TGListSortCompare := TListDoubleSortCompare}
-{$DEFINE TGListToStringConverter := TListDoubleToStringConverter}
-{$DEFINE TGListFromStringConverter := TListDoubleFromStringConverter}
-{$DEFINE TGListItemArray := TListDoubleItemArray}
 {$DEFINE INTERFACE}
 {$INCLUDE '..\Generic\GenericList.inc'}
@@ -59 +43 @@
 {$DEFINE TGListItem := Pointer}
 {$DEFINE TGList := TListPointer}
-{$DEFINE TGListSortCompare := TListPointerSortCompare}
-{$DEFINE TGListToStringConverter := TListPointerToStringConverter}
-{$DEFINE TGListFromStringConverter := TListPointerFromStringConverter}
-{$DEFINE TGListItemArray := TListPointerItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericList.inc'}
@@ -70 +50 @@
 {$DEFINE TGListStringItem := string}
 {$DEFINE TGListString := TListString}
-{$DEFINE TGListStringSortCompare := TListStringSortCompare}
-{$DEFINE TGListStringToStringConverter := TListStringToStringConverter}
-{$DEFINE TGListStringFromStringConverter := TListStringFromStringConverter}
-{$DEFINE TGListItemArray := TListStringItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericListString.inc'}
@@ -81 +57 @@
 {$DEFINE TGListItem := Byte}
 {$DEFINE TGList := TListByteBase}
-{$DEFINE TGListSortCompare := TListByteSortCompare}
-{$DEFINE TGListToStringConverter := TListByteToStringConverter}
-{$DEFINE TGListFromStringConverter := TListByteFromStringConverter}
-{$DEFINE TGListItemArray := TListByteItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericList.inc'}
@@ -95 +67 @@
   procedure AddStream(Stream: TStream);
   procedure AddStreamPart(Stream: TStream; ItemCount: TGListIndex);
-  procedure WriteBuffer(var Buffer; Count: Integer);
-  procedure ReadBuffer(var Buffer; Count: Integer);
 end;
 
@@ -103 +73 @@
 {$DEFINE TGListItem := Char}
 {$DEFINE TGList := TListCharBase}
-{$DEFINE TGListSortCompare := TListSortCompareChar}
-{$DEFINE TGListToStringConverter := TListToStringConverterChar}
-{$DEFINE TGListFromStringConverter := TListFromStringConverterChar}
-{$DEFINE TGListItemArray := TListStringItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericList.inc'}
@@ -115 +81 @@
 {$DEFINE TGListObjectList := TListObjectList}
 {$DEFINE TGListObject := TListObject}
-{$DEFINE TGListObjectSortCompare := TListObjectSortCompare}
-{$DEFINE TGListObjectToStringConverter := TListObjectToStringConverter}
-{$DEFINE TGListObjectFromStringConverter := TListObjectFromStringConverter}
-{$DEFINE TGListItemArray := TListObjectItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericListObject.inc'}
@@ -138 +100 @@
 {$DEFINE TGListItem := TMethod}
 {$DEFINE TGList := TListMethodBase}
-{$DEFINE TGListSortCompare := TListMethodSortCompare}
-{$DEFINE TGListToStringConverter := TListMethodToStringConverter}
-{$DEFINE TGListFromStringConverter := TListMethodFromStringConverter}
-{$DEFINE TGListItemArray := TListMethodItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericList.inc'}
@@ -154 +112 @@
 {$DEFINE TGListItem := TNotifyEvent}
 {$DEFINE TGList := TListNotifyEventBase}
-{$DEFINE TGListSortCompare := TListNotifyEventSortCompare}
-{$DEFINE TGListToStringConverter := TListNotifyEventToStringConverter}
-{$DEFINE TGListFromStringConverter := TListNotifyEventFromStringConverter}
-{$DEFINE TGListItemArray := TListNotifyEventItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericList.inc'}
@@ -166 +120 @@
 end;
 
+
+TBaseEvent = procedure of object;
+
+// TListSimpleEventBase<Integer, TBaseEvent>
+{$DEFINE TGListIndex := Integer}
+{$DEFINE TGListItem := TBaseEvent}
+{$DEFINE TGList := TListSimpleEventBase}
+{$DEFINE INTERFACE}
+{$I 'GenericList.inc'}
+
+// TListSimpleEvent<Integer, TSimpleEvent>
+TListSimpleEvent = class(TListSimpleEventBase)
+  procedure CallAll;
+end;
+
+
+// TFileListByte<Integer, Byte>
+{$DEFINE TGFileListIndex := Integer}
+{$DEFINE TGFileListItem := Byte}
+{$DEFINE TGFileListList := TFileListListByte}
+{$DEFINE TGFileList := TFileListByte}
+{$DEFINE INTERFACE}
+{$I 'GenericFileList.inc'}
+
 function StrToStr(Value: string): string;
+
+
+
+
 
 implementation
@@ -177 +159 @@
 {$DEFINE TGListItem := Integer}
 {$DEFINE TGList := TListInteger}
-{$DEFINE TGListSortCompare := TListIntegerSortCompare}
-{$DEFINE TGListToStringConverter := TListIntegerToStringConverter}
-{$DEFINE TGListFromStringConverter := TListIntegerFromStringConverter}
-{$DEFINE TGListItemArray := TListIntegerItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericList.inc'}
@@ -188 +166 @@
 {$DEFINE TGListItem := SmallInt}
 {$DEFINE TGList := TListSmallInt}
-{$DEFINE TGListSortCompare := TListSmallIntSortCompare}
-{$DEFINE TGListToStringConverter := TListSmallIntToStringConverter}
-{$DEFINE TGListFromStringConverter := TListSmallIntFromStringConverter}
-{$DEFINE TGListItemArray := TListSmallIntItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericList.inc'}
@@ -199 +173 @@
 {$DEFINE TGListItem := Boolean}
 {$DEFINE TGList := TListBoolean}
-{$DEFINE TGListSortCompare := TListBooleanSortCompare}
-{$DEFINE TGListToStringConverter := TListBooleanToStringConverter}
-{$DEFINE TGListFromStringConverter := TListBooleanFromStringConverter}
-{$DEFINE TGListItemArray := TListBooleanItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericList.inc'}
@@ -210 +180 @@
 {$DEFINE TGListItem := Double}
 {$DEFINE TGList := TListDouble}
-{$DEFINE TGListSortCompare := TListDoubleSortCompare}
-{$DEFINE TGListToStringConverter := TListDoubleToStringConverter}
-{$DEFINE TGListFromStringConverter := TListDoubleFromStringConverter}
-{$DEFINE TGListItemArray := TListDoubleItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericList.inc'}
@@ -221 +187 @@
 {$DEFINE TGListItem := Pointer}
 {$DEFINE TGList := TListPointer}
-{$DEFINE TGListSortCompare := TListPointerSortCompare}
-{$DEFINE TGListToStringConverter := TListPointerToStringConverter}
-{$DEFINE TGListFromStringConverter := TListPointerFromStringConverter}
-{$DEFINE TGListItemArray := TListPointerItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericList.inc'}
@@ -232 +194 @@
 {$DEFINE TGListStringItem := string}
 {$DEFINE TGListString := TListString}
-{$DEFINE TGListStringSortCompare := TListStringSortCompare}
-{$DEFINE TGListStringToStringConverter := TListStringToStringConverter}
-{$DEFINE TGListStringFromStringConverter := TListStringFromStringConverter}
-{$DEFINE TGListItemArray := TListStringItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericListString.inc'}
@@ -243 +201 @@
 {$DEFINE TGListItem := Byte}
 {$DEFINE TGList := TListByteBase}
-{$DEFINE TGListSortCompare := TListByteSortCompare}
-{$DEFINE TGListToStringConverter := TListByteToStringConverter}
-{$DEFINE TGListFromStringConverter := TListByteFromStringConverter}
-{$DEFINE TGListItemArray := TListByteItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericList.inc'}
@@ -254 +208 @@
 {$DEFINE TGListItem := Char}
 {$DEFINE TGList := TListCharBase}
-{$DEFINE TGListSortCompare := TListSortCompareChar}
-{$DEFINE TGListToStringConverter := TListToStringConverterChar}
-{$DEFINE TGListFromStringConverter := TListFromStringConverterChar}
-{$DEFINE TGListItemArray := TListStringItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericList.inc'}
@@ -266 +216 @@
 {$DEFINE TGListObjectList := TListObjectList}
 {$DEFINE TGListObject := TListObject}
-{$DEFINE TGListObjectSortCompare := TListObjectSortCompare}
-{$DEFINE TGListObjectToStringConverter := TListObjectToStringConverter}
-{$DEFINE TGListObjectFromStringConverter := TListObjectFromStringConverter}
-{$DEFINE TGListItemArray := TListObjectItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericListObject.inc'}
@@ -277 +223 @@
 {$DEFINE TGListItem := TMethod}
 {$DEFINE TGList := TListMethodBase}
-{$DEFINE TGListSortCompare := TListMethodSortCompare}
-{$DEFINE TGListToStringConverter := TListMethodToStringConverter}
-{$DEFINE TGListFromStringConverter := TListMethodFromStringConverter}
-{$DEFINE TGListItemArray := TListMethodItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericList.inc'}
@@ -288 +230 @@
 {$DEFINE TGListItem := TNotifyEvent}
 {$DEFINE TGList := TListNotifyEventBase}
-{$DEFINE TGListSortCompare := TListNotifyEventSortCompare}
-{$DEFINE TGListToStringConverter := TListNotifyEventToStringConverter}
-{$DEFINE TGListFromStringConverter := TListNotifyEventFromStringConverter}
-{$DEFINE TGListItemArray := TListNotifyEventItemArray}
-{$DEFINE IMPLEMENTATION}
-{$I 'GenericList.inc'}
+{$DEFINE IMPLEMENTATION}
+{$I 'GenericList.inc'}
+
+// TListSimpleEventBase<Integer, TBaseEvent>
+{$DEFINE TGListIndex := Integer}
+{$DEFINE TGListItem := TBaseEvent}
+{$DEFINE TGList := TListSimpleEventBase}
+{$DEFINE IMPLEMENTATION}
+{$I 'GenericList.inc'}
+
+// TFileListByte<Integer, Byte>
+{$DEFINE TGFileListIndex := Integer}
+{$DEFINE TGFileListItem := Byte}
+{$DEFINE TGFileListList := TFileListListByte}
+{$DEFINE TGFileList := TFileListByte}
+{$DEFINE IMPLEMENTATION}
+{$I 'GenericFileList.inc'}
 
 
@@ -300 +253 @@
   Result := Value;
 end;
+
+{ TListSimpleEvent }
+
+procedure TListSimpleEvent.CallAll;
+var
+  I: TGListIndex;
+begin
+  I := 0;
+  while (I < Count) do begin
+    TBaseEvent(Items[I])();
+    I := I + 1;
+  end;
+end;
+
 
 { TListChar }
@@ -364 +331 @@
   I: TGListIndex;
 begin
-  I := 0;
-  while (I < Count) do begin
+  I := Count - 1;
+  while (I >= 0) do begin
     TNotifyEvent(Items[I])(Sender);
-    I := I + 1;
+    I := I - 1;
   end;
 end;
@@ -445 +412 @@
 end;
 
-procedure TListByte.WriteBuffer(var Buffer; Count: Integer);
-begin
-
-end;
-
-procedure TListByte.ReadBuffer(var Buffer; Count: Integer);
-begin
-
-end;
 
 end.

trunk/Packages/TemplateGenerics/Specialized/SpecializedMatrix.pas

@@ -18 +18 @@
 {$DEFINE TGMatrixRow := TMatrixIntegerRow}
 {$DEFINE TGMatrix := TMatrixInteger}
-{$DEFINE TGMatrixSortCompare := TMatrixIntegerSortCompare}
-{$DEFINE TGMatrixToStringConverter := TMatrixIntegerToStringConverter}
-{$DEFINE TGMatrixFromStringConverter := TMatrixIntegerFromStringConverter}
-{$DEFINE TGMatrixMerge := TMatrixIntegerMerge}
 {$DEFINE INTERFACE}
 {$I 'GenericMatrix.inc'}
@@ -32 +28 @@
 {$DEFINE TGMatrixRow := TMatrixByteRow}
 {$DEFINE TGMatrix := TMatrixByte}
-{$DEFINE TGMatrixSortCompare := TMatrixByteSortCompare}
-{$DEFINE TGMatrixToStringConverter := TMatrixByteToStringConverter}
-{$DEFINE TGMatrixFromStringConverter := TMatrixByteFromStringConverter}
-{$DEFINE TGMatrixMerge := TMatrixByteMerge}
 {$DEFINE INTERFACE}
 {$I 'GenericMatrix.inc'}
@@ -46 +38 @@
 {$DEFINE TGMatrixRow := TMatrixObjectRow}
 {$DEFINE TGMatrix := TMatrixObject}
-{$DEFINE TGMatrixSortCompare := TMatrixObjectSortCompare}
-{$DEFINE TGMatrixToStringConverter := TMatrixObjectToStringConverter}
-{$DEFINE TGMatrixFromStringConverter := TMatrixObjectFromStringConverter}
-{$DEFINE TGMatrixMerge := TMatrixStringMerge}
 {$DEFINE INTERFACE}
 {$I 'GenericMatrix.inc'}
@@ -65 +53 @@
 {$DEFINE TGMatrixRow := TMatrixIntegerRow}
 {$DEFINE TGMatrix := TMatrixInteger}
-{$DEFINE TGMatrixSortCompare := TMatrixIntegerSortCompare}
-{$DEFINE TGMatrixToStringConverter := TMatrixIntegerToStringConverter}
-{$DEFINE TGMatrixFromStringConverter := TMatrixIntegerFromStringConverter}
-{$DEFINE TGMatrixMerge := TMatrixIntegerMerge}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericMatrix.inc'}
@@ -79 +63 @@
 {$DEFINE TGMatrixRow := TMatrixByteRow}
 {$DEFINE TGMatrix := TMatrixByte}
-{$DEFINE TGMatrixSortCompare := TMatrixByteSortCompare}
-{$DEFINE TGMatrixToStringConverter := TMatrixByteToStringConverter}
-{$DEFINE TGMatrixFromStringConverter := TMatrixByteFromStringConverter}
-{$DEFINE TGMatrixMerge := TMatrixByteMerge}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericMatrix.inc'}
@@ -93 +73 @@
 {$DEFINE TGMatrixRow := TMatrixObjectRow}
 {$DEFINE TGMatrix := TMatrixObject}
-{$DEFINE TGMatrixSortCompare := TMatrixObjectSortCompare}
-{$DEFINE TGMatrixToStringConverter := TMatrixObjectToStringConverter}
-{$DEFINE TGMatrixFromStringConverter := TMatrixObjectFromStringConverter}
-{$DEFINE TGMatrixMerge := TMatrixStringMerge}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericMatrix.inc'}

trunk/Packages/TemplateGenerics/Specialized/SpecializedPoint.pas

@@ -1 +1 @@
 unit SpecializedPoint;
 
-{$mode objfpc}{$H+}
+{$mode Delphi}{$H+}
 
 interface

trunk/Packages/TemplateGenerics/Specialized/SpecializedQueue.pas

@@ -16 +16 @@
 {$DEFINE TGQueue := TQueueInteger}
 {$DEFINE TGQueueList := TQueueListInteger}
-{$DEFINE TGQueueSortCompare := TQueueSortCompareInteger}
-{$DEFINE TGQueueToStringConverter := TQueueToStringConverterInteger}
-{$DEFINE TGQueueFromStringConverter := TQueueFromStringConverterInteger}
-{$DEFINE TGQueueItemArray := TQueueIntegerItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericQueue.inc'}
@@ -28 +24 @@
 {$DEFINE TGQueue := TQueuePointer}
 {$DEFINE TGQueueList := TQueueListPointer}
-{$DEFINE TGQueueSortCompare := TQueueSortComparePointer}
-{$DEFINE TGQueueToStringConverter := TQueueToStringConverterPointer}
-{$DEFINE TGQueueFromStringConverter := TQueueFromStringConverterPointer}
-{$DEFINE TGQueueItemArray := TQueuePointerItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericQueue.inc'}
@@ -40 +32 @@
 {$DEFINE TGQueue := TQueueByte}
 {$DEFINE TGQueueList := TQueueListByte}
-{$DEFINE TGQueueSortCompare := TQueueSortCompareByte}
-{$DEFINE TGQueueToStringConverter := TQueueToStringConverterByte}
-{$DEFINE TGQueueFromStringConverter := TQueueFromStringConverterByte}
-{$DEFINE TGQueueItemArray := TQueueByteItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericQueue.inc'}
@@ -57 +45 @@
 {$DEFINE TGQueue := TQueueInteger}
 {$DEFINE TGQueueList := TQueueListInteger}
-{$DEFINE TGQueueSortCompare := TQueueSortCompareInteger}
-{$DEFINE TGQueueToStringConverter := TQueueToStringConverterInteger}
-{$DEFINE TGQueueFromStringConverter := TQueueFromStringConverterInteger}
-{$DEFINE TGQueueItemArray := TQueueIntegerItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I '..\Generic\GenericQueue.inc'}
@@ -69 +53 @@
 {$DEFINE TGQueue := TQueuePointer}
 {$DEFINE TGQueueList := TQueueListPointer}
-{$DEFINE TGQueueSortCompare := TQueueSortComparePointer}
-{$DEFINE TGQueueToStringConverter := TQueueToStringConverterPointer}
-{$DEFINE TGQueueFromStringConverter := TQueueFromStringConverterPointer}
-{$DEFINE TGQueueItemArray := TQueuePointerItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericQueue.inc'}
@@ -81 +61 @@
 {$DEFINE TGQueue := TQueueByte}
 {$DEFINE TGQueueList := TQueueListByte}
-{$DEFINE TGQueueSortCompare := TQueueSortCompareByte}
-{$DEFINE TGQueueToStringConverter := TQueueToStringConverterByte}
-{$DEFINE TGQueueFromStringConverter := TQueueFromStringConverterByte}
-{$DEFINE TGQueueItemArray := TQueueByteItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericQueue.inc'}

trunk/Packages/TemplateGenerics/Specialized/SpecializedSet.pas

@@ -16 +16 @@
 {$DEFINE TGSetList := TSetListInteger}
 {$DEFINE TGSet := TSetInteger}
-{$DEFINE TGSetSortCompare := TSetSortCompareInteger}
-{$DEFINE TGSetToStringConverter := TSetToStringConverterInteger}
-{$DEFINE TGSetFromStringConverter := TSetFromStringConverterInteger}
-{$DEFINE TGSetItemArray := TSetIntegerItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericSet.inc'}
@@ -28 +24 @@
 {$DEFINE TGSetList := TSetListPointer}
 {$DEFINE TGSet := TSetPointer}
-{$DEFINE TGSetSortCompare := TSetSortComparePointer}
-{$DEFINE TGSetToStringConverter := TSetToStringConverterPointer}
-{$DEFINE TGSetFromStringConverter := TSetFromStringConverterPointer}
-{$DEFINE TGSetItemArray := TSetPointerItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericSet.inc'}
@@ -45 +37 @@
 {$DEFINE TGSetList := TSetListInteger}
 {$DEFINE TGSet := TSetInteger}
-{$DEFINE TGSetSortCompare := TSetSortCompareInteger}
-{$DEFINE TGSetToStringConverter := TSetToStringConverterInteger}
-{$DEFINE TGSetFromStringConverter := TSetFromStringConverterInteger}
-{$DEFINE TGSetItemArray := TSetIntegerItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericSet.inc'}
@@ -57 +45 @@
 {$DEFINE TGSetList := TSetListPointer}
 {$DEFINE TGSet := TSetPointer}
-{$DEFINE TGSetSortCompare := TSetSortComparePointer}
-{$DEFINE TGSetToStringConverter := TSetToStringConverterPointer}
-{$DEFINE TGSetFromStringConverter := TSetFromStringConverterPointer}
-{$DEFINE TGSetItemArray := TSetPointerItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericSet.inc'}

trunk/Packages/TemplateGenerics/Specialized/SpecializedStack.pas

@@ -16 +16 @@
 {$DEFINE TGStackList := TListStackInteger}
 {$DEFINE TGStack := TStackInteger}
-{$DEFINE TGStackSortCompare := TStackSortCompareInteger}
-{$DEFINE TGStackToStringConverter := TStackToStringConverterInteger}
-{$DEFINE TGStackFromStringConverter := TStackFromStringConverterInteger}
-{$DEFINE TGStackItemArray := TStackIntegerItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericStack.inc'}
@@ -28 +24 @@
 {$DEFINE TGStackList := TListStackPointer}
 {$DEFINE TGStack := TStackPointer}
-{$DEFINE TGStackSortCompare := TStackSortComparePointer}
-{$DEFINE TGStackToStringConverter := TStackToStringConverterPointer}
-{$DEFINE TGStackFromStringConverter := TStackFromStringConverterPointer}
-{$DEFINE TGStackItemArray := TStackStringItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericStack.inc'}
@@ -46 +38 @@
 {$DEFINE TGStackList := TListStackInteger}
 {$DEFINE TGStack := TStackInteger}
-{$DEFINE TGStackSortCompare := TStackSortCompareInteger}
-{$DEFINE TGStackToStringConverter := TStackToStringConverterInteger}
-{$DEFINE TGStackFromStringConverter := TStackFromStringConverterInteger}
-{$DEFINE TGStackItemArray := TStackIntegerItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericStack.inc'}
@@ -58 +46 @@
 {$DEFINE TGStackList := TListStackPointer}
 {$DEFINE TGStack := TStackPointer}
-{$DEFINE TGStackSortCompare := TStackSortComparePointer}
-{$DEFINE TGStackToStringConverter := TStackToStringConverterPointer}
-{$DEFINE TGStackFromStringConverter := TStackFromStringConverterPointer}
-{$DEFINE TGStackItemArray := TStackStringItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericStack.inc'}

trunk/Packages/TemplateGenerics/Specialized/SpecializedStream.pas

@@ -18 +18 @@
 {$DEFINE TGStreamList := TListStreamInteger}
 {$DEFINE TGStream := TStreamInteger}
-{$DEFINE TGStreamSortCompare := TStreamIntegerSortCompare}
-{$DEFINE TGStreamToStringConverter := TStreamIntegerToStringConverter}
-{$DEFINE TGStreamFromStringConverter := TStreamIntegerFromStringConverter}
-{$DEFINE TGStreamItemArray := TStreamIntegerItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericStream.inc'}
@@ -30 +26 @@
 {$DEFINE TGStreamList := TListStreamByte}
 {$DEFINE TGStream := TBaseStreamByte}
-{$DEFINE TGStreamSortCompare := TStreamByteSortCompare}
-{$DEFINE TGStreamToStringConverter := TStreamByteToStringConverter}
-{$DEFINE TGStreamFromStringConverter := TStreamByteFromStringConverter}
-{$DEFINE TGStreamItemArray := TStreamByteItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericStream.inc'}
@@ -42 +34 @@
 {$DEFINE TGStreamList := TListStreamPointer}
 {$DEFINE TGStream := TStreamPointer}
-{$DEFINE TGStreamSortCompare := TStreamPointerSortCompare}
-{$DEFINE TGStreamToStringConverter := TStreamPointerToStringConverter}
-{$DEFINE TGStreamFromStringConverter := TStreamPointerFromStringConverter}
-{$DEFINE TGStreamItemArray := TStreamPointerItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericStream.inc'}
@@ -69 +57 @@
     procedure WriteStream(Stream: TBaseStreamByte; Count: Integer); override;
     function Read: Byte; override;
-    function ReadArray(Count: Integer): TStreamByteItemArray; override;
+    function ReadArray(Count: Integer): TItemArray; override;
     function ReadList(List: TListByte; Count: Integer): Integer;
     function ReadBuffer(var Buffer; Count: Integer): Integer; override;
@@ -134 +122 @@
 end;
 
-function TMemoryStreamByte.ReadArray(Count: Integer): TStreamByteItemArray;
+function TMemoryStreamByte.ReadArray(Count: Integer): TItemArray;
 begin
   Result := FList.GetArray(FPosition, Count);
@@ -211 +199 @@
 {$DEFINE TGStreamList := TListStreamInteger}
 {$DEFINE TGStream := TStreamInteger}
-{$DEFINE TGStreamSortCompare := TStreamIntegerSortCompare}
-{$DEFINE TGStreamToStringConverter := TStreamIntegerToStringConverter}
-{$DEFINE TGStreamFromStringConverter := TStreamIntegerFromStringConverter}
-{$DEFINE TGStreamItemArray := TStreamIntegerItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericStream.inc'}
@@ -223 +207 @@
 {$DEFINE TGStreamList := TListStreamByte}
 {$DEFINE TGStream := TBaseStreamByte}
-{$DEFINE TGStreamSortCompare := TStreamByteSortCompare}
-{$DEFINE TGStreamToStringConverter := TStreamByteToStringConverter}
-{$DEFINE TGStreamFromStringConverter := TStreamByteFromStringConverter}
-{$DEFINE TGStreamItemArray := TStreamByteItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericStream.inc'}
@@ -235 +215 @@
 {$DEFINE TGStreamList := TListStreamPointer}
 {$DEFINE TGStream := TStreamPointer}
-{$DEFINE TGStreamSortCompare := TStreamPointerSortCompare}
-{$DEFINE TGStreamToStringConverter := TStreamPointerToStringConverter}
-{$DEFINE TGStreamFromStringConverter := TStreamPointerFromStringConverter}
-{$DEFINE TGStreamItemArray := TStreamPointerItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericStream.inc'}

trunk/Packages/TemplateGenerics/Specialized/SpecializedTree.pas

@@ -16 +16 @@
 {$DEFINE TGTreeNode := TTreeNodeInteger}
 {$DEFINE TGTreeNodeList := TTreeNodeListInteger}
-{$DEFINE TGTreeSortCompare := TTreeSortCompareInteger}
-{$DEFINE TGTreeToStringConverter := TTreeToStringConverterInteger}
-{$DEFINE TGTreeFromStringConverter := TTreeFromStringConverterInteger}
-{$DEFINE TGTreeItemArray := TTreeIntegerItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericTree.inc'}
@@ -29 +25 @@
 {$DEFINE TGTreeNode := TTreeNodeString}
 {$DEFINE TGTreeNodeList := TTreeNodeListString}
-{$DEFINE TGTreeSortCompare := TTreeSortCompareString}
-{$DEFINE TGTreeToStringConverter := TTreeToStringConverterString}
-{$DEFINE TGTreeFromStringConverter := TTreeFromStringConverterString}
-{$DEFINE TGTreeItemArray := TTreeStringItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericTree.inc'}
@@ -42 +34 @@
 {$DEFINE TGTreeNode := TTreeNodePointer}
 {$DEFINE TGTreeNodeList := TTreeNodeListPointer}
-{$DEFINE TGTreeSortCompare := TTreeSortComparePointer}
-{$DEFINE TGTreeToStringConverter := TTreeToStringConverterPointer}
-{$DEFINE TGTreeFromStringConverter := TTreeFromStringConverterPointer}
-{$DEFINE TGTreeItemArray := TTreePointerItemArray}
 {$DEFINE INTERFACE}
 {$I 'GenericTree.inc'}
@@ -60 +48 @@
 {$DEFINE TGTreeNode := TTreeNodeInteger}
 {$DEFINE TGTreeNodeList := TTreeNodeListInteger}
-{$DEFINE TGTreeSortCompare := TTreeSortCompareInteger}
-{$DEFINE TGTreeToStringConverter := TTreeToStringConverterInteger}
-{$DEFINE TGTreeFromStringConverter := TTreeFromStringConverterInteger}
-{$DEFINE TGTreeItemArray := TTreeIntegerItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericTree.inc'}
@@ -73 +57 @@
 {$DEFINE TGTreeNode := TTreeNodeString}
 {$DEFINE TGTreeNodeList := TTreeNodeListString}
-{$DEFINE TGTreeSortCompare := TTreeSortCompareString}
-{$DEFINE TGTreeToStringConverter := TTreeToStringConverterString}
-{$DEFINE TGTreeFromStringConverter := TTreeFromStringConverterString}
-{$DEFINE TGTreeItemArray := TTreeStringItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericTree.inc'}
@@ -86 +66 @@
 {$DEFINE TGTreeNode := TTreeNodePointer}
 {$DEFINE TGTreeNodeList := TTreeNodeListPointer}
-{$DEFINE TGTreeSortCompare := TTreeSortComparePointer}
-{$DEFINE TGTreeToStringConverter := TTreeToStringConverterPointer}
-{$DEFINE TGTreeFromStringConverter := TTreeFromStringConverterPointer}
-{$DEFINE TGTreeItemArray := TTreePointerItemArray}
 {$DEFINE IMPLEMENTATION}
 {$I 'GenericTree.inc'}

trunk/Packages/TemplateGenerics/TemplateGenerics.lpk

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <CONFIG>
   <Package Version="4">
     <PathDelim Value="\"/>
     <Name Value="TemplateGenerics"/>
-    <Type Value="RunAndDesignTime"/>
     <AddToProjectUsesSection Value="True"/>
     <Author Value="Chronos (robie@centrum.cz)"/>
@@ -17 +16 @@
       <CodeGeneration>
         <Optimizations>
+          <VariablesInRegisters Value="True"/>
           <OptimizationLevel Value="3"/>
-          <VariablesInRegisters Value="True"/>
         </Optimizations>
       </CodeGeneration>
       <Other>
         <CompilerMessages>
-          <IgnoredMessages idx5024="True"/>
+          <UseMsgFile Value="True"/>
         </CompilerMessages>
+        <CompilerPath Value="$(CompPath)"/>
       </Other>
     </CompilerOptions>
     <Description Value="Generic classes implemented as templates."/>
     <Version Minor="4"/>
-    <Files Count="27">
+    <Files Count="28">
       <Item1>
         <Filename Value="ReadMe.txt"/>
@@ -47 +47 @@
       </Item4>
       <Item5>
-        <Filename Value="Generic\GenericQueue.inc"/>
-        <Type Value="Include"/>
+        <Filename Value="Generic\GenericFileList.inc"/>
       </Item5>
       <Item6>
-        <Filename Value="Generic\GenericRange.inc"/>
+        <Filename Value="Generic\GenericQueue.inc"/>
         <Type Value="Include"/>
       </Item6>
       <Item7>
-        <Filename Value="Generic\GenericSet.inc"/>
+        <Filename Value="Generic\GenericRange.inc"/>
         <Type Value="Include"/>
       </Item7>
       <Item8>
-        <Filename Value="Generic\GenericStack.inc"/>
+        <Filename Value="Generic\GenericSet.inc"/>
         <Type Value="Include"/>
       </Item8>
       <Item9>
-        <Filename Value="Generic\GenericTree.inc"/>
+        <Filename Value="Generic\GenericStack.inc"/>
         <Type Value="Include"/>
       </Item9>
       <Item10>
+        <Filename Value="Generic\GenericTree.inc"/>
+        <Type Value="Include"/>
+      </Item10>
+      <Item11>
         <Filename Value="Generic\GenericMatrix.inc"/>
         <UnitName Value="GenericMatrix"/>
-      </Item10>
-      <Item11>
+      </Item11>
+      <Item12>
         <Filename Value="Generic\GenericListString.inc"/>
         <UnitName Value="GenericListString"/>
-      </Item11>
-      <Item12>
+      </Item12>
+      <Item13>
         <Filename Value="Generic\GenericBitmap.inc"/>
         <UnitName Value="GenericBitmap"/>
-      </Item12>
-      <Item13>
+      </Item13>
+      <Item14>
         <Filename Value="Generic\GenericPoint.inc"/>
         <Type Value="Include"/>
-      </Item13>
-      <Item14>
+      </Item14>
+      <Item15>
         <Filename Value="Generic\GenericStream.inc"/>
         <UnitName Value="GenericStream"/>
-      </Item14>
-      <Item15>
+      </Item15>
+      <Item16>
         <Filename Value="Generic\GenericRectangle.inc"/>
         <UnitName Value="GenericRectangle"/>
-      </Item15>
-      <Item16>
+      </Item16>
+      <Item17>
         <Filename Value="Specialized\SpecializedList.pas"/>
         <UnitName Value="SpecializedList"/>
-      </Item16>
-      <Item17>
+      </Item17>
+      <Item18>
         <Filename Value="Specialized\SpecializedDictionary.pas"/>
         <UnitName Value="SpecializedDictionary"/>
-      </Item17>
-      <Item18>
+      </Item18>
+      <Item19>
         <Filename Value="Specialized\SpecializedStack.pas"/>
         <UnitName Value="SpecializedStack"/>
-      </Item18>
-      <Item19>
+      </Item19>
+      <Item20>
         <Filename Value="Specialized\SpecializedTree.pas"/>
         <UnitName Value="SpecializedTree"/>
-      </Item19>
-      <Item20>
+      </Item20>
+      <Item21>
         <Filename Value="Specialized\SpecializedQueue.pas"/>
         <UnitName Value="SpecializedQueue"/>
-      </Item20>
-      <Item21>
+      </Item21>
+      <Item22>
         <Filename Value="Specialized\SpecializedSet.pas"/>
         <UnitName Value="SpecializedSet"/>
-      </Item21>
-      <Item22>
+      </Item22>
+      <Item23>
         <Filename Value="Specialized\SpecializedPoint.pas"/>
         <UnitName Value="SpecializedPoint"/>
-      </Item22>
-      <Item23>
+      </Item23>
+      <Item24>
         <Filename Value="Specialized\SpecializedMatrix.pas"/>
         <UnitName Value="SpecializedMatrix"/>
-      </Item23>
-      <Item24>
+      </Item24>
+      <Item25>
         <Filename Value="Specialized\SpecializedBitmap.pas"/>
         <UnitName Value="SpecializedBitmap"/>
-      </Item24>
-      <Item25>
+      </Item25>
+      <Item26>
         <Filename Value="Specialized\SpecializedStream.pas"/>
         <UnitName Value="SpecializedStream"/>
-      </Item25>
-      <Item26>
+      </Item26>
+      <Item27>
         <Filename Value="Specialized\SpecializedRectangle.pas"/>
         <UnitName Value="SpecializedRectangle"/>
-      </Item26>
-      <Item27>
+      </Item27>
+      <Item28>
         <Filename Value="Additional\UBinarySerializer.pas"/>
         <UnitName Value="UBinarySerializer"/>
-      </Item27>
+      </Item28>
     </Files>
+    <Type Value="RunAndDesignTime"/>
     <RequiredPkgs Count="2">
       <Item1>

@@ -6 +6 @@
 compiled
 heaptrclog.trc
+LazFuck.dbg