X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Finterface_widgets.cpp;h=c891f7828be3bf5813f2d80f0b2da2a3e045f72f;hb=b5077c0ef45f56e5b4126f78b71aadecf8f2857f;hp=06e33aca411d9862ad5ddd6e0808d459e0dbd82e;hpb=a53156c65a93d74fa0ff7c8739a7ed8444a4bafd;p=vlc

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 06e33aca41..c891f7828b 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -23,10 +23,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
+#include <vlc_vout.h>
+
 #include "dialogs_provider.hpp"
 #include "components/interface_widgets.hpp"
 #include "main_interface.hpp"
@@ -34,7 +37,6 @@
 #include "menus.hpp"
 #include "util/input_slider.hpp"
 #include "util/customwidgets.hpp"
-#include <vlc_vout.h>
 
 #include <QLabel>
 #include <QSpacerItem>
@@ -47,39 +49,59 @@
 #include <QResizeEvent>
 #include <QDate>
 
+#ifdef Q_WS_X11
+# include <X11/Xlib.h>
+# include <qx11info_x11.h>
+#endif
+
+#include <math.h>
+
 /**********************************************************************
  * Video Widget. A simple frame on which video is drawn
  * This class handles resize issues
  **********************************************************************/
-static void *DoRequest( intf_thread_t *, vout_thread_t *, int*,int*,
-                        unsigned int *, unsigned int * );
-static void DoRelease( intf_thread_t *, void * );
-static int DoControl( intf_thread_t *, void *, int, va_list );
 
 VideoWidget::VideoWidget( intf_thread_t *_p_i ) : QFrame( NULL ), p_intf( _p_i )
 {
     /* Init */
-    vlc_mutex_init( p_intf, &lock );
-    p_vout = NULL;
+    i_vout = 0;
     hide(); setMinimumSize( 16, 16 );
     videoSize.rwidth() = -1;
     videoSize.rheight() = -1;
+    setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
 
     /* Black background is more coherent for a Video Widget IMVHO */
     QPalette plt =  palette();
     plt.setColor( QPalette::Active, QPalette::Window , Qt::black );
     plt.setColor( QPalette::Inactive, QPalette::Window , Qt::black );
     setPalette( plt );
+    setAttribute( Qt::WA_PaintOnScreen, true );
+
+    /* The core can ask through a callback to show the video. */
+#if HAS_QT43
+    connect( this, SIGNAL(askVideoWidgetToShow( unsigned int, unsigned int)),
+             this, SLOT(SetSizing(unsigned int, unsigned int )),
+             Qt::BlockingQueuedConnection );
+#else
+#error This is broken. Fix it with a QEventLoop with a processEvents () 
+    connect( this, SIGNAL(askVideoWidgetToShow( unsigned int, unsigned int)),
+             this, SLOT(SetSizing(unsigned int, unsigned int )) );
+#endif
+}
 
-    /* The core can ask through a callback to show the video */
-    CONNECT( this, askVideoWidgetToShow(), this, show() );
-    /* The core can ask through a callback to resize the video */
-   // CONNECT( this, askResize( int, int ), this, SetSizing( int, int ) );
+void VideoWidget::paintEvent(QPaintEvent *ev)
+{
+    QFrame::paintEvent(ev);
+#ifdef Q_WS_X11
+    XFlush( QX11Info::display() );
+#endif
 }
 
 VideoWidget::~VideoWidget()
 {
-    vlc_mutex_lock( &lock );
+    vout_thread_t *p_vout = i_vout
+        ? (vout_thread_t *)vlc_object_get( i_vout ) : NULL;
+
     if( p_vout )
     {
         if( !p_intf->psz_switch_intf )
@@ -92,25 +114,25 @@ VideoWidget::~VideoWidget()
             if( vout_Control( p_vout, VOUT_REPARENT ) != VLC_SUCCESS )
                 vout_Control( p_vout, VOUT_CLOSE );
         }
+        vlc_object_release( p_vout );
     }
