mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-09 05:57:14 +03:00
Code Activity

Finish 1.4.41

Browse Source 
# Conflicts:
#	limereport/lrbasedesignintf.h
#	limereport/lrreportdesignwidget.cpp
#	limereport/lrreportdesignwidget.h
#	limereport/lrreportengine.cpp
This commit is contained in:
Arin Alexander
2017-09-21 22:08:20 +03:00
parent b18fd6ea04 f76d9c839b
commit 0ab92681b0
9 changed files with 87 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
limereport/lrreportdesignwidget.cpp
View File

@@ -387,7 +387,7 @@ void ReportDesignWidget::slotItemSelected(BaseDesignIntf *item){
bool ReportDesignWidget::saveToFile(const QString &fileName){
bool result = false;
m_report->scriptContext()->setInitScript(m_scriptEditor->toPlainText());
prepareReport();
#ifdef HAVE_QTDESIGNER_INTEGRATION
updateDialogs();
#endif
@@ -408,7 +408,7 @@ bool ReportDesignWidget::saveToFile(const QString &fileName){
bool ReportDesignWidget::save()
{
m_report->scriptContext()->setInitScript(m_scriptEditor->toPlainText());
prepareReport();
#ifdef HAVE_QTDESIGNER_INTEGRATION
updateDialogs();
#endif
@@ -620,9 +620,15 @@ void ReportDesignWidget::setBorders(const BaseDesignIntf::BorderLines& borders)
activePage()->setBorders(borders);
}
void ReportDesignWidget::prepareReport()
{
m_report->scriptContext()->setInitScript(m_scriptEditor->toPlainText());
report()->clearSelection();
}
void ReportDesignWidget::previewReport()
{
report()->scriptContext()->setInitScript(m_scriptEditor->toPlainText());
prepareReport();
#ifdef HAVE_QTDESIGNER_INTEGRATION
updateDialogs();
#endif
@@ -631,7 +637,7 @@ void ReportDesignWidget::previewReport()
void ReportDesignWidget::printReport()
{
report()->scriptContext()->setInitScript(m_scriptEditor->toPlainText());
prepareReport();
#ifdef HAVE_QTDESIGNER_INTEGRATION
updateDialogs();
#endif