X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=39ce7ed6f4b0034ad3b0adfc7241cdcd76340779;hp=ac5372a6f46d295468699ca95460cbab647720ef;hb=e7aff437662e4a7dc891952bcb632d67c457d689;hpb=3084ed4b15663dd717ff656745db305f377ab215

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index ac5372a6..39ce7ed6 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -27,55 +27,33 @@
 #include <algorithm>
 #include <iterator>
 
-#include <boost/algorithm/string/join.hpp>
-
 #include <QAction>
 #include <QApplication>
-#include <QButtonGroup>
 #include <QCloseEvent>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QMenu>
-#include <QMenuBar>
+#include <QDockWidget>
+#include <QHBoxLayout>
 #include <QSettings>
-#include <QStatusBar>
-#include <QVBoxLayout>
 #include <QWidget>
 
 #include "mainwindow.hpp"
 
 #include "devicemanager.hpp"
+#include "util.hpp"
 #include "devices/hardwaredevice.hpp"
-#include "devices/sessionfile.hpp"
 #include "dialogs/about.hpp"
-#include "dialogs/connect.hpp"
-#include "dialogs/inputoutputoptions.hpp"
-#include "dialogs/storeprogress.hpp"
 #include "toolbars/mainbar.hpp"
-#include "view/logicsignal.hpp"
 #include "view/view.hpp"
-#include "widgets/exportmenu.hpp"
-#ifdef ENABLE_DECODE
-#include "widgets/decodermenu.hpp"
-#endif
-#include "widgets/hidingmenubar.hpp"
 
-#include <inttypes.h>
 #include <stdint.h>
 #include <stdarg.h>
-#include <glib.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;
-using std::vector;
-
-using boost::algorithm::join;
-
-using sigrok::Error;
-using sigrok::OutputFormat;
 
 namespace pv {
 
@@ -83,82 +61,66 @@ namespace view {
 class ViewItem;
 }
 
-const char *MainWindow::SettingOpenDirectory = "MainWindow/OpenDirectory";
-const char *MainWindow::SettingSaveDirectory = "MainWindow/SaveDirectory";
+using toolbars::MainBar;
+
+const QString MainWindow::WindowTitle = tr("PulseView");
 
 MainWindow::MainWindow(DeviceManager &device_manager,
-	const char *open_file_name,
+	string open_file_name, string open_file_format,
 	QWidget *parent) :
 	QMainWindow(parent),
 	device_manager_(device_manager),
-	session_(device_manager),
-	action_open_(new QAction(this)),
-	action_save_as_(new QAction(this)),
-	action_connect_(new QAction(this)),
-	action_quit_(new QAction(this)),
-	action_view_zoom_in_(new QAction(this)),
-	action_view_zoom_out_(new QAction(this)),
-	action_view_zoom_fit_(new QAction(this)),
-	action_view_zoom_one_to_one_(new QAction(this)),
-	action_view_show_cursors_(new QAction(this)),
+	session_selector_(this),
+	action_view_sticky_scrolling_(new QAction(this)),
+	action_view_coloured_bg_(new QAction(this)),
 	action_about_(new QAction(this))
-#ifdef ENABLE_DECODE
-	, menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
-#endif
 {
+	qRegisterMetaType<util::Timestamp>("util::Timestamp");
+
 	setup_ui();
 	restore_ui_settings();
-	if (open_file_name) {
-		const QString s(QString::fromUtf8(open_file_name));
-		QMetaObject::invokeMethod(this, "load_file",
-			Qt::QueuedConnection,
-			Q_ARG(QString, s));
-	}
-}
-
-QAction* MainWindow::action_open() const
-{
-	return action_open_;
-}
 
-QAction* MainWindow::action_save_as() const
-{
-	return action_save_as_;
-}
+	if (!open_file_name.empty()) {
+		shared_ptr<Session> session = add_session();
+		session->main_bar()->load_init_file(open_file_name, open_file_format);
+	}
 
-QAction* MainWindow::action_connect() const
-{
-	return action_connect_;
-}
+	// Add empty default session if there aren't any sessions
+	if (sessions_.size() == 0) {
+		shared_ptr<Session> session = add_session();
 
-QAction* MainWindow::action_quit() const
-{
-	return action_quit_;
-}
+		map<string, string> dev_info;
+		shared_ptr<devices::HardwareDevice> other_device, demo_device;
 
-QAction* MainWindow::action_view_zoom_in() const
-{
-	return action_view_zoom_in_;
-}
+		// 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;
+			}
+		}
 
