Fix the activation or not of advanced buttons in fullscreen controller

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

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index c891f7828be3bf5813f2d80f0b2da2a3e045f72f..6ce1adbc6ab55e759b7c529e320a488cb39536b4 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -56,6 +56,8 @@
 
 #include <math.h>
 
+#define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a media")
+
 /**********************************************************************
  * Video Widget. A simple frame on which video is drawn
  * This class handles resize issues
@@ -236,6 +238,7 @@ void BackgroundWidget::contextMenuEvent( QContextMenuEvent *event )
     QVLCMenu::PopupMenu( p_intf, true );
 }
 
+#if 0
 /**********************************************************************
  * Visualization selector panel
  **********************************************************************/
@@ -284,6 +287,7 @@ void VisualSelector::next()
         free( psz_new );
     }
 }
+#endif
 
 /**********************************************************************
  * TEH controls
@@ -303,11 +307,12 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i ) :
     advLayout->setAlignment( Qt::AlignBottom );
 
     /* A to B Button */
-    ABButton = new QPushButton( "AB" );
+    ABButton = new QPushButton;
     setupSmallButton( ABButton );
     advLayout->addWidget( ABButton );
     BUTTON_SET_ACT_I( ABButton, "", atob_nob,
-        qtr( "Loop from point A to point B continuously\nClick to set point A" ), fromAtoB() );
+      qtr( "Loop from point A to point B continuously.\nClick to set point A" ),
+      fromAtoB() );
     timeA = timeB = 0;
     CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
              this, AtoBLoop( float, int, int ) );
@@ -319,14 +324,14 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i ) :
     BUTTON_SET_ACT( frameButton, "Fr", qtr( "Frame by frame" ), frame() );
 #endif
 
-    recordButton = new QPushButton( "R" );
+    recordButton = new QPushButton;
     setupSmallButton( recordButton );
     advLayout->addWidget( recordButton );
     BUTTON_SET_ACT_I( recordButton, "", record,
             qtr( "Record" ), record() );
 
     /* Snapshot Button */
-    snapshotButton = new QPushButton( "S" );
+    snapshotButton = new QPushButton;
     setupSmallButton( snapshotButton );
     advLayout->addWidget( snapshotButton );
     BUTTON_SET_ACT_I( snapshotButton, "", snapshot,
@@ -363,7 +368,7 @@ void AdvControlsWidget::fromAtoB()
     if( !timeA )
     {
         timeA = var_GetTime( THEMIM->getInput(), "time"  );
-        ABButton->setToolTip( "Click to set point B" );
+        ABButton->setToolTip( qtr( "Click to set point B" ) );
         ABButton->setIcon( QIcon( ":/atob_noa" ) );
         return;
     }
@@ -372,7 +377,7 @@ void AdvControlsWidget::fromAtoB()
         timeB = var_GetTime( THEMIM->getInput(), "time"  );
         var_SetTime( THEMIM->getInput(), "time" , timeA );
         ABButton->setIcon( QIcon( ":/atob" ) );
-        ABButton->setToolTip( "Stop the A to B loop" );
+        ABButton->setToolTip( qtr( "Stop the A to B loop" ) );
         return;
     }
     timeA = 0;
@@ -569,19 +574,20 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
 
     /* Add this block to the main layout */
 
-    BUTTON_SET_ACT_I( playButton, "", play_b, qtr( "Play" ), play() );
+    BUTTON_SET_ACT_I( playButton, "", play_b, qtr( I_PLAY_TOOLTIP ), play() );
     BUTTON_SET_ACT_I( prevButton, "" , previous_b,
-                      qtr( "Previous" ), prev() );
-    BUTTON_SET_ACT_I( nextButton, "", next_b, qtr( "Next" ), next() );
-    BUTTON_SET_ACT_I( stopButton, "", stop_b, qtr( "Stop" ), stop() );
+                      qtr( "Previous media in the playlist" ), prev() );
+    BUTTON_SET_ACT_I( nextButton, "", next_b,
+                      qtr( "Next media in the playlist" ), next() );
+    BUTTON_SET_ACT_I( stopButton, "", stop_b, qtr( "Stop playback" ), stop() );
 
     /*
      * Other first Line buttons
      */
     /** Fullscreen/Visualisation **/
     fullscreenButton = new QPushButton;
-    BUTTON_SET_ACT_I( fullscreenButton, "", fullscreen, qtr( "Fullscreen" ),
-            fullscreen() );
+    BUTTON_SET_ACT_I( fullscreenButton, "", fullscreen,
+            qtr( "Toggle the video in fullscreen" ), fullscreen() );
     setupSmallButton( fullscreenButton );
 
     if( !b_fsCreation )
@@ -595,7 +601,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
         /** extended Settings **/
         extSettingsButton = new QPushButton;
         BUTTON_SET_ACT_I( extSettingsButton, "", extended,
-                qtr( "Extended settings" ), extSettings() );
+                qtr( "Show extended settings" ), extSettings() );
         setupSmallButton( extSettingsButton );
     }
 
