Use a generic approach when adding the "close on enter" hook for popups

[pulseview.git] / pv / view / trace.h

diff --git a/pv/view/trace.h b/pv/view/trace.h
index 631c8d9cb6a7435343ef806d2ed1eb6566cb7e02..7726be255f05db2e0f50307881ffc4763bdfe93a 100644 (file)
--- a/pv/view/trace.h
+++ b/pv/view/trace.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_TRACE_H
-#define PULSEVIEW_PV_TRACE_H
+#ifndef PULSEVIEW_PV_VIEW_TRACE_H
+#define PULSEVIEW_PV_VIEW_TRACE_H
 
 #include <QColor>
 #include <QPainter>
@@ -31,10 +31,9 @@
 
 #include "selectableitem.h"
 
-namespace pv {
-
-class SigSession;
+class QFormLayout;
 
+namespace pv {
 namespace view {
 
 class View;
@@ -48,7 +47,7 @@ private:
        static const int LabelHitPadding;
 
 protected:
-       Trace(SigSession &session, QString name);
+       Trace(QString name);
 
 public:
        /**
@@ -113,7 +112,7 @@ public:
        virtual void paint_fore(QPainter &p, int left, int right);
 
        /**
-        * Paints the signal label into a QGLWidget.
+        * Paints the signal label.
         * @param p the QPainter to paint into.
         * @param right the x-coordinate of the right edge of the header
         *      area.
@@ -133,12 +132,24 @@ public:
 
        virtual QMenu* create_context_menu(QWidget *parent);
 
-protected:
+       pv::widgets::Popup* create_popup(QWidget *parent);
+
        /**
         * Gets the y-offset of the axis.
         */
        int get_y() const;
 
+       /**
+        * Computes the outline rectangle of a label.
+        * @param p the QPainter to lay out text with.
+        * @param right the x-coordinate of the right edge of the header
+        *      area.
+        * @return Returns the rectangle of the signal label.
+        */
+       QRectF get_label_rect(int right);
+
+protected:
+
        /**
         * Gets the text colour.
         * @remarks This colour is computed by comparing the lightness
@@ -156,42 +167,37 @@ protected:
         */
        void paint_axis(QPainter &p, int y, int left, int right);
 
-private:
+       void add_colour_option(QWidget *parent, QFormLayout *form);
 
-       /**
-        * Computes an caches the size of the label text.
-        */
-       void compute_text_size(QPainter &p);
+       void create_popup_form();
 
-       /**
-        * Computes the outline rectangle of a label.
-        * @param p the QPainter to lay out text with.
-        * @param right the x-coordinate of the right edge of the header
-        *      area.
-        * @return Returns the rectangle of the signal label.
-        */
-       QRectF get_label_rect(int right);
+       virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
+
+private Q_SLOTS:
+       void on_text_changed(const QString &text);
 
-private slots:
-       void on_action_set_name_triggered();
+       void on_colour_changed(const QColor &colour);
 
-       void on_action_set_colour_triggered();
+       void on_popup_closed();
 
-signals:
+Q_SIGNALS:
+       void visibility_changed();
        void text_changed();    
+       void colour_changed();
 
 protected:
-       pv::SigSession &_session;
        pv::view::View *_view;
 
        QString _name;
        QColor _colour;
        int _v_offset;
 
-       QSizeF _text_size;
+private:
+       pv::widgets::Popup *_popup;
+       QFormLayout *_popup_form;
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_TRACEL_H
+#endif // PULSEVIEW_PV_VIEW_TRACE_H