Changeset 362


Ignore:
Timestamp:
Dec 31, 2024, 1:15:01 PM (7 days ago)
Author:
chronos
Message:
  • Added: Close button on more forms for better touch screen devices support.
Location:
trunk
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/Core.pas

    r361 r362  
    476476    FormMain.FormKeyShortcuts := TFormKeyShortcuts.Create(nil);
    477477  with FormMain.FormKeyShortcuts do begin
    478     ImageList := ImageListSmall;
     478    Images := ImageListSmall;
    479479    SourceComponents.Clear;
    480480    SourceComponents.Add(Self);

  • trunk/Forms/FormCharts.lfm

    r317 r362  
    11object FormCharts: TFormCharts
    2   Left = 808
    3   Height = 709
    4   Top = 365
    5   Width = 944
     2  Left = 411
     3  Height = 586
     4  Top = 146
     5  Width = 787
    66  Caption = 'Charts'
    7   ClientHeight = 709
    8   ClientWidth = 944
    9   DesignTimePPI = 144
     7  ClientHeight = 586
     8  ClientWidth = 787
     9  DesignTimePPI = 120
    1010  OnShow = FormShow
    11   LCLVersion = '3.4.0.0'
     11  LCLVersion = '3.6.0.0'
    1212  object Chart1: TChart
    13     Left = 10
    14     Height = 636
    15     Top = 67
    16     Width = 929
     13    Left = 8
     14    Height = 488
     15    Top = 48
     16    Width = 775
    1717    AxisList = <   
    1818      item
    … …  
    3838  end
    3939  object ComboBox1: TComboBox
    40     Left = 29
    41     Height = 38
    42     Top = 10
    43     Width = 470
    44     ItemHeight = 0
     40    Left = 24
     41    Height = 28
     42    Top = 8
     43    Width = 392
     44    ItemHeight = 20
    4545    ItemIndex = 0
    4646    Items.Strings = (
    … …  
    5555    OnChange = ComboBox1Change
    5656  end
     57  object ButtonClose: TButton
     58    Left = 680
     59    Height = 31
     60    Top = 544
     61    Width = 94
     62    Caption = 'Close'
     63    ModalResult = 11
     64    TabOrder = 2
     65    OnClick = ButtonCloseClick
     66  end
    5767end

  • trunk/Forms/FormCharts.lrj

    r317 r362  
    11{"version":1,"strings":[
    22{"hash":77498803,"name":"tformcharts.caption","sourcebytes":[67,104,97,114,116,115],"value":"Charts"},
    3 {"hash":264628691,"name":"tformcharts.combobox1.text","sourcebytes":[79,99,99,117,112,105,101,100,32,99,101,108,108,115],"value":"Occupied cells"}
     3{"hash":264628691,"name":"tformcharts.combobox1.text","sourcebytes":[79,99,99,117,112,105,101,100,32,99,101,108,108,115],"value":"Occupied cells"},
     4{"hash":4863637,"name":"tformcharts.buttonclose.caption","sourcebytes":[67,108,111,115,101],"value":"Close"}
    45]}

  • trunk/Forms/FormCharts.pas

    r344 r362  
    1212
    1313  TFormCharts = class(TFormEx)
     14    ButtonClose: TButton;
    1415    Chart1: TChart;
    1516    ComboBox1: TComboBox;
     17    procedure ButtonCloseClick(Sender: TObject);
    1618    procedure ComboBox1Change(Sender: TObject);
    1719    procedure FormShow(Sender: TObject);
    … …  
    4446begin
    4547  Redraw;
     48end;
     49
     50procedure TFormCharts.ButtonCloseClick(Sender: TObject);
     51begin
     52  Close;
    4653end;
    4754

  • trunk/Forms/FormHelp.lfm

    r317 r362  
    11object FormHelp: TFormHelp
    2   Left = 1040
    3   Height = 432
    4   Top = 540
    5   Width = 582
     2  Left = 514
     3  Height = 360
     4  Top = 267
     5  Width = 485
    66  Caption = 'Help'
    7   ClientHeight = 432
    8   ClientWidth = 582
    9   Constraints.MinHeight = 268
    10   Constraints.MinWidth = 509
    11   DesignTimePPI = 144
     7  ClientHeight = 360
     8  ClientWidth = 485
     9  Constraints.MinHeight = 100
     10  Constraints.MinWidth = 100
     11  DesignTimePPI = 120
    1212  OnCreate = FormCreate
    1313  Position = poMainFormCenter
    14   LCLVersion = '3.4.0.0'
     14  LCLVersion = '3.6.0.0'
    1515  object Memo1: TMemo
    16     Left = 7
    17     Height = 418
    18     Top = 7
    19     Width = 568
    20     Align = alClient
    21     BorderSpacing.Around = 7
     16    Left = 8
     17    Height = 304
     18    Top = 8
     19    Width = 469
     20    Align = alTop
     21    Anchors = [akTop, akLeft, akRight, akBottom]
     22    BorderSpacing.Around = 8
    2223    ReadOnly = True
    2324    ScrollBars = ssAutoBoth
    2425    TabOrder = 0
    2526  end
     27  object ButtonClose: TButton
     28    Left = 383
     29    Height = 31
     30    Top = 320
     31    Width = 94
     32    Anchors = [akRight, akBottom]
     33    Caption = 'Close'
     34    ModalResult = 11
     35    TabOrder = 1
     36  end
    2637end

  • trunk/Forms/FormHelp.lrj

    r317 r362  
    11{"version":1,"strings":[
    2 {"hash":322608,"name":"tformhelp.caption","sourcebytes":[72,101,108,112],"value":"Help"}
     2{"hash":322608,"name":"tformhelp.caption","sourcebytes":[72,101,108,112],"value":"Help"},
     3{"hash":4863637,"name":"tformhelp.buttonclose.caption","sourcebytes":[67,108,111,115,101],"value":"Close"}
    34]}

  • trunk/Forms/FormHelp.pas

    r317 r362  
    1212
    1313  TFormHelp = class(TFormEx)
     14    ButtonClose: TButton;
    1415    Memo1: TMemo;
    1516    procedure FormCreate(Sender: TObject);

  • trunk/Forms/FormPlayersStats.lfm

    r317 r362  
    11object FormPlayersStats: TFormPlayersStats
    2   Left = 907
    3   Height = 300
    4   Top = 570
    5   Width = 746
     2  Left = 689
     3  Height = 249
     4  Top = 437
     5  Width = 598
    66  Caption = 'Players stats'
    7   ClientHeight = 300
    8   ClientWidth = 746
    9   DesignTimePPI = 144
     7  ClientHeight = 249
     8  ClientWidth = 598
     9  Constraints.MinHeight = 100
     10  Constraints.MinWidth = 100
     11  DesignTimePPI = 120
    1012  OnShow = FormShow
    11   LCLVersion = '3.4.0.0'
     13  LCLVersion = '3.6.0.0'
    1214  object ListView1: TListView
    13     Left = 5
    14     Height = 290
    15     Top = 5
    16     Width = 736
    17     Align = alClient
    18     BorderSpacing.Around = 5
     15    Left = 8
     16    Height = 191
     17    Top = 8
     18    Width = 582
     19    Align = alTop
     20    Anchors = [akTop, akLeft, akRight, akBottom]
     21    BorderSpacing.Around = 8
    1922    Columns = <   
    2023      item
    2124        Caption = 'Name'
    22         Width = 120
     25        Width = 100
    2326      end   
    2427      item
    2528        Caption = 'Mode'
    26         Width = 120
     29        Width = 100
    2730      end   
    2831      item
    2932        Caption = 'Cells'
    30         Width = 120
     33        Width = 100
    3134      end   
    3235      item
    3336        Caption = 'Discovered'
    34         Width = 120
     37        Width = 100
    3538      end   
    3639      item
    3740        Caption = 'Cities'
    38         Width = 120
     41        Width = 100
    3942      end   
    4043      item
    4144        Caption = 'Units'
    42         Width = 120
     45        Width = 100
    4346      end   
    4447      item
    4548        Caption = 'Win objective cells'
    46         Width = 150
     49        Width = 125
    4750      end>
    4851    OwnerData = True
    … …  
    5457    OnData = ListView1Data
    5558  end
     59  object ButtonClose: TButton
     60    Left = 496
     61    Height = 31
     62    Top = 207
     63    Width = 94
     64    Anchors = [akRight, akBottom]
     65    Caption = 'Close'
     66    TabOrder = 1
     67    OnClick = ButtonCloseClick
     68  end
    5669  object PopupMenu1: TPopupMenu
    57     Left = 172
    58     Top = 132
     70    Left = 143
     71    Top = 110
    5972    object MenuItem1: TMenuItem
    6073      Action = ASpectate
    … …  
    6275  end
    6376  object ActionList1: TActionList
    64     Left = 448
    65     Top = 136
     77    Left = 373
     78    Top = 113
    6679    object ASpectate: TAction
    6780      Caption = 'Spectate'
    … …  
    7588    Column = 0
    7689    Order = soNone
    77     Left = 653
    78     Top = 132
     90    Left = 544
     91    Top = 110
    7992  end
    8093end

  • trunk/Forms/FormPlayersStats.lrj

    r317 r362  
    88{"hash":6049971,"name":"tformplayersstats.listview1.columns[5].caption","sourcebytes":[85,110,105,116,115],"value":"Units"},
    99{"hash":164849683,"name":"tformplayersstats.listview1.columns[6].caption","sourcebytes":[87,105,110,32,111,98,106,101,99,116,105,118,101,32,99,101,108,108,115],"value":"Win objective cells"},
     10{"hash":4863637,"name":"tformplayersstats.buttonclose.caption","sourcebytes":[67,108,111,115,101],"value":"Close"},
    1011{"hash":112897285,"name":"tformplayersstats.aspectate.caption","sourcebytes":[83,112,101,99,116,97,116,101],"value":"Spectate"}
    1112]}

  • trunk/Forms/FormPlayersStats.pas

    r318 r362  
    55uses
    66  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
    7   Menus, ActnList, Game, ListViewSort, FormEx, Player;
     7  Menus, ActnList, StdCtrls, Game, ListViewSort, FormEx, Player;
    88
    99type
    … …  
    1414    ASpectate: TAction;
    1515    ActionList1: TActionList;
     16    ButtonClose: TButton;
    1617    ListView1: TListView;
    1718    ListViewSort1: TListViewSort;
    … …  
    1920    PopupMenu1: TPopupMenu;
    2021    procedure ASpectateExecute(Sender: TObject);
     22    procedure ButtonCloseClick(Sender: TObject);
    2123    procedure FormShow(Sender: TObject);
    2224    procedure ListView1Data(Sender: TObject; Item: TListItem);
    … …  
    9597end;
    9698
     99procedure TFormPlayersStats.ButtonCloseClick(Sender: TObject);
     100begin
     101  Close;
     102end;
     103
    97104procedure TFormPlayersStats.ReloadList;
    98105begin

  • trunk/Forms/FormUnitMoves.lfm

    r318 r362  
    11object FormUnitMoves: TFormUnitMoves
    22  Left = 879
    3   Height = 418
     3  Height = 279
    44  Top = 511
    5   Width = 802
     5  Width = 660
    66  Caption = 'Unit moves'
    7   ClientHeight = 418
    8   ClientWidth = 802
    9   DesignTimePPI = 144
     7  ClientHeight = 279
     8  ClientWidth = 660
     9  Constraints.MinHeight = 100
     10  Constraints.MinWidth = 100
     11  DesignTimePPI = 120
    1012  OnShow = FormShow
    11   LCLVersion = '3.4.0.0'
     13  LCLVersion = '3.6.0.0'
    1214  object ListView1: TListView
    13     Left = 0
    14     Height = 418
    15     Top = 0
    16     Width = 802
    17     Align = alClient
     15    Left = 8
     16    Height = 224
     17    Top = 8
     18    Width = 644
     19    Align = alTop
     20    Anchors = [akTop, akLeft, akRight, akBottom]
     21    BorderSpacing.Around = 8
    1822    Columns = <   
    1923      item
    2024        Caption = 'From cell'
    21         Width = 180
     25        Width = 150
    2226      end   
    2327      item
    2428        Caption = 'To cell'
    25         Width = 180
     29        Width = 150
    2630      end   
    2731      item
    2832        Caption = 'Once count'
    29         Width = 180
     33        Width = 150
    3034      end   
    3135      item
    3236        Caption = 'Repeat count'
    33         Width = 398
     37        Width = 332
    3438      end>
    3539    OwnerData = True
    … …  
    4145    OnData = ListView1Data
    4246  end
     47  object ButtonClose: TButton
     48    Left = 558
     49    Height = 31
     50    Top = 240
     51    Width = 94
     52    Anchors = [akRight, akBottom]
     53    Caption = 'Close'
     54    ModalResult = 11
     55    TabOrder = 1
     56    OnClick = ButtonCloseClick
     57  end
    4358end

  • trunk/Forms/FormUnitMoves.lrj

    r317 r362  
    44{"hash":186031228,"name":"tformunitmoves.listview1.columns[1].caption","sourcebytes":[84,111,32,99,101,108,108],"value":"To cell"},
    55{"hash":124588228,"name":"tformunitmoves.listview1.columns[2].caption","sourcebytes":[79,110,99,101,32,99,111,117,110,116],"value":"Once count"},
    6 {"hash":65405396,"name":"tformunitmoves.listview1.columns[3].caption","sourcebytes":[82,101,112,101,97,116,32,99,111,117,110,116],"value":"Repeat count"}
     6{"hash":65405396,"name":"tformunitmoves.listview1.columns[3].caption","sourcebytes":[82,101,112,101,97,116,32,99,111,117,110,116],"value":"Repeat count"},
     7{"hash":4863637,"name":"tformunitmoves.buttonclose.caption","sourcebytes":[67,108,111,115,101],"value":"Close"}
    78]}

  • trunk/Forms/FormUnitMoves.pas

    r318 r362  
    55uses
    66  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
    7   FormEx, Game;
     7  StdCtrls, FormEx, Game;
    88
    99type
    … …  
    1212
    1313  TFormUnitMoves = class(TFormEx)
     14    ButtonClose: TButton;
    1415    ListView1: TListView;
     16    procedure ButtonCloseClick(Sender: TObject);
    1517    procedure FormShow(Sender: TObject);
    1618    procedure ListView1Data(Sender: TObject; Item: TListItem);
    … …  
    4850end;
    4951
     52procedure TFormUnitMoves.ButtonCloseClick(Sender: TObject);
     53begin
     54  Close;
     55end;
     56
    5057procedure TFormUnitMoves.ReloadList;
    5158begin

  • trunk/Languages/xtactics.cs.po

    r361 r362  
    1010"Content-Type: text/plain; charset=UTF-8\n"
    1111"Content-Transfer-Encoding: 8bit\n"
    12 "X-Generator: Poedit 3.4.2\n"
     12"X-Generator: Poedit 3.5\n"
    1313
    1414#: building.sbonusattack
    … …  
    575575msgstr "Uložit jako"
    576576
     577#: tformcharts.buttonclose.caption
     578msgctxt "tformcharts.buttonclose.caption"
     579msgid "Close"
     580msgstr "Zavřít"
     581
    577582#: tformcharts.caption
    578583msgctxt "tformcharts.caption"
    … …  
    735740msgstr "Jméno"
    736741
     742#: tformhelp.buttonclose.caption
     743msgctxt "tformhelp.buttonclose.caption"
     744msgid "Close"
     745msgstr "Zavřít"
     746
    737747#: tformhelp.caption
    738748msgctxt "tformhelp.caption"
    … …  
    10581068msgstr "Divák"
    10591069
     1070#: tformplayersstats.buttonclose.caption
     1071msgctxt "tformplayersstats.buttonclose.caption"
     1072msgid "Close"
     1073msgstr "Zavřít"
     1074
    10601075#: tformplayersstats.caption
    10611076msgid "Players stats"
    … …  
    11821197msgstr "Obecné"
    11831198
     1199#: tformunitmoves.buttonclose.caption
     1200msgctxt "tformunitmoves.buttonclose.caption"
     1201msgid "Close"
     1202msgstr "Zavřít"
     1203
    11841204#: tformunitmoves.caption
    11851205msgctxt "tformunitmoves.caption"
    … …  
    12371257msgid "View range"
    12381258msgstr "Dohled"
    1239 

  • trunk/Languages/xtactics.pot

    r361 r362  
    553553msgstr ""
    554554
     555#: tformcharts.buttonclose.caption
     556msgctxt "tformcharts.buttonclose.caption"
     557msgid "Close"
     558msgstr ""
     559
    555560#: tformcharts.caption
    556561msgctxt "tformcharts.caption"
    … …  
    711716msgstr ""
    712717
     718#: tformhelp.buttonclose.caption
     719msgctxt "tformhelp.buttonclose.caption"
     720msgid "Close"
     721msgstr ""
     722
    713723#: tformhelp.caption
    714724msgctxt "tformhelp.caption"
    … …  
    10221032msgstr ""
    10231033
     1034#: tformplayersstats.buttonclose.caption
     1035msgctxt "tformplayersstats.buttonclose.caption"
     1036msgid "Close"
     1037msgstr ""
     1038
    10241039#: tformplayersstats.caption
    10251040msgid "Players stats"
    … …  
    11451160msgstr ""
    11461161
     1162#: tformunitmoves.buttonclose.caption
     1163msgctxt "tformunitmoves.buttonclose.caption"
     1164msgid "Close"
     1165msgstr ""
     1166
    11471167#: tformunitmoves.caption
    11481168msgctxt "tformunitmoves.caption"

  • trunk/Packages/Common/Forms/FormKeyShortcuts.lfm

    r332 r362  
    11object FormKeyShortcuts: TFormKeyShortcuts
    22  Left = 839
    3   Height = 329
     3  Height = 274
    44  Top = 609
    5   Width = 704
     5  Width = 587
    66  Caption = 'Key shortcuts'
    7   ClientHeight = 329
    8   ClientWidth = 704
    9   DesignTimePPI = 144
     7  ClientHeight = 274
     8  ClientWidth = 587
     9  DesignTimePPI = 120
    1010  OnCreate = FormCreate
    1111  OnDestroy = FormDestroy
    1212  OnShow = FormShow
    13   LCLVersion = '3.4.0.0'
     13  LCLVersion = '3.6.0.0'
    1414  object ListView1: TListView
    15     Left = 5
    16     Height = 319
    17     Top = 5
    18     Width = 694
    19     Align = alClient
    20     BorderSpacing.Around = 5
     15    Left = 8
     16    Height = 212
     17    Top = 8
     18    Width = 571
     19    Align = alTop
     20    Anchors = [akTop, akLeft, akRight, akBottom]
     21    BorderSpacing.Around = 8
    2122    Columns = <   
    2223      item
    2324        Caption = 'Action'
    24         Width = 240
     25        Width = 200
    2526      end   
    2627      item
    2728        Caption = 'Window'
    28         Width = 240
     29        Width = 200
    2930      end   
    3031      item
    3132        Caption = 'Shortcut'
    32         Width = 199
     33        Width = 166
    3334      end>
    3435    OwnerData = True
    … …  
    4243    OnKeyPress = ListView1KeyPress
    4344  end
     45  object ButtonClose: TButton
     46    Left = 485
     47    Height = 31
     48    Top = 232
     49    Width = 94
     50    Anchors = [akRight, akBottom]
     51    Caption = 'Close'
     52    ModalResult = 11
     53    TabOrder = 1
     54    OnClick = ButtonCloseClick
     55  end
    4456  object PopupMenu1: TPopupMenu
    45     Left = 408
    46     Top = 144
     57    Left = 340
     58    Top = 120
    4759    object MenuItem1: TMenuItem
    4860      Caption = 'Execute'
    … …  
    5567    Column = 0
    5668    Order = soNone
    57     Left = 200
    58     Top = 160
     69    Left = 184
     70    Top = 120
    5971  end
    6072end

  • trunk/Packages/Common/Forms/FormKeyShortcuts.lrj

    r332 r362  
    44{"hash":98585447,"name":"tformkeyshortcuts.listview1.columns[1].caption","sourcebytes":[87,105,110,100,111,119],"value":"Window"},
    55{"hash":258584404,"name":"tformkeyshortcuts.listview1.columns[2].caption","sourcebytes":[83,104,111,114,116,99,117,116],"value":"Shortcut"},
     6{"hash":4863637,"name":"tformkeyshortcuts.buttonclose.caption","sourcebytes":[67,108,111,115,101],"value":"Close"},
    67{"hash":216771813,"name":"tformkeyshortcuts.menuitem1.caption","sourcebytes":[69,120,101,99,117,116,101],"value":"Execute"}
    78]}

  • trunk/Packages/Common/Forms/FormKeyShortcuts.pas

    r332 r362  
    1313
    1414  TFormKeyShortcuts = class(TFormEx)
     15    ButtonClose: TButton;
    1516    ListView1: TListView;
    1617    ListViewSort1: TListViewSort;
    1718    MenuItem1: TMenuItem;
    1819    PopupMenu1: TPopupMenu;
     20    procedure ButtonCloseClick(Sender: TObject);
    1921    procedure FormCreate(Sender: TObject);
    2022    procedure FormDestroy(Sender: TObject);
    … …  
    2527    procedure MenuItem1Click(Sender: TObject);
    2628  private
    27     function GetImageList: TCustomImageList;
    28     procedure SetImageList(AValue: TCustomImageList);
     29    function GetImages: TCustomImageList;
     30    procedure SetImages(AValue: TCustomImageList);
    2931  public
    3032    SourceComponents: TObjectList<TComponent>;
    3133    MainForm: TForm;
    3234    procedure LoadFromComponent(C: TComponent);
    33     property ImageList: TCustomImageList read GetImageList write SetImageList;
     35    property Images: TCustomImageList read GetImages write SetImages;
    3436  end;
    3537
    … …  
    4951  SShortcut = 'Shortcut';
    5052  SKeyShortcuts = 'Key shortcuts';
     53  SClose = 'Close';
    5154
    5255{ TFormKeyShortcuts }
    … …  
    105108end;
    106109
     110procedure TFormKeyShortcuts.ButtonCloseClick(Sender: TObject);
     111begin
     112  Close;
     113end;
     114
    107115procedure TFormKeyShortcuts.FormDestroy(Sender: TObject);
    108116begin
    … …  
    116124end;
    117125
    118 function TFormKeyShortcuts.GetImageList: TCustomImageList;
     126function TFormKeyShortcuts.GetImages: TCustomImageList;
    119127begin
    120128  Result := ListView1.SmallImages;
    121129end;
    122130
    123 procedure TFormKeyShortcuts.SetImageList(AValue: TCustomImageList);
     131procedure TFormKeyShortcuts.SetImages(AValue: TCustomImageList);
    124132begin
    125133  ListView1.SmallImages := AValue;

  • trunk/Packages/Common/Languages/FormKeyShortcuts.cs.po

    r355 r362  
    1010"Content-Type: text/plain; charset=UTF-8\n"
    1111"Content-Transfer-Encoding: 8bit\n"
    12 "X-Generator: Poedit 3.4.2\n"
     12"X-Generator: Poedit 3.5\n"
    1313
    1414#: formkeyshortcuts.saction
    1515msgid "Action"
    1616msgstr "Akce"
     17
     18#: formkeyshortcuts.sclose
     19msgid "Close"
     20msgstr "Zavřít"
    1721
    1822#: formkeyshortcuts.sexecute
    … …  
    4044msgid "Window"
    4145msgstr "Okno"
    42 

  • trunk/Packages/Common/Languages/FormKeyShortcuts.pot

    r332 r362  
    44#: formkeyshortcuts.saction
    55msgid "Action"
     6msgstr ""
     7
     8#: formkeyshortcuts.sclose
     9msgid "Close"
    610msgstr ""
    711
Note: See TracChangeset for help on using the changeset viewer.