diff --git a/common.pri b/common.pri index d1a8dc6..d8500ef 100644 --- a/common.pri +++ b/common.pri @@ -134,7 +134,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 5 -LIMEREPORT_VERSION_RELEASE = 61 +LIMEREPORT_VERSION_RELEASE = 62 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" diff --git a/limereport/lrreportdesignwindow.cpp b/limereport/lrreportdesignwindow.cpp index d863ee9..57af790 100644 --- a/limereport/lrreportdesignwindow.cpp +++ b/limereport/lrreportdesignwindow.cpp @@ -1126,6 +1126,7 @@ void ReportDesignWindow::slotSaveReport() QString filename = m_reportDesignWidget->reportFileName(); m_lblReportName->setText(filename); if(!filename.isEmpty()) addRecentFile(filename); + setWindowTitle(m_reportDesignWidget->report()->reportName() + " - Lime Report Designer"); } void ReportDesignWindow::slotSaveReportAs() @@ -1137,6 +1138,7 @@ void ReportDesignWindow::slotSaveReportAs() m_reportDesignWidget->saveToFile(fileName); m_lblReportName->setText(m_reportDesignWidget->reportFileName()); addRecentFile(fileName); + setWindowTitle(m_reportDesignWidget->report()->reportName() + " - Lime Report Designer"); } } diff --git a/limereport/lrreportengine.cpp b/limereport/lrreportengine.cpp index c28f921..0165e9d 100644 --- a/limereport/lrreportengine.cpp +++ b/limereport/lrreportengine.cpp @@ -206,7 +206,7 @@ void ReportEnginePrivate::collectionLoadFinished(const QString &) page->setReportSettings(&m_reportSettings); page->setSceneRect(-Const::SCENE_MARGIN,-Const::SCENE_MARGIN, page->pageItem()->width()+Const::SCENE_MARGIN*2, - page->pageItem()->height()+Const::SCENE_MARGIN*2); + page->pageItem()->boundingRect().height()+Const::SCENE_MARGIN*2); } emit pagesLoadFinished(); } @@ -876,6 +876,7 @@ bool ReportEnginePrivate::saveToFile(const QString &fileName) } } dropChanges(); + this->setReportName(fi.baseName()); return saved; }