Changeset 51 for trunk/Forms

Timestamp:

Dec 20, 2021, 6:45:12 PM (3 years ago)

Author:

chronos

Message:

• Modified: Updated Common package.
• Removed: CoolTranslator merged into Common package.
• Modified: Code cleanup.

Location:

trunk/Forms

Files:

• UFormAbout.lfm (deleted)
• UFormAbout.lrj (deleted)
• UFormAbout.pas (deleted)
• UFormNewGame.pas (modified) (1 diff)
• UMainForm.lfm (modified) (6 diffs)
• UMainForm.pas (modified) (4 diffs)

trunk/Forms/UFormNewGame.pas

@@ -288 +288 @@
 procedure TFormNewGame.FormCreate(Sender: TObject);
 begin
-  Core.CoolTranslator1.TranslateComponentRecursive(Self);
+  Core.Translator1.TranslateComponentRecursive(Self);
   Players := TPlayers.Create;
 end;

trunk/Forms/UMainForm.lfm

@@ -1 +1 @@
 object MainForm: TMainForm
-  Left = 486
-  Height = 515
-  Top = 258
-  Width = 642
+  Left = 692
+  Height = 618
+  Top = 479
+  Width = 770
   Caption = 'Tunneler'
-  ClientHeight = 490
-  ClientWidth = 642
-  DesignTimePPI = 120
+  ClientHeight = 584
+  ClientWidth = 770
+  DesignTimePPI = 144
   Menu = MainMenu1
   OnClose = FormClose
@@ -16 +16 @@
   OnKeyUp = FormKeyUp
   OnShow = FormShow
-  LCLVersion = '2.0.2.0'
+  LCLVersion = '2.0.12.0'
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 28
-    Top = 462
-    Width = 642
+    Height = 27
+    Top = 557
+    Width = 770
     Panels = <    
       item
-        Width = 62
+        Width = 74
       end    
       item
-        Width = 62
+        Width = 74
       end    
       item
-        Width = 62
+        Width = 74
       end    
       item
-        Width = 62
+        Width = 74
       end    
       item
-        Width = 62
+        Width = 74
       end    
       item
-        Width = 62
+        Width = 74
       end    
       item
-        Width = 62
+        Width = 74
       end>
     ParentFont = False
@@ -49 +49 @@
   object Image1: TImage
     Left = 0
-    Height = 462
+    Height = 557
     Top = 0
-    Width = 642
+    Width = 770
     Align = alClient
     OnMouseLeave = Image1MouseLeave
@@ -59 +59 @@
     Interval = 50
     OnTimer = TimerDrawTimer
-    left = 124
-    top = 63
+    Left = 149
+    Top = 76
   end
   object MainMenu1: TMainMenu
-    left = 230
-    top = 20
+    Left = 276
+    Top = 24
     object MenuItem1: TMenuItem
       Caption = 'Game'
@@ -93 +93 @@
     Interval = 20
     OnTimer = TimerEngineTickTimer
-    left = 120
-    top = 130
+    Left = 144
+    Top = 156
   end
   object ActionList1: TActionList
-    left = 360
-    top = 40
+    Left = 432
+    Top = 48
     object AFullScreen: TAction
       Caption = 'Fullscreen mode'
@@ -132 +132 @@
     RootName = 'CONFIG'
     ReadOnly = False
-    left = 124
-    top = 300
+    Left = 149
+    Top = 360
+  end
+  object AboutDialog1: TAboutDialog
+    CoolTranslator = Core.Translator1
+    ThemeManager = Core.ThemeManager1
+    ApplicationInfo = Core.ApplicationInfo
+    Left = 308
+    Top = 181
   end
 end

trunk/Forms/UMainForm.pas

@@ -8 +8 @@
   XMLConf, Classes, SysUtils, FileUtil, Forms, Controls, Graphics,
   Dialogs, ExtCtrls, ComCtrls, Menus, ActnList, UEngine, UPlatform, Math,
-  DateUtils, GraphType, UPersistentForm, UApplicationInfo, UCoolTranslator,
-  LCLType, URegistry;
+  DateUtils, GraphType, UPersistentForm, UApplicationInfo, UTranslator,
+  LCLType, URegistry, UAboutDialog;
 
 type
@@ -17 +17 @@
   TMainForm = class(TForm)
     AAbout: TAction;
+    AboutDialog1: TAboutDialog;
     AShowRawImageDesc: TAction;
     AShowMap: TAction;
@@ -143 +144 @@
   Engine := TEngine.Create;
   Engine.Bitmap := Image1.Picture.Bitmap;
-  Core.CoolTranslator1.Language := Core.CoolTranslator1.Languages.SearchByCode('cs');
+  Core.Translator1.Language := Core.Translator1.Languages.SearchByCode('cs');
   LoadConfig;
   Engine.NewGame;
@@ -221 +222 @@
 procedure TMainForm.AAboutExecute(Sender: TObject);
 begin
-  FormAbout := TFormAbout.Create(nil);
-  FormAbout.ShowModal;
-  FreeAndNil(FormAbout);
+  AboutDialog1.Show;
 end;