python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2024-12-25 04:54:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

Finish 1.4.102

Browse Source 
# Conflicts:
#	limereport/lrreportdesignwindow.cpp
This commit is contained in:
Arin Alex 2018-08-27 17:48:02 +03:00
commit a56cfdc4d7
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

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

7
limereport/lrreportdesignwindow.cpp
View File

@ -88,7 +88,11 @@ ReportDesignWindow::ReportDesignWindow(ReportEnginePrivateInterface* report, QWi
m_lblReportName = new QLabel(report->reportFileName(),this); m_lblReportName = new QLabel(report->reportFileName(),this);
m_statusBar->insertWidget(0,m_lblReportName); m_statusBar->insertWidget(0,m_lblReportName);
setStatusBar(m_statusBar); setStatusBar(m_statusBar);
setWindowTitle("Lime Report Designer");
QString windowTitle = "Lime Report Designer";
if (!report->reportName().isEmpty())
windowTitle = report->reportName() + " - " + windowTitle;
setWindowTitle(windowTitle);
showDefaultEditors(); showDefaultEditors();
showDefaultToolBars(); showDefaultToolBars();
restoreSetting(); restoreSetting();
@ -886,6 +890,7 @@ void ReportDesignWindow::slotNewReport()
m_lblReportName->setText(""); m_lblReportName->setText("");
startNewReport(); startNewReport();
m_deletePageAction->setEnabled(false); m_deletePageAction->setEnabled(false);
setWindowTitle("Lime Report Designer");
} }
} }