Changeset 168


Ignore:
Timestamp:
Aug 20, 2024, 3:43:35 PM (4 months ago)
Author:
chronos
Message:

Merged revision(s) 166-167 from trunk:

  • Fixed: OpenDialog was not initialized in Target options form.
  • Modified: Used scrollbox in target options form.
Location:
tags/1.3.0
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • tags/1.3.0

  • tags/1.3.0/Forms/FormKeyShortcuts.lfm

    r155 r168  
    11object FormKeyShortcuts: TFormKeyShortcuts
    2   Left = 1016
    3   Height = 437
    4   Top = 501
    5   Width = 527
     2  Left = 839
     3  Height = 329
     4  Top = 609
     5  Width = 704
    66  Caption = 'Key shortcuts'
    7   ClientHeight = 437
    8   ClientWidth = 527
     7  ClientHeight = 329
     8  ClientWidth = 704
    99  DesignTimePPI = 144
    1010  OnCreate = FormCreate
     
    1414  object ListView1: TListView
    1515    Left = 5
    16     Height = 427
     16    Height = 319
    1717    Top = 5
    18     Width = 517
     18    Width = 694
    1919    Align = alClient
    2020    BorderSpacing.Around = 5
     
    3030      item
    3131        Caption = 'Shortcut'
    32         Width = 127
     32        Width = 199
    3333      end>
    3434    PopupMenu = PopupMenu1
  • tags/1.3.0/Forms/FormTargetOptions.lfm

    r166 r168  
    11object FormTargetOptions: TFormTargetOptions
    22  Left = 987
    3   Height = 216
     3  Height = 251
    44  Top = 599
    5   Width = 609
     5  Width = 675
    66  Caption = 'Target options'
    7   ClientHeight = 216
    8   ClientWidth = 609
     7  ClientHeight = 251
     8  ClientWidth = 675
    99  DesignTimePPI = 144
    1010  LCLVersion = '3.4.0.0'
    11   object Edit1: TEdit
    12     Left = 10
    13     Height = 33
    14     Top = 38
    15     Width = 492
    16     Anchors = [akTop, akLeft, akRight]
    17     ParentFont = False
    18     TabOrder = 0
    19   end
    20   object Label1: TLabel
    21     Left = 10
    22     Height = 25
    23     Top = 8
    24     Width = 144
    25     Caption = 'Compiler location:'
    26     ParentColor = False
    27     ParentFont = False
    28   end
    29   object ButtonCompiler: TButton
    30     Left = 512
     11  object ButtonOk: TButton
     12    Left = 552
    3113    Height = 37
    32     Top = 42
    33     Width = 90
    34     Anchors = [akTop, akRight]
    35     Caption = 'Select...'
    36     ParentFont = False
    37     TabOrder = 1
    38     OnClick = ButtonCompilerClick
    39   end
    40   object ButtonExecute: TButton
    41     Left = 512
    42     Height = 37
    43     Top = 115
    44     Width = 90
    45     Anchors = [akTop, akRight]
    46     Caption = 'Select...'
    47     ParentFont = False
    48     TabOrder = 2
    49     OnClick = ButtonExecuteClick
    50   end
    51   object Edit2: TEdit
    52     Left = 10
    53     Height = 33
    54     Top = 115
    55     Width = 492
    56     Anchors = [akTop, akLeft, akRight]
    57     ParentFont = False
    58     TabOrder = 3
    59   end
    60   object Label2: TLabel
    61     Left = 10
    62     Height = 25
    63     Top = 86
    64     Width = 139
    65     Caption = 'Executor location:'
    66     ParentColor = False
    67     ParentFont = False
    68   end
    69   object ButtonOk: TButton
    70     Left = 486
    71     Height = 37
    72     Top = 165
     14    Top = 200
    7315    Width = 109
    7416    Anchors = [akRight, akBottom]
     
    7618    ModalResult = 1
    7719    ParentFont = False
    78     TabOrder = 4
     20    TabOrder = 0
    7921  end
    8022  object ButtonCancel: TButton
    81     Left = 351
     23    Left = 417
    8224    Height = 37
    83     Top = 165
     25    Top = 200
    8426    Width = 109
    8527    Anchors = [akRight, akBottom]
     
    8729    ModalResult = 2
    8830    ParentFont = False
    89     TabOrder = 5
     31    TabOrder = 1
     32  end
     33  object ScrollBox1: TScrollBox
     34    Left = 8
     35    Height = 179
     36    Top = 8
     37    Width = 662
     38    HorzScrollBar.Page = 165
     39    VertScrollBar.Page = 158
     40    Anchors = [akTop, akLeft, akRight, akBottom]
     41    ClientHeight = 177
     42    ClientWidth = 660
     43    TabOrder = 2
     44    object Label1: TLabel
     45      Left = 10
     46      Height = 26
     47      Top = 8
     48      Width = 155
     49      Caption = 'Compiler location:'
     50      ParentColor = False
     51      ParentFont = False
     52    end
     53    object Edit1: TEdit
     54      Left = 10
     55      Height = 43
     56      Top = 38
     57      Width = 540
     58      Anchors = [akTop, akLeft, akRight]
     59      ParentFont = False
     60      TabOrder = 0
     61    end
     62    object ButtonCompiler: TButton
     63      Left = 558
     64      Height = 37
     65      Top = 42
     66      Width = 90
     67      Anchors = [akTop, akRight]
     68      Caption = 'Select...'
     69      ParentFont = False
     70      TabOrder = 1
     71      OnClick = ButtonCompilerClick
     72    end
     73    object ButtonExecute: TButton
     74      Left = 558
     75      Height = 37
     76      Top = 115
     77      Width = 90
     78      Anchors = [akTop, akRight]
     79      Caption = 'Select...'
     80      ParentFont = False
     81      TabOrder = 2
     82      OnClick = ButtonExecuteClick
     83    end
     84    object Edit2: TEdit
     85      Left = 10
     86      Height = 43
     87      Top = 115
     88      Width = 540
     89      Anchors = [akTop, akLeft, akRight]
     90      ParentFont = False
     91      TabOrder = 3
     92    end
     93    object Label2: TLabel
     94      Left = 10
     95      Height = 26
     96      Top = 86
     97      Width = 151
     98      Caption = 'Executor location:'
     99      ParentColor = False
     100      ParentFont = False
     101    end
    90102  end
    91103  object OpenDialog1: TOpenDialog
  • tags/1.3.0/Forms/FormTargetOptions.lrj

    r145 r168  
    11{"version":1,"strings":[
    22{"hash":251086723,"name":"tformtargetoptions.caption","sourcebytes":[84,97,114,103,101,116,32,111,112,116,105,111,110,115],"value":"Target options"},
     3{"hash":1371,"name":"tformtargetoptions.buttonok.caption","sourcebytes":[79,107],"value":"Ok"},
     4{"hash":77089212,"name":"tformtargetoptions.buttoncancel.caption","sourcebytes":[67,97,110,99,101,108],"value":"Cancel"},
    35{"hash":266916938,"name":"tformtargetoptions.label1.caption","sourcebytes":[67,111,109,112,105,108,101,114,32,108,111,99,97,116,105,111,110,58],"value":"Compiler location:"},
    46{"hash":45763278,"name":"tformtargetoptions.buttoncompiler.caption","sourcebytes":[83,101,108,101,99,116,46,46,46],"value":"Select..."},
    57{"hash":45763278,"name":"tformtargetoptions.buttonexecute.caption","sourcebytes":[83,101,108,101,99,116,46,46,46],"value":"Select..."},
    6 {"hash":102772106,"name":"tformtargetoptions.label2.caption","sourcebytes":[69,120,101,99,117,116,111,114,32,108,111,99,97,116,105,111,110,58],"value":"Executor location:"},
    7 {"hash":1371,"name":"tformtargetoptions.buttonok.caption","sourcebytes":[79,107],"value":"Ok"},
    8 {"hash":77089212,"name":"tformtargetoptions.buttoncancel.caption","sourcebytes":[67,97,110,99,101,108],"value":"Cancel"}
     8{"hash":102772106,"name":"tformtargetoptions.label2.caption","sourcebytes":[69,120,101,99,117,116,111,114,32,108,111,99,97,116,105,111,110,58],"value":"Executor location:"}
    99]}
  • tags/1.3.0/Forms/FormTargetOptions.pas

    r149 r168  
    1212
    1313  TFormTargetOptions = class(TFormEx)
     14    ButtonCompiler: TButton;
     15    ButtonExecute: TButton;
    1416    ButtonOk: TButton;
    1517    ButtonCancel: TButton;
    16     ButtonCompiler: TButton;
    17     ButtonExecute: TButton;
    1818    Edit1: TEdit;
    1919    Edit2: TEdit;
     
    2121    Label2: TLabel;
    2222    OpenDialog1: TOpenDialog;
     23    ScrollBox1: TScrollBox;
    2324    procedure ButtonCompilerClick(Sender: TObject);
    2425    procedure ButtonExecuteClick(Sender: TObject);
Note: See TracChangeset for help on using the changeset viewer.