Replace obsolete/deprecated Qt methods

[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 63cab9f94a6ab6f7ee9a026570107ed030c54c0b..2c65dcf2e4f3f928ac38216a4303fd7fe543b8be 100644 (file)
--- a/pv/subwindows/decoder_selector/subwindow.cpp
+++ b/pv/subwindows/decoder_selector/subwindow.cpp
@@ -32,6 +32,13 @@
 #include "pv/session.hpp"
 #include "pv/subwindows/decoder_selector/subwindow.hpp"
 
+#include <libsigrokdecode/libsigrokdecode.h>
+#include "subwindow.hpp"  // Required only for lupdate since above include isn't recognized
+
+#define DECODERS_HAVE_TAGS \
+       ((SRD_PACKAGE_VERSION_MAJOR > 0) || \
+        (SRD_PACKAGE_VERSION_MAJOR == 0) && (SRD_PACKAGE_VERSION_MINOR > 5))
+
 using std::reverse;
 
 namespace pv {
@@ -39,7 +46,8 @@ namespace subwindows {
 namespace decoder_selector {
 
 const char *initial_notice =
-       QT_TRANSLATE_NOOP("pv::subwindows::decoder_selector::SubWindow", "Select a decoder to see its description here.");
+       QT_TRANSLATE_NOOP("pv::subwindows::decoder_selector::SubWindow",
+                       "Select a decoder to see its description here.");  // clazy:exclude=non-pod-global-static
 
 const int min_width_margin = 75;
 
@@ -101,7 +109,9 @@ SubWindow::SubWindow(Session& session, QWidget* parent) :
        filter->setClearButtonEnabled(true);
        filter->addAction(filter_icon, QLineEdit::LeadingPosition);
 
+
        sort_filter_model_->setSourceModel(model_);
+       sort_filter_model_->setSortCaseSensitivity(Qt::CaseInsensitive);
        sort_filter_model_->setFilterCaseSensitivity(Qt::CaseInsensitive);
        sort_filter_model_->setFilterKeyColumn(-1);
 
@@ -118,6 +128,11 @@ SubWindow::SubWindow(Session& session, QWidget* parent) :
 
        tree_view_->setIndentation(10);
 
+#if (!DECODERS_HAVE_TAGS)
+       tree_view_->expandAll();
+       tree_view_->setItemsExpandable(false);
+#endif
+
        QScrollArea* info_label_body_container = new QScrollArea();
        info_label_body_container->setWidget(info_label_body_);
        info_label_body_container->setWidgetResizable(true);
@@ -170,7 +185,7 @@ QToolBar* SubWindow::create_toolbar(QWidget *parent) const
 int SubWindow::minimum_width() const
 {
        QFontMetrics m(info_label_body_->font());
-       const int label_width = m.width(QString(tr(initial_notice)));
+       const int label_width = util::text_width(m, tr(initial_notice));
 
        return label_width + min_width_margin;
 }
@@ -208,34 +223,47 @@ vector<const srd_decoder*> SubWindow::get_decoders_providing(const char* output)
 
 void SubWindow::on_item_changed(const QModelIndex& index)
 {
-       if (!index.isValid())
-               return;
+       QString decoder_name, id, longname, desc, doc, tags;
 
-       QModelIndex id_index = index.model()->index(index.row(), 2, index.parent());
-       QString decoder_name = index.model()->data(id_index, Qt::DisplayRole).toString();
+       // If the parent isn't valid, a category title was clicked
+       if (index.isValid() && index.parent().isValid()) {
+               QModelIndex id_index = index.model()->index(index.row(), 2, index.parent());
+               decoder_name = index.model()->data(id_index, Qt::DisplayRole).toString();
 
-       if (decoder_name.isEmpty())
-               return;
+               if (decoder_name.isEmpty())
+                       return;
 
-       const srd_decoder* d = srd_decoder_get_by_id(decoder_name.toUtf8());
+               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)).trimmed();
+               id = QString::fromUtf8(d->id);
+               longname = QString::fromUtf8(d->longname);
+               desc = QString::fromUtf8(d->desc);
+               doc = QString::fromUtf8(srd_decoder_doc_get(d)).trimmed();
 
-       QString tags;
-       for (GSList* li = (GSList*)d->tags; li; li = li->next) {
-               QString s = (li == (GSList*)d->tags) ?
-                       tr((char*)li->data) :
-                       QString(tr(", %1")).arg(tr((char*)li->data));
-               tags.append(s);
-       }
+#if DECODERS_HAVE_TAGS
+               for (GSList* li = (GSList*)d->tags; li; li = li->next) {
+                       QString s = (li == (GSList*)d->tags) ?
+                               tr((char*)li->data) :
+                               QString(tr(", %1")).arg(tr((char*)li->data));
+                       tags.append(s);
+               }
+#endif
+       } else
+               doc = QString(tr(initial_notice));
+
+       if (!id.isEmpty())
+               info_label_header_->setText(
+                       QString("<span style='font-size:large'><b>%1 (%2)</b></span><br><i>%3</i>")
+                       .arg(longname, id, desc));
+       else
+               info_label_header_->clear();
 
-       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));
+
+       if (!tags.isEmpty())
+               info_label_footer_->setText(tr("<p align='right'>Tags: %1</p>").arg(tags));
+       else
+               info_label_footer_->clear();
 }
 
 void SubWindow::on_item_activated(const QModelIndex& index)