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 26d2bfb015cbbbfb693b1fce73c0a0579ea53be3..6ce1adbc6ab55e759b7c529e320a488cb39536b4 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -56,7 +56,7 @@
 
 #include <math.h>
 
-#define I_PLAY_TOOLTIP "Play\nIf the playlist is empty, open a media"
+#define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a media")
 
 /**********************************************************************
  * Video Widget. A simple frame on which video is drawn
@@ -368,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;
     }
@@ -377,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;
@@ -871,6 +871,7 @@ void ControlsWidget::enableInput( bool enable )
 {
     slowerButton->setEnabled( enable );
     slider->setEnabled( enable );
+    slider->setSliderPosition ( 0 );
     fasterButton->setEnabled( enable );
 
     /* Advanced Buttons too */
@@ -888,7 +889,7 @@ void ControlsWidget::enableVideo( bool enable )
 
 void ControlsWidget::toggleAdvanced()
 {
-    if( !VISIBLE( advControls ) )
+    if( advControls && !b_advancedVisible )
     {
         advControls->show();
         b_advancedVisible = true;
@@ -924,19 +925,19 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i,
     /* First line */
     slider->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum);
     fsLayout->addWidget( slowerButton, 0, 0 );
-    fsLayout->addWidget( slider, 0, 1, 1, 6 );
-    fsLayout->addWidget( fasterButton, 0, 7 );
+    fsLayout->addWidget( slider, 0, 1, 1, 8 );
+    fsLayout->addWidget( fasterButton, 0, 9 );
 
-    fsLayout->addWidget( playButton, 1, 0 );
-    fsLayout->addLayout( controlButLayout, 1, 1 );
+    fsLayout->addWidget( playButton, 1, 0, 1, 2 );
+    fsLayout->addLayout( controlButLayout, 1, 2 );
 
-    fsLayout->addWidget( discFrame, 1, 2 );
-    fsLayout->addWidget( telexFrame, 1, 3 );
-    fsLayout->addWidget( advControls, 1, 4, Qt::AlignVCenter );
-    fsLayout->addWidget( fullscreenButton, 1, 5 );
+    fsLayout->addWidget( discFrame, 1, 3 );
+    fsLayout->addWidget( telexFrame, 1, 4 );
+    fsLayout->addWidget( advControls, 1, 5, Qt::AlignVCenter );
+    fsLayout->addWidget( fullscreenButton, 1, 6 );
 
-    fsLayout->addWidget( volMuteLabel, 1, 6);
-    fsLayout->addWidget( volumeSlider, 1, 7 );
+    fsLayout->addWidget( volMuteLabel, 1, 7 );
+    fsLayout->addWidget( volumeSlider, 1, 8, 1, 2 );
 
     /* hiding timer */
     p_hideTimer = new QTimer( this );
@@ -960,6 +961,7 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i,
 #ifdef WIN32TRICK
     setWindowOpacity( 0.0 );
     fscHidden = true;
+    adjustSize();
     show();
 #endif
 
@@ -976,6 +978,7 @@ FullscreenControllerWidget::~FullscreenControllerWidget()
  */
 void FullscreenControllerWidget::showFSC()
 {
+    adjustSize();
 #ifdef WIN32TRICK
     // after quiting and going to fs, we need to call show()
     if( isHidden() )