paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-21 22:39:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Save settings to ConfigStorage. Improved FixMainClassAncestor.

Browse Source 
git-svn-id: trunk@25864 -
This commit is contained in:
juha 2010-06-03 12:59:50 +00:00
parent 4aac61a8ab
commit 991452e4a2
4 changed files with 113 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
converter/convcodetool.pas
View File

@ -54,7 +54,8 @@ type
function RemoveUnits: boolean;
function RenameUnits: boolean;
function UsesSectionsToUnitnames: TStringList;
function FixMainClassAncestor(AReplaceTypes: TStringToStringTree): boolean;
function FixMainClassAncestor(const AClassName: string;
AReplaceTypes: TStringToStringTree): boolean;
public
property Ask: Boolean read fAsk write fAsk;
property UseBothDfmAndLfm: boolean read fUseBothDfmAndLfm write fUseBothDfmAndLfm;
@ -66,24 +67,9 @@ type
property UnitsToComment: TStringList read fUnitsToComment write fUnitsToComment;
end;
// Global function
function FixMainClassAncestor(Code: TCodeBuffer; AReplaceTypes: TStringToStringTree): boolean;
implementation
function FixMainClassAncestor(Code: TCodeBuffer;
AReplaceTypes: TStringToStringTree): boolean;
var
ConvTool: TConvDelphiCodeTool;
begin
ConvTool:=TConvDelphiCodeTool.Create(Code);
try Result:=ConvTool.FixMainClassAncestor(AReplaceTypes);
finally ConvTool.Free;
end;
end;
{ TConvDelphiCodeTool }
constructor TConvDelphiCodeTool.Create(Code: TCodeBuffer);
@ -406,33 +392,9 @@ begin
end;
function TConvDelphiCodeTool.FixMainClassAncestor(AReplaceTypes: TStringToStringTree): boolean;
// Change a type that main form inherits from to a fall-back type,
// if defined in AReplaceTypes.
function FindFirstClassNode: TCodeTreeNode;
// Search for the first class definition which is the only one for form files.
var
ANode, ClassNode: TCodeTreeNode;
begin
ANode:=fCodeTool.FindMainUsesSection; // or fCodeTool.FindInterfaceNode;
if ANode<>nil then
ANode:=ANode.NextBrother;
Result:=nil;
while ANode<>nil do begin
if ANode.Desc in [ctnTypeDefinition,ctnGenericType] then begin
ClassNode:=fCodeTool.FindTypeNodeOfDefinition(ANode);
if (ClassNode<>nil) and (ClassNode.Desc in AllClassObjects) then begin
if (not ((ClassNode.SubDesc and ctnsForwardDeclaration)>0)) then begin
Result:=ClassNode;
exit;
end;
end;
end;
ANode:=ANode.Next;
end;
end;
function TConvDelphiCodeTool.FixMainClassAncestor(const AClassName: string;
AReplaceTypes: TStringToStringTree): boolean;
// Replace the ancestor type of main form with a fall-back type if needed.
var
ANode, InheritanceNode: TCodeTreeNode;
TypeUpdater: TStringMapUpdater;
@ -441,10 +403,8 @@ begin
Result:=false; // fCodeTool.FindInheritanceNode
with fCodeTool do begin
BuildTree(true);
if (AReplaceTypes=nil) or (AReplaceTypes.Tree.Count=0) then exit(true);
// Find the class name that the main class inherits from.
ANode:=FindFirstClassNode;
ANode:=FindClassNodeInInterface(AClassName,true,false,false); // FindFirstClassNode;
if ANode=nil then exit;
BuildSubTreeForClass(ANode);
InheritanceNode:=FindInheritanceNode(ANode);
@ -456,7 +416,6 @@ begin
ReadNextAtom;
OldType:=GetAtom;
end;
// Change the inheritance type to a fall-back type if needed.
TypeUpdater:=TStringMapUpdater.Create(AReplaceTypes);
try

181
converter/convertsettings.pas
View File

