mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 00:54:39 +03:00
Code

Finish 1.4.52

Browse Source
This commit is contained in:
Arin Alexander 2017-11-01 22:09:33 +03:00
commit 0ecb64f304
5 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -62,7 +62,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 4 LIMEREPORT_VERSION_MINOR = 4
LIMEREPORT_VERSION_RELEASE = 51 LIMEREPORT_VERSION_RELEASE = 52
LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"

2
include/lrreportengine.h
View File

@ -102,6 +102,8 @@ public:
bool resultIsEditable(); bool resultIsEditable();
bool isBusy(); bool isBusy();
void setPassPharse(QString& passPharse); void setPassPharse(QString& passPharse);
Qt::LayoutDirection previewLayoutDirection();
void setPreviewLayoutDirection(const Qt::LayoutDirection& previewLayoutDirection);
signals: signals:
void renderStarted(); void renderStarted();
void renderFinished(); void renderFinished();

23
limereport/lrreportengine.cpp
View File

@ -379,6 +379,7 @@ void ReportEnginePrivate::previewReport(PreviewHints hints)
w->setWindowTitle(m_previewWindowTitle); w->setWindowTitle(m_previewWindowTitle);
w->setSettings(settings()); w->setSettings(settings());
w->setPages(pages); w->setPages(pages);
w->setLayoutDirection(m_previewLayoutDirection);
if (!dataManager()->errorsList().isEmpty()){ if (!dataManager()->errorsList().isEmpty()){
w->setErrorMessages(dataManager()->errorsList()); w->setErrorMessages(dataManager()->errorsList());
} }
@ -715,6 +716,16 @@ QString ReportEnginePrivate::renderToString()
}else return QString(); }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) void ReportEnginePrivate::setPassPhrase(const QString &passPhrase)
{ {
m_passPhrase = passPhrase; m_passPhrase = passPhrase;
@ -921,6 +932,18 @@ void ReportEngine::setPassPharse(QString &passPharse)
d->setPassPhrase(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) void ReportEngine::setShowProgressDialog(bool value)
{ {
Q_D(ReportEngine); Q_D(ReportEngine);

2
limereport/lrreportengine.h
View File

@ -102,6 +102,8 @@ public:
bool resultIsEditable(); bool resultIsEditable();
bool isBusy(); bool isBusy();
void setPassPharse(QString& passPharse); void setPassPharse(QString& passPharse);
Qt::LayoutDirection previewLayoutDirection();
void setPreviewLayoutDirection(const Qt::LayoutDirection& previewLayoutDirection);
signals: signals:
void renderStarted(); void renderStarted();
void renderFinished(); void renderFinished();

4
limereport/lrreportengine_p.h
View File

@ -130,6 +130,8 @@ public:
void setPassPhrase(const QString &passPhrase); void setPassPhrase(const QString &passPhrase);
void reorderPages(const QList<PageDesignIntf *> &reorderedPages); void reorderPages(const QList<PageDesignIntf *> &reorderedPages);
void clearSelection(); void clearSelection();
Qt::LayoutDirection previewLayoutDirection();
void setPreviewLayoutDirection(const Qt::LayoutDirection& previewLayoutDirection);
signals: signals:
void pagesLoadFinished(); void pagesLoadFinished();
void datasourceCollectionLoadFinished(const QString& collectionName); void datasourceCollectionLoadFinished(const QString& collectionName);
@ -182,8 +184,8 @@ private:
bool m_reportRendering; bool m_reportRendering;
bool m_resultIsEditable; bool m_resultIsEditable;
QString m_passPhrase; QString m_passPhrase;
QFileSystemWatcher *m_fileWatcher; QFileSystemWatcher *m_fileWatcher;
Qt::LayoutDirection m_previewLayoutDirection;
}; };
} }