Moved all srd commands into decode thread, implemented error messages

[pulseview.git] / pv / view / decodesignal.cpp

diff --git a/pv/view/decodesignal.cpp b/pv/view/decodesignal.cpp
index b151b3911d13ef6beb570cb092cefae115660ef1..885312088c2ba11db0d6170687c294b837c06553 100644 (file)
--- a/pv/view/decodesignal.cpp
+++ b/pv/view/decodesignal.cpp
@@ -24,7 +24,10 @@ extern "C" {
 
 #include <extdef.h>
 
+#include <boost/foreach.hpp>
+
 #include <QAction>
+#include <QMenu>
 
 #include "decodesignal.h"
 
@@ -59,14 +62,14 @@ DecodeSignal::DecodeSignal(pv::SigSession &session,
                this, SLOT(on_new_decode_data()));
 }
 
-void DecodeSignal::init_context_bar_actions(QWidget *parent)
+bool DecodeSignal::enabled() const
 {
-       (void)parent;
+       return true;
 }
 
-bool DecodeSignal::enabled() const
+const boost::shared_ptr<pv::data::Decoder>& DecodeSignal::decoder() const
 {
-       return true;
+       return _decoder;
 }
 
 void DecodeSignal::set_view(pv::view::View *view)
@@ -109,12 +112,6 @@ void DecodeSignal::paint_mid(QPainter &p, int left, int right)
        }
 }
 
-const list<QAction*> DecodeSignal::get_context_bar_actions()
-{
-       list<QAction*> actions;
-       return actions;
-}
-
 QMenu* DecodeSignal::create_context_menu(QWidget *parent)
 {
        QMenu *const menu = Trace::create_context_menu(parent);
@@ -122,6 +119,7 @@ QMenu* DecodeSignal::create_context_menu(QWidget *parent)
        menu->addSeparator();
 
        QAction *const del = new QAction(tr("Delete"), this);
+       del->setShortcuts(QKeySequence::Delete);
        connect(del, SIGNAL(triggered()), this, SLOT(on_delete()));
        menu->addAction(del);
 
@@ -134,6 +132,11 @@ void DecodeSignal::on_new_decode_data()
                _view->update_viewport();
 }
 
+void DecodeSignal::delete_pressed()
+{
+       on_delete();
+}
+
 void DecodeSignal::on_delete()
 {
        _session.remove_decode_signal(this);