Integrated ColourButton into popup

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

diff --git a/pv/view/trace.h b/pv/view/trace.h
index ff65a2138536945d2f95115ffbfc38738331862c..0b9c509aeda37e2f7e017ec1ffda7d0c7e1d6131 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>
@@ -35,10 +35,6 @@ namespace pv {
 
 class SigSession;
 
-namespace widgets {
-class Popup;
-}
-
 namespace view {
 
 class View;
@@ -162,6 +158,8 @@ protected:
         */
        void paint_axis(QPainter &p, int y, int left, int right);
 
+       void add_colour_option(QWidget *parent, QFormLayout *form);
+
        virtual void populate_popup_form(QWidget *parent, QFormLayout *form);
 
 private:
@@ -185,8 +183,13 @@ private slots:
 
        void on_action_set_colour_triggered();
 
+       void on_text_changed(const QString &text);
+
+       void on_colour_changed(const QColor &colour);
+
 signals:
        void text_changed();    
+       void colour_changed();
 
 protected:
        pv::SigSession &_session;
@@ -202,4 +205,4 @@ protected:
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_TRACEL_H
+#endif // PULSEVIEW_PV_VIEW_TRACE_H