-    vlc_mutex_unlock( &lock );
-    vlc_mutex_destroy( &lock );
 }
 
 /**
  * Request the video to avoid the conflicts
  **/
 void *VideoWidget::request( vout_thread_t *p_nvout, int *pi_x, int *pi_y,
-                           unsigned int *pi_width, unsigned int *pi_height )
+                            unsigned int *pi_width, unsigned int *pi_height )
 {
     msg_Dbg( p_intf, "Video was requested %i, %i", *pi_x, *pi_y );
-    emit askVideoWidgetToShow();
-    if( p_vout )
+    emit askVideoWidgetToShow( *pi_width, *pi_height );
+    if( i_vout )
     {
         msg_Dbg( p_intf, "embedded video already in use" );
         return NULL;
     }
-    p_vout = p_nvout;
+    i_vout = p_nvout->i_object_id;
+    msg_Dbg( p_intf, "embedded video ready (handle %p)", winId() );
     return ( void* )winId();
 }
 
@@ -122,13 +144,14 @@ void VideoWidget::SetSizing( unsigned int w, unsigned int h )
     msg_Dbg( p_intf, "Video is resizing to: %i %i", w, h );
     videoSize.rwidth() = w;
     videoSize.rheight() = h;
+    if( isHidden() ) show();
     updateGeometry(); // Needed for deinterlace
 }
 
 void VideoWidget::release( void *p_win )
 {
-    msg_Dbg( p_intf, "Video is non needed anymore" );
-    p_vout = NULL;
+    msg_Dbg( p_intf, "Video is not needed anymore" );
+    i_vout = 0;
     videoSize.rwidth() = 0;
     videoSize.rheight() = 0;
     hide();
@@ -148,11 +171,11 @@ QSize VideoWidget::sizeHint() const
 #define MAX_BG_SIZE 400
 #define MIN_BG_SIZE 64
 
-BackgroundWidget::BackgroundWidget( intf_thread_t *_p_i ) :
-                                        QWidget( NULL ), p_intf( _p_i )
+BackgroundWidget::BackgroundWidget( intf_thread_t *_p_i )
+                 :QWidget( NULL ), p_intf( _p_i )
 {
     /* We should use that one to take the more size it can */
-    setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred );
+    setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding);
 
     /* A dark background */
     setAutoFillBackground( true );
@@ -178,17 +201,23 @@ BackgroundWidget::BackgroundWidget( intf_thread_t *_p_i ) :
     backgroundLayout->setColumnStretch( 0, 1 );
     backgroundLayout->setColumnStretch( 2, 1 );
 
-    CONNECT( THEMIM->getIM(), artChanged( QString ), this, update( QString ) );
-    resize( 300, 150 );
+    CONNECT( THEMIM->getIM(), artChanged( QString ), this, updateArt( QString ) );
 }
 
 BackgroundWidget::~BackgroundWidget()
+{}
+
+void BackgroundWidget::resizeEvent( QResizeEvent * event )
 {
+    if( event->size().height() <= MIN_BG_SIZE )
+        label->hide();
+    else
+        label->show();
 }
 
-void BackgroundWidget::update( QString url )
+void BackgroundWidget::updateArt( QString url )
 {
-    if( url.isNull() )
+    if( url.isEmpty() )
     {
         if( QDate::currentDate().dayOfYear() >= 354 )
             label->setPixmap( QPixmap( ":/vlc128-christmas.png" ) );
@@ -199,7 +228,6 @@ void BackgroundWidget::update( QString url )
     else
     {
         label->setPixmap( QPixmap( url ) );
-        msg_Dbg( p_intf, "changing input b_need_update done ");
     }
 }
 
@@ -221,9 +249,8 @@ VisualSelector::VisualSelector( intf_thread_t *_p_i ) :
     layout->addWidget( prevButton );
     layout->addWidget( nextButton );
 
-    layout->addItem( new QSpacerItem( 40,20,
-                              QSizePolicy::Expanding, QSizePolicy::Minimum ) );
-    layout->addWidget( new QLabel( qtr( "Current visualization:" ) ) );
+    layout->addStretch( 10 );
+    layout->addWidget( new QLabel( qtr( "Current visualization" ) ) );
 
     current = new QLabel( qtr( "None" ) );
     layout->addWidget( current );
@@ -236,8 +263,7 @@ VisualSelector::VisualSelector( intf_thread_t *_p_i ) :
 }
 
 VisualSelector::~VisualSelector()
