X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fheader.h;h=f190d50c919e518d81abdab31219ec2d8ec3d0f2;hb=7ccd5a64548bccac7c172f9d5649f936044a5fa1;hp=024227820b6635008216b38b290ec230fce528d8;hpb=728fcafc9897d3ffb4a109b6248d88b0945128f5;p=pulseview.git

diff --git a/pv/view/header.h b/pv/view/header.h
index 0242278..f190d50 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,28 +30,45 @@
 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;
+
+	void signals_updated();
+
 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);
 
 private:
+	void mouseLeftPressEvent(QMouseEvent *event);
 	void mousePressEvent(QMouseEvent * event);
 
+	void mouseLeftReleaseEvent(QMouseEvent *event);
 	void mouseReleaseEvent(QMouseEvent *event);
 
 	void mouseMoveEvent(QMouseEvent *event);
@@ -62,12 +77,14 @@ private:
 
 	void contextMenuEvent(QContextMenuEvent *event);
 
-private slots:
-	void on_signals_changed();
+	void keyPressEvent(QKeyEvent *e);
 
+private Q_SLOTS:
 	void on_signals_moved();
 
-signals:
+	void on_trace_changed();
+
+Q_SIGNALS:
 	void signals_moved();
 
 private:
@@ -75,8 +92,8 @@ private:
 	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