Changeset 15 for trunk/Packages/Common

Timestamp:

Mar 22, 2018, 8:31:19 PM (7 years ago)

Author:

chronos

Message:

• Modified: Update Common and CollTranslator packages to fix build under Lazarus 1.8.
• Fixed: Some memory leaks.

Location:

trunk/Packages/Common

Files:

• Common.lpk (modified) (3 diffs)
• Common.pas (modified) (2 diffs)
• Languages/UJobProgressView.po (modified) (1 diff)
• UApplicationInfo.pas (modified) (4 diffs)
• UCommon.pas (modified) (7 diffs)
• UDebugLog.pas (modified) (1 diff)
• UFindFile.pas (modified) (3 diffs)
• UJobProgressView.lfm (modified) (1 diff)
• UJobProgressView.lrt (modified) (1 diff)
• UJobProgressView.pas (modified) (1 diff)
• UListViewSort.pas (modified) (16 diffs)
• UMemory.pas (modified) (2 diffs)
• UPersistentForm.pas (modified) (5 diffs)
• URegistry.pas (modified) (4 diffs)
• UScaleDPI.pas (modified) (8 diffs)
• UXMLUtils.pas (modified) (7 diffs)

trunk/Packages/Common/Common.lpk

@@ -4 +4 @@
     <PathDelim Value="\"/>
     <Name Value="Common"/>
+    <Type Value="RunAndDesignTime"/>
     <AddToProjectUsesSection Value="True"/>
     <Author Value="Chronos (robie@centrum.cz)"/>
@@ -10 +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="21">
       <Item1>
         <Filename Value="StopWatch.pas"/>
@@ -105 +129 @@
         <UnitName Value="UScaleDPI"/>
       </Item20>
+      <Item21>
+        <Filename Value="UTheme.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="UTheme"/>
+      </Item21>
     </Files>
     <i18n>
       <EnableI18N Value="True"/>
       <OutDir Value="Languages"/>
+      <EnableI18NForLFM Value="True"/>
     </i18n>
-    <Type Value="RunAndDesignTime"/>
-    <RequiredPkgs Count="2">
+    <RequiredPkgs Count="3">
       <Item1>
-        <PackageName Value="TemplateGenerics"/>
+        <PackageName Value="LCL"/>
       </Item1>
       <Item2>
+        <PackageName Value="TemplateGenerics"/>
+      </Item2>
+      <Item3>
         <PackageName Value="FCL"/>
         <MinVersion Major="1" Valid="True"/>
-      </Item2>
+      </Item3>
     </RequiredPkgs>
     <UsageOptions>

trunk/Packages/Common/Common.pas

@@ -8 +8 @@
 
 uses
-  StopWatch, UCommon, UDebugLog, UDelay, UPrefixMultiplier, UURI, UThreading, 
-  UMemory, UResetableThread, UPool, ULastOpenedList, URegistry, 
-  UJobProgressView, UXMLUtils, UApplicationInfo, USyncCounter, UListViewSort, 
-  UPersistentForm, UFindFile, UScaleDPI, LazarusPackageIntf;
+  StopWatch, UCommon, UDebugLog, UDelay, UPrefixMultiplier, UURI, UThreading,
+  UMemory, UResetableThread, UPool, ULastOpenedList, URegistry,
+  UJobProgressView, UXMLUtils, UApplicationInfo, USyncCounter, UListViewSort,
+  UPersistentForm, UFindFile, UScaleDPI, UTheme, LazarusPackageIntf;
 
 implementation
@@ -25 +25 @@
   RegisterUnit('UFindFile', @UFindFile.Register);
   RegisterUnit('UScaleDPI', @UScaleDPI.Register);
+  RegisterUnit('UTheme', @UTheme.Register);
 end;
 

trunk/Packages/Common/Languages/UJobProgressView.po

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

trunk/Packages/Common/UApplicationInfo.pas

@@ -14 +14 @@
   TApplicationInfo = class(TComponent)
   private
+    FDescription: string;
     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;
@@ -79 +82 @@
 end;
 
+function TApplicationInfo.GetRegistryContext: TRegistryContext;
+begin
+  Result := TRegistryContext.Create(RegistryRoot, RegistryKey);
+end;
+
 end.

trunk/Packages/Common/UCommon.pas

@@ -6 +6 @@
 
 uses
-  {$IFDEF Windows}Windows,{$ENDIF}
+  {$ifdef Windows}Windows,{$endif}
+  {$ifdef Linux}baseunix,{$endif}
   Classes, SysUtils, StrUtils, Dialogs, Process, LCLIntf,
   FileUtil; //, ShFolder, ShellAPI;
@@ -62 +63 @@
 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;
+function ComputerName: string;
+function OccurenceOfChar(What: Char; Where: string): Integer;
+function GetDirCount(Dir: string): Integer;
+function MergeArray(A, B: array of string): TArrayOfString;
+function LoadFileToStr(const FileName: TFileName): AnsiString;
 
 
@@ -105 +112 @@
   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
-    DeleteFileUTF8(Path + UTF8Encode(SearchRec.Name));
+    DeleteFile(Path + SearchRec.Name);
 
     Find := SysUtils.FindNext(SearchRec);
@@ -286 +293 @@
   L: LongWord;
 begin
