diff --git a/converter/convertsettings.lfm b/converter/convertsettings.lfm index 7ebef5eda2..a7318b8cca 100644 --- a/converter/convertsettings.lfm +++ b/converter/convertsettings.lfm @@ -72,18 +72,17 @@ object ConvertSettingsForm: TConvertSettingsForm ShowHint = True TabOrder = 3 end - object MethodReplacementsButton: TBitBtn + object FuncReplacementsButton: TBitBtn Left = 11 Height = 30 Hint = 'Some Delphi functions can be replaced with a LCL function' Top = 108 Width = 272 - Caption = 'Method Replacements' - OnClick = MethodReplacementsButtonClick + Caption = 'Function Replacements' + OnClick = FuncReplacementsButtonClick ParentShowHint = False ShowHint = True TabOrder = 4 - Visible = False end end object SettingsGroupBox: TGroupBox @@ -92,7 +91,7 @@ object ConvertSettingsForm: TConvertSettingsForm Top = 80 Width = 637 Anchors = [akTop, akLeft, akRight] - ClientHeight = 132 + ClientHeight = 117 ClientWidth = 633 TabOrder = 1 object TargetRadioGroup: TRadioGroup @@ -189,6 +188,15 @@ object ConvertSettingsForm: TConvertSettingsForm Height = 39 Top = 398 Width = 625 + OKButton.Name = 'OKButton' + OKButton.Caption = '&OK' + HelpButton.Name = 'HelpButton' + HelpButton.Caption = '&Help' + CloseButton.Name = 'CloseButton' + CloseButton.Caption = '&Close' + CloseButton.Enabled = False + CancelButton.Name = 'CancelButton' + CancelButton.Caption = 'Cancel' TabOrder = 4 ShowButtons = [pbOK, pbCancel, pbHelp] end diff --git a/converter/convertsettings.pas b/converter/convertsettings.pas index 9fe39084fe..47bbdfde2d 100644 --- a/converter/convertsettings.pas +++ b/converter/convertsettings.pas @@ -110,12 +110,12 @@ type SameDFMCheckBox: TCheckBox; ProjectPathEdit: TLabeledEdit; TargetRadioGroup: TRadioGroup; - MethodReplacementsButton: TBitBtn; + FuncReplacementsButton: TBitBtn; UnitReplacementsButton: TBitBtn; SettingsGroupBox: TGroupBox; MissingStuffGroupBox: TGroupBox; AutoRemovePropCheckBox: TCheckBox; - procedure MethodReplacementsButtonClick(Sender: TObject); + procedure FuncReplacementsButtonClick(Sender: TObject); procedure TypeReplacementsButtonClick(Sender: TObject); procedure UnitReplacementsButtonClick(Sender: TObject); procedure FormCreate(Sender: TObject); @@ -436,8 +436,8 @@ begin UnitReplacementsButton.Hint:=lisConvUnitReplHint; TypeReplacementsButton.Caption:=lisConvTypeReplacements; TypeReplacementsButton.Hint:=lisConvTypeReplHint; - MethodReplacementsButton.Caption:=lisConvMethodReplacements; - MethodReplacementsButton.Hint:=lisConvMethodReplHint; + FuncReplacementsButton.Caption:=lisConvFuncReplacements; + FuncReplacementsButton.Hint:=lisConvFuncReplHint; TargetRadioGroupClick(TargetRadioGroup); end; @@ -467,9 +467,9 @@ begin EditMap(fSettings.ReplaceTypes, lisConvTypesToReplace); end; -procedure TConvertSettingsForm.MethodReplacementsButtonClick(Sender: TObject); +procedure TConvertSettingsForm.FuncReplacementsButtonClick(Sender: TObject); begin - ; + EditMap(fSettings.ReplaceFuncs, lisConvFuncsToReplace); end; diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index e503778b9f..631e777c09 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -472,12 +472,13 @@ resourcestring lisConvAutoReplaceUnitHint = 'If unchecked, there will be interactive dialogs for editing / accepting changes.'; lisConvUnitsToReplace = 'Units to replace'; lisConvTypesToReplace = 'Types to replace'; + lisConvFuncsToReplace = 'Functions / procedures to replace'; lisConvUnitReplacements = 'Unit Replacements'; lisConvUnitReplHint = 'Unit names in uses section of a source unit'; lisConvTypeReplacements = 'Type Replacements'; lisConvTypeReplHint = 'Unknown types in form file (DFM/LFM)'; - lisConvMethodReplacements = 'Method Replacements'; - lisConvMethodReplHint = 'Some Delphi functions can be replaced with LCL function'; + lisConvFuncReplacements = 'Function Replacements'; + lisConvFuncReplHint = 'Some Delphi functions can be replaced with LCL function'; lisReplacements = 'Replacements'; lisProperties = 'Properties (replace or delete)'; lisTypes = 'Types (not removed if no replacement)';