X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=1f00477a2012d9cb5a3a8e11f6cd046ff62f8682;hb=27e8df221014d1a8c7769866773e8dbb0486eea8;hp=d61ccd8368ec8cce971a4735459353b7429d16a4;hpb=fe08b6e8a85c80ae738757f7d85aa38ef7c4bdc3;p=pulseview.git

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index d61ccd83..1f00477a 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -24,6 +24,8 @@
 #include <math.h>
 
 #include <QApplication>
+#include <QFormLayout>
+#include <QMenu>
 
 #include "signal.h"
 #include "view.h"
@@ -48,54 +50,78 @@ const char *const ProbeNames[] = {
 	"SCL"
 };
 
-Signal::Signal(pv::SigSession &session, const sr_probe *const probe) :
+Signal::Signal(pv::SigSession &session, sr_probe *const probe) :
 	Trace(session, probe->name),
 	_probe(probe),
-	_name_action(NULL),
 	_name_widget(NULL),
 	_updating_name_widget(false)
 {
 	assert(_probe);
 }
 
-void Signal::init_context_bar_actions(QWidget *parent)
+void Signal::set_name(QString name)
+{
+	Trace::set_name(name);
+	_updating_name_widget = true;
+	_name_widget->setEditText(name);
+	_updating_name_widget = false;
+}
+
+bool Signal::enabled() const
+{
+	return _probe->enabled;
+}
+
+void Signal::enable(bool enable)
+{
+	_probe->enabled = enable;
+	visibility_changed();
+}
+
+const sr_probe* Signal::probe() const
+{
+	return _probe;
+}
+
+void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
 	_name_widget = new QComboBox(parent);
 	_name_widget->setEditable(true);
 
-	_name_action = new QWidgetAction(parent);
-	_name_action->setDefaultWidget(_name_widget);
-
 	for(unsigned int i = 0; i < countof(ProbeNames); i++)
 		_name_widget->insertItem(i, ProbeNames[i]);
 	_name_widget->setEditText(_probe->name);
 
 	connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
 		this, SLOT(on_text_changed(const QString&)));
-}
 
-void Signal::set_name(QString name)
-{
-	Trace::set_name(name);
-	_updating_name_widget = true;
-	_name_widget->setEditText(name);
-	_updating_name_widget = false;
+	form->addRow(tr("Name"), _name_widget);
+
+	add_colour_option(parent, form);
 }
 
-bool Signal::enabled() const
+QMenu* Signal::create_context_menu(QWidget *parent)
 {
-	return _probe->enabled;
+	QMenu *const menu = Trace::create_context_menu(parent);
+
+	menu->addSeparator();
+
+	QAction *const disable = new QAction(tr("Disable"), this);
+	disable->setShortcuts(QKeySequence::Delete);
+	connect(disable, SIGNAL(triggered()), this, SLOT(on_disable()));
+	menu->addAction(disable);
+
+	return menu;
 }
 
-const sr_probe* Signal::probe() const
+void Signal::delete_pressed()
 {
-	return _probe;
+	on_disable();
 }
 
-void Signal::on_text_changed(const QString &text)
+void Signal::on_disable()
 {
-	Trace::set_name(text);
-	text_changed();
+	enable(false);
 }
 
 } // namespace view