Qt Imageset update.

[vlc] / modules / gui / qt4 / util / input_slider.cpp

diff --git a/modules/gui/qt4/util/input_slider.cpp b/modules/gui/qt4/util/input_slider.cpp
index 0200ffb8a068c57136f39463412eb83291f8b414..dc81a95e26f8de414ce1de92594ec8ef41d81f67 100644 (file)
--- a/modules/gui/qt4/util/input_slider.cpp
+++ b/modules/gui/qt4/util/input_slider.cpp
@@ -5,6 +5,7 @@
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
+ *          Jean-Baptiste Kempf <jb@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -113,7 +114,8 @@ void InputSlider::mouseMoveEvent(QMouseEvent *event)
 #define SOUNDMIN  0   // %
 #define SOUNDMAX  200 // % OR 400 ?
 
-SoundSlider::SoundSlider( QWidget *_parent, int _i_step, bool b_hard )
+SoundSlider::SoundSlider( QWidget *_parent, int _i_step, bool b_hard,
+                          char *psz_colors )
                         : QAbstractSlider( _parent )
 {
     paddingL = 5;
@@ -124,20 +126,31 @@ SoundSlider::SoundSlider( QWidget *_parent, int _i_step, bool b_hard )
     setMouseTracking( true );
     b_sliding = false;
 
-    pixOutside = QPixmap( ":/pixmaps/volume-slider-outside.png" );
+    pixOutside = QPixmap( ":/volslide-outside" );
 
-    const QPixmap temp( ":/pixmaps/volume-slider-inside.png" );
+    const QPixmap temp( ":/volslide-inside" );
     const QBitmap mask( temp.createHeuristicMask() );
 
     setMinimumSize( pixOutside.size() );
 
     pixGradient = QPixmap( mask.size() );
 
+    /* Gradient building from the preferences */
     QLinearGradient gradient( paddingL, 4, WLENGTH + paddingL , 4 );
-    gradient.setColorAt( 0.0, Qt::white );
-    gradient.setColorAt( 0.2, QColor( 20, 226, 20 ) );
-    gradient.setColorAt( 0.5, QColor( 255, 176, 15 ) );
-    gradient.setColorAt( 1.0, QColor( 235, 30, 20 ) );
+
+    QStringList colorList = qfu( psz_colors ).split( ";" );
+    free( psz_colors );
+
+    /* Fill with 255 if the list is too short */
+    if( colorList.size() < 12 )
+        for( int i = colorList.size(); i < 12; i++)
+            colorList.append( "255" );
+
+#define c(i) colorList.at(i).toInt()
+    gradient.setColorAt( 0.0, QColor( c(0), c(1), c(2) ) );
+    gradient.setColorAt( 0.2, QColor( c(3), c(4), c(5) ) );
+    gradient.setColorAt( 0.5, QColor( c(6), c(7), c(8) ) );
+    gradient.setColorAt( 1.0, QColor( c(9), c(10), c(11) ) );
 
     QPainter painter( &pixGradient );
     painter.setPen( Qt::NoPen );
@@ -203,10 +216,10 @@ void SoundSlider::mouseMoveEvent( QMouseEvent *event )
     }
     else
     {
-        setToolTip( QString("%1  \%" )
-                .arg( (int)( event->x() - paddingL ) * maximum() / WLENGTH ) );
+        int i = ( event->x() - paddingL ) * maximum() / WLENGTH;
+        i = __MIN( __MAX( 0, i ), maximum() );
+        setToolTip( QString("%1  \%" ).arg( i ) );
     }
-
 }
 
 void SoundSlider::changeValue( int x )