X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Finterface_widgets.cpp;h=fb724d3d41dc7ece3e4588c578f3d67e8eab08d5;hb=39670df97892b3ef4be6edd28e39826804f51cff;hp=6a8f8ace5e5a53b9e4729e5a920238700978b66b;hpb=e17bf628eebcba0307d3c5ad5f80c97d43c48fa5;p=vlc

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 6a8f8ace5e..fb724d3d41 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -249,8 +249,7 @@ VisualSelector::VisualSelector( intf_thread_t *_p_i ) :
     layout->addWidget( prevButton );
     layout->addWidget( nextButton );
 
-    layout->addItem( new QSpacerItem( 40,20,
-                              QSizePolicy::Expanding, QSizePolicy::Minimum ) );
+    layout->addStretch( 10 );
     layout->addWidget( new QLabel( qtr( "Current visualization" ) ) );
 
     current = new QLabel( qtr( "None" ) );
@@ -307,7 +306,8 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i ) :
     ABButton = new QPushButton( "AB" );
     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 ) );
@@ -322,14 +322,15 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i ) :
     recordButton = new QPushButton( "R" );
     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" );
     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()
@@ -362,19 +363,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 */
@@ -405,19 +409,10 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
                                 bool b_fsCreation) :
                                 QFrame( _p_mi ), p_intf( _p_i )
 {
-    controlLayout = new QGridLayout( );
-
-    controlLayout->setSpacing( 0 );
-    controlLayout->setLayoutMargins( 7, 5, 7, 3, 6 );
-
-    if( !b_fsCreation )
-        setLayout( controlLayout );
-
     setSizePolicy( QSizePolicy::Preferred , QSizePolicy::Maximum );
 
     /** The main Slider **/
     slider = new InputSlider( Qt::Horizontal, NULL );
-    controlLayout->addWidget( slider, 0, 1, 1, 16 );
     /* Update the position when the IM has changed */
     CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
              slider, setPosition( float, int, int ) );
@@ -431,20 +426,17 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
     slowerButton->setMaximumSize( QSize( 26, 20 ) );
 
     BUTTON_SET_ACT( slowerButton, "-", qtr( "Slower" ), slower() );
-    controlLayout->addWidget( slowerButton, 0, 0 );
 
     fasterButton = new QToolButton;
     fasterButton->setAutoRaise( true );
     fasterButton->setMaximumSize( QSize( 26, 20 ) );
 
     BUTTON_SET_ACT( fasterButton, "+", qtr( "Faster" ), faster() );
-    controlLayout->addWidget( fasterButton, 0, 17 );
 
     /* advanced Controls handling */
     b_advancedVisible = b_advControls;
 
     advControls = new AdvControlsWidget( p_intf );
-    controlLayout->addWidget( advControls, 1, 3, 2, 4, Qt::AlignBottom );
     if( !b_advancedVisible ) advControls->hide();
 
     /** Disc and Menus handling */
@@ -466,11 +458,9 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
     setupSmallButton( nextSectionButton );
     discLayout->addWidget( nextSectionButton );
 
-    controlLayout->addWidget( discFrame, 1, 10, 2, 3, Qt::AlignBottom );
-
-    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();
 
@@ -512,8 +502,6 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
     telexPage->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum );
     telexLayout->addWidget( telexPage );
 
-    if( !b_fsCreation )
-        controlLayout->addWidget( telexFrame, 1, 10, 2, 4, Qt::AlignBottom );
     telexFrame->hide(); /* default hidden */
 
     CONNECT( telexPage, valueChanged( int ), THEMIM->getIM(),
@@ -521,7 +509,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() );
@@ -533,7 +521,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(),
@@ -553,10 +541,6 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
     playButton->setMinimumSize( QSize( 36, 36 ) );
     playButton->setIconSize( QSize( 30, 30 ) );
 
-    controlLayout->addWidget( playButton, 2, 0, 2, 2 );
-
-    controlLayout->setColumnMinimumWidth( 2, 20 );
-    controlLayout->setColumnStretch( 2, 0 );
 
     /** Prev + Stop + Next Block **/
     controlButLayout = new QHBoxLayout;
