X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=dfabc9a06797f0a080ae16069b16de70f0929280;hp=e213f511e7b1f92419d5154f337d524dbfc40c73;hb=b571a8e7e0dc3e3b6daa58f27050e76466f006dd;hpb=4d1ec09aed2931962808a2b103de8bf1d26e4a60

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index e213f511..dfabc9a0 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -14,45 +14,45 @@
  * 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>
-
 #ifdef ENABLE_DECODE
 #include <libsigrokdecode/libsigrokdecode.h>
 #endif
 
 #include <algorithm>
+#include <cassert>
+#include <cstdarg>
+#include <cstdint>
 #include <iterator>
 
 #include <QAction>
 #include <QApplication>
 #include <QCloseEvent>
+#include <QDebug>
 #include <QDockWidget>
 #include <QHBoxLayout>
 #include <QMessageBox>
 #include <QSettings>
+#include <QShortcut>
 #include <QWidget>
 
 #include "mainwindow.hpp"
 
 #include "devicemanager.hpp"
-#include "util.hpp"
 #include "devices/hardwaredevice.hpp"
-#include "dialogs/about.hpp"
+#include "dialogs/settings.hpp"
+#include "globalsettings.hpp"
 #include "toolbars/mainbar.hpp"
-#include "view/view.hpp"
+#include "util.hpp"
+#include "views/trace/view.hpp"
+#include "views/trace/standardbar.hpp"
 
-#include <stdint.h>
-#include <stdarg.h>
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::dynamic_pointer_cast;
-using std::list;
 using std::make_shared;
-using std::map;
 using std::shared_ptr;
 using std::string;
 
@@ -66,71 +66,43 @@ using toolbars::MainBar;
 
 const QString MainWindow::WindowTitle = tr("PulseView");
 
-MainWindow::MainWindow(DeviceManager &device_manager,
-	string open_file_name, string open_file_format,
-	QWidget *parent) :
+MainWindow::MainWindow(DeviceManager &device_manager, QWidget *parent) :
 	QMainWindow(parent),
 	device_manager_(device_manager),
 	session_selector_(this),
 	session_state_mapper_(this),
-	action_view_sticky_scrolling_(new QAction(this)),
-	action_view_coloured_bg_(new QAction(this)),
-	action_about_(new QAction(this)),
 	icon_red_(":/icons/status-red.svg"),
 	icon_green_(":/icons/status-green.svg"),
 	icon_grey_(":/icons/status-grey.svg")
 {
 	qRegisterMetaType<util::Timestamp>("util::Timestamp");
+	qRegisterMetaType<uint64_t>("uint64_t");
+
+	GlobalSettings::add_change_handler(this);
 
 	setup_ui();
 	restore_ui_settings();
-
-	if (!open_file_name.empty()) {
-		shared_ptr<Session> session = add_session();
-		session->main_bar()->load_init_file(open_file_name, open_file_format);
-	}
-
-	// Add empty default session if there aren't any sessions
-	if (sessions_.size() == 0) {
-		shared_ptr<Session> session = add_session();
-
-		map<string, string> dev_info;
-		shared_ptr<devices::HardwareDevice> other_device, demo_device;
-
-		// Use any available device that's not demo
-		for (shared_ptr<devices::HardwareDevice> dev : device_manager_.devices()) {
-			if (dev->hardware_device()->driver()->name() == "demo") {
-				demo_device = dev;
-			} else {
-				other_device = dev;
-			}
-		}
-
-		// ...and if there isn't any, just use demo then
-		session->main_bar()->select_device(other_device ?
-			other_device : demo_device);
-	}
 }
 
 MainWindow::~MainWindow()
 {
+	GlobalSettings::remove_change_handler(this);
+
 	while (!sessions_.empty())
 		remove_session(sessions_.front());
 }
 
