Changeset 36

Timestamp:

Oct 13, 2019, 5:14:50 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Missing UFormHistory files.
• Added: Allow to disable moves history recording.

Location:

trunk

Files:

• Forms/UFormHistory.lfm (added)
• Forms/UFormHistory.lrj (added)
• Forms/UFormHistory.pas (added)
• Forms/UFormMain.lfm (modified) (1 diff)
• Forms/UFormMain.pas (modified) (3 diffs)
• Forms/UFormNew.lfm (modified) (4 diffs)
• Forms/UFormNew.lrj (modified) (1 diff)
• Forms/UFormNew.pas (modified) (3 diffs)
• Forms/UFormSettings.pas (modified) (1 diff)
• Game2048.lpi (modified) (1 diff)
• Languages/Game2048.cs.mo (modified) ( previous)
• Languages/Game2048.cs.po (modified) (1 diff)
• Languages/Game2048.po (modified) (1 diff)
• Packages/Common/URegistry.pas (modified) (1 diff)
• UCore.pas (modified) (3 diffs)
• UGame.pas (modified) (13 diffs)

trunk/Forms/UFormMain.lfm

@@ -37 +37 @@
         Action = Core.AComputer
       end
-      object MenuItem5: TMenuItem
+      object MenuItemMovesHistory: TMenuItem
         Action = Core.AHistory
       end

trunk/Forms/UFormMain.pas

@@ -19 +19 @@
     MenuItem3: TMenuItem;
     MenuItem4: TMenuItem;
-    MenuItem5: TMenuItem;
+    MenuItemMovesHistory: TMenuItem;
     MenuItemTools: TMenuItem;
     MenuItemNew: TMenuItem;
@@ -88 +88 @@
   Core.PersistentForm1.Load(Self);
   UpdateInterface;
+  if Core.Game.Board.GetEmptyTilesCount > Core.Game.Board.Size.X * Core.Game.Board.Size.Y - 2 then
+    Core.Game.New;
 end;
 
@@ -108 +110 @@
   ToolsVisible: Boolean;
 begin
+  MenuItemMovesHistory.Visible := Core.Game.RecordHistory;
   ToolsVisible := False;
   for I := 0 to MenuItemTools.Count - 1 do

trunk/Forms/UFormNew.lfm

@@ -1 +1 @@
 object FormNew: TFormNew
   Left = 703
-  Height = 212
-  Top = 748
-  Width = 487
+  Height = 266
+  Top = 694
+  Width = 501
   Caption = 'New game'
-  ClientHeight = 212
-  ClientWidth = 487
+  ClientHeight = 266
+  ClientWidth = 501
   DesignTimePPI = 144
   OnClose = FormClose
@@ -45 +45 @@
     Left = 120
     Height = 38
-    Top = 158
+    Top = 212
     Width = 113
     Anchors = [akLeft, akBottom]
@@ -55 +55 @@
     Left = 280
     Height = 38
-    Top = 158
+    Top = 212
     Width = 113
     Anchors = [akLeft, akBottom]
@@ -70 +70 @@
     TabOrder = 3
   end
+  object CheckBoxRecordHistory: TCheckBox
+    Left = 16
+    Height = 30
+    Top = 88
+    Width = 210
+    Caption = 'Record moves history'
+    TabOrder = 4
+  end
 end

trunk/Forms/UFormNew.lrj

@@ -4 +4 @@
 {"hash":77089212,"name":"tformnew.buttoncancel.caption","sourcebytes":[67,97,110,99,101,108],"value":"Cancel"},
 {"hash":1339,"name":"tformnew.buttonok.caption","sourcebytes":[79,75],"value":"OK"},
-{"hash":260260820,"name":"tformnew.checkboxundoenabled.caption","sourcebytes":[85,110,100,111,32,101,110,97,98,108,101,100],"value":"Undo enabled"}
+{"hash":260260820,"name":"tformnew.checkboxundoenabled.caption","sourcebytes":[85,110,100,111,32,101,110,97,98,108,101,100],"value":"Undo enabled"},
+{"hash":146862089,"name":"tformnew.checkboxrecordhistory.caption","sourcebytes":[82,101,99,111,114,100,32,109,111,118,101,115,32,104,105,115,116,111,114,121],"value":"Record moves history"}
 ]}

