Changeset 390 for Common

Timestamp:

Jul 18, 2012, 4:13:05 PM (12 years ago)

Author:

chronos

Message:

• Added: GeneralRegistry TWinRegistry class implementation.

Location:

Common

Files:

• Common.lpk (modified) (1 diff)
• StopWatch.pas (modified) (1 diff)
• UApplicationInfo.pas (modified) (2 diffs)
• ULastOpenedList.pas (modified) (4 diffs)
• URegistry.pas (deleted)

Common/Common.lpk

@@ -91 +91 @@
     <RequiredPkgs Count="3">
       <Item1>
-        <PackageName Value="RegistryPkg"/>
+        <PackageName Value="GeneralRegistry"/>
+        <MinVersion Minor="1" Valid="True"/>
       </Item1>
       <Item2>

Common/StopWatch.pas

@@ -22 +22 @@
     function GetElapsed: string;
   public
-    constructor Create(const startOnCreate : Boolean = False) ;
+    constructor Create(const startOnCreate: Boolean = False) ;
     procedure Start;
     procedure Stop;
-    property IsHighResolution : Boolean read fIsHighResolution;
-    property ElapsedTicks : TLargeInteger read GetElapsedTicks;
-    property ElapsedMiliseconds : TLargeInteger read GetElapsedMiliseconds;
-    property Elapsed : string read GetElapsed;
-    property IsRunning : Boolean read fIsRunning;
+    property IsHighResolution: Boolean read fIsHighResolution;
+    property ElapsedTicks: TLargeInteger read GetElapsedTicks;
+    property ElapsedMiliseconds: TLargeInteger read GetElapsedMiliseconds;
+    property Elapsed: string read GetElapsed;
+    property IsRunning: Boolean read fIsRunning;
   end;
 

Common/UApplicationInfo.pas

@@ -6 +6 @@
 
 uses
-  SysUtils, Registry2, Classes, Forms, URegistry;
+  SysUtils, Classes, Forms, UGeneralRegistry;
 
 type
@@ -74 +74 @@
   FAppName := Application.Name;
   FRegistryKey := '\Software\' + FAppName;
-  FRegistryRoot := rrKeyCurrentUser;
+  FRegistryRoot := rrApplicationUser;
 end;
 

Common/ULastOpenedList.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Registry2, URegistry, Menus;
+  Classes, SysUtils, UGeneralRegistry, Menus;
 
 type
@@ -23 +23 @@
     destructor Destroy; override;
     procedure LoadToMenuItem(MenuItem: TMenuItem; ClickAction: TNotifyEvent);
-    procedure LoadFromRegistry(Root: HKEY; Key: string);
-    procedure SaveToRegistry(Root: HKEY; Key: string);
+    procedure LoadFromRegistry(Root: Integer; const Key: string);
+    procedure SaveToRegistry(Root: Integer; const Key: string);
     procedure AddItem(FileName: string);
   published
@@ -87 +87 @@
 end;
 
-procedure TLastOpenedList.LoadFromRegistry(Root: HKEY; Key: string);
+procedure TLastOpenedList.LoadFromRegistry(Root: Integer; const Key: string);
 var
   I: Integer;
-  Registry: TRegistryEx;
+  Registry: TGeneralRegistry;
   FileName: string;
 begin
-  Registry := TRegistryEx.Create;
+  Registry := TGeneralRegistry.Create(nil);
   with Registry do
   try
-    RootKey := Root;
+    CurrentRoot := Root;
     OpenKey(Key, True);
     Items.Clear;
     I := 0;
     while ValueExists('File' + IntToStr(I)) and (I < MaxCount) do begin
-      FileName := UTF8Encode(ReadStringWithDefault('File' + IntToStr(I), ''));
+      if ValueExists('File' + IntToStr(I)) then
+        FileName := UTF8Encode(ReadString('File' + IntToStr(I)))
+        else FileName := '';
       if Trim(FileName) <> '' then Items.Add(FileName);
       Inc(I);
@@ -112 +114 @@
 end;
 
-procedure TLastOpenedList.SaveToRegistry(Root: HKEY; Key: string);
+procedure TLastOpenedList.SaveToRegistry(Root: Integer; const Key: string);
 var
   I: Integer;
-  Registry: TRegistryEx;
+  Registry: TGeneralRegistry;
 begin
-  Registry := TRegistryEx.Create;
+  Registry := TGeneralRegistry.Create(nil);
   with Registry do
   try
-    RootKey := Root;
+    CurrentRoot := Root;
     OpenKey(Key, True);
     for I := 0 to Items.Count - 1 do