Changeset 301


Ignore:
Timestamp:
Jul 10, 2019, 11:35:10 PM (5 years ago)
Author:
chronos
Message:
  • Fixed: Corrected dimensions in About dialog.
  • Removed: Old Player and Players forms replaced by general item list.
Location:
trunk
Files:
6 deleted
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Forms/UFormAbout.lfm

    r295 r301  
    11object FormAbout: TFormAbout
    2   Left = 1014
    3   Height = 448
    4   Top = 442
    5   Width = 705
     2  Left = 868
     3  Height = 402
     4  Top = 565
     5  Width = 720
    66  Caption = 'About'
    7   ClientHeight = 448
    8   ClientWidth = 705
    9   DesignTimePPI = 120
     7  ClientHeight = 402
     8  ClientWidth = 720
     9  DesignTimePPI = 144
    1010  OnCreate = FormCreate
    1111  OnShow = FormShow
    1212  Position = poScreenCenter
    13   LCLVersion = '2.0.0.4'
     13  LCLVersion = '2.0.2.0'
    1414  object LabelDescription: TLabel
    15     Left = 25
    16     Height = 40
    17     Top = 137
    18     Width = 655
     15    Left = 30
     16    Height = 24
     17    Top = 134
     18    Width = 660
    1919    Align = alTop
    20     BorderSpacing.Around = 25
    21     Caption = 'Turn-based strategy game inspired by classic Risk board game. The game is highly configurable to allow to adjust battle field and game rules.'
     20    BorderSpacing.Left = 30
     21    BorderSpacing.Right = 30
     22    BorderSpacing.Bottom = 30
     23    Constraints.MinHeight = 24
    2224    ParentColor = False
    2325    ParentFont = False
    … …  
    2527  end
    2628  object ButtonClose: TButton
    27     Left = 564
    28     Height = 31
    29     Top = 398
    30     Width = 116
     29    Left = 551
     30    Height = 37
     31    Top = 342
     32    Width = 139
    3133    Anchors = [akRight, akBottom]
    3234    Caption = 'Close'
    … …  
    3638  end
    3739  object LabelContent: TLabel
    38     Left = 25
    39     Height = 20
    40     Top = 202
    41     Width = 655
     40    Left = 30
     41    Height = 26
     42    Top = 188
     43    Width = 660
    4244    Align = alTop
    43     BorderSpacing.Around = 25
     45    BorderSpacing.Around = 30
    4446    Caption = '   '
    4547    ParentColor = False
    … …  
    4749  end
    4850  object ButtonHomePage: TButton
    49     Left = 20
    50     Height = 31
    51     Top = 398
    52     Width = 220
     51    Left = 24
     52    Height = 37
     53    Top = 342
     54    Width = 264
    5355    Anchors = [akLeft, akBottom]
    5456    Caption = 'Home page'
    … …  
    5961  object Panel1: TPanel
    6062    Left = 0
    61     Height = 112
     63    Height = 134
    6264    Top = 0
    63     Width = 705
     65    Width = 720
    6466    Align = alTop
    6567    BevelOuter = bvNone
    66     ClientHeight = 112
    67     ClientWidth = 705
     68    ClientHeight = 134
     69    ClientWidth = 720
    6870    FullRepaint = False
    6971    ParentFont = False
    7072    TabOrder = 2
    7173    object LabelAppName: TLabel
    72       Left = 96
    73       Height = 67
    74       Top = 20
    75       Width = 170
    76       Align = alCustom
    77       BorderSpacing.Around = 25
    78       Caption = 'xTactics'
    79       Font.Height = -50
     74      Left = 130
     75      Height = 100
     76      Top = 30
     77      Width = 560
     78      Align = alTop
     79      BorderSpacing.Left = 100
     80      BorderSpacing.Around = 30
     81      Constraints.MinHeight = 100
     82      Font.Height = -60
    8083      ParentColor = False
    8184      ParentFont = False
    … …  
    8386    end
    8487    object Image1: TImage
    85       Left = 20
    86       Height = 82
    87       Top = 25
    88       Width = 82
     88      Left = 24
     89      Height = 98
     90      Top = 30
     91      Width = 98
    8992      Picture.Data = {
    9093        1754506F727461626C654E6574776F726B47726170686963CF01000089504E47

  • trunk/Forms/UFormAbout.lrj

    r295 r301  
    11{"version":1,"strings":[
    22{"hash":4691652,"name":"tformabout.caption","sourcebytes":[65,98,111,117,116],"value":"About"},
    3 {"hash":120622558,"name":"tformabout.labeldescription.caption","sourcebytes":[84,117,114,110,45,98,97,115,101,100,32,115,116,114,97,116,101,103,121,32,103,97,109,101,32,105,110,115,112,105,114,101,100,32,98,121,32,99,108,97,115,115,105,99,32,82,105,115,107,32,98,111,97,114,100,32,103,97,109,101,46,32,84,104,101,32,103,97,109,101,32,105,115,32,104,105,103,104,108,121,32,99,111,110,102,105,103,117,114,97,98,108,101,32,116,111,32,97,108,108,111,119,32,116,111,32,97,100,106,117,115,116,32,98,97,116,116,108,101,32,102,105,101,108,100,32,97,110,100,32,103,97,109,101,32,114,117,108,101,115,46],"value":"Turn-based strategy game inspired by classic Risk board game. The game is highly configurable to allow to adjust battle field and game rules."},
    43{"hash":4863637,"name":"tformabout.buttonclose.caption","sourcebytes":[67,108,111,115,101],"value":"Close"},
    54{"hash":8736,"name":"tformabout.labelcontent.caption","sourcebytes":[32,32,32],"value":"   "},
    6 {"hash":58140853,"name":"tformabout.buttonhomepage.caption","sourcebytes":[72,111,109,101,32,112,97,103,101],"value":"Home page"},
    7 {"hash":175810675,"name":"tformabout.labelappname.caption","sourcebytes":[120,84,97,99,116,105,99,115],"value":"xTactics"}
     5{"hash":58140853,"name":"tformabout.buttonhomepage.caption","sourcebytes":[72,111,109,101,32,112,97,103,101],"value":"Home page"}
    86]}

  • trunk/Forms/UFormAbout.pas

    r243 r301  
    2424    procedure FormCreate(Sender: TObject);
    2525    procedure FormShow(Sender: TObject);
    26   private
    27     { private declarations }
    2826  public
    29     { public declarations }
     27    ApplicationInfo: TApplicationInfo;
    3028  end;
    3129
    … …  
    5048begin
    5149  Core.ThemeManager1.UseTheme(Self);
    52   with Core do begin
     50  if Assigned(ApplicationInfo) then begin
    5351    LabelAppName.Caption := ApplicationInfo.AppName;
    5452    LabelContent.Caption := SVersion + ': ' + ApplicationInfo.Version + LineEnding +
    5553      SReleaseDate + ': ' + DateToStr(ApplicationInfo.ReleaseDate) + LineEnding +
    5654      SLicense + ': ' + ApplicationInfo.License;
     55    LabelDescription.Caption := ApplicationInfo.Description;
    5756  end;
    5857end;
    … …  
    6059procedure TFormAbout.ButtonHomePageClick(Sender: TObject);
    6160begin
    62   OpenWebPage(Core.ApplicationInfo.HomePage);
     61  if Assigned(ApplicationInfo) then
     62    OpenWebPage(ApplicationInfo.HomePage);
    6363end;
    6464

  • trunk/Forms/UFormList.lfm

    r300 r301  
    3535    OnDblClick = AModifyExecute
    3636    OnKeyPress = ListView1KeyPress
     37    OnKeyUp = ListView1KeyUp
    3738    OnSelectItem = ListView1SelectItem
    3839  end
    … …  
    4344    Width = 480
    4445    Align = alBottom
     46    Images = Core.ImageListSmall
    4547    ParentFont = False
    4648    TabOrder = 1
    … …  
    6769  end
    6870  object ActionList1: TActionList
     71    Images = Core.ImageListSmall
    6972    left = 208
    7073    top = 163
    … …  
    9699  end
    97100  object PopupMenu1: TPopupMenu
     101    Images = Core.ImageListSmall
    98102    left = 352
    99103    top = 160

  • trunk/Forms/UFormList.pas

    r300 r301  
    4444    procedure ListView1Data(Sender: TObject; Item: TListItem);
    4545    procedure ListView1KeyPress(Sender: TObject; var Key: char);
     46    procedure ListView1KeyUp(Sender: TObject; var Key: Word; Shift: TShiftState
     47      );
    4648    procedure ListView1SelectItem(Sender: TObject; Item: TListItem;
    4749      Selected: Boolean);
    … …  
    129131  FormItem := TFormItem.Create(Self);
    130132  try
    131     TempEntry.Name := SNew + ' ' + LowerCase(List.GetItemClass.GetClassName);
     133    TempEntry.Name := List.GetNextAvailableName(SNew + ' ' + LowerCase(List.GetItemClass.GetClassName));
    132134    FormItem.Item := TempEntry;
    133135    if FormItem.ShowModal = mrOk then begin
    … …  
    250252end;
    251253
     254procedure TFormList.ListView1KeyUp(Sender: TObject; var Key: Word;
     255  Shift: TShiftState);
     256begin
     257  if Key = 45 then AAdd.Execute;
     258  if Key = 46 then ARemove.Execute;
     259end;
     260
    252261procedure TFormList.ListView1SelectItem(Sender: TObject;
    253262  Item: TListItem; Selected: Boolean);

  • trunk/Languages/xtactics.cs.po

    r300 r301  
    126126msgstr "O aplikaci"
    127127
    128 #: tformabout.labelappname.caption
    129 msgctxt "tformabout.labelappname.caption"
    130 msgid "xTactics"
    131 msgstr "xTactics"
    132 
    133128#: tformabout.labelcontent.caption
    134129msgctxt "tformabout.labelcontent.caption"
    135130msgid "   "
    136131msgstr "   "
    137 
    138 #: tformabout.labeldescription.caption
    139 msgid "Turn-based strategy game inspired by classic Risk board game. The game is highly configurable to allow to adjust battle field and game rules."
    140 msgstr "Tahová strategická hra inspirovaná klasickou deskovou hrou Risk. Hra je vysoce nastavitelná pro umožňění upravit bojiště a herní pravidla."
    141132
    142133#: tformcharts.caption
    … …  
    691682msgid "Rules"
    692683msgstr "Pravidla"
    693 
    694 #: tformplayer.buttoncancel.caption
    695 msgctxt "tformplayer.buttoncancel.caption"
    696 msgid "Cancel"
    697 msgstr "Zrušit"
    698 
    699 #: tformplayer.buttonok.caption
    700 msgctxt "tformplayer.buttonok.caption"
    701 msgid "Ok"
    702 msgstr "Ok"
    703 
    704 #: tformplayer.caption
    705 msgctxt "tformplayer.caption"
    706 msgid "Player"
    707 msgstr "Hráč"
    708 
    709 #: tformplayer.checkboxdefensive.caption
    710 msgctxt "tformplayer.checkboxdefensive.caption"
    711 msgid "Defensive"
    712 msgstr "Obranný"
    713 
    714 #: tformplayer.comboboxmode.text
    715 msgctxt "tformplayer.comboboxmode.text"
    716 msgid "Human"
    717 msgstr "Člověk"
    718 
    719 #: tformplayer.label1.caption
    720 msgctxt "tformplayer.label1.caption"
    721 msgid "Name:"
    722 msgstr "Jméno:"
    723 
    724 #: tformplayer.label2.caption
    725 msgid "Mode:"
    726 msgstr "Režim:"
    727 
    728 #: tformplayer.label3.caption
    729 msgctxt "tformplayer.label3.caption"
    730 msgid "Color:"
    731 msgstr "Barva:"
    732 
    733 #: tformplayer.label4.caption
    734 msgid "Agressivity:"
    735 msgstr "Agresivita:"
    736 
    737 #: tformplayer.label5.caption
    738 msgid "Start units:"
    739 msgstr "Počátečních jednotek:"
    740 
    741 #: tformplayer.label6.caption
    742 msgid "Nation:"
    743 msgstr "Národ:"
    744 
    745 #: tformplayers.aadd.caption
    746 msgctxt "tformplayers.aadd.caption"
    747 msgid "Add"
    748 msgstr "Přidat"
    749 
    750 #: tformplayers.aclone.caption
    751 msgctxt "tformplayers.aclone.caption"
    752 msgid "Clone"
    753 msgstr "Klonovat"
    754 
    755 #: tformplayers.amodify.caption
    756 msgctxt "tformplayers.amodify.caption"
    757 msgid "Modify"
    758 msgstr "Upravit"
    759 
    760 #: tformplayers.aremove.caption
    761 msgctxt "tformplayers.aremove.caption"
    762 msgid "Remove"
    763 msgstr "Odstranit"
    764 
    765 #: tformplayers.aselectall.caption
    766 msgctxt "tformplayers.aselectall.caption"
    767 msgid "Select all"
    768 msgstr "Vybrat vše"
    769 
    770 #: tformplayers.caption
    771 msgctxt "tformplayers.caption"
    772 msgid "Players"
    773 msgstr "Hráči"
    774 
    775 #: tformplayers.listview1.columns[0].caption
    776 msgctxt "tformplayers.listview1.columns[0].caption"
    777 msgid "Name"
    778 msgstr "Jméno"
    779 
    780 #: tformplayers.listview1.columns[1].caption
    781 msgctxt "tformplayers.listview1.columns[1].caption"
    782 msgid "Type"
    783 msgstr "Typ"
    784 
    785 #: tformplayers.listview1.columns[2].caption
    786 msgctxt "tformplayers.listview1.columns[2].caption"
    787 msgid "Color"
    788 msgstr "Barva"
    789 
    790 #: tformplayers.listview1.columns[3].caption
    791 msgctxt "tformplayers.listview1.columns[3].caption"
    792 msgid "Nation"
    793 msgstr "Národ"
    794 
    795 #: tformplayers.listview1.columns[4].caption
    796 msgctxt "tformplayers.listview1.columns[4].caption"
    797 msgid "Start units"
    798 msgstr "Počátečních jednotek"
    799684
    800685#: tformplayersstats.aspectate.caption
    … …  
    12221107msgstr "Zůstat naživu určený počet tahů"
    12231108
    1224 #: uformplayer.sagrohigh
    1225 msgctxt "uformplayer.sagrohigh"
    1226 msgid "High"
    1227 msgstr "Vysoká"
    1228 
    1229 #: uformplayer.sagrolow
    1230 msgctxt "uformplayer.sagrolow"
    1231 msgid "Low"
    1232 msgstr "Nízká"
    1233 
    1234 #: uformplayer.sagromedium
    1235 msgctxt "uformplayer.sagromedium"
    1236 msgid "Medium"
    1237 msgstr "Střední"
    1238 
    1239 #: uformplayer.scomputer
    1240 msgctxt "uformplayer.scomputer"
    1241 msgid "Computer"
    1242 msgstr "Počítač"
    1243 
    1244 #: uformplayer.shuman
    1245 msgctxt "uformplayer.shuman"
    1246 msgid "Human"
    1247 msgstr "Člověk"
    1248 
    1249 #: uformplayers.sremoveitems
    1250 msgctxt "uformplayers.sremoveitems"
    1251 msgid "Remove items"
    1252 msgstr "Odstranit položky"
    1253 
    1254 #: uformplayers.sremoveitemsquery
    1255 msgctxt "uformplayers.sremoveitemsquery"
    1256 msgid "Do you want to remove selected items?"
    1257 msgstr "Opravdu chcete odstranit vybrané položky?"
    1258 
    12591109#: ugame.scomputer
    12601110msgctxt "ugame.scomputer"
    … …  
    14711321msgid "View range"
    14721322msgstr "Dohled"
     1323

  • trunk/Languages/xtactics.po

    r300 r301  
    116116msgstr ""
    117117
    118 #: tformabout.labelappname.caption
    119 msgctxt "tformabout.labelappname.caption"
    120 msgid "xTactics"
    121 msgstr ""
    122 
    123118#: tformabout.labelcontent.caption
    124119msgctxt "tformabout.labelcontent.caption"
    … …  
    126121msgstr ""
    127122
    128 #: tformabout.labeldescription.caption
    129 msgid "Turn-based strategy game inspired by classic Risk board game. The game is highly configurable to allow to adjust battle field and game rules."
    130 msgstr ""
    131 
    132123#: tformcharts.caption
    133124msgctxt "tformcharts.caption"
    … …  
    677668msgctxt "tformnew.tabsheetrules.caption"
    678669msgid "Rules"
    679 msgstr ""
    680 
    681 #: tformplayer.buttoncancel.caption
    682 msgctxt "TFORMPLAYER.BUTTONCANCEL.CAPTION"
    683 msgid "Cancel"
    684 msgstr ""
    685 
    686 #: tformplayer.buttonok.caption
    687 msgctxt "TFORMPLAYER.BUTTONOK.CAPTION"
    688 msgid "Ok"
    689 msgstr ""
    690 
    691 #: tformplayer.caption
    692 msgctxt "tformplayer.caption"
    693 msgid "Player"
    694 msgstr ""
    695 
    696 #: tformplayer.checkboxdefensive.caption
    697 msgctxt "tformplayer.checkboxdefensive.caption"
    698 msgid "Defensive"
    699 msgstr ""
    700 
    701 #: tformplayer.comboboxmode.text
    702 msgctxt "TFORMPLAYER.COMBOBOXMODE.TEXT"
    703 msgid "Human"
    704 msgstr ""
    705 
    706 #: tformplayer.label1.caption
    707 msgctxt "tformplayer.label1.caption"
    708 msgid "Name:"
    709 msgstr ""
    710 
    711 #: tformplayer.label2.caption
    712 msgid "Mode:"
    713 msgstr ""
    714 
    715 #: tformplayer.label3.caption
    716 msgctxt "tformplayer.label3.caption"
    717 msgid "Color:"
    718 msgstr ""
    719 
    720 #: tformplayer.label4.caption
    721 msgid "Agressivity:"
    722 msgstr ""
    723 
    724 #: tformplayer.label5.caption
    725 msgid "Start units:"
    726 msgstr ""
    727 
    728 #: tformplayer.label6.caption
    729 msgid "Nation:"
    730 msgstr ""
    731 
    732 #: tformplayers.aadd.caption
    733 msgctxt "tformplayers.aadd.caption"
    734 msgid "Add"
    735 msgstr ""
    736 
    737 #: tformplayers.aclone.caption
    738 msgctxt "tformplayers.aclone.caption"
    739 msgid "Clone"
    740 msgstr ""
    741 
    742 #: tformplayers.amodify.caption
    743 msgctxt "tformplayers.amodify.caption"
    744 msgid "Modify"
    745 msgstr ""
    746 
    747 #: tformplayers.aremove.caption
    748 msgctxt "tformplayers.aremove.caption"
    749 msgid "Remove"
    750 msgstr ""
    751 
    752 #: tformplayers.aselectall.caption
    753 msgctxt "tformplayers.aselectall.caption"
    754 msgid "Select all"
    755 msgstr ""
    756 
    757 #: tformplayers.caption
    758 msgctxt "tformplayers.caption"
    759 msgid "Players"
    760 msgstr ""
    761 
    762 #: tformplayers.listview1.columns[0].caption
    763 msgctxt "tformplayers.listview1.columns[0].caption"
    764 msgid "Name"
    765 msgstr ""
    766 
    767 #: tformplayers.listview1.columns[1].caption
    768 msgid "Type"
    769 msgstr ""
    770 
    771 #: tformplayers.listview1.columns[2].caption
    772 msgctxt "tformplayers.listview1.columns[2].caption"
    773 msgid "Color"
    774 msgstr ""
    775 
    776 #: tformplayers.listview1.columns[3].caption
    777 msgctxt "tformplayers.listview1.columns[3].caption"
    778 msgid "Nation"
    779 msgstr ""
    780 
    781 #: tformplayers.listview1.columns[4].caption
    782 msgctxt "tformplayers.listview1.columns[4].caption"
    783 msgid "Start units"
    784670msgstr ""
    785671
    … …  
    12001086msgstr ""
    12011087
    1202 #: uformplayer.sagrohigh
    1203 msgctxt "uformplayer.sagrohigh"
    1204 msgid "High"
    1205 msgstr ""
    1206 
    1207 #: uformplayer.sagrolow
    1208 msgctxt "uformplayer.sagrolow"
    1209 msgid "Low"
    1210 msgstr ""
    1211 
    1212 #: uformplayer.sagromedium
    1213 msgctxt "uformplayer.sagromedium"
    1214 msgid "Medium"
    1215 msgstr ""
    1216 
    1217 #: uformplayer.scomputer
    1218 msgctxt "uformplayer.scomputer"
    1219 msgid "Computer"
    1220 msgstr ""
    1221 
    1222 #: uformplayer.shuman
    1223 msgctxt "uformplayer.shuman"
    1224 msgid "Human"
    1225 msgstr ""
    1226 
    1227 #: uformplayers.sremoveitems
    1228 msgctxt "uformplayers.sremoveitems"
    1229 msgid "Remove items"
    1230 msgstr ""
    1231 
    1232 #: uformplayers.sremoveitemsquery
    1233 msgctxt "uformplayers.sremoveitemsquery"
    1234 msgid "Do you want to remove selected items?"
    1235 msgstr ""
    1236 
    12371088#: ugame.scomputer
    12381089msgctxt "ugame.scomputer"

  • trunk/Systems/HexWars.xts

    r297 r301  
    11<?xml version="1.0" encoding="utf-8"?>
    22<XtacticsGameSystem>
    3   <UnitsSplitMerge>0</UnitsSplitMerge>
     3  <UnitsSplitMerge>-1</UnitsSplitMerge>
    44  <EmptyCellsNeutral>0</EmptyCellsNeutral>
    55  <UnitsMoveImmediately>0</UnitsMoveImmediately>

  • trunk/UCore.lfm

    r295 r301  
    33  OnDestroy = DataModuleDestroy
    44  OldCreateOrder = False
    5   Height = 676
    6   HorizontalOffset = 348
    7   VerticalOffset = 348
    8   Width = 1048
    9   PPI = 120
     5  Height = 811
     6  HorizontalOffset = 418
     7  VerticalOffset = 418
     8  Width = 1258
     9  PPI = 144
    1010  object ActionListMain: TActionList
    1111    Images = ImageListSmall
    12     left = 114
    13     top = 50
     12    left = 137
     13    top = 60
    1414    object AExit: TAction
    1515      Caption = 'Exit'
    … …  
    114114  end
    115115  object ImageListSmall: TImageList
    116     left = 653
    117     top = 350
     116    left = 784
     117    top = 420
    118118    Bitmap = {
    119119      4C691300000010000000100000000000000000000000E3AA4BD6E5B35EFFE3B1
    … …  
    731731    POFilesFolder = 'Languages'
    732732    OnTranslate = CoolTranslator1Translate
    733     left = 114
    734     top = 363
     733    left = 137
     734    top = 436
    735735  end
    736736  object ImageListLarge: TImageList
    737737    Height = 32
    738738    Width = 32
    739     left = 655
    740     top = 238
     739    left = 786
     740    top = 286
    741741    Bitmap = {
    742742      4C69100000002000000020000000000000000000000000000000E2AA4B36E2A9
    … …  
    27952795    RootName = 'CONFIG'
    27962796    ReadOnly = False
    2797     left = 114
    2798     top = 463
     2797    left = 137
     2798    top = 556
    27992799  end
    28002800  object OpenDialog1: TOpenDialog
    28012801    DefaultExt = '.xtmap'
    2802     left = 938
    2803     top = 243
     2802    left = 1126
     2803    top = 292
    28042804  end
    28052805  object SaveDialog1: TSaveDialog
    28062806    DefaultExt = '.xtmap'
    2807     left = 938
    2808     top = 138
     2807    left = 1126
     2808    top = 166
    28092809  end
    28102810  object ApplicationInfo: TApplicationInfo
    … …  
    28182818    HomePage = 'https://app.zdechov.net/xtactics'
    28192819    AuthorsName = 'Chronos'
     2820    EmailContact = 'robie@centrum.cz'
    28202821    AppName = 'xTactics'
    2821     ReleaseDate = 43365
     2822    Description = 'Turn-based strategy game inspired by classic Risk board game. The game is highly configurable to allow to adjust battle field and game rules.'
     2823    ReleaseDate = 43656
    28222824    RegistryKey = '\Software\xTactics'
    28232825    RegistryRoot = rrKeyCurrentUser
    28242826    License = 'CC0'
    2825     left = 114
    2826     top = 150
     2827    left = 137
     2828    top = 180
    28272829  end
    28282830  object PersistentForm: TPersistentForm
    28292831    MinVisiblePart = 50
    28302832    EntireVisible = False
    2831     left = 650
    2832     top = 500
     2833    left = 780
     2834    top = 600
    28332835  end
    28342836  object ScaleDPI1: TScaleDPI
    28352837    AutoDetect = False
    2836     left = 113
    2837     top = 563
     2838    left = 136
     2839    top = 676
    28382840  end
    28392841  object LastOpenedList1: TLastOpenedList
    28402842    MaxCount = 10
    28412843    OnChange = LastOpenedList1Change
    2842     left = 114
    2843     top = 250
     2844    left = 137
     2845    top = 300
    28442846  end
    28452847  object ThemeManager1: TThemeManager
    2846     left = 337
    2847     top = 270
     2848    left = 404
     2849    top = 324
    28482850  end
    28492851end

  • trunk/UCore.pas

    r299 r301  
    77uses
    88  Classes, SysUtils, XMLConf, FileUtil, ActnList, Controls, Dialogs, Forms,
    9   UGame, UApplicationInfo, UPersistentForm, UScaleDPI, UCoolTranslator,
     9  UGame, UApplicationInfo, UPersistentForm, UScaleDPI, UCoolTranslator, DOM,
    1010  URegistry, ULastOpenedList, UTheme, Registry, Menus, UFormClient, UPlayer,
    1111  UGameServer, UGameClient, fgl, UServerList, UGameSystem, Graphics;
    … …  
    326326  FormAbout := TFormAbout.Create(Self);
    327327  try
     328    FormAbout.ApplicationInfo := ApplicationInfo;
    328329    FormAbout.ShowModal;
    329330  finally
    … …  
    737738    GameSettings.Players[1].Name := SPlayer + ' 2';
    738739
     740    // GameSystemName needs to be loaded before game systems config itself.
     741    // Players reference Nations from game system.
     742    GameSettings.GameSystemName := string(XMLConfig1.GetValue(DOMString('Game/GameSystemName'), DOMString('HexWars')));
     743    GameSettings.GameSystem := GameSystems.SearchByName(GameSettings.GameSystemName);
     744
    739745    GameSettings.LoadConfig(XMLConfig1, 'Game');
    740     GameSettings.GameSystem := GameSystems.SearchByName(GameSettings.GameSystemName);
    741746    if not Assigned(GameSettings.GameSystem) then
    742747      GameSettings.GameSystem := GameSystems.First;

  • trunk/UGame.pas

    r299 r301  
    570570    MaxNeutralUnits := GetValue(DOMString(Path + '/MaxNeutralUnits'), 5);
    571571    MaxPower := GetValue(DOMString(Path + '/MaxPower'), 99);
    572     GameSystemName := string(GetValue(DOMString(Path + '/GameSystemName'), DOMString('')));
    573572    Players.LoadConfig(Config, Path + '/Players');
    574573  end;

  • trunk/xtactics.lpi

    r300 r301  
    111111      </Item7>
    112112    </RequiredPackages>
    113     <Units Count="43">
     113    <Units Count="41">
    114114      <Unit0>
    115115        <Filename Value="xtactics.lpr"/>
    … …  
    128128      </Unit2>
    129129      <Unit3>
    130         <Filename Value="Forms/UFormPlayer.pas"/>
    131         <IsPartOfProject Value="True"/>
    132         <ComponentName Value="FormPlayer"/>
     130        <Filename Value="Forms/UFormSettings.pas"/>
     131        <IsPartOfProject Value="True"/>
     132        <ComponentName Value="FormSettings"/>
    133133        <HasResources Value="True"/>
    134134        <ResourceBaseClass Value="Form"/>
    135135      </Unit3>
    136136      <Unit4>
    137         <Filename Value="Forms/UFormSettings.pas"/>
    138         <IsPartOfProject Value="True"/>
    139         <ComponentName Value="FormSettings"/>
     137        <Filename Value="Forms/UFormMain.pas"/>
     138        <IsPartOfProject Value="True"/>
     139        <ComponentName Value="FormMain"/>
    140140        <HasResources Value="True"/>
    141141        <ResourceBaseClass Value="Form"/>
    142142      </Unit4>
    143143      <Unit5>
    144         <Filename Value="Forms/UFormMain.pas"/>
    145         <IsPartOfProject Value="True"/>
    146         <ComponentName Value="FormMain"/>
     144        <Filename Value="Forms/UFormMove.pas"/>
     145        <IsPartOfProject Value="True"/>
     146        <ComponentName Value="FormMove"/>
    147147        <HasResources Value="True"/>
    148148        <ResourceBaseClass Value="Form"/>
    149149      </Unit5>
    150150      <Unit6>
    151         <Filename Value="Forms/UFormMove.pas"/>
    152         <IsPartOfProject Value="True"/>
    153         <ComponentName Value="FormMove"/>
     151        <Filename Value="Forms/UFormNew.pas"/>
     152        <IsPartOfProject Value="True"/>
     153        <ComponentName Value="FormNew"/>
    154154        <HasResources Value="True"/>
    155155        <ResourceBaseClass Value="Form"/>
    156156      </Unit6>
    157157      <Unit7>
    158         <Filename Value="Forms/UFormNew.pas"/>
    159         <IsPartOfProject Value="True"/>
    160         <ComponentName Value="FormNew"/>
     158        <Filename Value="Forms/UFormAbout.pas"/>
     159        <IsPartOfProject Value="True"/>
     160        <ComponentName Value="FormAbout"/>
    161161        <HasResources Value="True"/>
    162162        <ResourceBaseClass Value="Form"/>
    163163      </Unit7>
    164164      <Unit8>
    165         <Filename Value="Forms/UFormAbout.pas"/>
    166         <IsPartOfProject Value="True"/>
    167         <ComponentName Value="FormAbout"/>
     165        <Filename Value="Forms/UFormHelp.pas"/>
     166        <IsPartOfProject Value="True"/>
     167        <ComponentName Value="FormHelp"/>
    168168        <HasResources Value="True"/>
    169169        <ResourceBaseClass Value="Form"/>
    170170      </Unit8>
    171171      <Unit9>
    172         <Filename Value="Forms/UFormHelp.pas"/>
    173         <IsPartOfProject Value="True"/>
    174         <ComponentName Value="FormHelp"/>
     172        <Filename Value="Forms/UFormCharts.pas"/>
     173        <IsPartOfProject Value="True"/>
     174        <ComponentName Value="FormCharts"/>
    175175        <HasResources Value="True"/>
    176176        <ResourceBaseClass Value="Form"/>
    177177      </Unit9>
    178178      <Unit10>
    179         <Filename Value="Forms/UFormCharts.pas"/>
    180         <IsPartOfProject Value="True"/>
    181         <ComponentName Value="FormCharts"/>
     179        <Filename Value="Forms/UFormUnitMoves.pas"/>
     180        <IsPartOfProject Value="True"/>
     181        <ComponentName Value="FormUnitMoves"/>
    182182        <HasResources Value="True"/>
    183183        <ResourceBaseClass Value="Form"/>
    184184      </Unit10>
    185185      <Unit11>
    186         <Filename Value="Forms/UFormUnitMoves.pas"/>
    187         <IsPartOfProject Value="True"/>
    188         <ComponentName Value="FormUnitMoves"/>
     186        <Filename Value="Forms/UFormChat.pas"/>
     187        <IsPartOfProject Value="True"/>
     188        <ComponentName Value="FormChat"/>
    189189        <HasResources Value="True"/>
    190190        <ResourceBaseClass Value="Form"/>
    191191      </Unit11>
    192192      <Unit12>
    193         <Filename Value="Forms/UFormChat.pas"/>
    194         <IsPartOfProject Value="True"/>
    195         <ComponentName Value="FormChat"/>
    196         <HasResources Value="True"/>
    197         <ResourceBaseClass Value="Form"/>
     193        <Filename Value="UTCP.pas"/>
     194        <IsPartOfProject Value="True"/>
    198195      </Unit12>
    199196      <Unit13>
    200         <Filename Value="UTCP.pas"/>
     197        <Filename Value="UServerList.pas"/>
    201198        <IsPartOfProject Value="True"/>
    202199      </Unit13>
    203200      <Unit14>
    204         <Filename Value="UServerList.pas"/>
    205         <IsPartOfProject Value="True"/>
     201        <Filename Value="Forms/UFormClient.pas"/>
     202        <IsPartOfProject Value="True"/>
     203        <ComponentName Value="FormClient"/>
     204        <HasResources Value="True"/>
     205        <ResourceBaseClass Value="Form"/>
    206206      </Unit14>
    207207      <Unit15>
    208         <Filename Value="Forms/UFormClient.pas"/>
    209         <IsPartOfProject Value="True"/>
    210         <ComponentName Value="FormClient"/>
     208        <Filename Value="Forms/UFormPlayersStats.pas"/>
     209        <IsPartOfProject Value="True"/>
     210        <ComponentName Value="FormPlayersStats"/>
    211211        <HasResources Value="True"/>
    212212        <ResourceBaseClass Value="Form"/>
    213213      </Unit15>
    214214      <Unit16>
    215         <Filename Value="Forms/UFormPlayersStats.pas"/>
    216         <IsPartOfProject Value="True"/>
    217         <ComponentName Value="FormPlayersStats"/>
    218         <HasResources Value="True"/>
    219         <ResourceBaseClass Value="Form"/>
     215        <Filename Value="UGameServer.pas"/>
     216        <IsPartOfProject Value="True"/>
    220217      </Unit16>
    221218      <Unit17>
    222         <Filename Value="UGameServer.pas"/>
     219        <Filename Value="UGameClient.pas"/>
    223220        <IsPartOfProject Value="True"/>
    224221      </Unit17>
    225222      <Unit18>
    226         <Filename Value="UGameClient.pas"/>
     223        <Filename Value="UGameProtocol.pas"/>
    227224        <IsPartOfProject Value="True"/>
    228225      </Unit18>
    229226      <Unit19>
    230         <Filename Value="UGameProtocol.pas"/>
     227        <Filename Value="Packages/PinConnection/UCommPin.pas"/>
    231228        <IsPartOfProject Value="True"/>
    232229      </Unit19>
    233230      <Unit20>
    234         <Filename Value="Packages/PinConnection/UCommPin.pas"/>
     231        <Filename Value="UGeometry.pas"/>
    235232        <IsPartOfProject Value="True"/>
    236233      </Unit20>
    237234      <Unit21>
    238         <Filename Value="UGeometry.pas"/>
     235        <Filename Value="UGeometryClasses.pas"/>
    239236        <IsPartOfProject Value="True"/>
    240237      </Unit21>
    241238      <Unit22>
    242         <Filename Value="UGeometryClasses.pas"/>
    243         <IsPartOfProject Value="True"/>
     239        <Filename Value="Forms/UFormServer.pas"/>
     240        <IsPartOfProject Value="True"/>
     241        <ComponentName Value="FormServer"/>
     242        <HasResources Value="True"/>
     243        <ResourceBaseClass Value="Form"/>
    244244      </Unit22>
    245245      <Unit23>
    246         <Filename Value="Forms/UFormServer.pas"/>
    247         <IsPartOfProject Value="True"/>
    248         <ComponentName Value="FormServer"/>
    249         <HasResources Value="True"/>
    250         <ResourceBaseClass Value="Form"/>
     246        <Filename Value="UClientAI.pas"/>
     247        <IsPartOfProject Value="True"/>
    251248      </Unit23>
    252249      <Unit24>
    253         <Filename Value="UClientAI.pas"/>
     250        <Filename Value="UGameConnection.pas"/>
    254251        <IsPartOfProject Value="True"/>
    255252      </Unit24>
    256253      <Unit25>
    257         <Filename Value="UGameConnection.pas"/>
     254        <Filename Value="Packages/PinConnection/UCommThread.pas"/>
    258255        <IsPartOfProject Value="True"/>
    259256      </Unit25>
    260257      <Unit26>
    261         <Filename Value="Packages/PinConnection/UCommThread.pas"/>
    262         <IsPartOfProject Value="True"/>
     258        <Filename Value="Forms/UFormKeyShortcuts.pas"/>
     259        <IsPartOfProject Value="True"/>
     260        <ComponentName Value="FormKeyShortcuts"/>
     261        <HasResources Value="True"/>
     262        <ResourceBaseClass Value="Form"/>
    263263      </Unit26>
    264264      <Unit27>
    265         <Filename Value="Forms/UFormKeyShortcuts.pas"/>
    266         <IsPartOfProject Value="True"/>
    267         <ComponentName Value="FormKeyShortcuts"/>
    268         <HasResources Value="True"/>
    269         <ResourceBaseClass Value="Form"/>
     265        <Filename Value="Packages/PinConnection/UCommFrame.pas"/>
     266        <IsPartOfProject Value="True"/>
    270267      </Unit27>
    271268      <Unit28>
    272         <Filename Value="Packages/PinConnection/UCommFrame.pas"/>
     269        <Filename Value="UMapType.pas"/>
    273270        <IsPartOfProject Value="True"/>
    274271      </Unit28>
    275272      <Unit29>
    276         <Filename Value="UMapType.pas"/>
     273        <Filename Value="UMap.pas"/>
    277274        <IsPartOfProject Value="True"/>
    278275      </Unit29>
    279276      <Unit30>
    280         <Filename Value="UMap.pas"/>
     277        <Filename Value="UPlayer.pas"/>
    281278        <IsPartOfProject Value="True"/>
    282279      </Unit30>
    283280      <Unit31>
    284         <Filename Value="UPlayer.pas"/>
     281        <Filename Value="UClientGUI.pas"/>
    285282        <IsPartOfProject Value="True"/>
    286283      </Unit31>
    287284      <Unit32>
    288         <Filename Value="UClientGUI.pas"/>
     285        <Filename Value="UUnit.pas"/>
    289286        <IsPartOfProject Value="True"/>
    290287      </Unit32>
    291288      <Unit33>
    292         <Filename Value="UUnit.pas"/>
     289        <Filename Value="UGameSystem.pas"/>
    293290        <IsPartOfProject Value="True"/>
    294291      </Unit33>
    295292      <Unit34>
    296         <Filename Value="UGameSystem.pas"/>
     293        <Filename Value="UBuilding.pas"/>
    297294        <IsPartOfProject Value="True"/>
    298295      </Unit34>
    299296      <Unit35>
    300         <Filename Value="UBuilding.pas"/>
    301         <IsPartOfProject Value="True"/>
     297        <Filename Value="Forms/UFormGameSystem.pas"/>
     298        <IsPartOfProject Value="True"/>
     299        <ComponentName Value="FormGameSystem"/>
     300        <HasResources Value="True"/>
     301        <ResourceBaseClass Value="Form"/>
    302302      </Unit35>
    303303      <Unit36>
    304         <Filename Value="Forms/UFormGameSystem.pas"/>
    305         <IsPartOfProject Value="True"/>
    306         <ComponentName Value="FormGameSystem"/>
     304        <Filename Value="Forms/UFormGameSystems.pas"/>
     305        <IsPartOfProject Value="True"/>
     306        <ComponentName Value="FormGameSystems"/>
    307307        <HasResources Value="True"/>
    308308        <ResourceBaseClass Value="Form"/>
    309309      </Unit36>
    310310      <Unit37>
    311         <Filename Value="Forms/UFormGameSystems.pas"/>
    312         <IsPartOfProject Value="True"/>
    313         <ComponentName Value="FormGameSystems"/>
    314         <HasResources Value="True"/>
    315         <ResourceBaseClass Value="Form"/>
     311        <Filename Value="UNation.pas"/>
     312        <IsPartOfProject Value="True"/>
    316313      </Unit37>
    317314      <Unit38>
    318         <Filename Value="Forms/UFormPlayers.pas"/>
    319         <IsPartOfProject Value="True"/>
    320         <ComponentName Value="FormPlayers"/>
    321         <HasResources Value="True"/>
    322         <ResourceBaseClass Value="Form"/>
     315        <Filename Value="UItemList.pas"/>
     316        <IsPartOfProject Value="True"/>
    323317      </Unit38>
    324318      <Unit39>
    325         <Filename Value="UNation.pas"/>
    326         <IsPartOfProject Value="True"/>
     319        <Filename Value="Forms/UFormList.pas"/>
     320        <IsPartOfProject Value="True"/>
     321        <ComponentName Value="FormList"/>
     322        <HasResources Value="True"/>
     323        <ResourceBaseClass Value="Form"/>
    327324      </Unit39>
    328325      <Unit40>
    329         <Filename Value="UItemList.pas"/>
    330         <IsPartOfProject Value="True"/>
     326        <Filename Value="Forms/UFormItem.pas"/>
     327        <IsPartOfProject Value="True"/>
     328        <ComponentName Value="FormItem"/>
     329        <HasResources Value="True"/>
     330        <ResourceBaseClass Value="Form"/>
    331331      </Unit40>
    332       <Unit41>
    333         <Filename Value="Forms/UFormList.pas"/>
    334         <IsPartOfProject Value="True"/>
    335         <ComponentName Value="FormList"/>
    336         <HasResources Value="True"/>
    337         <ResourceBaseClass Value="Form"/>
    338       </Unit41>
    339       <Unit42>
    340         <Filename Value="Forms/UFormItem.pas"/>
    341         <IsPartOfProject Value="True"/>
    342         <ComponentName Value="FormItem"/>
    343         <HasResources Value="True"/>
    344         <ResourceBaseClass Value="Form"/>
    345       </Unit42>
    346332    </Units>
    347333  </ProjectOptions>
Note: See TracChangeset for help on using the changeset viewer.