Removed context bar

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

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 45a8cd30726f43e64fa681c85427464c7d2ad415..7c4a11e03eee9fc1082578d7ffa71a2d05563b5f 100644 (file)
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -31,8 +31,6 @@
 namespace pv {
 namespace view {
 
-const QPen Signal::SignalAxisPen(QColor(128, 128, 128, 64));
-
 const char *const ProbeNames[] = {
        "CLK",
        "DATA",
@@ -53,29 +51,12 @@ const char *const ProbeNames[] = {
 Signal::Signal(pv::SigSession &session, const sr_probe *const probe) :
        Trace(session, probe->name),
        _probe(probe),
-       _name_action(NULL),
        _name_widget(NULL),
        _updating_name_widget(false)
 {
        assert(_probe);
 }
 
-void Signal::init_context_bar_actions(QWidget *parent)
-{
-       _name_widget = new QComboBox(parent);
-       _name_widget->setEditable(true);
-
-       _name_action = new QWidgetAction(parent);
-       _name_action->setDefaultWidget(_name_widget);
-
-       for(unsigned int i = 0; i < countof(ProbeNames); i++)
-               _name_widget->insertItem(i, ProbeNames[i]);
-       _name_widget->setEditText(_probe->name);
-
-       connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
-               this, SLOT(on_text_changed(const QString&)));
-}
-
 void Signal::set_name(QString name)
 {
        Trace::set_name(name);
@@ -94,10 +75,19 @@ const sr_probe* Signal::probe() const
        return _probe;
 }
 
-void Signal::paint_axis(QPainter &p, int y, int left, int right)
+void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
-       p.setPen(SignalAxisPen);
-       p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
+       _name_widget = new QComboBox(parent);
+       _name_widget->setEditable(true);
+
+       for(unsigned int i = 0; i < countof(ProbeNames); i++)
+               _name_widget->insertItem(i, ProbeNames[i]);
+       _name_widget->setEditText(_probe->name);
+
+       connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
+               this, SLOT(on_text_changed(const QString&)));
+
+       form->addRow(tr("Name"), _name_widget);
 }
 
 void Signal::on_text_changed(const QString &text)