Merge branch '1.4' into 1.4_ChartItem

Browse Source

Conflicts:
	limereport/items/items.qrc

...

This commit is contained in:

Arin Alex

2016-11-07 20:23:47 +03:00

parent 7c02c77aaf 9fe00a0e41

commit 6127db13e6

258 changed files with 137 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

limereport/items/images/DataBand.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 204 B After Width:  |  Height:  |  Size: 342 B

BIN

limereport/items/images/DataBand16.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 158 B After Width:  |  Height:  |  Size: 342 B

BIN

limereport/items/images/GroupFooter16.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 149 B After Width:  |  Height:  |  Size: 338 B

BIN

limereport/items/images/GroupHeader16.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 159 B After Width:  |  Height:  |  Size: 338 B

BIN

limereport/items/images/PageFooter.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 192 B After Width:  |  Height:  |  Size: 337 B

BIN

limereport/items/images/PageFooter16.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 149 B After Width:  |  Height:  |  Size: 338 B

BIN

limereport/items/images/PageHeader.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 184 B After Width:  |  Height:  |  Size: 336 B

BIN

limereport/items/images/PageHeader16.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 158 B After Width:  |  Height:  |  Size: 338 B

BIN

limereport/items/images/ReportFooter.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 193 B After Width:  |  Height:  |  Size: 337 B

BIN

limereport/items/images/ReportFooter16.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 149 B After Width:  |  Height:  |  Size: 338 B

BIN

limereport/items/images/ReportHeader.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 185 B After Width:  |  Height:  |  Size: 336 B

BIN

limereport/items/images/ReportHeader16.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 159 B After Width:  |  Height:  |  Size: 338 B

BIN

limereport/items/images/ReportPage.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 182 B After Width:  |  Height:  |  Size: 331 B

BIN

limereport/items/images/ReportPage16.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 143 B After Width:  |  Height:  |  Size: 308 B

BIN

limereport/items/images/SubDetailBand16.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 158 B After Width:  |  Height:  |  Size: 342 B

BIN

limereport/items/images/SubDetailFooterBand16.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 149 B After Width:  |  Height:  |  Size: 338 B

BIN

limereport/items/images/SubDetailHeaderBand16.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 154 B After Width:  |  Height:  |  Size: 338 B

BIN

limereport/items/images/addBand1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 640 B After Width:  |  Height:  |  Size: 1.0 KiB

BIN

limereport/items/images/barcode2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 229 B After Width:  |  Height:  |  Size: 398 B

BIN

limereport/items/images/barcode3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 368 B

BIN

limereport/items/images/hlayout.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 444 B After Width:  |  Height:  |  Size: 904 B

BIN

limereport/items/images/hlayuot_3_24.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 430 B After Width:  |  Height:  |  Size: 476 B

BIN

limereport/items/images/imageItem.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 26 KiB After Width:  |  Height:  |  Size: 26 KiB

BIN

limereport/items/images/imageItem1.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 25 KiB After Width:  |  Height:  |  Size: 25 KiB

BIN

limereport/items/images/imageItem2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.6 KiB

BIN

limereport/items/images/imageItem3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 379 B

BIN

limereport/items/images/insert-text.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.8 KiB After Width:  |  Height:  |  Size: 2.0 KiB

BIN

limereport/items/images/insert-text_2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.7 KiB

BIN

limereport/items/images/insert-text_3.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 593 B After Width:  |  Height:  |  Size: 927 B

BIN

limereport/items/images/insert-text_5.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 598 B After Width:  |  Height:  |  Size: 1.2 KiB

BIN

limereport/items/images/insert-text_6.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 409 B

BIN

limereport/items/images/settings.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 509 B After Width:  |  Height:  |  Size: 552 B

BIN

limereport/items/images/settings2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 878 B After Width:  |  Height:  |  Size: 1.2 KiB

BIN

limereport/items/images/shape2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 538 B After Width:  |  Height:  |  Size: 640 B

BIN

limereport/items/images/shape4.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 636 B After Width:  |  Height:  |  Size: 716 B

BIN

limereport/items/images/shape5.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 662 B After Width:  |  Height:  |  Size: 824 B

BIN

limereport/items/images/shape6.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 448 B