X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftabular_decoder%2Fmodel.cpp;fp=pv%2Fviews%2Ftabular_decoder%2Fmodel.cpp;h=c8692efb17d7125003b8989a2311b3b275a00b3d;hb=8e168b23846653c087e46b6a63feffac48512ddb;hp=6037cf3e8171745caa67191999b6a967914edd8b;hpb=02078aa15a4747b8ab7a91d54e2e141c3acb5628;p=pulseview.git diff --git a/pv/views/tabular_decoder/model.cpp b/pv/views/tabular_decoder/model.cpp index 6037cf3e..c8692efb 100644 --- a/pv/views/tabular_decoder/model.cpp +++ b/pv/views/tabular_decoder/model.cpp @@ -25,6 +25,7 @@ #include "view.hpp" #include "pv/util.hpp" +#include "pv/globalsettings.hpp" using std::make_shared; @@ -48,9 +49,6 @@ AnnotationCollectionModel::AnnotationCollectionModel(QObject* parent) : end_index_(0), hide_hidden_(false) { - GlobalSettings::add_change_handler(this); - theme_is_dark_ = GlobalSettings::current_theme_is_dark(); - // TBD Maybe use empty columns as indentation levels to indicate stacked decoders header_data_.emplace_back(tr("Sample")); // Column #0 header_data_.emplace_back(tr("Time")); // Column #1 @@ -101,7 +99,7 @@ QVariant AnnotationCollectionModel::data(const QModelIndex& index, int role) con // Only use custom cell background color if column index reached the hierarchy level if (index.column() >= level) { - if (theme_is_dark_) + if (GlobalSettings::current_theme_is_dark()) return QBrush(ann->dark_color()); else return QBrush(ann->bright_color()); @@ -330,16 +328,6 @@ void AnnotationCollectionModel::update_annotations_without_hidden() all_annotations_without_hidden_.resize(count); } -void AnnotationCollectionModel::on_setting_changed(const QString &key, const QVariant &value) -{ - (void)key; - (void)value; - - // We don't really care about the actual setting, we just update the - // flag that indicates whether we are using a bright or dark color theme - theme_is_dark_ = GlobalSettings::current_theme_is_dark(); -} - void AnnotationCollectionModel::on_annotation_visibility_changed() { if (!hide_hidden_)