]> sigrok.org Git - pulseview.git/blobdiff - pv/mainwindow.cpp
MainWindow: Don't return bogus view
[pulseview.git] / pv / mainwindow.cpp
index 719d608989a82b92a8d42f1be66b04ef9264a1ce..92c92d023225a7d5fa7cb5f54764d4e1218b2a12 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.h"
+#include "mainwindow.hpp"
 
-#include "devicemanager.h"
-#include "device/device.h"
-#include "dialogs/about.h"
-#include "dialogs/connect.h"
-#include "dialogs/storeprogress.h"
-#include "toolbars/samplingbar.h"
-#include "view/logicsignal.h"
-#include "view/view.h"
-#ifdef ENABLE_DECODE
-#include "widgets/decodermenu.h"
-#endif
+#include "devicemanager.hpp"
+#include "util.hpp"
+#include "devices/hardwaredevice.hpp"
+#include "dialogs/about.hpp"
+#include "toolbars/mainbar.hpp"
+#include "view/view.hpp"
 
-/* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
-#define __STDC_FORMAT_MACROS
-#include <inttypes.h>
 #include <stdint.h>
 #include <stdarg.h>
-#include <glib.h>
-#include <libsigrok/libsigrok.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;
 
 namespace pv {
 
 namespace view {
-class SelectableItem;
+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)
+       device_manager_(device_manager),
+       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);
+       }
+
+       // 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);
        }
 }
 
-void MainWindow::setup_ui()
+MainWindow::~MainWindow()
 {
-       setObjectName(QString::fromUtf8("MainWindow"));
+       for (auto entry : view_docks_) {
 
-       // Set the window icon
-       QIcon icon;
-       icon.addFile(QString::fromUtf8(":/icons/sigrok-logo-notext.png"),
-               QSize(), QIcon::Normal, QIcon::Off);
-       setWindowIcon(icon);
+               const std::shared_ptr<QDockWidget> dock = entry.first;
 
-       // 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
-       QMenuBar *const menu_bar = new QMenuBar(this);
-       menu_bar->setGeometry(QRect(0, 0, 400, 25));
-
-       // File Menu
-       QMenu *const menu_file = new QMenu;
-       menu_file->setTitle(tr("&File"));
-
-       QAction *const action_open = new QAction(this);
-       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);
-
-       QAction *const action_save_as = new QAction(this);
-       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();
-
-       QAction *const action_connect = new QAction(this);
-       action_connect->setText(tr("&Connect to Device..."));
-       action_connect->setObjectName(QString::fromUtf8("actionConnect"));
-       menu_file->addAction(action_connect);
-
-       menu_file->addSeparator();
-
-       QAction *action_quit = new QAction(this);
-       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"));
-
-       QAction *const action_view_zoom_in = new QAction(this);
-       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);
-
-       QAction *const action_view_zoom_out = new QAction(this);
-       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);
-
-       QAction *const action_view_zoom_fit = new QAction(this);
-       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);
-
-       QAction *const action_view_zoom_one_to_one = new QAction(this);
-       action_view_zoom_one_to_one->setText(tr("Zoom to &One-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();
-
-       QAction *action_view_show_cursors = new QAction(this);
-       action_view_show_cursors->setCheckable(true);
-       action_view_show_cursors->setChecked(_view->cursors_shown());
-       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"));
+               // Remove view from the dock widget's QMainWindow
+               QMainWindow *dock_main = dynamic_cast<QMainWindow*>(dock->widget());
+               dock_main->setCentralWidget(0);
 
-       pv::widgets::DecoderMenu *const menu_decoders_add =
-               new pv::widgets::DecoderMenu(menu_decoders, true);
-       menu_decoders_add->setTitle(tr("&Add"));
-       connect(menu_decoders_add, SIGNAL(decoder_selected(srd_decoder*)),
-               this, SLOT(add_decoder(srd_decoder*)));
+               // Remove the QMainWindow
+               dock->setWidget(0);
 
-       menu_decoders->addMenu(menu_decoders_add);
-#endif
+               const std::shared_ptr<pv::view::View> view = entry.second;
 
-       // Help Menu
-       QMenu *const menu_help = new QMenu;
-       menu_help->setTitle(tr("&Help"));
+               for (shared_ptr<Session> session : sessions_)
+                       if (session->has_view(view))
+                               session->deregister_view(view);
+       }
+}
 
-       QAction *const action_about = new QAction(this);
-       action_about->setObjectName(QString::fromUtf8("actionAbout"));
-       action_about->setText(tr("&About..."));
-       menu_help->addAction(action_about);
+QAction* MainWindow::action_view_sticky_scrolling() const
+{
+       return action_view_sticky_scrolling_;
+}
 
-       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());
+QAction* MainWindow::action_view_coloured_bg() const
+{
+       return action_view_coloured_bg_;
+}
+
+QAction* MainWindow::action_about() const
+{
+       return action_about_;
+}
+
+shared_ptr<pv::view::View> MainWindow::get_active_view() const
+{
+       // 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();
+       }
 
-       setMenuBar(menu_bar);
-       QMetaObject::connectSlotsByName(this);
+       // Get the view contained in the dock widget
+       for (auto entry : view_docks_)
+               if (entry.first.get() == dock)
+                       return entry.second;
 
-       // Setup the toolbar
-       QToolBar *const toolbar = new QToolBar(tr("Main Toolbar"), this);
-       toolbar->addAction(action_open);
-       toolbar->addAction(action_save_as);
-       toolbar->addSeparator();
-       toolbar->addAction(action_view_zoom_in);
-       toolbar->addAction(action_view_zoom_out);
-       toolbar->addAction(action_view_zoom_fit);
-       toolbar->addAction(action_view_zoom_one_to_one);
-       addToolBar(toolbar);
+       return nullptr;
+}
 
-       // Setup the sampling bar
-       _sampling_bar = new toolbars::SamplingBar(_session, this);
+shared_ptr<pv::view::View> MainWindow::add_view(const QString &title,
+       view::ViewType type, Session &session)
+{
+       shared_ptr<pv::view::View> v;
 
-       // Populate the device list and select the initially selected device
-       update_device_list();
+       if (type == pv::view::TraceView) {
+               shared_ptr<QDockWidget> dock = make_shared<QDockWidget>(title, this);
+               dock->setObjectName(title);
+               addDockWidget(Qt::TopDockWidgetArea, dock.get());
 
-       connect(_sampling_bar, SIGNAL(run_stop()), this,
-               SLOT(run_stop()));
-       addToolBar(_sampling_bar);
+               // 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
 
-       // Set the title
-       setWindowTitle(tr("PulseView"));
+               v = make_shared<pv::view::View>(session, dock_main);
+               view_docks_[dock] = v;
+               session.register_view(v);
 
-       // Setup _session events
-       connect(&_session, SIGNAL(capture_state_changed(int)), this,
-               SLOT(capture_state_changed(int)));
+               dock_main->setCentralWidget(v.get());
+               dock->setWidget(dock_main);
 
-}
+               dock->setFeatures(QDockWidget::DockWidgetMovable |
+                       QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
 
-void MainWindow::save_ui_settings()
-{
-       QSettings settings("sigrok", "PulseView");
+               QAbstractButton *close_btn =
+                       dock->findChildren<QAbstractButton*>
+                               ("qt_dockwidget_closebutton").front();
 
-       settings.beginGroup("MainWindow");
-       settings.setValue("state", saveState());
-       settings.setValue("geometry", saveGeometry());
-       settings.endGroup();
-}
+               connect(close_btn, SIGNAL(clicked(bool)),
+                       this, SLOT(on_view_close_clicked()));
 
-void MainWindow::restore_ui_settings()
-{
-       QSettings settings("sigrok", "PulseView");
+               if (type == view::TraceView) {
+                       connect(&session, SIGNAL(trigger_event(util::Timestamp)), v.get(),
+                               SLOT(trigger_event(util::Timestamp)));
 
-       settings.beginGroup("MainWindow");
+                       v->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
+                       v->enable_coloured_bg(action_view_coloured_bg_->isChecked());
 
-       if (settings.contains("geometry")) {
-               restoreGeometry(settings.value("geometry").toByteArray());
-               restoreState(settings.value("state").toByteArray());
-       } else
-               resize(1000, 720);
+                       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);
 
-       settings.endGroup();
-}
+                               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());
 
-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));
+                       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::update_device_list()
+shared_ptr<Session> MainWindow::add_session()
 {
-       assert(_sampling_bar);
+       int id = sessions_.size();
+       QString name = tr("Untitled-%1").arg(id + 1);
 
-       shared_ptr<pv::device::DevInst> selected_device = _session.get_device();
-       list< shared_ptr<device::DevInst> > devices;
+       shared_ptr<Session> session = make_shared<Session>(device_manager_, name);
 
-       if (_device_manager.devices().size() == 0)
-               return;
+       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()));
 
-       std::copy(_device_manager.devices().begin(),
-               _device_manager.devices().end(), std::back_inserter(devices));
+       sessions_.push_back(session);
 
-       if (std::find(devices.begin(), devices.end(), selected_device) ==
-               devices.end())
-               devices.push_back(selected_device);
-       assert(selected_device);
-
-       _sampling_bar->set_device_list(devices, selected_device);
-}
+       shared_ptr<view::View> main_view =
+               add_view(name, pv::view::TraceView, *session);
 
-void MainWindow::closeEvent(QCloseEvent *event)
-{
-       save_ui_settings();
-       event->accept();
+       return session;
 }
 
-void MainWindow::load_file(QString file_name)
+void MainWindow::remove_session(shared_ptr<Session> session)
 {
-       const QString errorMessage(
-               QString("Failed to load file %1").arg(file_name));
-       const QString infoMessage;
-
-       try {
-               _session.set_file(file_name.toStdString());
-       } catch(QString e) {
-               show_session_error(tr("Failed to load ") + file_name, e);
-               _session.set_default_device();
-               update_device_list();
-               return;
+       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();
        }
 
-       update_device_list();
+       sessions_.remove_if([&](shared_ptr<Session> s) {
+               return s == session; });
 
-       _session.start_capture([&, errorMessage, infoMessage](QString) {
-               session_error(errorMessage, infoMessage); });
+       // Update the window title if there is no view left to
+       // generate focus change events
+       if (sessions_.empty())
+               on_session_name_changed();
 }
 
-void MainWindow::show_session_error(
-       const QString text, const QString info_text)
+void MainWindow::setup_ui()
 {
-       QMessageBox msg(this);
-       msg.setText(text);
-       msg.setInformativeText(info_text);
-       msg.setStandardButtons(QMessageBox::Ok);
-       msg.setIcon(QMessageBox::Warning);
-       msg.exec();
+       setObjectName(QString::fromUtf8("MainWindow"));
+
+       // Set the window icon
+       QIcon icon;
+       icon.addFile(QString(":/icons/sigrok-logo-notext.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"));
+
+       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..."));
+
+       setDockNestingEnabled(true);
+
+       connect(static_cast<QApplication *>(QCoreApplication::instance()),
+               SIGNAL(focusChanged(QWidget*, QWidget*)),
+               this, SLOT(on_focus_changed()));
 }
 
-void MainWindow::on_actionOpen_triggered()
+void MainWindow::save_ui_settings()
 {
        QSettings settings;
-       const QString dir = settings.value(SettingOpenDirectory).toString();
-
-       // Show the dialog
-       const QString file_name = QFileDialog::getOpenFileName(
-               this, tr("Open File"), dir, tr(
-                       "Sigrok Sessions (*.sr);;"
-                       "All Files (*.*)"));
+       int id = 0;
 
-       if (!file_name.isEmpty()) {
-               load_file(file_name);
+       settings.beginGroup("MainWindow");
+       settings.setValue("state", saveState());
+       settings.setValue("geometry", saveGeometry());
+       settings.endGroup();
 
-               const QString abs_path = QFileInfo(file_name).absolutePath();
-               settings.setValue(SettingOpenDirectory, abs_path);
+       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::on_actionSaveAs_triggered()
+void MainWindow::restore_ui_settings()
 {
-       using pv::dialogs::StoreProgress;
+       QSettings settings;
+       int i, session_count;
 
-       // Stop any currently running capture session
-       _session.stop_capture();
+       settings.beginGroup("MainWindow");
 
-       QSettings settings;
-       const QString dir = settings.value(SettingSaveDirectory).toString();
+       if (settings.contains("geometry")) {
+               restoreGeometry(settings.value("geometry").toByteArray());
+               restoreState(settings.value("state").toByteArray());
+       } else
+               resize(1000, 720);
 
-       // Show the dialog
-       const QString file_name = QFileDialog::getSaveFileName(
-               this, tr("Save File"), dir, tr("Sigrok Sessions (*.sr)"));
+       settings.endGroup();
 
-       if (file_name.isEmpty())
-               return;
+       session_count = settings.value("sessions", 0).toInt();
 
-       const QString abs_path = QFileInfo(file_name).absolutePath();
-       settings.setValue(SettingSaveDirectory, abs_path);
+       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();
+       }
+}
 
-       StoreProgress *dlg = new StoreProgress(file_name, _session, this);
-       dlg->run();
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+       save_ui_settings();
+       event->accept();
 }
 
-void MainWindow::on_actionConnect_triggered()
+QMenu* MainWindow::createPopupMenu()
 {
-       // Stop any currently running capture session
-       _session.stop_capture();
+       return nullptr;
+}
 
-       dialogs::Connect dlg(this, _device_manager);
+bool MainWindow::restoreState(const QByteArray &state, int version)
+{
+       (void)state;
+       (void)version;
 
-       // If the user selected a device, select it in the device list. Select the
-       // current device otherwise.
-       if (dlg.exec())
-               _session.set_device(dlg.get_selected_device());
+       // Do nothing. We don't want Qt to handle this, or else it
+       // will try to restore all the dock widgets and create havoc.
 
-       update_device_list();
+       return false;
 }
 
-void MainWindow::on_actionQuit_triggered()
+void MainWindow::on_add_view(const QString &title, view::ViewType type,
+       Session *session)
 {
-       close();
+       // 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_actionViewZoomIn_triggered()
+void MainWindow::on_focus_changed()
 {
-       _view->zoom(1);
+       shared_ptr<view::View> view;
+       bool title_set = false;
+
+       view = get_active_view();
+
+       for (shared_ptr<Session> session : sessions_) {
+               if (!session->has_view(view))
+                       continue;
+
+               setWindowTitle(session->name() + " - " + WindowTitle);
+               title_set = true;
+       }
+
+       if (!title_set)
+               setWindowTitle(WindowTitle);
 }
 
-void MainWindow::on_actionViewZoomOut_triggered()
+void MainWindow::on_new_session()
 {
-       _view->zoom(-1);
+       add_session();
 }
 
-void MainWindow::on_actionViewZoomFit_triggered()
+void MainWindow::on_session_name_changed()
 {
-       _view->zoom_fit();
+       // Update the corresponding dock widget's name(s)
+       Session *session = qobject_cast<Session*>(QObject::sender());
+       assert(session);
+
+       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());
+                       }
+       }
+
+       // Refresh window title if the affected session has focus
+       on_focus_changed();
 }
 
-void MainWindow::on_actionViewZoomOneToOne_triggered()
+void MainWindow::on_new_view(Session *session)
 {
-       _view->zoom_one_to_one();
+       // 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_actionViewShowCursors_triggered()
+void MainWindow::on_view_close_clicked()
 {
-       assert(_view);
+       // 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();
+       }
 
-       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(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::run_stop()
+void MainWindow::on_actionViewColouredBg_triggered()
 {
-       switch(_session.get_capture_state()) {
-       case SigSession::Stopped:
-               _session.start_capture([&](QString message) {
-                       session_error("Capture failed", message); });
-               break;
-
-       case SigSession::AwaitingTrigger:
-       case SigSession::Running:
-               _session.stop_capture();
-               break;
-       }
+       shared_ptr<pv::view::View> view = get_active_view();
+       if (view)
+               view->enable_coloured_bg(action_view_coloured_bg_->isChecked());
 }
 
-void MainWindow::capture_state_changed(int state)
+void MainWindow::on_actionAbout_triggered()
 {
-       _sampling_bar->set_capture_state((pv::SigSession::capture_state)state);
+       dialogs::About dlg(device_manager_.context(), this);
+       dlg.exec();
 }
 
 } // namespace pv