]> git.sesse.net Git - vlc/blobdiff - modules/gui/qt4/components/interface_widgets.cpp
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix the "drag slider to 100% when video finishes doesn't reset thte slider" bug.
[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 a42d4c0bfef89597769af8662ee9cd2475e0ead7..5a628747bba126a40a00897d85b7b21773a5a202 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 "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,10 +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( ABButton, "AB", qtr( "A to B" ), fromAtoB() );
+    BUTTON_SET_ACT_I( ABButton, "", atob_nob,
+      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 ) );
@@ -318,17 +324,18 @@ 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_16px.png,
+    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( snapshotButton, "S", qtr( "Take a snapshot" ), snapshot() );
+    BUTTON_SET_ACT_I( snapshotButton, "", snapshot,
+            qtr( "Take a snapshot" ), snapshot() );
 }
 
 AdvControlsWidget::~AdvControlsWidget()
@@ -361,19 +368,22 @@ void AdvControlsWidget::fromAtoB()
     if( !timeA )
     {
         timeA = var_GetTime( THEMIM->getInput(), "time"  );
-        ABButton->setText( "A->..." );
+        ABButton->setToolTip( "Click to set point B" );
+        ABButton->setIcon( QIcon( ":/atob_noa" ) );
         return;
     }
     if( !timeB )
     {
         timeB = var_GetTime( THEMIM->getInput(), "time"  );
         var_SetTime( THEMIM->getInput(), "time" , timeA );
-        ABButton->setText( "A<=>B" );
+        ABButton->setIcon( QIcon( ":/atob" ) );
+        ABButton->setToolTip( "Stop the A to B loop" );
         return;
     }
     timeA = 0;
     timeB = 0;
-    ABButton->setText( "AB" );
+    ABButton->setToolTip( qtr( "Loop from point A to point B continuously\nClick to set point A" ) );
+    ABButton->setIcon( QIcon( ":/atob_nob" ) );
 }
 
 /* Function called regularly when in an AtoB loop */
@@ -453,9 +463,9 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
     setupSmallButton( nextSectionButton );
     discLayout->addWidget( nextSectionButton );
 
-    BUTTON_SET_IMG( prevSectionButton, "", previous.png, "" );
-    BUTTON_SET_IMG( nextSectionButton, "", next.png, "" );
-    BUTTON_SET_IMG( menuButton, "", previous.png, qtr( "Menu" ) );
+    BUTTON_SET_IMG( prevSectionButton, "", dvd_prev, "" );
+    BUTTON_SET_IMG( nextSectionButton, "", dvd_next, "" );
+    BUTTON_SET_IMG( menuButton, "", dvd_menu, qtr( "Menu" ) );
 
     discFrame->hide();
 
@@ -504,7 +514,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
     CONNECT( THEMIM->getIM(), setNewTelexPage( int ),
               telexPage, setValue( int ) );
 
-    BUTTON_SET_IMG( telexOn, "", tv.png, qtr( "Teletext on" ) );
+    BUTTON_SET_IMG( telexOn, "", tv, qtr( "Teletext on" ) );
 
     CONNECT( telexOn, clicked(), THEMIM->getIM(),
              telexToggleButtons() );
@@ -516,7 +526,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
     telexTransparent->setEnabled( false );
     telexPage->setEnabled( false );
 
