From bbe4328c062ffd98521cb89168c7b30e8295b337 Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Sat, 25 Sep 2010 16:51:19 +0000 Subject: [PATCH] Fix progress bar style on Windows --- src/proplistdelegate.h | 10 ++++++++++ src/transferlistdelegate.h | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/proplistdelegate.h b/src/proplistdelegate.h index 6d419dbc0..8aeef057f 100644 --- a/src/proplistdelegate.h +++ b/src/proplistdelegate.h @@ -43,6 +43,10 @@ #include "misc.h" #include "propertieswidget.h" +#ifdef Q_WS_WIN +#include +#endif + // Defines for properties list columns enum PropColumn {NAME, PCSIZE, PROGRESS, PRIORITY}; @@ -79,7 +83,13 @@ public: newopt.minimum = 0; newopt.state |= QStyle::State_Enabled; newopt.textVisible = true; +#ifndef Q_WS_WIN QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter); +#else + // XXX: To avoid having the progress text on the right of the bar + QPlastiqueStyle st; + st.drawControl(QStyle::CE_ProgressBar, &newopt, painter, 0); +#endif break; } case PRIORITY: { diff --git a/src/transferlistdelegate.h b/src/transferlistdelegate.h index 172ff79e2..3319defca 100644 --- a/src/transferlistdelegate.h +++ b/src/transferlistdelegate.h @@ -41,6 +41,10 @@ #include #include "misc.h" +#ifdef Q_WS_WIN + #include +#endif + // Defines for download list list columns enum TorrentState {STATE_DOWNLOADING, STATE_STALLED_DL, STATE_STALLED_UP, STATE_SEEDING, STATE_PAUSED_DL, STATE_PAUSED_UP, STATE_QUEUED_DL, STATE_QUEUED_UP, STATE_CHECKING_UP, STATE_CHECKING_DL, STATE_INVALID}; enum Column {TR_NAME, TR_PRIORITY, TR_SIZE, TR_PROGRESS, TR_STATUS, TR_SEEDS, TR_PEERS, TR_DLSPEED, TR_UPSPEED, TR_ETA, TR_RATIO, TR_LABEL, TR_ADD_DATE, TR_SEED_DATE, TR_DLLIMIT, TR_UPLIMIT, TR_HASH}; @@ -167,7 +171,13 @@ public: newopt.minimum = 0; newopt.state |= QStyle::State_Enabled; newopt.textVisible = true; +#ifndef Q_WS_WIN QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter); +#else + // XXX: To avoid having the progress text on the right of the bar + QPlastiqueStyle st; + st.drawControl(QStyle::CE_ProgressBar, &newopt, painter, 0); +#endif break; } default: