Changeset 221 for trunk/Forms

Timestamp:

Jun 12, 2018, 11:04:18 AM (7 years ago)

Author:

chronos

Message:

• Fixed: OnKeyUp event is not fired if FormClient is docked onto FormMain. Pass this event from FormMain.
• Modified: Hide Game mode in New game dialog if DEBUG mode is not active. The feature is not finished yet.

Location:

trunk/Forms

Files:

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

trunk/Forms/UFormClient.lfm

@@ -7 +7 @@
   ClientHeight = 621
   ClientWidth = 775
-  DesignTimePPI = 144
+  DesignTimePPI = 120
   OnClose = FormClose
   OnCreate = FormCreate
@@ -17 +17 @@
   object StatusBar1: TStatusBar
     Left = 0
-    Height = 30
-    Top = 591
+    Height = 28
+    Top = 593
     Width = 775
     Panels = <    
@@ -34 +34 @@
   object ToolBar1: TToolBar
     Left = 0
-    Height = 591
+    Height = 593
     Top = 0
     Width = 32
@@ -80 +80 @@
   object PaintBox1: TPaintBox
     Left = 32
-    Height = 591
+    Height = 593
     Top = 0
     Width = 743

trunk/Forms/UFormClient.pas

@@ -416 +416 @@
 procedure TFormClient.FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState
   );
-begin
-  if (Key = 27) or (Key = 17) then
+const
+  ControlKey = 17;
+  EscapeKey = 27;
+begin
+  if (Key = EscapeKey) or (Key = ControlKey) then
   if Assigned(Core.Game.CurrentPlayer) then begin
     Client.View.SelectedCell := nil;

trunk/Forms/UFormMain.lfm

@@ -5 +5 @@
   Width = 775
   Caption = 'xTactics'
-  ClientHeight = 587
+  ClientHeight = 596
   ClientWidth = 775
-  DesignTimePPI = 144
+  DesignTimePPI = 120
   Menu = MainMenu1
   OnClose = FormClose
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  OnKeyUp = FormKeyUp
   OnShow = FormShow
   LCLVersion = '1.8.2.0'
@@ -77 +78 @@
   object PanelMain: TPanel
     Left = 0
-    Height = 547
+    Height = 556
     Top = 40
     Width = 775

trunk/Forms/UFormMain.pas

@@ -69 +69 @@
     procedure AToolBarBigIconsExecute(Sender: TObject);
     procedure AToolBarVisibleExecute(Sender: TObject);
+    procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure FormShow(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
@@ -172 +173 @@
 end;
 
+procedure TFormMain.FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState
+  );
+begin
+  // Pass KeyUp event to docked form
+  FormClient.FormKeyUp(Sender, Key, Shift);
+end;
+
 procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction);
 begin

trunk/Forms/UFormNew.lfm

@@ -9 +9 @@
   Constraints.MinHeight = 501
   Constraints.MinWidth = 667
-  DesignTimePPI = 144
+  DesignTimePPI = 120
   OnClose = FormClose
   OnCreate = FormCreate
@@ -21 +21 @@
     Top = 4
     Width = 749
-    ActivePage = TabSheet2
+    ActivePage = TabSheetMode
     Align = alClient
     BorderSpacing.Around = 4
-    TabIndex = 2
+    TabIndex = 0
     TabOrder = 0
     object TabSheetMode: TTabSheet
       Caption = 'Mode'
-      ClientHeight = 651
-      ClientWidth = 743
+      ClientHeight = 662
+      ClientWidth = 741
       object RadioButtonModeLocal: TRadioButton
         Left = 10
-        Height = 30
+        Height = 24
         Top = 14
-        Width = 68
+        Width = 59
         Caption = 'Local'
         Checked = True
@@ -43 +43 @@
       object RadioButtonModeNetworkServer: TRadioButton
         Left = 10
-        Height = 30
+        Height = 24
         Top = 48
-        Width = 154
+        Width = 123
         Caption = 'Network server'
         OnChange = RadioButtonModeLocalChange
@@ -52 +52 @@
       object RadioButtonModeNetworkClient: TRadioButton
         Left = 10
-        Height = 30
+        Height = 24
         Top = 152
-        Width = 149
+        Width = 120
         Caption = 'Network client'
         OnChange = RadioButtonModeLocalChange
@@ -61 +61 @@
       object EditServerAddress: TEdit
         Left = 24
-        Height = 36
+        Height = 28
         Top = 112
         Width = 220
@@ -68 +68 @@
       object SpinEditServerPort: TSpinEdit
         Left = 256
-        Height = 36
+        Height = 28
         Top = 112
         Width = 79
@@ -76 +76 @@
       object Label11: TLabel
         Left = 256
-        Height = 26
+        Height = 20
         Top = 88
-        Width = 41
+        Width = 30
         Caption = 'Port:'
         ParentColor = False
