standardpanel: Add some tooltips

vlc_intf_strings.h: with the current intf having changing icons on the button (and not activated/desactivated state), tool tips can be confusing. So reword a strings slightly. Also "No repeat" may need to be improve

diff --git a/include/vlc_intf_strings.h b/include/vlc_intf_strings.h
index 6ad98e41fcad625824de2a0d65da2735bdb9b91e..068bbf64c82102da68ae7a6a0f52035bc15f0892 100644 (file)
--- a/include/vlc_intf_strings.h
+++ b/include/vlc_intf_strings.h
@@ -66,7 +66,7 @@
 #define I_PL_NOREPEAT   N_("No repeat")
 
 #define I_PL_RANDOM     N_("Random")
-#define I_PL_NORANDOM   N_("No random")
+#define I_PL_NORANDOM   N_("Random off")
 
 #define I_PL_ADDPL      N_("Add to playlist")
 #define I_PL_ADDML      N_("Add to media library")

diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index 7b237fddfbed1795fb0f7b774afcbd8dbe5b1c5a..bbf24c807cd73c7806bc843d7843f20fcd873945 100644 (file)
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -94,9 +94,16 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
     buttons->addWidget( addButton );
 
     randomButton = new QPushButton( this );
-    randomButton->setIcon( model->hasRandom() ?
-                            QIcon( ":/pixmaps/playlist_shuffle_on.png" ) :
-                            QIcon( ":/pixmaps/playlist_shuffle_off.png" ) );
+    if( model->hasRandom() )
+    {
+        randomButton->setIcon( QIcon( ":/pixmaps/playlist_shuffle_on.png" ));
+        randomButton->setToolTip( qtr( I_PL_RANDOM ));
+    }
+    else
+    {
+         randomButton->setIcon( QIcon( ":/pixmaps/playlist_shuffle_off.png" ) );
+         randomButton->setToolTip( qtr( I_PL_NORANDOM ));
+    }
     BUTTONACT( randomButton, toggleRandom() );
     buttons->addWidget( randomButton );
 
@@ -104,12 +111,21 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
     buttons->addItem( spacer );
 
     repeatButton = new QPushButton( this );
-    if( model->hasRepeat() ) repeatButton->setIcon(
-                        QIcon( ":/pixmaps/playlist_repeat_one.png" ) );
-    else if( model->hasLoop() ) repeatButton->setIcon(
-                        QIcon( ":/pixmaps/playlist_repeat_all.png" ) );
-    else repeatButton->setIcon(
-                        QIcon( ":/pixmaps/playlist_repeat_off.png" ) );
+    if( model->hasRepeat() ) 
+    {
+        repeatButton->setIcon( QIcon( ":/pixmaps/playlist_repeat_one.png" ) );
+        repeatButton->setToolTip( qtr( I_PL_REPEAT ));
+    }
+    else if( model->hasLoop() )
+    {
+        repeatButton->setIcon( QIcon( ":/pixmaps/playlist_repeat_all.png" ) );
+        repeatButton->setToolTip( qtr( I_PL_LOOP ));
+    }   
+    else
+    {
+        repeatButton->setIcon( QIcon( ":/pixmaps/playlist_repeat_off.png" ) );
+        repeatButton->setToolTip( qtr( I_PL_NOREPEAT ));
+    }   
     BUTTONACT( repeatButton, toggleRepeat() );
     buttons->addWidget( repeatButton );
 
@@ -122,6 +138,7 @@ StandardPLPanel::StandardPLPanel( PlaylistWidget *_parent,
 
     QPushButton *clear = new QPushButton( qfu( "CL") );
     clear->setMaximumWidth( 30 );
+    clear->setToolTip( qtr( "Clear" ));
     BUTTONACT( clear, clearFilter() );
     buttons->addWidget( clear );
 
@@ -137,16 +154,19 @@ void StandardPLPanel::toggleRepeat()
     {
         model->setRepeat( false ); model->setLoop( true );
         repeatButton->setIcon( QIcon( ":/pixmaps/playlist_repeat_all.png" ) );
+        repeatButton->setToolTip( qtr( I_PL_LOOP ));
     }
     else if( model->hasLoop() )
     {
         model->setRepeat( false ) ; model->setLoop( false );
         repeatButton->setIcon( QIcon( ":/pixmaps/playlist_repeat_off.png" ) );
+        repeatButton->setToolTip( qtr( I_PL_NOREPEAT ));
     }
     else
     {
         model->setRepeat( true );
         repeatButton->setIcon( QIcon( ":/pixmaps/playlist_repeat_one.png" ) );
+        repeatButton->setToolTip( qtr( I_PL_REPEAT ));
     }
 }
 
@@ -157,6 +177,7 @@ void StandardPLPanel::toggleRandom()
     randomButton->setIcon( prev ?
                 QIcon( ":/pixmaps/playlist_shuffle_off.png" ) :
                 QIcon( ":/pixmaps/playlist_shuffle_on.png" ) );
+    randomButton->setToolTip( prev ? qtr( I_PL_NORANDOM ) : qtr(I_PL_RANDOM ) );
 }
 
 void StandardPLPanel::handleExpansion( const QModelIndex &index )