Improvements to filename display in window titles

Author: stfnp

gui/source/post/ResultWindow.cpp

@@ -5,28 +5,20 @@
 #include <QMessageBox>
 #include <QFileDialog>
 
-ResultWindow::ResultWindow() {
+ResultWindow::ResultWindow(const QString& filePath, const BowResult& data) {
     // Main window properties
-    this->setWindowTitle("Results");
+    this->setWindowFilePath(filePath);
     this->setWindowIcon(QIcon(":/icons/logo.svg"));
     this->setStyleSheet("QMainWindow { background-image:url(:/icons/background.png); background-position: center; background-repeat: no-repeat; }");
     this->menuBar()->setAutoFillBackground(true);
     this->resize({1000, 700});    // Initial size, overwritten by stored window geometry if present
 
-    // Load geometry and state
+    // Load state and geometry
     UserSettings settings;
     restoreState(settings.value("OutputWindow/state").toByteArray());
     restoreGeometry(settings.value("OutputWindow/geometry").toByteArray());
-}
-
-void ResultWindow::closeEvent(QCloseEvent *event) {
-    // Save state and geometry
-    UserSettings settings;
-    settings.setValue("OutputWindow/state", saveState());
-    settings.setValue("OutputWindow/geometry", saveGeometry());
-}
 
-void ResultWindow::load(const BowResult& data) {
+    // Try to load output data
     try {
         this->data = data;
         this->setCentralWidget(new OutputWidget(this->data));
@@ -35,3 +27,10 @@ void ResultWindow::load(const BowResult& data) {
         QMessageBox::critical(this, "Error", "Failed to open result data:\n" + QString(e.what()));
     }
 }
+
+void ResultWindow::closeEvent(QCloseEvent *event) {
+    // Save state and geometry
+    UserSettings settings;
+    settings.setValue("OutputWindow/state", saveState());
+    settings.setValue("OutputWindow/geometry", saveGeometry());
+}

gui/source/post/ResultWindow.hpp

@@ -6,8 +6,7 @@ class RecentFilesMenu;
 
 class ResultWindow: public QMainWindow {
 public:
-    ResultWindow();
-    void load(const BowResult& data);
+    ResultWindow(const QString& filePath, const BowResult& data);
 
 private:
     BowResult data;

gui/source/pre/MainWindow.cpp

@@ -274,8 +274,7 @@ void MainWindow::runSimulation(Mode mode) {
     BowResult result;
     SimulationDialog dialog(this, mainModel->getBow(), result, mode);
     if(dialog.exec() == QDialog::Accepted) {
-        auto window = new ResultWindow();
-        window->load(result);
+        auto window = new ResultWindow(this->windowFilePath(), result);
         window->show();
     }
 }
@@ -344,10 +343,13 @@ QString MainWindow::showSaveFileDialog() {
 // Filename to display at the top of the window, which is either the actual name of the current file
 // or the default name if no file is loaded
 QString MainWindow::displayPath() {
-    if(mainModel->currentFile().isEmpty()) {
-        return DEFAULT_NAME;
-    }
-    else {
+    if(!mainModel->currentFile().isEmpty()) {
         return mainModel->currentFile();
     }
+
+    if(mainModel->hasBow()) {
+        return DEFAULT_NAME;
+    }
+
+    return "";
 }