X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=dec5c20cbabfad042ec785886a2a2be9ca747e40;hp=e084ecc94e55fe4a7390a0bc3f76aae2002e63e7;hb=9d28da5ae394e572dedf0ec22c17fd259825e1c9;hpb=9b6378f147671e62f57887d51d01864d20e01475

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index e084ecc9..dec5c20c 100644
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -34,6 +34,8 @@
 #include <QPainter>
 #include <QRect>
 
+#include <pv/widgets/popup.h>
+
 using namespace boost;
 using namespace std;
 
@@ -41,8 +43,10 @@ namespace pv {
 namespace view {
 
 Header::Header(View &parent) :
-	MarginWidget(parent)
+	MarginWidget(parent),
+	_dragging(false)
 {
+	setFocusPolicy(Qt::ClickFocus);
 	setMouseTracking(true);
 
 	connect(&_view.session(), SIGNAL(signals_changed()),
@@ -150,10 +154,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();
 	}
 }
 
@@ -162,8 +184,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>,
@@ -204,12 +236,34 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 		t->create_context_menu(this)->exec(event->globalPos());
 }
 
+void Header::keyPressEvent(QKeyEvent *e)
+{
+	assert(e);
+
+	switch (e->key())
+	{
+	case Qt::Key_Delete:
+	{
+		const vector< shared_ptr<Trace> > traces(_view.get_traces());
+		BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+			if (t->selected())
+				t->delete_pressed();	
+		break;
+	}
+	}
+}
+
 void Header::on_signals_changed()
 {
 	const vector< shared_ptr<Trace> > traces(_view.get_traces());
 	BOOST_FOREACH(shared_ptr<Trace> t, traces) {
 		assert(t);
-		connect(t.get(), SIGNAL(text_changed()), this, SLOT(update()));
+		connect(t.get(), SIGNAL(visibility_changed()),
+			this, SLOT(update()));
+		connect(t.get(), SIGNAL(text_changed()),
+			this, SLOT(update()));
+		connect(t.get(), SIGNAL(colour_changed()),
+			this, SLOT(update()));
 	}
 }