X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsubwindows%2Fdecoder_selector%2Fsubwindow.cpp;h=af6de2d95f295a87827805083b0892f75e4ad533;hp=5e6dff5a8e5b3a6702e6152ca20a072040bba481;hb=e0cfcb0e4f744a1e28f83b1babb4bc48ef680f79;hpb=a51c7f7d2691c79caa86930cd8f6ecfa9cd71a28

diff --git a/pv/subwindows/decoder_selector/subwindow.cpp b/pv/subwindows/decoder_selector/subwindow.cpp
index 5e6dff5..af6de2d 100644
--- a/pv/subwindows/decoder_selector/subwindow.cpp
+++ b/pv/subwindows/decoder_selector/subwindow.cpp
@@ -19,11 +19,14 @@
 
 #include <algorithm>
 
+#include <QApplication>
 #include <QDebug>
+#include <QFontMetrics>
 #include <QInputDialog>
 #include <QLabel>
 #include <QLineEdit>
 #include <QPushButton>
+#include <QScrollArea>
 #include <QVBoxLayout>
 
 #include "pv/session.hpp"
@@ -36,6 +39,9 @@ namespace pv {
 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
@@ -110,10 +116,14 @@ SubWindow::SubWindow(Session& session, QWidget* parent) :
 
 	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_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;
@@ -121,7 +131,8 @@ SubWindow::SubWindow(Session& session, QWidget* parent) :
 	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);
 
@@ -149,6 +160,14 @@ QToolBar* SubWindow::create_toolbar(QWidget *parent) const
 	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;
@@ -194,7 +213,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 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) {