]> sigrok.org Git - pulseview.git/blobdiff - pv/mainwindow.cpp
Fix #814 by using PNG application logo instead of SVG
[pulseview.git] / pv / mainwindow.cpp
index f907f09cce33f118b0c830dbc0ee564f50a76501..41c748b75d2908e732e410251f3c5d8a65a14779 100644 (file)
 #include <QVBoxLayout>
 #include <QWidget>
 
+#include <QDockWidget>
+
 #include "mainwindow.hpp"
 
 #include "devicemanager.hpp"
+#include "util.hpp"
+#include "data/segment.hpp"
+#include "devices/hardwaredevice.hpp"
+#include "devices/inputfile.hpp"
+#include "devices/sessionfile.hpp"
 #include "dialogs/about.hpp"
 #include "dialogs/connect.hpp"
 #include "dialogs/inputoutputoptions.hpp"
@@ -53,6 +60,7 @@
 #include "view/logicsignal.hpp"
 #include "view/view.hpp"
 #include "widgets/exportmenu.hpp"
+#include "widgets/importmenu.hpp"
 #ifdef ENABLE_DECODE
 #include "widgets/decodermenu.hpp"
 #endif
 #include <glib.h>
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
+using std::cerr;
+using std::endl;
 using std::list;
+using std::make_shared;
 using std::map;
+using std::max;
+using std::pair;
 using std::shared_ptr;
 using std::string;
 using std::vector;
 
 using boost::algorithm::join;
 
-using sigrok::Device;
 using sigrok::Error;
-using sigrok::HardwareDevice;
 using sigrok::OutputFormat;
+using sigrok::InputFormat;
 
 namespace pv {
 
@@ -87,33 +99,36 @@ const char *MainWindow::SettingOpenDirectory = "MainWindow/OpenDirectory";
 const char *MainWindow::SettingSaveDirectory = "MainWindow/SaveDirectory";
 
 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_save_selection_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_sticky_scrolling_(new QAction(this)),
+       action_view_coloured_bg_(new QAction(this)),
        action_view_show_cursors_(new QAction(this)),
        action_about_(new QAction(this))
 #ifdef ENABLE_DECODE
        , menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
 #endif
 {
+       qRegisterMetaType<util::Timestamp>("util::Timestamp");
+
        setup_ui();
        restore_ui_settings();
-       if (open_file_name) {
-               const QString s(QString::fromUtf8(open_file_name));
-               QMetaObject::invokeMethod(this, "load_file",
-                       Qt::QueuedConnection,
-                       Q_ARG(QString, s));
-       }
+       if (open_file_name.empty())
+               select_init_device();
+       else
+               load_init_file(open_file_name, open_file_format);
 }
 
 QAction* MainWindow::action_open() const
@@ -126,6 +141,11 @@ QAction* MainWindow::action_save_as() const
        return action_save_as_;
 }
 
+QAction* MainWindow::action_save_selection_as() const
+{
+       return action_save_selection_as_;
+}
+
 QAction* MainWindow::action_connect() const
 {
        return action_connect_;
@@ -156,6 +176,16 @@ QAction* MainWindow::action_view_zoom_one_to_one() const
        return action_view_zoom_one_to_one_;
 }
 
+QAction* MainWindow::action_view_sticky_scrolling() const
+{
+       return action_view_sticky_scrolling_;
+}
+
+QAction* MainWindow::action_view_coloured_bg() const
+{
+       return action_view_coloured_bg_;
+}
+
 QAction* MainWindow::action_view_show_cursors() const
 {
        return action_view_show_cursors_;
@@ -173,14 +203,73 @@ QMenu* MainWindow::menu_decoder_add() const
 }
 #endif
 
