diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2013-12-05 14:38:12 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-12-05 08:04:55 -0800 |
| commit | 26d2cc0fef22dbe9cdf69e16c3bf26d0d9b5ed5d (patch) | |
| tree | d24b201d6951480b7a645054fc724965230b474b /qt-ui/mainwindow.cpp | |
| parent | 94f85bbef9e0b4079f17f6d995c3af381f3784de (diff) | |
| download | subsurface-26d2cc0fef22dbe9cdf69e16c3bf26d0d9b5ed5d.tar.gz | |
MainWindow: fix setTitle() calls
setTitle() works with an enum that can be fed different values,
and other we may have eventually. For example not only "app title",
or "app title: filename", but others, like dates, certain app status
and so on.
Patch fixes an issue where deleting a single dive in the divelist
resets the title to "Subsurface" only. clearUpEmpty() should only
call setTitle(MWTF_DEFAULT) if no file is currently open.
It also adds a safe-guard to revert back to MWTF_DEFAULT if
no file is open but setTitle is called with MWTF_FILENAME.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/mainwindow.cpp')
| -rw-r--r-- | qt-ui/mainwindow.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index c9b003d3a..18cb0c122 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -135,7 +135,8 @@ void MainWindow::cleanUpEmpty() ui.ProfileWidget->clear(); ui.ListWidget->reload(DiveTripModel::TREE); ui.globe->reload(); - setTitle(MWTF_DEFAULT); + if (!existing_filename) + setTitle(MWTF_DEFAULT); } void MainWindow::on_actionClose_triggered() @@ -790,6 +791,10 @@ void MainWindow::setTitle(enum MainWindowTitleFormat format) setWindowTitle("Subsurface"); break; case MWTF_FILENAME: + if (!existing_filename) { + setTitle(MWTF_DEFAULT); + return; + } QFile f(existing_filename); QFileInfo fileInfo(f); QString fileName(fileInfo.fileName()); |