]> sigrok.org Git - pulseview.git/blobdiff - pv/mainwindow.cpp
Session: Fix issue #67 by improving error handling
[pulseview.git] / pv / mainwindow.cpp
index 5c399e43c38d1523abe748e52cb9c0d44039d792..8646175e2b32f7a6b7f0a7ec7233f07d136d77fb 100644 (file)
@@ -30,6 +30,7 @@
 #include <QAction>
 #include <QApplication>
 #include <QCloseEvent>
+#include <QDebug>
 #include <QDockWidget>
 #include <QHBoxLayout>
 #include <QMessageBox>
 
 #include "mainwindow.hpp"
 
+#include "application.hpp"
 #include "devicemanager.hpp"
 #include "devices/hardwaredevice.hpp"
 #include "dialogs/settings.hpp"
 #include "globalsettings.hpp"
 #include "toolbars/mainbar.hpp"
 #include "util.hpp"
-#include "view/view.hpp"
+#include "views/trace/view.hpp"
 #include "views/trace/standardbar.hpp"
 
+#ifdef ENABLE_DECODE
+#include "subwindows/decoder_selector/subwindow.hpp"
+#include "views/decoder_binary/view.hpp"
+#include "views/tabular_decoder/view.hpp"
+#endif
+
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
-using std::bind;
 using std::dynamic_pointer_cast;
 using std::make_shared;
-using std::map;
-using std::placeholders::_1;
 using std::shared_ptr;
 using std::string;
 
 namespace pv {
 
-namespace view {
-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) :
+MainWindow::MainWindow(DeviceManager &device_manager, QWidget *parent) :
        QMainWindow(parent),
        device_manager_(device_manager),
        session_selector_(this),
-       session_state_mapper_(this),
        icon_red_(":/icons/status-red.svg"),
        icon_green_(":/icons/status-green.svg"),
        icon_grey_(":/icons/status-grey.svg")
 {
-       qRegisterMetaType<util::Timestamp>("util::Timestamp");
-       qRegisterMetaType<uint64_t>("uint64_t");
-
-       GlobalSettings::register_change_handler(GlobalSettings::Key_View_ColouredBG,
-               bind(&MainWindow::on_settingViewColouredBg_changed, this, _1));
-
-       GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowSamplingPoints,
-               bind(&MainWindow::on_settingViewShowSamplingPoints_changed, this, _1));
-
        setup_ui();
        restore_ui_settings();
-
-       if (!open_file_name.empty()) {
-               shared_ptr<Session> session = add_session();
-               session->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->select_device(other_device ? other_device : demo_device);
-       }
+       connect(this, SIGNAL(session_error_raised(const QString, const QString)),
+               this, SLOT(on_session_error_raised(const QString, const QString)));
 }
 
 MainWindow::~MainWindow()
 {
+       // Make sure we no longer hold any shared pointers to widgets after the
+       // destructor finishes (goes for sessions and sub windows alike)
+
        while (!sessions_.empty())
                remove_session(sessions_.front());
+
+       sub_windows_.clear();
+}
+
+void MainWindow::show_session_error(const QString text, const QString info_text)
+{
+       // TODO Emulate noquote()
+       qDebug() << "Notifying user of session error: " << text << "; " << info_text;
+
+       QMessageBox msg;
+       msg.setText(text + "\n\n" + info_text);
+       msg.setStandardButtons(QMessageBox::Ok);
+       msg.setIcon(QMessageBox::Warning);
+       msg.exec();
 }
 
 shared_ptr<views::ViewBase> MainWindow::get_active_view() const
@@ -141,21 +124,21 @@ shared_ptr<views::ViewBase> MainWindow::get_active_view() const
        }
 
        // Get the view contained in the dock widget
-       for (auto entry : view_docks_)
+       for (auto& entry : view_docks_)
                if (entry.first == dock)
                        return entry.second;
 
        return nullptr;
 }
 
-shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
-       views::ViewType type, Session &session)
+shared_ptr<views::ViewBase> MainWindow::add_view(views::ViewType type,
+       Session &session)
 {
        GlobalSettings settings;
        shared_ptr<views::ViewBase> v;
 
        QMainWindow *main_window = nullptr;
-       for (auto entry : session_windows_)
+       for (auto& entry : session_windows_)
                if (entry.first.get() == &session)
                        main_window = entry.second;
 
@@ -163,6 +146,13 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 
        shared_ptr<MainBar> main_bar = session.main_bar();
 
+       // Only use the view type in the name if it's not the main view
+       QString title;
+       if (main_bar)
+               title = QString("%1 (%2)").arg(session.name(), views::ViewTypeNames[type]);
+       else
+               title = session.name();
+
        QDockWidget* dock = new QDockWidget(title, main_window);
        dock->setObjectName(title);
        main_window->addDockWidget(Qt::TopDockWidgetArea, dock);
@@ -173,8 +163,13 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 
        if (type == views::ViewTypeTrace)
                // This view will be the main view if there's no main bar yet
-               v = make_shared<views::TraceView::View>(session,
-                       (main_bar ? false : true), dock_main);
+               v = make_shared<views::trace::View>(session, (main_bar ? false : true), dock_main);
+#ifdef ENABLE_DECODE
+       if (type == views::ViewTypeDecoderBinary)
+               v = make_shared<views::decoder_binary::View>(session, false, dock_main);
+       if (type == views::ViewTypeTabularDecoder)
+               v = make_shared<views::tabular_decoder::View>(session, false, dock_main);
+#endif
 
        if (!v)
                return nullptr;
@@ -185,26 +180,27 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
        dock_main->setCentralWidget(v.get());
        dock->setWidget(dock_main);
 
+       dock->setContextMenuPolicy(Qt::PreventContextMenu);
        dock->setFeatures(QDockWidget::DockWidgetMovable |
                QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
 
        QAbstractButton *close_btn =
-               dock->findChildren<QAbstractButton*>
-                       ("qt_dockwidget_closebutton").front();
+               dock->findChildren<QAbstractButton*>("qt_dockwidget_closebutton")  // clazy:exclude=detaching-temporary
+                       .front();
 
        connect(close_btn, SIGNAL(clicked(bool)),
                this, SLOT(on_view_close_clicked()));
 
-       connect(&session, SIGNAL(trigger_event(util::Timestamp)),
+       connect(&session, SIGNAL(trigger_event(int, util::Timestamp)),
                qobject_cast<views::ViewBase*>(v.get()),
-               SLOT(trigger_event(util::Timestamp)));
+               SLOT(trigger_event(int, util::Timestamp)));
 
-       if (type == views::ViewTypeTrace) {
-               views::TraceView::View *tv =
-                       qobject_cast<views::TraceView::View*>(v.get());
+       connect(&session, SIGNAL(session_error_raised(const QString, const QString)),
+               this, SLOT(on_session_error_raised(const QString, const QString)));
 
-               tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
-               tv->enable_show_sampling_points(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool());
+       if (type == views::ViewTypeTrace) {
+               views::trace::View *tv =
+                       qobject_cast<views::trace::View*>(v.get());
 
                if (!main_bar) {
                        /* Initial view, create the main bar */
@@ -212,8 +208,10 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
                        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*)));
+                       connect(main_bar.get(), SIGNAL(new_view(Session*, int)),
+                               this, SLOT(on_new_view(Session*, int)));
+                       connect(main_bar.get(), SIGNAL(show_decoder_selector(Session*)),
+                               this, SLOT(on_show_decoder_selector(Session*)));
 
                        main_bar->action_view_show_cursors()->setChecked(tv->cursors_shown());
 
@@ -232,6 +230,8 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
                }
        }
 
+       v->setFocus();
+
        return v;
 }
 
@@ -242,7 +242,7 @@ void MainWindow::remove_view(shared_ptr<views::ViewBase> view)
                        continue;
 
                // Find the dock the view is contained in and remove it
