projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
65cbcf4
)
Removed QToolBar from DecoderGroupBox
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sun, 12 Jan 2014 20:12:40 +0000
(20:12 +0000)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sun, 12 Jan 2014 20:12:40 +0000
(20:12 +0000)
pv/widgets/decodergroupbox.cpp
patch
|
blob
|
history
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 <Q
ToolBar
>
+#include <Q
PushButton
>
#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->add
Action(delete_acti
on);
+ toolbar->add
Widget(delete_butt
on);
}
void DecoderGroupBox::add_layout(QLayout *layout)
}
void DecoderGroupBox::add_layout(QLayout *layout)