X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=ffbab0639ceac05500896a94d59655bc3c5c68d0;hb=6e89374a6796f8d5d9cc61b0a2f7e98562a034ae;hp=ebf28b6224c69a5786a760333b34dd99ec6d1f10;hpb=68456dab5d519d886cf632cecc01373cc258d83c;p=pulseview.git

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index ebf28b62..ffbab063 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -23,13 +23,14 @@
 #include <assert.h>
 #include <math.h>
 
-#include <QColorDialog>
-#include <QInputDialog>
+#include <QFormLayout>
+#include <QLineEdit>
 
 #include "trace.h"
+#include "tracepalette.h"
 #include "view.h"
 
-#include <pv/widgets/popup.h>
+#include <pv/widgets/colourbutton.h>
 
 namespace pv {
 namespace view {
@@ -172,16 +173,6 @@ QMenu* Trace::create_context_menu(QWidget *parent)
 {
 	QMenu *const menu = SelectableItem::create_context_menu(parent);
 
-	QAction *const set_name = new QAction(tr("Set &Name..."), this);
-	connect(set_name, SIGNAL(triggered()),
-		this, SLOT(on_action_set_name_triggered()));
-	menu->addAction(set_name);
-
-	QAction *const set_colour = new QAction(tr("Set &Colour..."), this);
-	connect(set_colour, SIGNAL(triggered()),
-		this, SLOT(on_action_set_colour_triggered()));
-	menu->addAction(set_colour);
-
 	return menu;
 }
 
@@ -211,6 +202,20 @@ 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)
 {
 	QLineEdit *const name_edit = new QLineEdit(parent);
@@ -218,6 +223,8 @@ void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
 	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)
@@ -243,32 +250,17 @@ QRectF Trace::get_label_rect(int right)
 		label_size.width(), label_size.height());
 }
 
-void Trace::on_action_set_name_triggered()
-{
-	bool ok = false;
-
-	const QString new_label = QInputDialog::getText(_context_parent,
-		tr("Set Name"), tr("Name"), QLineEdit::Normal, get_name(),
-		&ok);
-
-	if (ok)
-		set_name(new_label);
-}
-
-void Trace::on_action_set_colour_triggered()
-{
-	const QColor new_colour = QColorDialog::getColor(
-		get_colour(), _context_parent, tr("Set Colour"));
-
-	if (new_colour.isValid())
-		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