code for generation of window title has been outsourced to the Qt

utilities library
This commit is contained in:
Martchus 2015-07-07 00:53:24 +02:00
parent eaaa6e8abe
commit 474f788d40
1 changed files with 8 additions and 14 deletions

View File

@ -8,6 +8,7 @@
#include <passwordfile/io/entry.h> #include <passwordfile/io/entry.h>
#include <qtutilities/enterpassworddialog/enterpassworddialog.h> #include <qtutilities/enterpassworddialog/enterpassworddialog.h>
#include <qtutilities/misc/dialogutils.h>
#include <c++utilities/io/path.h> #include <c++utilities/io/path.h>
@ -589,24 +590,17 @@ void MainWindow::updateUiStatus()
*/ */
void MainWindow::updateWindowTitle() void MainWindow::updateWindowTitle()
{ {
if(m_file.path().empty()) { Dialogs::DocumentStatus docStatus;
if(m_file.hasRootEntry()) { if(m_file.hasRootEntry()) {
if(m_somethingChanged) { if(m_somethingChanged) {
setWindowTitle(QStringLiteral("*Unsaved - %1").arg(QApplication::applicationName())); docStatus = Dialogs::DocumentStatus::Unsaved;
} else {
setWindowTitle(QStringLiteral("Unsaved - %1").arg(QApplication::applicationName()));
}
} else { } else {
setWindowTitle(QApplication::applicationName()); docStatus = Dialogs::DocumentStatus::Saved;
} }
} else { } else {
QFileInfo file = QString::fromStdString(m_file.path()); docStatus = Dialogs::DocumentStatus::NoDocument;
if(m_somethingChanged) {
setWindowTitle(QStringLiteral("*%1 - %2 - %3").arg(file.fileName(), file.dir().path(), QApplication::applicationName()));
} else {
setWindowTitle(QStringLiteral("%1 - %2 - %3").arg(file.fileName(), file.dir().path(), QApplication::applicationName()));
}
} }
setWindowTitle(Dialogs::generateWindowTitle(docStatus, QString::fromStdString(m_file.path())));
} }
void MainWindow::applyDefaultExpanding(const QModelIndex &parent) void MainWindow::applyDefaultExpanding(const QModelIndex &parent)