X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=e084ecc94e55fe4a7390a0bc3f76aae2002e63e7;hb=9b6378f147671e62f57887d51d01864d20e01475;hp=e14a9f246ecfb39e7d390e9d9f96be136cdf80e9;hpb=38eeddeab105aea3f8015dda5399ebbead21550a;p=pulseview.git

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index e14a9f2..e084ecc 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -29,8 +29,6 @@
 #include <boost/foreach.hpp>
 
 #include <QApplication>
-#include <QColorDialog>
-#include <QInputDialog>
 #include <QMenu>
 #include <QMouseEvent>
 #include <QPainter>
@@ -43,17 +41,10 @@ namespace pv {
 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))
+	MarginWidget(parent)
 {
 	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 +57,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 +86,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();
@@ -214,44 +200,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()