-QAction* MainWindow::action_view_zoom_out() const
-{
-	return action_view_zoom_out_;
+		// ...and if there isn't any, just use demo then
+		session->main_bar()->select_device(other_device ?
+			other_device : demo_device);
+	}
 }
 
-QAction* MainWindow::action_view_zoom_fit() const
+MainWindow::~MainWindow()
 {
-	return action_view_zoom_fit_;
+	while (!sessions_.empty())
+		remove_session(sessions_.front());
 }
 
-QAction* MainWindow::action_view_zoom_one_to_one() const
+QAction* MainWindow::action_view_sticky_scrolling() const
 {
-	return action_view_zoom_one_to_one_;
+	return action_view_sticky_scrolling_;
 }
 
-QAction* MainWindow::action_view_show_cursors() const
+QAction* MainWindow::action_view_coloured_bg() const
 {
-	return action_view_show_cursors_;
+	return action_view_coloured_bg_;
 }
 
 QAction* MainWindow::action_about() const
@@ -166,298 +128,252 @@ QAction* MainWindow::action_about() const
 	return action_about_;
 }
 
-#ifdef ENABLE_DECODE
-QMenu* MainWindow::menu_decoder_add() const
+shared_ptr<views::ViewBase> MainWindow::get_active_view() const
 {
-	return menu_decoders_add_;
+	// If there's only one view, use it...
+	if (view_docks_.size() == 1)
+		return view_docks_.begin()->second;
+
+	// ...otherwise find the dock widget the widget with focus is contained in
+	QObject *w = QApplication::focusWidget();
+	QDockWidget *dock = 0;
+
+	while (w) {
+	    dock = qobject_cast<QDockWidget*>(w);
+	    if (dock)
+	        break;
+	    w = w->parent();
+	}
+
+	// Get the view contained in the dock widget
+	for (auto entry : view_docks_)
+		if (entry.first == dock)
+			return entry.second;
+
+	return nullptr;
 }
-#endif
 
-void MainWindow::run_stop()
+shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
+	views::ViewType type, Session &session)
 {
-	switch(session_.get_capture_state()) {
-	case Session::Stopped:
-		session_.start_capture([&](QString message) {
-			session_error("Capture failed", message); });
-		break;
-
-	case Session::AwaitingTrigger:
-	case Session::Running:
-		session_.stop_capture();
-		break;
+	QMainWindow *main_window;
+	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);
+
+		// 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
+
+		shared_ptr<views::TraceView::View> v =
+			make_shared<views::TraceView::View>(session, dock_main);
+		view_docks_[dock] = v;
+		session.register_view(v);
+
+		dock_main->setCentralWidget(v.get());
+		dock->setWidget(dock_main);
+
+		dock->setFeatures(QDockWidget::DockWidgetMovable |
+			QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
+
+		QAbstractButton *close_btn =
+			dock->findChildren<QAbstractButton*>
+				("qt_dockwidget_closebutton").front();
+
+		connect(close_btn, SIGNAL(clicked(bool)),
+			this, SLOT(on_view_close_clicked()));
+
+		if (type == views::ViewTypeTrace) {
+			connect(&session, SIGNAL(trigger_event(util::Timestamp)),
+				qobject_cast<views::ViewBase*>(v.get()),
+				SLOT(trigger_event(util::Timestamp)));
+
+			v->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
+			v->enable_coloured_bg(action_view_coloured_bg_->isChecked());
+
+			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(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)));
+		}
+
+		return v;
 	}