-    BUTTON_SET_IMG( telexTransparent, "", tvtelx.png, qtr( "Teletext" ) );
+    BUTTON_SET_IMG( telexTransparent, "", tvtelx, qtr( "Teletext" ) );
     CONNECT( telexTransparent, clicked( bool ),
              THEMIM->getIM(), telexSetTransparency() );
     CONNECT( THEMIM->getIM(), toggleTelexTransparency(),
@@ -564,18 +574,20 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
 
     /* Add this block to the main layout */
 
-    BUTTON_SET_ACT_I( playButton, "", play.png, qtr( "Play" ), play() );
-    BUTTON_SET_ACT_I( prevButton, "" , previous.png,
-                      qtr( "Previous" ), prev() );
-    BUTTON_SET_ACT_I( nextButton, "", next.png, qtr( "Next" ), next() );
-    BUTTON_SET_ACT_I( stopButton, "", stop.png, qtr( "Stop" ), stop() );
+    BUTTON_SET_ACT_I( playButton, "", play_b, qtr( I_PLAY_TOOLTIP ), play() );
+    BUTTON_SET_ACT_I( prevButton, "" , previous_b,
+                      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( "F" );
-    BUTTON_SET_ACT( fullscreenButton, "F", qtr( "Fullscreen" ), fullscreen() );
+    fullscreenButton = new QPushButton;
+    BUTTON_SET_ACT_I( fullscreenButton, "", fullscreen,
+            qtr( "Toggle the video in fullscreen" ), fullscreen() );
     setupSmallButton( fullscreenButton );
 
     if( !b_fsCreation )
@@ -583,13 +595,13 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
         /** Playlist Button **/
         playlistButton = new QPushButton;
         setupSmallButton( playlistButton );
-        BUTTON_SET_IMG( playlistButton, "" , playlist.png, qtr( "Show playlist" ) );
+        BUTTON_SET_IMG( playlistButton, "" , playlist, qtr( "Show playlist" ) );
         CONNECT( playlistButton, clicked(), _p_mi, togglePlaylist() );
 
         /** extended Settings **/
         extSettingsButton = new QPushButton;
-        BUTTON_SET_ACT( extSettingsButton, "Ex", qtr( "Extended settings" ),
-                extSettings() );
+        BUTTON_SET_ACT_I( extSettingsButton, "", extended,
+                qtr( "Show extended settings" ), extSettings() );
         setupSmallButton( extSettingsButton );
     }
 
@@ -597,8 +609,7 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
     hVolLabel = new VolumeClickHandler( p_intf, this );
 
     volMuteLabel = new QLabel;
-    volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-medium.png" ) );
-    volMuteLabel->setToolTip( qtr( "Mute" ) );
+    volMuteLabel->setPixmap( QPixmap( ":/volume-medium" ) );
     volMuteLabel->installEventFilter( hVolLabel );
 
     if( b_shiny )
@@ -703,13 +714,13 @@ void ControlsWidget::toggleTeletextTransparency()
 {
     if( b_telexTransparent )
     {
-        telexTransparent->setIcon( QIcon( ":/pixmaps/tvtelx.png" ) );
+        telexTransparent->setIcon( QIcon( ":/tvtelx" ) );
         telexTransparent->setToolTip( qtr( "Teletext" ) );
         b_telexTransparent = false;
     }
     else
     {
-        telexTransparent->setIcon( QIcon( ":/pixmaps/tvtelx-transparent.png" ) );
+        telexTransparent->setIcon( QIcon( ":/tvtelx-transparent" ) );
         telexTransparent->setToolTip( qtr( "Transparent" ) );
         b_telexTransparent = true;
     }
@@ -773,12 +784,18 @@ void ControlsWidget::updateVolume( int i_sliderVolume )
         aout_VolumeSet( p_intf, i_res );
     }
     if( i_sliderVolume == 0 )
-        volMuteLabel->setPixmap( QPixmap(":/pixmaps/volume-muted.png" ) );
-    else if( i_sliderVolume < VOLUME_MAX / 3 )
-        volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) );
+    {
+        volMuteLabel->setPixmap( QPixmap(":/volume-muted" ) );
+        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( ":/pixmaps/volume-high.png" ) );
-    else volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-medium.png" ) );
+        volMuteLabel->setPixmap( QPixmap( ":/volume-high" ) );
+    else volMuteLabel->setPixmap( QPixmap( ":/volume-medium" ) );
+    volMuteLabel->setToolTip( qtr( "Mute" ) );
 }
 
 void ControlsWidget::updateVolume()
@@ -808,13 +825,13 @@ void ControlsWidget::setStatus( int status )
 {
     if( status == PLAYING_S ) /* Playing */
     {
-        playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) );
-        playButton->setToolTip( qtr( "Pause" ) );
+        playButton->setIcon( QIcon( ":/pause_b" ) );
+        playButton->setToolTip( qtr( "Pause the playback" ) );
     }
     else
     {
-        playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );
-        playButton->setToolTip( qtr( "Play" ) );
+        playButton->setIcon( QIcon( ":/play_b" ) );
+        playButton->setToolTip( qtr( I_PLAY_TOOLTIP ) );
     }
 }
 
@@ -854,6 +871,7 @@ void ControlsWidget::enableInput( bool enable )
 {
     slowerButton->setEnabled( enable );
     slider->setEnabled( enable );
+    slider->setSliderPosition ( 0 );
     fasterButton->setEnabled( enable );
 
     /* Advanced Buttons too */
@@ -904,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( slowerButton, 0, 0 );
     fsLayout->addWidget( slider, 0, 1, 1, 6 );
     fsLayout->addWidget( fasterButton, 0, 7 );
 
-    fsLayout->addWidget( volMuteLabel, 1, 0);
-    fsLayout->addWidget( volumeSlider, 1, 1 );
-
-    fsLayout->addLayout( controlButLayout, 1, 2 );
-
-    fsLayout->addWidget( playButton, 1, 3 );
-
-    fsLayout->addWidget( discFrame, 1, 4 );
-
-    fsLayout->addWidget( telexFrame, 1, 5 );
+    fsLayout->addWidget( playButton, 1, 0 );
+    fsLayout->addLayout( controlButLayout, 1, 1 );
 
-    fsLayout->addWidget( advControls, 1, 6, Qt::AlignVCenter );
+    fsLayout->addWidget( discFrame, 1, 2 );
+    fsLayout->addWidget( telexFrame, 1, 3 );
+    fsLayout->addWidget( advControls, 1, 4, Qt::AlignVCenter );
+    fsLayout->addWidget( fullscreenButton, 1, 5 );
 
-    fsLayout->addWidget( fullscreenButton, 1, 7 );
+    fsLayout->addWidget( volMuteLabel, 1, 6);
+    fsLayout->addWidget( volumeSlider, 1, 7 );
 
     /* hiding timer */
     p_hideTimer = new QTimer( this );
Unnamed repository; edit this file 'description' to name the repository.