diff --git a/CMakeLists.txt b/CMakeLists.txt index 77d1a6d..33f2345 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ project(limereport) set(LIMEREPORT_VERSION_MAJOR 1) set(LIMEREPORT_VERSION_MINOR 7) -set(LIMEREPORT_VERSION_RELEASE 7) +set(LIMEREPORT_VERSION_RELEASE 9) option(ENABLE_ZINT "Enable libzint build for barcode support" OFF) option(LIMEREPORT_STATIC "Build LimeReport as static library" OFF) diff --git a/common.pri b/common.pri index f476b66..e2a5df0 100644 --- a/common.pri +++ b/common.pri @@ -141,7 +141,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MINOR = 7 -LIMEREPORT_VERSION_RELEASE = 7 +LIMEREPORT_VERSION_RELEASE = 9 LIMEREPORT_VERSION = '$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}' DEFINES *= LIMEREPORT_VERSION_STR=\\\"$${LIMEREPORT_VERSION}\\\" diff --git a/limereport/lrreportdesignwidget.cpp b/limereport/lrreportdesignwidget.cpp index 58570bc..47b1832 100644 --- a/limereport/lrreportdesignwidget.cpp +++ b/limereport/lrreportdesignwidget.cpp @@ -483,9 +483,8 @@ bool ReportDesignWidget::save() bool result = false; if (emitSaveReport()) { - result = true; // saved via signal - } - else if (!m_report->reportFileName().isEmpty()){ + result = true; + } else if (!m_report->reportFileName().isEmpty()) { if (m_report->saveToFile()){ m_report->emitSaveFinished(); result = true; @@ -495,7 +494,15 @@ bool ReportDesignWidget::save() m_report->emitSaveFinished(); result = true; } - else if (m_report->saveToFile(QFileDialog::getSaveFileName(this,tr("Report file name"),"","Report files (*.lrxml);; All files (*)"))){ + else if ( + m_report->saveToFile( + QFileDialog::getSaveFileName( + this, tr("Report file name"), + m_report->currentReportsDir(), + "Report files (*.lrxml);; All files (*)" + ) + ) + ){ m_report->emitSaveFinished(); result = true; };