Session: Break up add_decoder()

[pulseview.git] / pv / toolbars / mainbar.cpp

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index f3bbcee1b90490af234be2db0bc9e1bac2759173..272e844f981df35ba05be9f1a472322ec2ea99b3 100644 (file)
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -35,6 +35,7 @@
 
 #include <boost/algorithm/string/join.hpp>
 
+#include <pv/data/decodesignal.hpp>
 #include <pv/devicemanager.hpp>
 #include <pv/devices/hardwaredevice.hpp>
 #include <pv/devices/inputfile.hpp>
@@ -43,10 +44,10 @@
 #include <pv/dialogs/inputoutputoptions.hpp>
 #include <pv/dialogs/storeprogress.hpp>
 #include <pv/mainwindow.hpp>
-#include <pv/popups/deviceoptions.hpp>
 #include <pv/popups/channels.hpp>
+#include <pv/popups/deviceoptions.hpp>
 #include <pv/util.hpp>
-#include <pv/view/view.hpp>
+#include <pv/views/trace/view.hpp>
 #include <pv/widgets/exportmenu.hpp>
 #include <pv/widgets/importmenu.hpp>
 #ifdef ENABLE_DECODE
@@ -87,7 +88,7 @@ const char *MainBar::SettingOpenDirectory = "MainWindow/OpenDirectory";
 const char *MainBar::SettingSaveDirectory = "MainWindow/SaveDirectory";
 
 MainBar::MainBar(Session &session, QWidget *parent,
-               pv::views::TraceView::View *view) :
+               pv::views::trace::View *view) :
        StandardBar(session, parent, view, false),
        action_new_view_(new QAction(this)),
        action_open_(new QAction(this)),
@@ -114,6 +115,8 @@ MainBar::MainBar(Session &session, QWidget *parent,
 {
        setObjectName(QString::fromUtf8("MainBar"));
 
+       setContextMenuPolicy(Qt::PreventContextMenu);
+
        // Actions
        action_new_view_->setText(tr("New &View"));
        action_new_view_->setIcon(QIcon::fromTheme("window-new",
@@ -199,10 +202,10 @@ MainBar::MainBar(Session &session, QWidget *parent,
        connect(menu_decoders_add_, SIGNAL(decoder_selected(srd_decoder*)),
                this, SLOT(add_decoder(srd_decoder*)));
 
-       add_decoder_button_->setIcon(QIcon::fromTheme("add-decoder",
-               QIcon(":/icons/add-decoder.svg")));
+       add_decoder_button_->setIcon(QIcon(":/icons/add-decoder.svg"));
        add_decoder_button_->setPopupMode(QToolButton::InstantPopup);
        add_decoder_button_->setMenu(menu_decoders_add_);
+       add_decoder_button_->setToolTip(tr("Add low-level, non-stacked protocol decoder"));
 #endif
 
        connect(&sample_count_, SIGNAL(value_changed()),
@@ -215,12 +218,11 @@ MainBar::MainBar(Session &session, QWidget *parent,
        set_capture_state(pv::Session::Stopped);
 
        configure_button_.setToolTip(tr("Configure Device"));
-       configure_button_.setIcon(QIcon::fromTheme("configure",
-               QIcon(":/icons/configure.png")));
+       configure_button_.setIcon(QIcon::fromTheme("preferences-system",
+               QIcon(":/icons/preferences-system.png")));
 
        channels_button_.setToolTip(tr("Configure Channels"));
-       channels_button_.setIcon(QIcon::fromTheme("channels",
-               QIcon(":/icons/channels.svg")));
+       channels_button_.setIcon(QIcon(":/icons/channels.svg"));
 
        add_toolbar_widgets();
 
@@ -420,8 +422,7 @@ void MainBar::update_sample_count_selector()
        min_sample_count = min(max(min_sample_count, MinSampleCount),
                max_sample_count);
 
-       sample_count_.show_125_list(
-               min_sample_count, max_sample_count);
+       sample_count_.show_125_list(min_sample_count, max_sample_count);
 
        if (sr_dev->config_check(ConfigKey::LIMIT_SAMPLES, Capability::GET)) {
                auto gvar = sr_dev->config_get(ConfigKey::LIMIT_SAMPLES);
@@ -575,14 +576,15 @@ void MainBar::add_decoder(srd_decoder *decoder)
 {
 #ifdef ENABLE_DECODE
        assert(decoder);
-       session_.add_decoder(decoder);
+       shared_ptr<data::DecodeSignal> signal = session_.add_decode_signal();
+       if (signal)
+               signal->stack_decoder(decoder);
 #else
        (void)decoder;
 #endif
 }
 
-void MainBar::export_file(shared_ptr<OutputFormat> format,
-       bool selection_only)
+void MainBar::export_file(shared_ptr<OutputFormat> format, bool selection_only)
 {
        using pv::dialogs::StoreProgress;
 
@@ -596,13 +598,13 @@ void MainBar::export_file(shared_ptr<OutputFormat> format,
 
        // Selection only? Verify that the cursors are active and fetch their values
        if (selection_only) {
-               views::TraceView::View *trace_view =
-                       qobject_cast<views::TraceView::View*>(session_.main_view().get());
+               views::trace::View *trace_view =
+                       qobject_cast<views::trace::View*>(session_.main_view().get());
 
                if (!trace_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)."));
+                                       "to a session file (e.g. using the Show Cursors button)."));
                        return;
                }
 
@@ -627,9 +629,9 @@ void MainBar::export_file(shared_ptr<OutputFormat> format,
                QString::fromStdString(format->description()));
 
        if (exts.empty())
-               filter += "(*.*)";
+               filter += "(*)";
        else
-               filter += QString("(*.%1);;%2 (*.*)").arg(
+               filter += QString("(*.%1);;%2 (*)").arg(
                        QString::fromStdString(join(exts, ", *.")),
                        tr("All Files"));
 
@@ -680,7 +682,7 @@ void MainBar::import_file(shared_ptr<InputFormat> format)
        // Show the file dialog
        const QString file_name = QFileDialog::getOpenFileName(
                this, tr("Import File"), dir, tr(
-                       "%1 files (*.*);;All Files (*.*)").arg(
+                       "%1 files (*);;All Files (*)").arg(
                        QString::fromStdString(format->description())));
 
        if (file_name.isEmpty())
@@ -741,7 +743,7 @@ void MainBar::on_sample_rate_changed()
 void MainBar::on_config_changed()
 {
        commit_sample_count();
-       commit_sample_rate();   
+       commit_sample_rate();
 }
 
 void MainBar::on_actionNewView_triggered()
@@ -757,8 +759,8 @@ void MainBar::on_actionOpen_triggered()
        // Show the dialog
        const QString file_name = QFileDialog::getOpenFileName(
                this, tr("Open File"), dir, tr(
-                       "Sigrok Sessions (*.sr);;"
-                       "All Files (*.*)"));
+                       "sigrok Sessions (*.sr);;"
+                       "All Files (*)"));
 
        if (!file_name.isEmpty()) {
                session_.load_file(file_name);