mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-09-23 16:39:07 +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

2
include/lrpreviewreportwidget.h
View File

@@ -5,6 +5,7 @@
#include <QTimer>
#include <QPrinter>
#include "lrglobal.h"
#include "lrpreparedpagesintf.h"
namespace LimeReport {
@@ -64,6 +65,7 @@ signals:
void scalePercentChanged(int percent);
void pagesSet(int pageCount);
void itemInserted(LimeReport::PageDesignIntf* report, QPointF pos, const QString& ItemType);
void onSave(bool& saved, LimeReport::IPreparedPages* pages);
private slots:
void slotSliderMoved(int value);
void reportEngineDestroyed(QObject* object);

14
include/lrreportengine.h
View File

@@ -40,6 +40,7 @@
#include "lrscriptenginemanagerintf.h"
#include "lrpreviewreportwidget.h"
#include "lrreportdesignwindowintrerface.h"
#include "lrpreparedpagesintf.h"
class QPrinter;
class QGraphicsScene;
@@ -137,20 +138,10 @@ class PageDesignIntf;
class PageItemDesignIntf;
class ReportDesignWidget;
class PreviewReportWidget;
class PreparedPages;
typedef QList< QSharedPointer<PageItemDesignIntf> > ReportPages;
class LIMEREPORT_EXPORT IPreparedPages{
public:
virtual ~IPreparedPages();
virtual bool loadFromFile(const QString& fileName) = 0;
virtual bool loadFromString(const QString data) = 0;
virtual bool loadFromByteArray(QByteArray* data) = 0;
virtual bool saveToFile(const QString& fileName) = 0;
virtual QString saveToString() = 0;
virtual QByteArray saveToByteArray() = 0;
};
class LIMEREPORT_EXPORT ReportEngine : public QObject{
Q_OBJECT
friend class ReportDesignWidget;
@@ -223,6 +214,7 @@ signals:
void onSave(bool& saved);
void onSaveAs(bool& saved);
void onLoad(bool& loaded);
void onSavePreview(bool& saved, LimeReport::IPreparedPages* pages);
void saveFinished();
void loadFinished();
void printedToPDF(QString fileName);