-{
-}
+{}
 
 void VisualSelector::prev()
 {
@@ -274,13 +300,14 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i ) :
     QHBoxLayout *advLayout = new QHBoxLayout( this );
     advLayout->setMargin( 0 );
     advLayout->setSpacing( 0 );
+    advLayout->setAlignment( Qt::AlignBottom );
 
     /* A to B Button */
     ABButton = new QPushButton( "AB" );
-    ABButton->setMaximumSize( QSize( 26, 26 ) );
-    ABButton->setIconSize( QSize( 20, 20 ) );
+    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 ) );
@@ -289,22 +316,21 @@ AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i ) :
     frameButton->setMaximumSize( QSize( 26, 26 ) );
     frameButton->setIconSize( QSize( 20, 20 ) );
     advLayout->addWidget( frameButton );
-    BUTTON_SET_ACT( frameButton, "Fr", qtr( "Frame by Frame" ), frame() );
+    BUTTON_SET_ACT( frameButton, "Fr", qtr( "Frame by frame" ), frame() );
 #endif
 
     recordButton = new QPushButton( "R" );
-    recordButton->setMaximumSize( QSize( 26, 26 ) );
-    recordButton->setIconSize( QSize( 20, 20 ) );
+    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->setMaximumSize( QSize( 26, 26 ) );
-    snapshotButton->setIconSize( QSize( 20, 20 ) );
+    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()
@@ -337,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 */
@@ -376,22 +405,14 @@ void AdvControlsWidget::frame(){}
 ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
                                 MainInterface *_p_mi,
                                 bool b_advControls,
-                                bool b_shiny ) :
-                                QFrame( NULL ), p_intf( _p_i )
+                                bool b_shiny,
+                                bool b_fsCreation) :
+                                QFrame( _p_mi ), p_intf( _p_i )
 {
-    controlLayout = new QGridLayout( this );
-    controlLayout->setSpacing( 0 );
-#if QT43
-    controlLayout->setContentsMargins( 9, 6, 9, 6 );
-#else
-    controlLayout->setMargin( 6 );
-#endif
-
     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 ) );
@@ -405,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 */
@@ -440,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, "" );
+    BUTTON_SET_IMG( prevSectionButton, "", dvd_prev, "" );
+    BUTTON_SET_IMG( nextSectionButton, "", dvd_next, "" );
+    BUTTON_SET_IMG( menuButton, "", dvd_menu, qtr( "Menu" ) );
 
     discFrame->hide();
 
@@ -458,44 +474,60 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
              sectionNext() );
     CONNECT( menuButton, clicked(), THEMIM->getIM(),
              sectionMenu() );
+
     /**
      * Telextext QFrame
      * TODO: Merge with upper menu in a StackLayout
      **/
-#ifdef ZVBI_COMPILED
     telexFrame = new QWidget( this );
     QHBoxLayout *telexLayout = new QHBoxLayout( telexFrame );
     telexLayout->setSpacing( 0 );
     telexLayout->setMargin( 0 );
 
-    QToolButton *telexOn = new QToolButton;
-    telexOn->setText( qtr( "On" ) );
+    telexOn = new QPushButton;
     setupSmallButton( telexOn );
     telexLayout->addWidget( telexOn );
 
-    QToolButton *telexTransparent = new QToolButton;
-    telexTransparent->setText( qtr( "Transparent" ) );
+    telexTransparent = new QPushButton;
     setupSmallButton( telexTransparent );
     telexLayout->addWidget( telexTransparent );
+    b_telexTransparent = false;
 
-    QSpinBox *telexPage = new QSpinBox;
+    telexPage = new QSpinBox;
     telexPage->setRange( 0, 999 );
     telexPage->setValue( 100 );
+    telexPage->setAccelerated( true );
+    telexPage->setWrapping( true );
     telexPage->setAlignment( Qt::AlignRight );
+    telexPage->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum );
     telexLayout->addWidget( telexPage );
 
-    controlLayout->addWidget( telexFrame, 1, 10, 2, 3, Qt::AlignBottom );
-    telexFrame->hide();
+    telexFrame->hide(); /* default hidden */
 
     CONNECT( telexPage, valueChanged( int ), THEMIM->getIM(),
              telexGotoPage( int ) );