+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();
+       }
+
+       // Get the view contained in the dock widget
+       for (auto entry : view_docks_)
+               if (entry.first.get() == dock)
+                       return entry.second;
+
+       return shared_ptr<pv::view::View>();
+}
+
+shared_ptr<pv::view::View> MainWindow::add_view(const QString &title,
+       view::ViewType type, Session &session)
+{
+       shared_ptr<pv::view::View> v;
+
+       if (type == pv::view::TraceView)
+               v = make_shared<pv::view::View>(session, this);
+
+       if (v) {
+               shared_ptr<QDockWidget> dock = make_shared<QDockWidget>(title, this);
+               dock->setWidget(v.get());
+               dock->setObjectName(title);
+               addDockWidget(Qt::TopDockWidgetArea, dock.get());
+               view_docks_[dock] = v;
+
+               dock->setFeatures(QDockWidget::DockWidgetMovable |
+                       QDockWidget::DockWidgetFloatable);
+
+               if (type == view::TraceView) {
+                       connect(&session, SIGNAL(trigger_event(util::Timestamp)), v.get(),
+                               SLOT(trigger_event(util::Timestamp)));
+                       connect(v.get(), SIGNAL(sticky_scrolling_changed(bool)), this,
+                               SLOT(sticky_scrolling_changed(bool)));
+                       connect(v.get(), SIGNAL(always_zoom_to_fit_changed(bool)), this,
+                               SLOT(always_zoom_to_fit_changed(bool)));
+
+                       v->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
+                       v->enable_coloured_bg(action_view_coloured_bg_->isChecked());
+                       action_view_show_cursors_->setChecked(v->cursors_shown());
+               }
+       }
+
+       return v;
+}
+
 void MainWindow::run_stop()
 {
-       switch(session_.get_capture_state()) {
+       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();
@@ -188,11 +277,14 @@ void MainWindow::run_stop()
        }
 }
 
-void MainWindow::select_device(shared_ptr<Device> device)
+void MainWindow::select_device(shared_ptr<devices::Device> device)
 {
        try {
-               session_.set_device(device);
-       } catch(const QString &e) {
+               if (device)
+                       session_.set_device(device);
+               else
+                       session_.set_default_device();
+       } catch (const QString &e) {
                QMessageBox msg(this);
                msg.setText(e);
                msg.setInformativeText(tr("Failed to Select Device"));
@@ -202,16 +294,50 @@ void MainWindow::select_device(shared_ptr<Device> device)
        }
 }
 
-void MainWindow::export_file(shared_ptr<OutputFormat> format)
+void MainWindow::export_file(shared_ptr<OutputFormat> format,
+       bool selection_only)
 {
        using pv::dialogs::StoreProgress;
 
+       // Make sure there's a view selected to pull the data from
+       shared_ptr<pv::view::View> view = get_active_view();
+       if (!view) {
+               show_session_error(tr("No View Selected"), tr("Please click on the " \
+                               "view whose data you want to save and try again."));
+               return;
+       }
+
        // Stop any currently running capture session
        session_.stop_capture();
 
        QSettings settings;
        const QString dir = settings.value(SettingSaveDirectory).toString();
 
+       std::pair<uint64_t, uint64_t> sample_range;
+
+       // Selection only? Verify that the cursors are active and fetch their values
+       if (selection_only) {
+               if (!view->cursors()->enabled()) {
+                       show_session_error(tr("Missing Cursors"), tr("You need to set the " \
+                                       "cursors before you can save the data enclosed by them " \
+                                       "to a session file (e.g. using ALT-V - Show Cursors)."));
+                       return;
+               }
+
+               const double samplerate = session_.get_samplerate();
+
+               const pv::util::Timestamp& start_time = view->cursors()->first()->time();
+               const pv::util::Timestamp& end_time = view->cursors()->second()->time();
+
+               const uint64_t start_sample =
+                       std::max((double)0, start_time.convert_to<double>() * samplerate);
+               const uint64_t end_sample = end_time.convert_to<double>() * samplerate;
+
+               sample_range = std::make_pair(start_sample, end_sample);
+       } else {
+               sample_range = std::make_pair(0, 0);
+       }
+
        // Construct the filter
        const vector<string> exts = format->extensions();
        QString filter = tr("%1 files ").arg(
@@ -221,7 +347,7 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format)
                filter += "(*.*)";
        else
                filter += QString("(*.%1);;%2 (*.*)").arg(
-                       QString::fromStdString(join(exts, ", *."))).arg(
+                       QString::fromStdString(join(exts, ", *.")),
                        tr("All Files"));
 
        // Show the file dialog
@@ -247,30 +373,60 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format)
        }
 
        StoreProgress *dlg = new StoreProgress(file_name, format, options,
-               session_, this);
+               sample_range, session_, this);
        dlg->run();
 }
 