-               for (auto entry : view_docks_)
+               for (auto& entry : view_docks_)
                        if (entry.second == view) {
                                // Remove the view from the session
                                session->deregister_view(view);
@@ -263,6 +263,74 @@ void MainWindow::remove_view(shared_ptr<views::ViewBase> view)
        }
 }
 
+shared_ptr<subwindows::SubWindowBase> MainWindow::add_subwindow(
+       subwindows::SubWindowType type, Session &session)
+{
+       GlobalSettings settings;
+       shared_ptr<subwindows::SubWindowBase> w;
+
+       QMainWindow *main_window = nullptr;
+       for (auto& entry : session_windows_)
+               if (entry.first.get() == &session)
+                       main_window = entry.second;
+
+       assert(main_window);
+
+       QString title = "";
+
+       switch (type) {
+#ifdef ENABLE_DECODE
+               case subwindows::SubWindowTypeDecoderSelector:
+                       title = tr("Decoder Selector");
+                       break;
+#endif
+               default:
+                       break;
+       }
+
+       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
+
+#ifdef ENABLE_DECODE
+       if (type == subwindows::SubWindowTypeDecoderSelector)
+               w = make_shared<subwindows::decoder_selector::SubWindow>(session, dock_main);
+#endif
+
+       if (!w)
+               return nullptr;
+
+       sub_windows_[dock] = w;
+       dock_main->setCentralWidget(w.get());
+       dock->setWidget(dock_main);
+
+       dock->setContextMenuPolicy(Qt::PreventContextMenu);
+       dock->setFeatures(QDockWidget::DockWidgetMovable |
+               QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
+
+       QAbstractButton *close_btn =
+               dock->findChildren<QAbstractButton*>  // clazy:exclude=detaching-temporary
+                       ("qt_dockwidget_closebutton").front();
+
+       // Allow all subwindows to be closed via ESC.
+       close_btn->setShortcut(QKeySequence(Qt::Key_Escape));
+
+       connect(close_btn, SIGNAL(clicked(bool)),
+               this, SLOT(on_sub_window_close_clicked()));
+
+       if (w->has_toolbar())
+               dock_main->addToolBar(w->create_toolbar(dock_main));
+
+       if (w->minimum_width() > 0)
+               dock->setMinimumSize(w->minimum_width(), 0);
+
+       return w;
+}
+
 shared_ptr<Session> MainWindow::add_session()
 {
        static int last_session_id = 1;
@@ -270,13 +338,14 @@ shared_ptr<Session> MainWindow::add_session()
 
        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(add_view(ViewType, Session*)),
+               this, SLOT(on_add_view(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(device_changed()),
+               this, SLOT(on_session_device_changed()));
        connect(session.get(), SIGNAL(capture_state_changed(int)),
-               &session_state_mapper_, SLOT(map()));
+               this, SLOT(on_session_capture_state_changed(int)));
 
        sessions_.push_back(session);
 
@@ -290,17 +359,26 @@ shared_ptr<Session> MainWindow::add_session()
 
        window->setDockNestingEnabled(true);
 
-       shared_ptr<views::ViewBase> main_view =
-               add_view(name, views::ViewTypeTrace, *session);
+       add_view(views::ViewTypeTrace, *session);
 
        return session;
 }
 
 void MainWindow::remove_session(shared_ptr<Session> session)
 {
+       // Determine the height of the button before it collapses
        int h = new_session_button_->height();
 
-       for (shared_ptr<views::ViewBase> view : session->views())
+       // Stop capture while the session still exists so that the UI can be
+       // updated in case we're currently running. If so, this will schedule a
+       // call to our on_capture_state_changed() slot for the next run of the
+       // event loop. We need to have this executed immediately or else it will
+       // be dismissed since the session object will be deleted by the time we
+       // leave this method and the event loop gets a chance to run again.
+       session->stop_capture();
+       QApplication::processEvents();
+
+       for (const shared_ptr<views::ViewBase>& view : session->views())
                remove_view(view);
 
        QMainWindow *window = session_windows_.at(session);
@@ -311,6 +389,7 @@ void MainWindow::remove_session(shared_ptr<Session> session)
        if (last_focused_session_ == session)
                last_focused_session_.reset();
 
+       // Remove the session from our list of sessions (which also destroys it)
        sessions_.remove_if([&](shared_ptr<Session> s) {
                return s == session; });
 
@@ -318,7 +397,7 @@ void MainWindow::remove_session(shared_ptr<Session> session)
                // 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*>())
+               for (QWidget *w : static_tab_widget_->findChildren<QWidget*>())  // clazy:exclude=range-loop
                        w->setMinimumHeight(h);
 
                int margin = static_tab_widget_->layout()->contentsMargins().bottom();
@@ -331,6 +410,84 @@ void MainWindow::remove_session(shared_ptr<Session> session)
        }
 }
 