-QAction* MainWindow::action_view_sticky_scrolling() const
-{
-	return action_view_sticky_scrolling_;
-}
-
-QAction* MainWindow::action_view_coloured_bg() const
+void MainWindow::show_session_error(const QString text, const QString info_text)
 {
-	return action_view_coloured_bg_;
-}
+	// TODO Emulate noquote()
+	qDebug() << "Notifying user of session error:" << info_text;
 
-QAction* MainWindow::action_about() const
-{
-	return action_about_;
+	QMessageBox msg;
+	msg.setText(text);
+	msg.setInformativeText(info_text);
+	msg.setStandardButtons(QMessageBox::Ok);
+	msg.setIcon(QMessageBox::Warning);
+	msg.exec();
 }
 
 shared_ptr<views::ViewBase> MainWindow::get_active_view() const
@@ -141,17 +113,17 @@ shared_ptr<views::ViewBase> MainWindow::get_active_view() const
 
 	// ...otherwise find the dock widget the widget with focus is contained in
 	QObject *w = QApplication::focusWidget();
-	QDockWidget *dock = 0;
+	QDockWidget *dock = nullptr;
 
 	while (w) {
-	    dock = qobject_cast<QDockWidget*>(w);
-	    if (dock)
-	        break;
-	    w = w->parent();
+		dock = qobject_cast<QDockWidget*>(w);
+		if (dock)
+			break;
+		w = w->parent();
 	}
 
 	// Get the view contained in the dock widget
-	for (auto entry : view_docks_)
+	for (auto& entry : view_docks_)
 		if (entry.first == dock)
 			return entry.second;
 
@@ -161,73 +133,124 @@ 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;
-	for (auto entry : session_windows_)
+	GlobalSettings settings;
+	shared_ptr<views::ViewBase> v;
+
+	QMainWindow *main_window = nullptr;
+	for (auto& entry : session_windows_)
 		if (entry.first.get() == &session)
 			main_window = entry.second;
 
 	assert(main_window);
 
