Integrated ColourButton into popup

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

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index 28084544f6f4247aee1798e4081302f0f22d5b27..de036a941820dd256a1429f1545175cada6058de 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -27,9 +27,10 @@
 #include <QInputDialog>
 
 #include "trace.h"
+#include "tracepalette.h"
 #include "view.h"
 
-#include <pv/widgets/popup.h>
+#include <pv/widgets/colourbutton.h>
 
 namespace pv {
 namespace view {
@@ -211,9 +212,29 @@ void Trace::paint_axis(QPainter &p, int y, int left, int right)
        p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
 }
 
+void Trace::add_colour_option(QWidget *parent, QFormLayout *form)
+{
+       using pv::widgets::ColourButton;
+
+       ColourButton *const colour_button = new ColourButton(
+               TracePalette::Rows, TracePalette::Cols, parent);
+       colour_button->set_palette(TracePalette::Colours);
+       colour_button->set_colour(_colour);
+       connect(colour_button, SIGNAL(selected(const QColor&)),
+               this, SLOT(on_colour_changed(const QColor&)));
+
+       form->addRow(tr("Colour"), colour_button);
+}
+
 void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
-       form->addRow("Name", new QLineEdit(parent));
+       QLineEdit *const name_edit = new QLineEdit(parent);
+       name_edit->setText(_name);
+       connect(name_edit, SIGNAL(textChanged(const QString&)),
+               this, SLOT(on_text_changed(const QString&)));
+       form->addRow(tr("Name"), name_edit);
+
+       add_colour_option(parent, form);
 }
 
 void Trace::compute_text_size(QPainter &p)
@@ -260,6 +281,17 @@ void Trace::on_action_set_colour_triggered()
                set_colour(new_colour);
 }
 
+void Trace::on_text_changed(const QString &text)
+{
+       set_name(text);
+       text_changed();
+}
+
+void Trace::on_colour_changed(const QColor &colour)
+{
+       set_colour(colour);
+       colour_changed();
+}
 
 } // namespace view
 } // namespace pv