From b9b7854ed5101148ba0a0d64a29708f804537a6c Mon Sep 17 00:00:00 2001
From: Soeren Apel <soeren@apelpie.net>
Date: Tue, 26 Aug 2014 13:18:40 +0200
Subject: [PATCH] Fix bug 298 by enhancing signal and trace popup behavior

---
 pv/view/signal.cpp | 3 +++
 pv/view/trace.cpp  | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 48b400d..8ca5130 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -25,6 +25,7 @@
 
 #include <QApplication>
 #include <QFormLayout>
+#include <QLineEdit>
 #include <QMenu>
 
 #include <libsigrok/libsigrok.h>
@@ -99,6 +100,8 @@ void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 	for(unsigned int i = 0; i < countof(ProbeNames); i++)
 		_name_widget->insertItem(i, ProbeNames[i]);
 	_name_widget->setEditText(_probe->name);
+	_name_widget->lineEdit()->selectAll();
+	_name_widget->setFocus();
 
 	connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
 		this, SLOT(on_text_changed(const QString&)));
diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index d10448f..d3e7f01 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -263,6 +263,8 @@ void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
 	QLineEdit *const name_edit = new QLineEdit(parent);
 	name_edit->setText(_name);
+	name_edit->selectAll();
+	name_edit->setFocus();
 	connect(name_edit, SIGNAL(textChanged(const QString&)),
 		this, SLOT(on_text_changed(const QString&)));
 	form->addRow(tr("Name"), name_edit);
-- 
2.30.2