From 01ee099a048c54825ddbcd5afeaed3e030b65bf8 Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Wed, 1 Nov 2017 22:09:19 +0300 Subject: [PATCH] setPreviewLayoutDirection() added to RepotEngine --- common.pri | 2 +- include/lrreportengine.h | 2 ++ limereport/lrreportengine.cpp | 23 +++++++++++++++++++++++ limereport/lrreportengine.h | 2 ++ limereport/lrreportengine_p.h | 4 +++- 5 files changed, 31 insertions(+), 2 deletions(-) diff --git a/common.pri b/common.pri index 7d1aadf..91c0016 100644 --- a/common.pri +++ b/common.pri @@ -62,7 +62,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 4 -LIMEREPORT_VERSION_RELEASE = 51 +LIMEREPORT_VERSION_RELEASE = 52 LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" diff --git a/include/lrreportengine.h b/include/lrreportengine.h index 564dabd..746712e 100644 --- a/include/lrreportengine.h +++ b/include/lrreportengine.h @@ -102,6 +102,8 @@ public: bool resultIsEditable(); bool isBusy(); void setPassPharse(QString& passPharse); + Qt::LayoutDirection previewLayoutDirection(); + void setPreviewLayoutDirection(const Qt::LayoutDirection& previewLayoutDirection); signals: void renderStarted(); void renderFinished(); diff --git a/limereport/lrreportengine.cpp b/limereport/lrreportengine.cpp index dd1896c..8a4e46c 100644 --- a/limereport/lrreportengine.cpp +++ b/limereport/lrreportengine.cpp @@ -379,6 +379,7 @@ void ReportEnginePrivate::previewReport(PreviewHints hints) w->setWindowTitle(m_previewWindowTitle); w->setSettings(settings()); w->setPages(pages); + w->setLayoutDirection(m_previewLayoutDirection); if (!dataManager()->errorsList().isEmpty()){ w->setErrorMessages(dataManager()->errorsList()); } @@ -715,6 +716,16 @@ QString ReportEnginePrivate::renderToString() }else return QString(); } +Qt::LayoutDirection ReportEnginePrivate::previewLayoutDirection() +{ + return m_previewLayoutDirection; +} + +void ReportEnginePrivate::setPreviewLayoutDirection(const Qt::LayoutDirection& layoutDirection) +{ + m_previewLayoutDirection = layoutDirection; +} + void ReportEnginePrivate::setPassPhrase(const QString &passPhrase) { m_passPhrase = passPhrase; @@ -921,6 +932,18 @@ void ReportEngine::setPassPharse(QString &passPharse) d->setPassPhrase(passPharse); } +Qt::LayoutDirection ReportEngine::previewLayoutDirection() +{ + Q_D(ReportEngine); + return d->previewLayoutDirection(); +} + +void ReportEngine::setPreviewLayoutDirection(const Qt::LayoutDirection& layoutDirection) +{ + Q_D(ReportEngine); + return d->setPreviewLayoutDirection(layoutDirection); +} + void ReportEngine::setShowProgressDialog(bool value) { Q_D(ReportEngine); diff --git a/limereport/lrreportengine.h b/limereport/lrreportengine.h index 564dabd..746712e 100644 --- a/limereport/lrreportengine.h +++ b/limereport/lrreportengine.h @@ -102,6 +102,8 @@ public: bool resultIsEditable(); bool isBusy(); void setPassPharse(QString& passPharse); + Qt::LayoutDirection previewLayoutDirection(); + void setPreviewLayoutDirection(const Qt::LayoutDirection& previewLayoutDirection); signals: void renderStarted(); void renderFinished(); diff --git a/limereport/lrreportengine_p.h b/limereport/lrreportengine_p.h index 4035f6e..7d47e90 100644 --- a/limereport/lrreportengine_p.h +++ b/limereport/lrreportengine_p.h @@ -130,6 +130,8 @@ public: void setPassPhrase(const QString &passPhrase); void reorderPages(const QList &reorderedPages); void clearSelection(); + Qt::LayoutDirection previewLayoutDirection(); + void setPreviewLayoutDirection(const Qt::LayoutDirection& previewLayoutDirection); signals: void pagesLoadFinished(); void datasourceCollectionLoadFinished(const QString& collectionName); @@ -182,8 +184,8 @@ private: bool m_reportRendering; bool m_resultIsEditable; QString m_passPhrase; - QFileSystemWatcher *m_fileWatcher; + Qt::LayoutDirection m_previewLayoutDirection; }; }