#include "input_manager.hpp"
#include "menus.hpp"
#include "util/input_slider.hpp"
+#include "util/customwidgets.hpp"
#include <vlc_vout.h>
#include <QLabel>
#include <QPalette>
#include <QResizeEvent>
-#define ICON_SIZE 128
-#define MAX_BG_SIZE 300
-
/**********************************************************************
* Video Widget. A simple frame on which video is drawn
* This class handles resize issues
{
vlc_mutex_init( p_intf, &lock );
p_vout = NULL;
+
CONNECT( this, askResize(), this, SetMinSize() );
+ CONNECT( this, askVideoToShow(), this, show() );
setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred );
}
void *VideoWidget::request( vout_thread_t *p_nvout, int *pi_x, int *pi_y,
unsigned int *pi_width, unsigned int *pi_height )
{
+ emit askVideoToShow();
if( p_vout )
{
msg_Dbg( p_intf, "embedded video already in use" );
{
p_vout = NULL;
}
+
+
/**********************************************************************
* Background Widget. Show a simple image background. Currently,
* it's a static 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 )
{
+ /* We should use that one to take the more size it can */
+ setSizePolicy( QSizePolicy::Preferred, QSizePolicy::MinimumExpanding );
+ /* A dark background */
setAutoFillBackground( true );
plt = palette();
plt.setColor( QPalette::Active, QPalette::Window , Qt::black );
plt.setColor( QPalette::Inactive, QPalette::Window , Qt::black );
setPalette( plt );
+ /* A cone in the middle */
label = new QLabel;
- label->setMaximumHeight( ICON_SIZE );
- label->setMaximumWidth( ICON_SIZE );
- label->setScaledContents( true );
+// 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" ) );
- backgroundLayout = new QHBoxLayout;
+
+ QHBoxLayout *backgroundLayout = new QHBoxLayout( this );
backgroundLayout->addWidget( label );
- setLayout( backgroundLayout );
+
+ resize( 300, 150 );
+ updateGeometry();
}
BackgroundWidget::~BackgroundWidget()
-{
- backgroundLayout->takeAt( 0 );
- delete backgroundLayout;
-}
+{}
void BackgroundWidget::setArt( QString url )
{
label->setPixmap( QPixmap( ":/vlc128.png" ) );
else
label->setPixmap( QPixmap( url ) );
+ updateGeometry();
}
QSize BackgroundWidget::sizeHint() const
{
- return widgetSize;
+ return label->size();
}
void BackgroundWidget::resizeEvent( QResizeEvent *e )
{
- if( e->size().height() < ICON_SIZE -1 )
- label->setMaximumWidth( e->size().height() );
- else
- label->setMaximumWidth( ICON_SIZE );
+ msg_Dbg( p_intf, "BG size, %i, %i", e->size().width(), e->size().height() );
+ if( e->size().height() < label->height() )
+ {
+ label->resize( e->size().height(), e->size().height() );
+ }
}
void BackgroundWidget::contextMenuEvent( QContextMenuEvent *event )
{
QVLCMenu::PopupMenu( p_intf, true );
}
+
/**********************************************************************
* Visualization selector panel
**********************************************************************/
VisualSelector::VisualSelector( intf_thread_t *_p_i ) :
- QFrame( NULL ), p_intf( _p_i )
+ QFrame( NULL ), p_intf( _p_i )
{
QHBoxLayout *layout = new QHBoxLayout( this );
layout->setMargin( 0 );
advLayout->setMargin( 0 );
advLayout->setSpacing( 0 );
-/* FIXME A to B function */
+ /* A to B Button */
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() );
+ timeA = timeB = 0;
+ CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
+ this, AtoBLoop( float, int, int ) );
- 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
+ //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 */
+ /* FIXME Record function */
recordButton = new QPushButton( "R" );
recordButton->setMaximumSize( QSize( 26, 26 ) );
recordButton->setIconSize( QSize( 20, 20 ) );
BUTTON_SET_ACT_I( recordButton, "", record_16px.png,
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() );
-
+ /* Snapshot Button */
+ 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() );
}
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()
+void AdvControlsWidget::snapshot()
{
- THEMIM->getIM()->normalRate();
+ 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::snapshot()
+/* Function called when the button is clicked() */
+void AdvControlsWidget::fromAtoB()
{
- 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 );
+ if( !timeA )
+ {
+ timeA = var_GetTime( THEMIM->getInput(), "time" );
+ ABButton->setText( "A->..." );
+ return;
+ }
+ if( !timeB )
+ {
+ timeB = var_GetTime( THEMIM->getInput(), "time" );
+ var_SetTime( THEMIM->getInput(), "time" , timeA );
+ ABButton->setText( "A<=>B" );
+ return;
+ }
+ timeA = 0;
+ timeB = 0;
+ ABButton->setText( "AB" );
+}
+
+/* Function called regularly when in an AtoB loop */
+void AdvControlsWidget::AtoBLoop( float f_pos, int i_time, int i_length )
+{
+ if( timeB )
+ {
+ if( i_time >= (int)(timeB/1000000) )
+ var_SetTime( THEMIM->getInput(), "time" , timeA );
+ }
}
-void AdvControlsWidget::frame(){}
-void AdvControlsWidget::fromAtoB(){}
void AdvControlsWidget::record(){}
+void AdvControlsWidget::frame(){}
/*****************************
* DA Control Widget !
*****************************/
-ControlsWidget::ControlsWidget( intf_thread_t *_p_i, bool b_advControls ) :
- QFrame( NULL ), p_intf( _p_i )
+ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
+ bool b_advControls,
+ bool b_shiny ) :
+ QFrame( NULL ), p_intf( _p_i )
{
- //QSize size( 500, 200 );
- //resize( size );
controlLayout = new QGridLayout( this );
controlLayout->setSpacing( 0 );
- setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Minimum );
-
-#if DEBUG_COLOR
- QPalette palette2;
- palette2.setColor(this->backgroundRole(), Qt::magenta);
- setPalette(palette2);
-#endif
+ setSizePolicy( QSizePolicy::Preferred , QSizePolicy::Minimum );
/** 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 ) );
+ 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 = new QPushButton;
+ slowerButton->setFlat( true );
slowerButton->setMaximumSize( QSize( 26, 20 ) );
- fasterButton = new QPushButton( "F" );
- BUTTON_SET_ACT( fasterButton, "F", qtr( "Faster" ), faster() );
- controlLayout->addWidget( fasterButton, 0, 17 );
+ BUTTON_SET_ACT( slowerButton, "-", qtr( "Slower" ), slower() );
+ controlLayout->addWidget( slowerButton, 0, 0 );
+
+ fasterButton = new QPushButton;
+ fasterButton->setFlat( true );
fasterButton->setMaximumSize( QSize( 26, 20 ) );
- /** TODO: Insert here the AdvControls Widget
- * Then fix all the size issues in main_interface.cpp
- **/
+ 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, 5, Qt::AlignBottom );
+ controlLayout->addWidget( advControls, 1, 3, 2, 4, Qt::AlignBottom );
if( !b_advancedVisible ) advControls->hide();
- //THIS should be removed. need_components_update = true;
/** Disc and Menus handling */
discFrame = new QFrame( this );
/** TODO
* Telextext QFrame
+ * Merge with upper menu in a StackLayout
**/
/** Play Buttons **/
playButton->setMinimumSize( QSize( 45, 45 ) );
playButton->setIconSize( QSize( 30, 30 ) );
- controlLayout->addWidget( playButton, 2, 0, 2, 2, Qt::AlignBottom );
+ controlLayout->addWidget( playButton, 2, 0, 2, 2 );
controlLayout->setColumnMinimumWidth( 2, 20 );
controlLayout->setColumnStretch( 2, 0 );
controlButLayout->addWidget( nextButton );
/* Add this block to the main layout */
- controlLayout->addLayout( controlButLayout, 3, 3, 1, 3 );
+ 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,
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 );
+ controlLayout->setColumnStretch( 7 , 2 );
/*
* Other first Line buttons
fullscreenButton = new QPushButton( "F" );
BUTTON_SET_ACT( fullscreenButton, "F", qtr( "Fullscreen" ), fullscreen() );
setupSmallButton( fullscreenButton );
- controlLayout->addWidget( fullscreenButton, 3, 10 );
+ controlLayout->addWidget( fullscreenButton, 3, 10, Qt::AlignBottom );
/** Playlist Button **/
playlistButton = new QPushButton;
setupSmallButton( playlistButton );
- controlLayout->addWidget( playlistButton, 3, 11 );
+ controlLayout->addWidget( playlistButton, 3, 11, Qt::AlignBottom );
BUTTON_SET_IMG( playlistButton, "" , playlist.png, qtr( "Show playlist" ) );
/** extended Settings **/
BUTTON_SET_ACT( extSettingsButton, "Ex", qtr( "Extended Settings" ),
extSettings() );
setupSmallButton( extSettingsButton );
- controlLayout->addWidget( extSettingsButton, 3, 12 );
+ controlLayout->addWidget( extSettingsButton, 3, 12, Qt::AlignBottom );
controlLayout->setColumnStretch( 14, 5 );
/* Volume */
- VolumeClickHandler *h = new VolumeClickHandler( p_intf, this );
+ VolumeClickHandler *hVolLabel = 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 );
+ volMuteLabel->installEventFilter( hVolLabel );
+ controlLayout->addWidget( volMuteLabel, 3, 15, Qt::AlignBottom );
- volumeSlider->setMaximum( VOLUME_MAX );
+ if( b_shiny )
+ {
+ volumeSlider = new SoundSlider( this,
+ config_GetInt( p_intf, "volume-step" ),
+ config_GetInt( p_intf, "qt-volume-complete" ) );
+ }
+ else
+ {
+ volumeSlider = new QSlider( this );
+ volumeSlider->setOrientation( Qt::Horizontal );
+ }
+ volumeSlider->setMaximumSize( QSize( 200, 40 ) );
+ volumeSlider->setMinimumSize( QSize( 80, 20 ) );
volumeSlider->setFocusPolicy( Qt::NoFocus );
- controlLayout->addWidget( volMuteLabel, 3, 15 );
- controlLayout->addWidget( volumeSlider, 3, 16, 1, 2 );
+ 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) );
/* Volume control connection */
+ resize( QSize( 400, 60 ) );
CONNECT( volumeSlider, valueChanged( int ), this, updateVolume( int ) );
- msg_Dbg( p_intf, "size: %i - %i", size().height(), size().width() );
+ msg_Dbg( p_intf, "controls size: %i - %i", size().width(), size().height() );
}
+
ControlsWidget::~ControlsWidget()
{
}
+
+/*
+QSize ControlsWidget::sizeHint() const
+{
+ return QSize( 300, 50 );
+}
+*/
+
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 ) )
+ if( THEPL->current.i_size == 0 )
{
/* The playlist is empty, open a file requester */
THEDP->openFileDialog();
/* Audio part */
audio_volume_t i_volume;
aout_VolumeGet( p_intf, &i_volume );
- i_volume = ( i_volume * VOLUME_MAX )/ (AOUT_VOLUME_MAX/2) ;
+ 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() );
*/
void ControlsWidget::fullscreen()
{
- vout_thread_t *p_vout = (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+ 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" ) );
#include "components/playlist/panels.hpp"
#include "components/playlist/selector.hpp"
-PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i ) :
+#include <QSplitter>
+
+PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QSettings *settings ) :
p_intf ( _p_i )
{
+ /* In case we want to keep the splitter informations */
+ settings->beginGroup( "Playlist" );
+ restoreState(settings->value("splitterSizes").toByteArray());
+ settings->endGroup();
+
/* Left Part and design */
QWidget *leftW = new QWidget( this );
QVBoxLayout *left = new QVBoxLayout( leftW );
setCollapsible( 1, false );
QList<int> sizeList;
- sizeList << 180 << 520 ;
+ sizeList << 180 << 420 ;
setSizes( sizeList );
+ setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding );
+ resize( 600, 300 );
+ //updateGeometry();
}
void PlaylistWidget::setArt( QString url )
{
if( url.isNull() )
+ {
art->setPixmap( QPixmap( ":/noart.png" ) );
+ emit artSet( url );
+ }
else if( prevArt != url )
{
art->setPixmap( QPixmap( url ) );
}
}
+QSize PlaylistWidget::sizeHint() const
+{
+ return QSize( 600 , 300 );
+}
+
PlaylistWidget::~PlaylistWidget()
{
}
-QSize PlaylistWidget::sizeHint() const
+void PlaylistWidget::saveSettings( QSettings *settings )
{
- return widgetSize;
+ settings->beginGroup( "Playlist" );
+ settings->setValue("splitterSizes", saveState() );
+ settings->endGroup();
}
/**********************************************************************
**********************************************************************/
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->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);
}
SpeedControlWidget::~SpeedControlWidget()
-{
-}
+{}
#define RATE_SLIDER_MAXIMUM 3.0
#define RATE_SLIDER_MINIMUM 0.3
//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();
/ ( RATE_SLIDER_MAXIMUM - 1.0 ) );
}
}
-
+
//Block signals to avoid feedback loop
speedSlider->blockSignals( true );
speedSlider->setValue( sliderValue );
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 ) ;
+ ( 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 );
+ ( sliderValue * ( RATE_SLIDER_MAXIMUM - 1.0 ) + RATE_SLIDER_LENGTH );
}
- THEMIM->getIM()->setRate(rate);
+ THEMIM->getIM()->setRate(rate);
}
void SpeedControlWidget::resetRate()
{
- THEMIM->getIM()->setRate(INPUT_RATE_DEFAULT);
+ THEMIM->getIM()->setRate(INPUT_RATE_DEFAULT);
}
projects / vlc / blobdiff