Changeset 273 for trunk/Forms

Timestamp:

Jan 30, 2019, 8:08:44 AM (6 years ago)

Author:

chronos

Message:

• Added: Show units shape to see in which cell units are placed.
• Fixed: Do not place units with zero power in zero power cells.
• Fixed: Better checks of cell power if cell is without unit.

Location:

trunk/Forms

Files:

• UFormClient.pas (modified) (1 diff)
• UFormMain.lfm (modified) (2 diffs)
• UFormMain.pas (modified) (8 diffs)
• UFormNew.lfm (modified) (8 diffs)
• UFormNew.pas (modified) (1 diff)

trunk/Forms/UFormClient.pas

@@ -347 +347 @@
     FClient.OnNextPlayer := DoNextPlayer;
     FClient.View.DestRect := TRect.CreateBounds(TPoint.Create(0, 0), TPoint.Create(PaintBox1.Width, PaintBox1.Height));
-    FClient.ShowCellGrid := Core.ShowCellGrid;
+    FClient.CellGridVisible := Core.CellGridVisible;
+    FClient.UnitShapeVisible := Core.UnitShapeVisible;
   end;
   Redraw;

trunk/Forms/UFormMain.lfm

@@ -149 +149 @@
         Action = AMapGridVisible
       end
+      object MenuItem34: TMenuItem
+        Action = AUnitShapeVisible
+      end
+      object MenuItem35: TMenuItem
+        Caption = '-'
+      end
       object MenuItem21: TMenuItem
         Action = AToolBarVisible
@@ -225 +231 @@
       OnExecute = AMapGridVisibleExecute
     end
+    object AUnitShapeVisible: TAction
+      Caption = 'Unit shape visible'
+      OnExecute = AUnitShapeVisibleExecute
+    end
   end
   object PopupMenuToolbar: TPopupMenu

trunk/Forms/UFormMain.pas

@@ -18 +18 @@
 
   TFormMain = class(TForm)
+    AUnitShapeVisible: TAction;
     AMapGridVisible: TAction;
     AStatusBarVisible: TAction;
@@ -49 +50 @@
     MenuItem32: TMenuItem;
     MenuItem33: TMenuItem;
+    MenuItem34: TMenuItem;
+    MenuItem35: TMenuItem;
     MenuItemDebug: TMenuItem;
     MenuItem31: TMenuItem;
@@ -76 +79 @@
     procedure AToolBarBigIconsExecute(Sender: TObject);
     procedure AToolBarVisibleExecute(Sender: TObject);
+    procedure AUnitShapeVisibleExecute(Sender: TObject);
     procedure FormActivate(Sender: TObject);
     procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
@@ -201 +205 @@
 end;
 
+procedure TFormMain.AUnitShapeVisibleExecute(Sender: TObject);
+begin
+  AUnitShapeVisible.Checked := not AUnitShapeVisible.Checked;
+  UpdateClientForms;
+end;
+
 procedure TFormMain.FormActivate(Sender: TObject);
 begin
@@ -220 +230 @@
   Core.PersistentForm.Save(Self);
   SaveConfig(Core.XMLConfig1, 'FormMain');
-  Core.ShowCellGrid := AMapGridVisible.Checked;
+  Core.CellGridVisible := AMapGridVisible.Checked;
+  Core.UnitShapeVisible := AUnitShapeVisible.Checked;
   Core.Done;
 end;
@@ -244 +255 @@
   FormClient.AStatusBarVisible.Checked := AStatusBarVisible.Checked;
   FormClient.AStatusBarVisible.Update;
-  Core.ShowCellGrid := AMapGridVisible.Checked;
-  if Assigned(FormClient.Client) then
-    FormClient.Client.ShowCellGrid := Core.ShowCellGrid;
+  Core.CellGridVisible := AMapGridVisible.Checked;
+  Core.UnitShapeVisible := AUnitShapeVisible.Checked;
+  if Assigned(FormClient.Client) then begin
+    FormClient.Client.CellGridVisible := Core.CellGridVisible;
+    FormClient.Client.UnitShapeVisible := Core.UnitShapeVisible;
+  end;
   FormClient.Redraw;
   for I := 0 to Core.FormClients.Count - 1 do begin
@@ -255 +269 @@
     Core.FormClients[I].AStatusBarVisible.Checked := AStatusBarVisible.Checked;
     Core.FormClients[I].AStatusBarVisible.Update;
-    if Assigned(Core.FormClients[I].Client) then
-      Core.FormClients[I].Client.ShowCellGrid := Core.ShowCellGrid;
+    if Assigned(Core.FormClients[I].Client) then begin
+      Core.FormClients[I].Client.CellGridVisible := Core.CellGridVisible;
+      Core.FormClients[I].Client.UnitShapeVisible := Core.UnitShapeVisible;
+    end;
     Core.FormClients[I].Redraw;
   end;
@@ -265 +281 @@
   if not FormShown then begin
     Core.LoadConfig;
-    AMapGridVisible.Checked := Core.ShowCellGrid;
+    AMapGridVisible.Checked := Core.CellGridVisible;
+    AUnitShapeVisible.Checked := Core.UnitShapeVisible;
     Core.ScaleDPI;
     Core.PersistentForm.Load(Self, True);

trunk/Forms/UFormNew.lfm

@@ -21 +21 @@
     Top = 4
     Width = 806
-    ActivePage = TabSheetMap
+    ActivePage = TabSheetRules
     Align = alClient
     BorderSpacing.Around = 4
-    TabIndex = 2
+    TabIndex = 3
     TabOrder = 0
     OnChange = PageControl1Change
@@ -326 +326 @@
         object ComboBoxGridType: TComboBox
           Left = 146
-          Height = 38
+          Height = 42
           Top = 104
           Width = 208
@@ -343 +343 @@
         object ComboBoxMapShape: TComboBox
           Left = 146
-          Height = 38
+          Height = 42
           Top = 144
           Width = 208
@@ -546 +546 @@
       object Panel4: TPanel
         Left = 0
-        Height = 655
+        Height = 652
         Top = 0
-        Width = 739
+        Width = 796
         Align = alClient
         BevelOuter = bvNone
-        ClientHeight = 655
-        ClientWidth = 739
+        ClientHeight = 652
+        ClientWidth = 796
         TabOrder = 0
         object RadioGroupGrowCells: TRadioGroup
@@ -587 +587 @@
         object ComboBoxWinObjective: TComboBox
           Left = 224
-          Height = 38
+          Height = 42
           Top = 244
           Width = 328
@@ -635 +635 @@
           Height = 78
           Top = 290
-          Width = 716
+          Width = 773
           ActivePage = TabSheetCaptureEntireMap
           Anchors = [akTop, akLeft, akRight]
@@ -647 +647 @@
           object TabSheetCaptureCells: TTabSheet
             ClientHeight = 74
-            ClientWidth = 712
+            ClientWidth = 763
             object Label14: TLabel
               Left = 8
@@ -669 +669 @@
           object TabSheetStayAliveTurns: TTabSheet
             ClientHeight = 74
-            ClientWidth = 712
+            ClientWidth = 763
             object Label13: TLabel
               Left = 8

trunk/Forms/UFormNew.pas

@@ -417 +417 @@
   Client.View.ZoomAll;
   //Client.ControlPlayer := GamePreview.Players.First;
-  Client.ShowCellGrid := True;
+  Client.CellGridVisible := True;
   Bitmap.Canvas.Brush.Color := MapBackgroundColor; //clBackground; //PaintBox1.GetColorResolvingParent;
   Bitmap.Canvas.FillRect(0, 0, Bitmap.Width, Bitmap.Height);