X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fheader.h;h=024227820b6635008216b38b290ec230fce528d8;hb=95237c18d988245fd5f484b70a481891982f5f37;hp=ff058863c2d536a598b5b83a199801bd2ba9b1e5;hpb=54401bbb93fbbd9b0de4874bf02c24b710643fe7;p=pulseview.git

diff --git a/pv/view/header.h b/pv/view/header.h
index ff058863..02422782 100644
--- a/pv/view/header.h
+++ b/pv/view/header.h
@@ -22,18 +22,20 @@
 #define PULSEVIEW_PV_VIEW_HEADER_H
 
 #include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
 
-#include <map>
+#include <list>
+#include <utility>
 
-#include <QWidget>
+#include "marginwidget.h"
 
 namespace pv {
 namespace view {
 
-class Signal;
+class Trace;
 class View;
 
-class Header : public QWidget
+class Header : public MarginWidget
 {
 	Q_OBJECT
 
@@ -41,9 +43,11 @@ public:
 	Header(View &parent);
 
 private:
-	boost::shared_ptr<pv::view::Signal> get_mouse_over_signal(
+	boost::shared_ptr<pv::view::Trace> get_mouse_over_trace(
 		const QPoint &pt);
 
+	void clear_selection();
+
 private:
 	void paintEvent(QPaintEvent *event);
 
@@ -59,24 +63,20 @@ private:
 	void contextMenuEvent(QContextMenuEvent *event);
 
 private slots:
-	void on_action_set_name_triggered();
+	void on_signals_changed();
 
-	void on_action_set_colour_triggered();
+	void on_signals_moved();
 
 signals:
 	void signals_moved();
 
 private:
-	View &_view;
-
 	QPoint _mouse_point;
 	QPoint _mouse_down_point;
+	bool _dragging;
 
-	std::map<const Signal*, int> _mouse_down_signal_offsets;
-
-	boost::shared_ptr<Signal> _context_signal;
-	QAction *_action_set_name;
-	QAction *_action_set_colour;
+	std::list<std::pair<boost::weak_ptr<Trace>, int> >
+		_drag_traces;
 };
 
 } // namespace view