-	if (type == views::ViewTypeTrace) {
-		QDockWidget* dock = new QDockWidget(title, main_window);
-		dock->setObjectName(title);
-		main_window->addDockWidget(Qt::TopDockWidgetArea, dock);
+	shared_ptr<MainBar> main_bar = session.main_bar();
 
-		// Insert a QMainWindow into the dock widget to allow for a tool bar
-		QMainWindow *dock_main = new QMainWindow(dock);
-		dock_main->setWindowFlags(Qt::Widget);  // Remove Qt::Window flag
+	QDockWidget* dock = new QDockWidget(title, main_window);
+	dock->setObjectName(title);
+	main_window->addDockWidget(Qt::TopDockWidgetArea, dock);
 
-		shared_ptr<views::TraceView::View> v =
-			make_shared<views::TraceView::View>(session, dock_main);
-		view_docks_[dock] = v;
-		session.register_view(v);
+	// Insert a QMainWindow into the dock widget to allow for a tool bar
+	QMainWindow *dock_main = new QMainWindow(dock);
+	dock_main->setWindowFlags(Qt::Widget);  // Remove Qt::Window flag
 
-		dock_main->setCentralWidget(v.get());
-		dock->setWidget(dock_main);
+	if (type == views::ViewTypeTrace)
+		// This view will be the main view if there's no main bar yet
+		v = make_shared<views::trace::View>(session,
+			(main_bar ? false : true), dock_main);
 
-		dock->setFeatures(QDockWidget::DockWidgetMovable |
-			QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
+	if (!v)
+		return nullptr;
 
-		QAbstractButton *close_btn =
-			dock->findChildren<QAbstractButton*>
-				("qt_dockwidget_closebutton").front();
+	view_docks_[dock] = v;
+	session.register_view(v);
 
-		connect(close_btn, SIGNAL(clicked(bool)),
-			this, SLOT(on_view_close_clicked()));
+	dock_main->setCentralWidget(v.get());
+	dock->setWidget(dock_main);
 
-		if (type == views::ViewTypeTrace) {
-			connect(&session, SIGNAL(trigger_event(util::Timestamp)),
-				qobject_cast<views::ViewBase*>(v.get()),
-				SLOT(trigger_event(util::Timestamp)));
+	dock->setContextMenuPolicy(Qt::PreventContextMenu);
+	dock->setFeatures(QDockWidget::DockWidgetMovable |
+		QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
 
-			v->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
-			v->enable_coloured_bg(action_view_coloured_bg_->isChecked());
+	QAbstractButton *close_btn =
+		dock->findChildren<QAbstractButton*>("qt_dockwidget_closebutton")
+			.front();  // clazy:exclude=detaching-temporary
 
-			shared_ptr<MainBar> main_bar = session.main_bar();
-			if (!main_bar) {
-				main_bar = make_shared<MainBar>(session, *this);
-				dock_main->addToolBar(main_bar.get());
-				session.set_main_bar(main_bar);
+	connect(close_btn, SIGNAL(clicked(bool)),
+		this, SLOT(on_view_close_clicked()));
 
-				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(&session, SIGNAL(trigger_event(int, util::Timestamp)),
+		qobject_cast<views::ViewBase*>(v.get()),
+		SLOT(trigger_event(int, util::Timestamp)));
 
-			connect(v.get(), SIGNAL(always_zoom_to_fit_changed(bool)),
-				main_bar.get(), SLOT(on_always_zoom_to_fit_changed(bool)));
+	if (type == views::ViewTypeTrace) {
+		views::trace::View *tv =
+			qobject_cast<views::trace::View*>(v.get());
+
+		tv->enable_colored_bg(settings.value(GlobalSettings::Key_View_ColoredBG).toBool());
+		tv->enable_show_sampling_points(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool());
+		tv->enable_show_analog_minor_grid(settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool());
+
+		if (!main_bar) {
+			/* Initial view, create the main bar */
+			main_bar = make_shared<MainBar>(session, this, tv);
+			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(tv->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, tv);
+			dock_main->addToolBar(standard_bar);
+
+			standard_bar->action_view_show_cursors()->setChecked(tv->cursors_shown());
 		}
-
-		return v;
 	}
 
-	return nullptr;
+	return v;
+}
+
+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(nullptr);
+
+				// 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;
-	QString name = tr("Untitled-%1").arg(last_session_id++);
+	QString name = tr("Session %1").arg(last_session_id++);
 
 	shared_ptr<Session> session = make_shared<Session>(device_manager_, name);
 
@@ -259,25 +282,20 @@ shared_ptr<Session> MainWindow::add_session()
 
 void MainWindow::remove_session(shared_ptr<Session> session)
 {
+	// Determine the height of the button before it collapses
 	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);
+	// Stop capture while the session still exists so that the UI can be
+	// updated in case we're currently running. If so, this will schedule a
+	// call to our on_capture_state_changed() slot for the next run of the
+	// event loop. We need to have this executed immediately or else it will
+	// be dismissed since the session object will be deleted by the time we
+	// leave this method and the event loop gets a chance to run again.
+	session->stop_capture();
+	QApplication::processEvents();
 
-				// 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 (const shared_ptr<views::ViewBase>& view : session->views())
+		remove_view(view);
 
 	QMainWindow *window = session_windows_.at(session);
 	session_selector_.removeTab(session_selector_.indexOf(window));
@@ -287,6 +305,7 @@ void MainWindow::remove_session(shared_ptr<Session> session)
 	if (last_focused_session_ == session)
 		last_focused_session_.reset();
 
+	// Remove the session from our list of sessions (which also destroys it)
 	sessions_.remove_if([&](shared_ptr<Session> s) {
 		return s == session; });
 
@@ -295,7 +314,7 @@ void MainWindow::remove_session(shared_ptr<Session> session)
 		// drops to zero. We must prevent this to keep the static
 		// widgets visible
 		for (QWidget *w : static_tab_widget_->findChildren<QWidget*>())
-			w->setMinimumHeight(h);
+			w->setMinimumHeight(h);  // clazy:exclude=range-loop
 
 		int margin = static_tab_widget_->layout()->contentsMargins().bottom();
 		static_tab_widget_->setMinimumHeight(h + 2 * margin);
@@ -307,6 +326,96 @@ void MainWindow::remove_session(shared_ptr<Session> session)
 	}
 }
 
+void MainWindow::add_session_with_file(string open_file_name,
+	string open_file_format)
+{
+	shared_ptr<Session> session = add_session();
+	session->load_init_file(open_file_name, open_file_format);
+}
+
+void MainWindow::add_default_session()
+{
+	// Only add the default session if there would be no session otherwise
+	if (sessions_.size() > 0)
+		return;
+
+	shared_ptr<Session> session = add_session();
+
+	// Check the list of available devices. Prefer the one that was
+	// found with user supplied scan specs (if applicable). Then try
+	// one of the auto detected devices that are not the demo device.
+	// Pick demo in the absence of "genuine" hardware devices.
+	shared_ptr<devices::HardwareDevice> user_device, other_device, demo_device;
+	for (const shared_ptr<devices::HardwareDevice>& dev : device_manager_.devices()) {
+		if (dev == device_manager_.user_spec_device()) {
+			user_device = dev;
+		} else if (dev->hardware_device()->driver()->name() == "demo") {
+			demo_device = dev;
+		} else {
+			other_device = dev;
+		}
+	}
+	if (user_device)
+		session->select_device(user_device);
+	else if (other_device)
+		session->select_device(other_device);
+	else
+		session->select_device(demo_device);
+}
+
+void MainWindow::save_sessions()
+{
+	QSettings settings;
+	int id = 0;
+
+	for (shared_ptr<Session>& session : sessions_) {
+		// Ignore sessions using the demo device or no device at all
+		if (session->device()) {
+			shared_ptr<devices::HardwareDevice> device =
+				dynamic_pointer_cast< devices::HardwareDevice >
+				(session->device());
+
+			if (device &&
+				device->hardware_device()->driver()->name() == "demo")
+				continue;
+
+			settings.beginGroup("Session" + QString::number(id++));
+			settings.remove("");  // Remove all keys in this group
+			session->save_settings(settings);
+			settings.endGroup();
+		}
+	}
+
+	settings.setValue("sessions", id);
+}
+
+void MainWindow::restore_sessions()
+{
+	QSettings settings;
+	int i, session_count;
+
+	session_count = settings.value("sessions", 0).toInt();
+
+	for (i = 0; i < session_count; i++) {
+		settings.beginGroup("Session" + QString::number(i));
+		shared_ptr<Session> session = add_session();
+		session->restore_settings(settings);
+		settings.endGroup();
+	}
+}
+
+void MainWindow::on_setting_changed(const QString &key, const QVariant &value)
+{
+	if (key == GlobalSettings::Key_View_ColoredBG)
+		on_settingViewColoredBg_changed(value);
+
+	if (key == GlobalSettings::Key_View_ShowSamplingPoints)
+		on_settingViewShowSamplingPoints_changed(value);
+
+	if (key == GlobalSettings::Key_View_ShowAnalogMinorGrid)
+		on_settingViewShowAnalogMinorGrid_changed(value);
+}
+
 void MainWindow::setup_ui()
 {
 	setObjectName(QString::fromUtf8("MainWindow"));
@@ -315,40 +424,40 @@ void MainWindow::setup_ui()
 
 	// Set the window icon
 	QIcon icon;
-	icon.addFile(QString(":/icons/sigrok-logo-notext.png"));
+	icon.addFile(QString(":/icons/pulseview.png"));
 	setWindowIcon(icon);
 
-	action_view_sticky_scrolling_->setCheckable(true);
-	action_view_sticky_scrolling_->setChecked(true);
-	action_view_sticky_scrolling_->setShortcut(QKeySequence(Qt::Key_S));
-	action_view_sticky_scrolling_->setObjectName(
-		QString::fromUtf8("actionViewStickyScrolling"));
-	action_view_sticky_scrolling_->setText(tr("&Sticky Scrolling"));
+	view_sticky_scrolling_shortcut_ = new QShortcut(QKeySequence(Qt::Key_S), this, SLOT(on_view_sticky_scrolling_shortcut()));
+	view_sticky_scrolling_shortcut_->setAutoRepeat(false);
 
-	action_view_coloured_bg_->setCheckable(true);
-	action_view_coloured_bg_->setChecked(true);
-	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"));
+	view_show_sampling_points_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Period), this, SLOT(on_view_show_sampling_points_shortcut()));
+	view_show_sampling_points_shortcut_->setAutoRepeat(false);
 
-	action_about_->setObjectName(QString::fromUtf8("actionAbout"));
-	action_about_->setText(tr("&About..."));
+	view_show_analog_minor_grid_shortcut_ = new QShortcut(QKeySequence(Qt::Key_G), this, SLOT(on_view_show_analog_minor_grid_shortcut()));
+	view_show_analog_minor_grid_shortcut_->setAutoRepeat(false);
+
+	view_colored_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_colored_bg_shortcut()));
+	view_colored_bg_shortcut_->setAutoRepeat(false);
 
 	// 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"));