@@ -84 +84 @@
       object Label12: TLabel
         Left = 24
-        Height = 26
+        Height = 20
         Top = 88
-        Width = 74
+        Width = 56
         Caption = 'Address:'
         ParentColor = False
@@ -92 +92 @@
       object ListViewServers: TListView
         Left = 26
-        Height = 419
+        Height = 430
         Top = 181
         Width = 334
@@ -120 +120 @@
         Left = 27
         Height = 31
-        Top = 612
+        Top = 623
         Width = 94
         Action = AServerAdd
@@ -129 +129 @@
         Left = 240
         Height = 31
-        Top = 612
+        Top = 623
         Width = 94
         Action = AServerRemove
@@ -138 +138 @@
         Left = 136
         Height = 30
-        Top = 612
+        Top = 623
         Width = 94
         Action = AServerModify
@@ -145 +145 @@
       end
     end
-    object TabSheet1: TTabSheet
+    object TabSheetPlayers: TTabSheet
       Caption = 'Players'
-      ClientHeight = 651
-      ClientWidth = 743
+      ClientHeight = 662
+      ClientWidth = 741
       object ListViewPlayers: TListView
         Left = 4
-        Height = 601
+        Height = 612
         Top = 4
-        Width = 735
+        Width = 733
         Align = alTop
         Anchors = [akTop, akLeft, akRight, akBottom]
@@ -191 +191 @@
         Left = 224
         Height = 25
-        Top = 613
+        Top = 624
         Width = 83
         Action = APlayerRemove
@@ -200 +200 @@
         Left = 16
         Height = 25
-        Top = 613
+        Top = 624
         Width = 83
         Action = APlayerAdd
@@ -209 +209 @@
         Left = 120
         Height = 25
-        Top = 613
+        Top = 624
         Width = 83
         Action = APlayerModify
@@ -217 +217 @@
       end
     end
-    object TabSheet2: TTabSheet
+    object TabSheetMap: TTabSheet
       Caption = 'Map'
-      ClientHeight = 651
-      ClientWidth = 743
+      ClientHeight = 662
+      ClientWidth = 741
       object Label1: TLabel
         Left = 8
-        Height = 26
+        Height = 20
         Top = 9
-        Width = 95
+        Width = 74
         Caption = 'Map width:'
         ParentColor = False
@@ -231 +231 @@
       object Label2: TLabel
         Left = 8
-        Height = 26
+        Height = 20
         Top = 57
-        Width = 102
+        Width = 79
         Caption = 'Map height:'
         ParentColor = False
@@ -239 +239 @@
       object SpinEditMapSizeX: TSpinEdit
         Left = 128
-        Height = 36
+        Height = 28
         Top = 4
         Width = 98
@@ -249 +249 @@
       object SpinEditMapSizeY: TSpinEdit
         Left = 128
-        Height = 36
+        Height = 28
         Top = 55
         Width = 98
@@ -261 +261 @@
         Height = 47
         Top = 8
-        Width = 492
+        Width = 490
         Max = 100
         Min = 2
@@ -274 +274 @@
         Height = 47
         Top = 49
-        Width = 492
+        Width = 490
         Max = 100
         Min = 2
@@ -285 +285 @@
       object Label5: TLabel
         Left = 8
-        Height = 26
+        Height = 20
         Top = 104
-        Width = 83
+        Width = 64
         Caption = 'Grid type:'
         ParentColor = False
@@ -293 +293 @@
       object ComboBoxGridType: TComboBox
         Left = 146
-        Height = 36
+        Height = 28
         Top = 104
         Width = 208
