X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=2ee4b1850ded6f36e18b817df0482d0bd9bba431;hb=ab973f4729258b729d2aa84abfa14b61609fa35e;hp=ba1271b0c4251afee4f3dedfff8b534d59a3d647;hpb=8d3e0764def48fdf19dc9100c87bbb42da5a9d6d;p=pulseview.git

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index ba1271b..2ee4b18 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -25,6 +25,8 @@
 
 #include <QApplication>
 #include <QFormLayout>
+#include <QKeyEvent>
+#include <QLineEdit>
 #include <QMenu>
 
 #include <libsigrok/libsigrok.h>
@@ -32,7 +34,9 @@
 #include "signal.h"
 #include "view.h"
 
-using boost::shared_ptr;
+#include <pv/device/devinst.h>
+
+using std::shared_ptr;
 
 namespace pv {
 namespace view {
@@ -54,9 +58,9 @@ const char *const ProbeNames[] = {
 	"SCL"
 };
 
-Signal::Signal(pv::SigSession &session, shared_ptr<pv::DevInst> dev_inst,
-	sr_probe *const probe) :
-	Trace(session, probe->name),
+Signal::Signal(shared_ptr<pv::device::DevInst> dev_inst,
+	const sr_channel *const probe) :
+	Trace(probe->name),
 	_dev_inst(dev_inst),
 	_probe(probe),
 	_name_widget(NULL),
@@ -80,27 +84,43 @@ bool Signal::enabled() const
 
 void Signal::enable(bool enable)
 {
-	_probe->enabled = enable;
+	_dev_inst->enable_probe(_probe, enable);
 	visibility_changed();
 }
 
-const sr_probe* Signal::probe() const
+const sr_channel* Signal::probe() const
 {
 	return _probe;
 }
 
 void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
+	int index;
+
 	_name_widget = new QComboBox(parent);
 	_name_widget->setEditable(true);
 
 	for(unsigned int i = 0; i < countof(ProbeNames); i++)
 		_name_widget->insertItem(i, ProbeNames[i]);
-	_name_widget->setEditText(_probe->name);
+
+	index = _name_widget->findText(_name, Qt::MatchExactly);
+
+	if (index == -1) {
+		_name_widget->insertItem(0, _name);
+		_name_widget->setCurrentIndex(0);
+	} else {
+		_name_widget->setCurrentIndex(index);
+	}
+
+	_name_widget->lineEdit()->selectAll();
+	_name_widget->setFocus();
 
 	connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
 		this, SLOT(on_text_changed(const QString&)));
 
+	// We want to close the popup when the Enter key was pressed.
+	_name_widget->installEventFilter(this);
+
 	form->addRow(tr("Name"), _name_widget);
 
 	add_colour_option(parent, form);
@@ -120,6 +140,24 @@ QMenu* Signal::create_context_menu(QWidget *parent)
 	return menu;
 }
 
+bool Signal::eventFilter(QObject *obj, QEvent *evt)
+{
+	QKeyEvent *keyEvent;
+
+	(void)obj;
+
+	if (evt->type() == QEvent::KeyPress) {
+		keyEvent = static_cast<QKeyEvent*>(evt);
+		if (keyEvent->key() == Qt::Key_Enter ||
+		    keyEvent->key() == Qt::Key_Return) {
+			close_popup();
+			return true;
+		}
+	}
+
+	return false;
+}
+
 void Signal::delete_pressed()
 {
 	on_disable();