X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=d9f6666d266d0d420563c3a66b7dd58c0128061c;hb=b2a53645cfc81baae2bec80aaf6f10e69172d257;hp=a615e8513e7ff04d95b1b56af7c24299858af4c9;hpb=e314eca490a09eec9ee851787f6e8c28805a81fd;p=pulseview.git

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index a615e85..d9f6666 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))
 {
@@ -71,17 +70,26 @@ boost::shared_ptr<pv::view::Signal> Header::get_mouse_over_signal(
 	{
 		assert(s);
 
-		const QRect signal_heading_rect(
-			0, s->get_v_offset() - v_offset,
-			w, View::SignalHeight);
-
-		if (s->pt_in_label_rect(signal_heading_rect, pt))
+		if (s->pt_in_label_rect(s->get_v_offset() - v_offset,
+			0, w, pt))
 			return s;
 	}
 
 	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();
@@ -97,13 +105,10 @@ void Header::paintEvent(QPaintEvent*)
 	{
 		assert(s);
 
-		const QRect signal_heading_rect(
-			0, s->get_v_offset() - v_offset,
-			w, View::SignalHeight);
-
+		const int y = s->get_v_offset() - v_offset;
 		const bool highlight = !dragging && s->pt_in_label_rect(
-			signal_heading_rect, _mouse_point);
-		s->paint_label(painter, signal_heading_rect, highlight);
+			y, 0, w, _mouse_point);
+		s->paint_label(painter, y, w, highlight);
 	}
 
 	painter.end();
@@ -155,6 +160,7 @@ void Header::mousePressEvent(QMouseEvent *event)
 				s->select(false);
 	}
 
+	selection_changed();
 	update();
 }
 
@@ -224,14 +230,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);
 }