Changeset 432

Timestamp:

Oct 25, 2012, 2:11:47 PM (12 years ago)

Author:

chronos

Message:

• Added: ListViewSort and SyncCounter units.

Location:

Common

Files:

• Common.lpk (modified) (2 diffs)
• Common.pas (modified) (1 diff)
• UJobProgressView.lfm (modified) (3 diffs)
• UJobProgressView.pas (modified) (12 diffs)
• ULastOpenedList.pas (modified) (3 diffs)
• UListViewSort.pas (added)
• UMemory.pas (modified) (2 diffs)
• URegistry.pas (modified) (3 diffs)
• UResetableThread.pas (modified) (2 diffs)
• USyncCounter.pas (added)

Common/Common.lpk

@@ -22 +22 @@
     <License Value="GNU/GPL"/>
     <Version Minor="7"/>
-    <Files Count="15">
+    <Files Count="17">
       <Item1>
         <Filename Value="StopWatch.pas"/>
@@ -87 +87 @@
         <UnitName Value="UApplicationInfo"/>
       </Item15>
+      <Item16>
+        <Filename Value="USyncCounter.pas"/>
+        <UnitName Value="USyncCounter"/>
+      </Item16>
+      <Item17>
+        <Filename Value="UListViewSort.pas"/>
+        <UnitName Value="UListViewSort"/>
+      </Item17>
     </Files>
     <i18n>

Common/Common.pas

@@ -10 +10 @@
   StopWatch, UCommon, UDebugLog, UDelay, UPrefixMultiplier, UURI, UThreading, 
   UMemory, UResetableThread, UPool, ULastOpenedList, URegistry, 
-  UJobProgressView, UXMLUtils, UApplicationInfo, LazarusPackageIntf;
+  UJobProgressView, UXMLUtils, UApplicationInfo, USyncCounter, UListViewSort, 
+  LazarusPackageIntf;
 
 implementation

Common/UJobProgressView.lfm

@@ -28 +28 @@
     object LabelOperation: TLabel
       Left = 8
-      Height = 14
+      Height = 13
       Top = 8
-      Width = 67
+      Width = 66
       Caption = 'Operations:'
       Font.Height = -11
@@ -80 +80 @@
     object LabelEstimatedTimePart: TLabel
       Left = 8
-      Height = 14
+      Height = 13
       Top = -2
-      Width = 72
+      Width = 71
       Caption = 'Estimated time:'
       ParentColor = False
@@ -132 +132 @@
     object LabelEstimatedTimeTotal: TLabel
       Left = 8
-      Height = 14
+      Height = 13
       Top = 0
-      Width = 98
+      Width = 97
       Caption = 'Total estimated time:'
       ParentColor = False

Common/UJobProgressView.pas

@@ -111 +111 @@
     Finished: Boolean;
     FOnJobFinish: TJobProgressViewMethod;
+    FOnOwnerDraw: TNotifyEvent;
+    FOwnerDraw: Boolean;
     FShowDelay: Integer;
     FTerminate: Boolean;
@@ -116 +118 @@
     TotalStartTime: TDateTime;
     Log: TStringList;
-    Form: TFormJobProgressView;
     procedure SetTerminate(const AValue: Boolean);
     procedure UpdateProgress;
@@ -122 +123 @@
     procedure StartJobs;
     procedure UpdateHeight;
+    procedure JobProgressChange(Sender: TObject);
   public
+    Form: TFormJobProgressView;
     Jobs: TObjectList; // TListObject<TJob>
     CurrentJob: TJob;
@@ -136 +139 @@
     property Terminate: Boolean read FTerminate write SetTerminate;
   published
+    property OwnerDraw: Boolean read FOwnerDraw write FOwnerDraw;
     property ShowDelay: Integer read FShowDelay write FShowDelay;
     property AutoClose: Boolean read FAutoClose write FAutoClose;
     property OnJobFinish: TJobProgressViewMethod read FOnJobFinish
       write FOnJobFinish;
+    property OnOwnerDraw: TNotifyEvent read FOnOwnerDraw
+      write FOnOwnerDraw;
   end;
 
@@ -196 +202 @@
   NewJob.Progress.Max := 100;
   NewJob.Progress.Reset;