+void MainWindow::import_file(shared_ptr<InputFormat> format)
+{
+       assert(format);
+
+       QSettings settings;
+       const QString dir = settings.value(SettingOpenDirectory).toString();
+
+       // Construct the filter
+       const vector<string> exts = format->extensions();
+       const QString filter = exts.empty() ? "" :
+               tr("%1 files (*.%2)").arg(
+                       QString::fromStdString(format->description()),
+                       QString::fromStdString(join(exts, ", *.")));
+
+       // Show the file dialog
+       const QString file_name = QFileDialog::getOpenFileName(
+               this, tr("Import File"), dir, tr(
+                       "%1 files (*.*);;All Files (*.*)").arg(
+                       QString::fromStdString(format->description())));
+
+       if (file_name.isEmpty())
+               return;
+
+       // Show the options dialog
+       map<string, Glib::VariantBase> options;
+       if (!format->options().empty()) {
+               dialogs::InputOutputOptions dlg(
+                       tr("Import %1").arg(QString::fromStdString(
+                               format->description())),
+                       format->options(), this);
+               if (!dlg.exec())
+                       return;
+               options = dlg.options();
+       }
+
+       load_file(file_name, format, options);
+
+       const QString abs_path = QFileInfo(file_name).absolutePath();
+       settings.setValue(SettingOpenDirectory, abs_path);
+}
+
 void MainWindow::setup_ui()
 {
        setObjectName(QString::fromUtf8("MainWindow"));
 
        // Set the window icon
        QIcon icon;
-       icon.addFile(QString(":/icons/sigrok-logo-notext.svg"));
+       icon.addFile(QString(":/icons/sigrok-logo-notext.png"));
        setWindowIcon(icon);
 
-       // Setup the central widget
-       central_widget_ = new QWidget(this);
-       vertical_layout_ = new QVBoxLayout(central_widget_);
-       vertical_layout_->setSpacing(6);
-       vertical_layout_->setContentsMargins(0, 0, 0, 0);
-       setCentralWidget(central_widget_);
-
-       view_ = new pv::view::View(session_, this);
-
-       vertical_layout_->addWidget(view_);
-
        // Setup the menu bar
        pv::widgets::HidingMenuBar *const menu_bar =
                new pv::widgets::HidingMenuBar(this);
@@ -293,6 +449,13 @@ void MainWindow::setup_ui()
        action_save_as_->setObjectName(QString::fromUtf8("actionSaveAs"));
        menu_file->addAction(action_save_as_);
 
+       action_save_selection_as_->setText(tr("Save Selected &Range As..."));
+       action_save_selection_as_->setIcon(QIcon::fromTheme("document-save-as",
+               QIcon(":/icons/document-save-as.png")));
+       action_save_selection_as_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R));
+       action_save_selection_as_->setObjectName(QString::fromUtf8("actionSaveSelectionAs"));
+       menu_file->addAction(action_save_selection_as_);
+
        menu_file->addSeparator();
 
        widgets::ExportMenu *menu_file_export = new widgets::ExportMenu(this,
@@ -303,6 +466,14 @@ void MainWindow::setup_ui()
                this, SLOT(export_file(std::shared_ptr<sigrok::OutputFormat>)));
        menu_file->addAction(menu_file_export->menuAction());
 
+       widgets::ImportMenu *menu_file_import = new widgets::ImportMenu(this,
+               device_manager_.context());
+       menu_file_import->setTitle(tr("&Import"));
+       connect(menu_file_import,
+               SIGNAL(format_selected(std::shared_ptr<sigrok::InputFormat>)),
+               this, SLOT(import_file(std::shared_ptr<sigrok::InputFormat>)));
+       menu_file->addAction(menu_file_import->menuAction());
+
        menu_file->addSeparator();
 
        action_connect_->setText(tr("&Connect to Device..."));
@@ -339,6 +510,7 @@ void MainWindow::setup_ui()
                QString::fromUtf8("actionViewZoomOut"));
        menu_view->addAction(action_view_zoom_out_);
 
+       action_view_zoom_fit_->setCheckable(true);
        action_view_zoom_fit_->setText(tr("Zoom to &Fit"));
        action_view_zoom_fit_->setIcon(QIcon::fromTheme("zoom-fit",
                QIcon(":/icons/zoom-fit.png")));
@@ -357,8 +529,27 @@ void MainWindow::setup_ui()
 
        menu_view->addSeparator();
 
+       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_view->addAction(action_view_sticky_scrolling_);
+
+       menu_view->addSeparator();
+
+       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"));
+       menu_view->addAction(action_view_coloured_bg_);
+
+       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));
@@ -397,9 +588,16 @@ void MainWindow::setup_ui()
        setMenuBar(menu_bar);
        QMetaObject::connectSlotsByName(this);
 
+       // Also add all actions to the main window for always-enabled hotkeys
+       for (QAction* action : menu_bar->actions())
+               this->addAction(action);
+
        // Setup the toolbar
        main_bar_ = new toolbars::MainBar(session_, *this);
 