+
+	return nullptr;
 }
 
-void MainWindow::select_device(shared_ptr<devices::Device> device)
+shared_ptr<Session> MainWindow::add_session()
 {
-	try {
-		session_.set_device(device);
-	} catch(const QString &e) {
-		QMessageBox msg(this);
-		msg.setText(e);
-		msg.setInformativeText(tr("Failed to Select Device"));
-		msg.setStandardButtons(QMessageBox::Ok);
-		msg.setIcon(QMessageBox::Warning);
-		msg.exec();
-	}
+	static int last_session_id = 1;
+	QString name = tr("Untitled-%1").arg(last_session_id++);
+
+	shared_ptr<Session> session = make_shared<Session>(device_manager_, name);
+
+	connect(session.get(), SIGNAL(add_view(const QString&, views::ViewType, Session*)),
+		this, SLOT(on_add_view(const QString&, views::ViewType, Session*)));
+	connect(session.get(), SIGNAL(name_changed()),
+		this, SLOT(on_session_name_changed()));
+
+	sessions_.push_back(session);
+
+	QMainWindow *window = new QMainWindow();
+	window->setWindowFlags(Qt::Widget);  // Remove Qt::Window flag
+	session_windows_[session] = window;
+	session_selector_.addTab(window, name);
+
+	window->setDockNestingEnabled(true);
+
+	shared_ptr<views::ViewBase> main_view =
+		add_view(name, views::ViewTypeTrace, *session);
+
+	return session;
 }
 
-void MainWindow::export_file(shared_ptr<OutputFormat> format)
+void MainWindow::remove_session(shared_ptr<Session> session)
 {
-	using pv::dialogs::StoreProgress;
+	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 any currently running capture session
-	session_.stop_capture();
+				// 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);
 
-	QSettings settings;
-	const QString dir = settings.value(SettingSaveDirectory).toString();
-
-	// Construct the filter
-	const vector<string> exts = format->extensions();
-	QString filter = tr("%1 files ").arg(
-		QString::fromStdString(format->description()));
-
-	if (exts.empty())
-		filter += "(*.*)";
-	else
-		filter += QString("(*.%1);;%2 (*.*)").arg(
-			QString::fromStdString(join(exts, ", *."))).arg(
-			tr("All Files"));
-
-	// Show the file dialog
-	const QString file_name = QFileDialog::getSaveFileName(
-		this, tr("Save File"), dir, filter);
-
-	if (file_name.isEmpty())
-		return;
-
-	const QString abs_path = QFileInfo(file_name).absolutePath();
-	settings.setValue(SettingSaveDirectory, abs_path);
-
-	// Show the options dialog
-	map<string, Glib::VariantBase> options;
-	if (!format->options().empty()) {
-		dialogs::InputOutputOptions dlg(
-			tr("Export %1").arg(QString::fromStdString(
-				format->description())),
-			format->options(), this);
-		if (!dlg.exec())
-			return;
-		options = dlg.options();
+				// Remove this entry from the container
+				view_docks_.erase(entry.first);
+			}
 	}
 