+    CONNECT( THEMIM->getIM(), setNewTelexPage( int ),
+              telexPage, setValue( int ) );
+
+    BUTTON_SET_IMG( telexOn, "", tv, qtr( "Teletext on" ) );
+
+    CONNECT( telexOn, clicked(), THEMIM->getIM(),
+             telexToggleButtons() );
     CONNECT( telexOn, clicked( bool ), THEMIM->getIM(),
              telexToggle( bool ) );
+    CONNECT( THEMIM->getIM(), toggleTelexButtons(),
+              this, toggleTeletext() );
+    b_telexEnabled = false;
+    telexTransparent->setEnabled( false );
+    telexPage->setEnabled( false );
+
+    BUTTON_SET_IMG( telexTransparent, "", tvtelx, qtr( "Teletext" ) );
     CONNECT( telexTransparent, clicked( bool ),
-             THEMIM->getIM(), telexSetTransparency( bool ) );
+             THEMIM->getIM(), telexSetTransparency() );
+    CONNECT( THEMIM->getIM(), toggleTelexTransparency(),
+              this, toggleTeletextTransparency() );
     CONNECT( THEMIM->getIM(), teletextEnabled( bool ),
-             telexFrame, setVisible( bool ) );
-#endif
+             this, enableTeletext( bool ) );
 
     /** Play Buttons **/
     QSizePolicy sizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
@@ -509,13 +541,9 @@ 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 **/
-    QHBoxLayout *controlButLayout = new QHBoxLayout;
+    controlButLayout = new QHBoxLayout;
     controlButLayout->setSpacing( 0 ); /* Don't remove that, will be useful */
 
     /* Prev */
@@ -540,60 +568,51 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
     controlButLayout->addWidget( nextButton );
 
     /* Add this block to the main layout */
-    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 **/
-    QPushButton *extSettingsButton = new QPushButton( "F" );
-    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 */
-    VolumeClickHandler *hVolLabel = new VolumeClickHandler( p_intf, this );
+    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 )
     {
         volumeSlider = new SoundSlider( this,
             config_GetInt( p_intf, "volume-step" ),
-            config_GetInt( p_intf, "qt-volume-complete" ) );
+            config_GetInt( p_intf, "qt-volume-complete" ),
+            config_GetPsz( p_intf, "qt-slider-colours" ) );
     }
     else
     {
@@ -603,17 +622,54 @@ 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" ) ) *
                               VOLUME_MAX / (AOUT_VOLUME_MAX/2) );
 
+    /* Force the update at build time in order to have a muted icon if needed */
+    updateVolume( volumeSlider->value() );
+
     /* Volume control connection */
     CONNECT( volumeSlider, valueChanged( int ), this, updateVolume( int ) );
     CONNECT( THEMIM, volumeChanged( void ), this, updateVolume( void ) );
 
-    CONNECT( THEMIM->getIM(), statusChanged( int ), this, updateInput() );
+    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();
 }
@@ -621,6 +677,50 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
 ControlsWidget::~ControlsWidget()
 {}
 
