Removed QToolBar from DecoderGroupBox

diff --git a/pv/widgets/decodergroupbox.cpp b/pv/widgets/decodergroupbox.cpp
index 805a769017c81eb658743b5407d435cfc0fc4c6b..58874d38722d0723e46a53e271616c21541f55f2 100644 (file)
--- a/pv/widgets/decodergroupbox.cpp
+++ b/pv/widgets/decodergroupbox.cpp
@@ -20,10 +20,9 @@
 
 #include "decodergroupbox.h"
 
 
 #include "decodergroupbox.h"
 

-#include <QAction>

 #include <QHBoxLayout>
 #include <QLabel>
 #include <QHBoxLayout>
 #include <QLabel>

-#include <QToolBar>
+#include <QPushButton>

 #include <QVBoxLayout>
 
 #include <assert.h>
 #include <QVBoxLayout>
 
 #include <assert.h>


@@ -42,15 +41,16 @@ DecoderGroupBox::DecoderGroupBox(QString title, QWidget *parent) :
                0, 0);
        _layout->setColumnStretch(0, 1);
 
                0, 0);
        _layout->setColumnStretch(0, 1);
 

-       QToolBar *const toolbar = new QToolBar;
-       toolbar->setIconSize(QSize(16, 16));
-       _layout->addWidget(toolbar, 0, 1);
+       QHBoxLayout *const toolbar = new QHBoxLayout;
+       _layout->addLayout(toolbar, 0, 1);

 
 

-       QAction *const delete_action = new QAction(
-               QIcon(":/icons/decoder-delete.svg"), tr("Delete"), this);
-       connect(delete_action, SIGNAL(triggered()),
+       QPushButton *const delete_button = new QPushButton(
+               QIcon(":/icons/decoder-delete.svg"), QString(), this);
+       delete_button->setFlat(true);
+       delete_button->setIconSize(QSize(16, 16));
+       connect(delete_button, SIGNAL(clicked()),

                this, SIGNAL(delete_decoder()));
                this, SIGNAL(delete_decoder()));

-       toolbar->addAction(delete_action);
+       toolbar->addWidget(delete_button);

 }
 
 void DecoderGroupBox::add_layout(QLayout *layout)
 }
 
 void DecoderGroupBox::add_layout(QLayout *layout)