X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fsignal.cpp;h=cda9a4a4f314bab36bd118bc813a2fdb5706351b;hb=76c2f5b8478f5217c69f06ff927039b3b3e60294;hp=b770dee3acadd0d5a45cf38a323850aeed7bb665;hpb=0a952555b9d153f42912e47f35fac5dd4643fca9;p=pulseview.git

diff --git a/pv/views/trace/signal.cpp b/pv/views/trace/signal.cpp
index b770dee3..cda9a4a4 100644
--- a/pv/views/trace/signal.cpp
+++ b/pv/views/trace/signal.cpp
@@ -44,23 +44,28 @@ namespace trace {
 const char *const ChannelNames[] = {
 	"CLK",
 	"DATA",
+	"EN",
 	"IN",
 	"OUT",
 	"RST",
 	"TX",
 	"RX",
-	"EN",
+	"SDA",
+	"SCL"
 	"SCLK",
 	"MOSI",
 	"MISO",
+	"/CS",
+	"nCS",
 	"/SS",
-	"SDA",
-	"SCL"
+	"nSS",
+	"/RST",
+	"nRST",
 };
 
 Signal::Signal(pv::Session &session,
-	shared_ptr<data::SignalBase> channel) :
-	Trace(channel),
+	shared_ptr<data::SignalBase> signal) :
+	Trace(signal),
 	session_(session),
 	name_widget_(nullptr)
 {
@@ -156,10 +161,17 @@ QMenu* Signal::create_header_context_menu(QWidget *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);
+	QString caption;
+
+	if (base_->is_generated())
+		caption = tr("Remove");
+	else
+		caption = tr("Disable");
+
+	QAction *const a = new QAction(caption, this);
+	a->setShortcuts(QKeySequence::Delete);
+	connect(a, SIGNAL(triggered()), this, SLOT(on_disable()));
+	menu->addAction(a);
 
 	return menu;
 }
@@ -184,7 +196,11 @@ void Signal::on_name_changed(const QString &text)
 
 void Signal::on_disable()
 {
-	base_->set_enabled(false);
+	// For generated signals, "disable" means "remove"
+	if (base_->is_generated())
+		session_.remove_generated_signal(base_);
+	else
+		base_->set_enabled(false);
 }
 
 void Signal::on_enabled_changed(bool enabled)