Changeset 74 for trunk/Forms

Timestamp:

Oct 4, 2014, 9:19:27 PM (10 years ago)

Author:

chronos

Message:

• Added: Show player color in player list.
• Added: Confirmation dialog for game restart action.

Location:

trunk/Forms

Files:

• UFormMain.lfm (modified) (1 diff)
• UFormMain.lrt (modified) (1 diff)
• UFormNew.lfm (modified) (20 diffs)
• UFormNew.pas (modified) (3 diffs)

trunk/Forms/UFormMain.lfm

@@ -89 +89 @@
       Top = 162
       Width = 32
-      Caption = 'ToolButton9'
       Style = tbsSeparator
     end

trunk/Forms/UFormMain.lrt

@@ -1 +1 @@
 TFORMMAIN.CAPTION=xTactics
-TFORMMAIN.TOOLBUTTON9.CAPTION=ToolButton9
 TFORMMAIN.MENUITEM1.CAPTION=Game
 TFORMMAIN.MENUITEM5.CAPTION=-

trunk/Forms/UFormNew.lfm

@@ -49 +49 @@
       TabOrder = 0
       ViewStyle = vsReport
+      OnCustomDrawSubItem = ListView1CustomDrawSubItem
       OnData = ListView1Data
       OnDblClick = ListView1DblClick
@@ -127 +128 @@
     object CheckBoxVoid: TCheckBox
       Left = 8
-      Height = 24
+      Height = 27
       Top = 101
-      Width = 175
+      Width = 198
       Caption = 'Inaccessible places'
       OnChange = CheckBoxVoidChange
@@ -136 +137 @@
     object Label1: TLabel
       Left = 8
-      Height = 22
+      Height = 25
       Top = 9
-      Width = 88
+      Width = 104
       Caption = 'Map width:'
       ParentColor = False
@@ -144 +145 @@
     object SpinEditMapSizeX: TSpinEdit
       Left = 128
-      Height = 32
+      Height = 35
       Top = 4
       Width = 98
@@ -154 +155 @@
     object SpinEditMapSizeY: TSpinEdit
       Left = 128
-      Height = 32
+      Height = 35
       Top = 55
       Width = 98
@@ -164 +165 @@
     object SpinEditVoidPercent: TSpinEdit
       Left = 216
-      Height = 32
+      Height = 35
       Top = 97
       Width = 106
@@ -173 +174 @@
     object Label3: TLabel
       Left = 331
-      Height = 22
+      Height = 25
       Top = 102
-      Width = 15
+      Width = 17
       Caption = '%'
       ParentColor = False
@@ -207 +208 @@
     object Label2: TLabel
       Left = 8
-      Height = 22
+      Height = 25
       Top = 57
-      Width = 94
+      Width = 110
       Caption = 'Map height:'
       ParentColor = False
@@ -215 +216 @@
     object CheckBoxCity: TCheckBox
       Left = 8
-      Height = 24
+      Height = 27
       Top = 141
-      Width = 68
+      Width = 73
       Caption = 'Cities'
       OnChange = CheckBoxCityChange
@@ -224 +225 @@
     object SpinEditCityPercent: TSpinEdit
       Left = 216
-      Height = 32
+      Height = 35
       Top = 137
       Width = 106
@@ -233 +234 @@
     object Label4: TLabel
       Left = 331
-      Height = 22
+      Height = 25
       Top = 142
-      Width = 15
+      Width = 17
       Caption = '%'
       ParentColor = False
@@ -253 +254 @@
       ChildSizing.Layout = cclLeftToRightThenTopToBottom
       ChildSizing.ControlsPerLine = 1
-      ClientHeight = 52
+      ClientHeight = 49
       ClientWidth = 301
       Items.Strings = (
@@ -275 +276 @@
       ChildSizing.Layout = cclLeftToRightThenTopToBottom
       ChildSizing.ControlsPerLine = 1
-      ClientHeight = 81
+      ClientHeight = 78
       ClientWidth = 308
       Items.Strings = (
@@ -286 +287 @@
     object ComboBoxGridType: TComboBox
       Left = 473
-      Height = 30
+      Height = 37
       Top = 201
       Width = 208
@@ -300 +301 @@
     object Label5: TLabel
       Left = 336
-      Height = 22
+      Height = 25
       Top = 201
-      Width = 79
+      Width = 90
       Caption = 'Grid type:'
       ParentColor = False
@@ -308 +309 @@
     object Label6: TLabel
       Left = 8
-      Height = 22
+      Height = 25
       Top = 313
-      Width = 114
+      Width = 129
       Caption = 'Win objective:'
       ParentColor = False
@@ -316 +317 @@
     object ComboBoxWinObjective: TComboBox
       Left = 232
-      Height = 30
+      Height = 37
       Top = 305
       Width = 328
@@ -331 +332 @@
     object Label7: TLabel
       Left = 8
-      Height = 22
+      Height = 25
       Top = 348
-      Width = 211
+      Width = 245
       Caption = 'Max random neutral units:'
       ParentColor = False
@@ -339 +340 @@
     object SpinEditNeutralUnits: TSpinEdit
       Left = 384
-      Height = 32
+      Height = 35
       Top = 344
       Width = 98
@@ -349 +350 @@
     object CheckBoxSymetricMap: TCheckBox
       Left = 334
-      Height = 24
+      Height = 27
       Top = 238
-      Width = 133
+      Width = 151
       Caption = 'Symetric map'
       TabOrder = 15

trunk/Forms/UFormNew.pas

@@ -56 +56 @@
     procedure FormDestroy(Sender: TObject);
     procedure FormShow(Sender: TObject);
+    procedure ListView1CustomDrawSubItem(Sender: TCustomListView;
+      Item: TListItem; SubItem: Integer; State: TCustomDrawState;
+      var DefaultDraw: Boolean);
     procedure ListView1Data(Sender: TObject; Item: TListItem);
     procedure ListView1DblClick(Sender: TObject);
@@ -111 +114 @@
     Item.Data := Players[Item.Index];
     Item.SubItems.Add(PlayerModeText[Mode]);
-    Item.SubItems.Add(IntToStr(Color));
+    Item.SubItems.Add(''); // Do not show color text
     Item.SubItems.Add(IntToStr(StartUnits));
   end;
@@ -212 +215 @@
 begin
   ReloadView;
+end;
+
+procedure TFormNew.ListView1CustomDrawSubItem(Sender: TCustomListView;
+  Item: TListItem; SubItem: Integer; State: TCustomDrawState;
+  var DefaultDraw: Boolean);
+begin
+  if SubItem = 2 then
+  with ListView1.Canvas do begin
+    Brush.Color := TPlayer(Item.Data).Color;
+    Brush.Style := bsSolid;
+    FillRect(Item.DisplayRectSubItem(2, drBounds));
+  end;
 end;