+void MainWindow::add_session_with_file(string open_file_name,
+       string open_file_format, string open_setup_file_name)
+{
+       shared_ptr<Session> session = add_session();
+       session->load_init_file(open_file_name, open_file_format, open_setup_file_name);
+}
+
+void MainWindow::add_default_session()
+{
+       // Only add the default session if there would be no session otherwise
+       if (sessions_.size() > 0)
+               return;
+
+       shared_ptr<Session> session = add_session();
+
+       // Check the list of available devices. Prefer the one that was
+       // found with user supplied scan specs (if applicable). Then try
+       // one of the auto detected devices that are not the demo device.
+       // Pick demo in the absence of "genuine" hardware devices.
+       shared_ptr<devices::HardwareDevice> user_device, other_device, demo_device;
+       for (const shared_ptr<devices::HardwareDevice>& dev : device_manager_.devices()) {
+               if (dev == device_manager_.user_spec_device()) {
+                       user_device = dev;
+               } else if (dev->hardware_device()->driver()->name() == "demo") {
+                       demo_device = dev;
+               } else {
+                       other_device = dev;
+               }
+       }
+       if (user_device)
+               session->select_device(user_device);
+       else if (other_device)
+               session->select_device(other_device);
+       else
+               session->select_device(demo_device);
+}
+
+void MainWindow::save_sessions()
+{
+       QSettings settings;
+       int id = 0;
+
+       for (shared_ptr<Session>& session : sessions_) {
+               // Ignore sessions using the demo device or no device at all
+               if (session->device()) {
+                       shared_ptr<devices::HardwareDevice> device =
+                               dynamic_pointer_cast< devices::HardwareDevice >
+                               (session->device());
+
+                       if (device &&
+                               device->hardware_device()->driver()->name() == "demo")
+                               continue;
+
+                       settings.beginGroup("Session" + QString::number(id++));
+                       settings.remove("");  // Remove all keys in this group
+                       session->save_settings(settings);
+                       settings.endGroup();
+               }
+       }
+
+       settings.setValue("sessions", id);
+}
+
+void MainWindow::restore_sessions()
+{
+       QSettings settings;
+       int i, session_count;
+
+       session_count = settings.value("sessions", 0).toInt();
+
+       for (i = 0; i < session_count; i++) {
+               settings.beginGroup("Session" + QString::number(i));
+               shared_ptr<Session> session = add_session();
+               session->restore_settings(settings);
+               settings.endGroup();
+       }
+}
+
 void MainWindow::setup_ui()
 {
        setObjectName(QString::fromUtf8("MainWindow"));
@@ -339,17 +496,21 @@ void MainWindow::setup_ui()
 
        // Set the window icon
        QIcon icon;
-       icon.addFile(QString(":/icons/sigrok-logo-notext.png"));
+       icon.addFile(QString(":/icons/pulseview.png"));
        setWindowIcon(icon);
 
+       // Set up keyboard shortcuts that affect all views at once
        view_sticky_scrolling_shortcut_ = new QShortcut(QKeySequence(Qt::Key_S), this, SLOT(on_view_sticky_scrolling_shortcut()));
        view_sticky_scrolling_shortcut_->setAutoRepeat(false);
 
        view_show_sampling_points_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Period), this, SLOT(on_view_show_sampling_points_shortcut()));
        view_show_sampling_points_shortcut_->setAutoRepeat(false);
 
