X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.h;h=eeef55389eb79384f5f84ccaa9542bb631b28999;hb=c0f868521a211747f89ef217ae63404f373d952b;hp=3a7a103df0ecbae171f6ad47ea67791ba8c48525;hpb=e0e90d8091d3e4f20c03de6015bcedc5e4568567;p=pulseview.git

diff --git a/pv/view/signal.h b/pv/view/signal.h
index 3a7a103..eeef553 100644
--- a/pv/view/signal.h
+++ b/pv/view/signal.h
@@ -24,10 +24,12 @@
 #include <boost/shared_ptr.hpp>
 
 #include <QColor>
+#include <QComboBox>
 #include <QPainter>
 #include <QPen>
 #include <QRect>
 #include <QString>
+#include <QWidgetAction>
 
 #include <stdint.h>
 
@@ -37,6 +39,8 @@
 
 namespace pv {
 
+class SigSession;
+
 namespace data {
 class SignalData;
 }
@@ -45,14 +49,15 @@ namespace view {
 
 class Signal : public SelectableItem
 {
+	Q_OBJECT
+
 private:
 	static const int LabelHitPadding;
-	static const int LabelHighlightRadius;
 
 	static const QPen SignalAxisPen;
 
 protected:
-	Signal(const sr_probe *const probe);
+	Signal(pv::SigSession &session, const sr_probe *const probe);
 
 public:
 	/**
@@ -85,16 +90,6 @@ public:
 	 */
 	void set_v_offset(int v_offset);
 
-	/**
-	 * Returns true if the signal has been selected by the user.
-	 */
-	bool selected() const;
-
-	/**
-	 * Selects or deselects the signal.
-	 */
-	void select(bool select = true);
-
 	/**
 	 * Paints the signal with a QPainter
 	 * @param p the QPainter to paint into.
@@ -159,16 +154,25 @@ private:
 	 */
 	QRectF get_label_rect(int y, int right);
 
+private slots:
+	void on_text_changed(const QString &text);
+
+signals:
+	void text_changed();	
+
 protected:
+	pv::SigSession &_session;
 	const sr_probe *const _probe;
 
 	QString _name;
 	QColor _colour;
 	int _v_offset;
 
-	bool _selected;
-
 	QSizeF _text_size;
+
+	QWidgetAction _name_action;
+	QComboBox _name_widget;
+	bool _updating_name_widget;
 };
 
 } // namespace view