projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Session: Use a monotonic clock to measure acquisition time.
[pulseview.git]
/
pv
/
subwindows
/
decoder_selector
/
subwindow.cpp
diff --git
a/pv/subwindows/decoder_selector/subwindow.cpp
b/pv/subwindows/decoder_selector/subwindow.cpp
index 086b0064ec04d2354d76abd267a7da177afb54e0..19632ad17a05051b22f63e649923d98d0b34f484 100644
(file)
--- a/
pv/subwindows/decoder_selector/subwindow.cpp
+++ b/
pv/subwindows/decoder_selector/subwindow.cpp
@@
-19,11
+19,14
@@
#include <algorithm>
#include <algorithm>
+#include <QApplication>
#include <QDebug>
#include <QDebug>
+#include <QFontMetrics>
#include <QInputDialog>
#include <QLabel>
#include <QLineEdit>
#include <QPushButton>
#include <QInputDialog>
#include <QLabel>
#include <QLineEdit>
#include <QPushButton>
+#include <QScrollArea>
#include <QVBoxLayout>
#include "pv/session.hpp"
#include <QVBoxLayout>
#include "pv/session.hpp"
@@
-36,6
+39,9
@@
namespace pv {
namespace subwindows {
namespace decoder_selector {
namespace subwindows {
namespace decoder_selector {
+const QString initial_notice = QApplication::tr("Select a decoder to see its description here.");
+const int min_width_margin = 75;
+
bool QCustomSortFilterProxyModel::filterAcceptsRow(int source_row,
const QModelIndex& source_parent) const
bool QCustomSortFilterProxyModel::filterAcceptsRow(int source_row,
const QModelIndex& source_parent) const
@@
-96,6
+102,7
@@
SubWindow::SubWindow(Session& session, QWidget* parent) :
sort_filter_model_->setSourceModel(model_);
sort_filter_model_->setFilterCaseSensitivity(Qt::CaseInsensitive);
sort_filter_model_->setSourceModel(model_);
sort_filter_model_->setFilterCaseSensitivity(Qt::CaseInsensitive);
+ sort_filter_model_->setFilterKeyColumn(-1);
tree_view_->setModel(sort_filter_model_);
tree_view_->setRootIsDecorated(true);
tree_view_->setModel(sort_filter_model_);
tree_view_->setRootIsDecorated(true);
@@
-108,10
+115,16
@@
SubWindow::SubWindow(Session& session, QWidget* parent) :
// Ensure that all decoder tag names are fully visible by default
tree_view_->resizeColumnToContents(0);
// Ensure that all decoder tag names are fully visible by default
tree_view_->resizeColumnToContents(0);
+ tree_view_->setIndentation(10);
+
+ QScrollArea* info_label_body_container = new QScrollArea();
+ info_label_body_container->setWidget(info_label_body_);
+ info_label_body_container->setWidgetResizable(true);
+
info_box_->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
QVBoxLayout* info_box_layout = new QVBoxLayout(info_box_);
info_box_layout->addWidget(info_label_header_);
info_box_->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
QVBoxLayout* info_box_layout = new QVBoxLayout(info_box_);
info_box_layout->addWidget(info_label_header_);
- info_box_layout->addWidget(info_label_body_);
+ info_box_layout->addWidget(info_label_body_
container
);
info_box_layout->addWidget(info_label_footer_);
info_box_layout->setAlignment(Qt::AlignTop);
Qt::TextInteractionFlags flags = Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard;
info_box_layout->addWidget(info_label_footer_);
info_box_layout->setAlignment(Qt::AlignTop);
Qt::TextInteractionFlags flags = Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard;
@@
-119,7
+132,8
@@
SubWindow::SubWindow(Session& session, QWidget* parent) :
info_label_header_->setTextInteractionFlags(flags);
info_label_body_->setWordWrap(true);
info_label_body_->setTextInteractionFlags(flags);
info_label_header_->setTextInteractionFlags(flags);
info_label_body_->setWordWrap(true);
info_label_body_->setTextInteractionFlags(flags);
- info_label_body_->setText(tr("Select a decoder to see its description here."));
+ info_label_body_->setText(initial_notice);
+ info_label_body_->setAlignment(Qt::AlignTop);
info_label_footer_->setWordWrap(true);
info_label_footer_->setTextInteractionFlags(flags);
info_label_footer_->setWordWrap(true);
info_label_footer_->setTextInteractionFlags(flags);
@@
-147,6
+161,14
@@
QToolBar* SubWindow::create_toolbar(QWidget *parent) const
return toolbar;
}
return toolbar;
}
+int SubWindow::minimum_width() const
+{
+ QFontMetrics m(info_label_body_->font());
+ const int label_width = m.width(initial_notice);
+
+ return label_width + min_width_margin;
+}
+
vector<const char*> SubWindow::get_decoder_inputs(const srd_decoder* d) const
{
vector<const char*> ret_val;
vector<const char*> SubWindow::get_decoder_inputs(const srd_decoder* d) const
{
vector<const char*> ret_val;
@@
-192,7
+214,7
@@
void SubWindow::on_item_changed(const QModelIndex& index)
const QString id = QString::fromUtf8(d->id);
const QString longname = QString::fromUtf8(d->longname);
const QString desc = QString::fromUtf8(d->desc);
const QString id = QString::fromUtf8(d->id);
const QString longname = QString::fromUtf8(d->longname);
const QString desc = QString::fromUtf8(d->desc);
- const QString doc = QString::fromUtf8(srd_decoder_doc_get(d));
+ const QString doc = QString::fromUtf8(srd_decoder_doc_get(d))
.trimmed()
;
QString tags;
for (GSList* li = (GSList*)d->tags; li; li = li->next) {
QString tags;
for (GSList* li = (GSList*)d->tags; li; li = li->next) {
@@
-202,7
+224,7
@@
void SubWindow::on_item_changed(const QModelIndex& index)
tags.append(s);
}
tags.append(s);
}
- info_label_header_->setText(QString("<span style='font-size:large
;font-weight:bold'>%1 (%2)</span><br>%3
")
+ info_label_header_->setText(QString("<span style='font-size:large
'><b>%1 (%2)</b></span><br><i>%3</i>
")
.arg(longname, id, desc));
info_label_body_->setText(doc);
info_label_footer_->setText(tr("<p align='right'>Tags: %1</p>").arg(tags));
.arg(longname, id, desc));
info_label_body_->setText(doc);
info_label_footer_->setText(tr("<p align='right'>Tags: %1</p>").arg(tags));