*
* Authors: Clément Stenac <zorglub@videolan.org>
* Jean-Baptiste Kempf <jb@videolan.org>
+ * Rafaël Carré <funman@videolanorg>
*
* 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
ABButton->setMaximumSize( QSize( 26, 26 ) );
ABButton->setIconSize( QSize( 20, 20 ) );
advLayout->addWidget( ABButton );
- BUTTON_SET_ACT( ABButton, "AB", qtr( "A to B" ), normal() );
+ BUTTON_SET_ACT( ABButton, "AB", qtr( "A to B" ), fromAtoB() );
snapshotButton = new QPushButton( "S" );
snapshotButton->setMaximumSize( QSize( 26, 26 ) );
void AdvControlsWidget::enableInput( bool enable )
{
-// slowerButton->setEnabled( enable );
ABButton->setEnabled( enable );
recordButton->setEnabled( enable );
normalButton->setEnabled( enable );
-// fasterButton->setEnabled( enable );
}
void AdvControlsWidget::enableVideo( bool enable )
{
snapshotButton->setEnabled( enable );
frameButton->setEnabled( enable );
- //fullscreenButton->setEnabled( enable );
}
void AdvControlsWidget::normal()
void AdvControlsWidget::snapshot()
{
-}
-
-void AdvControlsWidget::fullscreen()
-{
+ 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);
/** The main Slider **/
slider = new InputSlider( Qt::Horizontal, NULL );
- controlLayout->addWidget( slider, 0, 1, 1, 15 );
+ 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 ) );
fasterButton = new QPushButton( "F" );
BUTTON_SET_ACT( fasterButton, "F", qtr( "Faster" ), faster() );
- controlLayout->addWidget( fasterButton, 0, 16 );
+ controlLayout->addWidget( fasterButton, 0, 17 );
fasterButton->setMaximumSize( QSize( 26, 20 ) );
/** TODO: Insert here the AdvControls Widget
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;
+ //THIS should be removed. need_components_update = true;
/** Disc and Menus handling */
discFrame = new QFrame( this );
discLayout->setSpacing( 0 );
discLayout->setMargin( 0 );
- QPushButton *prevSectionButton = new QPushButton( discFrame );
+ prevSectionButton = new QPushButton( discFrame );
setupSmallButton( prevSectionButton );
discLayout->addWidget( prevSectionButton );
- QPushButton *menuButton = new QPushButton( discFrame );
+ menuButton = new QPushButton( discFrame );
setupSmallButton( menuButton );
discLayout->addWidget( menuButton );
- QPushButton *nextSectionButton = new QPushButton( discFrame );
+ nextSectionButton = new QPushButton( discFrame );
setupSmallButton( nextSectionButton );
discLayout->addWidget( nextSectionButton );
- controlLayout->addWidget( discFrame, 1, 10, 2, 4, Qt::AlignBottom );
+ controlLayout->addWidget( discFrame, 1, 10, 2, 3, Qt::AlignBottom );
BUTTON_SET_IMG( prevSectionButton, "", previous.png, "" );
BUTTON_SET_IMG( nextSectionButton, "", next.png, "" );
QSizePolicy sizePolicy( QSizePolicy::Maximum, QSizePolicy::Fixed );
sizePolicy.setHorizontalStretch( 0 );
sizePolicy.setVerticalStretch( 0 );
-// sizePolicy.setHeightForWidth( playButton->sizePolicy().hasHeightForWidth() );
/* Play */
- QPushButton *playButton = new QPushButton;
+ 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;
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
/** Playlist Button **/
playlistButton = new QPushButton;
setupSmallButton( playlistButton );
-
controlLayout->addWidget( playlistButton, 3, 11 );
/** extended Settings **/
setupSmallButton( prefsButton );
controlLayout->addWidget( prefsButton, 3, 13 );
+ controlLayout->setColumnStretch( 14, 5 );
+
/* Volume */
VolumeClickHandler *h = new VolumeClickHandler( p_intf, this );
- QLabel *volMuteLabel = new QLabel;
- volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) );
+ volMuteLabel = new QLabel;
+ volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-high.png" ) );
volMuteLabel->setToolTip( qtr( "Mute" ) );
volMuteLabel->installEventFilter( h );
- /** TODO:
+ /** TODO:
* Change this slider to use a nice Amarok-like one
* Add a Context menu to change to the most useful %
* **/
volumeSlider->setMaximumSize( QSize( 80, 200 ) );
volumeSlider->setOrientation( Qt::Horizontal );
- volumeSlider->setMaximum( 100 );
+ volumeSlider->setMaximum( VOLUME_MAX );
volumeSlider->setFocusPolicy( Qt::NoFocus );
- controlLayout->addWidget( volMuteLabel, 3, 14 );
- controlLayout->addWidget( volumeSlider, 3, 15, 1, 2 );
+ controlLayout->addWidget( volMuteLabel, 3, 15 );
+ controlLayout->addWidget( volumeSlider, 3, 16, 1, 2 );
/* Volume control connection */
CONNECT( volumeSlider, valueChanged( int ), this, updateVolume( int ) );
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 */
- msg_Dbg( p_intf, "Nothing to play yet, open a file" );
THEDP->openFileDialog();
setStatus( 0 );
return;
{
discFrame->hide();
} else if( navigation == 1 ) {
- prevSectionButton->show();
prevSectionButton->setToolTip( qfu( HELP_PCH ) );
- nextSectionButton->show();
nextSectionButton->setToolTip( qfu( HELP_NCH ) );
menuButton->show();
discFrame->show();
} else {
- prevSectionButton->show();
prevSectionButton->setToolTip( qfu( HELP_PCH ) );
- nextSectionButton->show();
nextSectionButton->setToolTip( qfu( HELP_NCH ) );
menuButton->hide();
discFrame->show();
}
static bool b_my_volume;
-void ControlsWidget::updateVolume( int sliderVolume )
+void ControlsWidget::updateVolume( int i_sliderVolume )
{
if( !b_my_volume )
{
- int i_res = sliderVolume * AOUT_VOLUME_MAX /
- ( 2*volumeSlider->maximum() );
+ 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 * 200 )/ AOUT_VOLUME_MAX ;
+ 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 )
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( THEMIM->getIM()->hasVideo() );
+ enableVideo( true );
}
-/* FIXME */
void ControlsWidget::setStatus( int status )
{
- if( status == 1 ) // Playing
- {
- msg_Dbg( p_intf, "I was here %i", status );
- // playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) );
- }
+ if( status == PLAYING_S ) // Playing
+ playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) );
else
- {
- msg_Dbg( p_intf, "I was here %i", status );
- // playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );
- }
+ playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );
}
/**
*/
void ControlsWidget::fullscreen()
{
- msg_Dbg( p_intf, "Not implemented yet" );
+ vout_thread_t *p_vout = (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+ if( p_vout)
+ {
+ var_SetBool( p_vout, "fullscreen", !var_GetBool( p_vout, "fullscreen" ) );
+ vlc_object_release( p_vout );
+ }
}
void ControlsWidget::extSettings()
b_advancedVisible = false;
}
//FIXME connect this one :D
- emit advancedControlsShowed( b_advancedVisible ); // doComponentsUpdate();
+ emit advancedControlsToggled( b_advancedVisible ); // doComponentsUpdate();
}
/**********************************************************************
projects / vlc / blobdiff