mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 08:34:38 +03:00
Code

Finish 1.4.52

Browse Source 
# Conflicts:
#	include/lrreportengine.h
#	limereport/lrreportengine.cpp
#	limereport/lrreportengine.h
#	limereport/lrreportengine_p.h
This commit is contained in:
Arin Alexander 2017-11-01 22:17:25 +03:00
commit 27427e90aa
5 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -70,7 +70,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}\\\"

4
include/lrreportengine.h
View File

@ -108,10 +108,10 @@ public:
bool resultIsEditable(); bool resultIsEditable();
bool isBusy(); bool isBusy();
void setPassPharse(QString& passPharse); void setPassPharse(QString& passPharse);
QList<QLocale::Language> aviableLanguages(); QList<QLocale::Language> aviableLanguages();
bool setReportLanguage(QLocale::Language language); bool setReportLanguage(QLocale::Language language);
Qt::LayoutDirection previewLayoutDirection();
void setPreviewLayoutDirection(const Qt::LayoutDirection& previewLayoutDirection);
signals: signals:
void renderStarted(); void renderStarted();
void renderFinished(); void renderFinished();

11
limereport/lrreportengine.cpp
View File

@ -463,6 +463,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());
} }
@ -810,6 +811,16 @@ PageDesignIntf* ReportEnginePrivate::getPageByName(const QString& pageName)
return 0; return 0;
} }
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;

4
limereport/lrreportengine.h
View File

@ -108,10 +108,10 @@ public:
bool resultIsEditable(); bool resultIsEditable();
bool isBusy(); bool isBusy();
void setPassPharse(QString& passPharse); void setPassPharse(QString& passPharse);
QList<QLocale::Language> aviableLanguages(); QList<QLocale::Language> aviableLanguages();
bool setReportLanguage(QLocale::Language language); bool setReportLanguage(QLocale::Language language);
Qt::LayoutDirection previewLayoutDirection();
void setPreviewLayoutDirection(const Qt::LayoutDirection& previewLayoutDirection);
signals: signals:
void renderStarted(); void renderStarted();
void renderFinished(); void renderFinished();

3
limereport/lrreportengine_p.h
View File

@ -140,6 +140,8 @@ public:
ReportTranslation* reportTranslation(QLocale::Language language); ReportTranslation* reportTranslation(QLocale::Language language);
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);
@ -202,6 +204,7 @@ private:
Translations m_translations; Translations m_translations;
QLocale::Language m_reportLanguage; QLocale::Language m_reportLanguage;
void activateLanguage(QLocale::Language language); void activateLanguage(QLocale::Language language);
Qt::LayoutDirection m_previewLayoutDirection;
}; };
} }