Changeset 291 for trunk/Forms


Ignore:
Timestamp:
Mar 26, 2019, 1:16:27 PM (6 years ago)
Author:
chronos
Message:
  • Modified: UnitKind list and items converted to general item list.
Location:
trunk/Forms
Files:
4 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Forms/UFormClient.pas

    r274 r291  
    199199    end else begin
    200200      {$ifdef WINDOWS}
    201       PaintBox1.Canvas.Brush.Color := BackgroundColor; //clBackground; //PaintBox1.GetColorResolvingParent;
     201      PaintBox1.Canvas.Brush.Color := MapBackgroundColor; //clBackground; //PaintBox1.GetColorResolvingParent;
    202202      PaintBox1.Canvas.FillRect(0, 0, PaintBox1.Width, PaintBox1.Height);
    203203      {$endif}

  • trunk/Forms/UFormGameSystem.lfm

    r289 r291  
    11object FormGameSystem: TFormGameSystem
    22  Left = 571
    3   Height = 578
     3  Height = 482
    44  Top = 364
    5   Width = 781
     5  Width = 651
    66  Caption = 'Game system'
    7   ClientHeight = 578
    8   ClientWidth = 781
    9   DesignTimePPI = 144
     7  ClientHeight = 482
     8  ClientWidth = 651
     9  DesignTimePPI = 120
    1010  OnClose = FormClose
    1111  OnCreate = FormCreate
    … …  
    1414  LCLVersion = '2.0.0.4'
    1515  object ButtonSave: TButton
    16     Left = 160
    17     Height = 38
    18     Top = 528
    19     Width = 113
     16    Left = 133
     17    Height = 32
     18    Top = 440
     19    Width = 94
    2020    Anchors = [akLeft, akBottom]
    2121    Caption = 'Save'
    2222    OnClick = ButtonSaveClick
     23    ParentFont = False
    2324    TabOrder = 0
    2425  end
    2526  object ButtonLoad: TButton
    26     Left = 24
    27     Height = 38
    28     Top = 528
    29     Width = 113
     27    Left = 20
     28    Height = 32
     29    Top = 440
     30    Width = 94
    3031    Anchors = [akLeft, akBottom]
    3132    Caption = 'Load'
    3233    OnClick = ButtonLoadClick
     34    ParentFont = False
    3335    TabOrder = 1
    3436  end
    3537  object ButtonCancel: TButton
    36     Left = 504
    37     Height = 38
    38     Top = 528
    39     Width = 113
     38    Left = 420
     39    Height = 32
     40    Top = 440
     41    Width = 94
    4042    Anchors = [akRight, akBottom]
    4143    Caption = 'Cancel'
    4244    ModalResult = 2
     45    ParentFont = False
    4346    TabOrder = 2
    4447  end
    4548  object ButtonOk: TButton
    46     Left = 647
    47     Height = 38
    48     Top = 528
    49     Width = 113
     49    Left = 539
     50    Height = 32
     51    Top = 440
     52    Width = 94
    5053    Anchors = [akRight, akBottom]
    5154    Caption = 'OK'
    5255    ModalResult = 1
     56    ParentFont = False
    5357    TabOrder = 3
    5458  end
    5559  object PageControl1: TPageControl
    56     Left = 16
    57     Height = 496
    58     Top = 16
    59     Width = 744
     60    Left = 13
     61    Height = 414
     62    Top = 13
     63    Width = 620
    6064    ActivePage = TabSheetBuildings
    6165    Anchors = [akTop, akLeft, akRight, akBottom]
     66    ParentFont = False
    6267    TabIndex = 3
    6368    TabOrder = 4
    … …  
    6671      ClientHeight = 456
    6772      ClientWidth = 734
     73      ParentFont = False
    6874      object CheckBoxEmptyCellsNeutral: TCheckBox
    69         Left = 16
     75        Left = 13
    7076        Height = 30
    71         Top = 16
     77        Top = 13
    7278        Width = 362
    7379        Caption = 'Set cells without player units as neutral'
     80        ParentFont = False
    7481        TabOrder = 0
    7582      end
    7683      object CheckBoxUnitsSplitMerge: TCheckBox
    77         Left = 16
     84        Left = 13
    7885        Height = 30
    79         Top = 55
     86        Top = 46
    8087        Width = 231
    8188        Caption = 'Units can split or merge'
     89        ParentFont = False
    8290        TabOrder = 1
    8391      end
    8492      object CheckBoxUnitsMoveImmediately: TCheckBox
    85         Left = 16
     93        Left = 13
    8694        Height = 30
    87         Top = 95
     95        Top = 79
    8896        Width = 234
    8997        Caption = 'Units move immediately'
     98        ParentFont = False
    9099        TabOrder = 2
    91100      end
    … …  
    93102    object TabSheetUnits: TTabSheet
    94103      Caption = 'Units'
     104      ParentFont = False
    95105    end
    96106    object TabSheetNations: TTabSheet
    97107      Caption = 'Nations'
     108      ParentFont = False
    98109    end
    99110    object TabSheetBuildings: TTabSheet
    100111      Caption = 'Buildings'
     112      ParentFont = False
    101113    end
    102114  end
    103115  object OpenDialog1: TOpenDialog
    104     left = 440
    105     top = 160
     116    left = 367
     117    top = 133
    106118  end
    107119  object SaveDialog1: TSaveDialog
    108     left = 232
    109     top = 160
     120    left = 193
     121    top = 133
    110122  end
    111123end

  • trunk/Forms/UFormGameSystem.pas

    r290 r291  
    77uses
    88  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
    9   ComCtrls, UGameSystem, UFormUnitKinds,
    10   UFormList;
     9  ComCtrls, UGameSystem, UFormList;
    1110
    1211type
    … …  
    3736  private
    3837    FGameSystem: TGameSystem;
    39     FormUnitKinds: TFormUnitKinds;
     38    FormUnitKinds: TFormList;
    4039    FormNations: TFormList;
    4140    FormBuildingKinds: TFormList;
    … …  
    9594  Core.ThemeManager1.UseTheme(Self);
    9695  Core.CoolTranslator1.TranslateComponentRecursive(Self);
    97   FormUnitKinds := TFormUnitKinds.Create(nil);
     96  FormUnitKinds := TFormList.Create(nil);
    9897  FormUnitKinds.ManualDock(TabSheetUnits, nil, alClient);
    9998  FormUnitKinds.Align := alClient;
    … …  
    126125  if FGameSystem = AValue then Exit;
    127126  if Assigned(FGameSystem) then begin
    128     FormUnitKinds.UnitKinds := nil;
     127    FormUnitKinds.List := nil;
    129128    FormNations.List := nil;
    130129    FormBuildingKinds.List := nil;
    … …  
    132131  FGameSystem := AValue;
    133132  if Assigned(FGameSystem) then begin
    134     FormUnitKinds.UnitKinds := GameSystem.UnitKinds;
     133    FormUnitKinds.List := GameSystem.UnitKinds;
    135134    FormNations.List := GameSystem.Nations;
    136135    FormBuildingKinds.List := GameSystem.BuildingKinds;

  • trunk/Forms/UFormItem.pas

    r290 r291  
    7979    InitControls;
    8080    LoadData(Item);
    81     Caption := Item.GetClassSysName;
     81    Caption := Item.GetClassName;
    8282  end else begin
    8383    DataControls.Clear;
    … …  
    157157      NewControl := TCheckBox.Create(nil);
    158158    end else raise Exception.Create('Unsupported type ' + IntToStr(Integer(DataType)));
    159     NewControl.Left := 100;
     159    NewControl.Left := 150;
    160160    NewControl.Top := Y;
    161161    NewControl.Parent := Self;
    162162    Core.CoolTranslator1.TranslateComponent(NewControl);
     163    Core.ThemeManager1.ApplyTheme(NewControl);
    163164    NewControl.Visible := True;
    164165    DataControls.Add(NewControl);
Note: See TracChangeset for help on using the changeset viewer.