Merge branch 'master' into 1.4

This commit is contained in:
Arin Alex 2016-07-08 00:03:19 +03:00
commit 5c6e55728f

View File

@ -1,35 +1,37 @@
<?xml version="1.0" encoding="UTF8"?> <?xml version="1.0" encoding="UTF8"?>
<Report> <Report>
<object Type="Object" ClassName="LimeReport::ReportEnginePrivate"> <object ClassName="LimeReport::ReportEnginePrivate" Type="Object">
<objectName Type="QString"></objectName> <objectName Type="QString"></objectName>
<pages Type="Collection"> <pages Type="Collection">
<item Type="Object" ClassName="LimeReport::PageDesignIntf"> <item ClassName="LimeReport::PageDesignIntf" Type="Object">
<objectName Type="QString">page1</objectName> <objectName Type="QString">page1</objectName>
<sceneRect height="3070" Type="QRect" width="2200" x="-50" y="-50"/> <sceneRect Type="QRect" width="2200" x="-50" y="-50" height="3070"/>
<bspTreeDepth Type="int" Value="5"/> <bspTreeDepth Value="5" Type="int"/>
<font undeline="0" Type="QFont" pointSize="8" bold="0" italic="0" family="MS Shell Dlg 2"/> <font stylename="" Type="QFont" pointSize="8" underline="0" family="MS Shell Dlg 2" weight="50" italic="0"/>
<sortCacheEnabled Type="bool" Value="0"/> <sortCacheEnabled Value="0" Type="bool"/>
<stickyFocus Type="bool" Value="0"/> <stickyFocus Value="0" Type="bool"/>
<minimumRenderSize Type="qreal" Value="0"/> <minimumRenderSize Value="0" Type="qreal"/>
<pageItem Type="Object" ClassName="PageItem"> <pageItem ClassName="PageItem" Type="Object">
<objectName Type="QString">ReportPage1</objectName> <objectName Type="QString">ReportPage1</objectName>
<geometry height="2970" Type="QRect" width="2100" x="0" y="0"/> <geometry Type="QRect" width="2100" x="0" y="0" height="2970"/>
<children Type="Collection"> <children Type="Collection">
<item Type="Object" ClassName="Data"> <item ClassName="Data" Type="Object">
<objectName Type="QString">DataBand1</objectName> <objectName Type="QString">DataBand1</objectName>
<geometry height="110" Type="QRect" width="2000" x="50" y="306"/> <geometry Type="QRect" width="2000" x="50" y="306" height="110"/>
<children Type="Collection"> <children Type="Collection">
<item Type="Object" ClassName="TextItem"> <item ClassName="TextItem" Type="Object">
<objectName Type="QString">TextItem2</objectName> <objectName Type="QString">TextItem2</objectName>
<geometry height="50" Type="QRect" width="814" x="28" y="18"/> <geometry Type="QRect" width="814" x="38" y="32" height="50"/>
<children Type="Collection"/> <children Type="Collection"/>
<zOrder Type="qreal" Value="0"/> <zOrder Value="0" Type="qreal"/>
<borders Type="enumAndFlags" Value="0"/> <borders Value="0" Type="enumAndFlags"/>
<parentName Type="QString">DataBand1</parentName> <parentName Type="QString">DataBand1</parentName>
<borderLineSize Type="int" Value="1"/> <borderLineSize Value="1" Type="int"/>
<itemAlign Type="enumAndFlags" Value="4"/> <isVisible Value="1" Type="bool"/>
<itemLocation Type="enumAndFlags" Value="1"/> <borderColor Value="#000000" Type="QColor"/>
<stretchToMaxHeight Type="bool" Value="0"/> <itemLocation Value="1" Type="enumAndFlags"/>
<stretchToMaxHeight Value="0" Type="bool"/>
<itemAlign Value="4" Type="enumAndFlags"/>
<content Type="QString">$S{ <content Type="QString">$S{
var selectedItemBegin = '&lt;span style="background:black; color:red; font-weight:bold ">'; var selectedItemBegin = '&lt;span style="background:black; color:red; font-weight:bold ">';
@ -45,58 +47,65 @@ if ($D{customers.CustomerID}=="ANTON"){
'&lt;span>Customer: &lt;/span>'+customer; '&lt;span>Customer: &lt;/span>'+customer;
}</content> }</content>
<margin Type="int" Value="4"/> <margin Value="4" Type="int"/>
<alignment Type="enumAndFlags" Value="33"/> <alignment Value="33" Type="enumAndFlags"/>
<autoWidth Type="enumAndFlags" Value="0"/> <autoWidth Value="0" Type="enumAndFlags"/>
<autoHeight Type="bool" Value="0"/> <autoHeight Value="0" Type="bool"/>
<font undeline="0" Type="QFont" pointSize="10" bold="0" italic="0" family="Arial"/> <font stylename="" Type="QFont" pointSize="10" underline="0" family="Arial" weight="50" italic="0"/>
<backgroundOpacity Type="int" Value="100"/> <backgroundOpacity Value="100" Type="int"/>
<backgroundMode Type="enumAndFlags" Value="1"/> <backgroundMode Value="1" Type="enumAndFlags"/>
<backgroundColor Type="QColor" Value="#ffffff"/> <backgroundColor Value="#ffffff" Type="QColor"/>
<fontColor Type="QColor" Value="#000000"/> <fontColor Value="#000000" Type="QColor"/>
<angle Type="enumAndFlags" Value="0"/> <angle Value="0" Type="enumAndFlags"/>
<foregroundOpacity Type="int" Value="100"/> <foregroundOpacity Value="100" Type="int"/>
<underlines Type="bool" Value="0"/> <underlines Value="0" Type="bool"/>
<adaptFontToSize Type="bool" Value="0"/> <adaptFontToSize Value="0" Type="bool"/>
<trimValue Type="bool" Value="1"/> <trimValue Value="1" Type="bool"/>
<lineSpacing Type="int" Value="1"/> <lineSpacing Value="1" Type="int"/>
<underlineLineSize Type="int" Value="1"/> <underlineLineSize Value="1" Type="int"/>
<allowHTML Value="1" Type="bool"/>
<allowHTMLInFields Value="0" Type="bool"/>
</item> </item>
</children> </children>
<zOrder Type="qreal" Value="0"/> <zOrder Value="0" Type="qreal"/>
<borders Type="enumAndFlags" Value="0"/> <borders Value="0" Type="enumAndFlags"/>
<parentName Type="QString">ReportPage1</parentName> <parentName Type="QString">ReportPage1</parentName>
<borderLineSize Type="int" Value="1"/> <borderLineSize Value="1" Type="int"/>
<itemAlign Type="enumAndFlags" Value="4"/> <isVisible Value="1" Type="bool"/>
<autoHeight Type="bool" Value="1"/> <borderColor Value="#000000" Type="QColor"/>
<bandIndex Type="int" Value="4"/> <autoHeight Value="1" Type="bool"/>
<keepBottomSpace Type="bool" Value="0"/> <bandIndex Value="4" Type="int"/>
<keepBottomSpace Value="0" Type="bool"/>
<parentBand Type="QString"></parentBand> <parentBand Type="QString"></parentBand>
<backgroundColor Type="QColor" Value="#ffffff"/> <backgroundColor Value="#ffffff" Type="QColor"/>
<printIfEmpty Type="bool" Value="0"/> <printIfEmpty Value="0" Type="bool"/>
<datasource Type="QString">customers</datasource> <datasource Type="QString">customers</datasource>
<keepSubdetailTogether Type="bool" Value="0"/> <keepSubdetailTogether Value="0" Type="bool"/>
<splittable Type="bool" Value="0"/> <splittable Value="0" Type="bool"/>
<keepFooterTogether Type="bool" Value="0"/> <keepFooterTogether Value="0" Type="bool"/>
<sliceLastRow Type="bool" Value="0"/> <sliceLastRow Value="0" Type="bool"/>
<columnsCount Type="int" Value="1"/> <columnsCount Value="1" Type="int"/>
<columnsFillDirection Type="enumAndFlags" Value="0"/> <columnsFillDirection Value="0" Type="enumAndFlags"/>
<startNewPage Value="0" Type="bool"/>
<startFromNewPage Value="0" Type="bool"/>
</item> </item>
<item Type="Object" ClassName="ReportHeader"> <item ClassName="ReportHeader" Type="Object">
<objectName Type="QString">ReportHeader1</objectName> <objectName Type="QString">ReportHeader1</objectName>
<geometry height="252" Type="QRect" width="2000" x="50" y="50"/> <geometry Type="QRect" width="2000" x="50" y="50" height="252"/>
<children Type="Collection"> <children Type="Collection">
<item Type="Object" ClassName="TextItem"> <item ClassName="TextItem" Type="Object">
<objectName Type="QString">TextItem1</objectName> <objectName Type="QString">TextItem1</objectName>
<geometry height="222" Type="QRect" width="816" x="6" y="12"/> <geometry Type="QRect" width="816" x="6" y="12" height="222"/>
<children Type="Collection"/> <children Type="Collection"/>
<zOrder Type="qreal" Value="0"/> <zOrder Value="0" Type="qreal"/>
<borders Type="enumAndFlags" Value="0"/> <borders Value="0" Type="enumAndFlags"/>
<parentName Type="QString">ReportHeader1</parentName> <parentName Type="QString">ReportHeader1</parentName>
<borderLineSize Type="int" Value="1"/> <borderLineSize Value="1" Type="int"/>
<itemAlign Type="enumAndFlags" Value="4"/> <isVisible Value="1" Type="bool"/>
<itemLocation Type="enumAndFlags" Value="1"/> <borderColor Value="#000000" Type="QColor"/>
<stretchToMaxHeight Type="bool" Value="0"/> <itemLocation Value="1" Type="enumAndFlags"/>
<stretchToMaxHeight Value="0" Type="bool"/>
<itemAlign Value="4" Type="enumAndFlags"/>
<content Type="QString">$S{ <content Type="QString">$S{
var color = new QColor('#DEB887'); var color = new QColor('#DEB887');
var font = new QFont('Times New Roman',26,false,true); var font = new QFont('Times New Roman',26,false,true);
@ -105,97 +114,108 @@ THIS.fontColor = QColor('red');
THIS.font = font; THIS.font = font;
'Test'}</content> 'Test'}</content>
<margin Type="int" Value="4"/> <margin Value="4" Type="int"/>
<alignment Type="enumAndFlags" Value="33"/> <alignment Value="33" Type="enumAndFlags"/>
<autoWidth Type="enumAndFlags" Value="0"/> <autoWidth Value="0" Type="enumAndFlags"/>
<autoHeight Type="bool" Value="0"/> <autoHeight Value="0" Type="bool"/>
<font undeline="0" Type="QFont" pointSize="10" bold="0" italic="0" family="Times New Roman"/> <font stylename="" Type="QFont" pointSize="10" underline="0" family="Times New Roman" weight="50" italic="0"/>
<backgroundOpacity Type="int" Value="100"/> <backgroundOpacity Value="100" Type="int"/>
<backgroundMode Type="enumAndFlags" Value="1"/> <backgroundMode Value="1" Type="enumAndFlags"/>
<backgroundColor Type="QColor" Value="#ffffff"/> <backgroundColor Value="#ffffff" Type="QColor"/>
<fontColor Type="QColor" Value="#000000"/> <fontColor Value="#000000" Type="QColor"/>
<angle Type="enumAndFlags" Value="0"/> <angle Value="0" Type="enumAndFlags"/>
<foregroundOpacity Type="int" Value="100"/> <foregroundOpacity Value="100" Type="int"/>
<underlines Type="bool" Value="0"/> <underlines Value="0" Type="bool"/>
<adaptFontToSize Type="bool" Value="0"/> <adaptFontToSize Value="0" Type="bool"/>
<trimValue Type="bool" Value="1"/> <trimValue Value="1" Type="bool"/>
<lineSpacing Type="int" Value="1"/> <lineSpacing Value="1" Type="int"/>
<underlineLineSize Type="int" Value="1"/> <underlineLineSize Value="1" Type="int"/>
<allowHTML Value="0" Type="bool"/>
<allowHTMLInFields Value="0" Type="bool"/>
</item> </item>
<item Type="Object" ClassName="TextItem"> <item ClassName="TextItem" Type="Object">
<objectName Type="QString">TextItem3</objectName> <objectName Type="QString">TextItem3</objectName>
<geometry height="86" Type="QRect" width="408" x="878" y="44"/> <geometry Type="QRect" width="408" x="878" y="44" height="86"/>
<children Type="Collection"/> <children Type="Collection"/>
<zOrder Type="qreal" Value="0"/> <zOrder Value="0" Type="qreal"/>
<borders Type="enumAndFlags" Value="0"/> <borders Value="0" Type="enumAndFlags"/>
<parentName Type="QString">ReportHeader1</parentName> <parentName Type="QString">ReportHeader1</parentName>
<borderLineSize Type="int" Value="1"/> <borderLineSize Value="1" Type="int"/>
<itemAlign Type="enumAndFlags" Value="4"/> <isVisible Value="1" Type="bool"/>
<itemLocation Type="enumAndFlags" Value="0"/> <borderColor Value="#000000" Type="QColor"/>
<stretchToMaxHeight Type="bool" Value="0"/> <itemLocation Value="0" Type="enumAndFlags"/>
<stretchToMaxHeight Value="0" Type="bool"/>
<itemAlign Value="4" Type="enumAndFlags"/>
<content Type="QString">&lt;p> &lt;span>test1&lt;/span> &lt;span style="background:red">test&lt;/span> &lt;/p></content> <content Type="QString">&lt;p> &lt;span>test1&lt;/span> &lt;span style="background:red">test&lt;/span> &lt;/p></content>
<margin Type="int" Value="4"/> <margin Value="4" Type="int"/>
<alignment Type="enumAndFlags" Value="33"/> <alignment Value="33" Type="enumAndFlags"/>
<autoWidth Type="enumAndFlags" Value="0"/> <autoWidth Value="0" Type="enumAndFlags"/>
<autoHeight Type="bool" Value="0"/> <autoHeight Value="0" Type="bool"/>
<font undeline="0" Type="QFont" pointSize="10" bold="0" italic="0" family="Arial"/> <font stylename="" Type="QFont" pointSize="10" underline="0" family="Arial" weight="50" italic="0"/>
<backgroundOpacity Type="int" Value="100"/> <backgroundOpacity Value="100" Type="int"/>
<backgroundMode Type="enumAndFlags" Value="1"/> <backgroundMode Value="1" Type="enumAndFlags"/>
<backgroundColor Type="QColor" Value="#ffffff"/> <backgroundColor Value="#ffffff" Type="QColor"/>
<fontColor Type="QColor" Value="#000000"/> <fontColor Value="#000000" Type="QColor"/>
<angle Type="enumAndFlags" Value="0"/> <angle Value="0" Type="enumAndFlags"/>
<foregroundOpacity Type="int" Value="100"/> <foregroundOpacity Value="100" Type="int"/>
<underlines Type="bool" Value="0"/> <underlines Value="0" Type="bool"/>
<adaptFontToSize Type="bool" Value="0"/> <adaptFontToSize Value="0" Type="bool"/>
<trimValue Type="bool" Value="1"/> <trimValue Value="1" Type="bool"/>
<lineSpacing Type="int" Value="1"/> <lineSpacing Value="1" Type="int"/>
<underlineLineSize Type="int" Value="1"/> <underlineLineSize Value="1" Type="int"/>
<allowHTML Value="1" Type="bool"/>
<allowHTMLInFields Value="0" Type="bool"/>
</item> </item>
</children> </children>
<zOrder Type="qreal" Value="0"/> <zOrder Value="0" Type="qreal"/>
<borders Type="enumAndFlags" Value="0"/> <borders Value="0" Type="enumAndFlags"/>
<parentName Type="QString">ReportPage1</parentName> <parentName Type="QString">ReportPage1</parentName>
<borderLineSize Type="int" Value="1"/> <borderLineSize Value="1" Type="int"/>
<itemAlign Type="enumAndFlags" Value="4"/> <isVisible Value="1" Type="bool"/>
<autoHeight Type="bool" Value="1"/> <borderColor Value="#000000" Type="QColor"/>
<bandIndex Type="int" Value="1"/> <autoHeight Value="1" Type="bool"/>
<keepBottomSpace Type="bool" Value="0"/> <bandIndex Value="1" Type="int"/>
<keepBottomSpace Value="0" Type="bool"/>
<parentBand Type="QString"></parentBand> <parentBand Type="QString"></parentBand>
<backgroundColor Type="QColor" Value="#ffffff"/> <backgroundColor Value="#ffffff" Type="QColor"/>
<printIfEmpty Type="bool" Value="0"/> <printIfEmpty Value="0" Type="bool"/>
<splittable Type="bool" Value="0"/> <splittable Value="0" Type="bool"/>
</item> </item>
</children> </children>
<zOrder Type="qreal" Value="0"/> <zOrder Value="0" Type="qreal"/>
<borders Type="enumAndFlags" Value="0"/> <borders Value="0" Type="enumAndFlags"/>
<parentName Type="QString"></parentName> <parentName Type="QString"></parentName>
<borderLineSize Type="int" Value="1"/> <borderLineSize Value="1" Type="int"/>
<itemAlign Type="enumAndFlags" Value="4"/> <isVisible Value="1" Type="bool"/>
<topMargin Type="int" Value="5"/> <borderColor Value="#000000" Type="QColor"/>
<bottomMargin Type="int" Value="5"/> <topMargin Value="5" Type="int"/>
<rightMargin Type="int" Value="5"/> <bottomMargin Value="5" Type="int"/>
<leftMargin Type="int" Value="5"/> <rightMargin Value="5" Type="int"/>
<pageOrientation Type="enumAndFlags" Value="0"/> <leftMargin Value="5" Type="int"/>
<pageSize Type="enumAndFlags" Value="0"/> <pageOrientation Value="0" Type="enumAndFlags"/>
<pageSize Value="0" Type="enumAndFlags"/>
<gridStep Value="2" Type="int"/>
<fullPage Value="0" Type="bool"/>
<oldPrintMode Value="0" Type="bool"/>
</pageItem> </pageItem>
</item> </item>
</pages> </pages>
<datasourcesManager Type="Object" ClassName="LimeReport::DataSourceManager"> <datasourcesManager ClassName="LimeReport::DataSourceManager" Type="Object">
<objectName Type="QString">datasources</objectName> <objectName Type="QString">datasources</objectName>
<connections Type="Collection"> <connections Type="Collection">
<item Type="Object" ClassName="LimeReport::ConnectionDesc"> <item ClassName="LimeReport::ConnectionDesc" Type="Object">
<objectName Type="QString"></objectName> <objectName Type="QString"></objectName>
<name Type="QString">test</name> <name Type="QString">test</name>
<driver Type="QString">QSQLITE</driver> <driver Type="QString">QSQLITE</driver>
<databaseName Type="QString">E:/LimeReportGit/lib/report/demo/r1/demo_reports/northwind.db</databaseName> <databaseName Type="QString">./demo_reports/northwind.db</databaseName>
<userName Type="QString"></userName> <userName Type="QString"></userName>
<password Type="QString" Value=""/> <password Value="" Type="QString"/>
<host Type="QString"></host> <host Type="QString"></host>
<autoconnect Type="bool" Value="0"/> <autoconnect Value="0" Type="bool"/>
</item> </item>
</connections> </connections>
<queries Type="Collection"> <queries Type="Collection">
<item Type="Object" ClassName="LimeReport::QueryDesc"> <item ClassName="LimeReport::QueryDesc" Type="Object">
<objectName Type="QString"></objectName> <objectName Type="QString"></objectName>
<queryName Type="QString">customers</queryName> <queryName Type="QString">customers</queryName>
<queryText Type="QString">Select * from customers limit 5</queryText> <queryText Type="QString">Select * from customers limit 5</queryText>
@ -205,17 +225,18 @@ THIS.font = font;
<subqueries Type="Collection"/> <subqueries Type="Collection"/>
<subproxies Type="Collection"/> <subproxies Type="Collection"/>
<variables Type="Collection"> <variables Type="Collection">
<item Type="Object" ClassName="LimeReport::VarDesc"> <item ClassName="LimeReport::VarDesc" Type="Object">
<objectName Type="QString"></objectName> <objectName Type="QString"></objectName>
<name Type="QString">TestName</name> <name Type="QString">TestName</name>
<value Type="QString">TestValue</value> <value Type="QString">TestValue</value>
</item> </item>
</variables> </variables>
</datasourcesManager> </datasourcesManager>
<scriptContext Type="Object" ClassName="LimeReport::ScriptEngineContext"> <scriptContext ClassName="LimeReport::ScriptEngineContext" Type="Object">
<objectName Type="QString"></objectName> <objectName Type="QString"></objectName>
<dialogs Type="Collection"/> <dialogs Type="Collection"/>
<initScript Type="QString"></initScript> <initScript Type="QString"></initScript>
</scriptContext> </scriptContext>
<suppressFieldAndVarError Value="0" Type="bool"/>
</object> </object>
</Report> </Report>