Changeset 50 for trunk

Timestamp:

Nov 3, 2019, 12:18:14 PM (5 years ago)

Author:

chronos

Message:

• Added: Support for dark theme.

Location:

trunk

Files:

• Forms/UFormComputer.pas (modified) (1 diff)
• Forms/UFormHelp.pas (modified) (1 diff)
• Forms/UFormHistory.pas (modified) (1 diff)
• Forms/UFormMain.pas (modified) (1 diff)
• Forms/UFormNew.pas (modified) (1 diff)
• Forms/UFormSettings.lfm (modified) (3 diffs)
• Forms/UFormSettings.lrj (modified) (1 diff)
• Forms/UFormSettings.pas (modified) (5 diffs)
• Languages/Game2048.cs.po (modified) (1 diff)
• Languages/Game2048.po (modified) (1 diff)
• UCore.lfm (modified) (1 diff)
• UCore.pas (modified) (3 diffs)
• UGame.pas (modified) (4 diffs)

trunk/Forms/UFormComputer.pas

@@ -217 +217 @@
 begin
   Core.Translator1.TranslateComponentRecursive(Self);
+  Core.ThemeManager1.UseTheme(Self);
   GameTries1 := TGameTries.Create;
   GameTries2 := TGameTries.Create;

trunk/Forms/UFormHelp.pas

@@ -45 +45 @@
 begin
   Core.Translator1.TranslateComponentRecursive(Self);
+  Core.ThemeManager1.UseTheme(Self);
 end;
 

trunk/Forms/UFormHistory.pas

@@ -78 +78 @@
 begin
   Core.Translator1.TranslateComponentRecursive(Self);
+  Core.ThemeManager1.UseTheme(Self);
   Game := TGame.Create;
 end;

trunk/Forms/UFormMain.pas

@@ -98 +98 @@
   Core.PersistentForm1.RegistryContext := Core.ApplicationInfo1.GetRegistryContext;
   Core.PersistentForm1.Load(Self);
+  Core.ThemeManager1.UseTheme(Self);
   UpdateInterface;
   if Core.Game.Board.GetEmptyTilesCount > Core.Game.Board.Size.X * Core.Game.Board.Size.Y -

trunk/Forms/UFormNew.pas

@@ -49 +49 @@
 begin
   Core.Translator1.TranslateComponentRecursive(Self);
+  Core.ThemeManager1.UseTheme(Self);
   ComboBoxSkin.Items.Clear;
   for I := Low(SkinText) to High(SkinText) do

trunk/Forms/UFormSettings.lfm

@@ -11 +11 @@
   OnCreate = FormCreate
   OnShow = FormShow
-  LCLVersion = '2.0.2.0'
+  LCLVersion = '2.0.4.0'
   object Label1: TLabel
     Left = 19
-    Height = 26
+    Height = 25
     Top = 24
-    Width = 172
+    Width = 158
     Caption = 'Animation duration:'
     ParentColor = False
@@ -52 +52 @@
   object ComboBoxLanguage: TComboBox
     Left = 208
-    Height = 42
+    Height = 33
     Top = 86
     Width = 230
-    ItemHeight = 0
+    ItemHeight = 25
     Style = csDropDownList
     TabOrder = 3
@@ -61 +61 @@
   object Label2: TLabel
     Left = 19
-    Height = 26
+    Height = 25
     Top = 94
-    Width = 88
+    Width = 81
     Caption = 'Language:'
     ParentColor = False
   end
+  object ComboBoxTheme: TComboBox
+    Left = 208
+    Height = 33
+    Top = 136
+    Width = 230
+    ItemHeight = 25
+    Style = csDropDownList
+    TabOrder = 4
+  end
+  object Label3: TLabel
+    Left = 19
+    Height = 25
+    Top = 144
+    Width = 57
+    Caption = 'Theme:'
+    ParentColor = False
+  end
 end

trunk/Forms/UFormSettings.lrj

@@ -4 +4 @@
 {"hash":1339,"name":"tformsettings.buttonok.caption","sourcebytes":[79,75],"value":"OK"},
 {"hash":77089212,"name":"tformsettings.buttoncancel.caption","sourcebytes":[67,97,110,99,101,108],"value":"Cancel"},
-{"hash":82521866,"name":"tformsettings.label2.caption","sourcebytes":[76,97,110,103,117,97,103,101,58],"value":"Language:"}
+{"hash":82521866,"name":"tformsettings.label2.caption","sourcebytes":[76,97,110,103,117,97,103,101,58],"value":"Language:"},
+{"hash":95339402,"name":"tformsettings.label3.caption","sourcebytes":[84,104,101,109,101,58],"value":"Theme:"}
 ]}

trunk/Forms/UFormSettings.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls,
-  ULanguages;
+  ULanguages, UTheme;
 
 type
@@ -17 +17 @@
     ButtonCancel: TButton;
     ComboBoxLanguage: TComboBox;
+    ComboBoxTheme: TComboBox;
     Label1: TLabel;
     Label2: TLabel;
+    Label3: TLabel;
     TrackBar1: TTrackBar;
     procedure ButtonCancelClick(Sender: TObject);
@@ -62 +64 @@
     Core.Translator1.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
   end;
+  if ComboBoxTheme.ItemIndex <> -1 then
+    Core.ThemeManager1.Theme := TTheme(ComboBoxTheme.Items.Objects[ComboBoxTheme.ItemIndex]);
   ModalResult := mrOk;
 end;
@@ -75 +79 @@
   Core.Translator1.TranslateComponentRecursive(Self);
   Core.Translator1.LanguageListToStrings(ComboBoxLanguage.Items);
