mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-01-12 01:21:03 +03:00
Code

Merge tag '1.5.62' into develop

Browse Source 
Finish 1.5.62
This commit is contained in:
Arin Alexandex 2020-08-08 00:24:48 +03:00
commit 6c9c40d189
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -134,7 +134,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 5 LIMEREPORT_VERSION_MINOR = 5
LIMEREPORT_VERSION_RELEASE = 61 LIMEREPORT_VERSION_RELEASE = 62
LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}'
DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\"

2
limereport/lrreportdesignwindow.cpp
View File

@ -1126,6 +1126,7 @@ void ReportDesignWindow::slotSaveReport()
QString filename = m_reportDesignWidget->reportFileName(); QString filename = m_reportDesignWidget->reportFileName();
m_lblReportName->setText(filename); m_lblReportName->setText(filename);
if(!filename.isEmpty()) addRecentFile(filename); if(!filename.isEmpty()) addRecentFile(filename);
setWindowTitle(m_reportDesignWidget->report()->reportName() + " - Lime Report Designer");
} }
void ReportDesignWindow::slotSaveReportAs() void ReportDesignWindow::slotSaveReportAs()
@ -1137,6 +1138,7 @@ void ReportDesignWindow::slotSaveReportAs()
m_reportDesignWidget->saveToFile(fileName); m_reportDesignWidget->saveToFile(fileName);
m_lblReportName->setText(m_reportDesignWidget->reportFileName()); m_lblReportName->setText(m_reportDesignWidget->reportFileName());
addRecentFile(fileName); addRecentFile(fileName);
setWindowTitle(m_reportDesignWidget->report()->reportName() + " - Lime Report Designer");
} }
} }

3
limereport/lrreportengine.cpp
View File

@ -206,7 +206,7 @@ void ReportEnginePrivate::collectionLoadFinished(const QString &)
page->setReportSettings(&m_reportSettings); page->setReportSettings(&m_reportSettings);
page->setSceneRect(-Const::SCENE_MARGIN,-Const::SCENE_MARGIN, page->setSceneRect(-Const::SCENE_MARGIN,-Const::SCENE_MARGIN,
page->pageItem()->width()+Const::SCENE_MARGIN*2, page->pageItem()->width()+Const::SCENE_MARGIN*2,
page->pageItem()->height()+Const::SCENE_MARGIN*2); page->pageItem()->boundingRect().height()+Const::SCENE_MARGIN*2);
} }
emit pagesLoadFinished(); emit pagesLoadFinished();
} }
@ -876,6 +876,7 @@ bool ReportEnginePrivate::saveToFile(const QString &fileName)
} }
} }
dropChanges(); dropChanges();
this->setReportName(fi.baseName());
return saved; return saved;
} }