Changeset 74
- Timestamp:
- Oct 4, 2014, 9:19:27 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Forms/UFormMain.lfm
r73 r74 89 89 Top = 162 90 90 Width = 32 91 Caption = 'ToolButton9'92 91 Style = tbsSeparator 93 92 end -
trunk/Forms/UFormMain.lrt
r58 r74 1 1 TFORMMAIN.CAPTION=xTactics 2 TFORMMAIN.TOOLBUTTON9.CAPTION=ToolButton93 2 TFORMMAIN.MENUITEM1.CAPTION=Game 4 3 TFORMMAIN.MENUITEM5.CAPTION=- -
trunk/Forms/UFormNew.lfm
r70 r74 49 49 TabOrder = 0 50 50 ViewStyle = vsReport 51 OnCustomDrawSubItem = ListView1CustomDrawSubItem 51 52 OnData = ListView1Data 52 53 OnDblClick = ListView1DblClick … … 127 128 object CheckBoxVoid: TCheckBox 128 129 Left = 8 129 Height = 2 4130 Height = 27 130 131 Top = 101 131 Width = 1 75132 Width = 198 132 133 Caption = 'Inaccessible places' 133 134 OnChange = CheckBoxVoidChange … … 136 137 object Label1: TLabel 137 138 Left = 8 138 Height = 2 2139 Height = 25 139 140 Top = 9 140 Width = 88141 Width = 104 141 142 Caption = 'Map width:' 142 143 ParentColor = False … … 144 145 object SpinEditMapSizeX: TSpinEdit 145 146 Left = 128 146 Height = 3 2147 Height = 35 147 148 Top = 4 148 149 Width = 98 … … 154 155 object SpinEditMapSizeY: TSpinEdit 155 156 Left = 128 156 Height = 3 2157 Height = 35 157 158 Top = 55 158 159 Width = 98 … … 164 165 object SpinEditVoidPercent: TSpinEdit 165 166 Left = 216 166 Height = 3 2167 Height = 35 167 168 Top = 97 168 169 Width = 106 … … 173 174 object Label3: TLabel 174 175 Left = 331 175 Height = 2 2176 Height = 25 176 177 Top = 102 177 Width = 1 5178 Width = 17 178 179 Caption = '%' 179 180 ParentColor = False … … 207 208 object Label2: TLabel 208 209 Left = 8 209 Height = 2 2210 Height = 25 210 211 Top = 57 211 Width = 94212 Width = 110 212 213 Caption = 'Map height:' 213 214 ParentColor = False … … 215 216 object CheckBoxCity: TCheckBox 216 217 Left = 8 217 Height = 2 4218 Height = 27 218 219 Top = 141 219 Width = 68220 Width = 73 220 221 Caption = 'Cities' 221 222 OnChange = CheckBoxCityChange … … 224 225 object SpinEditCityPercent: TSpinEdit 225 226 Left = 216 226 Height = 3 2227 Height = 35 227 228 Top = 137 228 229 Width = 106 … … 233 234 object Label4: TLabel 234 235 Left = 331 235 Height = 2 2236 Height = 25 236 237 Top = 142 237 Width = 1 5238 Width = 17 238 239 Caption = '%' 239 240 ParentColor = False … … 253 254 ChildSizing.Layout = cclLeftToRightThenTopToBottom 254 255 ChildSizing.ControlsPerLine = 1 255 ClientHeight = 52256 ClientHeight = 49 256 257 ClientWidth = 301 257 258 Items.Strings = ( … … 275 276 ChildSizing.Layout = cclLeftToRightThenTopToBottom 276 277 ChildSizing.ControlsPerLine = 1 277 ClientHeight = 81278 ClientHeight = 78 278 279 ClientWidth = 308 279 280 Items.Strings = ( … … 286 287 object ComboBoxGridType: TComboBox 287 288 Left = 473 288 Height = 3 0289 Height = 37 289 290 Top = 201 290 291 Width = 208 … … 300 301 object Label5: TLabel 301 302 Left = 336 302 Height = 2 2303 Height = 25 303 304 Top = 201 304 Width = 79305 Width = 90 305 306 Caption = 'Grid type:' 306 307 ParentColor = False … … 308 309 object Label6: TLabel 309 310 Left = 8 310 Height = 2 2311 Height = 25 311 312 Top = 313 312 Width = 1 14313 Width = 129 313 314 Caption = 'Win objective:' 314 315 ParentColor = False … … 316 317 object ComboBoxWinObjective: TComboBox 317 318 Left = 232 318 Height = 3 0319 Height = 37 319 320 Top = 305 320 321 Width = 328 … … 331 332 object Label7: TLabel 332 333 Left = 8 333 Height = 2 2334 Height = 25 334 335 Top = 348 335 Width = 2 11336 Width = 245 336 337 Caption = 'Max random neutral units:' 337 338 ParentColor = False … … 339 340 object SpinEditNeutralUnits: TSpinEdit 340 341 Left = 384 341 Height = 3 2342 Height = 35 342 343 Top = 344 343 344 Width = 98 … … 349 350 object CheckBoxSymetricMap: TCheckBox 350 351 Left = 334 351 Height = 2 4352 Height = 27 352 353 Top = 238 353 Width = 1 33354 Width = 151 354 355 Caption = 'Symetric map' 355 356 TabOrder = 15 -
trunk/Forms/UFormNew.pas
r70 r74 56 56 procedure FormDestroy(Sender: TObject); 57 57 procedure FormShow(Sender: TObject); 58 procedure ListView1CustomDrawSubItem(Sender: TCustomListView; 59 Item: TListItem; SubItem: Integer; State: TCustomDrawState; 60 var DefaultDraw: Boolean); 58 61 procedure ListView1Data(Sender: TObject; Item: TListItem); 59 62 procedure ListView1DblClick(Sender: TObject); … … 111 114 Item.Data := Players[Item.Index]; 112 115 Item.SubItems.Add(PlayerModeText[Mode]); 113 Item.SubItems.Add( IntToStr(Color));116 Item.SubItems.Add(''); // Do not show color text 114 117 Item.SubItems.Add(IntToStr(StartUnits)); 115 118 end; … … 212 215 begin 213 216 ReloadView; 217 end; 218 219 procedure TFormNew.ListView1CustomDrawSubItem(Sender: TCustomListView; 220 Item: TListItem; SubItem: Integer; State: TCustomDrawState; 221 var DefaultDraw: Boolean); 222 begin 223 if SubItem = 2 then 224 with ListView1.Canvas do begin 225 Brush.Color := TPlayer(Item.Data).Color; 226 Brush.Style := bsSolid; 227 FillRect(Item.DisplayRectSubItem(2, drBounds)); 228 end; 214 229 end; 215 230 -
trunk/Languages/xtactics.cs.po
r70 r74 144 144 msgstr "Nástroje" 145 145 146 #: tformmain.toolbutton9.caption147 msgid "ToolButton9"148 msgstr ""149 150 146 #: tformmove.buttoncancel.caption 151 147 msgctxt "tformmove.buttoncancel.caption" … … 243 239 #: tformnew.checkboxsymetricmap.caption 244 240 msgid "Symetric map" 245 msgstr " "241 msgstr "Symetrická mapa" 246 242 247 243 #: tformnew.checkboxvoid.caption … … 316 312 317 313 #: tformplayer.caption 314 msgctxt "tformplayer.caption" 318 315 msgid "Player" 319 316 msgstr "Hráč" … … 361 358 #: tformsettings.label2.caption 362 359 msgid "Animation speed:" 363 msgstr " "360 msgstr "Rychlost animace:" 364 361 365 362 #: tformsettings.label3.caption 366 #, fuzzy367 363 msgctxt "tformsettings.label3.caption" 368 364 msgid "%" … … 382 378 msgstr "Hráč %s vyhrál" 383 379 380 #: ucore.srestartgame 381 msgid "Restart game?" 382 msgstr "Restartovat hru?" 383 384 #: ucore.srestartgamequestion 385 msgid "Do you want to restart current game?" 386 msgstr "Chcete restartovat aktuální hru?" 387 384 388 #: uformabout.sapplicationname 385 389 msgid "Application name" … … 492 496 #: ugame.snewgamefile 493 497 msgid "New game.xtg" 494 msgstr "" 498 msgstr "Nová hry.xtg" 499 500 #: ugame.splayer 501 msgctxt "ugame.splayer" 502 msgid "Player" 503 msgstr "Hráč" 495 504 496 505 #: ugame.sunfinishedbattle … … 500 509 #: ugame.swrongfileformat 501 510 msgid "Wrong file format" 502 msgstr " "503 511 msgstr "Chybný formát souboru" 512 -
trunk/Languages/xtactics.po
r70 r74 134 134 msgstr "" 135 135 136 #: tformmain.toolbutton9.caption137 msgid "ToolButton9"138 msgstr ""139 140 136 #: tformmove.buttoncancel.caption 141 137 msgctxt "tformmove.buttoncancel.caption" … … 304 300 305 301 #: tformplayer.caption 302 msgctxt "tformplayer.caption" 306 303 msgid "Player" 307 304 msgstr "" … … 369 366 msgstr "" 370 367 368 #: ucore.srestartgame 369 msgid "Restart game?" 370 msgstr "" 371 372 #: ucore.srestartgamequestion 373 msgid "Do you want to restart current game?" 374 msgstr "" 375 371 376 #: uformabout.sapplicationname 372 377 msgid "Application name" … … 481 486 msgstr "" 482 487 488 #: ugame.splayer 489 msgctxt "ugame.splayer" 490 msgid "Player" 491 msgstr "" 492 483 493 #: ugame.sunfinishedbattle 484 494 msgid "Unfinished battle" -
trunk/UCore.lfm
r64 r74 9 9 object ActionList1: TActionList 10 10 Images = ImageListSmall 11 left = 25212 top = 7211 left = 112 12 top = 80 13 13 object AGameNew: TAction 14 14 Caption = 'New' -
trunk/UCore.pas
r72 r74 75 75 SEndGame = 'End game?'; 76 76 SEndGameQuestion = 'Do you want to end current game?'; 77 SRestartGame = 'Restart game?'; 78 SRestartGameQuestion = 'Do you want to restart current game?'; 77 79 78 80 … … 203 205 procedure TCore.AGameRestartExecute(Sender: TObject); 204 206 begin 205 Game.New; 206 Game.Running := True; 207 FormMain.AZoomAll.Execute; 208 FormMain.Redraw; 209 UpdateActions; 207 if MessageDlg(SRestartGame, SRestartGameQuestion, mtConfirmation, mbYesNo, 0) = mrYes then begin 208 Game.New; 209 Game.Running := True; 210 FormMain.AZoomAll.Execute; 211 FormMain.Redraw; 212 UpdateActions; 213 end; 210 214 end; 211 215 -
trunk/UGame.pas
r72 r74 329 329 resourcestring 330 330 SMinimumPlayers = 'You need at least two players'; 331 SPlayer = 'Player'; 331 332 SHuman = 'Human'; 332 333 SComputer = 'Computer'; … … 1913 1914 1914 1915 Player := TPlayer.Create; 1915 Player.Name := 'Player1';1916 Player.Name := SPlayer + ' 1'; 1916 1917 Player.Game := Self; 1917 1918 Player.Color := clBlue; 1918 1919 Players.Add(Player); 1919 1920 Player := TPlayer.Create; 1920 Player.Name := 'Player2';1921 Player.Name := SPlayer + ' 2'; 1921 1922 Player.Game := Self; 1922 1923 Player.Color := clRed; -
trunk/xtactics.lpi
r73 r74 24 24 <Version Value="11"/> 25 25 <Target> 26 <Filename Value=" lib/$(TargetCPU)-$(TargetOS)/xtactics"/>26 <Filename Value="xtactics"/> 27 27 </Target> 28 28 <SearchPaths> … … 156 156 <Version Value="11"/> 157 157 <Target> 158 <Filename Value=" lib/$(TargetCPU)-$(TargetOS)/xtactics"/>158 <Filename Value="xtactics"/> 159 159 </Target> 160 160 <SearchPaths>
Note:
See TracChangeset
for help on using the changeset viewer.