From 1e2d85a2d871d979c2a1cffa7944f41a163f83c2 Mon Sep 17 00:00:00 2001 From: Mark Yu Date: Thu, 10 Jul 2025 14:32:22 -0400 Subject: [PATCH] Apply suggestions from code review apply code review suggestions Co-authored-by: Vladimir Golovnev --- src/base/preferences.cpp | 10 +++++----- src/base/preferences.h | 4 ++-- src/gui/optionsdialog.cpp | 6 +++--- src/gui/optionsdialog.ui | 2 +- src/gui/transferlistdelegate.cpp | 9 ++------- 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp index ba11688a9..ef0ad708b 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::useProgressBarFollowTextColor() const +bool Preferences::getProgressBarFollowsTextColor() const { - return value(u"Preferences/General/ProgressBarFollowTextColor"_s, false); + return value(u"GUI/TransferList/ProgressBarFollowsTextColor"_s, false); } -void Preferences::setProgressBarFollowTextColor(const bool b) +void Preferences::setProgressBarFollowsTextColor(const bool value) { - if (b == useProgressBarFollowTextColor()) + if (value == getProgressBarFollowsTextColor()) return; - setValue(u"Preferences/General/ProgressBarFollowTextColor"_s, b); + setValue(u"GUI/TransferList/ProgressBarFollowsTextColor"_s, value); } bool Preferences::getHideZeroValues() const diff --git a/src/base/preferences.h b/src/base/preferences.h index 82ae9bc21..bf08fde3d 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 useProgressBarFollowTextColor() const; - void setProgressBarFollowTextColor(bool b); + bool getProgressBarFollowsTextColor() const; + void setProgressBarFollowsTextColor(bool value); bool getHideZeroValues() const; void setHideZeroValues(bool b); int getHideZeroComboValues() const; diff --git a/src/gui/optionsdialog.cpp b/src/gui/optionsdialog.cpp index 4b993b130..70eb43c43 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->progressBarFollowTextColor->setChecked(pref->useProgressBarFollowTextColor()); + m_ui->checkProgressBarFollowsTextColor->setChecked(pref->getProgressBarFollowsTextColor()); 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->progressBarFollowTextColor, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); + connect(m_ui->checkProgressBarFollowsTextColor, &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->setProgressBarFollowTextColor(m_ui->progressBarFollowTextColor->isChecked()); + pref->setProgressBarFollowsTextColor(m_ui->checkProgressBarFollowsTextColor->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 47b306269..556d161c3 100644 --- a/src/gui/optionsdialog.ui +++ b/src/gui/optionsdialog.ui @@ -298,7 +298,7 @@ - + Make progress bars follow text colors diff --git a/src/gui/transferlistdelegate.cpp b/src/gui/transferlistdelegate.cpp index ac11db741..8bc41e45d 100644 --- a/src/gui/transferlistdelegate.cpp +++ b/src/gui/transferlistdelegate.cpp @@ -30,8 +30,8 @@ #include -#include "transferlistmodel.h" #include "base/preferences.h" +#include "transferlistmodel.h" TransferListDelegate::TransferListDelegate(QObject *parent) : QStyledItemDelegate {parent} @@ -91,12 +91,7 @@ void TransferListDelegate::paint(QPainter *painter, const QStyleOptionViewItem & QStyleOptionViewItem customOption {option}; customOption.state.setFlag(QStyle::State_Enabled, isEnableState(torrentState)); - QColor color = {}; - - if (Preferences::instance()->useProgressBarFollowTextColor()) - { - color = index.data(Qt::ForegroundRole).value(); - } + const QColor color = Preferences::instance()->getProgressBarFollowsTextColor() ? index.data(Qt::ForegroundRole).value() : QColor(); m_progressBarPainter.paint(painter, customOption, index.data().toString(), progress, color); }