-        ItemHeight = 0
+        ItemHeight = 20
         Items.Strings = (
           'Hexagonal'
@@ -307 +307 @@
       object ComboBoxMapShape: TComboBox
         Left = 146
-        Height = 36
+        Height = 28
         Top = 144
         Width = 208
-        ItemHeight = 0
+        ItemHeight = 20
         Items.Strings = (
           'Hexagonal'
@@ -322 +322 @@
       object Label8: TLabel
         Left = 8
-        Height = 26
+        Height = 20
         Top = 144
-        Width = 98
+        Width = 76
         Caption = 'Map shape:'
         ParentColor = False
@@ -332 +332 @@
         Height = 27
         Top = 110
-        Width = 255
+        Width = 253
         Anchors = [akTop, akLeft, akRight]
         AutoSize = False
@@ -340 +340 @@
       object SpinEditVoidPercent: TSpinEdit
         Left = 216
-        Height = 36
+        Height = 28
         Top = 224
         Width = 106
@@ -349 +349 @@
       object CheckBoxVoid: TCheckBox
         Left = 8
-        Height = 30
+        Height = 24
         Top = 232
-        Width = 187
+        Width = 149
         Caption = 'Inaccessible places'
         OnChange = CheckBoxVoidChange
@@ -358 +358 @@
       object CheckBoxCity: TCheckBox
         Left = 8
-        Height = 30
+        Height = 24
         Top = 272
-        Width = 71
+        Width = 60
         Caption = 'Cities'
         OnChange = CheckBoxCityChange
@@ -367 +367 @@
       object SpinEditCityPercent: TSpinEdit
         Left = 216
-        Height = 36
+        Height = 28
         Top = 272
         Width = 106
@@ -376 +376 @@
       object Label4: TLabel
         Left = 331
-        Height = 26
+        Height = 20
         Top = 272
-        Width = 15
+        Width = 12
         Caption = '%'
         ParentColor = False
@@ -384 +384 @@
       object Label3: TLabel
         Left = 331
-        Height = 26
+        Height = 20
         Top = 232
-        Width = 15
+        Width = 12
         Caption = '%'
         ParentColor = False
@@ -392 +392 @@
       object SpinEditNeutralUnits: TSpinEdit
         Left = 408
-        Height = 36
+        Height = 28
         Top = 384
         Width = 98
@@ -401 +401 @@
       object Label7: TLabel
         Left = 8
-        Height = 26
+        Height = 20
         Top = 384
-        Width = 227
+        Width = 172
         Caption = 'Max random neutral units:'
         ParentColor = False
@@ -409 +409 @@
       object EditImageFile: TEdit
         Left = 144
-        Height = 36
+        Height = 28
         Top = 184
-        Width = 476
+        Width = 474
         Anchors = [akTop, akLeft, akRight]
         TabOrder = 12
       end
       object ButtonImageBrowse: TButton
-        Left = 628
+        Left = 626
         Height = 25
         Top = 192
@@ -427 +427 @@
       object Label9: TLabel
         Left = 8
-        Height = 26
+        Height = 20
         Top = 184
-        Width = 90
+        Width = 70
         Caption = 'Image file:'
         ParentColor = False
@@ -435 +435 @@
       object CheckBoxBridges: TCheckBox
         Left = 8
-        Height = 30
+        Height = 24
         Top = 310
-        Width = 210
+        Width = 168
         Caption = 'Bridges between cells'
         TabOrder = 14
@@ -443 +443 @@
       object SpinEditMaxPower: TSpinEdit
         Left = 408
-        Height = 36
+        Height = 28
         Top = 344
         Width = 98
@@ -454 +454 @@
       object Label10: TLabel
         Left = 8
-        Height = 26
+        Height = 20
         Top = 344
-        Width = 156
+        Width = 119
         Caption = 'Max units per cell:'
         ParentColor = False
       end
     end
-    object TabSheet3: TTabSheet
+    object TabSheetRules: TTabSheet
       Caption = 'Rules'
-      ClientHeight = 651
-      ClientWidth = 743
+      ClientHeight = 662
+      ClientWidth = 741
       object RadioGroupGrowCells: TRadioGroup
         Left = 15
@@ -479 +479 @@
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 77
+        ClientHeight = 80
         ClientWidth = 308
         Items.Strings = (
@@ -490 +490 @@
       object Label6: TLabel
         Left = 8
-        Height = 26
+        Height = 20
         Top = 248
-        Width = 120
+        Width = 94
         Caption = 'Win objective:'
         ParentColor = False
@@ -498 +498 @@
       object ComboBoxWinObjective: TComboBox
         Left = 224
-        Height = 36
+        Height = 28
         Top = 244
         Width = 328
-        ItemHeight = 0
+        ItemHeight = 20
         Items.Strings = (
           'Defeat all oponents'
@@ -526 +526 @@
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 48
+        ClientHeight = 51
         ClientWidth = 301
         Items.Strings = (
@@ -538 +538 @@
         Height = 27
         Top = 24
-        Width = 583
+        Width = 581
         Anchors = [akTop, akLeft, akRight]
         AutoSize = False
@@ -548 +548 @@
         Height = 78
         Top = 290
-        Width = 720
+        Width = 718
         ActivePage = TabSheetCaptureCities
         Anchors = [akTop, akLeft, akRight]

trunk/Forms/UFormNew.pas

@@ -85 +85 @@
     SpinEditVoidPercent: TSpinEdit;
     Splitter1: TSplitter;
-    TabSheet1: TTabSheet;
-    TabSheet2: TTabSheet;
-    TabSheet3: TTabSheet;
+    TabSheetPlayers: TTabSheet;
+    TabSheetMap: TTabSheet;
+    TabSheetRules: TTabSheet;
     TabSheetStayAliveTurns: TTabSheet;
     TabSheetCaptureCells: TTabSheet;
@@ -343 +343 @@
   //Height := Trunc(1.5 * Height);
   //PageControl1.TabIndex := 0;
+  {$IFNDEF DEBUG}
+  TabSheetMode.TabVisible := False;
+  TabSheetMode.Enabled := False;
+  {$ENDIF}
 end;