X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fcomponents%2Finterface_widgets.cpp;h=4c431252bdd7d79e0c54a23821dd38b490aa1e0d;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=62a2002fcea1395decf5a560ebd60817578e49a7;hpb=9906af380efa4f7663ea1c16864e64b9015eae54;p=vlc diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp index 62a2002fce..4c431252bd 100644 --- a/modules/gui/qt4/components/interface_widgets.cpp +++ b/modules/gui/qt4/components/interface_widgets.cpp @@ -1,15 +1,17 @@ /***************************************************************************** * interface_widgets.cpp : Custom widgets for the main interface **************************************************************************** - * Copyright (C) 2006 the VideoLAN team + * Copyright ( C ) 2006 the VideoLAN team * $Id$ * * Authors: Clément Stenac + * Jean-Baptiste Kempf + * Rafaël Carré * * 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 * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * ( at your option ) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,14 +24,24 @@ *****************************************************************************/ #include "dialogs_provider.hpp" -#include #include "qt4.hpp" #include "components/interface_widgets.hpp" #include "main_interface.hpp" #include "input_manager.hpp" + +#include "util/input_slider.hpp" +#include + +#include +#include +#include +#include #include +#include +#include +#include -#define ICON_SIZE 128 +#define ICON_SIZE 300 /********************************************************************** * Video Widget. A simple frame on which video is drawn @@ -40,31 +52,12 @@ static void *DoRequest( intf_thread_t *, vout_thread_t *, int*,int*, static void DoRelease( intf_thread_t *, void * ); static int DoControl( intf_thread_t *, void *, int, va_list ); -bool need_update; - VideoWidget::VideoWidget( intf_thread_t *_p_i ) : QFrame( NULL ), p_intf( _p_i ) { vlc_mutex_init( p_intf, &lock ); - - p_intf->pf_request_window = ::DoRequest; - p_intf->pf_release_window = ::DoRelease; - p_intf->pf_control_window = ::DoControl; - p_intf->p_sys->p_video = this; p_vout = NULL; - + CONNECT( this, askResize(), this, SetMinSize() ); setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ); - - ON_TIMEOUT( update() ); - need_update = false; -} - -void VideoWidget::update() -{ - if( need_update ) - { - p_intf->p_sys->p_mi->resize( p_intf->p_sys->p_mi->sizeHint() ); - need_update = false; - } } VideoWidget::~VideoWidget() @@ -83,9 +76,6 @@ VideoWidget::~VideoWidget() vout_Control( p_vout, VOUT_CLOSE ); } } - p_intf->pf_request_window = NULL; - p_intf->pf_release_window = NULL; - p_intf->pf_control_window = NULL; vlc_mutex_unlock( &lock ); vlc_mutex_destroy( &lock ); } @@ -95,13 +85,7 @@ QSize VideoWidget::sizeHint() const return widgetSize; } -static void *DoRequest( intf_thread_t *p_intf, vout_thread_t *p_vout, - int *pi1, int *pi2, unsigned int*pi3,unsigned int*pi4) -{ - return p_intf->p_sys->p_video->Request( p_vout, pi1, pi2, pi3, pi4 ); -} - -void *VideoWidget::Request( vout_thread_t *p_nvout, int *pi_x, int *pi_y, +void *VideoWidget::request( vout_thread_t *p_nvout, int *pi_x, int *pi_y, unsigned int *pi_width, unsigned int *pi_height ) { if( p_vout ) @@ -110,76 +94,19 @@ void *VideoWidget::Request( vout_thread_t *p_nvout, int *pi_x, int *pi_y, return NULL; } p_vout = p_nvout; - - setMinimumSize( 1,1 ); - widgetSize = QSize( *pi_width, *pi_height ); - updateGeometry(); - need_update = true; - return (void*)winId(); + emit askResize(); + return ( void* )winId(); } -static void DoRelease( intf_thread_t *p_intf, void *p_win ) +void VideoWidget::SetMinSize() { - return p_intf->p_sys->p_video->Release( p_win ); + setMinimumSize( 16, 16 ); } -void VideoWidget::Release( void *p_win ) +void VideoWidget::release( void *p_win ) { p_vout = NULL; - if( config_GetInt( p_intf, "qt-always-video" ) == 0 ) - { - widgetSize = QSize ( 1,1 ); - updateGeometry(); - need_update = true; - } -} - -static int DoControl( intf_thread_t *p_intf, void *p_win, int i_q, va_list a ) -{ - return p_intf->p_sys->p_video->Control( p_win, i_q, a ); } - -int VideoWidget::Control( void *p_window, int i_query, va_list args ) -{ - int i_ret = VLC_EGENERIC; - vlc_mutex_lock( &lock ); - switch( i_query ) - { - case VOUT_GET_SIZE: - { - unsigned int *pi_width = va_arg( args, unsigned int * ); - unsigned int *pi_height = va_arg( args, unsigned int * ); - *pi_width = frame->width(); - *pi_height = frame->height(); - i_ret = VLC_SUCCESS; - break; - } - case VOUT_SET_SIZE: - { - unsigned int i_width = va_arg( args, unsigned int ); - unsigned int i_height = va_arg( args, unsigned int ); - - if( !i_width && p_vout ) i_width = p_vout->i_window_width; - if( !i_height && p_vout ) i_height = p_vout->i_window_height; - widgetSize = QSize( i_width, i_height ); - updateGeometry(); - need_update = true; - i_ret = VLC_SUCCESS; - break; - } - case VOUT_SET_STAY_ON_TOP: - { - /// \todo - break; - } - default: - msg_Warn( p_intf, "unsupported control query" ); - break; - } - vlc_mutex_unlock( &lock ); - return i_ret; -} - /********************************************************************** * Background Widget. Show a simple image background. Currently, * it's a static cone. @@ -187,20 +114,13 @@ int VideoWidget::Control( void *p_window, int i_query, va_list args ) BackgroundWidget::BackgroundWidget( intf_thread_t *_p_i ) : QFrame( NULL ), p_intf( _p_i ) { - DrawBackground(); - CONNECT( THEMIM->getIM(), audioStarted(), this, hasAudio() ); - CONNECT( THEMIM->getIM(), audioStarted(), this, hasVideo() ); -} -int BackgroundWidget::DrawBackground() -{ - setAutoFillBackground( true ); + setAutoFillBackground( true ); plt = palette(); plt.setColor( QPalette::Active, QPalette::Window , Qt::black ); plt.setColor( QPalette::Inactive, QPalette::Window , Qt::black ); setPalette( plt ); - backgroundLayout = new QHBoxLayout; label = new QLabel( "" ); label->setMaximumHeight( ICON_SIZE ); label->setMaximumWidth( ICON_SIZE ); @@ -209,14 +129,20 @@ int BackgroundWidget::DrawBackground() backgroundLayout = new QHBoxLayout; backgroundLayout->addWidget( label ); setLayout( backgroundLayout ); - return 0; } -int BackgroundWidget::CleanBackground() +BackgroundWidget::~BackgroundWidget() { - backgroundLayout->takeAt(0); + backgroundLayout->takeAt( 0 ); delete backgroundLayout; - return 0; +} + +void BackgroundWidget::setArt( QString url ) +{ + if( url.isNull() ) + label->setPixmap( QPixmap( ":/vlc128.png" ) ); + else + label->setPixmap( QPixmap( url ) ); } QSize BackgroundWidget::sizeHint() const @@ -224,26 +150,509 @@ QSize BackgroundWidget::sizeHint() const return widgetSize; } -void BackgroundWidget::hasAudio() +void BackgroundWidget::resizeEvent( QResizeEvent *e ) +{ + if( e->size().height() < ICON_SIZE -1 ) + label->setMaximumWidth( e->size().height() ); + else + label->setMaximumWidth( ICON_SIZE ); +} + +/********************************************************************** + * Visualization selector panel + **********************************************************************/ +VisualSelector::VisualSelector( intf_thread_t *_p_i ) : + QFrame( NULL ), p_intf( _p_i ) { - /* We have video already, do nothing */ - if( THEMIM->getIM()->b_has_video ) + QHBoxLayout *layout = new QHBoxLayout( this ); + layout->setMargin( 0 ); + QPushButton *prevButton = new QPushButton( "Prev" ); + QPushButton *nextButton = new QPushButton( "Next" ); + layout->addWidget( prevButton ); + layout->addWidget( nextButton ); + + layout->addItem( new QSpacerItem( 40,20, + QSizePolicy::Expanding, QSizePolicy::Minimum ) ); + layout->addWidget( new QLabel( qtr( "Current visualization:" ) ) ); + + current = new QLabel( qtr( "None" ) ); + layout->addWidget( current ); + + BUTTONACT( prevButton, prev() ); + BUTTONACT( nextButton, next() ); + + setLayout( layout ); + setMaximumHeight( 35 ); +} + +VisualSelector::~VisualSelector() +{ +} + +void VisualSelector::prev() +{ + char *psz_new = aout_VisualPrev( p_intf ); + if( psz_new ) { + current->setText( qfu( psz_new ) ); + free( psz_new ); + } +} + +void VisualSelector::next() +{ + char *psz_new = aout_VisualNext( p_intf ); + if( psz_new ) + { + current->setText( qfu( psz_new ) ); + free( psz_new ); + } +} + +/********************************************************************** + * TEH controls + **********************************************************************/ + +#define setupSmallButton( aButton ){ \ + aButton->setMaximumSize( QSize( 26, 26 ) ); \ + aButton->setMinimumSize( QSize( 26, 26 ) ); \ + aButton->setIconSize( QSize( 20, 20 ) ); } + +AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i ) : + QFrame( NULL ), p_intf( _p_i ) +{ + QHBoxLayout *advLayout = new QHBoxLayout( this ); + advLayout->setMargin( 0 ); + advLayout->setSpacing( 0 ); + +/* FIXME A to B function */ + ABButton = new QPushButton( "AB" ); + ABButton->setMaximumSize( QSize( 26, 26 ) ); + ABButton->setIconSize( QSize( 20, 20 ) ); + advLayout->addWidget( ABButton ); + BUTTON_SET_ACT( ABButton, "AB", qtr( "A to B" ), fromAtoB() ); + + snapshotButton = new QPushButton( "S" ); + snapshotButton->setMaximumSize( QSize( 26, 26 ) ); + snapshotButton->setIconSize( QSize( 20, 20 ) ); + advLayout->addWidget( snapshotButton ); + BUTTON_SET_ACT( snapshotButton, "S", qtr( "Take a snapshot" ), snapshot() ); + +//FIXME Frame by frame function + 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() ); + +/* FIXME Record function */ + recordButton = new QPushButton( "R" ); + recordButton->setMaximumSize( QSize( 26, 26 ) ); + recordButton->setIconSize( QSize( 20, 20 ) ); + advLayout->addWidget( recordButton ); + BUTTON_SET_ACT( recordButton, "R", qtr( "Record" ), record() ); + + normalButton = new QPushButton( "N" ); + normalButton->setMaximumSize( QSize( 26, 26 ) ); + normalButton->setIconSize( QSize( 20, 20 ) ); + advLayout->addWidget( normalButton ); + BUTTON_SET_ACT( normalButton, "N", qtr( "Normal rate" ), normal() ); + +} + +AdvControlsWidget::~AdvControlsWidget() +{ +} +void AdvControlsWidget::enableInput( bool enable ) +{ + ABButton->setEnabled( enable ); + recordButton->setEnabled( enable ); + normalButton->setEnabled( enable ); +} +void AdvControlsWidget::enableVideo( bool enable ) +{ + snapshotButton->setEnabled( enable ); + frameButton->setEnabled( enable ); +} + +void AdvControlsWidget::normal() +{ + THEMIM->getIM()->normalRate(); +} + +void AdvControlsWidget::snapshot() +{ + vout_thread_t *p_vout = (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE ); + if( p_vout ) vout_Control( p_vout, VOUT_SNAPSHOT ); +} + +void AdvControlsWidget::frame(){} +void AdvControlsWidget::fromAtoB(){} +void AdvControlsWidget::record(){} + +/***************************** + * DA Control Widget ! + *****************************/ +ControlsWidget::ControlsWidget( intf_thread_t *_p_i, bool b_advControls ) : + QFrame( NULL ), p_intf( _p_i ) +{ + //QSize size( 500, 200 ); + //resize( size ); + controlLayout = new QGridLayout( this ); + +#if DEBUG_COLOR + QPalette palette2; + palette2.setColor(this->backgroundRole(), Qt::magenta); + setPalette(palette2); +#endif + + /** 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 ) ); + /* And update the IM, when the position has changed */ + CONNECT( slider, sliderDragged( float ), + THEMIM->getIM(), sliderUpdate( float ) ); + + /** Slower and faster Buttons **/ + slowerButton = new QPushButton( "S" ); + BUTTON_SET_ACT( slowerButton, "S", qtr( "Slower" ), slower() ); + controlLayout->addWidget( slowerButton, 0, 0 ); + slowerButton->setMaximumSize( QSize( 26, 20 ) ); + + fasterButton = new QPushButton( "F" ); + BUTTON_SET_ACT( fasterButton, "F", qtr( "Faster" ), faster() ); + controlLayout->addWidget( fasterButton, 0, 17 ); + fasterButton->setMaximumSize( QSize( 26, 20 ) ); + + /** TODO: Insert here the AdvControls Widget + * Then fix all the size issues in main_interface.cpp + **/ + /* advanced Controls handling */ + b_advancedVisible = b_advControls; + + advControls = new AdvControlsWidget( p_intf ); + controlLayout->addWidget( advControls, 1, 3, 2, 5, Qt::AlignBottom ); + if( !b_advancedVisible ) advControls->hide(); + //THIS should be removed. need_components_update = true; + + /** Disc and Menus handling */ + discFrame = new QFrame( this ); + + QHBoxLayout *discLayout = new QHBoxLayout( discFrame ); + discLayout->setSpacing( 0 ); + discLayout->setMargin( 0 ); + + prevSectionButton = new QPushButton( discFrame ); + setupSmallButton( prevSectionButton ); + discLayout->addWidget( prevSectionButton ); + + menuButton = new QPushButton( discFrame ); + setupSmallButton( menuButton ); + discLayout->addWidget( menuButton ); + + nextSectionButton = new QPushButton( discFrame ); + 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, "" ); + + discFrame->hide(); + + /* Change the navigation button display when the IM navigation changes */ + CONNECT( THEMIM->getIM(), navigationChanged( int ), + this, setNavigation( int ) ); + /* Changes the IM navigation when triggered on the nav buttons */ + CONNECT( prevSectionButton, clicked(), THEMIM->getIM(), + sectionPrev() ); + CONNECT( nextSectionButton, clicked(), THEMIM->getIM(), + sectionNext() ); + CONNECT( menuButton, clicked(), THEMIM->getIM(), + sectionMenu() ); + + /** TODO + * Telextext QFrame + **/ + + /** Play Buttons **/ + QSizePolicy sizePolicy( QSizePolicy::Maximum, QSizePolicy::Fixed ); + sizePolicy.setHorizontalStretch( 0 ); + sizePolicy.setVerticalStretch( 0 ); + + /* Play */ + playButton = new QPushButton; + playButton->setSizePolicy( sizePolicy ); + playButton->setMaximumSize( QSize( 45, 45 ) ); + playButton->setIconSize( QSize( 30, 30 ) ); + + controlLayout->addWidget( playButton, 2, 0, 2, 2, Qt::AlignBottom ); + + controlLayout->setColumnMinimumWidth( 2, 20 ); + controlLayout->setColumnStretch( 2, 0 ); + + /** Prev + Stop + Next Block **/ + QHBoxLayout *controlButLayout = new QHBoxLayout; + controlButLayout->setSpacing( 0 ); /* Don't remove that, will be useful */ + + /* Prev */ + QPushButton *prevButton = new QPushButton; + prevButton->setSizePolicy( sizePolicy ); + setupSmallButton( prevButton ); + + controlButLayout->addWidget( prevButton ); + + /* Stop */ + QPushButton *stopButton = new QPushButton; + stopButton->setSizePolicy( sizePolicy ); + setupSmallButton( stopButton ); + + controlButLayout->addWidget( stopButton ); + + /* next */ + QPushButton *nextButton = new QPushButton; + nextButton->setSizePolicy( sizePolicy ); + setupSmallButton( nextButton ); + + 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, + qtr( "Previous" ), prev() ); + BUTTON_SET_ACT_I( nextButton, "", next.png, qtr( "Next" ), next() ); + BUTTON_SET_ACT_I( stopButton, "", stop.png, qtr( "Stop" ), stop() ); + + controlLayout->setColumnStretch( 8 , 10 ); + controlLayout->setColumnStretch( 9, 0 ); + + /* + * 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 ); + + /** Playlist Button **/ + playlistButton = new QPushButton; + setupSmallButton( playlistButton ); + controlLayout->addWidget( playlistButton, 3, 11 ); + + /** extended Settings **/ + QPushButton *extSettingsButton = new QPushButton( "F" ); + BUTTON_SET_ACT( extSettingsButton, "Ex", qtr( "Extended Settings" ), + extSettings() ); + setupSmallButton( extSettingsButton ); + controlLayout->addWidget( extSettingsButton, 3, 12 ); + + controlLayout->setColumnStretch( 14, 5 ); + + /* Volume */ + VolumeClickHandler *h = new VolumeClickHandler( p_intf, this ); + + volMuteLabel = new QLabel; + volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-high.png" ) ); + volMuteLabel->setToolTip( qtr( "Mute" ) ); + volMuteLabel->installEventFilter( h ); + + /** TODO: + * Change this slider to use a nice Amarok-like one + * Add a Context menu to change to the most useful % + * **/ + /** FIXME + * THis percerntage thing has to be handled correctly + * This has to match to the OSD + **/ + volumeSlider = new QSlider; + volumeSlider->setSizePolicy( sizePolicy ); + volumeSlider->setMaximumSize( QSize( 80, 200 ) ); + volumeSlider->setOrientation( Qt::Horizontal ); + + volumeSlider->setMaximum( VOLUME_MAX ); + volumeSlider->setFocusPolicy( Qt::NoFocus ); + controlLayout->addWidget( volMuteLabel, 3, 15 ); + controlLayout->addWidget( volumeSlider, 3, 16, 1, 2 ); + + /* Volume control connection */ + CONNECT( volumeSlider, valueChanged( int ), this, updateVolume( int ) ); +} +ControlsWidget::~ControlsWidget() +{ +} +void ControlsWidget::stop() +{ + THEMIM->stop(); +} + +void ControlsWidget::play() +{ + if( THEPL ) + msg_Dbg( p_intf, "There is %i playlist items", THEPL->items.i_size ); /* FIXME: remove me */ + if( playlist_IsEmpty( THEPL ) ) + { + /* The playlist is empty, open a file requester */ + THEDP->openFileDialog(); + setStatus( 0 ); + return; } + THEMIM->togglePlayPause(); +} + +void ControlsWidget::prev() +{ + THEMIM->prev(); +} + +void ControlsWidget::next() +{ + THEMIM->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 ) + { + discFrame->hide(); + } else if( navigation == 1 ) { + prevSectionButton->setToolTip( qfu( HELP_PCH ) ); + nextSectionButton->setToolTip( qfu( HELP_NCH ) ); + menuButton->show(); + discFrame->show(); + } else { + prevSectionButton->setToolTip( qfu( HELP_PCH ) ); + nextSectionButton->setToolTip( qfu( HELP_NCH ) ); + menuButton->hide(); + discFrame->show(); + } +} + +static bool b_my_volume; +void ControlsWidget::updateVolume( int i_sliderVolume ) +{ + if( !b_my_volume ) + { + int i_res = i_sliderVolume * (AOUT_VOLUME_MAX / 2) / VOLUME_MAX; + aout_VolumeSet( p_intf, i_res ); + } + if( i_sliderVolume == 0 ) + volMuteLabel->setPixmap( QPixmap(":/pixmaps/volume-muted.png" ) ); + else if( i_sliderVolume < VOLUME_MAX / 2 ) + volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) ); + else volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-high.png" ) ); +} + +void ControlsWidget::updateOnTimer() +{ + /* Audio part */ + audio_volume_t i_volume; + aout_VolumeGet( p_intf, &i_volume ); + i_volume = ( i_volume * VOLUME_MAX )/ (AOUT_VOLUME_MAX/2) ; + int i_gauge = volumeSlider->value(); + b_my_volume = false; + if( i_volume - i_gauge > 1 || i_gauge - i_volume > 1 ) + { + b_my_volume = true; + volumeSlider->setValue( i_volume ); + b_my_volume = false; + } + + /* Activate the interface buttons according to the presence of the input */ + enableInput( THEMIM->getIM()->hasInput() ); + //enableVideo( THEMIM->getIM()->hasVideo() ); + enableVideo( true ); +} + +void ControlsWidget::setStatus( int status ) +{ + if( status == PLAYING_S ) // Playing + playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) ); else + playButton->setIcon( QIcon( ":/pixmaps/play.png" ) ); +} + +/** + * TODO + * This functions toggle the fullscreen mode + * If there is no video, it should first activate Visualisations... + * This has also to be fixed in enableVideo() + */ +void ControlsWidget::fullscreen() +{ + vout_thread_t *p_vout = (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE ); + if( p_vout) { - /* Show the panel to the user */ - fprintf( stderr, "Showing panel\n" ); + var_SetBool( p_vout, "fullscreen", !var_GetBool( p_vout, "fullscreen" ) ); + vlc_object_release( p_vout ); } } -void BackgroundWidget::resizeEvent( QResizeEvent *e ) +void ControlsWidget::extSettings() { - if( e->size().height() < ICON_SIZE -1 ) - label->setMaximumWidth( e->size().height() ); + THEDP->extendedDialog(); +} + +void ControlsWidget::slower() +{ + THEMIM->getIM()->slower(); +} + +void ControlsWidget::faster() +{ + THEMIM->getIM()->faster(); +} + +void ControlsWidget::enableInput( bool enable ) +{ + slowerButton->setEnabled( enable ); + slider->setEnabled( enable ); + fasterButton->setEnabled( enable ); + + /* Advanced Buttons too */ + advControls->enableInput( enable ); +} + +void ControlsWidget::enableVideo( bool enable ) +{ + // TODO Later make the fullscreenButton toggle Visualisation and so on. + fullscreenButton->setEnabled( enable ); + + /* Advanced Buttons too */ + advControls->enableVideo( enable ); +} + +void ControlsWidget::toggleAdvanced() +{ + if( !VISIBLE( advControls ) ) + { + advControls->show(); + b_advancedVisible = true; + } else - label->setMaximumWidth( ICON_SIZE ); + { + advControls->hide(); + b_advancedVisible = false; + } + //FIXME connect this one :D + emit advancedControlsToggled( b_advancedVisible ); // doComponentsUpdate(); } /********************************************************************** @@ -252,24 +661,68 @@ void BackgroundWidget::resizeEvent( QResizeEvent *e ) #include "components/playlist/panels.hpp" #include "components/playlist/selector.hpp" -PlaylistWidget::PlaylistWidget( intf_thread_t *_p_intf ) : QFrame(NULL), - p_intf( _p_intf ) +PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i ) : + p_intf ( _p_i ) { - selector = new PLSelector( this, p_intf, THEPL ); - selector->setMaximumWidth( 130 ); + /* Left Part and design */ + QWidget *leftW = new QWidget( this ); + QVBoxLayout *left = new QVBoxLayout( leftW ); + /* Source Selector */ + selector = new PLSelector( this, p_intf, THEPL ); + left->addWidget( selector ); + + /* 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 ); + + /* Initialisation of the playlist */ playlist_item_t *p_root = playlist_GetPreferredNode( THEPL, THEPL->p_local_category ); - rightPanel = qobject_cast(new StandardPLPanel( this, + rightPanel = qobject_cast( new StandardPLPanel( this, p_intf, THEPL, p_root ) ); + /* Connects */ CONNECT( selector, activated( int ), rightPanel, setRoot( int ) ); - QHBoxLayout *layout = new QHBoxLayout(); - layout->addWidget( selector, 0 ); - layout->addWidget( rightPanel, 10 ); - setLayout( layout ); + 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 ) ); + + connect( selector, SIGNAL( activated( int ) ), + this, SIGNAL( rootChanged( int ) ) ); + emit rootChanged( p_root->i_id ); + + /* Add the two sides of the QSplitter */ + addWidget( leftW ); + addWidget( rightPanel ); + + leftW->setMaximumWidth( 250 ); + setCollapsible( 1, false ); + + QList sizeList; + sizeList << 180 << 520 ; + setSizes( sizeList ); +} + +void PlaylistWidget::setArt( QString url ) +{ + if( url.isNull() ) + art->setPixmap( QPixmap( ":/noart.png" ) ); + else if( prevArt != url ) + art->setPixmap( QPixmap( url ) ); + prevArt = url; + emit artSet( url ); } PlaylistWidget::~PlaylistWidget() @@ -281,3 +734,111 @@ QSize PlaylistWidget::sizeHint() const return widgetSize; } +/********************************************************************** + * Speed control widget + **********************************************************************/ +SpeedControlWidget::SpeedControlWidget( intf_thread_t *_p_i ) : + QFrame( NULL ), p_intf( _p_i ) +{ + QSizePolicy sizePolicy( QSizePolicy::Maximum, QSizePolicy::Fixed ); + sizePolicy.setHorizontalStretch( 0 ); + sizePolicy.setVerticalStretch( 0 ); + + speedSlider = new QSlider; + speedSlider->setSizePolicy( sizePolicy ); + speedSlider->setMaximumSize( QSize( 80, 200 ) ); + speedSlider->setOrientation( Qt::Vertical ); + speedSlider->setTickPosition( QSlider::TicksRight ); + + speedSlider->setRange( -100, 100 ); + speedSlider->setSingleStep( 10 ); + speedSlider->setPageStep( 20 ); + speedSlider->setTickInterval( 20 ); + + CONNECT( speedSlider, valueChanged( int ), this, updateRate( int ) ); + + normalSpeedButton = new QPushButton( "N" ); + normalSpeedButton->setMaximumSize( QSize( 26, 20 ) ); + normalSpeedButton->setFlat( true ); + 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); +} + +SpeedControlWidget::~SpeedControlWidget() +{ +} + +#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() ) + { + //We don't want to change anything if the user is using the slider + return; + } + + int sliderValue; + double speed = INPUT_RATE_DEFAULT / (double)rate; + + if( rate >= INPUT_RATE_DEFAULT ) + { + if( speed < RATE_SLIDER_MINIMUM ) + { + sliderValue = speedSlider->minimum(); + } + else + { + sliderValue = (int)( ( speed - 1.0 ) * RATE_SLIDER_LENGTH + / ( 1.0 - RATE_SLIDER_MAXIMUM ) ); + } + } + else + { + if( speed > RATE_SLIDER_MAXIMUM ) + { + sliderValue = speedSlider->maximum(); + } + else + { + sliderValue = (int)( ( speed - 1.0 ) * RATE_SLIDER_LENGTH + / ( RATE_SLIDER_MAXIMUM - 1.0 ) ); + } + } + + //Block signals to avoid feedback loop + speedSlider->blockSignals( true ); + speedSlider->setValue( sliderValue ); + speedSlider->blockSignals( false ); +} + +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 ); + } + + THEMIM->getIM()->setRate(rate); +} + +void SpeedControlWidget::resetRate() +{ + THEMIM->getIM()->setRate(INPUT_RATE_DEFAULT); +}