X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=fd40e216e196f0bd6b7a2fb09c52bf70061edcf3;hb=0a78bcaf5e2e7c8da02868716609b3410f5a1ab9;hp=e0e280b2826dc3c988c362d1c2eaecaf0a508f29;hpb=2658961bdef3601e07d494a8ed3d01a8101b68cd;p=pulseview.git

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index e0e280b2..fd40e216 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -43,8 +43,7 @@ namespace pv {
 namespace view {
 
 Header::Header(View &parent) :
-	QWidget(&parent),
-	_view(parent),
+	MarginWidget(parent),
 	_action_set_name(new QAction(tr("Set &Name..."), this)),
 	_action_set_colour(new QAction(tr("Set &Colour..."), this))
 {
@@ -55,6 +54,9 @@ Header::Header(View &parent) :
 	connect(_action_set_colour, SIGNAL(triggered()),
 		this, SLOT(on_action_set_colour_triggered()));
 
+	connect(&_view.session(), SIGNAL(signals_changed()),
+		this, SLOT(on_signals_changed()));
+
 	connect(&_view, SIGNAL(signals_moved()),
 		this, SLOT(on_signals_moved()));
 }
@@ -79,6 +81,18 @@ boost::shared_ptr<pv::view::Signal> Header::get_mouse_over_signal(
 	return shared_ptr<Signal>();
 }
 
+void Header::clear_selection()
+{
+	const vector< shared_ptr<Signal> > sigs(
+		_view.session().get_signals());
+	BOOST_FOREACH(const shared_ptr<Signal> s, sigs) {
+		assert(s);
+		s->select(false);
+	}
+
+	update();
+}
+
 void Header::paintEvent(QPaintEvent*)
 {
 	const int w = width();
@@ -149,6 +163,7 @@ void Header::mousePressEvent(QMouseEvent *event)
 				s->select(false);
 	}
 
+	selection_changed();
 	update();
 }
 
@@ -218,14 +233,16 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 
 void Header::on_action_set_name_triggered()
 {
+	bool ok = false;
+
 	shared_ptr<view::Signal> context_signal = _context_signal;
 	if (!context_signal)
 		return;
 
 	const QString new_label = QInputDialog::getText(this, tr("Set Name"),
-		tr("Name"), QLineEdit::Normal, context_signal->get_name());
+		tr("Name"), QLineEdit::Normal, context_signal->get_name(), &ok);
 
-	if (!new_label.isEmpty())
+	if (ok)
 		context_signal->set_name(new_label);
 }
 
@@ -242,6 +259,15 @@ void Header::on_action_set_colour_triggered()
 		context_signal->set_colour(new_colour);
 }
 
+void Header::on_signals_changed()
+{
+	const vector< shared_ptr<Signal> > sigs(_view.session().get_signals());
+	BOOST_FOREACH(shared_ptr<Signal> s, sigs) {
+		assert(s);
+		connect(s.get(), SIGNAL(text_changed()), this, SLOT(update()));
+	}
+}
+
 void Header::on_signals_moved()
 {
 	update();