X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=ddc2c8f0435c798039ab369830a3368c148a23dc;hp=f8463257b5b882531692abc3c0ab4803efdcfa64;hb=45cb64fff7ebf16381bb567e33c22a9ff6f78cd8;hpb=0f8f8c180b32413177f3940ea6f216d1cbadf09b

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index f8463257..ddc2c8f0 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>
@@ -31,21 +30,27 @@
 #include <QApplication>
 #include <QCloseEvent>
 #include <QDockWidget>
+#include <QHBoxLayout>
+#include <QMessageBox>
 #include <QSettings>
 #include <QWidget>
+#include <QShortcut>
 
 #include "mainwindow.hpp"
 
 #include "devicemanager.hpp"
 #include "util.hpp"
+#include "devices/hardwaredevice.hpp"
 #include "dialogs/about.hpp"
 #include "toolbars/mainbar.hpp"
 #include "view/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;
@@ -60,42 +65,60 @@ class ViewItem;
 
 using toolbars::MainBar;
 
+const QString MainWindow::WindowTitle = tr("PulseView");
+
 MainWindow::MainWindow(DeviceManager &device_manager,
 	string open_file_name, string open_file_format,
 	QWidget *parent) :
 	QMainWindow(parent),
 	device_manager_(device_manager),
-	session_(device_manager),
-	open_file_name_(open_file_name),
-	open_file_format_(open_file_format),
+	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))
+	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");
 
 	setup_ui();
 	restore_ui_settings();
-}
 
-MainWindow::~MainWindow()
-{
-	for (auto entry : view_docks_) {
+	if (!open_file_name.empty()) {
+		shared_ptr<Session> session = add_session();
+		session->load_init_file(open_file_name, open_file_format);
+	}
 
-		const std::shared_ptr<QDockWidget> dock = entry.first;
+	// Add empty default session if there aren't any sessions
+	if (sessions_.size() == 0) {
+		shared_ptr<Session> session = add_session();
 
-		// Remove view from the dock widget's QMainWindow
-		QMainWindow *dock_main = dynamic_cast<QMainWindow*>(dock->widget());
-		dock_main->setCentralWidget(0);
+		map<string, string> dev_info;
+		shared_ptr<devices::HardwareDevice> other_device, demo_device;
 
-		// Remove the QMainWindow
-		dock->setWidget(0);
+		// 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;
+			}
+		}
 
-		const std::shared_ptr<pv::view::View> view = entry.second;
-		session_.deregister_view(view);
+		// ...and if there isn't any, just use demo then
+		session->select_device(other_device ? other_device : demo_device);
 	}
 }
 
+MainWindow::~MainWindow()
+{
+	while (!sessions_.empty())
+		remove_session(sessions_.front());
+}
+
 QAction* MainWindow::action_view_sticky_scrolling() const
 {
 	return action_view_sticky_scrolling_;
@@ -111,7 +134,7 @@ QAction* MainWindow::action_about() const
 	return action_about_;
 }
 
-shared_ptr<pv::view::View> MainWindow::get_active_view() const
+shared_ptr<views::ViewBase> MainWindow::get_active_view() const
 {
 	// If there's only one view, use it...
 	if (view_docks_.size() == 1)
@@ -130,27 +153,33 @@ shared_ptr<pv::view::View> MainWindow::get_active_view() const
 
 	// Get the view contained in the dock widget
 	for (auto entry : view_docks_)
-		if (entry.first.get() == dock)
+		if (entry.first == dock)
 			return entry.second;
 
-	return shared_ptr<pv::view::View>();
+	return nullptr;
 }
 
