projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
28cd333
)
Integrated stacking button
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sun, 10 Nov 2013 21:44:41 +0000
(21:44 +0000)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sat, 30 Nov 2013 18:12:58 +0000
(18:12 +0000)
pv/view/decodetrace.cpp
patch
|
blob
|
history
diff --git
a/pv/view/decodetrace.cpp
b/pv/view/decodetrace.cpp
index 28443673498419bd6a2d3d2de18ed5f1e741162f..29c4a6e9b1476c613ac9d9f062be96570c5403fc 100644
(file)
--- a/
pv/view/decodetrace.cpp
+++ b/
pv/view/decodetrace.cpp
@@
-31,6
+31,7
@@
extern "C" {
#include <QFormLayout>
#include <QLabel>
#include <QMenu>
#include <QFormLayout>
#include <QLabel>
#include <QMenu>
+#include <QPushButton>
#include "decodetrace.h"
#include "decodetrace.h"
@@
-39,6
+40,7
@@
extern "C" {
#include <pv/view/logicsignal.h>
#include <pv/view/view.h>
#include <pv/view/decode/annotation.h>
#include <pv/view/logicsignal.h>
#include <pv/view/view.h>
#include <pv/view/decode/annotation.h>
+#include <pv/widgets/decodermenu.h>
using namespace boost;
using namespace std;
using namespace boost;
using namespace std;
@@
-179,6
+181,17
@@
void DecodeTrace::populate_popup_form(QWidget *parent, QFormLayout *form)
parent));
_binding.add_properties_to_form(form, true);
}
parent));
_binding.add_properties_to_form(form, true);
}
+
+ // Add stacking button
+ QPushButton *const stack_button =
+ new QPushButton(tr("Stack Decoder"), parent);
+ pv::widgets::DecoderMenu *const decoder_menu =
+ new pv::widgets::DecoderMenu(parent);
+ stack_button->setMenu(decoder_menu);
+
+ QHBoxLayout *stack_button_box = new QHBoxLayout;
+ stack_button_box->addWidget(stack_button, 0, Qt::AlignRight);
+ form->addRow(stack_button_box);
}
QMenu* DecodeTrace::create_context_menu(QWidget *parent)
}
QMenu* DecodeTrace::create_context_menu(QWidget *parent)