-       view_coloured_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_coloured_bg_shortcut()));
-       view_coloured_bg_shortcut_->setAutoRepeat(false);
+       view_show_analog_minor_grid_shortcut_ = new QShortcut(QKeySequence(Qt::Key_G), this, SLOT(on_view_show_analog_minor_grid_shortcut()));
+       view_show_analog_minor_grid_shortcut_->setAutoRepeat(false);
+
+       view_colored_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_colored_bg_shortcut()));
+       view_colored_bg_shortcut_->setAutoRepeat(false);
 
        // Set up the tab area
        new_session_button_ = new QToolButton();
@@ -367,8 +528,8 @@ void MainWindow::setup_ui()
        run_stop_shortcut_->setAutoRepeat(false);
 
        settings_button_ = new QToolButton();
-       settings_button_->setIcon(QIcon::fromTheme("configure",
-               QIcon(":/icons/configure.png")));
+       settings_button_->setIcon(QIcon::fromTheme("preferences-system",
+               QIcon(":/icons/preferences-system.png")));
        settings_button_->setToolTip(tr("Settings"));
        settings_button_->setAutoRaise(true);
 
@@ -391,17 +552,19 @@ void MainWindow::setup_ui()
        session_selector_.setCornerWidget(static_tab_widget_, Qt::TopLeftCorner);
        session_selector_.setTabsClosable(true);
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+       close_application_shortcut_ = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_Q), this, SLOT(close()));
+       close_current_tab_shortcut_ = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_W), this, SLOT(on_close_current_tab()));
+#else
        close_application_shortcut_ = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), this, SLOT(close()));
-       close_application_shortcut_->setAutoRepeat(false);
-
        close_current_tab_shortcut_ = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), this, SLOT(on_close_current_tab()));
+#endif
+       close_application_shortcut_->setAutoRepeat(false);
 
        connect(new_session_button_, SIGNAL(clicked(bool)),
                this, SLOT(on_new_session_clicked()));
        connect(run_stop_button_, SIGNAL(clicked(bool)),
                this, SLOT(on_run_stop_clicked()));
-       connect(&session_state_mapper_, SIGNAL(mapped(QObject*)),
-               this, SLOT(on_capture_state_changed(QObject*)));
        connect(settings_button_, SIGNAL(clicked(bool)),
                this, SLOT(on_settings_clicked()));
 
@@ -416,41 +579,38 @@ void MainWindow::setup_ui()
                this, SLOT(on_focus_changed()));
 }
 
