Added pv::view::MarginWidget as a common base class of Header and Ruler

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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index e0e280b2826dc3c988c362d1c2eaecaf0a508f29..8fb5b4bd3c126a104b2f37d133ceb65405ddb380 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -43,8 +43,7 @@ namespace pv {
 namespace view {
 
 Header::Header(View &parent) :
-       QWidget(&parent),
-       _view(parent),
+       MarginWidget(parent),
        _action_set_name(new QAction(tr("Set &Name..."), this)),
        _action_set_colour(new QAction(tr("Set &Colour..."), this))
 {
@@ -218,14 +217,16 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 
 void Header::on_action_set_name_triggered()
 {
+       bool ok = false;
+
        shared_ptr<view::Signal> context_signal = _context_signal;
        if (!context_signal)
                return;
 
        const QString new_label = QInputDialog::getText(this, tr("Set Name"),
-               tr("Name"), QLineEdit::Normal, context_signal->get_name());
+               tr("Name"), QLineEdit::Normal, context_signal->get_name(), &ok);
 
-       if (!new_label.isEmpty())
+       if (ok)
                context_signal->set_name(new_label);
 }