trunk/Forms/UFormNew.pas

@@ -16 +16 @@
     ButtonCancel: TButton;
     ButtonOk: TButton;
+    CheckBoxRecordHistory: TCheckBox;
     CheckBoxUndoEnabled: TCheckBox;
     ComboBoxSize: TComboBox;
@@ -60 +61 @@
   ComboBoxSize.ItemIndex := Game.Board.Size.X - 2;
   CheckBoxUndoEnabled.Checked := Game.UndoEnabled;
+  CheckBoxRecordHistory.Checked := Game.RecordHistory;
 end;
 
@@ -66 +68 @@
   Game.Board.Size := Point(2 + ComboBoxSize.ItemIndex, 2 + ComboBoxSize.ItemIndex);
   Game.UndoEnabled := CheckBoxUndoEnabled.Checked;
+  Game.RecordHistory := CheckBoxRecordHistory.Checked;
 end;
 

trunk/Forms/UFormSettings.pas

@@ -62 +62 @@
     Core.Translator1.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
   end;
-  Close;
+  ModalResult := mrOk;
 end;
 

trunk/Game2048.lpi

@@ -173 +173 @@
         <RangeChecks Value="True"/>
         <OverflowChecks Value="True"/>
-        <StackChecks Value="True"/>
       </Checks>
       <VerifyObjMethodCallValidity Value="True"/>

trunk/Languages/Game2048.cs.po

@@ -126 +126 @@
 msgstr "Nová hra"
 
+#: tformnew.checkboxrecordhistory.caption
+msgctxt "tformnew.checkboxrecordhistory.caption"
+msgid "Record moves history"
+msgstr "Zaznamenávat historii pohybů"
+
 #: tformnew.checkboxundoenabled.caption
 msgid "Undo enabled"

trunk/Languages/Game2048.po

@@ -116 +116 @@
 msgstr ""
 
+#: tformnew.checkboxrecordhistory.caption
+msgctxt "tformnew.checkboxrecordhistory.caption"
+msgid "Record moves history"
+msgstr ""
+
 #: tformnew.checkboxundoenabled.caption
 msgid "Undo enabled"

trunk/Packages/Common/URegistry.pas

@@ -133 +133 @@
 begin
   {$IFDEF Linux}
-  CloseKey;
+  //CloseKey;
   {$ENDIF}
   Result := inherited OpenKey(Key, CanCreate);

trunk/UCore.pas

@@ -88 +88 @@
   FormSettings := TFormSettings.Create(nil);
   try
-    FormSettings.ShowModal;
+    if FormSettings.ShowModal = mrOk then begin
+      FormMain.UpdateInterface;
+      UpdateInterface;
+    end;
   finally
     FreeAndNil(FormSettings);
@@ -153 +156 @@
       FormNew.Save(Core.Game);
       Game.New;
+      UpdateInterface;
+      FormMain.UpdateInterface;
     end;
   finally
@@ -184 +189 @@
 begin
   AUndo.Enabled := Game.CanUndo;
+  AHistory.Enabled := Game.RecordHistory;
   {$IFDEF DEBUG}
   AComputer.Enabled := True;

trunk/UGame.pas

@@ -61 +61 @@
     InitialTilesPos: array of TPoint;
     procedure GetStep(GameStep: TGame; Step: Integer);
+    procedure Clear;
     constructor Create;
     destructor Destroy; override;
@@ -96 +97 @@
     FOnGameOver: TNotifyEvent;
     FOnWin: TNotifyEvent;
+    FRecordHistory: Boolean;
     FRunning: Boolean;
     FScore: Integer;
@@ -101 +103 @@
     FBoardUndo: TBoard;
     function GetTileColor(Value: Integer): TColor;
+    procedure SetRecordHistory(AValue: Boolean);
     procedure SetScore(AValue: Integer);
     procedure DoChange;
@@ -138 +141 @@
     property OnGameOver: TNotifyEvent read FOnGameOver write FOnGameOver;
     property Moving: Boolean read FMoving;
