Converter: More settings GUI improvements.

git-svn-id: trunk@26125 -

converter/convertsettings.lfm

@@ -1,11 +1,11 @@
 object ConvertSettingsForm: TConvertSettingsForm
   Left = 366
-  Height = 457
+  Height = 443
   Top = 299
   Width = 637
   ActiveControl = ProjectPathEdit
   Caption = 'Convert Delphi unit, project or package '
-  ClientHeight = 457
+  ClientHeight = 443
   ClientWidth = 637
   Constraints.MinHeight = 400
   OnCreate = FormCreate
@@ -17,20 +17,20 @@ object ConvertSettingsForm: TConvertSettingsForm
     AnchorSideTop.Side = asrBottom
     AnchorSideBottom.Control = ButtonPanel
     Left = 0
-    Height = 187
+    Height = 173
     Top = 219
     Width = 637
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Top = 3
     Caption = 'Units, Types and Properties'
-    ClientHeight = 168
+    ClientHeight = 154
     ClientWidth = 633
     TabOrder = 0
-    object AutoRemovePropertiesCheckBox: TCheckBox
+    object AutoRemovePropCheckBox: TCheckBox
       Left = 303
       Height = 21
       Hint = 'If unchecked, there will be interactive dialogs for editing / accepting changes.'
-      Top = 12
+      Top = 40
       Width = 250
       Caption = 'Automatic removal of unknown properties'
       ParentShowHint = False
@@ -53,7 +53,7 @@ object ConvertSettingsForm: TConvertSettingsForm
       Left = 11
       Height = 30
       Hint = 'Unknown types in form file (DFM/LFM)'
-      Top = 52
+      Top = 60
       Width = 272
       Caption = 'Type Replacements'
       OnClick = TypeReplacementsButtonClick
@@ -61,6 +61,30 @@ object ConvertSettingsForm: TConvertSettingsForm
       ShowHint = True
       TabOrder = 2
     end
+    object AutoReplaceUnitsCheckBox: TCheckBox
+      Left = 303
+      Height = 21
+      Hint = 'If unchecked, there will be interactive dialogs for editing / accepting changes.'
+      Top = 12
+      Width = 228
+      Caption = 'Automatic replacement of unit names'
+      ParentShowHint = False
+      ShowHint = True
+      TabOrder = 3
+    end
+    object MethodReplacementsButton: 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
+      ParentShowHint = False
+      ShowHint = True
+      TabOrder = 4
+      Visible = False
+    end
   end
   object SettingsGroupBox: TGroupBox
     Left = 0
@@ -106,7 +130,7 @@ object ConvertSettingsForm: TConvertSettingsForm
       Left = 303
       Height = 21
       Hint = 'Separate form files allow different properties'
-      Top = 86
+      Top = 62
       Width = 285
       BorderSpacing.Left = 13
       BorderSpacing.Around = 7
@@ -163,7 +187,7 @@ object ConvertSettingsForm: TConvertSettingsForm
   object ButtonPanel: TButtonPanel
     Left = 6
     Height = 39
-    Top = 412
+    Top = 398
     Width = 625
     TabOrder = 4
     ShowButtons = [pbOK, pbCancel, pbHelp]

converter/convertsettings.pas

@@ -99,16 +99,19 @@ type
   { TConvertSettingsForm }
 
   TConvertSettingsForm = class(TForm)
+    AutoReplaceUnitsCheckBox: TCheckBox;
     BackupCheckBox: TCheckBox;
     ButtonPanel: TButtonPanel;
     TypeReplacementsButton: TBitBtn;
     SameDFMCheckBox: TCheckBox;
     ProjectPathEdit: TLabeledEdit;
     TargetRadioGroup: TRadioGroup;
+    MethodReplacementsButton: TBitBtn;
     UnitReplacementsButton: TBitBtn;
     SettingsGroupBox: TGroupBox;
     MissingStuffGroupBox: TGroupBox;
-    AutoRemovePropertiesCheckBox: TCheckBox;
+    AutoRemovePropCheckBox: TCheckBox;
+    procedure MethodReplacementsButtonClick(Sender: TObject);
     procedure TypeReplacementsButtonClick(Sender: TObject);
     procedure UnitReplacementsButtonClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
