paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-05 15:02:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE, XmlConfig: Added ability to store published object (TPersistent) properties / Adhere to "stored" value of properties

Browse Source 
git-svn-id: trunk@61887 -
This commit is contained in:
martin 2019-09-16 15:15:00 +00:00
parent e35fc25db7
commit 70005fc17a
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
components/lazutils/laz2_xmlcfg.pas
View File

@ -913,6 +913,7 @@ var
StrValue, DefStrValue: String;
//Int64Value, DefInt64Value: Int64;
BoolValue, DefBoolValue: boolean;
obj: TObject;
begin
// do not stream properties without getter and setter
@ -931,7 +932,9 @@ begin
Value := GetOrdProp(Instance, PropInfo);
if (DefInstance <> nil) then
DefValue := GetOrdProp(DefInstance, PropInfo);
if (DefInstance <> nil) and (Value = DefValue) then
if ((DefInstance <> nil) and (Value = DefValue)) or
(not IsStoredProp(Instance, PropInfo))
then
DeleteValue(Path)
else begin
case PropType^.Kind of
@ -968,7 +971,9 @@ begin
FloatValue := GetFloatProp(Instance, PropInfo);
if (DefInstance <> nil) then
DefFloatValue := GetFloatProp(DefInstance, PropInfo);
if (DefInstance <> nil) and (DefFloatValue = FloatValue) then
if ((DefInstance <> nil) and (DefFloatValue = FloatValue)) or
(not IsStoredProp(Instance, PropInfo))
then
DeleteValue(Path)
else
SetValue(Path, FloatToStr(FloatValue));
@ -978,7 +983,9 @@ begin
StrValue := GetStrProp(Instance, PropInfo);
if (DefInstance <> nil) then
DefStrValue := GetStrProp(DefInstance, PropInfo);
if (DefInstance <> nil) and (DefStrValue = StrValue) then
if ((DefInstance <> nil) and (DefStrValue = StrValue)) or
(not IsStoredProp(Instance, PropInfo))
then
DeleteValue(Path)
else
SetValue(Path, StrValue);
@ -988,7 +995,9 @@ begin
WStrValue := GetWideStrProp(Instance, PropInfo);
if (DefInstance <> nil) then
WDefStrValue := GetWideStrProp(DefInstance, PropInfo);
if (DefInstance <> nil) and (WDefStrValue = WStrValue) then
if ((DefInstance <> nil) and (WDefStrValue = WStrValue)) or
(not IsStoredProp(Instance, PropInfo))
then
DeleteValue(Path)
else
SetValue(Path, WStrValue);
@ -998,7 +1007,9 @@ begin
Int64Value := GetInt64Prop(Instance, PropInfo);
if (DefInstance <> nil) then
DefInt64Value := GetInt64Prop(DefInstance, PropInfo)
if (DefInstance <> nil) and (Int64Value = DefInt64Value) then
if ((DefInstance <> nil) and (Int64Value = DefInt64Value)) or
(not IsStoredProp(Instance, PropInfo))
then
DeleteValue(Path, Path)
else
SetValue(StrValue);
@ -1008,11 +1019,21 @@ begin
BoolValue := GetOrdProp(Instance, PropInfo)<>0;
if (DefInstance <> nil) then
DefBoolValue := GetOrdProp(DefInstance, PropInfo)<>0;
if (DefInstance <> nil) and (BoolValue = DefBoolValue) then
if ((DefInstance <> nil) and (BoolValue = DefBoolValue)) or
(not IsStoredProp(Instance, PropInfo))
then
DeleteValue(Path)
else
SetValue(Path, BoolValue);
end;
tkClass:
begin
obj := GetObjectProp(Instance, PropInfo);
if (obj is TPersistent) and IsStoredProp(Instance, PropInfo) then
WriteObject(Path+'/', TPersistent(obj))
else
DeleteValue(Path);
end;
end;
end;
@ -1032,6 +1053,7 @@ var
StrValue, DefStrValue: String;
//Int64Value, DefInt64Value: Int64;
BoolValue, DefBoolValue: boolean;
obj: TObject;
begin
// do not stream properties without getter and setter
@ -1138,6 +1160,12 @@ begin
BoolValue := GetValue(Path, DefBoolValue);
SetOrdProp(Instance, PropInfo, ord(BoolValue));
end;
tkClass:
begin
obj := GetObjectProp(Instance, PropInfo);
if (obj is TPersistent) and HasPath(Path, False) then
ReadObject(Path+'/', TPersistent(obj));
end;
end;
end;