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

Merge branch 'master' into 1.4

Browse Source
This commit is contained in:
Arin Alex 2016-08-02 22:33:43 +03:00
commit 7a1a3ac34a
8 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/lrglobal.h
View File

@ -80,6 +80,13 @@ namespace Const{
QString extractClassName(QString className);
enum RenderPass {FirstPass, SecondPass};
enum ArrangeType {AsNeeded, Force};
enum PreviewHint{ShowAllPreviewBars=0,
HidePreviewToolBar=1,
HidePreviewMenuBar=2,
HidePreviewStatusBar=4,
HideAllPreviewBar=7};
Q_DECLARE_FLAGS(PreviewHints, PreviewHint)
class ReportError : public std::runtime_error{
public:
ReportError(const QString& message):std::runtime_error(message.toStdString()){}
@ -104,6 +111,6 @@ namespace Const{
} // namespace LimeReport
Q_DECLARE_OPERATORS_FOR_FLAGS(LimeReport::PreviewHints)
#endif // GLOBAL_H

2
include/lrreportengine.h
View File

@ -77,7 +77,7 @@ public:
void printToFile(const QString& fileName);
PageDesignIntf *createPreviewScene(QObject *parent = 0);
bool printToPDF(const QString& fileName);
void previewReport();
void previewReport(PreviewHints hints = ShowAllPreviewBars);
void designReport();
void setShowProgressDialog(bool value);
IDataSourceManager* dataManager();

9
limereport/lrglobal.h
View File

@ -80,6 +80,13 @@ namespace Const{
QString extractClassName(QString className);
enum RenderPass {FirstPass, SecondPass};
enum ArrangeType {AsNeeded, Force};
enum PreviewHint{ShowAllPreviewBars=0,
HidePreviewToolBar=1,
HidePreviewMenuBar=2,
HidePreviewStatusBar=4,
HideAllPreviewBar=7};
Q_DECLARE_FLAGS(PreviewHints, PreviewHint)
class ReportError : public std::runtime_error{
public:
ReportError(const QString& message):std::runtime_error(message.toStdString()){}
@ -104,6 +111,6 @@ namespace Const{
} // namespace LimeReport
Q_DECLARE_OPERATORS_FOR_FLAGS(LimeReport::PreviewHints)
#endif // GLOBAL_H

15
limereport/lrpreviewreportwindow.cpp
View File

@ -149,6 +149,21 @@ void PreviewReportWindow::setErrorMessages(const QStringList &value){
m_previewReportWidget->setErrorMessages(value);
}
void PreviewReportWindow::setToolBarVisible(bool value)
{
ui->toolBar->setVisible(value);
}
void PreviewReportWindow::setStatusBarVisible(bool value)
{
ui->statusbar->setVisible(value);
}
void PreviewReportWindow::setMenuVisible(bool value)
{
ui->menubar->setVisible(value);
}
QSettings*PreviewReportWindow::settings()
{
if (m_settings){

3
limereport/lrpreviewreportwindow.h
View File

@ -62,6 +62,9 @@ public:
void initPreview(int pagesCount);
void setSettings(QSettings* value);
void setErrorMessages(const QStringList& value);
void setToolBarVisible(bool value);
void setStatusBarVisible(bool value);
void setMenuVisible(bool value);
QSettings* settings();
protected:
void writeSetting();

11
limereport/lrreportengine.cpp
View File

@ -355,7 +355,7 @@ bool ReportEnginePrivate::printToPDF(const QString &fileName)
return false;
}
void ReportEnginePrivate::previewReport()
void ReportEnginePrivate::previewReport(PreviewHints hints)
{
QTime start = QTime::currentTime();
try{
@ -375,6 +375,11 @@ void ReportEnginePrivate::previewReport()
if (!dataManager()->errorsList().isEmpty()){
w->setErrorMessages(dataManager()->errorsList());
}
w->setMenuVisible(!hints.testFlag(HidePreviewMenuBar));
w->setStatusBarVisible(!hints.testFlag(HidePreviewStatusBar));
w->setToolBarVisible(!hints.testFlag(HidePreviewToolBar));
m_activePreview = w;
connect(w,SIGNAL(destroyed(QObject*)), this, SLOT(slotPreviewWindowDestroed(QObject*)));
qDebug()<<"render time ="<<start.msecsTo(QTime::currentTime());
@ -720,12 +725,12 @@ bool ReportEngine::printToPDF(const QString &fileName)
return d->printToPDF(fileName);
}
void ReportEngine::previewReport()
void ReportEngine::previewReport(PreviewHints hints)
{
Q_D(ReportEngine);
if (m_settings)
d->setSettings(m_settings);
d->previewReport();
d->previewReport(hints);
}
void ReportEngine::designReport()

2
limereport/lrreportengine.h
View File

@ -77,7 +77,7 @@ public:
void printToFile(const QString& fileName);
PageDesignIntf *createPreviewScene(QObject *parent = 0);
bool printToPDF(const QString& fileName);
void previewReport();
void previewReport(PreviewHints hints = ShowAllPreviewBars);
void designReport();
void setShowProgressDialog(bool value);
IDataSourceManager* dataManager();

2
limereport/lrreportengine_p.h
View File

@ -86,7 +86,7 @@ public:
bool printPages(ReportPages pages, QPrinter *printer, PrintRange printRange = PrintRange());
void printToFile(const QString& fileName);
bool printToPDF(const QString& fileName);
void previewReport();
void previewReport(PreviewHints hints = ShowAllPreviewBars);
void designReport();
void setSettings(QSettings* value);
void setShowProgressDialog(bool value){m_showProgressDialog = value;}