+
+	run_stop_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Space), run_stop_button_, SLOT(click()));
+	run_stop_shortcut_->setAutoRepeat(false);
 
 	settings_button_ = new QToolButton();
-	settings_button_->setIcon(QIcon::fromTheme("configure",
-		QIcon(":/icons/configure.png")));
+	settings_button_->setIcon(QIcon::fromTheme("preferences-system",
+		QIcon(":/icons/preferences-system.png")));
+	settings_button_->setToolTip(tr("Settings"));
 	settings_button_->setAutoRaise(true);
 
 	QFrame *separator1 = new QFrame();
@@ -370,12 +479,19 @@ void MainWindow::setup_ui()
 	session_selector_.setCornerWidget(static_tab_widget_, Qt::TopLeftCorner);
 	session_selector_.setTabsClosable(true);
 
+	close_application_shortcut_ = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), this, SLOT(close()));
+	close_application_shortcut_->setAutoRepeat(false);
+
+	close_current_tab_shortcut_ = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), this, SLOT(on_close_current_tab()));
+
 	connect(new_session_button_, SIGNAL(clicked(bool)),
 		this, SLOT(on_new_session_clicked()));
 	connect(run_stop_button_, SIGNAL(clicked(bool)),
 		this, SLOT(on_run_stop_clicked()));
 	connect(&session_state_mapper_, SIGNAL(mapped(QObject*)),
 		this, SLOT(on_capture_state_changed(QObject*)));
