0
0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 16:44:39 +03:00

loaded() signal has been added

This commit is contained in:
Arin Alexander 2018-05-08 10:58:43 +03:00
parent 5e6704c697
commit d344264bfb
5 changed files with 36 additions and 20 deletions

View File

@ -72,20 +72,15 @@ ReportDesignWidget::ReportDesignWidget(ReportEnginePrivateInterface* report, QMa
mainLayout->addWidget(m_tabWidget); mainLayout->addWidget(m_tabWidget);
setLayout(mainLayout); setLayout(mainLayout);
// if (!report) { m_report=report;
// m_report=new ReportEnginePrivate(this); if (!m_report->pageCount()) m_report->appendPage("page1");
// m_report->setObjectName("report");
// m_report->appendPage("page1");
// }
// else {
m_report=report;//report->d_ptr;
if (!m_report->pageCount()) m_report->appendPage("page1");
// }
createTabs(); createTabs();
connect(dynamic_cast<QObject*>(m_report), SIGNAL(pagesLoadFinished()),this,SLOT(slotPagesLoadFinished())); connect(dynamic_cast<QObject*>(m_report), SIGNAL(pagesLoadFinished()),this,SLOT(slotPagesLoadFinished()));
connect(dynamic_cast<QObject*>(m_report), SIGNAL(cleared()),this,SIGNAL(cleared())); connect(dynamic_cast<QObject*>(m_report), SIGNAL(cleared()), this, SIGNAL(cleared()));
connect(dynamic_cast<QObject*>(m_report), SIGNAL(loaded()), this, SLOT(slotReportLoaded()));
connect(m_tabWidget, SIGNAL(currentChanged(int)), this, SLOT(slotCurrentTabChanged(int))); connect(m_tabWidget, SIGNAL(currentChanged(int)), this, SLOT(slotCurrentTabChanged(int)));
#ifdef HAVE_UI_LOADER #ifdef HAVE_UI_LOADER
connect(m_report->scriptContext(), SIGNAL(dialogDeleted(QString)), this, SLOT(slotDialogDeleted(QString))); connect(m_report->scriptContext(), SIGNAL(dialogDeleted(QString)), this, SLOT(slotDialogDeleted(QString)));
@ -250,6 +245,7 @@ void ReportDesignWidget::loadState(QSettings* settings)
void ReportDesignWidget::createTabs(){ void ReportDesignWidget::createTabs(){
m_tabWidget->clear();
int pageIndex = -1; int pageIndex = -1;
for (int i = 0; i<m_report->pageCount();++i){ for (int i = 0; i<m_report->pageCount();++i){
QGraphicsView* view = new QGraphicsView(qobject_cast<QWidget*>(this)); QGraphicsView* view = new QGraphicsView(qobject_cast<QWidget*>(this));
@ -465,14 +461,13 @@ bool ReportDesignWidget::save()
bool ReportDesignWidget::loadFromFile(const QString &fileName) bool ReportDesignWidget::loadFromFile(const QString &fileName)
{ {
if (m_report->loadFromFile(fileName,false)){ if (m_report->loadFromFile(fileName,false)){
QByteArray editorState = m_scriptEditor->saveState(); // QByteArray editorState = m_scriptEditor->saveState();
createTabs(); // createTabs();
//connectPage(m_report->pageAt(0)); // m_scriptEditor->setPlainText(m_report->scriptContext()->initScript());
m_scriptEditor->setPlainText(m_report->scriptContext()->initScript()); // m_scriptEditor->restoreState(editorState);
m_scriptEditor->restoreState(editorState); // emit loaded();
emit loaded(); // m_dialogChanged = false;
m_dialogChanged = false; // return true;
return true;
} else { } else {
QMessageBox::critical(this,tr("Error"),tr("Wrong file format")); QMessageBox::critical(this,tr("Error"),tr("Wrong file format"));
return false; return false;
@ -839,6 +834,16 @@ void ReportDesignWidget::slotCurrentTabChanged(int index)
if (view) view->centerOn(0,0); if (view) view->centerOn(0,0);
} }
void ReportDesignWidget::slotReportLoaded()
{
QByteArray editorState = m_scriptEditor->saveState();
createTabs();
m_scriptEditor->setPlainText(m_report->scriptContext()->initScript());
m_scriptEditor->restoreState(editorState);
emit loaded();
m_dialogChanged = false;
}
#ifdef HAVE_QTDESIGNER_INTEGRATION #ifdef HAVE_QTDESIGNER_INTEGRATION
void ReportDesignWidget::addNewDialog() void ReportDesignWidget::addNewDialog()

View File

@ -168,6 +168,7 @@ private slots:
void slotDatasourceCollectionLoaded(const QString&); void slotDatasourceCollectionLoaded(const QString&);
void slotSceneRectChanged(QRectF); void slotSceneRectChanged(QRectF);
void slotCurrentTabChanged(int index); void slotCurrentTabChanged(int index);
void slotReportLoaded();
#ifdef HAVE_QTDESIGNER_INTEGRATION #ifdef HAVE_QTDESIGNER_INTEGRATION
void slotDialogChanged(QString); void slotDialogChanged(QString);
void slotDialogNameChanged(QString oldName, QString newName); void slotDialogNameChanged(QString oldName, QString newName);

View File

@ -67,6 +67,7 @@
#ifdef HAVE_STATIC_BUILD #ifdef HAVE_STATIC_BUILD
#include "lrfactoryinitializer.h" #include "lrfactoryinitializer.h"
#endif #endif
namespace LimeReport{ namespace LimeReport{
QSettings* ReportEngine::m_settings = 0; QSettings* ReportEngine::m_settings = 0;
@ -740,7 +741,11 @@ bool ReportEnginePrivate::loadFromFile(const QString &fileName, bool autoLoadPre
m_fileWatcher->addPath( fileName ); m_fileWatcher->addPath( fileName );
} }
return slotLoadFromFile( fileName ); bool result = slotLoadFromFile( fileName );
if (result) {
emit loaded();
}
return result;
} }
bool ReportEnginePrivate::loadFromByteArray(QByteArray* data, const QString &name){ bool ReportEnginePrivate::loadFromByteArray(QByteArray* data, const QString &name){
@ -752,6 +757,7 @@ bool ReportEnginePrivate::loadFromByteArray(QByteArray* data, const QString &nam
if (reader->readItem(this)){ if (reader->readItem(this)){
m_fileName = ""; m_fileName = "";
m_reportName = name; m_reportName = name;
emit loaded();
return true; return true;
}; };
} }
@ -768,6 +774,7 @@ bool ReportEnginePrivate::loadFromString(const QString &report, const QString &n
if (reader->readItem(this)){ if (reader->readItem(this)){
m_fileName = ""; m_fileName = "";
m_reportName = name; m_reportName = name;
emit loaded();
return true; return true;
}; };
} }
@ -1131,6 +1138,7 @@ ReportEngine::ReportEngine(QObject *parent)
connect(d, SIGNAL(onSave()), this, SIGNAL(onSave())); connect(d, SIGNAL(onSave()), this, SIGNAL(onSave()));
connect(d, SIGNAL(onLoad(bool&)), this, SIGNAL(onLoad(bool&))); connect(d, SIGNAL(onLoad(bool&)), this, SIGNAL(onLoad(bool&)));
connect(d, SIGNAL(saveFinished()), this, SIGNAL(saveFinished())); connect(d, SIGNAL(saveFinished()), this, SIGNAL(saveFinished()));
connect(d, SIGNAL(loaded()), this, SIGNAL(loaded()));
} }
ReportEngine::~ReportEngine() ReportEngine::~ReportEngine()
@ -1177,7 +1185,7 @@ void ReportEngine::designReport()
d->designReport(); d->designReport();
} }
ReportDesignWindowInterface*ReportEngine::getDesignerWindow() ReportDesignWindowInterface* ReportEngine::getDesignerWindow()
{ {
Q_D(ReportEngine); Q_D(ReportEngine);
return d->getDesignerWindow(); return d->getDesignerWindow();

View File

@ -120,6 +120,7 @@ signals:
void onLoad(bool& loaded); void onLoad(bool& loaded);
void onSave(); void onSave();
void saveFinished(); void saveFinished();
void loaded();
public slots: public slots:
void cancelRender(); void cancelRender();
protected: protected:

View File

@ -189,6 +189,7 @@ signals:
void onLoad(bool& loaded); void onLoad(bool& loaded);
void onSave(); void onSave();
void saveFinished(); void saveFinished();
void loaded();
public slots: public slots:
bool slotLoadFromFile(const QString& fileName); bool slotLoadFromFile(const QString& fileName);
void cancelRender(); void cancelRender();