X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fheader.h;h=319f234e255e532f4f3a016c1c78bb6c40d1c821;hb=bcaa184ed439d801cb1a56b877bb2763246150da;hp=35d5d20f49f7b5bcf89f1ca1c91a127188d07abb;hpb=9b6378f147671e62f57887d51d01864d20e01475;p=pulseview.git

diff --git a/pv/view/header.h b/pv/view/header.h
index 35d5d20f..319f234e 100644
--- a/pv/view/header.h
+++ b/pv/view/header.h
@@ -21,10 +21,8 @@
 #ifndef PULSEVIEW_PV_VIEW_HEADER_H
 #define PULSEVIEW_PV_VIEW_HEADER_H
 
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
 #include <list>
+#include <memory>
 #include <utility>
 
 #include "marginwidget.h"
@@ -32,22 +30,35 @@
 namespace pv {
 namespace view {
 
-class Trace;
+class RowItem;
 class View;
 
 class Header : public MarginWidget
 {
 	Q_OBJECT
 
+private:
+	static const int Padding;
+
 public:
 	Header(View &parent);
 
+	QSize sizeHint() const;
+
+	/**
+	 * The horizontal offset, relative to the left edge of the widget,
+	 * where the arrows of the trace labels end.
+	 */
+	static const int BaselineOffset;
+
 private:
-	boost::shared_ptr<pv::view::Trace> get_mouse_over_trace(
+	std::shared_ptr<pv::view::RowItem> get_mouse_over_row_item(
 		const QPoint &pt);
 
 	void clear_selection();
 
+	void show_popup(const std::shared_ptr<RowItem> &item);
+
 private:
 	void paintEvent(QPaintEvent *event);
 
@@ -62,20 +73,25 @@ private:
 
 	void contextMenuEvent(QContextMenuEvent *event);
 
-private slots:
+	void keyPressEvent(QKeyEvent *e);
+
+private Q_SLOTS:
 	void on_signals_changed();
 
 	void on_signals_moved();
 
-signals:
+	void on_trace_changed();
+
+Q_SIGNALS:
 	void signals_moved();
 
 private:
 	QPoint _mouse_point;
 	QPoint _mouse_down_point;
+	bool _dragging;
 
-	std::list<std::pair<boost::weak_ptr<Trace>, int> >
-		_drag_traces;
+	std::list<std::pair<std::weak_ptr<RowItem>, int> >
+		_drag_row_items;
 };
 
 } // namespace view