-
   L := MAX_USERNAME_LENGTH + 2;
   SetLength(Result, L);
@@ -301 +307 @@
   end;
 end;
-
+{$endif}
+
+function ComputerName: string;
+{$ifdef mswindows}
+const
+ INFO_BUFFER_SIZE = 32767;
+var
+  Buffer : array[0..INFO_BUFFER_SIZE] of WideChar;
+  Ret : DWORD;
+begin
+  Ret := INFO_BUFFER_SIZE;
+  If (GetComputerNameW(@Buffer[0],Ret)) then begin
+    Result := UTF8Encode(WideString(Buffer));
+  end
+  else begin
+    Result := 'ERROR_NO_COMPUTERNAME_RETURNED';
+  end;
+end;
+{$endif}
+{$ifdef unix}
+var
+  Name: UtsName;
+begin
+  fpuname(Name);
+  Result := Name.Nodename;
+end;
+{$endif}
+
+{$ifdef windows}
 function LoggedOnUserNameEx(Format: TUserNameFormat): string;
 const
@@ -395 +429 @@
 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;
@@ -416 +453 @@
 
 procedure OpenWebPage(URL: string);
-var
-  Process: TProcess;
-  Browser, Params: string;
 begin
   OpenURL(URL);
-  {try
-    Process := TProcess.Create(nil);
-    Browser := '';
-    //FindDefaultBrowser(Browser, Params);
-    //Process.Executable := Browser;
-    //Process.Parameters.Add(Format(Params, [ApplicationInfo.HomePage]);
-    Process.CommandLine := 'cmd.exe /c start ' + URL;
-    Process.Options := [poNoConsole];
-    Process.Execute;
+end;
+
+procedure OpenFileInShell(FileName: string);
+begin
+  ExecuteProgram('cmd.exe', ['/c', 'start', FileName]);
+end;
+
+function RemoveQuotes(Text: string): string;
+begin
+  Result := Text;
+  if (Pos('"', Text) = 1) and (Text[Length(Text)] = '"') then
+    Result := Copy(Text, 2, Length(Text) - 2);
+end;
+
+function OccurenceOfChar(What: Char; Where: string): Integer;
+var
+  I: Integer;
+begin
+  Result := 0;
+  for I := 1 to Length(Where) do
+    if Where[I] = What then Inc(Result);
+end;
+
+function GetDirCount(Dir: string): Integer;
+begin
+  Result := OccurenceOfChar(DirectorySeparator, Dir);
+  if Copy(Dir, Length(Dir), 1) = DirectorySeparator then
+    Dec(Result);
+end;
+
+function MergeArray(A, B: array of string): TArrayOfString;
+var
+  I: Integer;
+begin
+  SetLength(Result, Length(A) + Length(B));
+  for I := 0 to Length(A) - 1 do
+    Result[I] := A[I];
+  for I := 0 to Length(B) - 1 do
+    Result[Length(A) + I] := B[I];
+end;
+
+function LoadFileToStr(const FileName: TFileName): AnsiString;
+var
+  FileStream: TFileStream;
+  Read: Integer;
+begin
+  Result := '';
+  FileStream := TFileStream.Create(FileName, fmOpenRead);
+  try
+    if FileStream.Size > 0 then begin
+      SetLength(Result, FileStream.Size);
+      Read := FileStream.Read(Pointer(Result)^, FileStream.Size);
+      SetLength(Result, Read);
+    end;
   finally
-    Process.Free;
-  end;}
-end;
-
-procedure OpenFileInShell(FileName: string);
-begin
-  ExecuteProgram('cmd.exe /c start "' + FileName + '"');
-end;
+    FileStream.Free;
+  end;
+end;
+
+
 
 initialization

trunk/Packages/Common/UDebugLog.pas

@@ -103 +103 @@
   try
     if ExtractFileDir(FileName) <> '' then
-      ForceDirectoriesUTF8(ExtractFileDir(FileName));
-    if FileExistsUTF8(FileName) then LogFile := TFileStream.Create(UTF8Decode(FileName), fmOpenWrite)
+      ForceDirectories(ExtractFileDir(FileName));
+    if FileExists(FileName) then LogFile := TFileStream.Create(UTF8Decode(FileName), fmOpenWrite)
       else LogFile := TFileStream.Create(UTF8Decode(FileName), fmCreate);
     LogFile.Seek(0, soFromEnd);

trunk/Packages/Common/UFindFile.pas

@@ -55 +55 @@
   end;
 
+const
+{$IFDEF WINDOWS}
+  FilterAll = '*.*';
+{$ENDIF}
+{$IFDEF LINUX}
+  FilterAll = '*';
+{$ENDIF}
+
 procedure Register;
 
@@ -71 +79 @@
   inherited Create(AOwner);
   Path := IncludeTrailingBackslash(UTF8Encode(GetCurrentDir));
-  FileMask := '*.*';
+  FileMask := FilterAll;
   FileAttr := [ffaAnyFile];
   s := TStringList.Create;
@@ -127 +135 @@
   If not InSubFolders then Exit;
 
-  if SysUtils.FindFirst(UTF8Decode(inPath + '*.*'), faDirectory, Rec) = 0 then
+  if SysUtils.FindFirst(UTF8Decode(inPath + FilterAll), faDirectory, Rec) = 0 then
   try
     repeat

trunk/Packages/Common/UJobProgressView.lfm

@@ -14 +14 @@
   OnDestroy = FormDestroy
   Position = poScreenCenter
-  LCLVersion = '1.1'
+  LCLVersion = '1.6.0.4'
   object PanelOperationsTitle: TPanel
     Left = 0

trunk/Packages/Common/UJobProgressView.lrt

@@ -1 @@
-TJOBPROGRESSVIEW.LABELOPERATION.CAPTION=Operations:
-TJOBPROGRESSVIEW.LABELESTIMATEDTIMEPART.CAPTION=Estimated time:
-TJOBPROGRESSVIEW.LABELESTIMATEDTIMETOTAL.CAPTION=Total estimated time:
+TFORMJOBPROGRESSVIEW.LABELOPERATION.CAPTION=Operations:
+TFORMJOBPROGRESSVIEW.LABELESTIMATEDTIMEPART.CAPTION=Estimated time:
+TFORMJOBPROGRESSVIEW.LABELESTIMATEDTIMETOTAL.CAPTION=Total estimated time:

trunk/Packages/Common/UJobProgressView.pas

@@ -166 +166 @@
   STotalEstimatedTime = 'Total estimated time: %s';
   SFinished = 'Finished';
+  SOperations = 'Operations';
 
 procedure Register;

trunk/Packages/Common/UListViewSort.pas

@@ -9 +9 @@
 uses
   {$IFDEF Windows}Windows, CommCtrl, {$ENDIF}Classes, Graphics, ComCtrls, SysUtils,
-  Controls, DateUtils, Dialogs, SpecializedList, Forms, Grids, StdCtrls, ExtCtrls;
+  Controls, DateUtils, Dialogs, SpecializedList, Forms, Grids, StdCtrls, ExtCtrls,
+  LclIntf, LMessages, LclType, LResources;
 
 type
@@ -18 +19 @@
   TCompareEvent = function (Item1, Item2: TObject): Integer of object;
   TListFilterEvent = procedure (ListViewSort: TListViewSort) of object;
+
+  { TListViewSort }
 
   TListViewSort = class(TComponent)
@@ -28 +31 @@
     FColumn: Integer;
     FOrder: TSortOrder;
+    FOldListViewWindowProc: TWndMethod;
+    FOnColumnWidthChanged: TNotifyEvent;
+    procedure DoColumnBeginResize(const AColIndex: Integer);
+    procedure DoColumnResized(const AColIndex: Integer);
+    procedure DoColumnResizing(const AColIndex, AWidth: Integer);
     procedure SetListView(const Value: TListView);
     procedure ColumnClick(Sender: TObject; Column: TListColumn);
@@ -40 +48 @@
     procedure SetColumn(const Value: Integer);
     procedure SetOrder(const Value: TSortOrder);
+    {$IFDEF WINDOWS}
+    procedure NewListViewWindowProc(var AMsg: TMessage);
+    {$ENDIF}
   public
     List: TListObject;
@@ -58 +69 @@
     property OnCustomDraw: TLVCustomDrawItemEvent read FOnCustomDraw
       write FOnCustomDraw;
+    property OnColumnWidthChanged: TNotifyEvent read FOnColumnWidthChanged
+      write FOnColumnWidthChanged;
     property Column: Integer read FColumn write SetColumn;
     property Order: TSortOrder read FOrder write SetOrder;
@@ -68 +81 @@
     FOnChange: TNotifyEvent;
     FStringGrid1: TStringGrid;
-    procedure DoOnKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure GridDoOnKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure GridDoOnResize(Sender: TObject);
   public
     constructor Create(AOwner: TComponent); override;
     procedure UpdateFromListView(ListView: TListView);
     function TextEntered: Boolean;
+    function TextEnteredCount: Integer;
+    function TextEnteredColumn(Index: Integer): Boolean;
     function GetColValue(Index: Integer): string;
     property StringGrid: TStringGrid read FStringGrid1 write FStringGrid1;
@@ -79 +95 @@
     property Align;
     property Anchors;
+    property BorderSpacing;
   end;
 
@@ -93 +110 @@
 { TListViewFilter }
 
