Fix SLIDERCOL_LONGTEXT like in commit 2848880a144e0aa184 of jb

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

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 8deeca222eb10f375ca3d42e28260d09872b3e7f..ab6b15717cd2a75cbe2b4f34b2ba9bc861166eaa 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 );
@@ -362,6 +370,7 @@ static void Init( intf_thread_t *p_intf )
                            : p_intf->p_libvlc->psz_homedir;
 
 #ifdef UPDATE_CHECK
+    /* Checking for VLC updates */
     if( config_GetInt( p_intf, "qt-updates-notif" ) )
     {
         int interval = config_GetInt( p_intf, "qt-updates-days" );
@@ -369,7 +378,6 @@ static void Init( intf_thread_t *p_intf )
         if( QDate::currentDate() >
                 settings.value( "updatedate" ).toDate().addDays( interval ) )
         {
-            msg_Dbg( p_intf, "Someone said I need to check updates" );
             /* The constructor of the update Dialog will do the 1st request */
             UpdateDialog::getInstance( p_intf );
             settings.setValue( "updatedate", QDate::currentDate() );
@@ -384,7 +392,7 @@ static void Init( intf_thread_t *p_intf )
 
     /* Destroy first the main interface because it is connected to some slots
        in the MainInputManager */
-    if( p_intf->p_sys->p_mi ) delete p_intf->p_sys->p_mi;
+    delete p_intf->p_sys->p_mi;
 
     /* Destroy then other windows, because some are connected to some slots
        in the MainInputManager */