Confirm with user when trying to close sessions with unsaved data

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index f7c47122737216fba1fa32472d70f10cf6b5b71c..4aeecb260466c6a0885951f94a687dbe132058dc 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cassert>
@@ -230,6 +229,34 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
        return nullptr;
 }
 
+void MainWindow::remove_view(shared_ptr<views::ViewBase> view)
+{
+       for (shared_ptr<Session> session : sessions_) {
+               if (!session->has_view(view))
+                       continue;
+
+               // Find the dock the view is contained in and remove it
+               for (auto entry : view_docks_)
+                       if (entry.second == view) {
+                               // Remove the view from the session
+                               session->deregister_view(view);
+
+                               // Remove the view from its parent; otherwise, Qt will
+                               // call deleteLater() on it, which causes a double free
+                               // since the shared_ptr in view_docks_ doesn't know
+                               // that Qt keeps a pointer to the view around
+                               view->setParent(0);
+
+                               // Delete the view's dock widget and all widgets inside it
+                               entry.first->deleteLater();
+
+                               // Remove the dock widget from the list and stop iterating
+                               view_docks_.erase(entry.first);
+                               break;
+                       }
+       }
+}
+
 shared_ptr<Session> MainWindow::add_session()
 {
        static int last_session_id = 1;
@@ -267,23 +294,8 @@ void MainWindow::remove_session(shared_ptr<Session> session)
 {
        int h = new_session_button_->height();
 
-       for (shared_ptr<views::ViewBase> view : session->views()) {
-               // Find the dock the view is contained in and remove it
-               for (auto entry : view_docks_)
-                       if (entry.second == view) {
-                               // Remove the view from the session
-                               session->deregister_view(view);
-
-                               // Remove the view from its parent; otherwise, Qt will
-                               // call deleteLater() on it, which causes a double free
-                               // since the shared_ptr in view_docks_ doesn't know
-                               // that Qt keeps a pointer to the view around
-                               entry.second->setParent(0);
-
-                               // Remove this entry from the container
-                               view_docks_.erase(entry.first);
-                       }
-       }
+       for (shared_ptr<views::ViewBase> view : session->views())
+               remove_view(view);
 
        QMainWindow *window = session_windows_.at(session);
        session_selector_.removeTab(session_selector_.indexOf(window));
@@ -465,8 +477,20 @@ std::shared_ptr<Session> MainWindow::get_tab_session(int index) const
 
 void MainWindow::closeEvent(QCloseEvent *event)
 {
-       save_ui_settings();
-       event->accept();
+       bool data_saved = true;
+
+       for (auto entry : session_windows_)
+               if (!entry.first->data_saved())
+                       data_saved = false;
+
+       if (!data_saved && (QMessageBox::question(this, tr("Confirmation"),
+               tr("There is unsaved data. Close anyway?"),
+               QMessageBox::Yes | QMessageBox::No) == QMessageBox::No)) {
+               event->ignore();
+       } else {
+               save_ui_settings();
+               event->accept();
+       }
 }
 
 QMenu* MainWindow::createPopupMenu()
@@ -655,7 +679,7 @@ void MainWindow::on_view_close_clicked()
                        remove_session(session);
                        break;
                } else
-                       session->deregister_view(view);
+                       remove_view(view);
        }
 }
 
@@ -669,11 +693,13 @@ void MainWindow::on_tab_changed(int index)
 
 void MainWindow::on_tab_close_requested(int index)
 {
-       // TODO Ask user if this is intended in case data is unsaved
-
        shared_ptr<Session> session = get_tab_session(index);
 
-       if (session)
+       assert(session);
+
+       if (session->data_saved() || (QMessageBox::question(this, tr("Confirmation"),
+               tr("This session contains unsaved data. Close it anyway?"),
+               QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes))
                remove_session(session);
 }