+void ControlsWidget::toggleTeletext()
+{
+    bool b_enabled = THEMIM->teletextState();
+    if( b_telexEnabled )
+    {
+        telexTransparent->setEnabled( false );
+        telexPage->setEnabled( false );
+        b_telexEnabled = false;
+    }
+    else if( b_enabled )
+    {
+        telexTransparent->setEnabled( true );
+        telexPage->setEnabled( true );
+        b_telexEnabled = true;
+    }
+}
+
+void ControlsWidget::enableTeletext( bool b_enable )
+{
+    telexFrame->setVisible( b_enable );
+    bool b_on = THEMIM->teletextState();
+
+    telexOn->setChecked( b_on );
+    telexTransparent->setEnabled( b_on );
+    telexPage->setEnabled( b_on );
+    b_telexEnabled = b_on;
+}
+
+void ControlsWidget::toggleTeletextTransparency()
+{
+    if( b_telexTransparent )
+    {
+        telexTransparent->setIcon( QIcon( ":/tvtelx" ) );
+        telexTransparent->setToolTip( qtr( "Teletext" ) );
+        b_telexTransparent = false;
+    }
+    else
+    {
+        telexTransparent->setIcon( QIcon( ":/tvtelx-transparent" ) );
+        telexTransparent->setToolTip( qtr( "Transparent" ) );
+        b_telexTransparent = true;
+    }
+}
+
 void ControlsWidget::stop()
 {
     THEMIM->stop();
@@ -650,11 +750,8 @@ void ControlsWidget::next()
 
 void ControlsWidget::setNavigation( int navigation )
 {
-#define HELP_MENU N_( "Menu" )
 #define HELP_PCH N_( "Previous chapter" )
 #define HELP_NCH N_( "Next chapter" )
-#define HELP_PTR N_( "Previous track" )
-#define HELP_NTR N_( "Next track" )
 
     // 1 = chapter, 2 = title, 0 = no
     if( navigation == 0 )
@@ -682,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()
@@ -710,15 +807,21 @@ void ControlsWidget::updateInput()
 {
     /* Activate the interface buttons according to the presence of the input */
     enableInput( THEMIM->getIM()->hasInput() );
-    enableVideo( THEMIM->getIM()->hasVideo() );
+    enableVideo( THEMIM->getIM()->hasVideo() && THEMIM->getIM()->hasInput() );
 }
 
 void ControlsWidget::setStatus( int status )
 {
-    if( status == PLAYING_S ) // Playing
-        playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) );
+    if( status == PLAYING_S ) /* Playing */
+    {
+        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" ) );
+    }
 }
 
 /**
@@ -788,6 +891,348 @@ void ControlsWidget::toggleAdvanced()
 }
 
 
+/**********************************************************************
+ * Fullscrenn control widget
+ **********************************************************************/
+FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i,
+        MainInterface *_p_mi, bool b_advControls, bool b_shiny )
+        : ControlsWidget( _p_i, _p_mi, b_advControls, b_shiny, true ),
+          i_mouse_last_x( -1 ), i_mouse_last_y( -1 ), b_mouse_over(false),
+          b_slow_hide_begin(false), i_slow_hide_timeout(1),
+          b_fullscreen( false ), i_hide_timeout( 1 )
+{
+    setWindowFlags( Qt::ToolTip );
+
+    setFrameShape( QFrame::StyledPanel );
+    setFrameStyle( QFrame::Sunken );
+    setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum );
+
+    QGridLayout *fsLayout = new QGridLayout( this );
+    fsLayout->setLayoutMargins( 5, 1, 5, 1, 5 );
+
+    fsLayout->addWidget( slowerButton, 0, 0 );
+    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->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( fullscreenButton, 1, 7 );
+
+    /* hiding timer */
+    p_hideTimer = new QTimer( this );
+    CONNECT( p_hideTimer, timeout(), this, hideFSC() );
+    p_hideTimer->setSingleShot( true );
+
+    /* slow hiding timer */
+#if HAVE_TRANSPARENCY
+    p_slowHideTimer = new QTimer( this );
+    CONNECT( p_slowHideTimer, timeout(), this, slowHideFSC() );
+#endif
+
+    adjustSize ();  /* need to get real width and height for moving */
+
+    /* center down */
+    QDesktopWidget * p_desktop = QApplication::desktop();
+
+    move( p_desktop->width() / 2 - width() / 2,
+          p_desktop->height() - height() );
+
+#ifdef WIN32TRICK
+    setWindowOpacity( 0.0 );
+    fscHidden = true;
+    show();
+#endif
+
+    vlc_mutex_init_recursive( &lock );
+}
+
+FullscreenControllerWidget::~FullscreenControllerWidget()
+{
+    vlc_mutex_destroy( &lock );
+}
+
+/**
+ * Show fullscreen controller
+ */
+void FullscreenControllerWidget::showFSC()
+{
+#ifdef WIN32TRICK
+    // after quiting and going to fs, we need to call show()
+    if( isHidden() )
+        show();
+
+    if( fscHidden )
+    {
+        fscHidden = false;
+        setWindowOpacity( 1.0 );
+    }
+#else
+    show();
+#endif
+
+#if HAVE_TRANSPARENCY
+    setWindowOpacity( DEFAULT_OPACITY );
+#endif
+}
+
+/**
+ * Hide fullscreen controller
+ * FIXME: under windows it have to be done by moving out of screen
+ *        because hide() doesnt work
+ */
+void FullscreenControllerWidget::hideFSC()
+{
+#ifdef WIN32TRICK
+    fscHidden = true;
+    setWindowOpacity( 0.0 );    // simulate hidding
+#else
+    hide();
+#endif
+}
+
+/**
+ * Plane to hide fullscreen controller
+ */
+void FullscreenControllerWidget::planHideFSC()
+{
+    vlc_mutex_lock( &lock );
+    int i_timeout = i_hide_timeout;
+    vlc_mutex_unlock( &lock );
+
+    p_hideTimer->start( i_timeout );
+
+#if HAVE_TRANSPARENCY
+    b_slow_hide_begin = true;
+    i_slow_hide_timeout = i_timeout;
+    p_slowHideTimer->start( i_slow_hide_timeout / 2 );
+#endif
+}
+
+/**
+ * Hidding fullscreen controller slowly
+ * Linux: need composite manager
+ * Windows: it is blinking, so it can be enabled by define TRASPARENCY
+ */
+void FullscreenControllerWidget::slowHideFSC()
+{
+#if HAVE_TRANSPARENCY
+    if( b_slow_hide_begin )
+    {
+        b_slow_hide_begin = false;
+
+        p_slowHideTimer->stop();
+        /* the last part of time divided to 100 pieces */
+        p_slowHideTimer->start( (int)( i_slow_hide_timeout / 2 / ( windowOpacity() * 100 ) ) );
+
+    }
+    else
+    {
+#ifdef WIN32TRICK
+         if ( windowOpacity() > 0.0 && !fscHidden )
+#else
+         if ( windowOpacity() > 0.0 )
+#endif
+         {
+             /* we should use 0.01 because of 100 pieces ^^^
+                but than it cannt be done in time */
+             setWindowOpacity( windowOpacity() - 0.02 );
+         }
+
+         if ( windowOpacity() <= 0.0 )
+             p_slowHideTimer->stop();
+    }
+#endif
+}
+
+/**
+ * event handling
+ * events: show, hide, start timer for hidding
+ */
+void FullscreenControllerWidget::customEvent( QEvent *event )
+{
+    bool b_fs;
+
+    switch( event->type() )
+    {
+    case FullscreenControlShow_Type:
+        vlc_mutex_lock( &lock );
+        b_fs = b_fullscreen;
+        vlc_mutex_unlock( &lock );
+
+        if( b_fs )  // FIXME I am not sure about that one
+            showFSC();
+        break;
+    case FullscreenControlHide_Type:
+        hideFSC();
+        break;
+    case FullscreenControlPlanHide_Type:
+        if( !b_mouse_over ) // Only if the mouse is not over FSC
+            planHideFSC();
+        break;
+    }
+}
+
+/**
+ * On mouse move
+ * moving with FSC
+ */
+void FullscreenControllerWidget::mouseMoveEvent( QMouseEvent *event )
+{
+    if ( event->buttons() == Qt::LeftButton )
+    {
+        int i_moveX = event->globalX() - i_mouse_last_x;
+        int i_moveY = event->globalY() - i_mouse_last_y;
+
+        move( x() + i_moveX, y() + i_moveY );
+
+        i_mouse_last_x = event->globalX();
+        i_mouse_last_y = event->globalY();
+    }
+}
+
+/**
+ * On mouse press
+ * store position of cursor
+ */
+void FullscreenControllerWidget::mousePressEvent( QMouseEvent *event )
+{
+    i_mouse_last_x = event->globalX();
+    i_mouse_last_y = event->globalY();
+}
+
+/**
+ * On mouse go above FSC
+ */
+void FullscreenControllerWidget::enterEvent( QEvent *event )
+{
+    b_mouse_over = true;
+
+    p_hideTimer->stop();
+#if HAVE_TRANSPARENCY
+    p_slowHideTimer->stop();
+#endif
+}
+
+/**
+ * On mouse go out from FSC
+ */
+void FullscreenControllerWidget::leaveEvent( QEvent *event )
+{
+    planHideFSC();
+
+    b_mouse_over = false;
+}
+
+/**
+ * When you get pressed key, send it to video output
+ * FIXME: clearing focus by clearFocus() to not getting
+ * key press events didnt work
+ */
+void FullscreenControllerWidget::keyPressEvent( QKeyEvent *event )
+{
+    int i_vlck = qtEventToVLCKey( event );
+    if( i_vlck > 0 )
+    {
+        var_SetInteger( p_intf->p_libvlc, "key-pressed", i_vlck );
+        event->accept();
+    }
+    else
+        event->ignore();
+}
+
+/* */
+static int FullscreenControllerWidgetFullscreenChanged( vlc_object_t *vlc_object, const char *variable,
+                                                        vlc_value_t old_val, vlc_value_t new_val,
+                                                        void *data )
+{
+    vout_thread_t *p_vout = (vout_thread_t *) vlc_object;
+    FullscreenControllerWidget *p_fs = (FullscreenControllerWidget *)data;
+
+    p_fs->fullscreenChanged( p_vout, new_val.b_bool, var_GetInteger( p_vout, "mouse-hide-timeout" ) );
+
+    return VLC_SUCCESS;
+}
+/* */
+static int FullscreenControllerWidgetMouseMoved( vlc_object_t *vlc_object, const char *variable,
+                                                 vlc_value_t old_val, vlc_value_t new_val,
+                                                 void *data )
+{
+    FullscreenControllerWidget *p_fs = (FullscreenControllerWidget *)data;
+
+    /* Show event */
+    IMEvent *eShow = new IMEvent( FullscreenControlShow_Type, 0 );
+    QApplication::postEvent( p_fs, static_cast<QEvent *>(eShow) );
+
+    /* Plan hide event */
+    IMEvent *eHide = new IMEvent( FullscreenControlPlanHide_Type, 0 );
+    QApplication::postEvent( p_fs, static_cast<QEvent *>(eHide) );
+
+    return VLC_SUCCESS;
+}
+
+
+/**
+ * It is called when video start
+ */
+void FullscreenControllerWidget::attachVout( vout_thread_t *p_vout )
+{
+    assert( p_vout );
+
+    vlc_mutex_lock( &lock );
+    var_AddCallback( p_vout, "fullscreen", FullscreenControllerWidgetFullscreenChanged, this ); /* I miss a add and fire */
+    fullscreenChanged( p_vout, var_GetBool( p_vout, "fullscreen" ), var_GetInteger( p_vout, "mouse-hide-timeout" ) );
+    vlc_mutex_unlock( &lock );
+}
+/**
+ * It is called after turn off video.
+ */
+void FullscreenControllerWidget::detachVout( vout_thread_t *p_vout )
+{
+    assert( p_vout );
+
+    var_DelCallback( p_vout, "fullscreen", FullscreenControllerWidgetFullscreenChanged, this );
+    vlc_mutex_lock( &lock );
+    fullscreenChanged( p_vout, false, 0 );
+    vlc_mutex_unlock( &lock );
+}
+
+/**
+ * Register and unregister callback for mouse moving
+ */
+void FullscreenControllerWidget::fullscreenChanged( vout_thread_t *p_vout, bool b_fs, int i_timeout )
+{
+    vlc_mutex_lock( &lock );
+    if( b_fs && !b_fullscreen )
+    {
+        b_fullscreen = true;
+        i_hide_timeout = i_timeout;
+        var_AddCallback( p_vout, "mouse-moved", FullscreenControllerWidgetMouseMoved, this );
+    }
+    else if( !b_fs && b_fullscreen )
+    {
+        b_fullscreen = false;
+        i_hide_timeout = i_timeout;
+        var_DelCallback( p_vout, "mouse-moved", FullscreenControllerWidgetMouseMoved, this );
+
+        /* Force fs hidding */
+        IMEvent *eHide = new IMEvent( FullscreenControlHide_Type, 0 );
+        QApplication::postEvent( this, static_cast<QEvent *>(eHide) );
+    }
+    vlc_mutex_unlock( &lock );
+}
+
 /**********************************************************************
  * Speed control widget
  **********************************************************************/