+    property RecordHistory: Boolean read FRecordHistory write SetRecordHistory;
   end;
 
@@ -173 +177 @@
 var
   I: Integer;
-  C: Integer;
-  HistoryMove: THistoryMove;
 begin
   with Reg do begin
     CurrentContext := RegContext;
-    C := ReadIntegerWithDefault('Count', 0);
-    for I := 0 to C - 1 do begin
-      HistoryMove := THistoryMove.Create;
-      Add(HistoryMove);
-      HistoryMove.LoadFromRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '/' + IntToStr(I)));
+    Count := ReadIntegerWithDefault('Count', 0);
+    for I := 0 to Count - 1 do begin
+      Items[I] := THistoryMove.Create;
+      THistoryMove(Items[I]).LoadFromRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '/' + IntToStr(I)));
     end;
   end;
@@ -229 +230 @@
       else raise Exception.Create('Tile should be empty');
   end;
+end;
+
+procedure THistory.Clear;
+begin
+  Moves.Clear;
+  SetLength(InitialTilesPos, 0);
 end;
 
@@ -475 +482 @@
     Result := EmptyTiles[Random(EmptyTiles.Count)];
     Result.Value := NewValue;
+    if RecordHistory then begin
+      SetLength(History.InitialTilesPos, Length(History.InitialTilesPos) + 1);
+      History.InitialTilesPos[Length(History.InitialTilesPos) - 1] := Result.Index;
+    end;
   end;
   EmptyTiles.Free;
@@ -512 +523 @@
 var
   I: Integer;
-  NewTile: TTile;
 begin
   FCanUndo := False;
@@ -518 +528 @@
   Score := 0;
   Running := True;
-  with History do begin
-    Moves.Clear;
-
-    SetLength(InitialTilesPos, 0);
-    for I := 0 to 1 do begin
-      NewTile := FillRandomTile(0);
-      SetLength(InitialTilesPos, Length(InitialTilesPos) + 1);
-      InitialTilesPos[Length(InitialTilesPos) - 1] := NewTile.Index;
-    end;
-  end;
+  History.Clear;
+  for I := 0 to 1 do
+    FillRandomTile(0);
   DoChange;
 end;
@@ -860 +863 @@
 
     NewTile := FillRandomTile;
-    HistoryMove := THistoryMove.Create;
-    HistoryMove.Direction := Direction;
-    HistoryMove.NewItemPos := NewTile.Index;
-    HistoryMove.NewItemValue := NewTile.Value;
-    History.Moves.Add(HistoryMove);
+    if RecordHistory then begin
+      HistoryMove := THistoryMove.Create;
+      HistoryMove.Direction := Direction;
+      HistoryMove.NewItemPos := NewTile.Index;
+      HistoryMove.NewItemValue := NewTile.Value;
+      History.Moves.Add(HistoryMove);
+    end;
 
     if not CanMove and (Board.GetEmptyTilesCount = 0) then
@@ -902 +907 @@
     WriteBool('CanUndo', FCanUndo);
     WriteBool('UndoEnabled', UndoEnabled);
+    WriteBool('RecordHistory', RecordHistory);
     FBoardUndo.SaveToRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\BoardUndo'));
     Board.SaveToRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\Board'));
@@ -924 +930 @@
     FCanUndo := ReadBoolWithDefault('CanUndo', False);
     UndoEnabled := ReadBoolWithDefault('UndoEnabled', True);
+    RecordHistory := ReadBoolWithDefault('RecordHistory', False);
     FBoardUndo.LoadFromRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\BoardUndo'));
     Board.LoadFromRegistry(Reg, TRegistryContext.Create(RegContext.RootKey, RegContext.Key + '\Board'));
@@ -970 +977 @@
 end;
 
+procedure TGame.SetRecordHistory(AValue: Boolean);
+begin
+  if FRecordHistory = AValue then Exit;
+  FRecordHistory := AValue;
+  if not FRecordHistory then History.Clear;
+end;
+
 procedure TGame.SetScore(AValue: Integer);
 begin