Changeset 365


Ignore:
Timestamp:
Jan 2, 2025, 2:29:10 PM (4 days ago)
Author:
chronos
Message:
  • Modified: OK button moved to be on the left side of buttons.
  • Modified: Allow to run test from test form.
  • Fixed: Free tests during test list form close.
Location:
trunk
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • trunk/Core.pas

    r364 r365  
    499499  FormTests.TestCases := GetTestCases;
    500500  FormTests.ShowModal;
     501  FormTests.TestCases.Free;
     502  FormTests.TestCases := nil;
    501503  FormTests.Free;
    502504end;
  • trunk/Forms/FormGameSystem.lfm

    r344 r365  
    11object FormGameSystem: TFormGameSystem
    22  Left = 954
    3   Height = 402
     3  Height = 482
    44  Top = 479
    5   Width = 542
     5  Width = 650
    66  Caption = 'Game system'
    7   ClientHeight = 402
    8   ClientWidth = 542
    9   DesignTimePPI = 120
     7  ClientHeight = 482
     8  ClientWidth = 650
     9  DesignTimePPI = 144
    1010  OnCreate = FormCreate
    1111  OnDestroy = FormDestroy
    1212  LCLVersion = '3.6.0.0'
    1313  object ButtonSave: TButton
    14     Left = 133
    15     Height = 32
    16     Top = 360
    17     Width = 94
     14    Left = 144
     15    Height = 38
     16    Top = 432
     17    Width = 113
    1818    Anchors = [akLeft, akBottom]
    1919    Caption = 'Save'
     
    2323  end
    2424  object ButtonLoad: TButton
    25     Left = 20
    26     Height = 32
    27     Top = 360
    28     Width = 94
     25    Left = 16
     26    Height = 38
     27    Top = 432
     28    Width = 113
    2929    Anchors = [akLeft, akBottom]
    3030    Caption = 'Load'
     
    3434  end
    3535  object ButtonCancel: TButton
    36     Left = 311
    37     Height = 32
    38     Top = 360
    39     Width = 94
     36    Left = 515
     37    Height = 38
     38    Top = 432
     39    Width = 113
    4040    Anchors = [akRight, akBottom]
    4141    Caption = 'Cancel'
     
    4545  end
    4646  object ButtonOk: TButton
    47     Left = 430
    48     Height = 32
    49     Top = 360
    50     Width = 94
     47    Left = 384
     48    Height = 38
     49    Top = 432
     50    Width = 113
    5151    Anchors = [akRight, akBottom]
    5252    Caption = 'OK'
     
    5656  end
    5757  object PageControl1: TPageControl
    58     Left = 13
    59     Height = 334
    60     Top = 13
    61     Width = 511
     58    Left = 16
     59    Height = 400
     60    Top = 16
     61    Width = 612
    6262    ActivePage = TabSheetGeneral
    6363    Anchors = [akTop, akLeft, akRight, akBottom]
     
    6767    object TabSheetGeneral: TTabSheet
    6868      Caption = 'General'
    69       ClientHeight = 301
    70       ClientWidth = 503
     69      ClientHeight = 360
     70      ClientWidth = 602
    7171      ParentFont = False
    7272      object CheckBoxEmptyCellsNeutral: TCheckBox
    73         Left = 13
    74         Height = 24
    75         Top = 13
    76         Width = 277
     73        Left = 16
     74        Height = 30
     75        Top = 16
     76        Width = 357
    7777        Caption = 'Set cells without player units as neutral'
    7878        ParentFont = False
     
    8080      end
    8181      object CheckBoxUnitsSplitMerge: TCheckBox
    82         Left = 13
    83         Height = 24
    84         Top = 46
    85         Width = 178
     82        Left = 16
     83        Height = 30
     84        Top = 55
     85        Width = 229
    8686        Caption = 'Units can split or merge'
    8787        ParentFont = False
     
    8989      end
    9090      object CheckBoxUnitsMoveImmediately: TCheckBox
    91         Left = 13
    92         Height = 24
    93         Top = 79
    94         Width = 182
     91        Left = 16
     92        Height = 30
     93        Top = 95
     94        Width = 232
    9595        Caption = 'Units move immediately'
    9696        ParentFont = False
     
    9898      end
    9999      object Label5: TLabel
    100         Left = 13
    101         Height = 20
    102         Top = 113
    103         Width = 128
     100        Left = 16
     101        Height = 26
     102        Top = 136
     103        Width = 164
    104104        Caption = 'Preferred grid type:'
    105105        ParentColor = False
     
    107107      end
    108108      object ComboBoxPreferredGridType: TComboBox
    109         Left = 227
    110         Height = 28
    111         Top = 113
    112         Width = 253
    113         ItemHeight = 20
     109        Left = 272
     110        Height = 38
     111        Top = 136
     112        Width = 304
     113        ItemHeight = 0
    114114        Items.Strings = (
    115115          'None'
     
    140140  end
    141141  object OpenDialog1: TOpenDialog
    142     Left = 367
    143     Top = 133
     142    Left = 440
     143    Top = 160
    144144  end
    145145  object SaveDialog1: TSaveDialog
    146     Left = 193
    147     Top = 133
     146    Left = 232
     147    Top = 160
    148148  end
    149149end
  • trunk/Forms/FormMove.lfm

    r317 r365  
    11object FormMove: TFormMove
    22  Left = 1104
    3   Height = 278
     3  Height = 299
    44  Top = 604
    5   Width = 421
     5  Width = 467
    66  ActiveControl = ButtonOk
    77  Caption = 'Move'
    8   ClientHeight = 278
    9   ClientWidth = 421
    10   Constraints.MinHeight = 278
    11   Constraints.MinWidth = 421
     8  ClientHeight = 299
     9  ClientWidth = 467
     10  Constraints.MinHeight = 100
     11  Constraints.MinWidth = 350
    1212  DesignTimePPI = 144
    1313  OnKeyPress = FormKeyPress
    1414  OnShow = FormShow
    1515  Position = poMainFormCenter
    16   LCLVersion = '3.4.0.0'
    17   object SpinEditOnce: TSpinEdit
    18     Left = 208
    19     Height = 43
    20     Top = 40
    21     Width = 98
    22     OnChange = SpinEditOnceChange
    23     OnKeyPress = FormKeyPress
    24     ParentFont = False
    25     TabOrder = 0
    26   end
    27   object Label1: TLabel
    28     Left = 16
    29     Height = 26
    30     Top = 40
    31     Width = 49
    32     Caption = 'Once:'
    33     ParentColor = False
    34     ParentFont = False
    35   end
     16  LCLVersion = '3.6.0.0'
    3617  object ButtonOk: TButton
    37     Left = 296
     18    Left = 134
    3819    Height = 38
    39     Top = 224
     20    Top = 253
    4021    Width = 100
     22    Anchors = [akRight, akBottom]
    4123    Caption = 'Ok'
    4224    Default = True
    4325    ModalResult = 1
    4426    ParentFont = False
    45     TabOrder = 1
     27    TabOrder = 0
     28    OnClick = ButtonOkClick
    4629  end
    4730  object ButtonCancel: TButton
    48     Left = 176
     31    Left = 246
    4932    Height = 38
    50     Top = 224
     33    Top = 253
    5134    Width = 100
     35    Anchors = [akRight, akBottom]
    5236    Caption = 'Cancel'
    5337    ModalResult = 2
    5438    ParentFont = False
    55     TabOrder = 2
    56   end
    57   object Label2: TLabel
    58     Left = 24
    59     Height = 26
    60     Top = 136
    61     Width = 90
    62     Caption = 'Every turn:'
    63     ParentColor = False
    64     ParentFont = False
    65   end
    66   object SpinEditRepeat: TSpinEdit
    67     Left = 208
    68     Height = 43
    69     Top = 128
    70     Width = 98
    71     OnChange = SpinEditRepeatChange
    72     OnKeyPress = FormKeyPress
    73     ParentFont = False
    74     TabOrder = 3
    75   end
    76   object TrackBarOnce: TTrackBar
    77     Left = 88
    78     Height = 58
    79     Top = 80
    80     Width = 245
    81     OnChange = TrackBarOnceChange
    82     PageSize = 1
    83     Position = 0
    84     TickStyle = tsNone
    85     Anchors = [akTop, akLeft, akRight]
    86     OnKeyPress = FormKeyPress
    87     ParentFont = False
    88     TabOrder = 4
    89   end
    90   object TrackBarRepeat: TTrackBar
    91     Left = 96
    92     Height = 58
    93     Top = 168
    94     Width = 231
    95     OnChange = TrackBarRepeatChange
    96     PageSize = 1
    97     Position = 0
    98     TickStyle = tsNone
    99     Anchors = [akTop, akLeft, akRight]
    100     OnKeyPress = FormKeyPress
    101     ParentFont = False
    102     TabOrder = 5
    103   end
    104   object ButtonOnceMin: TButton
    105     Left = 8
    106     Height = 38
    107     Top = 88
    108     Width = 80
    109     Caption = 'Min'
    110     ParentFont = False
    111     TabOrder = 6
    112     OnClick = ButtonOnceMinClick
    113   end
    114   object ButtonOnceMax: TButton
    115     Left = 333
    116     Height = 38
    117     Top = 88
    118     Width = 80
    119     Anchors = [akTop, akRight]
    120     Caption = 'Max'
    121     ParentFont = False
    122     TabOrder = 7
    123     OnClick = ButtonOnceMaxClick
    124   end
    125   object ButtonRepeatMin: TButton
    126     Left = 8
    127     Height = 38
    128     Top = 176
    129     Width = 80
    130     Caption = 'Min'
    131     ParentFont = False
    132     TabOrder = 8
    133     OnClick = ButtonRepeatMinClick
    134   end
    135   object ButtonRepeatMax: TButton
    136     Left = 333
    137     Height = 38
    138     Top = 176
    139     Width = 80
    140     Anchors = [akTop, akRight]
    141     Caption = 'Max'
    142     ParentFont = False
    143     TabOrder = 9
    144     OnClick = ButtonRepeatMaxClick
    145   end
    146   object Label3: TLabel
    147     Left = 16
    148     Height = 26
    149     Top = 8
    150     Width = 134
    151     Caption = 'Win probability:'
    152     ParentColor = False
    153     ParentFont = False
     39    TabOrder = 1
    15440  end
    15541  object LabelWinProbability: TLabel
     
    16349  end
    16450  object ButtonRemove: TButton
    165     Left = 48
     51    Left = 358
    16652    Height = 38
    167     Top = 224
     53    Top = 253
    16854    Width = 100
     55    Anchors = [akRight, akBottom]
    16956    Caption = 'Delete'
    17057    ParentFont = False
    171     TabOrder = 10
     58    TabOrder = 2
    17259    OnClick = ButtonRemoveClick
    17360  end
     61  object ScrollBox1: TScrollBox
     62    Left = 8
     63    Height = 231
     64    Top = 8
     65    Width = 451
     66    HorzScrollBar.Page = 298
     67    VertScrollBar.Page = 214
     68    Align = alTop
     69    Anchors = [akTop, akLeft, akRight, akBottom]
     70    BorderSpacing.Around = 8
     71    ClientHeight = 229
     72    ClientWidth = 449
     73    TabOrder = 3
     74    object Label3: TLabel
     75      Left = 8
     76      Height = 26
     77      Top = 8
     78      Width = 134
     79      Caption = 'Win probability:'
     80      ParentColor = False
     81      ParentFont = False
     82    end
     83    object Label1: TLabel
     84      Left = 8
     85      Height = 26
     86      Top = 48
     87      Width = 49
     88      Caption = 'Once:'
     89      ParentColor = False
     90      ParentFont = False
     91    end
     92    object SpinEditOnce: TSpinEdit
     93      Left = 200
     94      Height = 43
     95      Top = 40
     96      Width = 98
     97      OnChange = SpinEditOnceChange
     98      OnKeyPress = FormKeyPress
     99      ParentFont = False
     100      TabOrder = 0
     101    end
     102    object ButtonOnceMin: TButton
     103      Left = 8
     104      Height = 38
     105      Top = 88
     106      Width = 80
     107      Caption = 'Min'
     108      ParentFont = False
     109      TabOrder = 1
     110      OnClick = ButtonOnceMinClick
     111    end
     112    object TrackBarOnce: TTrackBar
     113      Left = 96
     114      Height = 58
     115      Top = 80
     116      Width = 275
     117      OnChange = TrackBarOnceChange
     118      PageSize = 1
     119      Position = 0
     120      TickStyle = tsNone
     121      Anchors = [akTop, akLeft, akRight]
     122      OnKeyPress = FormKeyPress
     123      ParentFont = False
     124      TabOrder = 2
     125    end
     126    object ButtonOnceMax: TButton
     127      Left = 361
     128      Height = 38
     129      Top = 88
     130      Width = 80
     131      Anchors = [akTop, akRight]
     132      Caption = 'Max'
     133      ParentFont = False
     134      TabOrder = 3
     135      OnClick = ButtonOnceMaxClick
     136    end
     137    object ButtonRepeatMax: TButton
     138      Left = 361
     139      Height = 38
     140      Top = 176
     141      Width = 80
     142      Anchors = [akTop, akRight]
     143      Caption = 'Max'
     144      ParentFont = False
     145      TabOrder = 4
     146      OnClick = ButtonRepeatMaxClick
     147    end
     148    object SpinEditRepeat: TSpinEdit
     149      Left = 200
     150      Height = 43
     151      Top = 128
     152      Width = 98
     153      OnChange = SpinEditRepeatChange
     154      OnKeyPress = FormKeyPress
     155      ParentFont = False
     156      TabOrder = 5
     157    end
     158    object TrackBarRepeat: TTrackBar
     159      Left = 96
     160      Height = 58
     161      Top = 156
     162      Width = 269
     163      OnChange = TrackBarRepeatChange
     164      PageSize = 1
     165      Position = 0
     166      TickStyle = tsNone
     167      Anchors = [akTop, akLeft, akRight]
     168      OnKeyPress = FormKeyPress
     169      ParentFont = False
     170      TabOrder = 6
     171    end
     172    object ButtonRepeatMin: TButton
     173      Left = 8
     174      Height = 38
     175      Top = 176
     176      Width = 80
     177      Caption = 'Min'
     178      ParentFont = False
     179      TabOrder = 7
     180      OnClick = ButtonRepeatMinClick
     181    end
     182    object Label2: TLabel
     183      Left = 8
     184      Height = 26
     185      Top = 136
     186      Width = 90
     187      Caption = 'Every turn:'
     188      ParentColor = False
     189      ParentFont = False
     190    end
     191  end
    174192end
  • trunk/Forms/FormMove.lrj

    r317 r365  
    11{"version":1,"strings":[
    22{"hash":345797,"name":"tformmove.caption","sourcebytes":[77,111,118,101],"value":"Move"},
    3 {"hash":5654922,"name":"tformmove.label1.caption","sourcebytes":[79,110,99,101,58],"value":"Once:"},
    43{"hash":1371,"name":"tformmove.buttonok.caption","sourcebytes":[79,107],"value":"Ok"},
    54{"hash":77089212,"name":"tformmove.buttoncancel.caption","sourcebytes":[67,97,110,99,101,108],"value":"Cancel"},
    6 {"hash":188155274,"name":"tformmove.label2.caption","sourcebytes":[69,118,101,114,121,32,116,117,114,110,58],"value":"Every turn:"},
     5{"hash":8736,"name":"tformmove.labelwinprobability.caption","sourcebytes":[32,32,32],"value":"   "},
     6{"hash":78392485,"name":"tformmove.buttonremove.caption","sourcebytes":[68,101,108,101,116,101],"value":"Delete"},
     7{"hash":261993402,"name":"tformmove.label3.caption","sourcebytes":[87,105,110,32,112,114,111,98,97,98,105,108,105,116,121,58],"value":"Win probability:"},
     8{"hash":5654922,"name":"tformmove.label1.caption","sourcebytes":[79,110,99,101,58],"value":"Once:"},
    79{"hash":21502,"name":"tformmove.buttononcemin.caption","sourcebytes":[77,105,110],"value":"Min"},
    810{"hash":21384,"name":"tformmove.buttononcemax.caption","sourcebytes":[77,97,120],"value":"Max"},
     11{"hash":21384,"name":"tformmove.buttonrepeatmax.caption","sourcebytes":[77,97,120],"value":"Max"},
    912{"hash":21502,"name":"tformmove.buttonrepeatmin.caption","sourcebytes":[77,105,110],"value":"Min"},
    10 {"hash":21384,"name":"tformmove.buttonrepeatmax.caption","sourcebytes":[77,97,120],"value":"Max"},
    11 {"hash":261993402,"name":"tformmove.label3.caption","sourcebytes":[87,105,110,32,112,114,111,98,97,98,105,108,105,116,121,58],"value":"Win probability:"},
    12 {"hash":8736,"name":"tformmove.labelwinprobability.caption","sourcebytes":[32,32,32],"value":"   "},
    13 {"hash":78392485,"name":"tformmove.buttonremove.caption","sourcebytes":[68,101,108,101,116,101],"value":"Delete"}
     13{"hash":188155274,"name":"tformmove.label2.caption","sourcebytes":[69,118,101,114,121,32,116,117,114,110,58],"value":"Every turn:"}
    1414]}
  • trunk/Forms/FormMove.pas

    r318 r365  
    1212
    1313  TFormMove = class(TFormEx)
     14    ButtonOnceMax: TButton;
     15    ButtonOnceMin: TButton;
    1416    ButtonRemove: TButton;
    15     ButtonRepeatMax: TButton;
    16     ButtonOnceMin: TButton;
    17     ButtonOnceMax: TButton;
    1817    ButtonOk: TButton;
    1918    ButtonCancel: TButton;
     19    ButtonRepeatMax: TButton;
    2020    ButtonRepeatMin: TButton;
    2121    Label1: TLabel;
     
    2323    Label3: TLabel;
    2424    LabelWinProbability: TLabel;
     25    ScrollBox1: TScrollBox;
    2526    SpinEditOnce: TSpinEdit;
    2627    SpinEditRepeat: TSpinEdit;
    2728    TrackBarOnce: TTrackBar;
    2829    TrackBarRepeat: TTrackBar;
     30    procedure ButtonOkClick(Sender: TObject);
    2931    procedure ButtonOnceMaxClick(Sender: TObject);
    3032    procedure ButtonRemoveClick(Sender: TObject);
     
    107109end;
    108110
     111procedure TFormMove.ButtonOkClick(Sender: TObject);
     112begin
     113
     114end;
     115
    109116procedure TFormMove.ButtonRemoveClick(Sender: TObject);
    110117begin
  • trunk/Forms/FormNew.lfm

    r364 r365  
    33  Height = 794
    44  Top = 155
    5   Width = 1218
     5  Width = 1401
    66  Caption = 'New game'
    77  ClientHeight = 794
    8   ClientWidth = 1218
     8  ClientWidth = 1401
    99  Constraints.MinHeight = 502
    1010  Constraints.MinWidth = 667
     
    1919    Height = 676
    2020    Top = 60
    21     Width = 813
     21    Width = 996
    2222    ActivePage = TabSheetMap
    2323    Align = alClient
     
    3030      Caption = 'Mode'
    3131      ClientHeight = 636
    32       ClientWidth = 803
     32      ClientWidth = 986
    3333      ParentFont = False
    3434      object Panel3: TPanel
     
    3636        Height = 636
    3737        Top = 0
    38         Width = 803
     38        Width = 986
    3939        Align = alClient
    4040        BevelOuter = bvNone
    4141        ClientHeight = 636
    42         ClientWidth = 803
     42        ClientWidth = 986
    4343        ParentFont = False
    4444        TabOrder = 0
     
    173173      Caption = 'Players'
    174174      ClientHeight = 636
    175       ClientWidth = 803
     175      ClientWidth = 986
    176176      ParentFont = False
    177177      object Panel2: TPanel
     
    179179        Height = 636
    180180        Top = 0
    181         Width = 803
     181        Width = 986
    182182        Align = alClient
    183183        BevelOuter = bvNone
     
    189189      Caption = 'Map'
    190190      ClientHeight = 636
    191       ClientWidth = 803
     191      ClientWidth = 986
    192192      OnShow = TabSheetMapShow
    193193      ParentFont = False
     
    196196        Height = 636
    197197        Top = 0
    198         Width = 803
     198        Width = 986
    199199        Align = alClient
    200200        BevelOuter = bvNone
    201201        ClientHeight = 636
    202         ClientWidth = 803
     202        ClientWidth = 986
    203203        ParentFont = False
    204204        TabOrder = 0
     
    247247          Height = 58
    248248          Top = 8
    249           Width = 552
     249          Width = 735
    250250          Max = 100
    251251          Min = 2
     
    261261          Height = 58
    262262          Top = 49
    263           Width = 552
     263          Width = 735
    264264          Max = 100
    265265          Min = 2
     
    418418          Height = 43
    419419          Top = 184
    420           Width = 533
     420          Width = 716
    421421          Anchors = [akTop, akLeft, akRight]
    422422          ParentFont = False
     
    425425        end
    426426        object ButtonImageBrowse: TButton
    427           Left = 688
     427          Left = 871
    428428          Height = 43
    429429          Top = 184
     
    489489          Height = 360
    490490          Top = 272
    491           Width = 374
     491          Width = 557
    492492          Anchors = [akTop, akLeft, akRight, akBottom]
    493493          OnResize = Image1Resize
     
    517517      Caption = 'Rules'
    518518      ClientHeight = 636
    519       ClientWidth = 803
     519      ClientWidth = 986
    520520      ParentFont = False
    521521      object Panel4: TPanel
     
    523523        Height = 636
    524524        Top = 0
    525         Width = 803
     525        Width = 986
    526526        Align = alClient
    527527        BevelOuter = bvNone
    528528        ClientHeight = 636
    529         ClientWidth = 803
     529        ClientWidth = 986
    530530        ParentFont = False
    531531        TabOrder = 0
     
    616616          Height = 110
    617617          Top = 314
    618           Width = 780
     618          Width = 963
    619619          ActivePage = TabSheetCaptureEntireMap
    620620          Anchors = [akTop, akLeft, akRight]
     
    631631          object TabSheetCaptureCells: TTabSheet
    632632            ClientHeight = 67
    633             ClientWidth = 770
     633            ClientWidth = 953
    634634            ParentFont = False
    635635            object Label14: TLabel
     
    656656          object TabSheetStayAliveTurns: TTabSheet
    657657            ClientHeight = 67
    658             ClientWidth = 770
     658            ClientWidth = 953
    659659            ParentFont = False
    660660            object Label13: TLabel
     
    693693    Height = 54
    694694    Top = 740
    695     Width = 1218
     695    Width = 1401
    696696    Align = alBottom
    697697    BevelOuter = bvNone
    698698    ClientHeight = 54
    699     ClientWidth = 1218
     699    ClientWidth = 1401
    700700    ParentFont = False
    701701    TabOrder = 1
    702702    object ButtonOk: TButton
    703       Left = 1098
     703      Left = 1152
    704704      Height = 38
    705705      Top = 8
     
    713713    end
    714714    object ButtonCancel: TButton
    715       Left = 967
     715      Left = 1272
    716716      Height = 38
    717717      Top = 8
     
    725725  end
    726726  object PanelChat: TPanel
    727     Left = 827
     727    Left = 1010
    728728    Height = 684
    729729    Top = 56
     
    735735  end
    736736  object Splitter1: TSplitter
    737     Left = 821
     737    Left = 1004
    738738    Height = 684
    739739    Top = 56
     
    746746    Height = 56
    747747    Top = 0
    748     Width = 1218
     748    Width = 1401
    749749    Align = alTop
    750750    BevelOuter = bvNone
    751751    ClientHeight = 56
    752     ClientWidth = 1218
     752    ClientWidth = 1401
    753753    ParentFont = False
    754754    TabOrder = 4
  • trunk/Forms/FormServer.lfm

    r364 r365  
    1010  LCLVersion = '3.6.0.0'
    1111  object ButtonCancel: TButton
    12     Left = 331
     12    Left = 472
    1313    Height = 38
    1414    Top = 241
     
    2121  end
    2222  object ButtonOk: TButton
    23     Left = 466
     23    Left = 344
    2424    Height = 38
    2525    Top = 241
  • trunk/Forms/FormSettings.lfm

    r364 r365  
    1616  LCLVersion = '3.6.0.0'
    1717  object ButtonOk: TButton
    18     Left = 735
     18    Left = 608
    1919    Height = 38
    2020    Top = 568
     
    2727  end
    2828  object ButtonCancel: TButton
    29     Left = 600
     29    Left = 735
    3030    Height = 38
    3131    Top = 568
  • trunk/Packages/Common/Forms/FormAbout.lfm

    r315 r365  
    11object FormAbout: TFormAbout
    22  Left = 624
    3   Height = 402
     3  Height = 397
    44  Top = 622
    5   Width = 702
     5  Width = 714
    66  Caption = 'About'
    7   ClientHeight = 402
    8   ClientWidth = 702
     7  ClientHeight = 397
     8  ClientWidth = 714
    99  DesignTimePPI = 144
    1010  OnShow = FormShow
    1111  Position = poScreenCenter
    12   LCLVersion = '2.2.6.0'
     12  LCLVersion = '3.6.0.0'
    1313  object LabelDescription: TLabel
    1414    Left = 30
    1515    Height = 26
    16     Top = 135
    17     Width = 642
     16    Top = 0
     17    Width = 654
    1818    Align = alTop
    1919    BorderSpacing.Left = 30
     
    2828    Left = 30
    2929    Height = 26
    30     Top = 191
    31     Width = 642
     30    Top = 221
     31    Width = 654
    3232    Align = alTop
    3333    BorderSpacing.Around = 30
     
    3939    Left = 0
    4040    Height = 135
    41     Top = 0
    42     Width = 702
     41    Top = 56
     42    Width = 714
    4343    Align = alTop
    4444    BevelOuter = bvNone
    4545    ClientHeight = 135
    46     ClientWidth = 702
     46    ClientWidth = 714
    4747    FullRepaint = False
    4848    ParentFont = False
     
    5252      Height = 84
    5353      Top = 20
    54       Width = 564
     54      Width = 576
    5555      Anchors = [akTop, akLeft, akRight]
    5656      AutoSize = False
     
    7474    Left = 0
    7575    Height = 75
    76     Top = 327
    77     Width = 702
     76    Top = 322
     77    Width = 714
    7878    Align = alBottom
    7979    BevelOuter = bvNone
    8080    ClientHeight = 75
    81     ClientWidth = 702
     81    ClientWidth = 714
    8282    TabOrder = 1
    8383    object ButtonHomePage: TButton
     
    8888      Anchors = [akLeft, akBottom]
    8989      Caption = 'Home page'
    90       OnClick = ButtonHomePageClick
    9190      ParentFont = False
    9291      TabOrder = 0
     92      OnClick = ButtonHomePageClick
    9393    end
    9494    object ButtonClose: TButton
    95       Left = 531
     95      Left = 543
    9696      Height = 38
    9797      Top = 24
  • trunk/Packages/Common/Forms/FormItem.lfm

    r355 r365  
    1010  OnCreate = FormCreate
    1111  OnDestroy = FormDestroy
    12   LCLVersion = '3.4.0.0'
     12  LCLVersion = '3.6.0.0'
    1313  object ButtonOk: TButton
    14     Left = 344
     14    Left = 224
    1515    Height = 38
    1616    Top = 353
     
    2424  end
    2525  object ButtonCancel: TButton
    26     Left = 208
     26    Left = 348
    2727    Height = 38
    2828    Top = 353
  • trunk/Packages/Common/Forms/FormKeyShortcuts.lfm

    r362 r365  
    11object FormKeyShortcuts: TFormKeyShortcuts
    22  Left = 839
    3   Height = 274
     3  Height = 329
    44  Top = 609
    5   Width = 587
     5  Width = 704
    66  Caption = 'Key shortcuts'
    7   ClientHeight = 274
    8   ClientWidth = 587
    9   DesignTimePPI = 120
     7  ClientHeight = 329
     8  ClientWidth = 704
     9  DesignTimePPI = 144
    1010  OnCreate = FormCreate
    1111  OnDestroy = FormDestroy
     
    1313  LCLVersion = '3.6.0.0'
    1414  object ListView1: TListView
    15     Left = 8
    16     Height = 212
    17     Top = 8
    18     Width = 571
     15    Left = 10
     16    Height = 262
     17    Top = 10
     18    Width = 684
    1919    Align = alTop
    2020    Anchors = [akTop, akLeft, akRight, akBottom]
    21     BorderSpacing.Around = 8
     21    BorderSpacing.Around = 10
    2222    Columns = <   
    2323      item
    2424        Caption = 'Action'
    25         Width = 200
     25        Width = 240
    2626      end   
    2727      item
    2828        Caption = 'Window'
    29         Width = 200
     29        Width = 240
    3030      end   
    3131      item
    3232        Caption = 'Shortcut'
    33         Width = 166
     33        Width = 199
    3434      end>
    3535    OwnerData = True
     
    4444  end
    4545  object ButtonClose: TButton
    46     Left = 485
    47     Height = 31
    48     Top = 232
    49     Width = 94
     46    Left = 581
     47    Height = 37
     48    Top = 284
     49    Width = 113
    5050    Anchors = [akRight, akBottom]
    5151    Caption = 'Close'
     
    5555  end
    5656  object PopupMenu1: TPopupMenu
    57     Left = 340
    58     Top = 120
     57    Left = 408
     58    Top = 144
    5959    object MenuItem1: TMenuItem
    6060      Caption = 'Execute'
     
    6767    Column = 0
    6868    Order = soNone
    69     Left = 184
    70     Top = 120
     69    Left = 221
     70    Top = 144
    7171  end
    7272end
  • trunk/Packages/Common/Forms/FormTest.lfm

    r315 r365  
    88  ClientWidth = 865
    99  DesignTimePPI = 144
    10   LCLVersion = '2.2.6.0'
     10  OnShow = FormShow
     11  LCLVersion = '3.6.0.0'
    1112  object MemoLog: TMemo
    1213    Left = 8
    13     Height = 505
     14    Height = 464
    1415    Top = 8
    1516    Width = 849
    16     Align = alClient
     17    Align = alTop
     18    Anchors = [akTop, akLeft, akRight, akBottom]
    1719    BorderSpacing.Around = 8
    1820    ReadOnly = True
     
    2022    TabOrder = 0
    2123  end
     24  object ButtonRun: TButton
     25    Left = 616
     26    Height = 37
     27    Top = 480
     28    Width = 112
     29    Anchors = [akRight, akBottom]
     30    Caption = 'Run'
     31    TabOrder = 1
     32    OnClick = ButtonRunClick
     33  end
     34  object ButtonClose: TButton
     35    Left = 745
     36    Height = 37
     37    Top = 480
     38    Width = 112
     39    Anchors = [akRight, akBottom]
     40    Caption = 'Close'
     41    ModalResult = 11
     42    TabOrder = 2
     43    OnClick = ButtonRunClick
     44  end
    2245end
  • trunk/Packages/Common/Forms/FormTest.lrj

    r315 r365  
    11{"version":1,"strings":[
    2 {"hash":371876,"name":"tformtest.caption","sourcebytes":[84,101,115,116],"value":"Test"}
     2{"hash":371876,"name":"tformtest.caption","sourcebytes":[84,101,115,116],"value":"Test"},
     3{"hash":22974,"name":"tformtest.buttonrun.caption","sourcebytes":[82,117,110],"value":"Run"},
     4{"hash":4863637,"name":"tformtest.buttonclose.caption","sourcebytes":[67,108,111,115,101],"value":"Close"}
    35]}
  • trunk/Packages/Common/Forms/FormTest.pas

    r315 r365  
    44
    55uses
    6   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, FormEx;
     6  Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, FormEx,
     7  TestCase;
    78
    89type
     
    1112
    1213  TFormTest = class(TFormEx)
     14    ButtonRun: TButton;
     15    ButtonClose: TButton;
    1316    MemoLog: TMemo;
     17    procedure FormShow(Sender: TObject);
     18    procedure ButtonRunClick(Sender: TObject);
     19  private
     20    FTestCase: TTestCase;
     21    procedure SetTestCase(AValue: TTestCase);
     22  public
     23    property TestCase: TTestCase read FTestCase write SetTestCase;
    1424  end;
    1525
     
    1929{$R *.lfm}
    2030
     31{ TFormTest }
     32
     33procedure TFormTest.FormShow(Sender: TObject);
     34begin
     35  if Assigned(FTestCase) then MemoLog.Text := FTestCase.Log;
     36end;
     37
     38procedure TFormTest.SetTestCase(AValue: TTestCase);
     39begin
     40  if FTestCase = AValue then Exit;
     41  FTestCase := AValue;
     42end;
     43
     44procedure TFormTest.ButtonRunClick(Sender: TObject);
     45begin
     46  if Assigned(FTestCase) then begin
     47    FTestCase.Run;
     48    MemoLog.Text := FTestCase.Log;
     49  end;
     50end;
     51
    2152end.
    2253
  • trunk/Packages/Common/Forms/FormTests.lfm

    r315 r365  
    99  DesignTimePPI = 144
    1010  OnShow = FormShow
    11   LCLVersion = '2.2.6.0'
     11  LCLVersion = '3.6.0.0'
    1212  object ListViewTestCases: TListView
    1313    Left = 19
     
    3636  end
    3737  object ButtonRun: TButton
    38     Left = 945
     38    Left = 816
    3939    Height = 37
    4040    Top = 585
     
    4242    Anchors = [akRight, akBottom]
    4343    Caption = 'Run'
     44    TabOrder = 1
    4445    OnClick = ButtonRunClick
    45     TabOrder = 1
    4646  end
    4747  object LabelResult: TLabel
     
    5353    Caption = '   '
    5454    ParentColor = False
     55  end
     56  object ButtonClose: TButton
     57    Left = 945
     58    Height = 37
     59    Top = 585
     60    Width = 112
     61    Anchors = [akRight, akBottom]
     62    Caption = 'Close'
     63    ModalResult = 11
     64    TabOrder = 2
     65    OnClick = ButtonRunClick
    5566  end
    5667  object ActionList1: TActionList
  • trunk/Packages/Common/Forms/FormTests.lrj

    r315 r365  
    55{"hash":22974,"name":"tformtests.buttonrun.caption","sourcebytes":[82,117,110],"value":"Run"},
    66{"hash":8736,"name":"tformtests.labelresult.caption","sourcebytes":[32,32,32],"value":"   "},
     7{"hash":4863637,"name":"tformtests.buttonclose.caption","sourcebytes":[67,108,111,115,101],"value":"Close"},
    78{"hash":368487,"name":"tformtests.ashow.caption","sourcebytes":[83,104,111,119],"value":"Show"},
    89{"hash":22974,"name":"tformtests.arun.caption","sourcebytes":[82,117,110],"value":"Run"}
  • trunk/Packages/Common/Forms/FormTests.pas

    r315 r365  
    1616    ActionList1: TActionList;
    1717    ButtonRun: TButton;
     18    ButtonClose: TButton;
    1819    LabelResult: TLabel;
    1920    ListViewTestCases: TListView;
     
    119120  with TFormTest.Create(nil) do
    120121  try
    121     MemoLog.Text := TTestCase(ListViewTestCases.Selected.Data).Log;
     122    TestCase := TTestCase(ListViewTestCases.Selected.Data);
    122123    ShowModal;
     124    ReloadList;
    123125  finally
    124126    Free;
Note: See TracChangeset for help on using the changeset viewer.