MainBar: Replaced device selector combo-box with a split button

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 1d2b49fff4772ae364e57ab5eb9c438995d5bc76..dc9e7de5be8589ce8f0f23244bbc7fae03c36ae9 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -92,7 +92,8 @@ MainWindow::MainWindow(DeviceManager &device_manager,
        action_view_zoom_fit_(new QAction(this)),
        action_view_zoom_one_to_one_(new QAction(this)),
        action_view_show_cursors_(new QAction(this)),
-       action_about_(new QAction(this))
+       action_about_(new QAction(this)),
+       menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
 {
        setup_ui();
        restore_ui_settings();
@@ -154,6 +155,11 @@ QAction* MainWindow::action_about() const
        return action_about_;
 }
 
+QMenu* MainWindow::menu_decoder_add() const
+{
+       return menu_decoders_add_;
+}
+
 void MainWindow::run_stop()
 {
        switch(session_.get_capture_state()) {
@@ -282,6 +288,8 @@ void MainWindow::setup_ui()
 
        action_view_show_cursors_->setCheckable(true);
        action_view_show_cursors_->setChecked(view_->cursors_shown());
+       action_view_show_cursors_->setIcon(QIcon::fromTheme("show-cursors",
+               QIcon(":/icons/show-cursors.svg")));
        action_view_show_cursors_->setShortcut(QKeySequence(Qt::Key_C));
        action_view_show_cursors_->setObjectName(
                QString::fromUtf8("actionViewShowCursors"));
@@ -293,13 +301,11 @@ void MainWindow::setup_ui()
        QMenu *const menu_decoders = new QMenu;
        menu_decoders->setTitle(tr("&Decoders"));
 
-       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*)),
+       menu_decoders_add_->setTitle(tr("&Add"));
+       connect(menu_decoders_add_, SIGNAL(decoder_selected(srd_decoder*)),
                this, SLOT(add_decoder(srd_decoder*)));
 
-       menu_decoders->addMenu(menu_decoders_add);
+       menu_decoders->addMenu(menu_decoders_add_);
 #endif
 
        // Help Menu
@@ -320,18 +326,6 @@ void MainWindow::setup_ui()
        setMenuBar(menu_bar);
        QMetaObject::connectSlotsByName(this);
 
-       // Setup the toolbar
-       QToolBar *const toolbar = new QToolBar(tr("Main Toolbar"), this);
-       toolbar->setObjectName(QString::fromUtf8("MainToolbar"));
-       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);
-
        // Setup the sampling bar
        main_bar_ = new toolbars::MainBar(session_, *this);
 
@@ -444,23 +438,7 @@ void MainWindow::session_error(
 
 void MainWindow::update_device_list()
 {
-       assert(main_bar_);
-
-       shared_ptr<Device> selected_device = session_.device();
-       list< shared_ptr<Device> > devices;
-
-       if (device_manager_.devices().size() == 0)
-               return;
-
-       std::copy(device_manager_.devices().begin(),
-               device_manager_.devices().end(), std::back_inserter(devices));
-
-       if (std::find(devices.begin(), devices.end(), selected_device) ==
-               devices.end())
-               devices.push_back(selected_device);
-       assert(selected_device);
-
-       main_bar_->set_device_list(devices, selected_device);
+       main_bar_->update_device_list();
 }
 
 void MainWindow::closeEvent(QCloseEvent *event)