+       // Set up the initial view
+       add_view(tr("Untitled"), pv::view::TraceView, session_);
+
        // Populate the device list and select the initially selected device
        update_device_list();
 
@@ -415,6 +613,78 @@ void MainWindow::setup_ui()
                SLOT(device_selected()));
 }
 
+void MainWindow::select_init_device()
+{
+       QSettings settings;
+       map<string, string> dev_info;
+       list<string> key_list;
+       shared_ptr<devices::HardwareDevice> device;
+
+       // Re-select last used device if possible but only if it's not demo
+       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) {
+               const QString k = QString::fromStdString(key);
+               if (!settings.contains(k))
+                       continue;
+
+               const string value = settings.value(k).toString().toStdString();
+               if (!value.empty())
+                       dev_info.insert(std::make_pair(key, value));
+       }
+
+       if (dev_info.count("model") > 0)
+               if (dev_info.at("model").find("Demo device") == std::string::npos)
+                       device = device_manager_.find_device_from_info(dev_info);
+
+       // When we can't find a device similar to the one we used last
+       // time and there is at least one device aside from demo, use it
+       if (!device) {
+               for (shared_ptr<devices::HardwareDevice> dev : device_manager_.devices()) {
+                       dev_info = device_manager_.get_device_info(dev);
+
+                       if (dev_info.count("model") > 0)
+                               if (dev_info.at("model").find("Demo device") == std::string::npos) {
+                                       device = dev;
+                                       break;
+                               }
+               }
+       }
+
+       select_device(device);
+       update_device_list();
+
+       settings.endGroup();
+}
+
+void MainWindow::load_init_file(const std::string &file_name,
+       const std::string &format)
+{
+       shared_ptr<InputFormat> input_format;
+
+       if (!format.empty()) {
+               const map<string, shared_ptr<InputFormat> > formats =
+                       device_manager_.context()->input_formats();
+               const auto iter = find_if(formats.begin(), formats.end(),
+                       [&](const pair<string, shared_ptr<InputFormat> > f) {
+                               return f.first == format; });
+               if (iter == formats.end()) {
+                       cerr << "Unexpected input format: " << format << endl;
+                       return;
+               }
+
+               input_format = (*iter).second;
+       }
+
+       load_file(QString::fromStdString(file_name), input_format);
+}
+
+
 void MainWindow::save_ui_settings()
 {
        QSettings settings;
@@ -439,7 +709,6 @@ void MainWindow::save_ui_settings()
                        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()));
@@ -455,12 +724,6 @@ void MainWindow::restore_ui_settings()
 {
        QSettings settings;
 
-       shared_ptr<HardwareDevice> device;
-
-       map<string, string> dev_info;
-       list<string> key_list;
-       string value;
-
        settings.beginGroup("MainWindow");
 
        if (settings.contains("geometry")) {
@@ -470,33 +733,6 @@ void MainWindow::restore_ui_settings()
                resize(1000, 720);
 
        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);
-
-       if (device) {
-               select_device(device);
-               update_device_list();
-       }
-
-       settings.endGroup();
 }
 
 void MainWindow::session_error(
@@ -512,30 +748,26 @@ void MainWindow::update_device_list()
        main_bar_->update_device_list();
 }
 
