X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Finterface_widgets.cpp;h=2df4c51b64fc65b878aa51d02f630734bc43767b;hb=b00904493e3d8a24c2612a16c19348dcc16ca60c;hp=b8b26a3804d9c7013951578ac667754d095366c1;hpb=92e69fb4875691906996b0ccb436b9abea73ae41;p=vlc diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp index b8b26a3804..2df4c51b64 100644 --- a/modules/gui/qt4/components/interface_widgets.cpp +++ b/modules/gui/qt4/components/interface_widgets.cpp @@ -7,6 +7,7 @@ * Authors: Clément Stenac * Jean-Baptiste Kempf * Rafaël Carré + * Ilkka Ollakka * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,6 +24,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + #include "dialogs_provider.hpp" #include "components/interface_widgets.hpp" #include "main_interface.hpp" @@ -30,39 +37,71 @@ #include "menus.hpp" #include "util/input_slider.hpp" #include "util/customwidgets.hpp" -#include #include #include #include #include +#include #include #include #include #include +#include + +#ifdef Q_WS_X11 +# include +# include +#endif + +#include /********************************************************************** * 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 ) { - vlc_mutex_init( p_intf, &lock ); - p_vout = NULL; + /* Init */ + 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 +} - CONNECT( this, askResize(), this, SetMinSize() ); - CONNECT( this, askVideoToShow(), this, show() ); - setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ); +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 ) @@ -75,54 +114,68 @@ 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 ); -} - -QSize VideoWidget::sizeHint() const -{ - return widgetSize; } +/** + * 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 ) { - emit askVideoToShow(); - if( p_vout ) + msg_Dbg( p_intf, "Video was requested %i, %i", *pi_x, *pi_y ); + emit askVideoWidgetToShow( *pi_width, *pi_height ); + if( i_vout ) { msg_Dbg( p_intf, "embedded video already in use" ); return NULL; } - p_vout = p_nvout; - emit askResize(); + i_vout = p_nvout->i_object_id; + msg_Dbg( p_intf, "embedded video ready (handle %p)", winId() ); return ( void* )winId(); } -void VideoWidget::SetMinSize() +/* Set the Widget to the correct Size */ +/* Function has to be called by the parent + Parent has to care about resizing himself*/ +void VideoWidget::SetSizing( unsigned int w, unsigned int h ) { - setMinimumSize( 16, 16 ); + 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 ) { - p_vout = NULL; + msg_Dbg( p_intf, "Video is not needed anymore" ); + i_vout = 0; + videoSize.rwidth() = 0; + videoSize.rheight() = 0; + hide(); + updateGeometry(); // Needed for deinterlace } +QSize VideoWidget::sizeHint() const +{ + return videoSize; +} /********************************************************************** * Background Widget. Show a simple image background. Currently, - * it's a static cone. + * it's album art if present or cone. **********************************************************************/ #define ICON_SIZE 128 #define MAX_BG_SIZE 400 #define MIN_BG_SIZE 64 -BackgroundWidget::BackgroundWidget( intf_thread_t *_p_i ) : - QFrame( 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::MinimumExpanding ); + setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding); /* A dark background */ setAutoFillBackground( true ); @@ -133,44 +186,48 @@ BackgroundWidget::BackgroundWidget( intf_thread_t *_p_i ) : /* A cone in the middle */ label = new QLabel; -// label->setScaledContents( true ); label->setMargin( 5 ); label->setMaximumHeight( MAX_BG_SIZE ); label->setMaximumWidth( MAX_BG_SIZE ); label->setMinimumHeight( MIN_BG_SIZE ); label->setMinimumWidth( MIN_BG_SIZE ); - label->setPixmap( QPixmap( ":/vlc128.png" ) ); + if( QDate::currentDate().dayOfYear() >= 354 ) + label->setPixmap( QPixmap( ":/vlc128-christmas.png" ) ); + else + label->setPixmap( QPixmap( ":/vlc128.png" ) ); - QHBoxLayout *backgroundLayout = new QHBoxLayout( this ); - backgroundLayout->addWidget( label ); + QGridLayout *backgroundLayout = new QGridLayout( this ); + backgroundLayout->addWidget( label, 0, 1 ); + backgroundLayout->setColumnStretch( 0, 1 ); + backgroundLayout->setColumnStretch( 2, 1 ); - resize( 300, 150 ); - updateGeometry(); + CONNECT( THEMIM->getIM(), artChanged( QString ), this, updateArt( QString ) ); } BackgroundWidget::~BackgroundWidget() {} -void BackgroundWidget::setArt( QString url ) +void BackgroundWidget::resizeEvent( QResizeEvent * event ) { - if( url.isNull() ) - label->setPixmap( QPixmap( ":/vlc128.png" ) ); + if( event->size().height() <= MIN_BG_SIZE ) + label->hide(); else - label->setPixmap( QPixmap( url ) ); - updateGeometry(); + label->show(); } -QSize BackgroundWidget::sizeHint() const +void BackgroundWidget::updateArt( QString url ) { - return label->size(); -} - -void BackgroundWidget::resizeEvent( QResizeEvent *e ) -{ - msg_Dbg( p_intf, "BG size, %i, %i", e->size().width(), e->size().height() ); - if( e->size().height() < label->height() ) + if( url.isEmpty() ) { - label->resize( e->size().height(), e->size().height() ); + if( QDate::currentDate().dayOfYear() >= 354 ) + label->setPixmap( QPixmap( ":/vlc128-christmas.png" ) ); + else + label->setPixmap( QPixmap( ":/vlc128.png" ) ); + return; + } + else + { + label->setPixmap( QPixmap( url ) ); } } @@ -192,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 ); @@ -207,8 +263,7 @@ VisualSelector::VisualSelector( intf_thread_t *_p_i ) : } VisualSelector::~VisualSelector() -{ -} +{} void VisualSelector::prev() { @@ -245,36 +300,33 @@ 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() ); timeA = timeB = 0; CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ), this, AtoBLoop( float, int, int ) ); - - //FIXME Frame by frame function +#if 0 frameButton = new QPushButton( "Fr" ); 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 - /* FIXME Record function */ 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, 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() ); } @@ -291,7 +343,9 @@ void AdvControlsWidget::enableInput( bool enable ) void AdvControlsWidget::enableVideo( bool enable ) { snapshotButton->setEnabled( enable ); +#if 0 frameButton->setEnabled( enable ); +#endif } void AdvControlsWidget::snapshot() @@ -332,24 +386,28 @@ void AdvControlsWidget::AtoBLoop( float f_pos, int i_time, int i_length ) } } +/* FIXME Record function */ void AdvControlsWidget::record(){} + +#if 0 +//FIXME Frame by frame function void AdvControlsWidget::frame(){} +#endif /***************************** * DA Control Widget ! *****************************/ 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 ); - setSizePolicy( QSizePolicy::Preferred , QSizePolicy::Minimum ); + 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 ) ); @@ -358,29 +416,26 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, THEMIM->getIM(), sliderUpdate( float ) ); /** Slower and faster Buttons **/ - slowerButton = new QPushButton; - slowerButton->setFlat( true ); + slowerButton = new QToolButton; + slowerButton->setAutoRaise( true ); slowerButton->setMaximumSize( QSize( 26, 20 ) ); BUTTON_SET_ACT( slowerButton, "-", qtr( "Slower" ), slower() ); - controlLayout->addWidget( slowerButton, 0, 0 ); - fasterButton = new QPushButton; - fasterButton->setFlat( true ); + 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 */ - discFrame = new QFrame( this ); + discFrame = new QWidget( this ); QHBoxLayout *discLayout = new QHBoxLayout( discFrame ); discLayout->setSpacing( 0 ); @@ -398,11 +453,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( menuButton, "", previous.png, qtr( "Menu" ) ); discFrame->hide(); @@ -417,10 +470,59 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, CONNECT( menuButton, clicked(), THEMIM->getIM(), sectionMenu() ); - /** TODO + /** * Telextext QFrame - * Merge with upper menu in a StackLayout + * TODO: Merge with upper menu in a StackLayout **/ + telexFrame = new QWidget( this ); + QHBoxLayout *telexLayout = new QHBoxLayout( telexFrame ); + telexLayout->setSpacing( 0 ); + telexLayout->setMargin( 0 ); + + telexOn = new QPushButton; + setupSmallButton( telexOn ); + telexLayout->addWidget( telexOn ); + + telexTransparent = new QPushButton; + setupSmallButton( telexTransparent ); + telexLayout->addWidget( telexTransparent ); + b_telexTransparent = false; + + 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 ); + + 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.png, 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.png, qtr( "Teletext" ) ); + CONNECT( telexTransparent, clicked( bool ), + THEMIM->getIM(), telexSetTransparency() ); + CONNECT( THEMIM->getIM(), toggleTelexTransparency(), + this, toggleTeletextTransparency() ); + CONNECT( THEMIM->getIM(), teletextEnabled( bool ), + this, enableTeletext( bool ) ); /** Play Buttons **/ QSizePolicy sizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed ); @@ -430,17 +532,13 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, /* Play */ playButton = new QPushButton; playButton->setSizePolicy( sizePolicy ); - playButton->setMaximumSize( QSize( 38, 38 ) ); - playButton->setMinimumSize( QSize( 45, 45 ) ); + playButton->setMaximumSize( QSize( 36, 36 ) ); + 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; + /** Prev + Stop + Next Block **/ + controlButLayout = new QHBoxLayout; controlButLayout->setSpacing( 0 ); /* Don't remove that, will be useful */ /* Prev */ @@ -465,7 +563,6 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, controlButLayout->addWidget( nextButton ); /* Add this block to the main layout */ - controlLayout->addLayout( controlButLayout, 3, 3, 1, 3, Qt::AlignBottom ); BUTTON_SET_ACT_I( playButton, "", play.png, qtr( "Play" ), play() ); BUTTON_SET_ACT_I( prevButton, "" , previous.png, @@ -473,48 +570,41 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, BUTTON_SET_ACT_I( nextButton, "", next.png, qtr( "Next" ), next() ); BUTTON_SET_ACT_I( stopButton, "", stop.png, qtr( "Stop" ), stop() ); - controlLayout->setColumnStretch( 7 , 2 ); - /* * Other first Line buttons - * Might need to be inside a frame to avoid a few resizing pb - * FIXME */ /** Fullscreen/Visualisation **/ fullscreenButton = new QPushButton( "F" ); BUTTON_SET_ACT( fullscreenButton, "F", 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" ), + extSettingsButton = new QPushButton; + BUTTON_SET_ACT( extSettingsButton, "Ex", qtr( "Extended settings" ), extSettings() ); setupSmallButton( extSettingsButton ); - controlLayout->addWidget( extSettingsButton, 3, 12, Qt::AlignBottom ); - controlLayout->setColumnStretch( 14, 5 ); /* Volume */ - VolumeClickHandler *hVolLabel = new VolumeClickHandler( p_intf, this ); + hVolLabel = new VolumeClickHandler( p_intf, this ); volMuteLabel = new QLabel; - volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-high.png" ) ); + volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-medium.png" ) ); 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 { @@ -524,28 +614,104 @@ 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 */ - resize( QSize( 400, 60 ) ); CONNECT( volumeSlider, valueChanged( int ), this, updateVolume( int ) ); - msg_Dbg( p_intf, "controls size: %i - %i", size().width(), size().height() ); + 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(); } 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; + } } -/* -QSize ControlsWidget::sizeHint() const +void ControlsWidget::enableTeletext( bool b_enable ) { - return QSize( 300, 50 ); + 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( ":/pixmaps/tvtelx.png" ) ); + telexTransparent->setToolTip( qtr( "Teletext" ) ); + b_telexTransparent = false; + } + else + { + telexTransparent->setIcon( QIcon( ":/pixmaps/tvtelx-transparent.png" ) ); + telexTransparent->setToolTip( qtr( "Transparent" ) ); + b_telexTransparent = true; + } } -*/ void ControlsWidget::stop() { @@ -576,11 +742,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 ) @@ -609,12 +772,14 @@ void ControlsWidget::updateVolume( int i_sliderVolume ) } if( i_sliderVolume == 0 ) volMuteLabel->setPixmap( QPixmap(":/pixmaps/volume-muted.png" ) ); - else if( i_sliderVolume < VOLUME_MAX / 2 ) + else if( i_sliderVolume < VOLUME_MAX / 3 ) volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) ); - else volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-high.png" ) ); + else if( i_sliderVolume > (VOLUME_MAX * 2 / 3 ) ) + volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-high.png" ) ); + else volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-medium.png" ) ); } -void ControlsWidget::updateOnTimer() +void ControlsWidget::updateVolume() { /* Audio part */ audio_volume_t i_volume; @@ -628,19 +793,27 @@ void ControlsWidget::updateOnTimer() volumeSlider->setValue( i_volume ); b_my_volume = false; } +} +void ControlsWidget::updateInput() +{ /* Activate the interface buttons according to the presence of the input */ enableInput( THEMIM->getIM()->hasInput() ); - //enableVideo( THEMIM->getIM()->hasVideo() ); - enableVideo( true ); + enableVideo( THEMIM->getIM()->hasVideo() && THEMIM->getIM()->hasInput() ); } void ControlsWidget::setStatus( int status ) { - if( status == PLAYING_S ) // Playing + if( status == PLAYING_S ) /* Playing */ + { playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) ); + playButton->setToolTip( qtr( "Pause" ) ); + } else + { playButton->setIcon( QIcon( ":/pixmaps/play.png" ) ); + playButton->setToolTip( qtr( "Play" ) ); + } } /** @@ -706,110 +879,350 @@ void ControlsWidget::toggleAdvanced() advControls->hide(); b_advancedVisible = false; } - //FIXME connect this one :D - emit advancedControlsToggled( b_advancedVisible ); // doComponentsUpdate(); + emit advancedControlsToggled( b_advancedVisible ); } + /********************************************************************** - * Playlist Widget. The embedded playlist + * Fullscrenn control widget **********************************************************************/ -#include "components/playlist/panels.hpp" -#include "components/playlist/selector.hpp" +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 ); -#include + /* hiding timer */ + p_hideTimer = new QTimer( this ); + CONNECT( p_hideTimer, timeout(), this, hideFSC() ); + p_hideTimer->setSingleShot( true ); -PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QSettings *settings ) : - p_intf ( _p_i ) + /* 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() { - /* Left Part and design */ - QWidget *leftW = new QWidget( this ); - QVBoxLayout *left = new QVBoxLayout( leftW ); +#ifdef WIN32TRICK + // after quiting and going to fs, we need to call show() + if( isHidden() ) + show(); - /* Source Selector */ - selector = new PLSelector( this, p_intf, THEPL ); - left->addWidget( selector ); + if( fscHidden ) + { + fscHidden = false; + setWindowOpacity( 1.0 ); + } +#else + show(); +#endif - /* Art label */ - art = new QLabel( "" ); - art->setMinimumHeight( 128 ); - art->setMinimumWidth( 128 ); - art->setMaximumHeight( 128 ); - art->setMaximumWidth( 128 ); - art->setScaledContents( true ); - art->setPixmap( QPixmap( ":/noart.png" ) ); - left->addWidget( art ); +#if HAVE_TRANSPARENCY + setWindowOpacity( DEFAULT_OPACITY ); +#endif +} - /* Initialisation of the playlist */ - playlist_item_t *p_root = playlist_GetPreferredNode( THEPL, - THEPL->p_local_category ); +/** + * 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 +} - rightPanel = qobject_cast( new StandardPLPanel( this, - p_intf, THEPL, p_root ) ); +/** + * Plane to hide fullscreen controller + */ +void FullscreenControllerWidget::planHideFSC() +{ + vlc_mutex_lock( &lock ); + int i_timeout = i_hide_timeout; + vlc_mutex_unlock( &lock ); - /* Connects */ - CONNECT( selector, activated( int ), rightPanel, setRoot( int ) ); + p_hideTimer->start( i_timeout ); - CONNECT( qobject_cast( rightPanel )->model, - artSet( QString ) , this, setArt( QString ) ); - /* Forward removal requests from the selector to the main panel */ - CONNECT( qobject_cast( selector )->model, - shouldRemove( int ), - qobject_cast( rightPanel ), removeItem( int ) ); +#if HAVE_TRANSPARENCY + b_slow_hide_begin = true; + i_slow_hide_timeout = i_timeout; + p_slowHideTimer->start( i_slow_hide_timeout / 2 ); +#endif +} - connect( selector, SIGNAL( activated( int ) ), - this, SIGNAL( rootChanged( int ) ) ); - emit rootChanged( p_root->i_id ); +/** + * 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; - /* Add the two sides of the QSplitter */ - addWidget( leftW ); - addWidget( rightPanel ); + p_slowHideTimer->stop(); + /* the last part of time divided to 100 pieces */ + p_slowHideTimer->start( (int)( i_slow_hide_timeout / 2 / ( windowOpacity() * 100 ) ) ); - leftW->setMaximumWidth( 250 ); - setCollapsible( 1, false ); + } + 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; - QList sizeList; - sizeList << 180 << 420 ; - setSizes( sizeList ); - setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding ); - - /* In case we want to keep the splitter informations */ - settings->beginGroup( "playlist" ); - restoreState( settings->value("splitterSizes").toByteArray()); - resize( settings->value("size", QSize(600, 300)).toSize()); - move( settings->value("pos", QPoint( 0, 400)).toPoint()); - settings->endGroup(); + 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; + } } -void PlaylistWidget::setArt( QString url ) +/** + * On mouse move + * moving with FSC + */ +void FullscreenControllerWidget::mouseMoveEvent( QMouseEvent *event ) { - if( url.isNull() ) + if ( event->buttons() == Qt::LeftButton ) { - art->setPixmap( QPixmap( ":/noart.png" ) ); - emit artSet( url ); + 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(); } - else if( prevArt != url ) +} + +/** + * 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 ) { - art->setPixmap( QPixmap( url ) ); - prevArt = url; - emit artSet( url ); + var_SetInteger( p_intf->p_libvlc, "key-pressed", i_vlck ); + event->accept(); } + else + event->ignore(); } -QSize PlaylistWidget::sizeHint() const +/* */ +static int FullscreenControllerWidgetFullscreenChanged( vlc_object_t *vlc_object, const char *variable, + vlc_value_t old_val, vlc_value_t new_val, + void *data ) { - return QSize( 600 , 300 ); + 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; -PlaylistWidget::~PlaylistWidget() -{} + /* Show event */ + IMEvent *eShow = new IMEvent( FullscreenControlShow_Type, 0 ); + QApplication::postEvent( p_fs, static_cast(eShow) ); + + /* Plan hide event */ + IMEvent *eHide = new IMEvent( FullscreenControlPlanHide_Type, 0 ); + QApplication::postEvent( p_fs, static_cast(eHide) ); -void PlaylistWidget::savingSettings( QSettings *settings ) + return VLC_SUCCESS; +} + + +/** + * It is called when video start + */ +void FullscreenControllerWidget::attachVout( vout_thread_t *p_vout ) { - settings->beginGroup( "playlist" ); - settings->setValue( "pos", pos() ); - settings->setValue( "size", size() ); - settings->setValue("splitterSizes", saveState() ); - settings->endGroup(); + 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(eHide) ); + } + vlc_mutex_unlock( &lock ); } /********************************************************************** @@ -828,32 +1241,36 @@ 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 ) ); - normalSpeedButton = new QPushButton( "N" ); + QToolButton *normalSpeedButton = new QToolButton( this ); normalSpeedButton->setMaximumSize( QSize( 26, 20 ) ); - normalSpeedButton->setFlat( true ); + normalSpeedButton->setAutoRaise( true ); + normalSpeedButton->setText( "1x" ); normalSpeedButton->setToolTip( qtr( "Revert to normal play speed" ) ); CONNECT( normalSpeedButton, clicked(), this, resetRate() ); QVBoxLayout *speedControlLayout = new QVBoxLayout; - speedControlLayout->addWidget(speedSlider); - speedControlLayout->addWidget(normalSpeedButton); - setLayout(speedControlLayout); + speedControlLayout->setLayoutMargins( 4, 4, 4, 4, 4 ); + speedControlLayout->setSpacing( 4 ); + speedControlLayout->addWidget( speedSlider ); + speedControlLayout->addWidget( normalSpeedButton ); + setLayout( speedControlLayout ); } SpeedControlWidget::~SpeedControlWidget() {} -#define RATE_SLIDER_MAXIMUM 3.0 -#define RATE_SLIDER_MINIMUM 0.3 -#define RATE_SLIDER_LENGTH 100.0 +void SpeedControlWidget::setEnable( bool b_enable ) +{ + speedSlider->setEnabled( b_enable ); +} void SpeedControlWidget::updateControls( int rate ) { @@ -863,32 +1280,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 @@ -899,18 +1300,8 @@ void SpeedControlWidget::updateControls( int rate ) void SpeedControlWidget::updateRate( int sliderValue ) { - int rate; - - if( sliderValue < 0.0 ) - { - rate = INPUT_RATE_DEFAULT* RATE_SLIDER_LENGTH / - ( sliderValue * ( 1.0 - RATE_SLIDER_MINIMUM ) + RATE_SLIDER_LENGTH ); - } - else - { - rate = 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); }