Changeset 13 for trunk

Timestamp:

Oct 5, 2019, 11:16:00 AM (5 years ago)

Author:

chronos

Message:

• Added: Allow to change interface language in settings form.

Location:

trunk

Files:

• Forms/UFormNew.lfm (modified) (2 diffs)
• Forms/UFormNew.pas (modified) (1 diff)
• Forms/UFormSettings.lfm (modified) (2 diffs)
• Forms/UFormSettings.lrj (modified) (1 diff)
• Forms/UFormSettings.pas (modified) (5 diffs)
• Languages/Game2048.cs.mo (modified) ( previous)
• Languages/Game2048.cs.po (modified) (8 diffs)
• Languages/Game2048.po (modified) (2 diffs)
• UCore.pas (modified) (2 diffs)

trunk/Forms/UFormNew.lfm

@@ -1 +1 @@
 object FormNew: TFormNew
-  Left = 759
+  Left = 753
   Height = 212
-  Top = 822
+  Top = 825
   Width = 487
   Caption = 'New game'
@@ -32 +32 @@
       '9 x 9'
       '10 x 10 '
+      '11 x 11'
+      '12 x 12'
     )
     Style = csDropDownList

trunk/Forms/UFormNew.pas

@@ -1 +1 @@
 unit UFormNew;
 
-{$mode objfpc}{$H+}
+{$mode delphi}{$H+}
 
 interface

trunk/Forms/UFormSettings.lfm

@@ -8 +8 @@
   ClientWidth = 480
   DesignTimePPI = 144
+  OnClose = FormClose
+  OnCreate = FormCreate
   OnShow = FormShow
   LCLVersion = '2.0.2.0'
@@ -48 +50 @@
     TabOrder = 2
   end
+  object ComboBoxLanguage: TComboBox
+    Left = 208
+    Height = 43
+    Top = 86
+    Width = 230
+    ItemHeight = 0
+    Style = csDropDownList
+    TabOrder = 3
+  end
+  object Label2: TLabel
+    Left = 19
+    Height = 26
+    Top = 94
+    Width = 88
+    Caption = 'Language:'
+    ParentColor = False
+  end
 end

trunk/Forms/UFormSettings.lrj

@@ -3 +3 @@
 {"hash":69745274,"name":"tformsettings.label1.caption","sourcebytes":[65,110,105,109,97,116,105,111,110,32,115,112,101,101,100,58],"value":"Animation speed:"},
 {"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":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:"}
 ]}

trunk/Forms/UFormSettings.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls;
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, ComCtrls,
+  ULanguages;
 
 type
@@ -15 +16 @@
     ButtonOk: TButton;
     ButtonCancel: TButton;
+    ComboBoxLanguage: TComboBox;
     Label1: TLabel;
+    Label2: TLabel;
     TrackBar1: TTrackBar;
     procedure ButtonCancelClick(Sender: TObject);
     procedure ButtonOkClick(Sender: TObject);
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
+    procedure FormCreate(Sender: TObject);
     procedure FormShow(Sender: TObject);
   private
@@ -29 +34 @@
   FormSettings: TFormSettings;
 
+
 implementation
 
@@ -35 +41 @@
 uses
   UCore;
+
+resourcestring
+  SLanguageChangeTitle = 'Language change';
+  SLanguageChangeMessage = 'Interface language was changed. It may require restart of application.';
+
 
 { TFormSettings }
@@ -46 +57 @@
 begin
   Core.Game.AnimationDuration := TrackBar1.Position;
+  if ComboBoxLanguage.ItemIndex <> -1 then begin
+    if (Core.Translator1.Language <> TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex])) then
+      MessageDlg(SLanguageChangeTitle, SLanguageChangeMessage, mtInformation, [mbOk], 0);
+    Core.Translator1.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
+  end;
   Close;
+end;
+
+procedure TFormSettings.FormClose(Sender: TObject; var CloseAction: TCloseAction
+  );
+begin
+  Core.PersistentForm1.Save(Self);
+end;
+
+procedure TFormSettings.FormCreate(Sender: TObject);
+begin
+  Core.Translator1.LanguageListToStrings(ComboBoxLanguage.Items);
 end;
 
 procedure TFormSettings.FormShow(Sender: TObject);
 begin