@@ -604,7 +610,6 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
 
     volMuteLabel = new QLabel;
     volMuteLabel->setPixmap( QPixmap( ":/volume-medium" ) );
-    volMuteLabel->setToolTip( qtr( "Mute" ) );
     volMuteLabel->installEventFilter( hVolLabel );
 
     if( b_shiny )
@@ -779,12 +784,18 @@ void ControlsWidget::updateVolume( int i_sliderVolume )
         aout_VolumeSet( p_intf, i_res );
     }
     if( i_sliderVolume == 0 )
+    {
         volMuteLabel->setPixmap( QPixmap(":/volume-muted" ) );
-    else if( i_sliderVolume < VOLUME_MAX / 3 )
+        volMuteLabel->setToolTip( qtr( "Unmute" ) );
+        return;
+    }
+
+    if( i_sliderVolume < VOLUME_MAX / 3 )
         volMuteLabel->setPixmap( QPixmap( ":/volume-low" ) );
     else if( i_sliderVolume > (VOLUME_MAX * 2 / 3 ) )
         volMuteLabel->setPixmap( QPixmap( ":/volume-high" ) );
     else volMuteLabel->setPixmap( QPixmap( ":/volume-medium" ) );
+    volMuteLabel->setToolTip( qtr( "Mute" ) );
 }
 
 void ControlsWidget::updateVolume()
@@ -815,12 +826,12 @@ void ControlsWidget::setStatus( int status )
     if( status == PLAYING_S ) /* Playing */
     {
         playButton->setIcon( QIcon( ":/pause_b" ) );
-        playButton->setToolTip( qtr( "Pause" ) );
+        playButton->setToolTip( qtr( "Pause the playback" ) );
     }
     else
     {
         playButton->setIcon( QIcon( ":/play_b" ) );
-        playButton->setToolTip( qtr( "Play" ) );
+        playButton->setToolTip( qtr( I_PLAY_TOOLTIP ) );
     }
 }
 
@@ -860,6 +871,7 @@ void ControlsWidget::enableInput( bool enable )
 {
     slowerButton->setEnabled( enable );
     slider->setEnabled( enable );
+    slider->setSliderPosition ( 0 );
     fasterButton->setEnabled( enable );
 
     /* Advanced Buttons too */
@@ -877,7 +889,7 @@ void ControlsWidget::enableVideo( bool enable )
 
 void ControlsWidget::toggleAdvanced()
 {
-    if( !VISIBLE( advControls ) )
+    if( advControls && !b_advancedVisible )
     {
         advControls->show();
         b_advancedVisible = true;
@@ -910,25 +922,22 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i,
     QGridLayout *fsLayout = new QGridLayout( this );
     fsLayout->setLayoutMargins( 5, 1, 5, 1, 5 );
 
-    fsLayout->addWidget( slowerButton, 0, 0 );
+    /* First line */
     slider->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum);
-    fsLayout->addWidget( slider, 0, 1, 1, 6 );
-    fsLayout->addWidget( fasterButton, 0, 7 );
-
-    fsLayout->addWidget( volMuteLabel, 1, 0);
-    fsLayout->addWidget( volumeSlider, 1, 1 );
+    fsLayout->addWidget( slowerButton, 0, 0 );
+    fsLayout->addWidget( slider, 0, 1, 1, 8 );
+    fsLayout->addWidget( fasterButton, 0, 9 );
 
+    fsLayout->addWidget( playButton, 1, 0, 1, 2 );
     fsLayout->addLayout( controlButLayout, 1, 2 );
 
-    fsLayout->addWidget( playButton, 1, 3 );
-
-    fsLayout->addWidget( discFrame, 1, 4 );
-
-    fsLayout->addWidget( telexFrame, 1, 5 );
-
-    fsLayout->addWidget( advControls, 1, 6, Qt::AlignVCenter );
+    fsLayout->addWidget( discFrame, 1, 3 );
+    fsLayout->addWidget( telexFrame, 1, 4 );
+    fsLayout->addWidget( advControls, 1, 5, Qt::AlignVCenter );
+    fsLayout->addWidget( fullscreenButton, 1, 6 );
 
-    fsLayout->addWidget( fullscreenButton, 1, 7 );
+    fsLayout->addWidget( volMuteLabel, 1, 7 );
+    fsLayout->addWidget( volumeSlider, 1, 8, 1, 2 );
 
     /* hiding timer */
     p_hideTimer = new QTimer( this );
@@ -952,6 +961,7 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i,
 #ifdef WIN32TRICK
     setWindowOpacity( 0.0 );
     fscHidden = true;
+    adjustSize();
     show();
 #endif
 
@@ -968,6 +978,7 @@ FullscreenControllerWidget::~FullscreenControllerWidget()
  */
 void FullscreenControllerWidget::showFSC()
 {
+    adjustSize();
 #ifdef WIN32TRICK
     // after quiting and going to fs, we need to call show()
     if( isHidden() )