]> sigrok.org Git - pulseview.git/blobdiff - pv/mainwindow.cpp
MainWindow: Fix crash on closing last session
[pulseview.git] / pv / mainwindow.cpp
index 21b66b534f59119b492b6be69bb049c094389768..a8f093bccd6eb051c533452b3e86b490625b2bff 100644 (file)
 
 #include <QAction>
 #include <QApplication>
-#include <QButtonGroup>
 #include <QCloseEvent>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QMenu>
-#include <QMenuBar>
+#include <QDockWidget>
 #include <QSettings>
-#include <QStatusBar>
-#include <QVBoxLayout>
 #include <QWidget>
 
 #include "mainwindow.hpp"
 
 #include "devicemanager.hpp"
+#include "util.hpp"
+#include "devices/hardwaredevice.hpp"
 #include "dialogs/about.hpp"
-#include "dialogs/connect.hpp"
-#include "dialogs/storeprogress.hpp"
 #include "toolbars/mainbar.hpp"
-#include "view/logicsignal.hpp"
 #include "view/view.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 <libsigrok/libsigrok.hpp>
+#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 sigrok::Device;
-using sigrok::Error;
-using sigrok::HardwareDevice;
-
 namespace pv {
 
 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)),
-       action_about_(new QAction(this)),
-       menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
+       action_view_sticky_scrolling_(new QAction(this)),
+       action_view_coloured_bg_(new QAction(this)),
+       action_about_(new QAction(this))
 {
+       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));
+
+       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_open() const
-{
-       return action_open_;
-}
+       // Add empty default session if there aren't any sessions
+       if (sessions_.size() == 0) {
+               shared_ptr<Session> session = add_session();
 
-QAction* MainWindow::action_save_as() const
-{
-       return action_save_as_;
-}
+               map<string, string> dev_info;
+               shared_ptr<devices::HardwareDevice> other_device, demo_device;
 
-QAction* MainWindow::action_connect() const
-{
-       return action_connect_;
-}
+               // 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_quit() const
-{
-       return action_quit_;
+               // ...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_in() const
+MainWindow::~MainWindow()
 {
-       return action_view_zoom_in_;
-}
+       for (auto entry : view_docks_) {
 
-QAction* MainWindow::action_view_zoom_out() const
-{
-       return action_view_zoom_out_;
-}
+               const std::shared_ptr<QDockWidget> dock = entry.first;
 
-QAction* MainWindow::action_view_zoom_fit() const
-{
-       return action_view_zoom_fit_;
+               // Remove view from the dock widget's QMainWindow
+               QMainWindow *dock_main = dynamic_cast<QMainWindow*>(dock->widget());
+               dock_main->setCentralWidget(0);
+
+               // Remove the QMainWindow
+               dock->setWidget(0);
+
+               const std::shared_ptr<pv::view::View> view = entry.second;
+
+               for (shared_ptr<Session> session : sessions_)
+                       if (session->has_view(view))
+                               session->deregister_view(view);
+       }
 }
 
-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
@@ -156,38 +141,126 @@ QAction* MainWindow::action_about() const
        return action_about_;
 }
 
-QMenu* MainWindow::menu_decoder_add() const
+shared_ptr<pv::view::View> 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.get() == dock)
+                       return entry.second;
+
+       return nullptr;
 }
 
-void MainWindow::run_stop()
+shared_ptr<pv::view::View> MainWindow::add_view(const QString &title,
+       view::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;
+       shared_ptr<pv::view::View> v;
+
+       if (type == pv::view::TraceView) {
+               shared_ptr<QDockWidget> dock = make_shared<QDockWidget>(title, this);
+               dock->setObjectName(title);
+               addDockWidget(Qt::TopDockWidgetArea, dock.get());
+
+               // Insert a QMainWindow into the dock widget to allow for a tool bar
+               QMainWindow *dock_main = new QMainWindow(dock.get());
+               dock_main->setWindowFlags(Qt::Widget);  // Remove Qt::Window flag
+
+               v = make_shared<pv::view::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 == view::TraceView) {
+                       connect(&session, SIGNAL(trigger_event(util::Timestamp)), 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_session()),
+                                       this, SLOT(on_new_session()));
+                               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;
 }
 
