X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=f8f5b6380514ac2604730ce0a687c0c469fff04a;hp=e14a9f246ecfb39e7d390e9d9f96be136cdf80e9;hb=0c0218fd70bde15f2ccd20f39f6d3ddddd3e1691;hpb=38eeddeab105aea3f8015dda5399ebbead21550a

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index e14a9f24..f8f5b638 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -29,13 +29,13 @@
 #include <boost/foreach.hpp>
 
 #include <QApplication>
-#include <QColorDialog>
-#include <QInputDialog>
 #include <QMenu>
 #include <QMouseEvent>
 #include <QPainter>
 #include <QRect>
 
+#include <pv/widgets/popup.h>
+
 using namespace boost;
 using namespace std;
 
@@ -44,16 +44,10 @@ namespace view {
 
 Header::Header(View &parent) :
 	MarginWidget(parent),
-	_action_set_name(new QAction(tr("Set &Name..."), this)),
-	_action_set_colour(new QAction(tr("Set &Colour..."), this))
+	_dragging(false)
 {
 	setMouseTracking(true);
 
-	connect(_action_set_name, SIGNAL(triggered()),
-		this, SLOT(on_action_set_name_triggered()));
-	connect(_action_set_colour, SIGNAL(triggered()),
-		this, SLOT(on_action_set_colour_triggered()));
-
 	connect(&_view.session(), SIGNAL(signals_changed()),
 		this, SLOT(on_signals_changed()));
 
@@ -66,13 +60,10 @@ shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
 	const int w = width();
 	const vector< shared_ptr<Trace> > traces(_view.get_traces());
 
-	const int v_offset = _view.v_offset();
 	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
 	{
 		assert(t);
-
-		if (t->pt_in_label_rect(t->get_v_offset() - v_offset,
-			0, w, pt))
+		if (t->pt_in_label_rect(0, w, pt))
 			return t;
 	}
 
@@ -98,16 +89,14 @@ void Header::paintEvent(QPaintEvent*)
 	QPainter painter(this);
 	painter.setRenderHint(QPainter::Antialiasing);
 
-	const int v_offset = _view.v_offset();
 	const bool dragging = !_drag_traces.empty();
 	BOOST_FOREACH(const shared_ptr<Trace> t, traces)
 	{
 		assert(t);
 
-		const int y = t->get_v_offset() - v_offset;
 		const bool highlight = !dragging && t->pt_in_label_rect(
-			y, 0, w, _mouse_point);
-		t->paint_label(painter, y, w, highlight);
+			0, w, _mouse_point);
+		t->paint_label(painter, w, highlight);
 	}
 
 	painter.end();
@@ -164,10 +153,28 @@ void Header::mousePressEvent(QMouseEvent *event)
 
 void Header::mouseReleaseEvent(QMouseEvent *event)
 {
+	using pv::widgets::Popup;
+
 	assert(event);
 	if (event->button() == Qt::LeftButton) {
+		if (_dragging)
+			_view.normalize_layout();
+		else
+		{
+			const shared_ptr<Trace> mouse_over_trace =
+				get_mouse_over_trace(event->pos());
+			if (mouse_over_trace) {
+				Popup *const p =
+					mouse_over_trace->create_popup(&_view);
+				p->set_position(mapToGlobal(QPoint(width(),
+					mouse_over_trace->get_y())),
+					Popup::Right);
+				p->show();
+			}
+		}
+
+		_dragging = false;
 		_drag_traces.clear();
-		_view.normalize_layout();
 	}
 }
 
@@ -176,8 +183,18 @@ void Header::mouseMoveEvent(QMouseEvent *event)
 	assert(event);
 	_mouse_point = event->pos();
 
+	if (!(event->buttons() & Qt::LeftButton))
+		return;
+
+	if ((event->pos() - _mouse_down_point).manhattanLength() <
+		QApplication::startDragDistance())
+		return;
+
 	// Move the signals if we are dragging
-	if (!_drag_traces.empty()) {
+	if (!_drag_traces.empty())
+	{
+		_dragging = true;
+
 		const int delta = event->pos().y() - _mouse_down_point.y();
 
 		for (std::list<std::pair<boost::weak_ptr<Trace>,
@@ -214,44 +231,8 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 {
 	const shared_ptr<Trace> t = get_mouse_over_trace(_mouse_point);
 
-	if (!t)
-		return;
-
-	QMenu menu(this);
-	menu.addAction(_action_set_name);
-	menu.addAction(_action_set_colour);
-
-	_context_trace = t;
-	menu.exec(event->globalPos());
-	_context_trace.reset();
-}
-
-void Header::on_action_set_name_triggered()
-{
-	bool ok = false;
-
-	shared_ptr<view::Trace> context_trace = _context_trace;
-	if (!context_trace)
-		return;
-
-	const QString new_label = QInputDialog::getText(this, tr("Set Name"),
-		tr("Name"), QLineEdit::Normal, context_trace->get_name(), &ok);
-
-	if (ok)
-		context_trace->set_name(new_label);
-}
-
-void Header::on_action_set_colour_triggered()
-{
-	shared_ptr<view::Trace> context_trace = _context_trace;
-	if (!context_trace)
-		return;
-
-	const QColor new_colour = QColorDialog::getColor(
-		context_trace->get_colour(), this, tr("Set Colour"));
-
-	if (new_colour.isValid())
-		context_trace->set_colour(new_colour);
+	if (t)
+		t->create_context_menu(this)->exec(event->globalPos());
 }
 
 void Header::on_signals_changed()