+void MainWindow::update_acq_button(Session *session)
+{
+       int state;
+       QString run_caption;
+
+       if (session) {
+               state = session->get_capture_state();
+               run_caption = session->using_file_device() ? tr("Reload") : tr("Run");
+       } else {
+               state = Session::Stopped;
+               run_caption = tr("Run");
+       }
+
+       const QIcon *icons[] = {&icon_grey_, &icon_red_, &icon_green_};
+       run_stop_button_->setIcon(*icons[state]);
+       run_stop_button_->setText((state == pv::Session::Stopped) ?
+               run_caption : tr("Stop"));
+}
+
 void MainWindow::save_ui_settings()
 {
        QSettings settings;
-       int id = 0;
 
        settings.beginGroup("MainWindow");
        settings.setValue("state", saveState());
        settings.setValue("geometry", saveGeometry());
        settings.endGroup();
-
-       for (shared_ptr<Session> session : sessions_) {
-               // Ignore sessions using the demo device or no device at all
-               if (session->device()) {
-                       shared_ptr<devices::HardwareDevice> device =
-                               dynamic_pointer_cast< devices::HardwareDevice >
-                               (session->device());
-
-                       if (device &&
-                               device->hardware_device()->driver()->name() == "demo")
-                               continue;
-
-                       settings.beginGroup("Session" + QString::number(id++));
-                       settings.remove("");  // Remove all keys in this group
-                       session->save_settings(settings);
-                       settings.endGroup();
-               }
-       }
-
-       settings.setValue("sessions", id);
 }
 
 void MainWindow::restore_ui_settings()
 {
        QSettings settings;
-       int i, session_count;
 
        settings.beginGroup("MainWindow");
 
@@ -461,21 +621,12 @@ void MainWindow::restore_ui_settings()
                resize(1000, 720);
 
        settings.endGroup();
-
-       session_count = settings.value("sessions", 0).toInt();
-
-       for (i = 0; i < session_count; i++) {
-               settings.beginGroup("Session" + QString::number(i));
-               shared_ptr<Session> session = add_session();
-               session->restore_settings(settings);
-               settings.endGroup();
-       }
 }
 
 shared_ptr<Session> MainWindow::get_tab_session(int index) const
 {
        // Find the session that belongs to the tab's main window
-       for (auto entry : session_windows_)
+       for (auto& entry : session_windows_)
                if (entry.second == session_selector_.widget(index))
                        return entry.first;
 
@@ -486,7 +637,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
 {
        bool data_saved = true;
 
-       for (auto entry : session_windows_)
+       for (auto& entry : session_windows_)
                if (!entry.first->data_saved())
                        data_saved = false;
 
@@ -496,6 +647,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
                event->ignore();
        } else {
                save_ui_settings();
+               save_sessions();
                event->accept();
        }
 }
@@ -516,30 +668,60 @@ bool MainWindow::restoreState(const QByteArray &state, int version)
        return false;
 }
 
-void MainWindow::session_error(const QString text, const QString info_text)
+void MainWindow::on_run_stop_clicked()
 {
-       QMetaObject::invokeMethod(this, "show_session_error",
-               Qt::QueuedConnection, Q_ARG(QString, text),
-               Q_ARG(QString, info_text));
-}
+       GlobalSettings settings;
+       bool all_sessions = settings.value(GlobalSettings::Key_General_StartAllSessions).toBool();
 
-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();
+       if (all_sessions)
+       {
+               vector< shared_ptr<Session> > hw_sessions;
+
+               // Make a list of all sessions where a hardware device is used
+               for (const shared_ptr<Session>& s : sessions_) {
+                       shared_ptr<devices::HardwareDevice> hw_device =
+                                       dynamic_pointer_cast< devices::HardwareDevice >(s->device());
+                       if (!hw_device)
+                               continue;
+                       hw_sessions.push_back(s);
+               }
+
+               // Stop all acquisitions if there are any running ones, start all otherwise
+               bool any_running = any_of(hw_sessions.begin(), hw_sessions.end(),
+                               [](const shared_ptr<Session> &s)
+                               { return (s->get_capture_state() == Session::AwaitingTrigger) ||
+                                               (s->get_capture_state() == Session::Running); });
+
+               for (shared_ptr<Session> s : hw_sessions)
+                       if (any_running)
+                               s->stop_capture();
+                       else
+                               s->start_capture([&](QString message) {Q_EMIT session_error_raised("Capture failed", message);});
+       } else {
+
+               shared_ptr<Session> session = last_focused_session_;
+
+               if (!session)
+                       return;
+
+               switch (session->get_capture_state()) {
+               case Session::Stopped:
+                       session->start_capture([&](QString message) {Q_EMIT session_error_raised("Capture failed", message);});
+                       break;
+               case Session::AwaitingTrigger:
+               case Session::Running:
+                       session->stop_capture();
+                       break;
+               }
+       }
 }
 
