X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=4aeecb260466c6a0885951f94a687dbe132058dc;hb=5ccfc97e20bbea19b9bc37905dd4cf63ee1f6303;hp=e1073144f7f97ca931b4733b27eead0dad3afaa0;hpb=efdec55aec1a137460fa362a381ed1904182bfed;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index e107314..4aeecb2 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -229,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;
@@ -266,24 +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 and stop iterating.
-				view_docks_.erase(entry.first);
-				break;
-			}
-	}
+	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);
 }