Changeset 424 for trunk/Packages/Common/UTheme.pas

Timestamp:

Apr 25, 2022, 6:22:53 PM (3 years ago)

Author:

chronos

Message:

• Modified: Update Common package to version 0.10.
• Modified: fgl unit replaced by Generics.Collections.

File:

• trunk/Packages/Common/UTheme.pas (modified) (7 diffs)

trunk/Packages/Common/UTheme.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, Graphics, ComCtrls, Controls, ExtCtrls, Menus, StdCtrls,
-  Spin, Forms, fgl, Grids;
+  Spin, Forms, Generics.Collections, Grids;
 
 type
@@ -19 +19 @@
   { TThemes }
 
-  TThemes = class(TFPGObjectList<TTheme>)
+  TThemes = class(TObjectList<TTheme>)
     function AddNew(Name: string): TTheme;
     function FindByName(Name: string): TTheme;
@@ -42 +42 @@
   end;
 
+const
+  ThemeNameSystem = 'System';
+  ThemeNameLight = 'Light';
+  ThemeNameDark = 'Dark';
+
 procedure Register;
+
 
 implementation
@@ -105 +111 @@
   inherited;
   Themes := TThemes.Create;
-  with Themes.AddNew('System') do begin
+  with Themes.AddNew(ThemeNameSystem) do begin
     ColorWindow := clWindow;
     ColorWindowText := clWindowText;
@@ -113 +119 @@
   end;
   Theme := TTheme(Themes.First);
-  with Themes.AddNew('Dark') do begin
+  with Themes.AddNew(ThemeNameDark) do begin
     ColorWindow := RGBToColor($20, $20, $20);
     ColorWindowText := clWhite;
@@ -120 +126 @@
     ColorControlSelected := RGBToColor(96, 125, 155);
   end;
-  with Themes.AddNew('Light') do begin
+  with Themes.AddNew(ThemeNameLight) do begin
     ColorWindow := clWhite;
     ColorWindowText := clBlack;
@@ -175 +181 @@
 procedure TThemeManager.UseTheme(Form: TForm);
 begin
-  if not Used and (FTheme.Name = 'System') then Exit;
+  if not Used and (FTheme.Name = ThemeNameSystem) then Exit;
   ApplyTheme(Form);
   Used := True;