-	StoreProgress *dlg = new StoreProgress(file_name, format, options,
-		session_, this);
-	dlg->run();
+	QMainWindow *window = session_windows_.at(session);
+	session_selector_.removeTab(session_selector_.indexOf(window));
+
+	session_windows_.erase(session);
+
+	sessions_.remove_if([&](shared_ptr<Session> s) {
+		return s == session; });
+
+	// Update the window title if there is no view left to
+	// generate focus change events
+	if (sessions_.empty())
+		setWindowTitle(WindowTitle);
 }
 
 void MainWindow::setup_ui()
 {
 	setObjectName(QString::fromUtf8("MainWindow"));
 
+	setCentralWidget(&session_selector_);
+
 	// Set the window icon
 	QIcon icon;
-	icon.addFile(QString(":/icons/sigrok-logo-notext.svg"));
+	icon.addFile(QString(":/icons/sigrok-logo-notext.png"));
 	setWindowIcon(icon);
 
-	// Setup the central widget
-	central_widget_ = new QWidget(this);
-	vertical_layout_ = new QVBoxLayout(central_widget_);
-	vertical_layout_->setSpacing(6);
-	vertical_layout_->setContentsMargins(0, 0, 0, 0);
-	setCentralWidget(central_widget_);
-
-	view_ = new pv::view::View(session_, this);
-
-	vertical_layout_->addWidget(view_);
-
-	// Setup the menu bar
-	pv::widgets::HidingMenuBar *const menu_bar =
-		new pv::widgets::HidingMenuBar(this);
-
-	// File Menu
-	QMenu *const menu_file = new QMenu;
-	menu_file->setTitle(tr("&File"));
-
-	action_open_->setText(tr("&Open..."));
-	action_open_->setIcon(QIcon::fromTheme("document-open",
-		QIcon(":/icons/document-open.png")));
-	action_open_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_O));
-	action_open_->setObjectName(QString::fromUtf8("actionOpen"));
-	menu_file->addAction(action_open_);
-
-	action_save_as_->setText(tr("&Save As..."));
-	action_save_as_->setIcon(QIcon::fromTheme("document-save-as",
-		QIcon(":/icons/document-save-as.png")));
-	action_save_as_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_S));
-	action_save_as_->setObjectName(QString::fromUtf8("actionSaveAs"));
-	menu_file->addAction(action_save_as_);
-
-	menu_file->addSeparator();
-
-	widgets::ExportMenu *menu_file_export = new widgets::ExportMenu(this,
-		device_manager_.context());
-	menu_file_export->setTitle(tr("&Export"));
-	connect(menu_file_export,
-		SIGNAL(format_selected(std::shared_ptr<sigrok::OutputFormat>)),
-		this, SLOT(export_file(std::shared_ptr<sigrok::OutputFormat>)));
-	menu_file->addAction(menu_file_export->menuAction());
-
-	menu_file->addSeparator();
-
-	action_connect_->setText(tr("&Connect to Device..."));
-	action_connect_->setObjectName(QString::fromUtf8("actionConnect"));
-	menu_file->addAction(action_connect_);
-
-	menu_file->addSeparator();
-
-	action_quit_->setText(tr("&Quit"));
-	action_quit_->setIcon(QIcon::fromTheme("application-exit",
-		QIcon(":/icons/application-exit.png")));
-	action_quit_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
-	action_quit_->setObjectName(QString::fromUtf8("actionQuit"));
-	menu_file->addAction(action_quit_);
-
-	// View Menu
-	QMenu *menu_view = new QMenu;
-	menu_view->setTitle(tr("&View"));
-
-	action_view_zoom_in_->setText(tr("Zoom &In"));
-	action_view_zoom_in_->setIcon(QIcon::fromTheme("zoom-in",
-		QIcon(":/icons/zoom-in.png")));
-	// simply using Qt::Key_Plus shows no + in the menu
-	action_view_zoom_in_->setShortcut(QKeySequence::ZoomIn);
-	action_view_zoom_in_->setObjectName(
-		QString::fromUtf8("actionViewZoomIn"));
-	menu_view->addAction(action_view_zoom_in_);
-
-	action_view_zoom_out_->setText(tr("Zoom &Out"));
-	action_view_zoom_out_->setIcon(QIcon::fromTheme("zoom-out",
-		QIcon(":/icons/zoom-out.png")));
-	action_view_zoom_out_->setShortcut(QKeySequence::ZoomOut);
-	action_view_zoom_out_->setObjectName(
-		QString::fromUtf8("actionViewZoomOut"));
-	menu_view->addAction(action_view_zoom_out_);
-
-	action_view_zoom_fit_->setText(tr("Zoom to &Fit"));
-	action_view_zoom_fit_->setIcon(QIcon::fromTheme("zoom-fit",
-		QIcon(":/icons/zoom-fit.png")));
-	action_view_zoom_fit_->setShortcut(QKeySequence(Qt::Key_F));
-	action_view_zoom_fit_->setObjectName(
-		QString::fromUtf8("actionViewZoomFit"));
-	menu_view->addAction(action_view_zoom_fit_);
-
-	action_view_zoom_one_to_one_->setText(tr("Zoom to O&ne-to-One"));
-	action_view_zoom_one_to_one_->setIcon(QIcon::fromTheme("zoom-original",
-		QIcon(":/icons/zoom-original.png")));
-	action_view_zoom_one_to_one_->setShortcut(QKeySequence(Qt::Key_O));
-	action_view_zoom_one_to_one_->setObjectName(
-		QString::fromUtf8("actionViewZoomOneToOne"));
-	menu_view->addAction(action_view_zoom_one_to_one_);
-
-	menu_view->addSeparator();
-
-	action_view_show_cursors_->setCheckable(true);
-	action_view_show_cursors_->setChecked(view_->cursors_shown());
-	action_view_show_cursors_->setIcon(QIcon::fromTheme("show-cursors",
-		QIcon(":/icons/show-cursors.svg")));
-	action_view_show_cursors_->setShortcut(QKeySequence(Qt::Key_C));
-	action_view_show_cursors_->setObjectName(
-		QString::fromUtf8("actionViewShowCursors"));
-	action_view_show_cursors_->setText(tr("Show &Cursors"));
-	menu_view->addAction(action_view_show_cursors_);
-
-	// Decoders Menu
-#ifdef ENABLE_DECODE
-	QMenu *const menu_decoders = new QMenu;
-	menu_decoders->setTitle(tr("&Decoders"));
-
-	menu_decoders_add_->setTitle(tr("&Add"));
-	connect(menu_decoders_add_, SIGNAL(decoder_selected(srd_decoder*)),
-		this, SLOT(add_decoder(srd_decoder*)));
-
-	menu_decoders->addMenu(menu_decoders_add_);
-#endif
+	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"));
 