@@ -804,22 +1249,24 @@ SpeedControlWidget::SpeedControlWidget( intf_thread_t *_p_i ) :
     speedSlider->setOrientation( Qt::Vertical );
     speedSlider->setTickPosition( QSlider::TicksRight );
 
-    speedSlider->setRange( -100, 100 );
-    speedSlider->setSingleStep( 10 );
-    speedSlider->setPageStep( 20 );
-    speedSlider->setTickInterval( 20 );
+    speedSlider->setRange( -24, 24 );
+    speedSlider->setSingleStep( 1 );
+    speedSlider->setPageStep( 1 );
+    speedSlider->setTickInterval( 12 );
 
     CONNECT( speedSlider, valueChanged( int ), this, updateRate( int ) );
 
     QToolButton *normalSpeedButton = new QToolButton( this );
     normalSpeedButton->setMaximumSize( QSize( 26, 20 ) );
     normalSpeedButton->setAutoRaise( true );
-    normalSpeedButton->setText( "N" );
+    normalSpeedButton->setText( "1x" );
     normalSpeedButton->setToolTip( qtr( "Revert to normal play speed" ) );
 
     CONNECT( normalSpeedButton, clicked(), this, resetRate() );
 
     QVBoxLayout *speedControlLayout = new QVBoxLayout;
