diff --git a/TODO b/TODO index d8c56002e..97913c153 100644 --- a/TODO +++ b/TODO @@ -68,4 +68,5 @@ LANGUAGES UPDATED: beta4->beta5 changelog: - BUGFIX: Finished torrents were still displayed as checking when paused by libtorrent on full disk (hit an assert) -- I18N: Updated Italian translation \ No newline at end of file +- I18N: Updated Italian translation +- COSMETIC: Changed the way progress bars are rendered \ No newline at end of file diff --git a/src/DLListDelegate.h b/src/DLListDelegate.h index 54ca27aae..902cb6052 100644 --- a/src/DLListDelegate.h +++ b/src/DLListDelegate.h @@ -79,7 +79,6 @@ class DLListDelegate: public QItemDelegate { } case PROGRESS:{ QStyleOptionProgressBarV2 newopt; - QPalette::ColorGroup cg = option.state & QStyle::State_Enabled ? QPalette::Normal : QPalette::Disabled; float progress; progress = index.data().toDouble()*100.; snprintf(tmp, MAX_CHAR_TMP, "%.1f", progress); @@ -89,15 +88,9 @@ class DLListDelegate: public QItemDelegate { newopt.maximum = 100; newopt.minimum = 0; newopt.state |= QStyle::State_Enabled; - newopt.textVisible = false; + newopt.textVisible = true; QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter); - //We prefer to display text manually to control color/font/boldness - if (option.state & QStyle::State_Selected){ - opt.palette.setColor(QPalette::Text, QColor("grey")); - painter->setPen(opt.palette.color(cg, QPalette::Text)); - } - painter->drawText(opt.rect, Qt::AlignCenter, newopt.text); break; } default: diff --git a/src/FinishedListDelegate.h b/src/FinishedListDelegate.h index 797604c7f..2484623b1 100644 --- a/src/FinishedListDelegate.h +++ b/src/FinishedListDelegate.h @@ -72,7 +72,6 @@ class FinishedListDelegate: public QItemDelegate { } case F_PROGRESS:{ QStyleOptionProgressBarV2 newopt; - QPalette::ColorGroup cg = option.state & QStyle::State_Enabled ? QPalette::Normal : QPalette::Disabled; float progress; progress = index.data().toDouble()*100.; snprintf(tmp, MAX_CHAR_TMP, "%.1f", progress); @@ -82,15 +81,9 @@ class FinishedListDelegate: public QItemDelegate { newopt.maximum = 100; newopt.minimum = 0; newopt.state |= QStyle::State_Enabled; - newopt.textVisible = false; + newopt.textVisible = true; QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter); - //We prefer to display text manually to control color/font/boldness - if (option.state & QStyle::State_Selected){ - opt.palette.setColor(QPalette::Text, QColor("grey")); - painter->setPen(opt.palette.color(cg, QPalette::Text)); - } - painter->drawText(option.rect, Qt::AlignCenter, newopt.text); break; } default: diff --git a/src/PropListDelegate.h b/src/PropListDelegate.h index 539c7c33b..ecdeb005c 100644 --- a/src/PropListDelegate.h +++ b/src/PropListDelegate.h @@ -76,15 +76,9 @@ class PropListDelegate: public QItemDelegate { newopt.maximum = 100; newopt.minimum = 0; newopt.state |= QStyle::State_Enabled; - newopt.textVisible = false; + newopt.textVisible = true; QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter); - //We prefer to display text manually to control color/font/boldness - if (option.state & QStyle::State_Selected){ - opt.palette.setColor(QPalette::Text, QColor("grey")); - painter->setPen(opt.palette.color(cg, QPalette::Text)); - } - painter->drawText(option.rect, Qt::AlignCenter, newopt.text); break; } case PRIORITY:{