@ -32,7 +32,8 @@ interface
uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, IDEProcs,
StdCtrls, EditBtn, Buttons, ExtCtrls, DialogProcs, LazarusIDEStrConsts,
CodeToolsStructs, BaseIDEIntf, LazConfigStorage, ButtonPanel, ReplaceNamesUnit;
CodeToolsStructs, AVL_Tree, BaseIDEIntf, LazConfigStorage,
ButtonPanel, ReplaceNamesUnit;
type
@ -46,6 +47,8 @@ type
// Unit, Project or Package top file and path.
fMainFilename: String;
fMainPath: String;
// Persistent storage in XML or some other format.
fConfigStorage: TConfigStorage;
// Actual user settings.
fBackupFiles: boolean;
fTarget: TConvertTarget;
@ -56,11 +59,6 @@ type
fReplaceUnits: TStringToStringTree;
// Delphi types mapped to Lazarus types, will be replaced.
fReplaceTypes: TStringToStringTree;
{ function ReadConfigMap(ABaseName: string; AConfig: TConfigStorage;
AMap: TStringToStringTree): boolean;
function WriteConfigMap(ABaseName: string; AConfig: TConfigStorage;
AMap: TStringToStringTree): boolean; }
// Getter / setter:
function GetBackupPath: String;
procedure SetMainFilename(const AValue: String);
@ -137,91 +135,108 @@ implementation
{ TConvertSettings }
procedure LoadStringToStringTree(Config: TConfigStorage; const Path: string;
Tree: TStringToStringTree);
var
Cnt: LongInt;
SubPath: String;
CurName: String;
CurValue: String;
i: Integer;
begin
Tree.Clear;
Cnt:=Config.GetValue(Path+'Count',0);
for i:=0 to Cnt-1 do begin
SubPath:=Path+'Item'+IntToStr(i)+'/';
CurName:=Config.GetValue(SubPath+'Name','');
CurValue:=Config.GetValue(SubPath+'Value','');
Tree[CurName]:=CurValue;
end;
end;
procedure SaveStringToStringTree(Config: TConfigStorage; const Path: string;
Tree: TStringToStringTree);
var
Node: TAVLTreeNode;
Item: PStringToStringTreeItem;
i: Integer;
SubPath: String;
begin
Config.SetDeleteValue(Path+'Count',Tree.Tree.Count,0);
Node:=Tree.Tree.FindLowest;
i:=0;
while Node<>nil do begin
Item:=PStringToStringTreeItem(Node.Data);
SubPath:=Path+'Item'+IntToStr(i)+'/';
Config.SetDeleteValue(SubPath+'Name',Item^.Name,'');
Config.SetDeleteValue(SubPath+'Value',Item^.Value,'');
Node:=Tree.Tree.FindSuccessor(Node);
inc(i);
end;
end;
constructor TConvertSettings.Create(const ATitle: string);
// var Config: TConfigStorage; AString: string;
begin
fTitle:=ATitle;
fMainFilename:='';
fMainPath:='';
{ ToDo: Read Config file
LoadStringToStringTree();
Config:=GetIDEConfigStorage('delphiconverter.xml',true);
try
AString:=Config.GetValue('Name1','');
ABool:=Config.GetValue('Name2',true);
...
finally
Config.Free;
end;
}
// Now hard-code some values. Later move them to a config file.
// Map Delphi units to Lazarus units.
fReplaceUnits:=TStringToStringTree.Create(false);
fReplaceUnits['Windows']:='LCLIntf, LCLType, LMessages';
fReplaceUnits['Variants']:='';
fReplaceUnits['ShellApi']:='';
fReplaceUnits['pngImage']:='';
fReplaceUnits['Jpeg']:='';
fReplaceUnits['gifimage']:='';
fReplaceUnits['^Q(.+)']:='$1'; // Kylix unit names.
fReplaceUnits['^Tnt(.+)']:='$1'; // Tnt* third party components.
// Map Delphi types to LCL types.
fReplaceTypes:=TStringToStringTree.Create(false);
fReplaceTypes['TFlowPanel']:='TPanel';
fReplaceTypes['TGridPanel']:='TPanel';
fReplaceTypes['TControlBar']:='TToolBar';
fReplaceTypes['TCoolBar']:='TToolBar';
fReplaceTypes['TComboBoxEx']:='TComboBox';
fReplaceTypes['TValueListEditor']:='TStringGrid';
fReplaceTypes['TRichEdit']:='TMemo';
fReplaceTypes['TDBRichEdit']:='TDBMemo';
fReplaceTypes['TApplicationEvents']:='TApplicationProperties';
fReplaceTypes['TPNGObject']:='TPortableNetworkGraphic';
fReplaceTypes['^TTnt(.+)']:='T$1';
// Load settings from ConfigStorage.
fConfigStorage:=GetIDEConfigStorage('delphiconverter.xml', true);
fBackupFiles :=fConfigStorage.GetValue('BackupFiles', true);
fTarget:=TConvertTarget(fConfigStorage.GetValue('ConvertTarget', 0));
fSameDFMFile :=fConfigStorage.GetValue('SameDFMFile', false);
fAutoRemoveProperties :=fConfigStorage.GetValue('AutoRemoveProperties', false);
fAutoConvertTypes :=fConfigStorage.GetValue('AutoConvertTypes', false);
LoadStringToStringTree(fConfigStorage, 'ReplaceUnits', fReplaceUnits);
LoadStringToStringTree(fConfigStorage, 'ReplaceTypes', fReplaceTypes);
// Add default values if ConfigStorage doesn't have any.
if fReplaceUnits.Tree.Count=0 then begin
// Map Delphi units to Lazarus units.
fReplaceUnits['Windows']:='LCLIntf, LCLType, LMessages';
fReplaceUnits['Variants']:='';
fReplaceUnits['ShellApi']:='';
fReplaceUnits['pngImage']:='';
fReplaceUnits['Jpeg']:=''; //maskedit
fReplaceUnits['gifimage']:='';
fReplaceUnits['^Q(.+)']:='$1'; // Kylix unit names.
fReplaceUnits['^Tnt(.+)']:='$1'; // Tnt* third party components.
end;
if fReplaceTypes.Tree.Count=0 then begin
// Map Delphi types to LCL types.
fReplaceTypes['TFlowPanel']:='TPanel';
fReplaceTypes['TGridPanel']:='TPanel';
fReplaceTypes['TControlBar']:='TToolBar';
fReplaceTypes['TCoolBar']:='TToolBar';
fReplaceTypes['TComboBoxEx']:='TComboBox';
fReplaceTypes['TValueListEditor']:='TStringGrid';
fReplaceTypes['TRichEdit']:='TMemo';
fReplaceTypes['TDBRichEdit']:='TDBMemo';
fReplaceTypes['TApplicationEvents']:='TApplicationProperties';
fReplaceTypes['TPNGObject']:='TPortableNetworkGraphic';
fReplaceTypes['^TTnt(.+)']:='T$1';
end;
end;
destructor TConvertSettings.Destroy;
begin
// Save possibly modified settings to ConfigStorage.
fConfigStorage.SetDeleteValue('BackupFiles', fBackupFiles, true);
fConfigStorage.SetDeleteValue('ConvertTarget', integer(fTarget), 0);
fConfigStorage.SetDeleteValue('SameDFMFile', fSameDFMFile, false);
fConfigStorage.SetDeleteValue('AutoRemoveProperties', fAutoRemoveProperties, false);
fConfigStorage.SetDeleteValue('AutoConvertTypes', fAutoConvertTypes, false);
SaveStringToStringTree(fConfigStorage, 'ReplaceUnits', fReplaceUnits);
SaveStringToStringTree(fConfigStorage, 'ReplaceTypes', fReplaceTypes);
// Free stuff
fConfigStorage.Free;
fReplaceTypes.Free;
fReplaceUnits.Free;
inherited Destroy;
end;
{
function GetLazIDEConfigStorage(const Filename: string; LoadFromDisk: Boolean
): TConfigStorage;
var
ConfigFilename: String;
begin
if LoadFromDisk then begin
// copy template config file to users config directory
CopySecondaryConfigFile(Filename);
end;
// create storage
ConfigFilename:=AppendPathDelim(GetPrimaryConfigPath)+Filename;
Result:=TXMLOptionsStorage.Create(ConfigFilename,LoadFromDisk);
end;
function TConvertSettings.ReadConfigMap(ABaseName: string; AConfig: TConfigStorage;
AMap: TStringToStringTree): boolean;
var
Cnt, i: integer;
begin
AMap.Clear;
i:=AConfig.GetValue(ABaseName+'Count',-1);
for i := 0 to Cnt do begin
end;
end;
function TConvertSettings.WriteConfigMap(ABaseName: string; AConfig: TConfigStorage;
AMap: TStringToStringTree): boolean;
begin
end;
}
function TConvertSettings.RunForm: TModalResult;
var
SettingsForm: TConvertSettingsForm;
@ -231,24 +246,20 @@ begin
try
Caption:=fTitle;
ProjectPathEdit.Text:=fMainPath;
{
// ToDo: Load from XML.
// Settings --> UI.
BackupCheckBox.Checked :=fBackupFiles;
TargetRadioGroup.ItemIndex :=integer(fTarget);
SameDFMCheckBox.Checked :=fSameDFMFile;
// Settings --> UI. Loaded from ConfigSettings earlier.
BackupCheckBox.Checked :=fBackupFiles;
TargetRadioGroup.ItemIndex :=integer(fTarget);
SameDFMCheckBox.Checked :=fSameDFMFile;
AutoRemovePropertiesCheckBox.Checked :=fAutoRemoveProperties;
AutoConvertTypesCheckBox.Checked:=fAutoConvertTypes;
}
Result:=ShowModal;
AutoConvertTypesCheckBox.Checked :=fAutoConvertTypes;
Result:=ShowModal; // Let the user change settings in a form.
if Result=mrOK then begin
// UI --> Settings.
// UI --> Settings. Will be saved to ConfigSettings later.
fBackupFiles :=BackupCheckBox.Checked;
fTarget :=TConvertTarget(TargetRadioGroup.ItemIndex);
fSameDFMFile :=SameDFMCheckBox.Checked;
fAutoRemoveProperties:=AutoRemovePropertiesCheckBox.Checked;
fAutoConvertTypes :=AutoConvertTypesCheckBox.Checked;
// ToDo: Save to XML.
end;
finally
Free;

