mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-11-24 16:18:04 +03:00
Code Activity

Finish 1.4.132

Browse Source 
# Conflicts:
#	include/lrpreviewreportwidget.h
#	include/lrreportengine.h
#	limereport/limereport.pri
#	limereport/limereport.pro
#	limereport/lrpreviewreportwidget.h
#	limereport/lrpreviewreportwindow.h
#	limereport/lrreportengine.cpp
#	limereport/lrreportengine.h
#	limereport/lrreportengine_p.h
This commit is contained in:
Arin Alexander
2019-05-29 18:10:26 +03:00
parent d9e609e954 536a409393
commit 0245f5993a
15 changed files with 188 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
limereport/lrreportengine_p.h
View File

@@ -112,24 +112,6 @@ public:
virtual void setCurrentDesignerLanguage(QLocale::Language language) = 0;
};
class PreparedPages: public IPreparedPages{
public:
PreparedPages(ReportPages* pages):m_pages(pages){}
~PreparedPages(){}
// IPreviewPages interface
private:
bool loadFromFile(const QString &fileName);
bool loadFromString(const QString data);
bool loadFromByteArray(QByteArray *data);
bool saveToFile(const QString &fileName);
QString saveToString();
QByteArray saveToByteArray();
private:
bool readPages(ItemsReaderIntf::Ptr reader);
ReportPages* m_pages;
};
class PrintProcessor{
public:
explicit PrintProcessor(QPrinter* printer);
@@ -262,7 +244,7 @@ public:
void setPreviewScaleType(const ScaleType &previewScaleType, int percent = 0);
void addWatermark(const WatermarkSetting& watermarkSetting);
void clearWatermarks();
IPreparedPages* preparedPages(){return &m_preparedPagesManager;}
IPreparedPages* preparedPages();
bool showPreparedPages(PreviewHints hints);
bool prepareReportPages();
signals:
@@ -274,6 +256,7 @@ signals:
void renderPageFinished(int renderedPageCount);
void onSave(bool& saved);
void onSaveAs(bool& saved);
void onSavePreview(bool& saved, LimeReport::IPreparedPages* pages);
void onLoad(bool& loaded);
void saveFinished();
void loadFinished();
@@ -320,7 +303,7 @@ private:
QList<PageDesignIntf*> m_pages;
QList<PageItemDesignIntf*> m_renderingPages;
ReportPages m_preparedPages;
PreparedPages m_preparedPagesManager;
PreparedPages* m_preparedPagesManager;
DataSourceManager* m_datasources;
ScriptEngineContext* m_scriptEngineContext;
ReportRender::Ptr m_reportRender;