DecoderSelector: Make window as wide as necessary when opening

[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 e768a5fcb28f330d3f76cb92f3b48f2846d57815..0172a43d9a4951b97a322ca46bee7c397e3706e1 100644 (file)
--- 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
@@ -105,13 +111,29 @@ SubWindow::SubWindow(Session& session, QWidget* parent) :
        // Hide the columns that hold the detailed item information
        tree_view_->hideColumn(2);  // ID
 
+       // 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_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_label_header_->setWordWrap(true);
+       info_label_header_->setTextInteractionFlags(flags);
        info_label_body_->setWordWrap(true);
-       info_label_body_->setText(tr("Select a decoder to see its description here."));
+       info_label_body_->setTextInteractionFlags(flags);
+       info_label_body_->setText(initial_notice);
+       info_label_footer_->setWordWrap(true);
+       info_label_footer_->setTextInteractionFlags(flags);
 
        connect(filter, SIGNAL(textChanged(const QString&)),
                this, SLOT(on_filter_changed(const QString&)));
@@ -137,19 +159,12 @@ QToolBar* SubWindow::create_toolbar(QWidget *parent) const
        return toolbar;
 }
 
-const srd_decoder* SubWindow::get_srd_decoder_from_id(QString id) const
+int SubWindow::minimum_width() const
 {
-       const srd_decoder* ret_val = nullptr;
+       QFontMetrics m(info_label_body_->font());
+       const int label_width = m.width(initial_notice);
 
-       for (GSList* li = (GSList*)srd_decoder_list(); li; li = li->next) {
-               const srd_decoder* d = (srd_decoder*)li->data;
-               assert(d);
-
-               if (QString::fromUtf8(d->id) == id)
-                       ret_val = d;
-       }
-
-       return ret_val;
+       return label_width + min_width_margin;
 }
 
 vector<const char*> SubWindow::get_decoder_inputs(const srd_decoder* d) const
@@ -192,12 +207,12 @@ void SubWindow::on_item_changed(const QModelIndex& index)
        if (decoder_name.isEmpty())
                return;
 
-       const srd_decoder* d = get_srd_decoder_from_id(decoder_name);
+       const srd_decoder* d = srd_decoder_get_by_id(decoder_name.toUtf8());
 
        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) {
@@ -207,7 +222,7 @@ void SubWindow::on_item_changed(const QModelIndex& index)
                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));
@@ -221,7 +236,7 @@ void SubWindow::on_item_activated(const QModelIndex& index)
        QModelIndex id_index = index.model()->index(index.row(), 2, index.parent());
        QString decoder_name = index.model()->data(id_index, Qt::DisplayRole).toString();
 
-       const srd_decoder* chosen_decoder = get_srd_decoder_from_id(decoder_name);
+       const srd_decoder* chosen_decoder = srd_decoder_get_by_id(decoder_name.toUtf8());
        if (chosen_decoder == nullptr)
                return;
 
@@ -270,7 +285,7 @@ void SubWindow::on_item_activated(const QModelIndex& index)
                                return;
 
                        QString d = item.section(' ', 0, 0);
-                       decoders.push_back(get_srd_decoder_from_id(d));
+                       decoders.push_back(srd_decoder_get_by_id(d.toUtf8()));
                }
 
                inputs = get_decoder_inputs(decoders.back());