-void MainWindow::on_add_view(const QString &title, views::ViewType type,
-       Session *session)
+void MainWindow::on_add_view(views::ViewType type, Session *session)
 {
        // We get a pointer and need a reference
-       for (shared_ptr<Session> s : sessions_)
+       for (shared_ptr<Session>& s : sessions_)
                if (s.get() == session)
-                       add_view(title, type, *s);
+                       add_view(type, *s);
 }
 
 void MainWindow::on_focus_changed()
@@ -576,7 +758,7 @@ void MainWindow::on_focused_session_changed(shared_ptr<Session> session)
        setWindowTitle(session->name() + " - " + WindowTitle);
 
        // Update the state of the run/stop button, too
-       on_capture_state_changed(session.get());
+       update_acq_button(session.get());
 }
 
 void MainWindow::on_new_session_clicked()
@@ -584,25 +766,6 @@ 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_settings_clicked()
 {
        dialogs::Settings dlg(device_manager_);
@@ -615,9 +778,9 @@ void MainWindow::on_session_name_changed()
        Session *session = qobject_cast<Session*>(QObject::sender());
        assert(session);
 
-       for (shared_ptr<views::ViewBase> view : session->views()) {
+       for (const shared_ptr<views::ViewBase>& view : session->views()) {
                // Get the dock that contains the view
-               for (auto entry : view_docks_)
+               for (auto& entry : view_docks_)
                        if (entry.second == view) {
                                entry.first->setObjectName(session->name());
                                entry.first->setWindowTitle(session->name());
@@ -625,7 +788,7 @@ void MainWindow::on_session_name_changed()
        }
 
        // Update the tab widget by finding the main window and the tab from that
-       for (auto entry : session_windows_)
+       for (auto& entry : session_windows_)
                if (entry.first.get() == session) {
                        QMainWindow *window = entry.second;
                        const int index = session_selector_.indexOf(window);
@@ -637,29 +800,40 @@ void MainWindow::on_session_name_changed()
                setWindowTitle(session->name() + " - " + WindowTitle);
 }
 
-void MainWindow::on_capture_state_changed(QObject *obj)
+void MainWindow::on_session_device_changed()
 {
-       Session *caller = qobject_cast<Session*>(obj);
+       Session *session = qobject_cast<Session*>(QObject::sender());
+       assert(session);
 
        // Ignore if caller is not the currently focused session
        // unless there is only one session
-       if ((sessions_.size() > 1) && (caller != last_focused_session_.get()))
+       if ((sessions_.size() > 1) && (session != last_focused_session_.get()))
                return;
 
-       int state = caller->get_capture_state();
+       update_acq_button(session);
+}
 
-       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_session_capture_state_changed(int state)
+{
+       (void)state;
+
+       Session *session = qobject_cast<Session*>(QObject::sender());
+       assert(session);
+
+       // Ignore if caller is not the currently focused session
+       // unless there is only one session
+       if ((sessions_.size() > 1) && (session != last_focused_session_.get()))
+               return;
+
+       update_acq_button(session);
 }
 
-void MainWindow::on_new_view(Session *session)
+void MainWindow::on_new_view(Session *session, int view_type)
 {
        // We get a pointer and need a reference
-       for (shared_ptr<Session> s : sessions_)
+       for (shared_ptr<Session>& s : sessions_)
                if (s.get() == session)
-                       add_view(session->name(), views::ViewTypeTrace, *s);
+                       add_view((views::ViewType)view_type, *s);
 }
 
 void MainWindow::on_view_close_clicked()
@@ -678,7 +852,7 @@ void MainWindow::on_view_close_clicked()
        // Get the view contained in the dock widget
        shared_ptr<views::ViewBase> view;
 
-       for (auto entry : view_docks_)
+       for (auto& entry : view_docks_)
                if (entry.first == dock)
                        view = entry.second;
 
@@ -713,20 +887,70 @@ void MainWindow::on_tab_close_requested(int index)
 {
        shared_ptr<Session> session = get_tab_session(index);
 
-       assert(session);
+       if (!session)
+               return;
 
        if (session->data_saved() || (QMessageBox::question(this, tr("Confirmation"),
                tr("This session contains unsaved data. Close it anyway?"),
                QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes))
                remove_session(session);
+
+       if (sessions_.empty())
+               update_acq_button(nullptr);
 }
 
-void MainWindow::on_view_coloured_bg_shortcut()
+void MainWindow::on_show_decoder_selector(Session *session)
+{
+#ifdef ENABLE_DECODE
+       // Close dock widget if it's already showing and return
+       for (auto& entry : sub_windows_) {
+               QDockWidget* dock = entry.first;
+               shared_ptr<subwindows::SubWindowBase> decoder_selector =
+                       dynamic_pointer_cast<subwindows::decoder_selector::SubWindow>(entry.second);
+
+               if (decoder_selector && (&decoder_selector->session() == session)) {
+                       sub_windows_.erase(dock);
+                       dock->close();
+                       return;
+               }
+       }
+
+       // We get a pointer and need a reference
+       for (shared_ptr<Session>& s : sessions_)
+               if (s.get() == session)
+                       add_subwindow(subwindows::SubWindowTypeDecoderSelector, *s);
+#else
+       (void)session;
+#endif
+}
+
+void MainWindow::on_sub_window_close_clicked()
+{
+       // Find the dock widget that contains the close button that was clicked
+       QObject *w = QObject::sender();
+       QDockWidget *dock = nullptr;
+
+       while (w) {
+           dock = qobject_cast<QDockWidget*>(w);
+           if (dock)
+               break;
+           w = w->parent();
+       }
+
+       sub_windows_.erase(dock);
+       dock->close();
+
+       // Restore focus to the last used main view
+       if (last_focused_session_)
+               last_focused_session_->main_view()->setFocus();
+}
+
+void MainWindow::on_view_colored_bg_shortcut()
 {
        GlobalSettings settings;
 
-       bool state = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
-       settings.setValue(GlobalSettings::Key_View_ColouredBG, !state);
+       bool state = settings.value(GlobalSettings::Key_View_ColoredBG).toBool();
+       settings.setValue(GlobalSettings::Key_View_ColoredBG, !state);
 }
 
 void MainWindow::on_view_sticky_scrolling_shortcut()
@@ -745,34 +969,12 @@ void MainWindow::on_view_show_sampling_points_shortcut()
        settings.setValue(GlobalSettings::Key_View_ShowSamplingPoints, !state);
 }
 
-void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
-{
-       bool state = new_value.toBool();
-
-       for (auto entry : view_docks_) {
-               shared_ptr<views::ViewBase> viewbase = entry.second;
-
-               // Only trace views have this setting
-               views::TraceView::View* view =
-                               qobject_cast<views::TraceView::View*>(viewbase.get());
-               if (view)
-                       view->enable_coloured_bg(state);
-       }
-}
-
-void MainWindow::on_settingViewShowSamplingPoints_changed(const QVariant new_value)
+void MainWindow::on_view_show_analog_minor_grid_shortcut()
 {
-       bool state = new_value.toBool();
-
-       for (auto entry : view_docks_) {
-               shared_ptr<views::ViewBase> viewbase = entry.second;
+       GlobalSettings settings;
 
-               // Only trace views have this setting
-               views::TraceView::View* view =
-                               qobject_cast<views::TraceView::View*>(viewbase.get());
-               if (view)
-                       view->enable_show_sampling_points(state);
-       }
+       bool state = settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool();
+       settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, !state);
 }
 
 void MainWindow::on_close_current_tab()
@@ -782,4 +984,8 @@ void MainWindow::on_close_current_tab()
        on_tab_close_requested(tab);
 }
 
+void MainWindow::on_session_error_raised(const QString text, const QString info_text) {
+       MainWindow::show_session_error(text, info_text);
+}
+
 } // namespace pv