+  NewJob.Progress.OnChange := JobProgressChange;
   Jobs.Add(NewJob);
   //ReloadJobList;
@@ -212 +219 @@
   Terminate := False;
 
-  Form.BringToFront;
+  if not OwnerDraw then Form.BringToFront;
 
   Finished := False;
@@ -244 +251 @@
       CurrentJobIndex := I;
       CurrentJob := TJob(Jobs[I]);
+      JobProgressChange(Self);
       StartTime := Now;
       Form.LabelEstimatedTimePart.Caption := Format(SEstimatedTime, ['']);
@@ -339 +347 @@
 end;
 
+procedure TJobProgressView.JobProgressChange(Sender: TObject);
+begin
+  if Assigned(FOnOwnerDraw) then
+    FOnOwnerDraw(Self);
+end;
+
 procedure TFormJobProgressView.TimerUpdateTimer(Sender: TObject);
 var
@@ -357 +371 @@
   if not Visible then begin
     TimerUpdate.Interval := UpdateInterval;
-    Show;
+    if not JobProgressView.OwnerDraw then Show;
   end;
 end;
@@ -509 +523 @@
 destructor TJobProgressView.Destroy;
 begin
-  Log.Free;
-  Jobs.Free;
-  inherited Destroy;
+  FreeAndNil(Log);
+  FreeAndNil(Jobs);
+  inherited;
 end;
 
@@ -519 +533 @@
     FLock.Acquire;
     FMax := AValue;
+    if FMax < 1 then FMax := 1;
     if FValue >= FMax then FValue := FMax;
   finally
@@ -610 +625 @@
 begin
   Progress.Free;
-  inherited Destroy;
+  inherited;
 end;
 

Common/ULastOpenedList.pas

@@ -18 +18 @@
     procedure SetMaxCount(AValue: Integer);
     procedure LimitMaxCount;
+    procedure ItemsChange(Sender: TObject);
+    procedure DoChange;
   public
     Items: TStringList;
@@ -58 +60 @@
 end;
 
+procedure TLastOpenedList.ItemsChange(Sender: TObject);
+begin
+  DoChange;
+end;
+
+procedure TLastOpenedList.DoChange;
+begin
+  if Assigned(FOnChange) then
+    FOnChange(Self);
+end;
+
 constructor TLastOpenedList.Create(AOwner: TComponent);
 begin
   inherited;
   Items := TStringList.Create;
+  Items.OnChange := ItemsChange;
   MaxCount := 10;
 end;
@@ -134 +148 @@
   Items.Insert(0, FileName);
   LimitMaxCount;
-  if Assigned(FOnChange) then
-    FOnChange(Self);
+  DoChange;
 end;
 

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;
@@ -110 +108 @@
 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.
 

Common/URegistry.pas

@@ -26 +26 @@
   TRegistryEx = class(TRegistry)
   private
+    function GetContext: TRegistryContext;
+    procedure SetContext(AValue: TRegistryContext);
   public
     function ReadBoolWithDefault(const Name: string;
@@ -35 +37 @@
     function DeleteKeyRecursive(const Key: string): Boolean;
     function OpenKey(const Key: string; CanCreate: Boolean): Boolean;
+    property Context: TRegistryContext read GetContext write SetContext;
   end;
 
@@ -106 +109 @@
 end;
 
+function TRegistryEx.GetContext: TRegistryContext;
+begin
+  Result.Key := CurrentPath;
+  Result.RootKey := RootKey;
+end;
+
+procedure TRegistryEx.SetContext(AValue: TRegistryContext);
+begin
+  RootKey := AValue.RootKey;
+  OpenKey(AValue.Key, True);
+end;
+
 function TRegistryEx.ReadBoolWithDefault(const Name: string;
   DefaultValue: Boolean): Boolean;

Common/UResetableThread.pas

@@ -104 +104 @@
 
 procedure TResetableThread.WaitForStart;
-var
-  WaitResult: TWaitResult;
+//var
+//  WaitResult: TWaitResult;
 begin
   //try
@@ -127 +127 @@
 
 procedure TResetableThread.WaitForStop;
-var
-  WaitState: TWaitResult;
+//var
+//  WaitState: TWaitResult;
 begin
   try