-	// Help Menu
-	QMenu *const menu_help = new QMenu;
-	menu_help->setTitle(tr("&Help"));
+	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"));
 
 	action_about_->setObjectName(QString::fromUtf8("actionAbout"));
 	action_about_->setText(tr("&About..."));
-	menu_help->addAction(action_about_);
 
-	menu_bar->addAction(menu_file->menuAction());
-	menu_bar->addAction(menu_view->menuAction());
-#ifdef ENABLE_DECODE
-	menu_bar->addAction(menu_decoders->menuAction());
-#endif
-	menu_bar->addAction(menu_help->menuAction());
+	// 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_->setAutoRaise(true);
+
+	QHBoxLayout* layout = new QHBoxLayout();
+	layout->setContentsMargins(2, 2, 2, 2);
+	layout->addWidget(new_session_button_);
 
-	setMenuBar(menu_bar);
-	QMetaObject::connectSlotsByName(this);
+	QWidget* static_tab_widget_ = new QWidget();
+	static_tab_widget_->setLayout(layout);
 
-	// Setup the toolbar
-	main_bar_ = new toolbars::MainBar(session_, *this);
+	session_selector_.setCornerWidget(static_tab_widget_, Qt::TopLeftCorner);
 
-	// Populate the device list and select the initially selected device
-	update_device_list();
+	session_selector_.setTabsClosable(true);
 
-	addToolBar(main_bar_);
+	connect(new_session_button_, SIGNAL(clicked(bool)),
+		this, SLOT(on_new_session_clicked()));
 
-	// Set the title
-	setWindowTitle(tr("PulseView"));
+	connect(&session_selector_, SIGNAL(tabCloseRequested(int)),
+		this, SLOT(on_tab_close_requested(int)));
+	connect(&session_selector_, SIGNAL(currentChanged(int)),
+		this, SLOT(on_tab_changed(int)));
 
