Changeset 203 for trunk/Forms

Timestamp:

May 18, 2018, 12:54:37 AM (7 years ago)

Author:

chronos

Message:

• Fixed: Player turn start/end signaling from server to clients.
• Added: Save action to save game without opening save dialog.
• Fixed: Move dialog was not opened after new game was created.

Location:

trunk/Forms

Files:

• UFormClient.lfm (modified) (5 diffs)
• UFormClient.pas (modified) (10 diffs)
• UFormMain.lfm (modified) (6 diffs)
• UFormMain.pas (modified) (1 diff)

trunk/Forms/UFormClient.lfm

@@ -1 +1 @@
 object FormClient: TFormClient
-  Left = 418
+  Left = 662
   Height = 621
-  Top = 253
+  Top = 413
   Width = 775
   Caption = 'Client'
   ClientHeight = 621
   ClientWidth = 775
-  DesignTimePPI = 120
+  DesignTimePPI = 144
   OnClose = FormClose
   OnCreate = FormCreate
@@ -17 +17 @@
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 28
-    Top = 593
+    Height = 30
+    Top = 591
     Width = 775
     Panels = <    
@@ -34 +34 @@
   object ToolBar1: TToolBar
     Left = 0
-    Height = 593
+    Height = 591
     Top = 0
     Width = 32
@@ -75 +75 @@
   object PaintBox1: TPaintBox
     Left = 32
-    Height = 593
+    Height = 591
     Top = 0
     Width = 743
@@ -132 +132 @@
       ImageIndex = 0
       OnExecute = AGameEndTurnExecute
+      ShortCut = 16468
     end
   end

trunk/Forms/UFormClient.pas

@@ -76 +76 @@
     LastTimerTime: TDateTime;
     TimerPeriod: TDateTime;
+    TurnActive: Boolean;
     procedure SetClient(AValue: TClient);
     procedure DoClientChange(Sender: TObject);
-    procedure DoOnMove(CellFrom, CellTo: TCell; var CountOnce,
+    procedure DoTurnStart(Sender: TObject);
+    procedure DoMove(CellFrom, CellTo: TCell; var CountOnce,
       CountRepeat: Integer; Update: Boolean; var Confirm: Boolean);
   public
     procedure LoadConfig(Config: TXmlConfig; Path: string);
     procedure SaveConfig(Config: TXmlConfig; Path: string);
-    procedure ReloadView;
+    procedure UpdateInterface;
     procedure Redraw;
     property Client: TClient read FClient write SetClient;
@@ -103 +105 @@
 { TFormClient }
 
-procedure TFormClient.DoOnMove(CellFrom, CellTo: TCell; var CountOnce,
+procedure TFormClient.DoMove(CellFrom, CellTo: TCell; var CountOnce,
   CountRepeat: Integer; Update: Boolean; var Confirm: Boolean);
 var
@@ -210 +212 @@
     FClient.Form := Self;
     FClient.OnChange := DoClientChange;
-    FClient.OnMove := DoOnMove;
+    FClient.OnMove := DoMove;
+    FClient.OnTurnStart := DoTurnStart();
   end;
   Redraw;
@@ -218 +221 @@
 begin
   Redraw;
+end;
+
+procedure TFormClient.DoTurnStart(Sender: TObject);
+begin
+  TurnActive := True;
+  UpdateInterface;
 end;
 
@@ -238 +247 @@
 end;
 
-procedure TFormClient.ReloadView;
+procedure TFormClient.UpdateInterface;
 begin
   if AToolBarBigIcons.Checked then begin
@@ -255 +264 @@
   ToolBar1.Visible := AToolBarVisible.Checked;
   StatusBar1.Visible := AStatusBarVisible.Checked;
+  AGameEndTurn.Enabled := TurnActive;
 end;
 
@@ -295 +305 @@
 begin
   AToolBarBigIcons.Checked := not AToolBarBigIcons.Checked;
-  ReloadView;
+  UpdateInterface;
 end;
 
@@ -301 +311 @@
 begin
   AStatusBarVisible.Checked := not AStatusBarVisible.Checked;
-  ReloadView;
+  UpdateInterface;
 end;
 
 procedure TFormClient.AGameEndTurnExecute(Sender: TObject);
-var
-  P: TGameProtocolClient;
-  P2: TCommPin;
-begin
-  P := Client.Protocol;
-  P2 := P.Pin;
+begin
+  TurnActive := False;
   Client.Protocol.TurnEnd;
+  UpdateInterface;
 end;
 
@@ -317 +324 @@
 begin
   AToolBarVisible.Checked := not AToolBarVisible.Checked;
-  ReloadView;
+  UpdateInterface;
 end;
 
@@ -370 +377 @@
   LoadConfig(Core.XMLConfig1, 'FormClient');
   Core.PersistentForm.Load(Self);
-  ReloadView;
+  UpdateInterface;
   Redraw;
 end;

trunk/Forms/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 447
+  Left = 801
   Height = 621
-  Top = 303
+  Top = 352
   Width = 775
   Caption = 'xTactics'
-  ClientHeight = 596
+  ClientHeight = 587
   ClientWidth = 775
-  DesignTimePPI = 120
+  DesignTimePPI = 144
   Menu = MainMenu1
   OnClose = FormClose
@@ -13 +13 @@
   OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '1.8.0.6'
+  LCLVersion = '1.8.2.0'
   WindowState = wsMaximized
   object ToolBar1: TToolBar
@@ -77 +77 @@
   object PanelMain: TPanel
     Left = 0
-    Height = 556
+    Height = 547
     Top = 40
     Width = 775
@@ -92 +92 @@
       object MenuItem2: TMenuItem
         Action = Core.AGameNew
+        Caption = 'New...'
       end
       object MenuItem3: TMenuItem
@@ -99 +100 @@
         Action = Core.AGameRestart
       end
-      object MenuItem4: TMenuItem
-        Action = Core.AGameEndTurn
-      end
       object MenuItem14: TMenuItem
         Action = Core.AGameLoad
@@ -110 +108 @@
       object MenuItem15: TMenuItem
         Action = Core.AGameSave
+        ShortCut = 16467
+      end
+      object MenuItem29: TMenuItem
+        Action = Core.AGameSaveAs
+        Caption = 'Save as'
+        ShortCut = 24659
       end
       object MenuItem5: TMenuItem

trunk/Forms/UFormMain.pas

@@ -43 +43 @@
     MenuItem27: TMenuItem;
     MenuItem28: TMenuItem;
+    MenuItem29: TMenuItem;
     MenuItemLoadRecent: TMenuItem;
     MenuItem3: TMenuItem;
-    MenuItem4: TMenuItem;
     MenuItem5: TMenuItem;
     MenuItem6: TMenuItem;