(qt) #5278 'Something strange with the color of progress bars' -- patch by rb07

diff --git a/qt/torrent-delegate-min.cc b/qt/torrent-delegate-min.cc
index a6e21e844ac9b405d6b111ff15e7e6ef428c39ef..d57213c5b980f9b754acd16f204f6fd512f5e8ca 100644 (file)
--- a/qt/torrent-delegate-min.cc
+++ b/qt/torrent-delegate-min.cc
@@ -21,7 +21,7 @@
 #include <QPainter>
 #include <QPixmap>
 #include <QPixmapCache>
-#include <QStyleOptionProgressBarV2>
+#include <QStyleOptionProgressBar>
 
 #include <libtransmission/transmission.h>
 #include <libtransmission/utils.h>
@@ -157,12 +157,17 @@ TorrentDelegateMin :: drawTorrent( QPainter * painter, const QStyleOptionViewIte
     if ( tor.isDownloading() ) {
         myProgressBarStyle->palette.setBrush( QPalette::Highlight, blueBrush );
         myProgressBarStyle->palette.setColor( QPalette::Base, blueBack );
-        myProgressBarStyle->palette.setColor( QPalette::Background, blueBack );
+        myProgressBarStyle->palette.setColor( QPalette::Window, blueBack );
     }
     else if ( tor.isSeeding() ) {
         myProgressBarStyle->palette.setBrush( QPalette::Highlight, greenBrush );
         myProgressBarStyle->palette.setColor( QPalette::Base, greenBack );
-        myProgressBarStyle->palette.setColor( QPalette::Background, greenBack );
+        myProgressBarStyle->palette.setColor( QPalette::Window, greenBack );
+    }
+    else {
+        myProgressBarStyle->palette.setBrush( QPalette::Highlight, silverBrush );
+        myProgressBarStyle->palette.setColor( QPalette::Base, silverBack );
+        myProgressBarStyle->palette.setColor( QPalette::Window, silverBack );
     }
     myProgressBarStyle->state = progressBarState;
     char buf[32];

diff --git a/qt/torrent-delegate.cc b/qt/torrent-delegate.cc
index 12d9bdbd443d5ac0e9351cdd6191f53bd9be9ce4..91f1a5ae34bae93a6e4e259e3e73ef1d6ace540e 100644 (file)
--- a/qt/torrent-delegate.cc
+++ b/qt/torrent-delegate.cc
@@ -20,7 +20,7 @@
 #include <QPainter>
 #include <QPixmap>
 #include <QPixmapCache>
-#include <QStyleOptionProgressBarV2>
+#include <QStyleOptionProgressBar>
 
 #include "formatter.h"
 #include "torrent.h"
@@ -35,12 +35,14 @@ enum
 
 QColor TorrentDelegate :: greenBrush;
 QColor TorrentDelegate :: blueBrush;
+QColor TorrentDelegate :: silverBrush;
 QColor TorrentDelegate :: greenBack;
 QColor TorrentDelegate :: blueBack;
+QColor TorrentDelegate :: silverBack;
 
 TorrentDelegate :: TorrentDelegate( QObject * parent ):
     QStyledItemDelegate( parent ),
-    myProgressBarStyle( new QStyleOptionProgressBarV2 )
+    myProgressBarStyle( new QStyleOptionProgressBar )
 {
     myProgressBarStyle->minimum = 0;
     myProgressBarStyle->maximum = 1000;
@@ -50,6 +52,9 @@ TorrentDelegate :: TorrentDelegate( QObject * parent ):
 
     blueBrush = QColor("steelblue");
     blueBack = QColor("lightgrey");
+
+    silverBrush = QColor("silver");
+    silverBack = QColor("grey");
 }
 
 TorrentDelegate :: ~TorrentDelegate( )
@@ -423,12 +428,17 @@ TorrentDelegate :: drawTorrent( QPainter * painter, const QStyleOptionViewItem&
     if ( tor.isDownloading() ) {
         myProgressBarStyle->palette.setBrush( QPalette::Highlight, blueBrush );
         myProgressBarStyle->palette.setColor( QPalette::Base, blueBack );
-        myProgressBarStyle->palette.setColor( QPalette::Background, blueBack );
+        myProgressBarStyle->palette.setColor( QPalette::Window, blueBack );
     }
     else if ( tor.isSeeding() ) {
         myProgressBarStyle->palette.setBrush( QPalette::Highlight, greenBrush );
         myProgressBarStyle->palette.setColor( QPalette::Base, greenBack );
-        myProgressBarStyle->palette.setColor( QPalette::Background, greenBack );
+        myProgressBarStyle->palette.setColor( QPalette::Window, greenBack );
+    }
+    else {
+        myProgressBarStyle->palette.setBrush( QPalette::Highlight, silverBrush );
+        myProgressBarStyle->palette.setColor( QPalette::Base, silverBack );
+        myProgressBarStyle->palette.setColor( QPalette::Window, silverBack );
     }
     myProgressBarStyle->state = progressBarState;
     setProgressBarPercentDone( option, tor );

diff --git a/qt/torrent-delegate.h b/qt/torrent-delegate.h
index d428951f51221671bd6dd51d09db118914f3e6b9..307aa2f6c28e211e1e948679382820d9bfcf3c68 100644 (file)
--- a/qt/torrent-delegate.h
+++ b/qt/torrent-delegate.h
@@ -16,7 +16,7 @@
 #include <QStyledItemDelegate>
 #include <QSize>
 
-class QStyleOptionProgressBarV2;
+class QStyleOptionProgressBar;
 class QStyleOptionViewItem;
 class QStyle;
 class Session;
@@ -27,11 +27,11 @@ class TorrentDelegate: public QStyledItemDelegate
         Q_OBJECT
 
     public:
-      static QColor blueBrush, greenBrush;
-      static QColor blueBack,  greenBack;
+      static QColor blueBrush, greenBrush, silverBrush;
+      static QColor blueBack,  greenBack, silverBack;
 
     protected:
-        QStyleOptionProgressBarV2 * myProgressBarStyle;
+        QStyleOptionProgressBar * myProgressBarStyle;
 
     protected:
         QString statusString( const Torrent& tor ) const;