-	// Setup session_ events
-	connect(&session_, SIGNAL(capture_state_changed(int)), this,
-		SLOT(capture_state_changed(int)));
-	connect(&session_, SIGNAL(device_selected()), this,
-		SLOT(device_selected()));
+
+	connect(static_cast<QApplication *>(QCoreApplication::instance()),
+		SIGNAL(focusChanged(QWidget*, QWidget*)),
+		this, SLOT(on_focus_changed()));
 }
 
 void MainWindow::save_ui_settings()
 {
 	QSettings settings;
-
-	map<string, string> dev_info;
-	list<string> key_list;
+	int id = 0;
 
 	settings.beginGroup("MainWindow");
 	settings.setValue("state", saveState());
 	settings.setValue("geometry", saveGeometry());
 	settings.endGroup();
 
-	if (session_.device()) {
-		settings.beginGroup("Device");
-		key_list.push_back("vendor");
-		key_list.push_back("model");
-		key_list.push_back("version");
-		key_list.push_back("serial_num");
-		key_list.push_back("connection_id");
-
-		dev_info = device_manager_.get_device_info(
-			session_.device());
-
-		for (string key : key_list) {
-
-			if (dev_info.count(key))
-				settings.setValue(QString::fromUtf8(key.c_str()),
-						QString::fromUtf8(dev_info.at(key).c_str()));
-			else
-				settings.remove(QString::fromUtf8(key.c_str()));
+	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.endGroup();
 	}
+
+	settings.setValue("sessions", id);
 }
 
 void MainWindow::restore_ui_settings()
 {
 	QSettings settings;
-
-	map<string, string> dev_info;
-	list<string> key_list;
-	string value;
+	int i, session_count;
 
 	settings.beginGroup("MainWindow");
 
@@ -469,45 +385,24 @@ void MainWindow::restore_ui_settings()
 
 	settings.endGroup();
 
-	// Re-select last used device if possible.
-	settings.beginGroup("Device");
-	key_list.push_back("vendor");
-	key_list.push_back("model");
-	key_list.push_back("version");
-	key_list.push_back("serial_num");
-	key_list.push_back("connection_id");
-
-	for (string key : key_list) {
-		if (!settings.contains(QString::fromUtf8(key.c_str())))
-			continue;
-
-		value = settings.value(QString::fromUtf8(key.c_str())).toString().toStdString();
-
-		if (value.size() > 0)
-			dev_info.insert(std::make_pair(key, value));
-	}
+	session_count = settings.value("sessions", 0).toInt();
 
-	const shared_ptr<devices::HardwareDevice> device =
-		device_manager_.find_device_from_info(dev_info);
-	if (device) {
-		select_device(device);
-		update_device_list();
+	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();
 	}
-
-	settings.endGroup();
 }
 
-void MainWindow::session_error(
-	const QString text, const QString info_text)
+std::shared_ptr<Session> MainWindow::get_tab_session(int index) const
 {
-	QMetaObject::invokeMethod(this, "show_session_error",
-		Qt::QueuedConnection, Q_ARG(QString, text),
-		Q_ARG(QString, info_text));
-}
+	// Find the session that belongs to the tab's main window
+	for (auto entry : session_windows_)
+		if (entry.second == session_selector_.widget(index))
+			return entry.first;
 
-void MainWindow::update_device_list()
-{
-	main_bar_->update_device_list();
+	return nullptr;
 }
 
 void MainWindow::closeEvent(QCloseEvent *event)
@@ -516,155 +411,175 @@ void MainWindow::closeEvent(QCloseEvent *event)
 	event->accept();
 }
 
-void MainWindow::keyReleaseEvent(QKeyEvent *event)
+QMenu* MainWindow::createPopupMenu()
 {
-	if (event->key() == Qt::Key_Alt) {
-		menuBar()->setHidden(!menuBar()->isHidden());
-		menuBar()->setFocus();
-	}
-	QMainWindow::keyReleaseEvent(event);
+	return nullptr;
 }
 
