Changeset 584 for Common/Forms


Ignore:
Timestamp:
Jan 17, 2025, 8:00:49 AM (5 weeks ago)
Author:
chronos
Message:
  • Modified: Updated Common package.
Location:
Common/Forms
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • Common/Forms/FormAbout.lfm

    r566 r584  
    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
    1616    Top = 135
    17     Width = 642
     17    Width = 654
    1818    Align = alTop
    1919    BorderSpacing.Left = 30
    … …  
    2929    Height = 26
    3030    Top = 191
    31     Width = 642
     31    Width = 654
    3232    Align = alTop
    3333    BorderSpacing.Around = 30
    … …  
    4040    Height = 135
    4141    Top = 0
    42     Width = 702
     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

  • Common/Forms/FormItem.lfm

    r583 r584  
    11object FormItem: TFormItem
    2   Left = 1040
    3   Height = 397
    4   Top = 540
    5   Width = 469
     2  Left = 441
     3  Height = 446
     4  Top = 395
     5  Width = 577
    66  Caption = 'Item'
    7   ClientHeight = 397
    8   ClientWidth = 469
     7  ClientHeight = 446
     8  ClientWidth = 577
    99  DesignTimePPI = 144
    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 = 332
    1515    Height = 38
    16     Top = 353
     16    Top = 402
    1717    Width = 113
    1818    Anchors = [akRight, akBottom]
    … …  
    2424  end
    2525  object ButtonCancel: TButton
    26     Left = 208
     26    Left = 456
    2727    Height = 38
    28     Top = 353
     28    Top = 402
    2929    Width = 113
    3030    Anchors = [akRight, akBottom]
    … …  
    3636  object ScrollBox1: TScrollBox
    3737    Left = 8
    38     Height = 334
     38    Height = 383
    3939    Top = 8
    40     Width = 453
     40    Width = 561
    4141    HorzScrollBar.Page = 1
    4242    VertScrollBar.Page = 1

  • Common/Forms/FormItem.pas

    r583 r584  
    176176    if DataType = dtString then begin
    177177      NewControl := TEdit.Create(nil);
    178       NewControl.Width := Scale96ToScreen(300);
     178      NewControl.Width := Scale96ToScreen(200);
    179179    end else
    180180    if DataType = dtColor then begin

  • Common/Forms/FormKeyShortcuts.lfm

    r580 r584  
    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 = 10
     16    Height = 262
     17    Top = 10
     18    Width = 684
     19    Align = alTop
     20    Anchors = [akTop, akLeft, akRight, akBottom]
     21    BorderSpacing.Around = 10
    2122    Columns = <   
    2223      item
    … …  
    4243    OnKeyPress = ListView1KeyPress
    4344  end
     45  object ButtonClose: TButton
     46    Left = 581
     47    Height = 37
     48    Top = 284
     49    Width = 113
     50    Anchors = [akRight, akBottom]
     51    Caption = 'Close'
     52    ModalResult = 11
     53    TabOrder = 1
     54    OnClick = ButtonCloseClick
     55  end
    4456  object PopupMenu1: TPopupMenu
    4557    Left = 408
    … …  
    5567    Column = 0
    5668    Order = soNone
    57     Left = 200
    58     Top = 160
     69    Left = 221
     70    Top = 144
    5971  end
    6072end

  • Common/Forms/FormKeyShortcuts.lrj

    r580 r584  
    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]}

  • Common/Forms/FormKeyShortcuts.pas

    r580 r584  
    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;

  • Common/Forms/FormList.lfm

    r583 r584  
    11object FormList: TFormList
    22  Left = 1040
    3   Height = 300
     3  Height = 360
    44  Top = 540
    5   Width = 400
     5  Width = 480
    66  Caption = 'List'
    7   ClientHeight = 300
    8   ClientWidth = 400
    9   DesignTimePPI = 120
     7  ClientHeight = 360
     8  ClientWidth = 480
     9  DesignTimePPI = 144
    1010  OnCreate = FormCreate
    1111  OnDestroy = FormDestroy
    … …  
    1414  object ListView1: TListView
    1515    Left = 0
    16     Height = 268
     16    Height = 322
    1717    Top = 0
    18     Width = 400
     18    Width = 480
    1919    Align = alClient
    2020    Columns = <   
    2121      item
    2222        Caption = 'Name'
    23         Width = 389
     23        Width = 467
    2424      end>
    2525    MultiSelect = True
    … …  
    4040  object ToolBar1: TToolBar
    4141    Left = 0
    42     Top = 268
    43     Width = 400
     42    Height = 38
     43    Top = 322
     44    Width = 480
    4445    Align = alBottom
    4546    ParentFont = False
    … …  
    5354    end
    5455    object ToolButton2: TToolButton
    55       Left = 30
     56      Left = 36
    5657      Top = 2
    5758      Action = AModify
    5859    end
    5960    object ToolButton3: TToolButton
    60       Left = 59
     61      Left = 71
    6162      Top = 2
    6263      Action = ARemove
    6364    end
    6465    object ToolButton4: TToolButton
    65       Left = 88
     66      Left = 106
    6667      Top = 2
    6768      Action = AClone
    … …  
    6970  end
    7071  object ActionList1: TActionList
    71     Left = 174
    72     Top = 133
     72    Left = 209
     73    Top = 160
    7374    object AAdd: TAction
    7475      Caption = 'Add'
    … …  
    101102  end
    102103  object PopupMenu1: TPopupMenu
    103     Left = 294
    104     Top = 133
     104    Left = 353
     105    Top = 160
    105106    object MenuItem1: TMenuItem
    106107      Action = AAdd

  • Common/Forms/FormList.pas

    r583 r584  
    7272  SRemoveItems = 'Remove items';
    7373  SRemoveItemsQuery = 'Do you want to remove selected items?';
    74   SNew = 'New';
    7574
    7675{ TFormList }
    … …  
    129128  FormItem := TFormItem.Create(Self);
    130129  try
    131     TempEntry.Name := FList.GetNextAvailableName(SNew + ' ' + LowerCase(List.GetName));
     130    TempEntry.Name := FList.GetNextAvailableName(List.GetName);
    132131    FormItem.Item := TempEntry;
    133132    if FormItem.ShowModal = mrOk then begin
    … …  
    204203  ItemFields: TItemFields;
    205204  ItemField: TItemField;
     205  DrawRect: TRect;
    206206begin
    207207  ItemFields := TItem(Item.Data).GetFields;
    208208  try
    209209    ItemField := ItemFields[SubItem];
    210     if ItemField.DataType = dtColor then
    211     with ListView1.Canvas do begin
     210    with ListView1.Canvas do
     211    if ItemField.DataType = dtColor then begin
    212212      Brush.Color := TItem(Item.Data).GetValueColor(ItemField.Index);
    213213      Brush.Style := bsSolid;
    214       FillRect(Item.DisplayRectSubItem(SubItem, drBounds));
    215     end;
     214      DrawRect := Item.DisplayRectSubItem(SubItem, drBounds);
     215      {$IFDEF LCLQT5}
     216      // TODO: Wrong rectangle width on Qt5
     217      if DrawRect.Width > ListView1.Columns[SubItem].Width then
     218        DrawRect.Width := ListView1.Columns[SubItem].Width;
     219      {$ENDIF}
     220      FillRect(DrawRect);
     221      end;
    216222  finally
    217223    ItemFields.Free;

  • Common/Forms/FormTest.lfm

    r566 r584  
    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

  • Common/Forms/FormTest.lrj

    r566 r584  
    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]}

  • Common/Forms/FormTest.pas

    r566 r584  
    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

  • Common/Forms/FormTests.lfm

    r566 r584  
    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

  • Common/Forms/FormTests.lrj

    r566 r584  
    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"}

  • Common/Forms/FormTests.pas

    r566 r584  
    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.