X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=1821ad1e67a69276bd3e6b04c607df0e2c1f121f;hp=bfdf65b477a2121d3a48d82becd2fae340ca0a73;hb=09f55d9665efb3b17ba7de4bae47be6989e884fe;hpb=33bedfc1262f3a6772f6a741144baf90790297fb

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index bfdf65b4..1821ad1e 100644
--- 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>
@@ -44,6 +43,7 @@
 #include "dialogs/about.hpp"
 #include "toolbars/mainbar.hpp"
 #include "view/view.hpp"
+#include "views/trace/standardbar.hpp"
 
 #include <stdint.h>
 #include <stdarg.h>
@@ -87,7 +87,7 @@ MainWindow::MainWindow(DeviceManager &device_manager,
 
 	if (!open_file_name.empty()) {
 		shared_ptr<Session> session = add_session();
-		session->main_bar()->load_init_file(open_file_name, open_file_format);
+		session->load_init_file(open_file_name, open_file_format);
 	}
 
 	// Add empty default session if there aren't any sessions
@@ -107,8 +107,7 @@ MainWindow::MainWindow(DeviceManager &device_manager,
 		}
 
 		// ...and if there isn't any, just use demo then
-		session->main_bar()->select_device(other_device ?
-			other_device : demo_device);
+		session->select_device(other_device ? other_device : demo_device);
 	}
 }
 
@@ -161,7 +160,7 @@ shared_ptr<views::ViewBase> MainWindow::get_active_view() const
 shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 	views::ViewType type, Session &session)
 {
-	QMainWindow *main_window;
+	QMainWindow *main_window = nullptr;
 	for (auto entry : session_windows_)
 		if (entry.first.get() == &session)
 			main_window = entry.second;
@@ -205,17 +204,29 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 
 			shared_ptr<MainBar> main_bar = session.main_bar();
 			if (!main_bar) {
-				main_bar = make_shared<MainBar>(session, *this);
+				/* Initial view, create the main bar */
+				main_bar = make_shared<MainBar>(session, this, v.get());
 				dock_main->addToolBar(main_bar.get());
 				session.set_main_bar(main_bar);
 
 				connect(main_bar.get(), SIGNAL(new_view(Session*)),
 					this, SLOT(on_new_view(Session*)));
-			}
-			main_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
 
-			connect(v.get(), SIGNAL(always_zoom_to_fit_changed(bool)),
-				main_bar.get(), SLOT(on_always_zoom_to_fit_changed(bool)));
+				main_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
+
+				/* For the main view we need to prevent the dock widget from
+				 * closing itself when its close button is clicked. This is
+				 * so we can confirm with the user first. Regular views don't
+				 * need this */
+				close_btn->disconnect(SIGNAL(clicked()), dock, SLOT(close()));
+			} else {
+				/* Additional view, create a standard bar */
+				pv::views::trace::StandardBar *standard_bar =
+					new pv::views::trace::StandardBar(session, this, v.get());
+				dock_main->addToolBar(standard_bar);
+
+				standard_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
+			}
 		}
 
 		return v;
@@ -224,6 +235,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;
@@ -261,23 +300,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));
@@ -330,26 +354,42 @@ void MainWindow::setup_ui()
 	action_view_coloured_bg_->setShortcut(QKeySequence(Qt::Key_B));
 	action_view_coloured_bg_->setObjectName(
 		QString::fromUtf8("actionViewColouredBg"));
-	action_view_coloured_bg_->setText(tr("Use &coloured backgrounds"));
+	action_view_coloured_bg_->setText(tr("Use &Coloured Backgrounds"));
 
 	action_about_->setObjectName(QString::fromUtf8("actionAbout"));
-	action_about_->setText(tr("&About..."));
+	action_about_->setToolTip(tr("&About..."));
 
 	// Set up the tab area
 	new_session_button_ = new QToolButton();
 	new_session_button_->setIcon(QIcon::fromTheme("document-new",
 		QIcon(":/icons/document-new.png")));
+	new_session_button_->setToolTip(tr("Create New Session"));
 	new_session_button_->setAutoRaise(true);
 
 	run_stop_button_ = new QToolButton();
 	run_stop_button_->setAutoRaise(true);
 	run_stop_button_->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 	run_stop_button_->setShortcut(QKeySequence(Qt::Key_Space));
+	run_stop_button_->setToolTip(tr("Start/Stop Acquisition"));
+
+	settings_button_ = new QToolButton();
+	settings_button_->setIcon(QIcon::fromTheme("configure",
+		QIcon(":/icons/configure.png")));
+	settings_button_->setToolTip(tr("Settings"));
+	settings_button_->setAutoRaise(true);
+
+	QFrame *separator1 = new QFrame();
+	separator1->setFrameStyle(QFrame::VLine | QFrame::Raised);
+	QFrame *separator2 = new QFrame();
+	separator2->setFrameStyle(QFrame::VLine | QFrame::Raised);
 
 	QHBoxLayout* layout = new QHBoxLayout();
 	layout->setContentsMargins(2, 2, 2, 2);
 	layout->addWidget(new_session_button_);
+	layout->addWidget(separator1);
 	layout->addWidget(run_stop_button_);
+	layout->addWidget(separator2);
+	layout->addWidget(settings_button_);
 
 	static_tab_widget_ = new QWidget();
 	static_tab_widget_->setLayout(layout);
@@ -443,8 +483,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()
@@ -565,6 +617,14 @@ void MainWindow::on_session_name_changed()
 			}
 	}
 
+	// Update the tab widget by finding the main window and the tab from that
+	for (auto entry : session_windows_)
+		if (entry.first.get() == session) {
+			QMainWindow *window = entry.second;
+			const int index = session_selector_.indexOf(window);
+			session_selector_.setTabText(index, session->name());
+		}
+
 	// Refresh window title if the affected session has focus
 	if (session == last_focused_session_.get())
 		setWindowTitle(session->name() + " - " + WindowTitle);
@@ -620,12 +680,17 @@ void MainWindow::on_view_close_clicked()
 		if (!session->has_view(view))
 			continue;
 
-		// Also destroy the entire session if its main view is closing
+		// Also destroy the entire session if its main view is closing...
 		if (view == session->main_view()) {
-			remove_session(session);
+			// ...but only if data is saved or the user confirms closing
+			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);
 			break;
 		} else
-			session->deregister_view(view);
+			// All other views can be closed at any time as no data will be lost
+			remove_view(view);
 	}
 }
 
@@ -639,11 +704,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);
 }