mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 00:33:02 +03:00
Code

Finish 1.7.9

Browse Source
This commit is contained in:
Arin Alex 2024-07-18 21:47:06 +03:00
commit e833461923
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -3,7 +3,7 @@ project(limereport)
set(LIMEREPORT_VERSION_MAJOR 1) set(LIMEREPORT_VERSION_MAJOR 1)
set(LIMEREPORT_VERSION_MINOR 7) 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(ENABLE_ZINT "Enable libzint build for barcode support" OFF)
option(LIMEREPORT_STATIC "Build LimeReport as static library" OFF) option(LIMEREPORT_STATIC "Build LimeReport as static library" OFF)

2
common.pri
View File

@ -141,7 +141,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 7 LIMEREPORT_VERSION_MINOR = 7
LIMEREPORT_VERSION_RELEASE = 7 LIMEREPORT_VERSION_RELEASE = 9
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}\\\"

15
limereport/lrreportdesignwidget.cpp
View File

@ -483,9 +483,8 @@ bool ReportDesignWidget::save()
bool result = false; bool result = false;
if (emitSaveReport()) { if (emitSaveReport()) {
result = true; // saved via signal result = true;
} } else if (!m_report->reportFileName().isEmpty()) {
else if (!m_report->reportFileName().isEmpty()){
if (m_report->saveToFile()){ if (m_report->saveToFile()){
m_report->emitSaveFinished(); m_report->emitSaveFinished();
result = true; result = true;
@ -495,7 +494,15 @@ bool ReportDesignWidget::save()
m_report->emitSaveFinished(); m_report->emitSaveFinished();
result = true; 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(); m_report->emitSaveFinished();
result = true; result = true;
}; };