@@ -258,14 +261,14 @@ begin
     BackupCheckBox.Checked               :=fBackupFiles;
     TargetRadioGroup.ItemIndex           :=integer(fTarget);
     SameDFMCheckBox.Checked              :=fSameDFMFile;
-    AutoRemovePropertiesCheckBox.Checked :=fAutoRemoveProperties;
+    AutoRemovePropCheckBox.Checked :=fAutoRemoveProperties;
     Result:=ShowModal;         // Let the user change settings in a form.
     if Result=mrOK then begin
       // UI --> Settings. Will be saved to ConfigSettings later.
       fBackupFiles         :=BackupCheckBox.Checked;
       fTarget              :=TConvertTarget(TargetRadioGroup.ItemIndex);
       fSameDFMFile         :=SameDFMCheckBox.Checked;
-      fAutoRemoveProperties:=AutoRemovePropertiesCheckBox.Checked;
+      fAutoRemoveProperties:=AutoRemovePropCheckBox.Checked;
     end;
   finally
     Free;
@@ -388,13 +391,17 @@ begin
   TargetRadioGroup.Hint:=lisConvertTargetHint;
   SameDFMCheckBox.Caption:=lisConvUseSameDFM;
   SameDFMCheckBox.Hint:=lisConvUseSameDFMHint;
-  MissingStuffGroupBox.Caption:= lisConvUnitsTypesProperties;
-  AutoRemovePropertiesCheckBox.Caption:=lisConvAutoRemoveProperties;
-  AutoRemovePropertiesCheckBox.Hint:=lisConvAutoRemoveHint;
+  MissingStuffGroupBox.Caption:= lisConvUnitsTypesProp;
+  AutoRemovePropCheckBox.Caption:=lisConvAutoRemoveProp;
+  AutoRemovePropCheckBox.Hint:=lisConvAutoRemovePropHint;
+  AutoReplaceUnitsCheckBox.Caption:=lisConvAutoReplaceUnits;
+  AutoReplaceUnitsCheckBox.Hint:=lisConvAutoReplaceUnitHint;
   UnitReplacementsButton.Caption:=lisConvUnitReplacements;
   UnitReplacementsButton.Hint:=lisConvUnitReplHint;
   TypeReplacementsButton.Caption:=lisConvTypeReplacements;
   TypeReplacementsButton.Hint:=lisConvTypeReplHint;
+  MethodReplacementsButton.Caption:=lisConvMethodReplacements;
+  MethodReplacementsButton.Hint:=lisConvMethodReplHint;
   TargetRadioGroupClick(TargetRadioGroup);
 end;
 
@@ -450,6 +457,11 @@ begin
   end;
 end;
 
+procedure TConvertSettingsForm.MethodReplacementsButtonClick(Sender: TObject);
+begin
+
+end;
+
 
 end.
 

ide/lazarusidestrconsts.pas

@@ -466,15 +466,19 @@ resourcestring
   lisConvertTargetHint = 'Converter adds conditional compilation to support different targets';
   lisConvUseSameDFM = 'Lazarus uses the same DFM form file as Delphi';
   lisConvUseSameDFMHint = 'Separate form files allow different properties';
-  lisConvUnitsTypesProperties = 'Units, Types and Properties';
-  lisConvAutoRemoveProperties = 'Automatic removal of unknown properties';
-  lisConvAutoRemoveHint = 'If unchecked, there will be interactive dialogs for editing / accepting changes';
+  lisConvUnitsTypesProp = 'Units, Types and Properties';
+  lisConvAutoRemoveProp = 'Automatic removal of unknown properties';
+  lisConvAutoRemovePropHint = 'If unchecked, there will be interactive dialogs for editing / accepting changes';
+  lisConvAutoReplaceUnits = 'Automatic replacement of unit names';
+  lisConvAutoReplaceUnitHint = 'If unchecked, there will be interactive dialogs for editing / accepting changes.';
   lisConvUnitsToReplace = 'Units to replace';
   lisConvTypesToReplace = 'Types 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';
   lisReplacements = 'Replacements';
   lisProperties = 'Properties (replace or delete)';
   lisTypes = 'Types (not removed if no replacement)';