-void MainWindow::closeEvent(QCloseEvent *event)
-{
-       save_ui_settings();
-       event->accept();
-}
-
-void MainWindow::keyReleaseEvent(QKeyEvent *event)
-{
-       if (event->key() == Qt::Key_Alt) {
-               menuBar()->setHidden(!menuBar()->isHidden());
-               menuBar()->setFocus();
-       }
-       QMainWindow::keyReleaseEvent(event);
-}
-
-void MainWindow::load_file(QString file_name)
+void MainWindow::load_file(QString file_name,
+       std::shared_ptr<sigrok::InputFormat> format,
+       const std::map<std::string, Glib::VariantBase> &options)
 {
        const QString errorMessage(
                QString("Failed to load file %1").arg(file_name));
-       const QString infoMessage;
 
        try {
-               session_.set_session_file(file_name.toStdString());
-       } catch(Error e) {
+               if (format)
+                       session_.set_device(shared_ptr<devices::Device>(
+                               new devices::InputFile(
+                                       device_manager_.context(),
+                                       file_name.toStdString(),
+                                       format, options)));
+               else
+                       session_.set_device(shared_ptr<devices::Device>(
+                               new devices::SessionFile(
+                                       device_manager_.context(),
+                                       file_name.toStdString())));
+       } catch (Error e) {
                show_session_error(tr("Failed to load ") + file_name, e.what());
                session_.set_default_device();
                update_device_list();
@@ -544,10 +776,25 @@ void MainWindow::load_file(QString file_name)
 
        update_device_list();
 
-       session_.start_capture([&, errorMessage, infoMessage](QString) {
+       session_.start_capture([&, errorMessage](QString infoMessage) {
                session_error(errorMessage, infoMessage); });
 }
 
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+       save_ui_settings();
+       event->accept();
+}
+
+void MainWindow::keyReleaseEvent(QKeyEvent *event)
+{
+       if (event->key() == Qt::Key_Alt) {
+               menuBar()->setHidden(!menuBar()->isHidden());
+               menuBar()->setFocus();
+       }
+       QMainWindow::keyReleaseEvent(event);
+}
+
 void MainWindow::show_session_error(
        const QString text, const QString info_text)
 {
@@ -583,6 +830,11 @@ void MainWindow::on_actionSaveAs_triggered()
        export_file(device_manager_.context()->output_formats()["srzip"]);
 }
 
+void MainWindow::on_actionSaveSelectionAs_triggered()
+{
+       export_file(device_manager_.context()->output_formats()["srzip"], true);
+}
+
 void MainWindow::on_actionConnect_triggered()
 {
        // Stop any currently running capture session
@@ -605,33 +857,57 @@ void MainWindow::on_actionQuit_triggered()
 
 void MainWindow::on_actionViewZoomIn_triggered()
 {
-       view_->zoom(1);
+       shared_ptr<pv::view::View> view = get_active_view();
+       if (view)
+               view->zoom(1);
 }
 
 void MainWindow::on_actionViewZoomOut_triggered()
 {
-       view_->zoom(-1);
+       shared_ptr<pv::view::View> view = get_active_view();
+       if (view)
+               view->zoom(-1);
 }
 
 void MainWindow::on_actionViewZoomFit_triggered()
 {
-       view_->zoom_fit();
+       shared_ptr<pv::view::View> view = get_active_view();
+       if (view)
+               view->zoom_fit(action_view_zoom_fit_->isChecked());
 }
 
 void MainWindow::on_actionViewZoomOneToOne_triggered()
 {
-       view_->zoom_one_to_one();
+       shared_ptr<pv::view::View> view = get_active_view();
+       if (view)
+               view->zoom_one_to_one();
+}
+
+void MainWindow::on_actionViewStickyScrolling_triggered()
+{
+       shared_ptr<pv::view::View> view = get_active_view();
+       if (view)
+               view->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
+}
+
+void MainWindow::on_actionViewColouredBg_triggered()
+{
+       shared_ptr<pv::view::View> view = get_active_view();
+       if (view)
+               view->enable_coloured_bg(action_view_coloured_bg_->isChecked());
 }
 
 void MainWindow::on_actionViewShowCursors_triggered()
 {
-       assert(view_);
+       shared_ptr<pv::view::View> view = get_active_view();
+       if (!view)
+               return;
 
-       const bool show = !view_->cursors_shown();
-       if(show)
-               view_->centre_cursors();
+       const bool show = !view->cursors_shown();
+       if (show)
+               view->centre_cursors();
 
-       view_->show_cursors(show);
+       view->show_cursors(show);
 }
 
 void MainWindow::on_actionAbout_triggered()
@@ -640,6 +916,16 @@ void MainWindow::on_actionAbout_triggered()
        dlg.exec();
 }
 
+void MainWindow::sticky_scrolling_changed(bool state)
+{
+       action_view_sticky_scrolling_->setChecked(state);
+}
+
+void MainWindow::always_zoom_to_fit_changed(bool state)
+{
+       action_view_zoom_fit_->setChecked(state);
+}
+
 void MainWindow::add_decoder(srd_decoder *decoder)
 {
 #ifdef ENABLE_DECODE
@@ -658,11 +944,14 @@ void MainWindow::capture_state_changed(int state)
 void MainWindow::device_selected()
 {
        // Set the title to include the device/file name
-       const shared_ptr<sigrok::Device> device = session_.device();
-       if (!device)
+       const shared_ptr<devices::Device> device = session_.device();
+
+       if (!device) {
+               main_bar_->reset_device_selector();
                return;
+       }
 
-       const string display_name = device_manager_.get_display_name(device);
+       const string display_name = device->display_name(device_manager_);
        setWindowTitle(tr("%1 - PulseView").arg(display_name.c_str()));
 }