Changeset 25 for trunk/Packages/Common/URegistry.pas

Timestamp:

Sep 10, 2022, 6:54:43 PM (2 years ago)

Author:

chronos

Message:

• Modified: CoolTranslator replaced by Common package.
• Modified: Update common package.

File:

• trunk/Packages/Common/URegistry.pas (modified) (13 diffs)

trunk/Packages/Common/URegistry.pas

@@ -1 +1 @@
 unit URegistry;
-
-{$MODE Delphi}
 
 interface
@@ -17 +15 @@
     RootKey: HKEY;
     Key: string;
+    class function Create(RootKey: TRegistryRoot; Key: string): TRegistryContext; static; overload;
+    class function Create(RootKey: HKEY; Key: string): TRegistryContext; static; overload;
     class operator Equal(A, B: TRegistryContext): Boolean;
-    function Create(RootKey: TRegistryRoot; Key: string): TRegistryContext; overload;
-    function Create(RootKey: HKEY; Key: string): TRegistryContext; overload;
   end;
 
@@ -29 +27 @@
     procedure SetCurrentContext(AValue: TRegistryContext);
   public
+    function ReadChar(const Name: string): Char;
+    procedure WriteChar(const Name: string; Value: Char);
     function ReadBoolWithDefault(const Name: string;
       DefaultValue: Boolean): Boolean;
     function ReadIntegerWithDefault(const Name: string; DefaultValue: Integer): Integer;
     function ReadStringWithDefault(const Name: string; DefaultValue: string): string;
+    function ReadCharWithDefault(const Name: string; DefaultValue: Char): Char;
     function ReadFloatWithDefault(const Name: string;
       DefaultValue: Double): Double;
@@ -41 +42 @@
     function GetValue(const Name: string; const DefaultValue: Boolean): Boolean; overload;
     function GetValue(const Name: string; const DefaultValue: Double): Double; overload;
+    function GetValue(const Name: string; const DefaultValue: Char): Char; overload;
     procedure SetValue(const Name: string; const Value: Integer); overload;
     procedure SetValue(const Name: string; const Value: string); overload;
     procedure SetValue(const Name: string; const Value: Boolean); overload;
     procedure SetValue(const Name: string; const Value: Double); overload;
+    procedure SetValue(const Name: string; const Value: Char); overload;
     property CurrentContext: TRegistryContext read GetCurrentContext write SetCurrentContext;
   end;
@@ -53 +56 @@
     HKEY_CURRENT_CONFIG, HKEY_DYN_DATA);
 
+
 implementation
 
-
 { TRegistryContext }
 
@@ -63 +66 @@
 end;
 
-function TRegistryContext.Create(RootKey: TRegistryRoot; Key: string): TRegistryContext;
+class function TRegistryContext.Create(RootKey: TRegistryRoot; Key: string): TRegistryContext;
 begin
   Result.RootKey := RegistryRootHKEY[RootKey];
@@ -69 +72 @@
 end;
 
-function TRegistryContext.Create(RootKey: HKEY; Key: string): TRegistryContext;
+class function TRegistryContext.Create(RootKey: HKEY; Key: string): TRegistryContext;
 begin
   Result.RootKey := RootKey;
@@ -97 +100 @@
 end;
 
+function TRegistryEx.ReadCharWithDefault(const Name: string; DefaultValue: Char
+  ): Char;
+begin
+  if ValueExists(Name) then Result := ReadChar(Name)
+    else begin
+      WriteChar(Name, DefaultValue);
+      Result := DefaultValue;
+    end;
+end;
+
 function TRegistryEx.ReadFloatWithDefault(const Name: string;
   DefaultValue: Double): Double;
@@ -131 +144 @@
 end;
 
+function TRegistryEx.GetValue(const Name: string; const DefaultValue: Char
+  ): Char;
+begin
+  Result := ReadCharWithDefault(Name, DefaultValue);
+end;
+
 procedure TRegistryEx.SetValue(const Name: string; const Value: Integer);
 begin
@@ -149 +168 @@
 begin
   WriteFloat(Name, Value);
+end;
+
+procedure TRegistryEx.SetValue(const Name: string; const Value: Char);
+begin
+  WriteChar(Name, Value);
 end;
 
@@ -171 +195 @@
 function TRegistryEx.OpenKey(const Key: string; CanCreate: Boolean): Boolean;
 begin
-  {$IFDEF Linux}
-  CloseKey;
+  {$IFDEF UNIX}
+  //CloseKey;
   {$ENDIF}
   Result := inherited OpenKey(Key, CanCreate);
@@ -179 +203 @@
 function TRegistryEx.GetCurrentContext: TRegistryContext;
 begin
-  Result.Key := CurrentPath;
+  Result.Key := String(CurrentPath);
   Result.RootKey := RootKey;
 end;
@@ -189 +213 @@
 end;
 
+function TRegistryEx.ReadChar(const Name: string): Char;
+var
+  S: string;
+begin
+  S := ReadString(Name);
+  if Length(S) > 0 then Result := S[1]
+    else Result := #0;
+end;
+
+procedure TRegistryEx.WriteChar(const Name: string; Value: Char);
+begin
+  WriteString(Name, Value);
+end;
+
 function TRegistryEx.ReadBoolWithDefault(const Name: string;
   DefaultValue: Boolean): Boolean;