Add a preference option to choose your Volume Slider colours.

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index b66beeaff5fc5ad1b9140e81917440276a5c76f4..7bba2c05c29a8950cef0c67b3a863c50e5d339a7 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -603,7 +603,8 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
     {
         volumeSlider = new SoundSlider( this,
             config_GetInt( p_intf, "volume-step" ),
-            config_GetInt( p_intf, "qt-volume-complete" ) );
+            config_GetInt( p_intf, "qt-volume-complete" ),
+            config_GetPsz( p_intf, "qt-slider-colours" ) );
     }
     else
     {

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index cb00389eb588c531fb10d9cabcae1035eefff15a..923f8bcc058ac717ac718a753c28dc1a1a1dd519 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -111,6 +111,11 @@ static void ShowDialog   ( intf_thread_t *, int, int, intf_dialog_args_t * );
 
 #define PRIVACY_TEXT N_( "Ask for network policy at start" )
 
+#define SLIDERCOL_TEXT N_( "Define the colours of the volume slider " )
+#define SLIDERCOL_LONGTEXT N_( "Define the colours of the volume slider\n " \
+                       "By specifying the 12 numbers separated by a ';'\n " \
+            "Default is '255;255;255;20;226;20;255;176;15,235;30;20'\n " \
+            "An alternative can be '30;30;50;40;40;100;50;50;160;150;150;255' ")
 
 #define VIEWDETAIL_TEXT N_( "Show the opening dialog view in detail mode" )
 
@@ -184,6 +189,9 @@ vlc_module_begin();
         add_integer( "qt-updates-days", 14, NULL, UPDATER_DAYS_TEXT,
                 UPDATER_DAYS_TEXT, VLC_FALSE );
 #endif
+        add_string( "qt-slider-colours",
+                "255;255;255;20;226;20;255;176;15,235;30;20",
+                NULL, SLIDERCOL_TEXT, SLIDERCOL_LONGTEXT, VLC_FALSE );
 
         add_bool( "qt-open-detail", VLC_FALSE, NULL, VIEWDETAIL_TEXT,
                 VIEWDETAIL_TEXT, VLC_FALSE );

diff --git a/modules/gui/qt4/util/input_slider.cpp b/modules/gui/qt4/util/input_slider.cpp
index a59afeb8824e51121f590b47590a09eb40ed1ccb..50834d95300768e0beb4f2247bbde2f4064e43af 100644 (file)
--- a/modules/gui/qt4/util/input_slider.cpp
+++ b/modules/gui/qt4/util/input_slider.cpp
@@ -114,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;
@@ -134,11 +135,20 @@ SoundSlider::SoundSlider( QWidget *_parent, int _i_step, bool b_hard )
 
     pixGradient = QPixmap( mask.size() );
 
+    /* Gradient building from the preferences */
     QLinearGradient gradient( paddingL, 4, WLENGTH + paddingL , 4 );
-    gradient.setColorAt( 0.0, QColor( 255, 255, 255 ) );
-    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( ";" );
+    /* 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 );

diff --git a/modules/gui/qt4/util/input_slider.hpp b/modules/gui/qt4/util/input_slider.hpp
index a06d93a2b3d34317da153f2264cd793dbba3e1f8..33efd4b9ce5839942110b0e3c915d80cd4c9720f 100644 (file)
--- a/modules/gui/qt4/util/input_slider.hpp
+++ b/modules/gui/qt4/util/input_slider.hpp
@@ -60,7 +60,7 @@ class SoundSlider : public QAbstractSlider
 {
     Q_OBJECT
 public:
-    SoundSlider( QWidget *_parent, int _i_step, bool b_softamp );
+    SoundSlider( QWidget *_parent, int _i_step, bool b_softamp, char * );
     virtual ~SoundSlider() {};
 protected:
     int paddingL;