+    speedControlLayout->setLayoutMargins( 4, 4, 4, 4, 4 );
+    speedControlLayout->setSpacing( 4 );
     speedControlLayout->addWidget( speedSlider );
     speedControlLayout->addWidget( normalSpeedButton );
     setLayout( speedControlLayout );
@@ -828,15 +1275,11 @@ SpeedControlWidget::SpeedControlWidget( intf_thread_t *_p_i ) :
 SpeedControlWidget::~SpeedControlWidget()
 {}
 
-void SpeedControlWidget::mouseDoubleClickEvent( QMouseEvent * event )
+void SpeedControlWidget::setEnable( bool b_enable )
 {
-    resetRate();
+    speedSlider->setEnabled( b_enable );
 }
 
-#define RATE_SLIDER_MAXIMUM 3.0
-#define RATE_SLIDER_MINIMUM 0.3
-#define RATE_SLIDER_LENGTH 100.0
-
 void SpeedControlWidget::updateControls( int rate )
 {
     if( speedSlider->isSliderDown() )
@@ -845,32 +1288,16 @@ void SpeedControlWidget::updateControls( int rate )
         return;
     }
 
-    int sliderValue;
-    double speed = INPUT_RATE_DEFAULT / (double)rate;
+    double value = 12 * log( (double)INPUT_RATE_DEFAULT / rate ) / log( 2 );
+    int sliderValue = (int) ( ( value > 0 ) ? value + .5 : value - .5 );
 
