w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-22 04:11:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove RGB values from configuration colours as they are unnecessary duplicated information

Browse Source
This commit is contained in:
Bill Somerville 2018-12-16 01:26:54 +00:00
parent e76f33e76e
commit 80a5d41223
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
models/DecodeHighlightingModel.cpp
View File

@ -155,25 +155,30 @@ QVariant DecodeHighlightingModel::data (const QModelIndex& index, int role) cons
if (index.isValid () && index.row () < rowCount ()) if (index.isValid () && index.row () < rowCount ())
{ {
auto const& item = m_->data_[index.row ()]; auto const& item = m_->data_[index.row ()];
auto fg_unset = Qt::NoBrush == item.foreground_.style ();
auto bg_unset = Qt::NoBrush == item.background_.style ();
switch (role) switch (role)
{ {
case Qt::CheckStateRole: case Qt::CheckStateRole:
result = item.enabled_ ? Qt::Checked : Qt::Unchecked; result = item.enabled_ ? Qt::Checked : Qt::Unchecked;
break; break;
case Qt::DisplayRole: case Qt::DisplayRole:
return QString {"%1 [f/g:%2, b/g:%3]"} return QString {"%1%2%3%4%4%5%6"}
.arg (highlight_name (item.type_)) .arg (highlight_name (item.type_))
.arg (item.foreground_.style () != Qt::NoBrush ? QString {"#%1"}.arg (item.foreground_.color ().rgb () & 0xffffff, 6, 16, QChar {'0'}) : QString {"unset"}) .arg (fg_unset || bg_unset ? QString {" ["} : QString {})
.arg (item.background_.style () != Qt::NoBrush ? QString {"#%1"}.arg (item.background_.color ().rgb () & 0xffffff, 6, 16, QChar {'0'}) : QString {"unset"}); .arg (fg_unset ? QString {"f/g unset"} : QString {})
.arg (fg_unset && bg_unset ? QString {" "} : QString {})
.arg (bg_unset ? QString {"b/g unset"} : QString {})
.arg (fg_unset || bg_unset ? QString {"]"} : QString {});
break; break;
case Qt::ForegroundRole: case Qt::ForegroundRole:
if (Qt::NoBrush != item.foreground_.style ()) if (!fg_unset)
{ {
result = item.foreground_; result = item.foreground_;
} }
break; break;
case Qt::BackgroundRole: case Qt::BackgroundRole:
if (Qt::NoBrush != item.background_.style ()) if (!bg_unset)
{ {
result = item.background_; result = item.background_;
} }