mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-24 00:33:02 +03:00
ReportEnginePrivate has been changed to ReportEngine in PrewiewWindow and DesignerWindow
This commit is contained in:
parent
0505801e3a
commit
188ab54ee2
@ -12,6 +12,7 @@ class PreviewReportWidget;
|
||||
|
||||
class PreviewReportWidgetPrivate;
|
||||
class ReportEnginePrivate;
|
||||
class ReportEngine;
|
||||
|
||||
class LIMEREPORT_EXPORT PreviewReportWidget : public QWidget
|
||||
{
|
||||
@ -20,7 +21,7 @@ class LIMEREPORT_EXPORT PreviewReportWidget : public QWidget
|
||||
friend class PreviewReportWindow;
|
||||
friend class PreviewReportWidgetPrivate;
|
||||
public:
|
||||
explicit PreviewReportWidget(ReportEnginePrivate *report, QWidget *parent = 0);
|
||||
explicit PreviewReportWidget(ReportEngine *report, QWidget *parent = 0);
|
||||
~PreviewReportWidget();
|
||||
public slots:
|
||||
void refreshPages();
|
||||
|
@ -63,11 +63,15 @@ class DataSourceManager;
|
||||
class ReportEnginePrivate;
|
||||
class PageDesignIntf;
|
||||
class PageItemDesignIntf;
|
||||
class ReportDesignWidget;
|
||||
class PreviewReportWidget;
|
||||
|
||||
typedef QList< QSharedPointer<PageItemDesignIntf> > ReportPages;
|
||||
|
||||
class LIMEREPORT_EXPORT ReportEngine : public QObject{
|
||||
Q_OBJECT
|
||||
friend class ReportDesignWidget;
|
||||
friend class PreviewReportWidget;
|
||||
public:
|
||||
static void setSettings(QSettings *value){m_settings=value;}
|
||||
public:
|
||||
|
@ -60,14 +60,15 @@ PageItemDesignIntf::Ptr PreviewReportWidgetPrivate::currentPage()
|
||||
else return PageItemDesignIntf::Ptr(0);
|
||||
}
|
||||
|
||||
PreviewReportWidget::PreviewReportWidget(ReportEnginePrivate *report, QWidget *parent) :
|
||||
PreviewReportWidget::PreviewReportWidget(ReportEngine *report, QWidget *parent) :
|
||||
QWidget(parent),
|
||||
ui(new Ui::PreviewReportWidget), d_ptr(new PreviewReportWidgetPrivate(this))
|
||||
{
|
||||
ui->setupUi(this);
|
||||
d_ptr->m_previewPage = report->createPreviewPage();
|
||||
d_ptr->m_report = report->d_ptr;
|
||||
d_ptr->m_previewPage = d_ptr->m_report->createPreviewPage();
|
||||
d_ptr->m_previewPage->setItemMode( LimeReport::PreviewMode );
|
||||
d_ptr->m_report = report;
|
||||
|
||||
|
||||
ui->errorsView->setVisible(false);
|
||||
connect(ui->graphicsView->verticalScrollBar(),SIGNAL(valueChanged(int)), this, SLOT(slotSliderMoved(int)));
|
||||
|
@ -12,6 +12,7 @@ class PreviewReportWidget;
|
||||
|
||||
class PreviewReportWidgetPrivate;
|
||||
class ReportEnginePrivate;
|
||||
class ReportEngine;
|
||||
|
||||
class LIMEREPORT_EXPORT PreviewReportWidget : public QWidget
|
||||
{
|
||||
@ -20,7 +21,7 @@ class LIMEREPORT_EXPORT PreviewReportWidget : public QWidget
|
||||
friend class PreviewReportWindow;
|
||||
friend class PreviewReportWidgetPrivate;
|
||||
public:
|
||||
explicit PreviewReportWidget(ReportEnginePrivate *report, QWidget *parent = 0);
|
||||
explicit PreviewReportWidget(ReportEngine *report, QWidget *parent = 0);
|
||||
~PreviewReportWidget();
|
||||
public slots:
|
||||
void refreshPages();
|
||||
|
@ -34,6 +34,8 @@
|
||||
#include "lrreportengine_p.h"
|
||||
#include "lrpreviewreportwidget.h"
|
||||
#include "lrpreviewreportwidget_p.h"
|
||||
#include "items/editors/lrfonteditorwidget.h"
|
||||
#include "items/editors/lrtextalignmenteditorwidget.h"
|
||||
|
||||
#include <QPrinter>
|
||||
#include <QPrintDialog>
|
||||
@ -43,7 +45,7 @@
|
||||
|
||||
namespace LimeReport{
|
||||
|
||||
PreviewReportWindow::PreviewReportWindow(ReportEnginePrivate *report,QWidget *parent, QSettings *settings, Qt::WindowFlags flags) :
|
||||
PreviewReportWindow::PreviewReportWindow(ReportEngine *report, QWidget *parent, QSettings *settings, Qt::WindowFlags flags) :
|
||||
QMainWindow(parent,flags),
|
||||
ui(new Ui::PreviewReportWindow), m_settings(settings), m_ownedSettings(false)
|
||||
{
|
||||
|
@ -34,15 +34,10 @@
|
||||
#include <QDomComment>
|
||||
#include <QSpinBox>
|
||||
#include <QComboBox>
|
||||
#include <QSettings>
|
||||
#include <QEventLoop>
|
||||
|
||||
#include "lrpagedesignintf.h"
|
||||
#include "lrreportrender.h"
|
||||
#include "serializators/lrstorageintf.h"
|
||||
#include "serializators/lrxmlreader.h"
|
||||
#include "lrpreviewreportwidget.h"
|
||||
|
||||
#include "items/editors/lrfonteditorwidget.h"
|
||||
#include "items/editors/lrtextalignmenteditorwidget.h"
|
||||
|
||||
namespace LimeReport {
|
||||
|
||||
@ -50,11 +45,19 @@ namespace Ui {
|
||||
class PreviewReportWindow;
|
||||
}
|
||||
|
||||
class PreviewReportWidget;
|
||||
class FontEditorWidget;
|
||||
class TextAlignmentEditorWidget;
|
||||
class ReportEngine;
|
||||
class PageItemDesignIntf;
|
||||
typedef QList< QSharedPointer<PageItemDesignIntf> > ReportPages;
|
||||
|
||||
|
||||
class PreviewReportWindow : public QMainWindow
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit PreviewReportWindow(ReportEnginePrivate *report, QWidget *parent = 0, QSettings* settings=0, Qt::WindowFlags flags=0);
|
||||
explicit PreviewReportWindow(ReportEngine *report, QWidget *parent = 0, QSettings* settings=0, Qt::WindowFlags flags=0);
|
||||
~PreviewReportWindow();
|
||||
void setReportReader(ItemsReaderIntf::Ptr reader);
|
||||
void setPages(ReportPages pages);
|
||||
|
@ -48,7 +48,7 @@ namespace LimeReport {
|
||||
|
||||
// ReportDesignIntf
|
||||
|
||||
ReportDesignWidget::ReportDesignWidget(ReportEnginePrivate *report, QMainWindow *mainWindow, QWidget *parent) :
|
||||
ReportDesignWidget::ReportDesignWidget(ReportEngine *report, QMainWindow *mainWindow, QWidget *parent) :
|
||||
QWidget(parent), m_mainWindow(mainWindow), m_verticalGridStep(10), m_horizontalGridStep(10), m_useGrid(false)
|
||||
{
|
||||
m_tabWidget = new QTabWidget(this);
|
||||
@ -63,7 +63,7 @@ ReportDesignWidget::ReportDesignWidget(ReportEnginePrivate *report, QMainWindow
|
||||
m_report->appendPage("page1");
|
||||
}
|
||||
else {
|
||||
m_report=report;
|
||||
m_report=report->d_ptr;
|
||||
if (!m_report->pageCount()) m_report->appendPage("page1");
|
||||
}
|
||||
|
||||
@ -74,7 +74,7 @@ ReportDesignWidget::ReportDesignWidget(ReportEnginePrivate *report, QMainWindow
|
||||
connect(m_tabWidget, SIGNAL(currentChanged(int)), this, SLOT(slotCurrentTabChanged(int)));
|
||||
|
||||
//m_instance=this;
|
||||
m_scriptEditor->setPlainText(report->scriptContext()->initScript());
|
||||
m_scriptEditor->setPlainText(m_report->scriptContext()->initScript());
|
||||
m_zoomer = new GraphicsViewZoomer(activeView());
|
||||
#ifdef Q_OS_WIN
|
||||
m_defaultFont = QFont("Arial",10);
|
||||
|
@ -150,7 +150,7 @@ protected:
|
||||
void createTabs();
|
||||
private:
|
||||
bool eventFilter(QObject *target, QEvent *event);
|
||||
ReportDesignWidget(ReportEnginePrivate* report,QMainWindow *mainWindow,QWidget *parent = 0);
|
||||
ReportDesignWidget(ReportEngine* report,QMainWindow *mainWindow,QWidget *parent = 0);
|
||||
private:
|
||||
ReportEnginePrivate* m_report;
|
||||
QGraphicsView *m_view;
|
||||
|
@ -62,7 +62,7 @@ namespace LimeReport{
|
||||
|
||||
ReportDesignWindow* ReportDesignWindow::m_instance=0;
|
||||
|
||||
ReportDesignWindow::ReportDesignWindow(ReportEnginePrivate *report, QWidget *parent, QSettings* settings) :
|
||||
ReportDesignWindow::ReportDesignWindow(ReportEngine *report, QWidget *parent, QSettings* settings) :
|
||||
QMainWindow(parent), m_textAttibutesIsChanging(false), m_settings(settings), m_ownedSettings(false), m_progressDialog(0), m_showProgressDialog(true)
|
||||
{
|
||||
initReportEditor(report);
|
||||
@ -437,7 +437,7 @@ void ReportDesignWindow::createMainMenu()
|
||||
m_recentFilesMenu->setDisabled(m_recentFiles.isEmpty());
|
||||
}
|
||||
|
||||
void ReportDesignWindow::initReportEditor(ReportEnginePrivate* report)
|
||||
void ReportDesignWindow::initReportEditor(ReportEngine* report)
|
||||
{
|
||||
m_reportDesignWidget=new ReportDesignWidget(report,this,this);
|
||||
setCentralWidget(m_reportDesignWidget);
|
||||
|
@ -59,7 +59,7 @@ class ReportDesignWindow : public QMainWindow
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
explicit ReportDesignWindow(ReportEnginePrivate* report, QWidget *parent = 0, QSettings* settings=0);
|
||||
explicit ReportDesignWindow(ReportEngine *report, QWidget *parent = 0, QSettings* settings=0);
|
||||
~ReportDesignWindow();
|
||||
static ReportDesignWindow* instance(){return m_instance;}
|
||||
|
||||
@ -134,7 +134,7 @@ private:
|
||||
void createItemsActions();
|
||||
void createObjectInspector();
|
||||
void createObjectsBrowser();
|
||||
void initReportEditor(ReportEnginePrivate* report);
|
||||
void initReportEditor(ReportEngine *report);
|
||||
void createDataWindow();
|
||||
void createScriptWindow();
|
||||
void updateRedoUndo();
|
||||
|
@ -371,7 +371,8 @@ void ReportEnginePrivate::previewReport(PreviewHints hints)
|
||||
ReportPages pages = renderToPages();
|
||||
dataManager()->setDesignTime(true);
|
||||
if (pages.count()>0){
|
||||
PreviewReportWindow* w = new PreviewReportWindow(this,0,settings());
|
||||
Q_Q(ReportEngine);
|
||||
PreviewReportWindow* w = new PreviewReportWindow(q,0,settings());
|
||||
w->setWindowFlags(Qt::Dialog|Qt::WindowMaximizeButtonHint|Qt::WindowCloseButtonHint| Qt::WindowMinMaxButtonsHint);
|
||||
w->setAttribute(Qt::WA_DeleteOnClose,true);
|
||||
w->setWindowModality(Qt::ApplicationModal);
|
||||
@ -405,7 +406,8 @@ void ReportEnginePrivate::previewReport(PreviewHints hints)
|
||||
|
||||
PreviewReportWidget* ReportEnginePrivate::createPreviewWidget(QWidget* parent){
|
||||
|
||||
PreviewReportWidget* widget = new PreviewReportWidget(this, parent);
|
||||
Q_Q(ReportEngine);
|
||||
PreviewReportWidget* widget = new PreviewReportWidget(q, parent);
|
||||
try{
|
||||
dataManager()->setDesignTime(false);
|
||||
ReportPages pages = renderToPages();
|
||||
@ -478,7 +480,8 @@ PageDesignIntf* ReportEngine::createPreviewScene(QObject* parent){
|
||||
void ReportEnginePrivate::designReport()
|
||||
{
|
||||
if (!m_designerWindow) {
|
||||
m_designerWindow = new LimeReport::ReportDesignWindow(this,QApplication::activeWindow(),settings());
|
||||
Q_Q(ReportEngine);
|
||||
m_designerWindow = new LimeReport::ReportDesignWindow(q,QApplication::activeWindow(),settings());
|
||||
m_designerWindow->setAttribute(Qt::WA_DeleteOnClose,true);
|
||||
m_designerWindow->setWindowIcon(QIcon(":report/images/logo32"));
|
||||
m_designerWindow->setShowProgressDialog(m_showProgressDialog);
|
||||
|
@ -63,11 +63,15 @@ class DataSourceManager;
|
||||
class ReportEnginePrivate;
|
||||
class PageDesignIntf;
|
||||
class PageItemDesignIntf;
|
||||
class ReportDesignWidget;
|
||||
class PreviewReportWidget;
|
||||
|
||||
typedef QList< QSharedPointer<PageItemDesignIntf> > ReportPages;
|
||||
|
||||
class LIMEREPORT_EXPORT ReportEngine : public QObject{
|
||||
Q_OBJECT
|
||||
friend class ReportDesignWidget;
|
||||
friend class PreviewReportWidget;
|
||||
public:
|
||||
static void setSettings(QSettings *value){m_settings=value;}
|
||||
public:
|
||||
|
Loading…
Reference in New Issue
Block a user