From 070508db0bbd73a786e6afe84e2f4fe3978356ea Mon Sep 17 00:00:00 2001 From: Arin Alex Date: Fri, 25 Jan 2019 01:10:37 +0300 Subject: [PATCH] PageSize enum's values are accorded with QPrinter::PageSize's values. --- common.pri | 2 +- limereport/lrpageitemdesignintf.h | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/common.pri b/common.pri index 9534741..fb015f5 100644 --- a/common.pri +++ b/common.pri @@ -77,7 +77,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 4 -LIMEREPORT_VERSION_RELEASE = 120 +LIMEREPORT_VERSION_RELEASE = 121 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" diff --git a/limereport/lrpageitemdesignintf.h b/limereport/lrpageitemdesignintf.h index 315ce08..d7fd6b0 100644 --- a/limereport/lrpageitemdesignintf.h +++ b/limereport/lrpageitemdesignintf.h @@ -34,6 +34,7 @@ #include "lritemscontainerdesignitf.h" #include #include +#include namespace LimeReport{ @@ -55,12 +56,19 @@ class PageItemDesignIntf : public LimeReport::ItemsContainerDesignInft Q_PROPERTY(bool resetPageNumber READ resetPageNumber WRITE setResetPageNumber) friend class ReportRender; public: - enum Orientation { Portrait, Landscape }; - enum PageSize {A4, B5, Letter, Legal, Executive, - A0, A1, A2, A3, A5, A6, A7, A8, A9, B0, B1, - B10, B2, B3, B4, B6, B7, B8, B9, C5E, Comm10E, - DLE, Folio, Ledger, Tabloid, Custom, NPageSize = Custom - }; + enum Orientation { Portrait = QPrinter::Portrait, Landscape = QPrinter::Landscape }; + enum PageSize { + A4 = QPrinter::A4, B5 = QPrinter::B5, Letter = QPrinter::Letter, + Legal = QPrinter::Legal, Executive = QPrinter::Executive, + A0 = QPrinter::A0, A1 = QPrinter::A1, A2 = QPrinter::A2, A3 = QPrinter::A3, + A5 = QPrinter::A5, A6 = QPrinter::A6, A7 = QPrinter::A7, A8 = QPrinter::A8, + A9 = QPrinter::A9, B0 = QPrinter::B0, B1 = QPrinter::B1, B10 = QPrinter::B10, + B2 = QPrinter::B2, B3 = QPrinter::B3, B4 = QPrinter::B4, B6 = QPrinter::B6, + B7 = QPrinter::B7, B8 = QPrinter::B8, B9 = QPrinter::B9, C5E = QPrinter::C5E, + Comm10E = QPrinter::Comm10E, DLE = QPrinter::DLE, Folio = QPrinter::Folio, + Ledger = QPrinter::Ledger, Tabloid = QPrinter::Tabloid, Custom = QPrinter::Custom, + NPageSize = Custom + }; typedef QList BandsList; typedef QList::const_iterator BandsIterator; typedef QSharedPointer Ptr;