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

Showing the report name in the title fixed

Browse Source
This commit is contained in:
Arin Alex 2018-08-27 17:44:33 +03:00
parent b072f345ac
commit 1be5920a64
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -75,7 +75,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

@ -78,7 +78,10 @@ ReportDesignWindow::ReportDesignWindow(ReportEnginePrivate *report, QWidget *par
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);
restoreSetting(); restoreSetting();
m_hideLeftPanel->setChecked(isDockAreaVisible(Qt::LeftDockWidgetArea)); m_hideLeftPanel->setChecked(isDockAreaVisible(Qt::LeftDockWidgetArea));
m_hideRightPanel->setChecked(isDockAreaVisible(Qt::RightDockWidgetArea)); m_hideRightPanel->setChecked(isDockAreaVisible(Qt::RightDockWidgetArea));
@ -742,6 +745,7 @@ void ReportDesignWindow::slotNewReport()
m_lblReportName->setText(""); m_lblReportName->setText("");
startNewReport(); startNewReport();
m_deletePageAction->setEnabled(false); m_deletePageAction->setEnabled(false);
setWindowTitle("Lime Report Designer");
} }
} }
@ -931,7 +935,6 @@ void ReportDesignWindow::slotLoadReport()
m_lblReportName->setText(fileName); m_lblReportName->setText(fileName);
m_propertyModel->setObject(0); m_propertyModel->setObject(0);
updateRedoUndo(); updateRedoUndo();
setWindowTitle(m_reportDesignWidget->report()->reportName() + " - Lime Report Designer");
if (!m_recentFiles.contains(fileName)){ if (!m_recentFiles.contains(fileName)){
if (m_recentFiles.count()==10){ if (m_recentFiles.count()==10){
QMap<QString, QDateTime>::const_iterator it = m_recentFiles.constBegin(); QMap<QString, QDateTime>::const_iterator it = m_recentFiles.constBegin();