Changeset 195 for trunk

Timestamp:

May 15, 2018, 4:30:54 PM (7 years ago)

Author:

chronos

Message:

• Added: Settings option to automatically reopen last saved game on application start.

Location:

trunk

Files:

• Forms/UFormSettings.lfm (modified) (6 diffs)
• Forms/UFormSettings.pas (modified) (3 diffs)
• Languages/xtactics.cs.po (modified) (1 diff)
• Languages/xtactics.po (modified) (1 diff)
• Packages/CoolTranslator/UCoolTranslator.pas (modified) (1 diff)
• UCore.pas (modified) (8 diffs)

trunk/Forms/UFormSettings.lfm

@@ -10 +10 @@
   Constraints.MinHeight = 327
   Constraints.MinWidth = 554
+  DesignTimePPI = 120
   OnCreate = FormCreate
   OnShow = FormShow
   Position = poMainFormCenter
-  LCLVersion = '1.8.0.4'
+  LCLVersion = '1.8.2.0'
   object ButtonOk: TButton
     Left = 444
@@ -47 +48 @@
     object TabSheetGeneral: TTabSheet
       Caption = 'General'
-      ClientHeight = 220
-      ClientWidth = 540
+      ClientHeight = 231
+      ClientWidth = 538
       object Label2: TLabel
-        Left = 27
-        Height = 26
+        Left = 20
+        Height = 20
         Top = 78
-        Width = 150
+        Width = 116
         Caption = 'Animation speed:'
         ParentColor = False
@@ -59 +60 @@
       object SpinEditAnimSpeed: TSpinEdit
         Left = 232
-        Height = 36
+        Height = 28
         Top = 72
         Width = 122
@@ -66 +67 @@
       object Label3: TLabel
         Left = 368
-        Height = 26
+        Height = 20
         Top = 82
-        Width = 15
+        Width = 12
         Caption = '%'
         ParentColor = False
       end
       object CheckBoxAutoSaveTurn: TCheckBox
-        Left = 8
+        Left = 20
         Height = 27
         Top = 112
-        Width = 586
+        Width = 584
         Anchors = [akTop, akLeft, akRight]
         AutoSize = False
@@ -84 +85 @@
       object Label1: TLabel
         Left = 20
-        Height = 26
+        Height = 20
         Top = 26
-        Width = 88
+        Width = 68
         Caption = 'Language:'
         ParentColor = False
@@ -92 +93 @@
       object ComboBoxLanguage: TComboBox
         Left = 178
-        Height = 40
+        Height = 28
         Top = 24
         Width = 196
-        ItemHeight = 0
+        ItemHeight = 20
         Style = csDropDownList
         TabOrder = 2
+      end
+      object CheckBoxReopenLastFile: TCheckBox
+        Left = 20
+        Height = 24
+        Top = 152
+        Width = 198
+        Caption = 'Reopen last game on start'
+        TabOrder = 3
       end
     end

trunk/Forms/UFormSettings.pas

@@ -16 +16 @@
     ButtonOk: TButton;
     ButtonCancel: TButton;
+    CheckBoxReopenLastFile: TCheckBox;
     CheckBoxAutoSaveTurn: TCheckBox;
     CheckBox2: TCheckBox;
@@ -85 +86 @@
   SpinEditY.Value := Core.ScaleDPI1.DPI.Y;
   CheckBoxAutoSaveTurn.Checked := Core.AutoSaveEnabled;
+  CheckBoxReopenLastFile.Checked := Core.ReopenLastFile;
 end;
 
@@ -96 +98 @@
   Core.ScaleDPI1.DPI := Point(SpinEditX.Value, SpinEditY.Value);
   Core.AutoSaveEnabled := CheckBoxAutoSaveTurn.Checked;
+  Core.ReopenLastFile := CheckBoxReopenLastFile.Checked;
 end;
 

trunk/Languages/xtactics.cs.po

@@ -591 +591 @@
 msgid "Developer mode"
 msgstr "Vývojářský režim"
+
+#: tformsettings.checkboxreopenlastfile.caption
+msgid "Reopen last game on start"
+msgstr "Znovuotevřít poslední hru při startu"
 
 #: tformsettings.label1.caption

trunk/Languages/xtactics.po

@@ -575 +575 @@
 #: tformsettings.checkboxdevelmode.caption
 msgid "Developer mode"
+msgstr ""
+
+#: tformsettings.checkboxreopenlastfile.caption
+msgid "Reopen last game on start"
 msgstr ""
 

trunk/Packages/CoolTranslator/UCoolTranslator.pas

@@ -295 +295 @@
   Result := FPOFilesFolder;
   if Copy(Result, 1, 1) <> DirectorySeparator then
-    Result := ExtractFileDir(UTF8Encode(Application.ExeName)) +
+    Result := ExtractFileDir(Application.ExeName) +
       DirectorySeparator + Result;
 end;

trunk/UCore.pas

@@ -63 +63 @@
     StoredDimension: TControlDimension;
     RegistryContext: TRegistryContext;
+    GameLoaded: Boolean;
     procedure LoadRecentExecute(Sender: TObject);
     procedure ProcessComputerTurns;
@@ -87 +88 @@
     AnimationSpeed: Integer;
     AutoSaveEnabled: Boolean;
+    ReopenLastFile: Boolean;
     FormClients: TFPGObjectList<TFormClient>;
     Clients: TClients;
@@ -163 +165 @@
   AnimationSpeed := XMLConfig1.GetValue('AnimationSpeed', 50);
   AutoSaveEnabled := XMLConfig1.GetValue('AutoSave', True);
+  ReopenLastFile := XMLConfig1.GetValue('ReopenLastFile', True);
   CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(String(XMLConfig1.GetValue('Language', '')));
   ScaleDPI1.DPI := Point(XMLConfig1.GetValue('DPIX', 96), XMLConfig1.GetValue('DPIY', 96));
@@ -175 +178 @@
   XMLConfig1.SetValue('AnimationSpeed', AnimationSpeed);
   XMLConfig1.SetValue('AutoSave', AutoSaveEnabled);
+  XMLConfig1.SetValue('ReopenLastFile', ReopenLastFile);
   XMLConfig1.SetValue('DPIX', ScaleDPI1.DPI.X);
   XMLConfig1.SetValue('DPIY', ScaleDPI1.DPI.Y);
@@ -186 +190 @@
   // Command line parameter handling
   if (ParamCount > 0) then begin
-    FileName := UTF8Encode(ParamStr(1));
+    FileName := ParamStr(1);
     if FileExists(FileName) then LoadGame(FileName);
   end;
@@ -294 +298 @@
       FormNew.Save(Server);
       StartNewGame;
+      GameLoaded := False;
     end;
   finally
@@ -419 +424 @@
   NewClient: TClient;
 begin
+  GameLoaded := True;
+
   Game.LoadFromFile(FileName);
   Server.InitClients;
@@ -541 +548 @@
 
     CommandLineParams;
+    if not GameLoaded and ReopenLastFile and (LastOpenedList1.Items.Count > 0) then
+      LoadGame(LastOpenedList1.Items[0]);
     ScaleDPI;