-void MainWindow::load_file(QString file_name)
+bool MainWindow::restoreState(const QByteArray &state, int version)
 {
-	const QString errorMessage(
-		QString("Failed to load file %1").arg(file_name));
-	const QString infoMessage;
-
-	try {
-		session_.set_device(
-			shared_ptr<devices::Device>(new devices::SessionFile(
-				device_manager_.context(),
-				file_name.toStdString())));
-	} catch(Error e) {
-		show_session_error(tr("Failed to load ") + file_name, e.what());
-		session_.set_default_device();
-		update_device_list();
-		return;
-	}
+	(void)state;
+	(void)version;
 
-	update_device_list();
+	// Do nothing. We don't want Qt to handle this, or else it
+	// will try to restore all the dock widgets and create havoc.
 
-	session_.start_capture([&, errorMessage, infoMessage](QString) {
-		session_error(errorMessage, infoMessage); });
+	return false;
 }
 
-void MainWindow::show_session_error(
-	const QString text, const QString info_text)
+void MainWindow::on_add_view(const QString &title, views::ViewType type,
+	Session *session)
 {
-	QMessageBox msg(this);
-	msg.setText(text);
-	msg.setInformativeText(info_text);
-	msg.setStandardButtons(QMessageBox::Ok);
-	msg.setIcon(QMessageBox::Warning);
-	msg.exec();
+	// We get a pointer and need a reference
+	for (std::shared_ptr<Session> s : sessions_)
+		if (s.get() == session)
+			add_view(title, type, *s);
 }
 