+  Core.ThemeManager1.UseTheme(Self);
+  Core.ThemeManager1.Themes.LoadToStrings(ComboBoxTheme.Items);
 end;
 
@@ -83 +89 @@
   ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.Translator1.Language);
   if ComboBoxLanguage.ItemIndex = -1 then ComboBoxLanguage.ItemIndex := 0;
+  ComboBoxTheme.ItemIndex := ComboBoxTheme.Items.IndexOfObject(Core.ThemeManager1.Theme);
+  if ComboBoxTheme.ItemIndex = -1 then ComboBoxTheme.ItemIndex := 0;
 end;
 

trunk/Languages/Game2048.cs.po

@@ -170 +170 @@
 msgstr "Jazyk:"
 
+#: tformsettings.label3.caption
+msgid "Theme:"
+msgstr "Téma:"
+
 #: ucore.sgameovercaption
 msgctxt "ucore.sgameovercaption"

trunk/Languages/Game2048.po

@@ -160 +160 @@
 msgstr ""
 
+#: tformsettings.label3.caption
+msgid "Theme:"
+msgstr ""
+
 #: ucore.sgameovercaption
 msgctxt "ucore.sgameovercaption"

trunk/UCore.lfm

@@ -37 +37 @@
   object Translator1: TTranslator
     POFilesFolder = 'Languages'
-    OnTranslate = Translator1Translate
     left = 336
     top = 295

trunk/UCore.pas

@@ -90 +90 @@
   try
     if FormSettings.ShowModal = mrOk then begin
+      FormMain.Redraw;
       FormMain.UpdateInterface;
       UpdateInterface;
@@ -214 +215 @@
       Translator1.Language := Translator1.Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''))
       else Translator1.Language := Translator1.Languages.SearchByCode('');
+    ThemeManager1.Theme := ThemeManager1.Themes.FindByName(ReadStringWithDefault('Theme', 'System'));
   finally
     Free;
@@ -229 +231 @@
       WriteString('LanguageCode', Translator1.Language.Code)
       else DeleteValue('LanguageCode');
+    WriteString('Theme', ThemeManager1.Theme.Name);
   finally
     Free;

trunk/UGame.pas

@@ -130 +130 @@
     UndoEnabled: Boolean;
     History: THistory;
+    BackgroundColor: TColor;
     function CanUndo: Boolean;
     procedure Undo;
@@ -182 +183 @@
 implementation
 
+uses
+  UCore;
+
 procedure Translate;
 begin
@@ -593 +597 @@
   TileMargin := Round(CanvasSize.X / Board.Size.X * 0.015);
   Canvas.Brush.Style := bsSolid;
-  Canvas.Brush.Color := clBlack;
+  Canvas.Brush.Color := Core.ThemeManager1.Theme.ColorControl;
   Canvas.FillRect(0, 0, Canvas.Width, Canvas.Height);
 
   ValueStr := SScore + ': ' + IntToStr(Score);
-  Canvas.Font.Color := clWhite;
+  Canvas.Font.Color := Core.ThemeManager1.Theme.ColorControlText;
   Canvas.Font.Height := Trunc(TopBarHeight * 0.7);
   Canvas.TextOut(ScaleY(16, 96), (TopBarHeight - Canvas.TextHeight(ValueStr)) div 2, ValueStr);
 
   ValueStr := STopScore + ': ' + IntToStr(TopScore);
-  Canvas.Font.Color := clWhite;
+  Canvas.Font.Color := Core.ThemeManager1.Theme.ColorControlText;
   Canvas.Font.Height := Trunc(TopBarHeight * 0.7);
   Canvas.TextOut(ScaleY(136, 96), (TopBarHeight - Canvas.TextHeight(ValueStr)) div 2, ValueStr);
@@ -1030 +1034 @@
 function TGame.GetTileColor(Value: Integer): TColor;
 begin
-  case Value of
-    0: Result := $f2f6f9;
-    1: Result := $dae4ee;
-    2: Result := $c8e0ed;
-    3: Result := $79b1f2;
-    4: Result := $6395f5;
-    5: Result := $5f7cf6;
-    6: Result := $3b5ef6;
-    7: Result := $72cfed;
-    8: Result := $61cced;
-    9: Result := $50c8ed;
-    10: Result := $3fc5ed;
-    11: Result := $2ec2ed;
-    else Result := $323a3c;
+  if Core.ThemeManager1.Theme.Name = 'Dark' then begin
+    case Value of
+      0: Result := $222629;
+      1: Result := $dae4ee;
+      2: Result := $c8e0ed;
+      3: Result := $79b1f2;
+      4: Result := $6395f5;
+      5: Result := $5f7cf6;
+      6: Result := $3b5ef6;
+      7: Result := $72cfed;
+      8: Result := $61cced;
+      9: Result := $50c8ed;
+      10: Result := $3fc5ed;
+      11: Result := $2ec2ed;
+      else Result := $323a3c;
+    end;
+  end else begin
+    case Value of
+      0: Result := $f2f6f9;
+      1: Result := $dae4ee;
+      2: Result := $c8e0ed;
+      3: Result := $79b1f2;
+      4: Result := $6395f5;
+      5: Result := $5f7cf6;
+      6: Result := $3b5ef6;
+      7: Result := $72cfed;
+      8: Result := $61cced;
+      9: Result := $50c8ed;
+      10: Result := $3fc5ed;
+      11: Result := $2ec2ed;
+      else Result := $323a3c;
+    end;
   end;
 end;