+	connect(settings_button_, SIGNAL(clicked(bool)),
+		this, SLOT(on_settings_clicked()));
 
 	connect(&session_selector_, SIGNAL(tabCloseRequested(int)),
 		this, SLOT(on_tab_close_requested(int)));
@@ -391,38 +507,16 @@ void MainWindow::setup_ui()
 void MainWindow::save_ui_settings()
 {
 	QSettings settings;
-	int id = 0;
 
 	settings.beginGroup("MainWindow");
 	settings.setValue("state", saveState());
 	settings.setValue("geometry", saveGeometry());
 	settings.endGroup();
-
-	for (shared_ptr<Session> session : sessions_) {
-		// Ignore sessions using the demo device or no device at all
-		if (session->device()) {
-			shared_ptr<devices::HardwareDevice> device =
-				dynamic_pointer_cast< devices::HardwareDevice >
-				(session->device());
-
-			if (device &&
-				device->hardware_device()->driver()->name() == "demo")
-				continue;
-
-			settings.beginGroup("Session" + QString::number(id++));
-			settings.remove("");  // Remove all keys in this group
-			session->save_settings(settings);
-			settings.endGroup();
-		}
-	}
-
-	settings.setValue("sessions", id);
 }
 
 void MainWindow::restore_ui_settings()
 {
 	QSettings settings;
-	int i, session_count;
 
 	settings.beginGroup("MainWindow");
 
@@ -433,21 +527,12 @@ void MainWindow::restore_ui_settings()
 		resize(1000, 720);
 
 	settings.endGroup();
-
-	session_count = settings.value("sessions", 0).toInt();
-
-	for (i = 0; i < session_count; i++) {
-		settings.beginGroup("Session" + QString::number(i));
-		shared_ptr<Session> session = add_session();
-		session->restore_settings(settings);
-		settings.endGroup();
-	}
 }
 