-    if( rate >= INPUT_RATE_DEFAULT )
+    if( sliderValue < speedSlider->minimum() )
     {
-        if( speed < RATE_SLIDER_MINIMUM )
-        {
-            sliderValue = speedSlider->minimum();
-        }
-        else
-        {
-            sliderValue = (int)( ( speed - 1.0 ) * RATE_SLIDER_LENGTH
-                                        / ( 1.0 - RATE_SLIDER_MAXIMUM ) );
-        }
+        sliderValue = speedSlider->minimum();
     }
-    else
+    else if( sliderValue > speedSlider->maximum() )
     {
-        if( speed > RATE_SLIDER_MAXIMUM )
-        {
-            sliderValue = speedSlider->maximum();
-        }
-        else
-        {
-            sliderValue = (int)( ( speed - 1.0 ) * RATE_SLIDER_LENGTH
-                                        / ( RATE_SLIDER_MAXIMUM - 1.0 ) );
-        }
+        sliderValue = speedSlider->maximum();
     }
 
     //Block signals to avoid feedback loop
@@ -881,18 +1308,8 @@ void SpeedControlWidget::updateControls( int rate )
 
 void SpeedControlWidget::updateRate( int sliderValue )
 {
-    int rate;
-
-    if( sliderValue < 0.0 )
-    {
-        rate = (int)(INPUT_RATE_DEFAULT* RATE_SLIDER_LENGTH /
-            ( sliderValue * ( 1.0 - RATE_SLIDER_MINIMUM ) + RATE_SLIDER_LENGTH ));
-    }
-    else
-    {
-        rate = (int)(INPUT_RATE_DEFAULT* RATE_SLIDER_LENGTH /
-            ( sliderValue * ( RATE_SLIDER_MAXIMUM - 1.0 ) + RATE_SLIDER_LENGTH ));
-    }
+    double speed = pow( 2, (double)sliderValue / 12 );
+    int rate = INPUT_RATE_DEFAULT / speed;
 
     THEMIM->getIM()->setRate(rate);
 }