-procedure TListViewFilter.DoOnKeyUp(Sender: TObject; var Key: Word;
+procedure TListViewFilter.GridDoOnKeyUp(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
   if Assigned(FOnChange) then
     FOnChange(Self);
+end;
+
+procedure TListViewFilter.GridDoOnResize(Sender: TObject);
+begin
+  FStringGrid1.DefaultRowHeight := FStringGrid1.Height;
 end;
 
@@ -113 +135 @@
   FStringGrid1.Options := [goFixedHorzLine, goFixedVertLine, goVertLine,
     goHorzLine, goRangeSelect, goEditing, goAlwaysShowEditor, goSmoothScroll];
-  FStringGrid1.OnKeyUp := DoOnKeyUp;
+  FStringGrid1.OnKeyUp := GridDoOnKeyUp;
+  FStringGrid1.OnResize := GridDoOnResize;
 end;
 
@@ -119 +142 @@
 var
   I: Integer;
-  NewColumn: TGridColumn;
 begin
   with FStringGrid1 do begin
-    Columns.Clear;
+    Options := Options - [goEditing, goAlwaysShowEditor];
+    //Columns.Clear;
     while Columns.Count > ListView.Columns.Count do Columns.Delete(Columns.Count - 1);
-    while Columns.Count < ListView.Columns.Count do NewColumn := Columns.Add;
+    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;
     end;
+    Options := Options + [goEditing, goAlwaysShowEditor];
   end;
 end;
 
 function TListViewFilter.TextEntered: Boolean;
+begin
+  Result := TextEnteredCount > 0;
+end;
+
+function TListViewFilter.TextEnteredCount: Integer;
 var
   I: Integer;
 begin
-  Result := False;
+  Result := 0;
   for I := 0 to FStringGrid1.ColCount - 1 do begin
     if FStringGrid1.Cells[I, 0] <> '' then begin
-      Result := True;
-      Break;
+      Inc(Result);
     end;
   end;
+end;
+
+function TListViewFilter.TextEnteredColumn(Index: Integer): Boolean;
+begin
+  Result := FStringGrid1.Cells[Index, 0] <> '';
 end;
 
@@ -153 +186 @@
 { TListViewSort }
 
+{$IFDEF WINDOWS}
+procedure TListViewSort.NewListViewWindowProc(var AMsg: TMessage);
+var
+  vColWidth: Integer;
+  vMsgNotify: TLMNotify absolute AMsg;
+  Code: Integer;
+begin
+  // call the old WindowProc of ListView
+  FOldListViewWindowProc(AMsg);
+
+  // Currently we care only with WM_NOTIFY message
+  if AMsg.Msg = WM_NOTIFY then
+  begin
+    Code := NMHDR(PHDNotify(vMsgNotify.NMHdr)^.Hdr).Code;
+    case Code of
+      HDN_ENDTRACKA, HDN_ENDTRACKW:
+        DoColumnResized(PHDNotify(vMsgNotify.NMHdr)^.Item);
+
+      HDN_BEGINTRACKA, HDN_BEGINTRACKW:
+        DoColumnBeginResize(PHDNotify(vMsgNotify.NMHdr)^.Item);
+
+      HDN_TRACKA, HDN_TRACKW:
+        begin
+          vColWidth := -1;
+          if (PHDNotify(vMsgNotify.NMHdr)^.PItem<>nil)
+             and (PHDNotify(vMsgNotify.NMHdr)^.PItem^.Mask and HDI_WIDTH <> 0)
+          then
+            vColWidth := PHDNotify(vMsgNotify.NMHdr)^.PItem^.cxy;
+
+          DoColumnResizing(PHDNotify(vMsgNotify.NMHdr)^.Item, vColWidth);
+        end;
+    end;
+  end;
+end;
+{$ENDIF}
+
+procedure TListViewSort.DoColumnBeginResize(const AColIndex: Integer);
+begin
+end;
+
+procedure TListViewSort.DoColumnResizing(const AColIndex, AWidth: Integer);
+begin
+end;
+
+procedure TListViewSort.DoColumnResized(const AColIndex: Integer);
+begin
+  if Assigned(FOnColumnWidthChanged) then
+    FOnColumnWidthChanged(Self);
+end;
 
 procedure TListViewSort.ColumnClick(Sender: TObject; Column: TListColumn);
@@ -179 +261 @@
 procedure TListViewSort.SetListView(const Value: TListView);
 begin
+  if FListView = Value then Exit;
+  if Assigned(FListView) then
+    ListView.WindowProc := FOldListViewWindowProc;
   FListView := Value;
   FListView.OnColumnClick := ColumnClick;
   FListView.OnCustomDrawItem := ListViewCustomDrawItem;
   FListView.OnClick := ListViewClick;
+  FOldListViewWindowProc := FListView.WindowProc;
+  {$IFDEF WINDOWS}
+  FListView.WindowProc := NewListViewWindowProc;
+  {$ENDIF}
 end;
 
@@ -199 +288 @@
   if ListView.Items.Count <> List.Count then
     ListView.Items.Count := List.Count;
-  if Assigned(FOnCompareItem) then Sort(FOnCompareItem);
+  if Assigned(FOnCompareItem) and (Order <> soNone) then Sort(FOnCompareItem);
   //ListView.Items[-1]; // Workaround for not show first row if selected
   ListView.Refresh;
@@ -266 +355 @@
   TP1: TPoint;
   XBias, YBias: Integer;
-  OldColor: TColor;
+  PenColor: TColor;
+  BrushColor: TColor;
   BiasTop, BiasLeft: Integer;
   Rect1: TRect;
@@ -278 +368 @@
   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
@@ -321 +412 @@
   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;
 

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

@@ -3 +3 @@
 {$mode delphi}
 
-// Date: 2010-06-01
+// Date: 2015-04-18
 
 interface
 
 uses
-  Classes, SysUtils, Forms, URegistry, LCLIntf, Registry;
+  Classes, SysUtils, Forms, URegistry, LCLIntf, Registry, Controls, ComCtrls;
 
 type
@@ -19 +19 @@
     FMinVisiblePart: Integer;
     FRegistryContext: TRegistryContext;
+    procedure LoadControl(Control: TControl);
+    procedure SaveControl(Control: TControl);
   public
+    FormNormalSize: TRect;
+    FormRestoredSize: TRect;
+    FormWindowState: TWindowState;
+    Form: TForm;
+    procedure LoadFromRegistry(RegistryContext: TRegistryContext);
+    procedure SaveToRegistry(RegistryContext: TRegistryContext);
     function CheckEntireVisible(Rect: TRect): TRect;
     function CheckPartVisible(Rect: TRect; Part: Integer): TRect;
@@ -44 +52 @@
 { TPersistentForm }
 
+procedure TPersistentForm.LoadControl(Control: TControl);
+var
+  I: Integer;
+  WinControl: TWinControl;
+  Count: Integer;
+begin
+  if Control is TListView then begin
+    with Form, TRegistryEx.Create do
+    try
+      RootKey := RegistryContext.RootKey;
+      OpenKey(RegistryContext.Key + '\Forms\' + Form.Name + '\' + Control.Name, True);
+      for I := 0 to TListView(Control).Columns.Count - 1 do begin
+        if ValueExists('ColWidth' + IntToStr(I)) then
+          TListView(Control).Columns[I].Width := ReadInteger('ColWidth' + IntToStr(I));
+      end;
+    finally
+      Free;
+    end;
+  end;
+
+  if Control is TWinControl then begin
+    WinControl := TWinControl(Control);
+    if WinControl.ControlCount > 0 then begin
+      for I := 0 to WinControl.ControlCount - 1 do begin
+        if WinControl.Controls[I] is TControl then begin
+          LoadControl(WinControl.Controls[I]);
+        end;
+      end;
+    end;
+  end;
+end;
+
+procedure TPersistentForm.SaveControl(Control: TControl);
+var
+  I: Integer;
+  WinControl: TWinControl;
+begin
+  if Control is TListView then begin
+    with Form, TRegistryEx.Create do
+    try
+      RootKey := RegistryContext.RootKey;
+      OpenKey(RegistryContext.Key + '\Forms\' + Form.Name + '\' + Control.Name, True);
+      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 TWinControl then begin
+      WinControl := TWinControl(Control);
+      if WinControl.ControlCount > 0 then begin
+        for I := 0 to WinControl.ControlCount - 1 do begin
+          if WinControl.Controls[I] is TControl then begin
+            SaveControl(WinControl.Controls[I]);
+          end;
+        end;
+      end;
+    end;
+end;
+
+procedure TPersistentForm.LoadFromRegistry(RegistryContext: TRegistryContext);
+begin
+  with TRegistryEx.Create do
+  try
+    RootKey := RegistryContext.RootKey;
+    OpenKey(RegistryContext.Key + '\Forms\' + Form.Name, True);
+    // Normal size
+    FormNormalSize.Left := ReadIntegerWithDefault('NormalLeft', FormNormalSize.Left);
+    FormNormalSize.Top := ReadIntegerWithDefault('NormalTop', FormNormalSize.Top);
+    FormNormalSize.Right := ReadIntegerWithDefault('NormalWidth', FormNormalSize.Right - FormNormalSize.Left)
+      + FormNormalSize.Left;
+    FormNormalSize.Bottom := ReadIntegerWithDefault('NormalHeight', FormNormalSize.Bottom - FormNormalSize.Top)
+      + FormNormalSize.Top;
+    // Restored size
+    FormRestoredSize.Left := ReadIntegerWithDefault('RestoredLeft', FormRestoredSize.Left);
+    FormRestoredSize.Top := ReadIntegerWithDefault('RestoredTop', FormRestoredSize.Top);
+    FormRestoredSize.Right := ReadIntegerWithDefault('RestoredWidth', FormRestoredSize.Right - FormRestoredSize.Left)
+      + FormRestoredSize.Left;
+    FormRestoredSize.Bottom := ReadIntegerWithDefault('RestoredHeight', FormRestoredSize.Bottom - FormRestoredSize.Top)
+      + FormRestoredSize.Top;
+    // Other state
+    FormWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(wsNormal)));
+  finally
+    Free;
+  end;
+end;
+
+procedure TPersistentForm.SaveToRegistry(RegistryContext: TRegistryContext);
+begin
+  with Form, TRegistryEx.Create do
+  try
+    RootKey := RegistryContext.RootKey;
+    OpenKey(RegistryContext.Key + '\Forms\' + Form.Name, True);
+    // Normal state
+    WriteInteger('NormalWidth', FormNormalSize.Right - FormNormalSize.Left);
+    WriteInteger('NormalHeight', FormNormalSize.Bottom - FormNormalSize.Top);
+    WriteInteger('NormalTop', FormNormalSize.Top);
+    WriteInteger('NormalLeft', FormNormalSize.Left);
+    // Restored state
+    WriteInteger('RestoredWidth', FormRestoredSize.Right - FormRestoredSize.Left);
+    WriteInteger('RestoredHeight', FormRestoredSize.Bottom - FormRestoredSize.Top);
+    WriteInteger('RestoredTop', FormRestoredSize.Top);
+    WriteInteger('RestoredLeft', FormRestoredSize.Left);
+    // Other state
+    WriteInteger('WindowState', Integer(FormWindowState));
+  finally
+    Free;
+  end;
+end;
+
 function TPersistentForm.CheckEntireVisible(Rect: TRect): TRect;
 var
@@ -98 +218 @@
 procedure TPersistentForm.Load(Form: TForm; DefaultMaximized: Boolean = False);
 var
-  Normal: TRect;
-  Restored: TRect;
   LoadDefaults: Boolean;
 begin
-  with TRegistryEx.Create do
-    try
-      RootKey := RegistryContext.RootKey;
-      OpenKey(RegistryContext.Key + '\Forms\' + Form.Name, True);
-
-      //RestoredWindowState := TWindowState(ReadIntegerWithDefault('WindowState', Integer(Form.WindowState)));
-      //if RestoredWindowState = wsMinimized then
-      //  RestoredWindowState := wsNormal;
-      //Form.WindowState := RestoredWindowState;
-      LoadDefaults := not ValueExists('NormalLeft');
-      Normal := Bounds(ReadIntegerWithDefault('NormalLeft', (Screen.Width - Form.Width) div 2),
-        ReadIntegerWithDefault('NormalTop', (Screen.Height - Form.Height) div 2),
-        ReadIntegerWithDefault('NormalWidth', Form.Width),
-        ReadIntegerWithDefault('NormalHeight', Form.Height));
-      Restored := Bounds(ReadIntegerWithDefault('RestoredLeft', (Screen.Width - Form.Width) div 2),
-        ReadIntegerWithDefault('RestoredTop', (Screen.Height - Form.Height) div 2),
-        ReadIntegerWithDefault('RestoredWidth', Form.Width),
-        ReadIntegerWithDefault('RestoredHeight', Form.Height));
-
-      if not EqualRect(Normal, Restored) or
-        (LoadDefaults and DefaultMaximized) then begin
-        // Restore to maximized state
-        Form.WindowState := wsNormal;
-        if not EqualRect(Restored, Form.BoundsRect) then
-          Form.BoundsRect := Restored;
-        Form.WindowState := wsMaximized;
-      end else begin
-        // Restore to normal state
-        Form.WindowState := wsNormal;
-        if FEntireVisible then Normal := CheckEntireVisible(Normal)
-          else if FMinVisiblePart > 0 then
-        Normal := CheckPartVisible(Normal, FMinVisiblePart);
-        if not EqualRect(Normal, Form.BoundsRect) then
-          Form.BoundsRect := Normal;
-      end;
-
-      //if ReadBoolWithDefault('Visible', False) then Form.Show;
-    finally
-      Free;
-    end;
+  Self.Form := Form;
+  // Set default
+  FormNormalSize := Bounds((Screen.Width - Form.Width) div 2,
+    (Screen.Height - Form.Height) div 2, Form.Width, Form.Height);
+  FormRestoredSize := Bounds((Screen.Width - Form.Width) div 2,
+    (Screen.Height - Form.Height) div 2, Form.Width, Form.Height);
+
+  LoadFromRegistry(RegistryContext);
+
+  if not EqualRect(FormNormalSize, FormRestoredSize) or
+    (LoadDefaults and DefaultMaximized) then begin
+    // Restore to maximized state
+    Form.WindowState := wsNormal;
+    if not EqualRect(FormRestoredSize, Form.BoundsRect) then
+      Form.BoundsRect := FormRestoredSize;
+    Form.WindowState := wsMaximized;
+  end else begin
+    // Restore to normal state
+    Form.WindowState := wsNormal;
+    if FEntireVisible then FormNormalSize := CheckEntireVisible(FormNormalSize)
+      else if FMinVisiblePart > 0 then
+    FormNormalSize := CheckPartVisible(FormNormalSize, FMinVisiblePart);
+    if not EqualRect(FormNormalSize, Form.BoundsRect) then
+      Form.BoundsRect := FormNormalSize;
+  end;
+  LoadControl(Form);
 end;
 
 procedure TPersistentForm.Save(Form: TForm);
 begin
-  with Form, TRegistryEx.Create do
-    try
-      RootKey := RegistryContext.RootKey;
-      OpenKey(RegistryContext.Key + '\Forms\' + Form.Name, True);
-      WriteInteger('NormalWidth', Form.Width);
-      WriteInteger('NormalHeight', Form.Height);
-      WriteInteger('NormalTop', Form.Top);
-      WriteInteger('NormalLeft', Form.Left);
-      WriteInteger('RestoredWidth', Form.RestoredWidth);
-      WriteInteger('RestoredHeight', Form.RestoredHeight);
-      WriteInteger('RestoredTop', Form.RestoredTop);
-      WriteInteger('RestoredLeft', Form.RestoredLeft);
-      //WriteInteger('WindowState', Integer(Form.WindowState));
-      //WriteBool('Visible', Form.Visible);
-    finally
-      Free;
-    end;
+  Self.Form := Form;
+  FormNormalSize := Bounds(Form.Left, Form.Top, Form.Width, Form.Height);
+  FormRestoredSize := Bounds(Form.RestoredLeft, Form.RestoredTop, Form.RestoredWidth,
+    Form.RestoredHeight);
+  FormWindowState := Form.WindowState;
+  SaveToRegistry(RegistryContext);
+  SaveControl(Form);
 end;
 
@@ -168 +262 @@
 begin
   inherited;
+  if AOwner is TForm then Form := TForm(AOwner)
+    else Form := nil;
   FMinVisiblePart := 50;
   FRegistryContext.RootKey := HKEY_CURRENT_USER;

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/UScaleDPI.pas

@@ -17 +17 @@
   TControlDimension = class
     BoundsRect: TRect;
-    AuxSize: TPoint;
     FontHeight: Integer;
     Controls: TObjectList; // TList<TControlDimension>
+    // Class specifics
+    ButtonSize: TPoint; // TToolBar
+    CoolBandWidth: Integer;
+    ConstraintsMin: TPoint; // TForm
+    ConstraintsMax: TPoint; // TForm
     constructor Create;
     destructor Destroy; override;
@@ -74 +78 @@
 destructor TControlDimension.Destroy;
 begin
-  Controls.Free;
+  FreeAndNil(Controls);
   inherited Destroy;
 end;
@@ -113 +117 @@
   Dimensions.Controls.Clear;
   if Control is TToolBar then
-    Dimensions.AuxSize := Point(TToolBar(Control).ButtonWidth, TToolBar(Control).ButtonHeight);
-
+    Dimensions.ButtonSize := Point(TToolBar(Control).ButtonWidth, TToolBar(Control).ButtonHeight);
+  if Control is TForm then begin
+    Dimensions.ConstraintsMin := Point(TForm(Control).Constraints.MinWidth,
+      TForm(Control).Constraints.MinHeight);
+    Dimensions.ConstraintsMax := Point(TForm(Control).Constraints.MaxWidth,
+      TForm(Control).Constraints.MaxHeight);
+  end;
   if Control is TWinControl then
   for I := 0 to TWinControl(Control).ControlCount - 1 do begin
-    if TWinControl(Control).Controls[I] is TControl then begin
+    if TWinControl(Control).Controls[I] is TControl then
+    // Do not scale docked forms twice
+    if not (TWinControl(Control).Controls[I] is TForm) then begin
       NewControl := TControlDimension.Create;
       Dimensions.Controls.Add(NewControl);
@@ -133 +144 @@
   Control.Font.Height := Dimensions.FontHeight;
   if Control is TToolBar then begin
-    TToolBar(Control).ButtonWidth := Dimensions.AuxSize.X;
-    TToolBar(Control).ButtonHeight := Dimensions.AuxSize.Y;
+    TToolBar(Control).ButtonWidth := Dimensions.ButtonSize.X;
+    TToolBar(Control).ButtonHeight := Dimensions.ButtonSize.Y;
+  end;
+  if Control is TForm then begin
+    TForm(Control).Constraints.MinWidth := Dimensions.ConstraintsMin.X;
+    TForm(Control).Constraints.MinHeight := Dimensions.ConstraintsMin.Y;
+    TForm(Control).Constraints.MaxWidth := Dimensions.ConstraintsMax.X;
+    TForm(Control).Constraints.MaxHeight := Dimensions.ConstraintsMax.Y;
   end;
   if Control is TWinControl then
   for I := 0 to TWinControl(Control).ControlCount - 1 do begin
-    if TWinControl(Control).Controls[I] is TControl then begin
+    if TWinControl(Control).Controls[I] is TControl then
+    // Do not scale docked forms twice
+    if not (TWinControl(Control).Controls[I] is TForm) then begin
       RestoreDimensions(TWinControl(Control).Controls[I], TControlDimension(Dimensions.Controls[I]));
     end;
@@ -152 +171 @@
   Control.Font.Height := ScaleY(Dimensions.FontHeight, DesignDPI.Y);
   if Control is TToolBar then begin
-    TToolBar(Control).ButtonWidth := ScaleX(Dimensions.AuxSize.X, DesignDPI.X);
-    TToolBar(Control).ButtonHeight := ScaleY(Dimensions.AuxSize.Y, DesignDPI.Y);
+    TToolBar(Control).ButtonWidth := ScaleX(Dimensions.ButtonSize.X, DesignDPI.X);
+    TToolBar(Control).ButtonHeight := ScaleY(Dimensions.ButtonSize.Y, DesignDPI.Y);
+  end;
+  if Control is TCoolBar then begin
+    with TCoolBar(Control) do
+    for I := 0 to Bands.Count - 1 do
+    with TCoolBand(Bands[I]) do begin
+      MinWidth := ScaleX(Dimensions.ButtonSize.X, DesignDPI.X);
+      MinHeight := ScaleY(Dimensions.ButtonSize.Y, DesignDPI.Y);
+      //Width := ScaleX(Dimensions.BoundsRect.Left -
+    end;
+  end;
+  if Control is TForm then begin
+    TForm(Control).Constraints.MinWidth := ScaleX(Dimensions.ConstraintsMin.X, DesignDPI.X);
+    TForm(Control).Constraints.MaxWidth := ScaleX(Dimensions.ConstraintsMax.X, DesignDPI.X);
+    TForm(Control).Constraints.MinHeight := ScaleY(Dimensions.ConstraintsMin.Y, DesignDPI.Y);
+    TForm(Control).Constraints.MaxHeight := ScaleY(Dimensions.ConstraintsMax.Y, DesignDPI.Y);
   end;
   if Control is TWinControl then
   for I := 0 to TWinControl(Control).ControlCount - 1 do begin
-    if TWinControl(Control).Controls[I] is TControl then begin
+    if TWinControl(Control).Controls[I] is TControl then
+    // Do not scale docked forms twice
+    if not (TWinControl(Control).Controls[I] is TForm) then begin
       ScaleDimensions(TWinControl(Control).Controls[I], TControlDimension(Dimensions.Controls[I]));
     end;
@@ -183 +219 @@
 
   SetLength(Temp, ImgList.Count);
-  TempBmp := TBitmap.Create;
   for I := 0 to ImgList.Count - 1 do
   begin
+    TempBmp := TBitmap.Create;
+    TempBmp.PixelFormat := pf32bit;
     ImgList.GetBitmap(I, TempBmp);
-    //TempBmp.PixelFormat := pfDevice;
     Temp[I] := TBitmap.Create;
     Temp[I].SetSize(NewWidth, NewHeight);
+    Temp[I].PixelFormat := pf32bit;
     Temp[I].TransparentColor := TempBmp.TransparentColor;
     //Temp[I].TransparentMode := TempBmp.TransparentMode;
@@ -199 +236 @@
     if (Temp[I].Width = 0) or (Temp[I].Height = 0) then Continue;
     Temp[I].Canvas.StretchDraw(Rect(0, 0, Temp[I].Width, Temp[I].Height), TempBmp);
-  end;
-  TempBmp.Free;
+    TempBmp.Free;
+  end;
 
   ImgList.Clear;
@@ -272 +309 @@
   end;
 
-
+  if Control is TCoolBar then
+  with TCoolBar(Control) do begin
+    BeginUpdate;
+    for I := 0 to Bands.Count - 1 do
+      with Bands[I] do begin
+        MinWidth := ScaleX(MinWidth, FromDPI.X);
+        MinHeight := ScaleY(MinHeight, FromDPI.Y);
+        Width := ScaleX(Width, FromDPI.X);
+        //Control.Invalidate;
+      end;
+    EndUpdate;
+  end;
 
   if Control is TToolBar then begin

trunk/Packages/Common/UXMLUtils.pas

@@ -12 +12 @@
 function DateTimeToXMLTime(Value: TDateTime; ApplyLocalBias: Boolean = True): WideString;
 procedure WriteInteger(Node: TDOMNode; Name: string; Value: Integer);
+procedure WriteInt64(Node: TDOMNode; Name: string; Value: Int64);
 procedure WriteBoolean(Node: TDOMNode; Name: string; Value: Boolean);
 procedure WriteString(Node: TDOMNode; Name: string; Value: string);
+procedure WriteDateTime(Node: TDOMNode; Name: string; Value: TDateTime);
 function ReadInteger(Node: TDOMNode; Name: string; DefaultValue: Integer): Integer;
+function ReadInt64(Node: TDOMNode; Name: string; DefaultValue: Int64): Int64;
 function ReadBoolean(Node: TDOMNode; Name: string; DefaultValue: Boolean): Boolean;
 function ReadString(Node: TDOMNode; Name: string; DefaultValue: string): string;
+function ReadDateTime(Node: TDOMNode; Name: string; DefaultValue: TDateTime): TDateTime;
 
 
@@ -72 +76 @@
   Minute: Integer;
   Second: Integer;
+  SecondFraction: Double;
   Millisecond: Integer;
 begin
@@ -94 +99 @@
       if Pos('Z', XMLDateTime) > 0 then
         LeftCutString(XMLDateTime, Part, 'Z');
-      Millisecond := StrToInt(Part);
+      SecondFraction := StrToFloat('0' + DecimalSeparator + Part);
+      Millisecond := Trunc(SecondFraction * 1000);
     end else begin
       if Pos('+', XMLDateTime) > 0 then
@@ -138 +144 @@
 end;
 
+procedure WriteInt64(Node: TDOMNode; Name: string; Value: Int64);
+var
+  NewNode: TDOMNode;
+begin
+  NewNode := Node.OwnerDocument.CreateElement(Name);
+  NewNode.TextContent := IntToStr(Value);
+  Node.AppendChild(NewNode);
+end;
+
 procedure WriteBoolean(Node: TDOMNode; Name: string; Value: Boolean);
 var
@@ -156 +171 @@
 end;
 
+procedure WriteDateTime(Node: TDOMNode; Name: string; Value: TDateTime);
+var
+  NewNode: TDOMNode;
+begin
+  NewNode := Node.OwnerDocument.CreateElement(Name);
+  NewNode.TextContent := DateTimeToXMLTime(Value);
+  Node.AppendChild(NewNode);
+end;
+
 function ReadInteger(Node: TDOMNode; Name: string; DefaultValue: Integer): Integer;
 var
@@ -166 +190 @@
 end;
 
+function ReadInt64(Node: TDOMNode; Name: string; DefaultValue: Int64): Int64;
+var
+  NewNode: TDOMNode;
+begin
+  Result := DefaultValue;
+  NewNode := Node.FindNode(Name);
+  if Assigned(NewNode) then
+    Result := StrToInt64(NewNode.TextContent);
+end;
+
 function ReadBoolean(Node: TDOMNode; Name: string; DefaultValue: Boolean): Boolean;
 var
@@ -186 +220 @@
 end;
 
+function ReadDateTime(Node: TDOMNode; Name: string; DefaultValue: TDateTime
+  ): TDateTime;
+var
+  NewNode: TDOMNode;
+begin
+  Result := DefaultValue;
+  NewNode := Node.FindNode(Name);
+  if Assigned(NewNode) then
+    Result := XMLTimeToDateTime(NewNode.TextContent);
+end;
+
 end.