-std::shared_ptr<Session> MainWindow::get_tab_session(int index) const
+shared_ptr<Session> MainWindow::get_tab_session(int index) const
 {
 	// Find the session that belongs to the tab's main window
-	for (auto entry : session_windows_)
+	for (auto& entry : session_windows_)
 		if (entry.second == session_selector_.widget(index))
 			return entry.first;
 
@@ -456,8 +541,21 @@ 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();
+		save_sessions();
+		event->accept();
+	}
 }
 
 QMenu* MainWindow::createPopupMenu()
@@ -476,28 +574,11 @@ bool MainWindow::restoreState(const QByteArray &state, int version)
 	return false;
 }
 
-void MainWindow::session_error(const QString text, const QString info_text)
-{
-	QMetaObject::invokeMethod(this, "show_session_error",
-		Qt::QueuedConnection, Q_ARG(QString, text),
-		Q_ARG(QString, info_text));
-}
-
-void MainWindow::show_session_error(const QString text, const QString info_text)
-{
-	QMessageBox msg(this);
-	msg.setText(text);
-	msg.setInformativeText(info_text);
-	msg.setStandardButtons(QMessageBox::Ok);
-	msg.setIcon(QMessageBox::Warning);
-	msg.exec();
-}
-
 void MainWindow::on_add_view(const QString &title, views::ViewType type,
 	Session *session)
 {
 	// We get a pointer and need a reference
-	for (std::shared_ptr<Session> s : sessions_)
+	for (shared_ptr<Session>& s : sessions_)
 		if (s.get() == session)
 			add_view(title, type, *s);
 }
@@ -554,7 +635,7 @@ void MainWindow::on_run_stop_clicked()
 	switch (session->get_capture_state()) {
 	case Session::Stopped:
 		session->start_capture([&](QString message) {
-			session_error("Capture failed", message); });
+			show_session_error("Capture failed", message); });
 		break;
 	case Session::AwaitingTrigger:
 	case Session::Running:
@@ -563,21 +644,35 @@ void MainWindow::on_run_stop_clicked()
 	}
 }
 
+void MainWindow::on_settings_clicked()
+{
+	dialogs::Settings dlg(device_manager_);
+	dlg.exec();
+}
+
 void MainWindow::on_session_name_changed()
 {
 	// Update the corresponding dock widget's name(s)
 	Session *session = qobject_cast<Session*>(QObject::sender());
 	assert(session);
 
-	for (shared_ptr<views::ViewBase> view : session->views()) {
+	for (const shared_ptr<views::ViewBase>& view : session->views()) {
 		// Get the dock that contains the view
-		for (auto entry : view_docks_)
+		for (auto& entry : view_docks_)
 			if (entry.second == view) {
 				entry.first->setObjectName(session->name());
 				entry.first->setWindowTitle(session->name());
 			}
 	}
 
+	// 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);
@@ -603,7 +698,7 @@ void MainWindow::on_capture_state_changed(QObject *obj)
 void MainWindow::on_new_view(Session *session)
 {
 	// We get a pointer and need a reference
-	for (std::shared_ptr<Session> s : sessions_)
+	for (shared_ptr<Session>& s : sessions_)
 		if (s.get() == session)
 			add_view(session->name(), views::ViewTypeTrace, *s);
 }
@@ -612,7 +707,7 @@ void MainWindow::on_view_close_clicked()
 {
 	// Find the dock widget that contains the close button that was clicked
 	QObject *w = QObject::sender();
-	QDockWidget *dock = 0;
+	QDockWidget *dock = nullptr;
 
 	while (w) {
 	    dock = qobject_cast<QDockWidget*>(w);
@@ -624,7 +719,7 @@ void MainWindow::on_view_close_clicked()
 	// Get the view contained in the dock widget
 	shared_ptr<views::ViewBase> view;
 
-	for (auto entry : view_docks_)
+	for (auto& entry : view_docks_)
 		if (entry.first == dock)
 			view = entry.second;
 
@@ -633,12 +728,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);
 	}
 }
 
@@ -652,36 +752,99 @@ 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)
+	if (!session)
+		return;
+
+	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);
 }
 