-void MainWindow::select_device(shared_ptr<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();
+       int id = sessions_.size();
+       QString name = tr("Untitled-%1").arg(id + 1);
+
+       shared_ptr<Session> session = make_shared<Session>(device_manager_, name);
+
+       connect(session.get(), SIGNAL(add_view(const QString&, view::ViewType, Session*)),
+               this, SLOT(on_add_view(const QString&, view::ViewType, Session*)));
+       connect(session.get(), SIGNAL(name_changed()),
+               this, SLOT(on_session_name_changed()));
+
+       sessions_.push_back(session);
+
+       shared_ptr<view::View> main_view =
+               add_view(name, pv::view::TraceView, *session);
+
+       return session;
+}
+
+void MainWindow::remove_session(shared_ptr<Session> session)
+{
+       for (shared_ptr<view::View> view : session->views()) {
+               // Find the dock the view is contained in and close it
+               for (auto entry : view_docks_)
+                       if (entry.second == view)
+                               entry.first->close();
        }
+
+       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()
@@ -196,200 +269,68 @@ void MainWindow::setup_ui()
 
        // Set the window icon
        QIcon icon;
-       icon.addFile(QString::fromUtf8(":/icons/sigrok-logo-notext.png"),
-               QSize(), QIcon::Normal, QIcon::Off);
+       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();
-
-       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*)));
+       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"));
 
-       menu_decoders->addMenu(menu_decoders_add_);
-#endif
-
-       // 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());
-
-       setMenuBar(menu_bar);
-       QMetaObject::connectSlotsByName(this);
-
-       // Setup the sampling bar
-       main_bar_ = new toolbars::MainBar(session_, *this);
-
-       // Populate the device list and select the initially selected device
-       update_device_list();
 
-       addToolBar(main_bar_);
+       setDockNestingEnabled(true);
 
-       // Set the title
-       setWindowTitle(tr("PulseView"));
-
-       // 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;
-
-       shared_ptr<HardwareDevice> device;
-
-       map<string, string> dev_info;
-       list<string> key_list;
-       string value;
+       int i, session_count;
 
        settings.beginGroup("MainWindow");
 
@@ -401,45 +342,14 @@ 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));
-       }
-
-       device = device_manager_.find_device_from_info(dev_info);
+       session_count = settings.value("sessions", 0).toInt();
 
-       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)
-{
-       QMetaObject::invokeMethod(this, "show_session_error",
-               Qt::QueuedConnection, Q_ARG(QString, text),
-               Q_ARG(QString, info_text));
-}
-
-void MainWindow::update_device_list()
-{
-       main_bar_->update_device_list();
 }
 
 void MainWindow::closeEvent(QCloseEvent *event)
@@ -448,171 +358,134 @@ 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_file(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, view::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();
+       shared_ptr<view::View> view;
+       bool title_set = false;
 
-       // Show the dialog
-       const QString file_name = QFileDialog::getOpenFileName(
-               this, tr("Open File"), dir, tr(
-                       "Sigrok Sessions (*.sr);;"
-                       "All Files (*.*)"));
+       view = get_active_view();
 
-       if (!file_name.isEmpty()) {
-               load_file(file_name);
+       for (shared_ptr<Session> session : sessions_) {
+               if (!session->has_view(view))
+                       continue;
 
-               const QString abs_path = QFileInfo(file_name).absolutePath();
-               settings.setValue(SettingOpenDirectory, abs_path);
+               setWindowTitle(session->name() + " - " + WindowTitle);
+               title_set = true;
        }
-}
-
-void MainWindow::on_actionSaveAs_triggered()
-{
-       using pv::dialogs::StoreProgress;
 
-       // Stop any currently running capture session
-       session_.stop_capture();
-
-       QSettings settings;
-       const QString dir = settings.value(SettingSaveDirectory).toString();
-
-       // Show the dialog
-       const QString file_name = QFileDialog::getSaveFileName(
-               this, tr("Save File"), dir, tr("Sigrok Sessions (*.sr)"));
-
-       if (file_name.isEmpty())
-               return;
-
-       const QString abs_path = QFileInfo(file_name).absolutePath();
-       settings.setValue(SettingSaveDirectory, abs_path);
-
-       StoreProgress *dlg = new StoreProgress(file_name, session_, this);
-       dlg->run();
+       if (!title_set)
+               setWindowTitle(WindowTitle);
 }
 
-void MainWindow::on_actionConnect_triggered()
+void MainWindow::on_new_session()
 {
-       // Stop any currently running capture session
-       session_.stop_capture();
-
-       dialogs::Connect dlg(this, device_manager_);
-
-       // 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());
-
-       update_device_list();
+       add_session();
 }
 
-void MainWindow::on_actionQuit_triggered()
+void MainWindow::on_session_name_changed()
 {
-       close();
-}
+       // Update the corresponding dock widget's name(s)
+       Session *session = qobject_cast<Session*>(QObject::sender());
+       assert(session);
 
-void MainWindow::on_actionViewZoomIn_triggered()
-{
-       view_->zoom(1);
-}
+       for (shared_ptr<view::View> 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());
+                       }
+       }
 