+  Core.PersistentForm1.Load(Self);
   TrackBar1.Position := Core.Game.AnimationDuration;
+  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.Translator1.Language);
+  if ComboBoxLanguage.ItemIndex = -1 then ComboBoxLanguage.ItemIndex := 0;
 end;
 

trunk/Languages/Game2048.cs.po

@@ -13 +13 @@
 
 #: tcore.aabout.caption
-#, fuzzy
 msgctxt "tcore.aabout.caption"
 msgid "About"
@@ -19 +18 @@
 
 #: tcore.aexit.caption
-#, fuzzy
 msgctxt "tcore.aexit.caption"
 msgid "Exit"
@@ -25 +23 @@
 
 #: tcore.agamenew.caption
-#, fuzzy
 msgctxt "tcore.agamenew.caption"
 msgid "New..."
@@ -31 +28 @@
 
 #: tcore.asettings.caption
-#, fuzzy
 msgctxt "tcore.asettings.caption"
 msgid "Settings"
@@ -88 +84 @@
 
 #: tformsettings.buttoncancel.caption
-#, fuzzy
 msgctxt "tformsettings.buttoncancel.caption"
 msgid "Cancel"
@@ -94 +89 @@
 
 #: tformsettings.buttonok.caption
-#, fuzzy
 msgctxt "tformsettings.buttonok.caption"
 msgid "OK"
@@ -106 +100 @@
 #: tformsettings.label1.caption
 msgid "Animation speed:"
-msgstr ""
+msgstr "Rychlost animace:"
+
+#: tformsettings.label2.caption
+msgid "Language:"
+msgstr "Jazyk:"
 
 #: uformabout.slicense
@@ -120 +118 @@
 msgstr "Verze"
 
+#: uformsettings.slanguagechangemessage
+msgid "Interface language was changed. It may require restart of application."
+msgstr "Jazyk rozhraní byl změněn. To může vyžadovat restart aplikace."
+
+#: uformsettings.slanguagechangetitle
+msgid "Language change"
+msgstr "Změna jazyka"
+
 #: ugame.sgameovercaption
 msgid "Lost"
-msgstr ""
+msgstr "Prohra"
 
 #: ugame.sgameovermessage
 msgid "Game over!"
-msgstr ""
+msgstr "Konec hry!"
 
 #: ugame.swincaption
 msgid "Win"
-msgstr ""
+msgstr "Vítězství"
 
 #: ugame.swinmessage
 msgid "You won! Do you want to continue to play?"
-msgstr ""
-
+msgstr "Vyhrál jsi! Chceš pokračovat ve hře?"

trunk/Languages/Game2048.po

@@ -92 +92 @@
 msgstr ""
 
+#: tformsettings.label2.caption
+msgid "Language:"
+msgstr ""
+
 #: uformabout.slicense
 msgid "License"
@@ -102 +106 @@
 #: uformabout.sversion
 msgid "Version"
+msgstr ""
+
+#: uformsettings.slanguagechangemessage
+msgid "Interface language was changed. It may require restart of application."
+msgstr ""
+
+#: uformsettings.slanguagechangetitle
+msgid "Language change"
 msgstr ""
 

trunk/UCore.pas

@@ -118 +118 @@
     Game.Size := Point(ReadIntegerWithDefault('SizeX', 4), ReadIntegerWithDefault('SizeY', 4));
     Game.AnimationDuration := ReadIntegerWithDefault('AnimationDuration', 30);
+    if ValueExists('LanguageCode') then
+      Translator1.Language := Translator1.Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''))
+      else Translator1.Language := Translator1.Languages.SearchByCode('');
   finally
     Free;
@@ -133 +136 @@
     WriteInteger('SizeY', Game.Size.Y);
     WriteInteger('AnimationDuration', Game.AnimationDuration);
+    if Assigned(Translator1.Language) and (Translator1.Language.Code <> '') then
+      WriteString('LanguageCode', Translator1.Language.Code)
+      else DeleteValue('LanguageCode');
   finally
     Free;