13
converter/missingpropertiesdlg.pas
View File

@ -366,6 +366,7 @@ function TLFMFixer.Repair: TModalResult;
var
CurError: TLFMError;
MissingObjectTypes: TStringList;
ConvTool: TConvDelphiCodeTool;
RegComp: TRegisteredComponent;
TypeName: String;
i, LoopCount: integer;
@ -373,8 +374,16 @@ begin
Result:=mrCancel;
MissingObjectTypes:=TStringList.Create;
try
fLFMTree:=DefaultLFMTrees.GetLFMTree(fLFMBuffer, true);
if not fLFMTree.ParseIfNeeded then exit;
// Change a type that main form inherits from to a fall-back type if needed.
if not FixMainClassAncestor(fPascalBuffer, fSettings.ReplaceTypes) then exit;
ConvTool:=TConvDelphiCodeTool.Create(fPascalBuffer);
try
if not ConvTool.FixMainClassAncestor(TLFMObjectNode(fLFMTree.Root).TypeName,
fSettings.ReplaceTypes) then exit;
finally
ConvTool.Free;
end;
LoopCount:=0;
repeat
if CodeToolBoss.CheckLFM(fPascalBuffer,fLFMBuffer,fLFMTree,
@ -405,7 +414,7 @@ begin
if MissingObjectTypes.Count>0 then begin
// Missing object types, but luckily found in IDE registered component classes.
Result:=PackageEditingInterface.AddUnitDependenciesForComponentClasses(
fPascalBuffer.Filename,MissingObjectTypes);
fPascalBuffer.Filename, MissingObjectTypes);
if Result<>mrOk then exit;
// check LFM again
if not CodeToolBoss.CheckLFM(fPascalBuffer,fLFMBuffer,fLFMTree,

2
converter/replacenamesunit.pas
View File

@ -121,12 +121,10 @@ begin
inherited Create(AStringMap);
fGrid:=AGrid;
GridEndInd:=1;
fGrid.BeginUpdate;
end;
destructor TGridUpdater.Destroy;
begin
fGrid.EndUpdate;
inherited Destroy;
end;