-void MainWindow::on_actionViewZoomOut_triggered()
-{
-       view_->zoom(-1);
+       // Refresh window title if the affected session has focus
+       on_focus_changed();
 }
 
-void MainWindow::on_actionViewZoomFit_triggered()
+void MainWindow::on_new_view(Session *session)
 {
-       view_->zoom_fit();
+       // We get a pointer and need a reference
+       for (std::shared_ptr<Session> s : sessions_)
+               if (s.get() == session)
+                       add_view(session->name(), pv::view::TraceView, *s);
 }
 
-void MainWindow::on_actionViewZoomOneToOne_triggered()
+void MainWindow::on_view_close_clicked()
 {
-       view_->zoom_one_to_one();
-}
+       // Find the dock widget that contains the close button that was clicked
+       QObject *w = QObject::sender();
+       QDockWidget *dock = 0;
 
-void MainWindow::on_actionViewShowCursors_triggered()
-{
-       assert(view_);
+       while (w) {
+           dock = qobject_cast<QDockWidget*>(w);
+           if (dock)
+               break;
+           w = w->parent();
+       }
 
-       const bool show = !view_->cursors_shown();
-       if(show)
-               view_->centre_cursors();
+       // Get the view contained in the dock widget
+       shared_ptr<view::View> view;
 
-       view_->show_cursors(show);
-}
+       for (auto entry : view_docks_)
+               if (entry.first.get() == dock)
+                       view = entry.second;
 
-void MainWindow::on_actionAbout_triggered()
-{
-       dialogs::About dlg(device_manager_.context(), this);
-       dlg.exec();
+       // 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()) {
+                       remove_session(session);
+                       break;
+               } else
+                       session->deregister_view(view);
+       }
 }
 
-void MainWindow::add_decoder(srd_decoder *decoder)
+void MainWindow::on_actionViewStickyScrolling_triggered()
 {
-#ifdef ENABLE_DECODE
-       assert(decoder);
-       session_.add_decoder(decoder);
-#else
-       (void)decoder;
-#endif
+       shared_ptr<pv::view::View> view = get_active_view();
+       if (view)
+               view->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
 }
 
-void MainWindow::capture_state_changed(int state)
+void MainWindow::on_actionViewColouredBg_triggered()
 {
-       main_bar_->set_capture_state((pv::Session::capture_state)state);
+       shared_ptr<pv::view::View> view = get_active_view();
+       if (view)
+               view->enable_coloured_bg(action_view_coloured_bg_->isChecked());
 }
 
-void MainWindow::device_selected()
+void MainWindow::on_actionAbout_triggered()
 {
-       // Set the title to include the device/file name
-       const shared_ptr<sigrok::Device> device = session_.device();
-       if (!device)
-               return;
-
-       const string display_name = device_manager_.get_display_name(device);
-       setWindowTitle(tr("%1 - PulseView").arg(display_name.c_str()));
+       dialogs::About dlg(device_manager_.context(), this);
+       dlg.exec();
 }
 
 } // namespace pv