Changeset 221
- Timestamp:
- Jun 12, 2018, 11:04:18 AM (6 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Forms/UFormClient.lfm
r213 r221 7 7 ClientHeight = 621 8 8 ClientWidth = 775 9 DesignTimePPI = 1 449 DesignTimePPI = 120 10 10 OnClose = FormClose 11 11 OnCreate = FormCreate … … 17 17 object StatusBar1: TStatusBar 18 18 Left = 0 19 Height = 3020 Top = 59 119 Height = 28 20 Top = 593 21 21 Width = 775 22 22 Panels = < … … 34 34 object ToolBar1: TToolBar 35 35 Left = 0 36 Height = 59 136 Height = 593 37 37 Top = 0 38 38 Width = 32 … … 80 80 object PaintBox1: TPaintBox 81 81 Left = 32 82 Height = 59 182 Height = 593 83 83 Top = 0 84 84 Width = 743 -
trunk/Forms/UFormClient.pas
r215 r221 416 416 procedure TFormClient.FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState 417 417 ); 418 begin 419 if (Key = 27) or (Key = 17) then 418 const 419 ControlKey = 17; 420 EscapeKey = 27; 421 begin 422 if (Key = EscapeKey) or (Key = ControlKey) then 420 423 if Assigned(Core.Game.CurrentPlayer) then begin 421 424 Client.View.SelectedCell := nil; -
trunk/Forms/UFormMain.lfm
r220 r221 5 5 Width = 775 6 6 Caption = 'xTactics' 7 ClientHeight = 5 877 ClientHeight = 596 8 8 ClientWidth = 775 9 DesignTimePPI = 1 449 DesignTimePPI = 120 10 10 Menu = MainMenu1 11 11 OnClose = FormClose 12 12 OnCreate = FormCreate 13 13 OnDestroy = FormDestroy 14 OnKeyUp = FormKeyUp 14 15 OnShow = FormShow 15 16 LCLVersion = '1.8.2.0' … … 77 78 object PanelMain: TPanel 78 79 Left = 0 79 Height = 5 4780 Height = 556 80 81 Top = 40 81 82 Width = 775 -
trunk/Forms/UFormMain.pas
r220 r221 69 69 procedure AToolBarBigIconsExecute(Sender: TObject); 70 70 procedure AToolBarVisibleExecute(Sender: TObject); 71 procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState); 71 72 procedure FormShow(Sender: TObject); 72 73 procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); … … 172 173 end; 173 174 175 procedure TFormMain.FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState 176 ); 177 begin 178 // Pass KeyUp event to docked form 179 FormClient.FormKeyUp(Sender, Key, Shift); 180 end; 181 174 182 procedure TFormMain.FormClose(Sender: TObject; var CloseAction: TCloseAction); 175 183 begin -
trunk/Forms/UFormNew.lfm
r218 r221 9 9 Constraints.MinHeight = 501 10 10 Constraints.MinWidth = 667 11 DesignTimePPI = 1 4411 DesignTimePPI = 120 12 12 OnClose = FormClose 13 13 OnCreate = FormCreate … … 21 21 Top = 4 22 22 Width = 749 23 ActivePage = TabSheet 223 ActivePage = TabSheetMode 24 24 Align = alClient 25 25 BorderSpacing.Around = 4 26 TabIndex = 226 TabIndex = 0 27 27 TabOrder = 0 28 28 object TabSheetMode: TTabSheet 29 29 Caption = 'Mode' 30 ClientHeight = 6 5131 ClientWidth = 74 330 ClientHeight = 662 31 ClientWidth = 741 32 32 object RadioButtonModeLocal: TRadioButton 33 33 Left = 10 34 Height = 3034 Height = 24 35 35 Top = 14 36 Width = 6836 Width = 59 37 37 Caption = 'Local' 38 38 Checked = True … … 43 43 object RadioButtonModeNetworkServer: TRadioButton 44 44 Left = 10 45 Height = 3045 Height = 24 46 46 Top = 48 47 Width = 1 5447 Width = 123 48 48 Caption = 'Network server' 49 49 OnChange = RadioButtonModeLocalChange … … 52 52 object RadioButtonModeNetworkClient: TRadioButton 53 53 Left = 10 54 Height = 3054 Height = 24 55 55 Top = 152 56 Width = 1 4956 Width = 120 57 57 Caption = 'Network client' 58 58 OnChange = RadioButtonModeLocalChange … … 61 61 object EditServerAddress: TEdit 62 62 Left = 24 63 Height = 3663 Height = 28 64 64 Top = 112 65 65 Width = 220 … … 68 68 object SpinEditServerPort: TSpinEdit 69 69 Left = 256 70 Height = 3670 Height = 28 71 71 Top = 112 72 72 Width = 79 … … 76 76 object Label11: TLabel 77 77 Left = 256 78 Height = 2 678 Height = 20 79 79 Top = 88 80 Width = 4180 Width = 30 81 81 Caption = 'Port:' 82 82 ParentColor = False … … 84 84 object Label12: TLabel 85 85 Left = 24 86 Height = 2 686 Height = 20 87 87 Top = 88 88 Width = 7488 Width = 56 89 89 Caption = 'Address:' 90 90 ParentColor = False … … 92 92 object ListViewServers: TListView 93 93 Left = 26 94 Height = 4 1994 Height = 430 95 95 Top = 181 96 96 Width = 334 … … 120 120 Left = 27 121 121 Height = 31 122 Top = 6 12122 Top = 623 123 123 Width = 94 124 124 Action = AServerAdd … … 129 129 Left = 240 130 130 Height = 31 131 Top = 6 12131 Top = 623 132 132 Width = 94 133 133 Action = AServerRemove … … 138 138 Left = 136 139 139 Height = 30 140 Top = 6 12140 Top = 623 141 141 Width = 94 142 142 Action = AServerModify … … 145 145 end 146 146 end 147 object TabSheet 1: TTabSheet147 object TabSheetPlayers: TTabSheet 148 148 Caption = 'Players' 149 ClientHeight = 6 51150 ClientWidth = 74 3149 ClientHeight = 662 150 ClientWidth = 741 151 151 object ListViewPlayers: TListView 152 152 Left = 4 153 Height = 6 01153 Height = 612 154 154 Top = 4 155 Width = 73 5155 Width = 733 156 156 Align = alTop 157 157 Anchors = [akTop, akLeft, akRight, akBottom] … … 191 191 Left = 224 192 192 Height = 25 193 Top = 6 13193 Top = 624 194 194 Width = 83 195 195 Action = APlayerRemove … … 200 200 Left = 16 201 201 Height = 25 202 Top = 6 13202 Top = 624 203 203 Width = 83 204 204 Action = APlayerAdd … … 209 209 Left = 120 210 210 Height = 25 211 Top = 6 13211 Top = 624 212 212 Width = 83 213 213 Action = APlayerModify … … 217 217 end 218 218 end 219 object TabSheet 2: TTabSheet219 object TabSheetMap: TTabSheet 220 220 Caption = 'Map' 221 ClientHeight = 6 51222 ClientWidth = 74 3221 ClientHeight = 662 222 ClientWidth = 741 223 223 object Label1: TLabel 224 224 Left = 8 225 Height = 2 6225 Height = 20 226 226 Top = 9 227 Width = 95227 Width = 74 228 228 Caption = 'Map width:' 229 229 ParentColor = False … … 231 231 object Label2: TLabel 232 232 Left = 8 233 Height = 2 6233 Height = 20 234 234 Top = 57 235 Width = 102235 Width = 79 236 236 Caption = 'Map height:' 237 237 ParentColor = False … … 239 239 object SpinEditMapSizeX: TSpinEdit 240 240 Left = 128 241 Height = 36241 Height = 28 242 242 Top = 4 243 243 Width = 98 … … 249 249 object SpinEditMapSizeY: TSpinEdit 250 250 Left = 128 251 Height = 36251 Height = 28 252 252 Top = 55 253 253 Width = 98 … … 261 261 Height = 47 262 262 Top = 8 263 Width = 49 2263 Width = 490 264 264 Max = 100 265 265 Min = 2 … … 274 274 Height = 47 275 275 Top = 49 276 Width = 49 2276 Width = 490 277 277 Max = 100 278 278 Min = 2 … … 285 285 object Label5: TLabel 286 286 Left = 8 287 Height = 2 6287 Height = 20 288 288 Top = 104 289 Width = 83289 Width = 64 290 290 Caption = 'Grid type:' 291 291 ParentColor = False … … 293 293 object ComboBoxGridType: TComboBox 294 294 Left = 146 295 Height = 36295 Height = 28 296 296 Top = 104 297 297 Width = 208 298 ItemHeight = 0298 ItemHeight = 20 299 299 Items.Strings = ( 300 300 'Hexagonal' … … 307 307 object ComboBoxMapShape: TComboBox 308 308 Left = 146 309 Height = 36309 Height = 28 310 310 Top = 144 311 311 Width = 208 312 ItemHeight = 0312 ItemHeight = 20 313 313 Items.Strings = ( 314 314 'Hexagonal' … … 322 322 object Label8: TLabel 323 323 Left = 8 324 Height = 2 6324 Height = 20 325 325 Top = 144 326 Width = 98326 Width = 76 327 327 Caption = 'Map shape:' 328 328 ParentColor = False … … 332 332 Height = 27 333 333 Top = 110 334 Width = 25 5334 Width = 253 335 335 Anchors = [akTop, akLeft, akRight] 336 336 AutoSize = False … … 340 340 object SpinEditVoidPercent: TSpinEdit 341 341 Left = 216 342 Height = 36342 Height = 28 343 343 Top = 224 344 344 Width = 106 … … 349 349 object CheckBoxVoid: TCheckBox 350 350 Left = 8 351 Height = 30351 Height = 24 352 352 Top = 232 353 Width = 1 87353 Width = 149 354 354 Caption = 'Inaccessible places' 355 355 OnChange = CheckBoxVoidChange … … 358 358 object CheckBoxCity: TCheckBox 359 359 Left = 8 360 Height = 30360 Height = 24 361 361 Top = 272 362 Width = 71362 Width = 60 363 363 Caption = 'Cities' 364 364 OnChange = CheckBoxCityChange … … 367 367 object SpinEditCityPercent: TSpinEdit 368 368 Left = 216 369 Height = 36369 Height = 28 370 370 Top = 272 371 371 Width = 106 … … 376 376 object Label4: TLabel 377 377 Left = 331 378 Height = 2 6378 Height = 20 379 379 Top = 272 380 Width = 1 5380 Width = 12 381 381 Caption = '%' 382 382 ParentColor = False … … 384 384 object Label3: TLabel 385 385 Left = 331 386 Height = 2 6386 Height = 20 387 387 Top = 232 388 Width = 1 5388 Width = 12 389 389 Caption = '%' 390 390 ParentColor = False … … 392 392 object SpinEditNeutralUnits: TSpinEdit 393 393 Left = 408 394 Height = 36394 Height = 28 395 395 Top = 384 396 396 Width = 98 … … 401 401 object Label7: TLabel 402 402 Left = 8 403 Height = 2 6403 Height = 20 404 404 Top = 384 405 Width = 227405 Width = 172 406 406 Caption = 'Max random neutral units:' 407 407 ParentColor = False … … 409 409 object EditImageFile: TEdit 410 410 Left = 144 411 Height = 36411 Height = 28 412 412 Top = 184 413 Width = 47 6413 Width = 474 414 414 Anchors = [akTop, akLeft, akRight] 415 415 TabOrder = 12 416 416 end 417 417 object ButtonImageBrowse: TButton 418 Left = 62 8418 Left = 626 419 419 Height = 25 420 420 Top = 192 … … 427 427 object Label9: TLabel 428 428 Left = 8 429 Height = 2 6429 Height = 20 430 430 Top = 184 431 Width = 90431 Width = 70 432 432 Caption = 'Image file:' 433 433 ParentColor = False … … 435 435 object CheckBoxBridges: TCheckBox 436 436 Left = 8 437 Height = 30437 Height = 24 438 438 Top = 310 439 Width = 210439 Width = 168 440 440 Caption = 'Bridges between cells' 441 441 TabOrder = 14 … … 443 443 object SpinEditMaxPower: TSpinEdit 444 444 Left = 408 445 Height = 36445 Height = 28 446 446 Top = 344 447 447 Width = 98 … … 454 454 object Label10: TLabel 455 455 Left = 8 456 Height = 2 6456 Height = 20 457 457 Top = 344 458 Width = 1 56458 Width = 119 459 459 Caption = 'Max units per cell:' 460 460 ParentColor = False 461 461 end 462 462 end 463 object TabSheet 3: TTabSheet463 object TabSheetRules: TTabSheet 464 464 Caption = 'Rules' 465 ClientHeight = 6 51466 ClientWidth = 74 3465 ClientHeight = 662 466 ClientWidth = 741 467 467 object RadioGroupGrowCells: TRadioGroup 468 468 Left = 15 … … 479 479 ChildSizing.Layout = cclLeftToRightThenTopToBottom 480 480 ChildSizing.ControlsPerLine = 1 481 ClientHeight = 77481 ClientHeight = 80 482 482 ClientWidth = 308 483 483 Items.Strings = ( … … 490 490 object Label6: TLabel 491 491 Left = 8 492 Height = 2 6492 Height = 20 493 493 Top = 248 494 Width = 120494 Width = 94 495 495 Caption = 'Win objective:' 496 496 ParentColor = False … … 498 498 object ComboBoxWinObjective: TComboBox 499 499 Left = 224 500 Height = 36500 Height = 28 501 501 Top = 244 502 502 Width = 328 503 ItemHeight = 0503 ItemHeight = 20 504 504 Items.Strings = ( 505 505 'Defeat all oponents' … … 526 526 ChildSizing.Layout = cclLeftToRightThenTopToBottom 527 527 ChildSizing.ControlsPerLine = 1 528 ClientHeight = 48528 ClientHeight = 51 529 529 ClientWidth = 301 530 530 Items.Strings = ( … … 538 538 Height = 27 539 539 Top = 24 540 Width = 58 3540 Width = 581 541 541 Anchors = [akTop, akLeft, akRight] 542 542 AutoSize = False … … 548 548 Height = 78 549 549 Top = 290 550 Width = 7 20550 Width = 718 551 551 ActivePage = TabSheetCaptureCities 552 552 Anchors = [akTop, akLeft, akRight] -
trunk/Forms/UFormNew.pas
r218 r221 85 85 SpinEditVoidPercent: TSpinEdit; 86 86 Splitter1: TSplitter; 87 TabSheet 1: TTabSheet;88 TabSheet 2: TTabSheet;89 TabSheet 3: TTabSheet;87 TabSheetPlayers: TTabSheet; 88 TabSheetMap: TTabSheet; 89 TabSheetRules: TTabSheet; 90 90 TabSheetStayAliveTurns: TTabSheet; 91 91 TabSheetCaptureCells: TTabSheet; … … 343 343 //Height := Trunc(1.5 * Height); 344 344 //PageControl1.TabIndex := 0; 345 {$IFNDEF DEBUG} 346 TabSheetMode.TabVisible := False; 347 TabSheetMode.Enabled := False; 348 {$ENDIF} 345 349 end; 346 350 -
trunk/Languages/xtactics.cs.po
r220 r221 9 9 "MIME-Version: 1.0\n" 10 10 "Content-Transfer-Encoding: 8bit\n" 11 "X-Generator: Poedit 2.0.6\n"11 "X-Generator: Poedit 1.8.8\n" 12 12 "Language: cs\n" 13 13 … … 534 534 msgstr "Rostoucí buňky" 535 535 536 #: tformnew.tabsheet1.caption 537 msgid "Players" 538 msgstr "Hráči" 539 540 #: tformnew.tabsheet2.caption 536 #: tformnew.tabsheetmap.caption 537 msgctxt "tformnew.tabsheetmap.caption" 541 538 msgid "Map" 542 539 msgstr "Mapa" 543 544 #: tformnew.tabsheet3.caption545 msgid "Rules"546 msgstr "Pravidla"547 540 548 541 #: tformnew.tabsheetmode.caption … … 550 543 msgid "Mode" 551 544 msgstr "Režim" 545 546 #: tformnew.tabsheetplayers.caption 547 msgctxt "tformnew.tabsheetplayers.caption" 548 msgid "Players" 549 msgstr "Hráči" 550 551 #: tformnew.tabsheetrules.caption 552 msgctxt "tformnew.tabsheetrules.caption" 553 msgid "Rules" 554 msgstr "Pravidla" 552 555 553 556 #: tformplayer.buttoncancel.caption -
trunk/Languages/xtactics.po
r220 r221 519 519 msgstr "" 520 520 521 #: tformnew.tabsheet1.caption 522 msgid "Players" 523 msgstr "" 524 525 #: tformnew.tabsheet2.caption 521 #: tformnew.tabsheetmap.caption 522 msgctxt "tformnew.tabsheetmap.caption" 526 523 msgid "Map" 527 msgstr ""528 529 #: tformnew.tabsheet3.caption530 msgid "Rules"531 524 msgstr "" 532 525 … … 534 527 msgctxt "tformnew.tabsheetmode.caption" 535 528 msgid "Mode" 529 msgstr "" 530 531 #: tformnew.tabsheetplayers.caption 532 msgctxt "tformnew.tabsheetplayers.caption" 533 msgid "Players" 534 msgstr "" 535 536 #: tformnew.tabsheetrules.caption 537 msgctxt "tformnew.tabsheetrules.caption" 538 msgid "Rules" 536 539 msgstr "" 537 540 -
trunk/UCore.lfm
r220 r221 3 3 OnDestroy = DataModuleDestroy 4 4 OldCreateOrder = False 5 Height = 8116 HorizontalOffset = 4237 VerticalOffset = 3 748 Width = 1 2589 PPI = 1 445 Height = 676 6 HorizontalOffset = 353 7 VerticalOffset = 312 8 Width = 1048 9 PPI = 120 10 10 object ActionListMain: TActionList 11 11 Images = ImageListSmall 12 left = 1 3713 top = 6012 left = 114 13 top = 50 14 14 object AExit: TAction 15 15 Caption = 'Exit' … … 105 105 end 106 106 object ImageListSmall: TImageList 107 left = 786108 top = 420107 left = 655 108 top = 350 109 109 Bitmap = { 110 110 4C690C00000010000000100000000000000000000000E3AA4BD6E5B35EFFE3B1 … … 498 498 POFilesFolder = 'Languages' 499 499 OnTranslate = CoolTranslator1Translate 500 left = 1 37501 top = 436500 left = 114 501 top = 363 502 502 end 503 503 object ImageListLarge: TImageList 504 504 Height = 32 505 505 Width = 32 506 left = 786507 top = 2 86506 left = 655 507 top = 238 508 508 Bitmap = { 509 509 4C690C0000002000000020000000000000000000000000000000E2AA4B36E2A9 … … 2050 2050 RootName = 'CONFIG' 2051 2051 ReadOnly = False 2052 left = 1 372053 top = 5562052 left = 114 2053 top = 463 2054 2054 end 2055 2055 object OpenDialog1: TOpenDialog 2056 2056 DefaultExt = '.xtmap' 2057 left = 11262058 top = 2 922057 left = 938 2058 top = 243 2059 2059 end 2060 2060 object SaveDialog1: TSaveDialog 2061 2061 DefaultExt = '.xtmap' 2062 left = 11262063 top = 1 662062 left = 938 2063 top = 138 2064 2064 end 2065 2065 object ApplicationInfo: TApplicationInfo … … 2074 2074 AuthorsName = 'Chronos' 2075 2075 AppName = 'xTactics' 2076 ReleaseDate = 432 382076 ReleaseDate = 43263 2077 2077 RegistryKey = '\Software\xTactics' 2078 2078 RegistryRoot = rrKeyCurrentUser 2079 2079 License = 'CC0' 2080 left = 1 372081 top = 1 802080 left = 114 2081 top = 150 2082 2082 end 2083 2083 object PersistentForm: TPersistentForm 2084 2084 MinVisiblePart = 50 2085 2085 EntireVisible = False 2086 left = 7802087 top = 6002086 left = 650 2087 top = 500 2088 2088 end 2089 2089 object ScaleDPI1: TScaleDPI 2090 2090 AutoDetect = False 2091 left = 1 362092 top = 6762091 left = 113 2092 top = 563 2093 2093 end 2094 2094 object LastOpenedList1: TLastOpenedList 2095 2095 MaxCount = 10 2096 2096 OnChange = LastOpenedList1Change 2097 left = 1 372098 top = 3002097 left = 114 2098 top = 250 2099 2099 end 2100 2100 end
Note:
See TracChangeset
for help on using the changeset viewer.