Keep a pointer to the active Popup in Trace

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

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index de036a941820dd256a1429f1545175cada6058de..79255bec3f98fa4491a4e81c6cb4529c12b176f0 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -23,8 +23,8 @@
 #include <assert.h>
 #include <math.h>
 
-#include <QColorDialog>
-#include <QInputDialog>
+#include <QFormLayout>
+#include <QLineEdit>
 
 #include "trace.h"
 #include "tracepalette.h"
@@ -41,7 +41,9 @@ const int Trace::LabelHitPadding = 2;
 Trace::Trace(pv::SigSession &session, QString name) :
        _session(session),
        _name(name),
-       _v_offset(0)
+       _v_offset(0),
+       _popup(NULL),
+       _popup_form(NULL)
 {
 }
 
@@ -173,27 +175,23 @@ 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;
 }
 
 pv::widgets::Popup* Trace::create_popup(QWidget *parent)
 {
        using pv::widgets::Popup;
-       Popup *const popup = new Popup(parent);
-       QFormLayout *const form = new QFormLayout(popup);
-       popup->setLayout(form);
-       populate_popup_form(popup, form);
-       return popup;
+
+       _popup = new Popup(parent);
+       _popup_form = new QFormLayout(_popup);
+       _popup->setLayout(_popup_form);
+
+       populate_popup_form(_popup, _popup_form);
+
+       connect(_popup, SIGNAL(closed()),
+               this, SLOT(on_popup_closed()));
+
+       return _popup;
 }
 
 int Trace::get_y() const
@@ -260,25 +258,10 @@ QRectF Trace::get_label_rect(int right)
                label_size.width(), label_size.height());
 }
 
-void Trace::on_action_set_name_triggered()
+void Trace::on_popup_closed()
 {
-       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);
+       _popup = NULL;
+       _popup_form = NULL;
 }
 
 void Trace::on_text_changed(const QString &text)