Changeset 115 for trunk/Packages

Timestamp:

Oct 13, 2020, 8:05:14 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Build with Lazarus 2.0.10.
• Modified: CoolTranslator package replaced by Translator in Common package.
• Modified: About dialog moved to Common package.

Location:

trunk/Packages

Files:

• Common/Common.lpk (modified) (2 diffs)
• Common/Common.pas (modified) (2 diffs)
• Common/UAboutDialog.pas (added)
• Common/UApplicationInfo.pas (modified) (5 diffs)
• Common/UFormAbout.lfm (added)
• Common/UFormAbout.lrj (added)
• Common/UFormAbout.pas (added)
• Common/ULanguages.pas (added)
• Common/URegistry.pas (modified) (5 diffs)
• Common/UTranslator.pas (added)
• CoolTranslator (deleted)

trunk/Packages/Common/Common.lpk

@@ -40 +40 @@
     <License Value="GNU/GPL"/>
     <Version Minor="7"/>
-    <Files Count="22">
+    <Files Count="26">
       <Item1>
         <Filename Value="StopWatch.pas"/>
@@ -139 +139 @@
         <UnitName Value="UStringTable"/>
       </Item22>
+      <Item23>
+        <Filename Value="UTranslator.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="UTranslator"/>
+      </Item23>
+      <Item24>
+        <Filename Value="ULanguages.pas"/>
+        <UnitName Value="ULanguages"/>
+      </Item24>
+      <Item25>
+        <Filename Value="UFormAbout.pas"/>
+        <UnitName Value="UFormAbout"/>
+      </Item25>
+      <Item26>
+        <Filename Value="UAboutDialog.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="UAboutDialog"/>
+      </Item26>
     </Files>
     <i18n>

trunk/Packages/Common/Common.pas

@@ -12 +12 @@
   UMemory, UResetableThread, UPool, ULastOpenedList, URegistry, 
   UJobProgressView, UXMLUtils, UApplicationInfo, USyncCounter, UListViewSort, 
-  UPersistentForm, UFindFile, UScaleDPI, UTheme, UStringTable, 
-  LazarusPackageIntf;
+  UPersistentForm, UFindFile, UScaleDPI, UTheme, UStringTable, UAboutDialog, 
+  UTranslator, ULanguages, UFormAbout, LazarusPackageIntf;
 
 implementation
@@ -29 +29 @@
   RegisterUnit('UScaleDPI', @UScaleDPI.Register);
   RegisterUnit('UTheme', @UTheme.Register);
+  RegisterUnit('UAboutDialog', @UAboutDialog.Register);
+  RegisterUnit('UTranslator', @UTranslator.Register);
 end;
 

trunk/Packages/Common/UApplicationInfo.pas

@@ -6 +6 @@
 
 uses
-  SysUtils, Classes, Forms, URegistry, Controls;
+  SysUtils, Classes, Forms, URegistry, Controls, Graphics;
 
 type
@@ -15 +15 @@
   private
     FDescription: TCaption;
+    FIcon: TBitmap;
     FIdentification: Byte;
     FLicense: string;
@@ -33 +34 @@
   public
     constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
     property Version: string read GetVersion;
     function GetRegistryContext: TRegistryContext;
@@ -52 +54 @@
     property RegistryRoot: TRegistryRoot read FRegistryRoot write FRegistryRoot;
     property License: string read FLicense write FLicense;
+    property Icon: TBitmap read FIcon write FIcon;
   end;
 
@@ -80 +83 @@
   FRegistryKey := '\Software\' + FAppName;
   FRegistryRoot := rrKeyCurrentUser;
+  FIcon := TBitmap.Create;
+end;
+
+destructor TApplicationInfo.Destroy;
+begin
+  FreeAndNil(FIcon);
+  inherited Destroy;
 end;
 

trunk/Packages/Common/URegistry.pas

@@ -1 +1 @@
 unit URegistry;
 
-{$MODE Delphi}
+{$MODE delphi}
 
 interface
@@ -17 +17 @@
     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;
 
@@ -58 +58 @@
 end;
 
-function TRegistryContext.Create(RootKey: TRegistryRoot; Key: string): TRegistryContext;
+class function TRegistryContext.Create(RootKey: TRegistryRoot; Key: string): TRegistryContext;
 begin
   Result.RootKey := RegistryRootHKEY[RootKey];
@@ -64 +64 @@
 end;
 
-function TRegistryContext.Create(RootKey: HKEY; Key: string): TRegistryContext;
+class function TRegistryContext.Create(RootKey: HKEY; Key: string): TRegistryContext;
 begin
   Result.RootKey := RootKey;
@@ -133 +133 @@
 begin
   {$IFDEF Linux}
-  CloseKey;
+  //CloseKey;
   {$ENDIF}
   Result := inherited OpenKey(Key, CanCreate);