-void MainWindow::on_actionViewStickyScrolling_triggered()
+void MainWindow::on_view_colored_bg_shortcut()
 {
-	shared_ptr<views::ViewBase> viewbase = get_active_view();
-	views::TraceView::View* view =
-		qobject_cast<views::TraceView::View*>(viewbase.get());
-	if (view)
-		view->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
+	GlobalSettings settings;
+
+	bool state = settings.value(GlobalSettings::Key_View_ColoredBG).toBool();
+	settings.setValue(GlobalSettings::Key_View_ColoredBG, !state);
 }
 
-void MainWindow::on_actionViewColouredBg_triggered()
+void MainWindow::on_view_sticky_scrolling_shortcut()
 {
-	shared_ptr<views::ViewBase> viewbase = get_active_view();
-	views::TraceView::View* view =
-			qobject_cast<views::TraceView::View*>(viewbase.get());
-	if (view)
-		view->enable_coloured_bg(action_view_coloured_bg_->isChecked());
+	GlobalSettings settings;
+
+	bool state = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool();
+	settings.setValue(GlobalSettings::Key_View_StickyScrolling, !state);
 }
 
-void MainWindow::on_actionAbout_triggered()
+void MainWindow::on_view_show_sampling_points_shortcut()
 {
-	dialogs::About dlg(device_manager_.context(), this);
-	dlg.exec();
+	GlobalSettings settings;
+
+	bool state = settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool();
+	settings.setValue(GlobalSettings::Key_View_ShowSamplingPoints, !state);
+}
+
+void MainWindow::on_view_show_analog_minor_grid_shortcut()
+{
+	GlobalSettings settings;
+
+	bool state = settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool();
+	settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, !state);
+}
+
+void MainWindow::on_settingViewColoredBg_changed(const QVariant new_value)
+{
+	bool state = new_value.toBool();
+
+	for (auto& entry : view_docks_) {
+		shared_ptr<views::ViewBase> viewbase = entry.second;
+
+		// Only trace views have this setting
+		views::trace::View* view =
+				qobject_cast<views::trace::View*>(viewbase.get());
+		if (view)
+			view->enable_colored_bg(state);
+	}
+}
+
+void MainWindow::on_settingViewShowSamplingPoints_changed(const QVariant new_value)
+{
+	bool state = new_value.toBool();
+
+	for (auto& entry : view_docks_) {
+		shared_ptr<views::ViewBase> viewbase = entry.second;
+
+		// Only trace views have this setting
+		views::trace::View* view =
+				qobject_cast<views::trace::View*>(viewbase.get());
+		if (view)
+			view->enable_show_sampling_points(state);
+	}
+}
+
+void MainWindow::on_settingViewShowAnalogMinorGrid_changed(const QVariant new_value)
+{
+	bool state = new_value.toBool();
+
+	for (auto& entry : view_docks_) {
+		shared_ptr<views::ViewBase> viewbase = entry.second;
+
+		// Only trace views have this setting
+		views::trace::View* view =
+				qobject_cast<views::trace::View*>(viewbase.get());
+		if (view)
+			view->enable_show_analog_minor_grid(state);
+	}
+}
+
+void MainWindow::on_close_current_tab()
+{
+	int tab = session_selector_.currentIndex();
+
+	on_tab_close_requested(tab);
 }
 
 } // namespace pv