-void MainWindow::on_actionOpen_triggered()
+void MainWindow::on_focus_changed()
 {
-	QSettings settings;
-	const QString dir = settings.value(SettingOpenDirectory).toString();
+	static shared_ptr<Session> prev_session;
 
-	// Show the dialog
-	const QString file_name = QFileDialog::getOpenFileName(
-		this, tr("Open File"), dir, tr(
-			"Sigrok Sessions (*.sr);;"
-			"All Files (*.*)"));
+	shared_ptr<views::ViewBase> view = get_active_view();
 
-	if (!file_name.isEmpty()) {
-		load_file(file_name);
+	if (view) {
+		for (shared_ptr<Session> session : sessions_) {
+			if (session->has_view(view)) {
+				if (session != prev_session) {
+					// Activate correct tab if necessary
+					shared_ptr<Session> tab_session = get_tab_session(
+						session_selector_.currentIndex());
+					if (tab_session != session)
+						session_selector_.setCurrentWidget(
+							session_windows_.at(session));
 
-		const QString abs_path = QFileInfo(file_name).absolutePath();
-		settings.setValue(SettingOpenDirectory, abs_path);
+					on_focused_session_changed(session);
+				}
+
+				prev_session = session;
+				break;
+			}
+		}
 	}
+
+	if (sessions_.empty())
+		setWindowTitle(WindowTitle);
 }
 
-void MainWindow::on_actionSaveAs_triggered()
+void MainWindow::on_focused_session_changed(shared_ptr<Session> session)
 {
-	export_file(device_manager_.context()->output_formats()["srzip"]);
+	setWindowTitle(session->name() + " - " + WindowTitle);
 }
 
-void MainWindow::on_actionConnect_triggered()
+void MainWindow::on_new_session_clicked()
 {
-	// Stop any currently running capture session
-	session_.stop_capture();
+	add_session();
+}
 
-	dialogs::Connect dlg(this, device_manager_);
+void MainWindow::on_session_name_changed()
+{
+	// Update the corresponding dock widget's name(s)
+	Session *session = qobject_cast<Session*>(QObject::sender());
+	assert(session);
 
-	// If the user selected a device, select it in the device list. Select the
-	// current device otherwise.
-	if (dlg.exec())
-		select_device(dlg.get_selected_device());
+	for (shared_ptr<views::ViewBase> view : session->views()) {
+		// Get the dock that contains the view
+		for (auto entry : view_docks_)
+			if (entry.second == view) {
+				entry.first->setObjectName(session->name());
+				entry.first->setWindowTitle(session->name());
+			}
+	}
 
-	update_device_list();
-}
+	// Refresh window title if the affected session has focus
+	shared_ptr<views::ViewBase> view = get_active_view();
 
-void MainWindow::on_actionQuit_triggered()
-{
-	close();
+	if (view && session->has_view(view))
+		setWindowTitle(session->name() + " - " + WindowTitle);
 }
 
-void MainWindow::on_actionViewZoomIn_triggered()
+void MainWindow::on_new_view(Session *session)
 {
-	view_->zoom(1);
+	// We get a pointer and need a reference
+	for (std::shared_ptr<Session> s : sessions_)
+		if (s.get() == session)
+			add_view(session->name(), views::ViewTypeTrace, *s);
 }
 
-void MainWindow::on_actionViewZoomOut_triggered()
+void MainWindow::on_view_close_clicked()
 {
-	view_->zoom(-1);
-}
+	// Find the dock widget that contains the close button that was clicked
+	QObject *w = QObject::sender();
+	QDockWidget *dock = 0;
 
-void MainWindow::on_actionViewZoomFit_triggered()
-{
-	view_->zoom_fit();
-}
+	while (w) {
+	    dock = qobject_cast<QDockWidget*>(w);
+	    if (dock)
+	        break;
+	    w = w->parent();
+	}
 
-void MainWindow::on_actionViewZoomOneToOne_triggered()
-{
-	view_->zoom_one_to_one();
-}
+	// Get the view contained in the dock widget
+	shared_ptr<views::ViewBase> view;
 
-void MainWindow::on_actionViewShowCursors_triggered()
-{
-	assert(view_);
+	for (auto entry : view_docks_)
+		if (entry.first == dock)
+			view = entry.second;
 
-	const bool show = !view_->cursors_shown();
-	if(show)
-		view_->centre_cursors();
+	// Deregister the view
+	for (shared_ptr<Session> session : sessions_) {
+		if (!session->has_view(view))
+			continue;
 
-	view_->show_cursors(show);
+		// Also destroy the entire session if its main view is closing
+		if (view == session->main_view()) {
+			remove_session(session);
+			break;
+		} else
+			session->deregister_view(view);
+	}
 }
 
-void MainWindow::on_actionAbout_triggered()
+void MainWindow::on_tab_changed(int index)
 {
-	dialogs::About dlg(device_manager_.context(), this);
-	dlg.exec();
+	shared_ptr<Session> session = get_tab_session(index);
+
+	if (session)
+		on_focused_session_changed(session);
 }
 
-void MainWindow::add_decoder(srd_decoder *decoder)
+void MainWindow::on_tab_close_requested(int index)
 {
-#ifdef ENABLE_DECODE
-	assert(decoder);
-	session_.add_decoder(decoder);
-#else
-	(void)decoder;
-#endif
+	// TODO Ask user if this is intended in case data is unsaved
+
+	shared_ptr<Session> session = get_tab_session(index);
+
+	if (session)
+		remove_session(session);
 }
 
-void MainWindow::capture_state_changed(int state)
+void MainWindow::on_actionViewStickyScrolling_triggered()
 {
-	main_bar_->set_capture_state((pv::Session::capture_state)state);
+	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());
 }
 
-void MainWindow::device_selected()
+void MainWindow::on_actionViewColouredBg_triggered()
 {
-	// Set the title to include the device/file name
-	const shared_ptr<devices::Device> device = session_.device();
-	if (!device)
-		return;
+	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());
+}
 
-	const string display_name = device->display_name(device_manager_);
-	setWindowTitle(tr("%1 - PulseView").arg(display_name.c_str()));
+void MainWindow::on_actionAbout_triggered()
+{
+	dialogs::About dlg(device_manager_.context(), this);
+	dlg.exec();
 }
 
 } // namespace pv