@@ -584,55 +568,44 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
     controlButLayout->addWidget( nextButton );
 
     /* Add this block to the main layout */
-    if( !b_fsCreation )
-        controlLayout->addLayout( controlButLayout, 3, 3, 1, 3 );
 
-    BUTTON_SET_ACT_I( playButton, "", play.png, qtr( "Play" ), play() );
-    BUTTON_SET_ACT_I( prevButton, "" , previous.png,
+    BUTTON_SET_ACT_I( playButton, "", play_b, qtr( "Play" ), play() );
+    BUTTON_SET_ACT_I( prevButton, "" , previous_b,
                       qtr( "Previous" ), prev() );
-    BUTTON_SET_ACT_I( nextButton, "", next.png, qtr( "Next" ), next() );
-    BUTTON_SET_ACT_I( stopButton, "", stop.png, qtr( "Stop" ), stop() );
-
-    controlLayout->setColumnMinimumWidth( 7, 20 );
-    controlLayout->setColumnStretch( 7, 0 );
-    controlLayout->setColumnStretch( 8, 0 );
-    controlLayout->setColumnStretch( 9, 0 );
+    BUTTON_SET_ACT_I( nextButton, "", next_b, qtr( "Next" ), next() );
+    BUTTON_SET_ACT_I( stopButton, "", stop_b, qtr( "Stop" ), 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( "Fullscreen" ),
+            fullscreen() );
     setupSmallButton( fullscreenButton );
-    controlLayout->addWidget( fullscreenButton, 3, 10, Qt::AlignBottom );
-
-    /** Playlist Button **/
-    playlistButton = new QPushButton;
-    setupSmallButton( playlistButton );
-    controlLayout->addWidget( playlistButton, 3, 11, Qt::AlignBottom );
-    BUTTON_SET_IMG( playlistButton, "" , playlist.png, qtr( "Show playlist" ) );
-    CONNECT( playlistButton, clicked(), _p_mi, togglePlaylist() );
-
-    /** extended Settings **/
-    extSettingsButton = new QPushButton;
-    BUTTON_SET_ACT( extSettingsButton, "Ex", qtr( "Extended settings" ),
-            extSettings() );
-    setupSmallButton( extSettingsButton );
-    controlLayout->addWidget( extSettingsButton, 3, 12, Qt::AlignBottom );
-
-    controlLayout->setColumnStretch( 13, 0 );
-    controlLayout->setColumnMinimumWidth( 13, 24 );
-    controlLayout->setColumnStretch( 14, 5 );
+
+    if( !b_fsCreation )
+    {
+        /** Playlist Button **/
+        playlistButton = new QPushButton;
+        setupSmallButton( playlistButton );
+        BUTTON_SET_IMG( playlistButton, "" , playlist, qtr( "Show playlist" ) );
+        CONNECT( playlistButton, clicked(), _p_mi, togglePlaylist() );
+
+        /** extended Settings **/
+        extSettingsButton = new QPushButton;
+        BUTTON_SET_ACT_I( extSettingsButton, "", extended,
+                qtr( "Extended settings" ), extSettings() );
+        setupSmallButton( extSettingsButton );
+    }
 
     /* Volume */
     hVolLabel = new VolumeClickHandler( p_intf, this );
 
     volMuteLabel = new QLabel;
-    volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-medium.png" ) );
+    volMuteLabel->setPixmap( QPixmap( ":/volume-medium" ) );
     volMuteLabel->setToolTip( qtr( "Mute" ) );
     volMuteLabel->installEventFilter( hVolLabel );
-    controlLayout->addWidget( volMuteLabel, 3, 15, Qt::AlignBottom );
 
     if( b_shiny )
     {
@@ -649,7 +622,6 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
     volumeSlider->setMaximumSize( QSize( 200, 40 ) );
     volumeSlider->setMinimumSize( QSize( 106, 30 ) );
     volumeSlider->setFocusPolicy( Qt::NoFocus );
-    controlLayout->addWidget( volumeSlider, 2, 16, 2 , 2, Qt::AlignBottom );
 
     /* Set the volume from the config */
     volumeSlider->setValue( ( config_GetInt( p_intf, "volume" ) ) *
@@ -662,6 +634,43 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
     CONNECT( volumeSlider, valueChanged( int ), this, updateVolume( int ) );
     CONNECT( THEMIM, volumeChanged( void ), this, updateVolume( void ) );
 
+    if( !b_fsCreation )
+    {
+        controlLayout = new QGridLayout( this );
+
+        controlLayout->setSpacing( 0 );
+        controlLayout->setLayoutMargins( 7, 5, 7, 3, 6 );
+
+        controlLayout->addWidget( slider, 0, 1, 1, 16 );
+        controlLayout->addWidget( slowerButton, 0, 0 );
+        controlLayout->addWidget( fasterButton, 0, 17 );
+
+        controlLayout->addWidget( advControls, 1, 3, 2, 4, Qt::AlignBottom );
+        controlLayout->addWidget( discFrame, 1, 10, 2, 3, Qt::AlignBottom );
+        controlLayout->addWidget( telexFrame, 1, 10, 2, 4, Qt::AlignBottom );
+
+        controlLayout->addWidget( playButton, 2, 0, 2, 2 );
+        controlLayout->setColumnMinimumWidth( 2, 20 );
+        controlLayout->setColumnStretch( 2, 0 );
+
+        controlLayout->addLayout( controlButLayout, 3, 3, 1, 3 );
+        controlLayout->setColumnMinimumWidth( 7, 20 );
+        controlLayout->setColumnStretch( 7, 0 );
+        controlLayout->setColumnStretch( 8, 0 );
+        controlLayout->setColumnStretch( 9, 0 );
+
+        controlLayout->addWidget( fullscreenButton, 3, 10, Qt::AlignBottom );
+        controlLayout->addWidget( playlistButton, 3, 11, Qt::AlignBottom );
+        controlLayout->addWidget( extSettingsButton, 3, 12, Qt::AlignBottom );
+
+        controlLayout->setColumnStretch( 13, 0 );
+        controlLayout->setColumnMinimumWidth( 13, 24 );
+        controlLayout->setColumnStretch( 14, 5 );
+
+        controlLayout->addWidget( volMuteLabel, 3, 15, Qt::AlignBottom );
+        controlLayout->addWidget( volumeSlider, 2, 16, 2 , 2, Qt::AlignBottom );
+    }
+
     updateInput();
 }
 
@@ -684,6 +693,7 @@ void ControlsWidget::toggleTeletext()
         b_telexEnabled = true;
     }
 }
