diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp index 074c10efa..ba11688a9 100644 --- a/src/base/preferences.cpp +++ b/src/base/preferences.cpp @@ -186,17 +186,17 @@ void Preferences::setAlternatingRowColors(const bool b) setValue(u"Preferences/General/AlternatingRowColors"_s, b); } -bool Preferences::useColorCodedProgressBar() const +bool Preferences::useProgressBarFollowTextColor() const { - return value(u"Preferences/General/ColorCodedProgressBar"_s, true); + return value(u"Preferences/General/ProgressBarFollowTextColor"_s, false); } -void Preferences::setColorCodedProgressBar(const bool b) +void Preferences::setProgressBarFollowTextColor(const bool b) { - if (b == useColorCodedProgressBar()) + if (b == useProgressBarFollowTextColor()) return; - setValue(u"Preferences/General/ColorCodedProgressBar"_s, b); + setValue(u"Preferences/General/ProgressBarFollowTextColor"_s, b); } bool Preferences::getHideZeroValues() const diff --git a/src/base/preferences.h b/src/base/preferences.h index 6133bf80d..82ae9bc21 100644 --- a/src/base/preferences.h +++ b/src/base/preferences.h @@ -113,8 +113,8 @@ public: void showSpeedInTitleBar(bool show); bool useAlternatingRowColors() const; void setAlternatingRowColors(bool b); - bool useColorCodedProgressBar() const; - void setColorCodedProgressBar(bool b); + bool useProgressBarFollowTextColor() const; + void setProgressBarFollowTextColor(bool b); bool getHideZeroValues() const; void setHideZeroValues(bool b); int getHideZeroComboValues() const; diff --git a/src/gui/optionsdialog.cpp b/src/gui/optionsdialog.cpp index 7d85bc680..4b993b130 100644 --- a/src/gui/optionsdialog.cpp +++ b/src/gui/optionsdialog.cpp @@ -261,7 +261,7 @@ void OptionsDialog::loadBehaviorTabOptions() m_ui->confirmDeletion->setChecked(pref->confirmTorrentDeletion()); m_ui->checkAltRowColors->setChecked(pref->useAlternatingRowColors()); - m_ui->colorCodedProgressBar->setChecked(pref->useColorCodedProgressBar()); + m_ui->progressBarFollowTextColor->setChecked(pref->useProgressBarFollowTextColor()); m_ui->checkHideZero->setChecked(pref->getHideZeroValues()); m_ui->comboHideZero->setCurrentIndex(pref->getHideZeroComboValues()); m_ui->comboHideZero->setEnabled(m_ui->checkHideZero->isChecked()); @@ -390,7 +390,7 @@ void OptionsDialog::loadBehaviorTabOptions() connect(m_ui->confirmDeletion, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); connect(m_ui->checkAltRowColors, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); - connect(m_ui->colorCodedProgressBar, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); + connect(m_ui->progressBarFollowTextColor, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); connect(m_ui->checkHideZero, &QAbstractButton::toggled, m_ui->comboHideZero, &QWidget::setEnabled); connect(m_ui->checkHideZero, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); connect(m_ui->comboHideZero, qComboBoxCurrentIndexChanged, this, &ThisType::enableApplyButton); @@ -485,7 +485,7 @@ void OptionsDialog::saveBehaviorTabOptions() const pref->setConfirmTorrentDeletion(m_ui->confirmDeletion->isChecked()); pref->setAlternatingRowColors(m_ui->checkAltRowColors->isChecked()); - pref->setColorCodedProgressBar(m_ui->colorCodedProgressBar->isChecked()); + pref->setProgressBarFollowTextColor(m_ui->progressBarFollowTextColor->isChecked()); pref->setHideZeroValues(m_ui->checkHideZero->isChecked()); pref->setHideZeroComboValues(m_ui->comboHideZero->currentIndex()); diff --git a/src/gui/optionsdialog.ui b/src/gui/optionsdialog.ui index b66be9a2e..47b306269 100644 --- a/src/gui/optionsdialog.ui +++ b/src/gui/optionsdialog.ui @@ -298,9 +298,9 @@ - + - Use color-coded progress bar + Make progress bars follow text colors true diff --git a/src/gui/transferlistdelegate.cpp b/src/gui/transferlistdelegate.cpp index c8598ddbe..ac11db741 100644 --- a/src/gui/transferlistdelegate.cpp +++ b/src/gui/transferlistdelegate.cpp @@ -93,7 +93,7 @@ void TransferListDelegate::paint(QPainter *painter, const QStyleOptionViewItem & QColor color = {}; - if (Preferences::instance()->useColorCodedProgressBar()) + if (Preferences::instance()->useProgressBarFollowTextColor()) { color = index.data(Qt::ForegroundRole).value(); }