pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

tvplanit: Fix xml datastore not saving custom recurrence interval.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6509 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2018-06-18 20:35:01 +00:00
parent bab84c3523
commit 9853dac525
4 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/tvplanit/examples/datastores/xml/project1.lpi
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<CONFIG> <CONFIG>
<ProjectOptions> <ProjectOptions>
<Version Value="11"/> <Version Value="10"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<General> <General>
<SessionStorage Value="InProjectDir"/> <SessionStorage Value="InProjectDir"/>
@ -17,10 +17,9 @@
<Version Value="2"/> <Version Value="2"/>
</PublishOptions> </PublishOptions>
<RunParams> <RunParams>
<FormatVersion Value="2"/> <local>
<Modes Count="1"> <FormatVersion Value="1"/>
<Mode0 Name="default"/> </local>
</Modes>
</RunParams> </RunParams>
<RequiredPackages Count="2"> <RequiredPackages Count="2">
<Item1> <Item1>

3
components/tvplanit/examples/datastores/xml/unit1.lfm
View File

@ -7,8 +7,7 @@ object Form1: TForm1
ClientHeight = 686 ClientHeight = 686
ClientWidth = 980 ClientWidth = 980
OnCreate = FormCreate OnCreate = FormCreate
OnDestroy = FormDestroy LCLVersion = '1.8.4.0'
LCLVersion = '1.9.0.0'
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Height = 33 Height = 33

6
components/tvplanit/examples/datastores/xml/unit1.pas
View File

@ -39,7 +39,6 @@ type
procedure BtnNewResClick(Sender: TObject); procedure BtnNewResClick(Sender: TObject);
procedure BtnEditResClick(Sender: TObject); procedure BtnEditResClick(Sender: TObject);
procedure FormCreate(Sender: TObject); procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject);
private private
{ private declarations } { private declarations }
public public
@ -87,10 +86,5 @@ begin
end; end;
end; end;
procedure TForm1.FormDestroy(Sender: TObject);
begin
VpXMLDatastore1.Connected := false;
end;
end. end.

2
components/tvplanit/source/vpxmlds.pas
View File

@ -740,7 +740,6 @@ begin
ev.EndTime := t2; ev.EndTime := t2;
ev.SnoozeTime := GetDateTimeAttrValue(ANode, 'SnoozeTime', FXmlSettings); ev.SnoozeTime := GetDateTimeAttrValue(ANode, 'SnoozeTime', FXmlSettings);
ev.RepeatRangeEnd := GetDateTimeAttrValue(ANode, 'RepeatRangeEng', FXmlSettings); ev.RepeatRangeEnd := GetDateTimeAttrValue(ANode, 'RepeatRangeEng', FXmlSettings);
ev.CustomInterval := GetIntAttrValue(ANode, 'CustomInterval');
s := GetAttrValue(ANode, 'AlarmAdvanceType'); s := GetAttrValue(ANode, 'AlarmAdvanceType');
if s <> '' then begin if s <> '' then begin
@ -759,6 +758,7 @@ begin
else else
XMLError(Format('Incorrect RepeatCode value: "%s"', [s])); XMLError(Format('Incorrect RepeatCode value: "%s"', [s]));
end; end;
ev.CustomInterval := GetIntAttrValue(ANode, 'CustomInterval');
node := ANode.FirstChild; node := ANode.FirstChild;
while node <> nil do begin while node <> nil do begin