-shared_ptr<pv::view::View> MainWindow::add_view(const QString &title,
-	view::ViewType type, Session &session)
+shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
+	views::ViewType type, Session &session)
 {
-	shared_ptr<pv::view::View> v;
+	QMainWindow *main_window = nullptr;
+	for (auto entry : session_windows_)
+		if (entry.first.get() == &session)
+			main_window = entry.second;
+
+	assert(main_window);
 
-	if (type == pv::view::TraceView) {
-		shared_ptr<QDockWidget> dock = make_shared<QDockWidget>(title, this);
+	if (type == views::ViewTypeTrace) {
+		QDockWidget* dock = new QDockWidget(title, main_window);
 		dock->setObjectName(title);
-		addDockWidget(Qt::TopDockWidgetArea, dock.get());
+		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.get());
+		QMainWindow *dock_main = new QMainWindow(dock);
 		dock_main->setWindowFlags(Qt::Widget);  // Remove Qt::Window flag
 
-		v = make_shared<pv::view::View>(session, dock_main);
+		shared_ptr<views::TraceView::View> v =
+			make_shared<views::TraceView::View>(session, dock_main);
 		view_docks_[dock] = v;
 		session.register_view(v);
 
@@ -158,40 +187,158 @@ shared_ptr<pv::view::View> MainWindow::add_view(const QString &title,
 		dock->setWidget(dock_main);
 
 		dock->setFeatures(QDockWidget::DockWidgetMovable |
-			QDockWidget::DockWidgetFloatable);
+			QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
 
-		if (type == view::TraceView) {
-			connect(&session, SIGNAL(trigger_event(util::Timestamp)), v.get(),
+		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)));
-			connect(v.get(), SIGNAL(sticky_scrolling_changed(bool)), this,
-				SLOT(sticky_scrolling_changed(bool)));
-			connect(v.get(), SIGNAL(always_zoom_to_fit_changed(bool)), this,
-				SLOT(always_zoom_to_fit_changed(bool)));
 
 			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,
-					open_file_name_, open_file_format_);
+				/* 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);
 
-				open_file_name_.clear();
-				open_file_format_.clear();
+				connect(main_bar.get(), SIGNAL(new_view(Session*)),
+					this, SLOT(on_new_view(Session*)));
+
+				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());
 			}
-			main_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
 		}
+
+		return v;
+	}
+
+	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;
+	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()));
+	session_state_mapper_.setMapping(session.get(), session.get());
+	connect(session.get(), SIGNAL(capture_state_changed(int)),
+		&session_state_mapper_, SLOT(map()));
+
+	sessions_.push_back(session);
+
+	QMainWindow *window = new QMainWindow();
+	window->setWindowFlags(Qt::Widget);  // Remove Qt::Window flag
+	session_windows_[session] = window;
+
+	int index = session_selector_.addTab(window, name);
+	session_selector_.setCurrentIndex(index);
+	last_focused_session_ = session;
 
-	return v;
+	window->setDockNestingEnabled(true);
+
+	shared_ptr<views::ViewBase> main_view =
+		add_view(name, views::ViewTypeTrace, *session);
+
+	return session;
+}
+
+void MainWindow::remove_session(shared_ptr<Session> session)
+{
+	int h = new_session_button_->height();
+
+	for (shared_ptr<views::ViewBase> view : session->views())
+		remove_view(view);
+
+	QMainWindow *window = session_windows_.at(session);
+	session_selector_.removeTab(session_selector_.indexOf(window));
+
+	session_windows_.erase(session);
+
+	if (last_focused_session_ == session)
+		last_focused_session_.reset();
+
+	sessions_.remove_if([&](shared_ptr<Session> s) {
+		return s == session; });
+
+	if (sessions_.empty()) {
+		// When there are no more tabs, the height of the QTabWidget
+		// drops to zero. We must prevent this to keep the static
+		// widgets visible
+		for (QWidget *w : static_tab_widget_->findChildren<QWidget*>())
+			w->setMinimumHeight(h);
+
+		int margin = static_tab_widget_->layout()->contentsMargins().bottom();
+		static_tab_widget_->setMinimumHeight(h + 2 * margin);
+		session_selector_.setMinimumHeight(h + 2 * margin);
+
+		// Update the window title if there is no view left to
+		// generate focus change events
+		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.png"));
@@ -209,57 +356,104 @@ 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..."));
-
-	// Set up the initial view
-	shared_ptr<view::View> main_view =
-		add_view(tr("Untitled"), pv::view::TraceView, session_);
-
-	// Set the title
-	setWindowTitle(tr("PulseView"));
+	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_->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_->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);
+
+	session_selector_.setCornerWidget(static_tab_widget_, Qt::TopLeftCorner);
+	session_selector_.setTabsClosable(true);
+
+	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(&session_selector_, SIGNAL(tabCloseRequested(int)),
+		this, SLOT(on_tab_close_requested(int)));
+	connect(&session_selector_, SIGNAL(currentChanged(int)),
+		this, SLOT(on_tab_changed(int)));
+
+
+	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;
+	int i, session_count;
 
 	settings.beginGroup("MainWindow");
 
@@ -270,12 +464,43 @@ 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
+{
+	// 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;
+
+	return nullptr;
 }
 
 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()
@@ -294,16 +519,219 @@ 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_)
+		if (s.get() == session)
+			add_view(title, type, *s);
+}
+
+void MainWindow::on_focus_changed()
+{
+	shared_ptr<views::ViewBase> view = get_active_view();
+
+	if (view) {
+		for (shared_ptr<Session> session : sessions_) {
+			if (session->has_view(view)) {
+				if (session != last_focused_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));
+
+					on_focused_session_changed(session);
+				}
+
+				break;
+			}
+		}
+	}
+
+	if (sessions_.empty())
+		setWindowTitle(WindowTitle);
+}
+
+void MainWindow::on_focused_session_changed(shared_ptr<Session> session)
+{
+	last_focused_session_ = session;
+
+	setWindowTitle(session->name() + " - " + WindowTitle);
+
+	// Update the state of the run/stop button, too
+	on_capture_state_changed(session.get());
+}
+
+void MainWindow::on_new_session_clicked()
+{
+	add_session();
+}
+
+void MainWindow::on_run_stop_clicked()
+{
+	shared_ptr<Session> session = last_focused_session_;
+
+	if (!session)
+		return;
+
+	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;
+	}
+}
+
+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()) {
+		// 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 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);
+}
+
+void MainWindow::on_capture_state_changed(QObject *obj)
+{
+	Session *caller = qobject_cast<Session*>(obj);
+
+	// Ignore if caller is not the currently focused session
+	// unless there is only one session
+	if ((sessions_.size() > 1) && (caller != last_focused_session_.get()))
+		return;
+
+	int state = caller->get_capture_state();
+
+	const QIcon *icons[] = {&icon_grey_, &icon_red_, &icon_green_};
+	run_stop_button_->setIcon(*icons[state]);
+	run_stop_button_->setText((state == pv::Session::Stopped) ?
+		tr("Run") : tr("Stop"));
+}
+
+void MainWindow::on_new_view(Session *session)
+{
+	// 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_view_close_clicked()
+{
+	// Find the dock widget that contains the close button that was clicked
+	QObject *w = QObject::sender();
+	QDockWidget *dock = 0;
+
+	while (w) {
+	    dock = qobject_cast<QDockWidget*>(w);
+	    if (dock)
+	        break;
+	    w = w->parent();
+	}
+
+	// Get the view contained in the dock widget
+	shared_ptr<views::ViewBase> view;
+
+	for (auto entry : view_docks_)
+		if (entry.first == dock)
+			view = entry.second;
+
+	// Deregister the view
+	for (shared_ptr<Session> session : sessions_) {
+		if (!session->has_view(view))
+			continue;
+
+		// Also destroy the entire session if its main view is closing...
+		if (view == session->main_view()) {
+			// ...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
+			// All other views can be closed at any time as no data will be lost
+			remove_view(view);
+	}
+}
+
+void MainWindow::on_tab_changed(int index)
+{
+	shared_ptr<Session> session = get_tab_session(index);
+
+	if (session)
+		on_focused_session_changed(session);
+}
+
+void MainWindow::on_tab_close_requested(int index)
+{
+	shared_ptr<Session> session = get_tab_session(index);
+
+	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);
+}
+
 void MainWindow::on_actionViewStickyScrolling_triggered()
 {
-	shared_ptr<pv::view::View> view = get_active_view();
+	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::on_actionViewColouredBg_triggered()
 {
-	shared_ptr<pv::view::View> view = get_active_view();
+	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());
 }