+
 void ControlsWidget::enableTeletext( bool b_enable )
 {
     telexFrame->setVisible( b_enable );
@@ -699,13 +709,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;
     }
@@ -769,12 +779,12 @@ void ControlsWidget::updateVolume( int i_sliderVolume )
         aout_VolumeSet( p_intf, i_res );
     }
     if( i_sliderVolume == 0 )
-        volMuteLabel->setPixmap( QPixmap(":/pixmaps/volume-muted.png" ) );
+        volMuteLabel->setPixmap( QPixmap(":/volume-muted" ) );
     else if( i_sliderVolume < VOLUME_MAX / 3 )
-        volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) );
+        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" ) );
 }
 
 void ControlsWidget::updateVolume()
@@ -804,12 +814,12 @@ void ControlsWidget::setStatus( int status )
 {
     if( status == PLAYING_S ) /* Playing */
     {
-        playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) );
+        playButton->setIcon( QIcon( ":/pause_b" ) );
         playButton->setToolTip( qtr( "Pause" ) );
     }
     else
     {
-        playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );
+        playButton->setIcon( QIcon( ":/play_b" ) );
         playButton->setToolTip( qtr( "Play" ) );
     }
 }
@@ -898,28 +908,24 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i,
     setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum );
 
     QGridLayout *fsLayout = new QGridLayout( this );
-    controlLayout->setSpacing( 0 );
-    controlLayout->setLayoutMargins( 5, 1, 5, 1, 5 );
+    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 );