From c45972fcedd81e4a8fe44061f2f0fda3566a159e Mon Sep 17 00:00:00 2001 From: mattias Date: Tue, 10 Jan 2006 14:20:20 +0000 Subject: [PATCH] converted SysVarUserOveridesDlg to lfm from Darius git-svn-id: trunk@8481 - --- .gitattributes | 2 + ide/runparamsopts.lfm | 42 ++++++------ ide/runparamsopts.lrs | 59 ++++++++--------- ide/sysvaruseroverridedlg.lfm | 92 ++++++++++++++++++++++++++ ide/sysvaruseroverridedlg.lrs | 30 +++++++++ ide/sysvaruseroverridedlg.pas | 117 ++++------------------------------ 6 files changed, 188 insertions(+), 154 deletions(-) create mode 100644 ide/sysvaruseroverridedlg.lfm create mode 100644 ide/sysvaruseroverridedlg.lrs diff --git a/.gitattributes b/.gitattributes index 4b1da2413b..c0a44dc9da 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1092,6 +1092,8 @@ ide/splash.pp svneol=native#text/pascal ide/startlazarus.lpr svneol=native#text/pascal ide/startlazarus.rc svneol=native#text/plain ide/startlazopts.pas svneol=native#text/pascal +ide/sysvaruseroverridedlg.lfm svneol=native#text/plain +ide/sysvaruseroverridedlg.lrs svneol=native#text/plain ide/sysvaruseroverridedlg.pas svneol=native#text/pascal ide/todolist.lfm svneol=native#text/plain ide/todolist.lrs svneol=native#text/plain diff --git a/ide/runparamsopts.lfm b/ide/runparamsopts.lfm index 2f0af86265..a3d5f39490 100644 --- a/ide/runparamsopts.lfm +++ b/ide/runparamsopts.lfm @@ -43,7 +43,7 @@ object RunParamsOptsDlg: TRunParamsOptsDlg object Notebook: TNotebook Align = alTop Anchors = [akTop, akLeft, akRight, akBottom] - PageIndex = 0 + PageIndex = 1 Height = 408 Width = 500 object Page1: TPage @@ -57,8 +57,8 @@ object RunParamsOptsDlg: TRunParamsOptsDlg AutoSize = True BorderSpacing.Around = 6 Caption = 'DisplayGroupBox' - ClientHeight = 54 - ClientWidth = 476 + ClientHeight = 72 + ClientWidth = 480 TabOrder = 3 Left = 6 Height = 72 @@ -93,8 +93,8 @@ object RunParamsOptsDlg: TRunParamsOptsDlg AutoSize = True BorderSpacing.Around = 6 Caption = 'CmdLineParametersGroupBox' - ClientHeight = 35 - ClientWidth = 476 + ClientHeight = 53 + ClientWidth = 480 TabOrder = 0 Left = 6 Height = 53 @@ -116,8 +116,8 @@ object RunParamsOptsDlg: TRunParamsOptsDlg AutoSize = True BorderSpacing.Around = 6 Caption = 'UseLaunchingApplicationGroupBox' - ClientHeight = 52 - ClientWidth = 476 + ClientHeight = 70 + ClientWidth = 480 TabOrder = 1 Left = 6 Height = 70 @@ -154,8 +154,8 @@ object RunParamsOptsDlg: TRunParamsOptsDlg AutoSize = True BorderSpacing.Around = 6 Caption = 'HostApplicationGroupBox' - ClientHeight = 35 - ClientWidth = 476 + ClientHeight = 53 + ClientWidth = 480 TabOrder = 2 Left = 6 Height = 53 @@ -189,8 +189,8 @@ object RunParamsOptsDlg: TRunParamsOptsDlg AutoSize = True BorderSpacing.Around = 6 Caption = 'WorkingDirectoryGroupBox' - ClientHeight = 35 - ClientWidth = 476 + ClientHeight = 53 + ClientWidth = 480 TabOrder = 4 Left = 6 Height = 53 @@ -241,8 +241,8 @@ object RunParamsOptsDlg: TRunParamsOptsDlg Align = alBottom BorderSpacing.Around = 6 Caption = 'UserOverridesGroupBox' - ClientHeight = 161 - ClientWidth = 480 + ClientHeight = 143 + ClientWidth = 476 TabOrder = 1 Left = 6 Height = 161 @@ -258,7 +258,7 @@ object RunParamsOptsDlg: TRunParamsOptsDlg TabOrder = 0 Left = 6 Height = 29 - Top = 106 + Top = 88 Width = 141 end object UserOverridesEditButton: TButton @@ -270,9 +270,10 @@ object RunParamsOptsDlg: TRunParamsOptsDlg OnClick = UserOverridesEditButtonClick TabOrder = 1 AnchorSideLeft.Control = UserOverridesAddButton + AnchorSideLeft.Side = asrBottom Left = 153 Height = 29 - Top = 106 + Top = 88 Width = 140 end object UserOverridesDeleteButton: TButton @@ -284,9 +285,10 @@ object RunParamsOptsDlg: TRunParamsOptsDlg OnClick = UserOverridesDeleteButtonClick TabOrder = 2 AnchorSideLeft.Control = UserOverridesEditButton + AnchorSideLeft.Side = asrBottom Left = 299 Height = 29 - Top = 106 + Top = 88 Width = 153 end object UserOverridesListView: TListView @@ -306,9 +308,10 @@ object RunParamsOptsDlg: TRunParamsOptsDlg end> RowSelect = True SortType = stText + TabOrder = 3 ViewStyle = vsReport Left = 6 - Height = 96 + Height = 78 Top = 6 Width = 464 end @@ -317,8 +320,8 @@ object RunParamsOptsDlg: TRunParamsOptsDlg Align = alClient BorderSpacing.Around = 6 Caption = 'SystemVariablesGroupBox' - ClientHeight = 184 - ClientWidth = 480 + ClientHeight = 166 + ClientWidth = 476 TabOrder = 2 Left = 6 Height = 184 @@ -340,6 +343,7 @@ object RunParamsOptsDlg: TRunParamsOptsDlg end> RowSelect = True SortType = stText + TabOrder = 0 ViewStyle = vsReport Left = 6 Height = 154 diff --git a/ide/runparamsopts.lrs b/ide/runparamsopts.lrs index 270f49aa82..62f3793318 100644 --- a/ide/runparamsopts.lrs +++ b/ide/runparamsopts.lrs @@ -15,12 +15,12 @@ LazarusResources.Add('TRunParamsOptsDlg','FORMDATA',[ +'pacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#12'Cancel' +'Button'#11'ModalResult'#2#2#8'TabOrder'#2#1#4'Left'#3#144#1#6'Height'#2#29#3 +'Top'#3#159#1#5'Width'#2'X'#0#0#9'TNotebook'#8'Notebook'#5'Align'#7#5'alTop' - +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#9'PageIndex'#2#0#6 + +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#9'PageIndex'#2#1#6 +'Height'#3#152#1#5'Width'#3#244#1#0#5'TPage'#5'Page1'#7'Caption'#6#5'Page1' +#11'ClientWidth'#3#236#1#12'ClientHeight'#3'~'#1#6'Height'#3'~'#1#5'Width'#3 +#236#1#0#9'TGroupBox'#15'DisplayGroupBox'#5'Align'#7#5'alTop'#8'AutoSize'#9 +#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'DisplayGroupBox'#12'ClientHeig' - +'ht'#2'6'#11'ClientWidth'#3#220#1#8'TabOrder'#2#3#4'Left'#2#6#6'Height'#2'H' + +'ht'#2'H'#11'ClientWidth'#3#224#1#8'TabOrder'#2#3#4'Left'#2#6#6'Height'#2'H' +#3'Top'#3#3#1#5'Width'#3#224#1#0#5'TEdit'#11'DisplayEdit'#5'Align'#7#5'alTop' +#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#4'Text'#6#11'DisplayEdit'#4'Le' +'ft'#2#6#6'Height'#2#23#3'Top'#2#25#5'Width'#3#208#1#0#0#9'TCheckBox'#18'Use' @@ -29,14 +29,14 @@ LazarusResources.Add('TRunParamsOptsDlg','FORMDATA',[ +'aption'#6#18'UseDisplayCheckBox'#8'TabOrder'#2#1#4'Left'#2#6#6'Height'#2#13 +#3'Top'#2#6#5'Width'#3#208#1#0#0#0#9'TGroupBox'#25'CmdLineParametersGroupBox' +#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6 - +#25'CmdLineParametersGroupBox'#12'ClientHeight'#2'#'#11'ClientWidth'#3#220#1 + +#25'CmdLineParametersGroupBox'#12'ClientHeight'#2'5'#11'ClientWidth'#3#224#1 +#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#2'5'#3'Top'#2'A'#5'Width'#3#224#1#0#5 +'TEdit'#21'CmdLineParametersEdit'#5'Align'#7#5'alTop'#20'BorderSpacing.Aroun' +'d'#2#6#8'TabOrder'#2#0#4'Text'#6#21'CmdLineParametersEdit'#4'Left'#2#6#6'He' +'ight'#2#23#3'Top'#2#6#5'Width'#3#208#1#0#0#0#9'TGroupBox'#31'UseLaunchingAp' +'plicationGroupBox'#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Aroun' +'d'#2#6#7'Caption'#6#31'UseLaunchingApplicationGroupBox'#12'ClientHeight'#2 - +'4'#11'ClientWidth'#3#220#1#8'TabOrder'#2#1#4'Left'#2#6#6'Height'#2'F'#3'Top' + +'F'#11'ClientWidth'#3#224#1#8'TabOrder'#2#1#4'Left'#2#6#6'Height'#2'F'#3'Top' +#2'|'#5'Width'#3#224#1#0#9'TCheckBox'#31'UseLaunchingApplicationCheckBox'#5 +'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'B' +'orderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#31'UseLau' @@ -47,7 +47,7 @@ LazarusResources.Add('TRunParamsOptsDlg','FORMDATA',[ +#4'Left'#2#6#6'Height'#2#21#3'Top'#2#25#5'Width'#3#208#1#0#0#0#9'TGroupBox' +#23'HostApplicationGroupBox'#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpac' +'ing.Around'#2#6#7'Caption'#6#23'HostApplicationGroupBox'#12'ClientHeight'#2 - +'#'#11'ClientWidth'#3#220#1#8'TabOrder'#2#2#4'Left'#2#6#6'Height'#2'5'#3'Top' + +'5'#11'ClientWidth'#3#224#1#8'TabOrder'#2#2#4'Left'#2#6#6'Height'#2'5'#3'Top' +#2#6#5'Width'#3#224#1#0#7'TButton'#24'HostApplicationBrowseBtn'#5'Align'#7#7 +'alRight'#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'C' +'aption'#6#24'HostApplicationBrowseBtn'#7'OnClick'#7#29'HostApplicationBrows' @@ -56,8 +56,8 @@ LazarusResources.Add('TRunParamsOptsDlg','FORMDATA',[ +'erSpacing.Around'#2#6#8'TabOrder'#2#1#4'Text'#6#19'HostApplicationEdit'#4'L' +'eft'#2#6#6'Height'#2#23#3'Top'#2#6#5'Width'#3#179#1#0#0#0#9'TGroupBox'#24'W' +'orkingDirectoryGroupBox'#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing' - +'.Around'#2#6#7'Caption'#6#24'WorkingDirectoryGroupBox'#12'ClientHeight'#2'#' - +#11'ClientWidth'#3#220#1#8'TabOrder'#2#4#4'Left'#2#6#6'Height'#2'5'#3'Top'#3 + +'.Around'#2#6#7'Caption'#6#24'WorkingDirectoryGroupBox'#12'ClientHeight'#2'5' + +#11'ClientWidth'#3#224#1#8'TabOrder'#2#4#4'Left'#2#6#6'Height'#2'5'#3'Top'#3 +#200#0#5'Width'#3#224#1#0#7'TButton'#19'WorkingDirectoryBtn'#5'Align'#7#7'al' +'Right'#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Cap' +'tion'#6#19'WorkingDirectoryBtn'#7'OnClick'#7#24'WorkingDirectoryBtnClick'#8 @@ -71,34 +71,35 @@ LazarusResources.Add('TRunParamsOptsDlg','FORMDATA',[ +'iablesCheckBox'#7'Enabled'#8#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#2#13#3'T' +'op'#3'k'#1#5'Width'#3#224#1#0#0#9'TGroupBox'#21'UserOverridesGroupBox'#5'Al' +'ign'#7#8'alBottom'#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'UserOverrid' - +'esGroupBox'#12'ClientHeight'#3#161#0#11'ClientWidth'#3#224#1#8'TabOrder'#2#1 + +'esGroupBox'#12'ClientHeight'#3#143#0#11'ClientWidth'#3#220#1#8'TabOrder'#2#1 +#4'Left'#2#6#6'Height'#3#161#0#3'Top'#3#196#0#5'Width'#3#224#1#0#7'TButton' +#22'UserOverridesAddButton'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize' +#9#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption' +#6#22'UserOverridesAddButton'#7'OnClick'#7#27'UserOverridesAddButtonClick'#8 - +'TabOrder'#2#0#4'Left'#2#6#6'Height'#2#29#3'Top'#2'j'#5'Width'#3#141#0#0#0#7 + +'TabOrder'#2#0#4'Left'#2#6#6'Height'#2#29#3'Top'#2'X'#5'Width'#3#141#0#0#0#7 +'TButton'#23'UserOverridesEditButton'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8 +'AutoSize'#9#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#2#7 +'Caption'#6#23'UserOverridesEditButton'#7'OnClick'#7#28'UserOverridesEditBut' +'tonClick'#8'TabOrder'#2#1#22'AnchorSideLeft.Control'#7#22'UserOverridesAddB' - +'utton'#4'Left'#3#153#0#6'Height'#2#29#3'Top'#2'j'#5'Width'#3#140#0#0#0#7'TB' - +'utton'#25'UserOverridesDeleteButton'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8 - +'AutoSize'#9#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#2#7 - +'Caption'#6#25'UserOverridesDeleteButton'#7'OnClick'#7#30'UserOverridesDelet' - +'eButtonClick'#8'TabOrder'#2#2#22'AnchorSideLeft.Control'#7#23'UserOverrides' - +'EditButton'#4'Left'#3'+'#1#6'Height'#2#29#3'Top'#2'j'#5'Width'#3#153#0#0#0#9 - +'TListView'#21'UserOverridesListView'#5'Align'#7#5'alTop'#7'Anchors'#11#5'ak' - +'Top'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Colu' - +'mns'#14#1#8'AutoSize'#9#7'Caption'#6#7'Caption'#5'Width'#2'*'#0#1#8'AutoSiz' - +'e'#9#7'Caption'#6#7'Caption'#5'Width'#2'*'#0#0#9'RowSelect'#9#8'SortType'#7 - +#6'stText'#9'ViewStyle'#7#8'vsReport'#4'Left'#2#6#6'Height'#2'`'#3'Top'#2#6#5 - +'Width'#3#208#1#0#0#0#9'TGroupBox'#23'SystemVariablesGroupBox'#5'Align'#7#8 - +'alClient'#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'SystemVariablesGroup' - +'Box'#12'ClientHeight'#3#184#0#11'ClientWidth'#3#224#1#8'TabOrder'#2#2#4'Lef' - +'t'#2#6#6'Height'#3#184#0#3'Top'#2#6#5'Width'#3#224#1#0#9'TListView'#23'Syst' - +'emVariablesListView'#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#7 - +'Columns'#14#1#8'AutoSize'#9#7'Caption'#6#7'Caption'#5'Width'#2'*'#0#1#8'Aut' - +'oSize'#9#7'Caption'#6#7'Caption'#5'Width'#2'*'#0#0#9'RowSelect'#9#8'SortTyp' - +'e'#7#6'stText'#9'ViewStyle'#7#8'vsReport'#4'Left'#2#6#6'Height'#3#154#0#3'T' - +'op'#2#6#5'Width'#3#208#1#0#0#0#0#0#0 + +'utton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#3#153#0#6'Height'#2#29 + +#3'Top'#2'X'#5'Width'#3#140#0#0#0#7'TButton'#25'UserOverridesDeleteButton'#7 + +'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2 + +#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#25'UserOverridesDeleteButt' + +'on'#7'OnClick'#7#30'UserOverridesDeleteButtonClick'#8'TabOrder'#2#2#22'Anch' + +'orSideLeft.Control'#7#23'UserOverridesEditButton'#19'AnchorSideLeft.Side'#7 + +#9'asrBottom'#4'Left'#3'+'#1#6'Height'#2#29#3'Top'#2'X'#5'Width'#3#153#0#0#0 + +#9'TListView'#21'UserOverridesListView'#5'Align'#7#5'alTop'#7'Anchors'#11#5 + +'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Co' + +'lumns'#14#1#8'AutoSize'#9#7'Caption'#6#7'Caption'#5'Width'#2'*'#0#1#8'AutoS' + +'ize'#9#7'Caption'#6#7'Caption'#5'Width'#2'*'#0#0#9'RowSelect'#9#8'SortType' + +#7#6'stText'#8'TabOrder'#2#3#9'ViewStyle'#7#8'vsReport'#4'Left'#2#6#6'Height' + +#2'N'#3'Top'#2#6#5'Width'#3#208#1#0#0#0#9'TGroupBox'#23'SystemVariablesGroup' + +'Box'#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'Sy' + +'stemVariablesGroupBox'#12'ClientHeight'#3#166#0#11'ClientWidth'#3#220#1#8'T' + +'abOrder'#2#2#4'Left'#2#6#6'Height'#3#184#0#3'Top'#2#6#5'Width'#3#224#1#0#9 + +'TListView'#23'SystemVariablesListView'#5'Align'#7#8'alClient'#20'BorderSpac' + +'ing.Around'#2#6#7'Columns'#14#1#8'AutoSize'#9#7'Caption'#6#7'Caption'#5'Wid' + +'th'#2'*'#0#1#8'AutoSize'#9#7'Caption'#6#7'Caption'#5'Width'#2'*'#0#0#9'RowS' + +'elect'#9#8'SortType'#7#6'stText'#8'TabOrder'#2#0#9'ViewStyle'#7#8'vsReport' + +#4'Left'#2#6#6'Height'#3#154#0#3'Top'#2#6#5'Width'#3#208#1#0#0#0#0#0#0 ]); diff --git a/ide/sysvaruseroverridedlg.lfm b/ide/sysvaruseroverridedlg.lfm new file mode 100644 index 0000000000..2b7f40fef6 --- /dev/null +++ b/ide/sysvaruseroverridedlg.lfm @@ -0,0 +1,92 @@ +object SysVarUserOverrideDialog: TSysVarUserOverrideDialog + ActiveControl = ValueEdit + Align = alTop + Caption = 'SysVarUserOverrideDialog' + ClientHeight = 147 + ClientWidth = 400 + PixelsPerInch = 96 + Position = poScreenCenter + HorzScrollBar.Page = 399 + VertScrollBar.Page = 146 + Left = 312 + Height = 147 + Top = 829 + Width = 400 + object VariableLabel: TLabel + Align = alTop + BorderSpacing.Around = 6 + Caption = 'VariableLabel' + Color = clNone + ParentColor = False + Left = 6 + Height = 14 + Top = 6 + Width = 388 + end + object ValueLabel: TLabel + Align = alTop + BorderSpacing.Around = 6 + Caption = 'ValueLabel' + Color = clNone + ParentColor = False + Left = 6 + Height = 14 + Top = 55 + Width = 388 + end + object ValueEdit: TEdit + Align = alTop + BorderSpacing.Around = 6 + TabOrder = 0 + Text = 'ValueEdit' + Left = 6 + Height = 23 + Top = 75 + Width = 388 + end + object VariableEdit: TEdit + Align = alTop + BorderSpacing.Around = 6 + TabOrder = 1 + Text = 'VariableEdit' + Left = 6 + Height = 23 + Top = 26 + Width = 388 + end + object OKButton: TBitBtn + Anchors = [akRight, akBottom] + AutoSize = True + BorderSpacing.Right = 6 + BorderSpacing.InnerBorder = 2 + Caption = '&OK' + Default = True + Kind = bkOK + ModalResult = 1 + NumGlyphs = 0 + OnClick = OkButtonClick + TabOrder = 2 + AnchorSideRight.Control = Owner + AnchorSideRight.Side = asrBottom + Left = 326 + Height = 34 + Top = 106 + Width = 68 + end + object CancelButton: TBitBtn + Anchors = [akRight, akBottom] + AutoSize = True + BorderSpacing.Right = 6 + BorderSpacing.InnerBorder = 2 + Caption = 'Cancel' + Kind = bkCancel + ModalResult = 2 + NumGlyphs = 0 + TabOrder = 3 + AnchorSideRight.Control = OKButton + Left = 240 + Height = 34 + Top = 106 + Width = 80 + end +end diff --git a/ide/sysvaruseroverridedlg.lrs b/ide/sysvaruseroverridedlg.lrs new file mode 100644 index 0000000000..20e0f9da19 --- /dev/null +++ b/ide/sysvaruseroverridedlg.lrs @@ -0,0 +1,30 @@ +{ This is an automatically generated lazarus resource file } + +LazarusResources.Add('TSysVarUserOverrideDialog','FORMDATA',[ + 'TPF0'#25'TSysVarUserOverrideDialog'#24'SysVarUserOverrideDialog'#13'ActiveCo' + +'ntrol'#7#9'ValueEdit'#5'Align'#7#5'alTop'#7'Caption'#6#24'SysVarUserOverrid' + +'eDialog'#12'ClientHeight'#3#147#0#11'ClientWidth'#3#144#1#13'PixelsPerInch' + +#2'`'#8'Position'#7#14'poScreenCenter'#18'HorzScrollBar.Page'#3#143#1#18'Ver' + +'tScrollBar.Page'#3#146#0#4'Left'#3'8'#1#6'Height'#3#147#0#3'Top'#3'='#3#5'W' + +'idth'#3#144#1#0#6'TLabel'#13'VariableLabel'#5'Align'#7#5'alTop'#20'BorderSp' + +'acing.Around'#2#6#7'Caption'#6#13'VariableLabel'#5'Color'#7#6'clNone'#11'Pa' + +'rentColor'#8#4'Left'#2#6#6'Height'#2#14#3'Top'#2#6#5'Width'#3#132#1#0#0#6'T' + +'Label'#10'ValueLabel'#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Ca' + +'ption'#6#10'ValueLabel'#5'Color'#7#6'clNone'#11'ParentColor'#8#4'Left'#2#6#6 + +'Height'#2#14#3'Top'#2'7'#5'Width'#3#132#1#0#0#5'TEdit'#9'ValueEdit'#5'Align' + +#7#5'alTop'#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#4'Text'#6#9'ValueEd' + +'it'#4'Left'#2#6#6'Height'#2#23#3'Top'#2'K'#5'Width'#3#132#1#0#0#5'TEdit'#12 + +'VariableEdit'#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#8'TabOrder'#2 + +#1#4'Text'#6#12'VariableEdit'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#26#5'Width' + +#3#132#1#0#0#7'TBitBtn'#8'OKButton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8 + +'AutoSize'#9#19'BorderSpacing.Right'#2#6#25'BorderSpacing.InnerBorder'#2#2#7 + +'Caption'#6#3'&OK'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumG' + +'lyphs'#2#0#7'OnClick'#7#13'OkButtonClick'#8'TabOrder'#2#2#23'AnchorSideRigh' + +'t.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3'F'#1 + +#6'Height'#2'"'#3'Top'#2'j'#5'Width'#2'D'#0#0#7'TBitBtn'#12'CancelButton'#7 + +'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2 + +#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCa' + +'ncel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#3#23'AnchorSideRig' + +'ht.Control'#7#8'OKButton'#4'Left'#3#240#0#6'Height'#2'"'#3'Top'#2'j'#5'Widt' + +'h'#2'P'#0#0#0 +]); diff --git a/ide/sysvaruseroverridedlg.pas b/ide/sysvaruseroverridedlg.pas index 9ab46df068..bde3d9a42d 100644 --- a/ide/sysvaruseroverridedlg.pas +++ b/ide/sysvaruseroverridedlg.pas @@ -40,16 +40,15 @@ uses LazarusIDEStrConsts, LResources; type + { TSysVarUserOverrideDialog } TSysVarUserOverrideDialog = class(TForm) + OKButton: TBitBtn; + CancelButton: TBitBtn; VariableLabel: TLabel; VariableEdit: TEdit; ValueLabel: TLabel; ValueEdit: TEdit; - OkButton: TButton; - CancelButton: TButton; procedure OkButtonClick(Sender: TObject); - procedure CancelButtonClick(Sender: TObject); - procedure SysVarUserOverrideDialogResize(Sender: TObject); private public constructor Create(TheOwner: TComponent); override; @@ -57,10 +56,8 @@ type function ShowSysVarUserOverrideDialog(var Variable, Value: string): TModalResult; - implementation - function ShowSysVarUserOverrideDialog(var Variable, Value: string): TModalResult; var SysVarUserOverrideDialog: TSysVarUserOverrideDialog; begin @@ -89,115 +86,23 @@ begin mtWarning,[mbCancel,mbIgnore],0)=mrCancel then exit; end; - ModalResult:=mrOk; -end; - -procedure TSysVarUserOverrideDialog.CancelButtonClick(Sender: TObject); -begin - ModalResult:=mrCancel; -end; - -procedure TSysVarUserOverrideDialog.SysVarUserOverrideDialogResize( - Sender: TObject); -begin - with VariableLabel do begin - SetBounds(10,10,150,Height); - end; - - with VariableEdit do begin - SetBounds(VariableLabel.Left,VariableLabel.Top+VariableLabel.Height+2, - Self.ClientWidth-2*VariableLabel.Left,Height); - end; - - with ValueLabel do begin - SetBounds(VariableEdit.Left,VariableEdit.Top+VariableEdit.Height+10, - 150,Height); - end; - - with ValueEdit do begin - SetBounds(ValueLabel.Left,ValueLabel.Top+ValueLabel.Height+2, - Self.ClientWidth-2*ValueLabel.Left,Height); - end; - - with OkButton do begin - SetBounds(Self.ClientWidth-220,Self.ClientHeight-40,100,25); - end; - - with CancelButton do begin - SetBounds(OkButton.Left+OkButton.Width+10,OkButton.Top,100,25); - end; end; constructor TSysVarUserOverrideDialog.Create(TheOwner: TComponent); begin inherited Create(TheOwner); - if LazarusResources.Find(ClassName)=nil then begin - Caption:=lisSVUOOverrideSystemVariable; - Width:=400; - Height:=170; - Position:=poScreenCenter; - OnResize:=@SysVarUserOverrideDialogResize; + Caption:=lisSVUOOverrideSystemVariable; - VariableLabel:=TLabel.Create(Self); - with VariableLabel do begin - Name:='VariableLabel'; - Parent:=Self; - SetBounds(10,10,150,Height); - Caption:=lisCodeToolsDefsVariable; - Visible:=true; - end; - - VariableEdit:=TEdit.Create(Self); - with VariableEdit do begin - Name:='VariableEdit'; - Parent:=Self; - SetBounds(VariableLabel.Left,VariableLabel.Top+VariableLabel.Height+2, - Self.ClientWidth-2*VariableLabel.Left,Height); - Visible:=true; - end; + VariableLabel.Caption:=lisCodeToolsDefsVariable; + ValueLabel.Caption:='Value:'; - ValueLabel:=TLabel.Create(Self); - with ValueLabel do begin - Name:='ValueLabel'; - Parent:=Self; - SetBounds(VariableEdit.Left,VariableEdit.Top+VariableEdit.Height+10, - 150,Height); - Caption:='Value:'; - Visible:=true; - end; - - ValueEdit:=TEdit.Create(Self); - with ValueEdit do begin - Name:='ValueEdit'; - Parent:=Self; - SetBounds(ValueLabel.Left,ValueLabel.Top+ValueLabel.Height+2, - Self.ClientWidth-2*ValueLabel.Left,Height); - Visible:=true; - end; - - OkButton:=TButton.Create(Self); - with OkButton do begin - Name:='OkButton'; - Parent:=Self; - SetBounds(Self.ClientWidth-220,Self.ClientHeight-40,100,25); - Caption:=lisSVUOOk; - OnClick:=@OkButtonClick; - Visible:=true; - end; - - CancelButton:=TButton.Create(Self); - with CancelButton do begin - Name:='CancelButton'; - Parent:=Self; - SetBounds(OkButton.Left+OkButton.Width+10,OkButton.Top,100,25); - Caption:=dlgCancel; - OnClick:=@CancelButtonClick; - Visible:=true; - end; - end; - SysVarUserOverrideDialogResize(nil); + OkButton.Caption:=lisSVUOOk; + CancelButton.Caption:=dlgCancel; end; +initialization + {$I sysvaruseroverridedlg.lrs} + end.