# include "config.h"
#endif
-#include <vlc_vout.h>
-#include <vlc_keys.h>
+#include <vlc_vout.h> /* vout_thread_t for FSC */
+/* Widgets */
#include "components/controller.hpp"
#include "components/controller_widget.hpp"
#include "components/interface_widgets.hpp"
+#include "util/buttons/DeckButtonsLayout.hpp"
+#include "util/buttons/BrowseButton.hpp"
+#include "util/buttons/RoundButton.hpp"
-#include "dialogs_provider.hpp" /* Opening Dialogs */
-#include "input_manager.hpp"
-#include "actions_manager.hpp"
+#include "dialogs_provider.hpp" /* Opening Dialogs */
+#include "actions_manager.hpp" /* *_ACTION */
-#include "util/input_slider.hpp" /* InputSlider */
-#include "util/customwidgets.hpp" /* qEventToKey */
+#include "util/input_slider.hpp" /* SeekSlider */
+#include "util/customwidgets.hpp" /* qEventToKey */
+
+#include "adapters/seekpoints.hpp"
-#include <QSpacerItem>
#include <QToolButton>
#include <QHBoxLayout>
+#include <QRegion>
#include <QSignalMapper>
#include <QTimer>
{
p_intf = _p_i;
advControls = NULL;
+ buttonGroupLayout = NULL;
/* Main action provider */
toolbarActionsMapper = new QSignalMapper( this );
CONNECT( toolbarActionsMapper, mapped( int ),
ActionsManager::getInstance( p_intf ), doAction( int ) );
- CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) );
+ CONNECT( THEMIM->getIM(), playingStatusChanged( int ), this, setStatus( int ) );
+
+ setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Fixed );
}
/* Reemit some signals on status Change to activate some buttons */
QStringList list2 = list.at( i ).split( "-" );
if( list2.size() < 1 )
{
- msg_Warn( p_intf, "Parsing error. Report this" );
+ msg_Warn( p_intf, "Parsing error 1. Please, report this." );
continue;
}
buttonType_e i_type = (buttonType_e)list2.at( 0 ).toInt( &ok );
if( !ok )
{
- msg_Warn( p_intf, "Parsing error 0. Please report this" );
+ msg_Warn( p_intf, "Parsing error 2. Please report this." );
continue;
}
i_option = list2.at( 1 ).toInt( &ok );
if( !ok )
{
- msg_Warn( p_intf, "Parsing error 1. Please report this" );
+ msg_Warn( p_intf, "Parsing error 3. Please, report this." );
continue;
- }
- }
+ } }
createAndAddWidget( controlLayout, -1, i_type, i_option );
}
+
+ if( buttonGroupLayout )
+ {
+ controlLayout->addLayout( buttonGroupLayout );
+ buttonGroupLayout = NULL;
+ }
}
void AbstractController::createAndAddWidget( QBoxLayout *controlLayout,
buttonType_e i_type,
int i_option )
{
+ VLC_UNUSED( i_index ); // i_index should only be required for edition
+
+ /* Close the current buttonGroup if we have a special widget or a spacer */
+ if( buttonGroupLayout && i_type > BUTTON_MAX )
+ {
+ controlLayout->addLayout( buttonGroupLayout );
+ buttonGroupLayout = NULL;
+ }
+
/* Special case for SPACERS, who aren't QWidgets */
if( i_type == WIDGET_SPACER )
{
- controlLayout->insertSpacing( i_index, 12 );
- return;
+ controlLayout->addSpacing( 12 );
}
-
- if( i_type == WIDGET_SPACER_EXTEND )
+ else if( i_type == WIDGET_SPACER_EXTEND )
{
- controlLayout->insertStretch( i_index, 12 );
- return;
+ controlLayout->addStretch( 12 );
}
+ else
+ {
+ /* Create the widget */
+ QWidget *widg = createWidget( i_type, i_option );
+ if( !widg ) return;
- QWidget *widg = createWidget( i_type, i_option );
- if( !widg ) return;
+ /* Buttons */
+ if( i_type < BUTTON_MAX )
+ {
+ if( !buttonGroupLayout )
+ {
+ buttonGroupLayout = new QHBoxLayout;
- controlLayout->insertWidget( i_index, widg );
+ }
+ buttonGroupLayout->addWidget( widg );
+ }
+ else /* Special widgets */
+ {
+ controlLayout->addWidget( widg );
+ }
+ }
}
QWidget *AbstractController::createWidget( buttonType_e button, int options )
{
-
bool b_flat = options & WIDGET_FLAT;
bool b_big = options & WIDGET_BIG;
bool b_shiny = options & WIDGET_SHINY;
BUTTON_SET_BAR( playButton );
CONNECT_MAP_SET( playButton, PLAY_ACTION );
CONNECT( this, inputPlaying( bool ),
- playButton, updateButton( bool ));
+ playButton, updateButtonIcons( bool ));
widget = playButton;
}
break;
NORMAL_BUTTON( OPEN );
}
break;
+ case OPEN_SUB_BUTTON:{
+ NORMAL_BUTTON( OPEN_SUB );
+ }
+ break;
case PREVIOUS_BUTTON:{
NORMAL_BUTTON( PREVIOUS );
}
ENABLE_ON_INPUT( FASTERButton );
}
break;
+ case PREV_SLOW_BUTTON:{
+ QToolButtonExt *but = new QToolButtonExt;
+ setupButton( but );
+ BUTTON_SET_BAR( but );
+ CONNECT( but, shortClicked(), THEMIM, prev() );
+ CONNECT( but, longClicked(), THEAM, skipBackward() );
+ widget = but;
+ }
+ break;
+ case NEXT_FAST_BUTTON:{
+ QToolButtonExt *but = new QToolButtonExt;
+ setupButton( but );
+ BUTTON_SET_BAR( but );
+ CONNECT( but, shortClicked(), THEMIM, next() );
+ CONNECT( but, longClicked(), THEAM, skipForward() );
+ widget = but;
+ }
+ break;
case FRAME_BUTTON: {
NORMAL_BUTTON( FRAME );
ENABLE_ON_VIDEO( FRAMEButton );
ENABLE_ON_INPUT( ABButton );
CONNECT_MAP_SET( ABButton, ATOB_ACTION );
CONNECT( THEMIM->getIM(), AtoBchanged( bool, bool),
- ABButton, setIcons( bool, bool ) );
+ ABButton, updateButtonIcons( bool, bool ) );
widget = ABButton;
}
break;
case INPUT_SLIDER: {
- InputSlider *slider = new InputSlider( Qt::Horizontal, NULL );
+ SeekSlider *slider = new SeekSlider( Qt::Horizontal, NULL );
+ SeekPoints *chapters = new SeekPoints( this, p_intf );
+ CONNECT( THEMIM->getIM(), titleChanged( bool ), chapters, update() );
+ slider->setChapters( chapters );
/* Update the position when the IM has changed */
- CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
- slider, setPosition( float, int, int ) );
+ CONNECT( THEMIM->getIM(), positionUpdated( float, int64_t, int ),
+ slider, setPosition( float, int64_t, int ) );
/* And update the IM, when the position has changed */
CONNECT( slider, sliderDragged( float ),
THEMIM->getIM(), sliderUpdate( float ) );
+ CONNECT( THEMIM->getIM(), cachingChanged( float ),
+ slider, updateBuffering( float ) );
widget = slider;
}
break;
setupButton( loopButton );
loopButton->setToolTip( qtr( "Click to toggle between loop one, loop all" ) );
loopButton->setCheckable( true );
- loopButton->updateIcons( NORMAL );
- CONNECT( THEMIM, repeatLoopChanged( int ), loopButton, updateIcons( int ) );
+ loopButton->updateButtonIcons( NORMAL );
+ CONNECT( THEMIM, repeatLoopChanged( int ), loopButton, updateButtonIcons( int ) );
CONNECT( loopButton, clicked(), THEMIM, loopRepeatLoopStatus() );
widget = loopButton;
}
break;
+ case INFO_BUTTON: {
+ NORMAL_BUTTON( INFO );
+ }
+ break;
+ case PLAYBACK_BUTTONS:{
+ widget = new QWidget;
+ DeckButtonsLayout *layout = new DeckButtonsLayout( widget );
+ BrowseButton *prev = new BrowseButton( widget, BrowseButton::Backward );
+ BrowseButton *next = new BrowseButton( widget );
+ RoundButton *play = new RoundButton( widget );
+ layout->setBackwardButton( prev );
+ layout->setForwardButton( next );
+ layout->setRoundButton( play );
+ CONNECT_MAP_SET( prev, PREVIOUS_ACTION );
+ CONNECT_MAP_SET( next, NEXT_ACTION );
+ CONNECT_MAP_SET( play, PLAY_ACTION );
+ }
+ break;
default:
msg_Warn( p_intf, "This should not happen %i", button );
break;
sectionNext() );
CONNECT( menuButton, clicked(), THEMIM->getIM(),
sectionMenu() );
- connect( THEMIM->getIM(), SIGNAL( titleChanged( bool ) ),
- this, SIGNAL( sizeChanged() ) );
return discFrame;
}
/**
* Telextext QFrame
**/
- QFrame *telexFrame = new QFrame;
+ QFrame *telexFrame = new QFrame( this );
QHBoxLayout *telexLayout = new QHBoxLayout( telexFrame );
telexLayout->setSpacing( 0 ); telexLayout->setMargin( 0 );
CONNECT( THEMIM->getIM(), teletextPossible( bool ),
telexFrame, setVisible( bool ) );
- connect( THEMIM->getIM(), SIGNAL( teletextPossible( bool ) ),
- this, SIGNAL( sizeChanged() ) );
/* On/Off button */
QToolButton *telexOn = new QToolButton;
/* advanced Controls handling */
b_advancedVisible = b_advControls;
#if DEBUG_LAYOUT
- setStyleSheet( " background: red ");
+ setStyleSheet( "background: red ");
#endif
+ setAttribute( Qt::WA_MacBrushedMetal);
QVBoxLayout *controlLayout = new QVBoxLayout( this );
- controlLayout->setContentsMargins( 4, 1, 4, 0 );
+ controlLayout->setContentsMargins( 4, 1, 0, 0 );
controlLayout->setSpacing( 0 );
QHBoxLayout *controlLayout1 = new QHBoxLayout;
controlLayout1->setSpacing( 0 ); controlLayout1->setMargin( 0 );
.toString();
parseAndCreate( line2, controlLayout2 );
+ grip = new QSizeGrip( this );
+ controlLayout2->addWidget( grip, 0, Qt::AlignBottom|Qt::AlignRight );
+
if( !b_advancedVisible && advControls ) advControls->hide();
controlLayout->addLayout( controlLayout1 );
controlLayout->addLayout( controlLayout2 );
}
-ControlsWidget::~ControlsWidget()
-{}
-
void ControlsWidget::toggleAdvanced()
{
if( !advControls ) return;
controlLayout->setMargin( 0 );
controlLayout->setSpacing( 0 );
#if DEBUG_LAYOUT
- setStyleSheet( " background: orange ");
+ setStyleSheet( "background: orange ");
#endif
controlLayout->setMargin( 0 );
controlLayout->setSpacing( 0 );
#if DEBUG_LAYOUT
- setStyleSheet( " background: green ");
+ setStyleSheet( "background: green ");
#endif
QString line = getSettings()->value( "InputToolbar", INPT_TB_DEFAULT ).toString();
/* hiding timer */
p_hideTimer = new QTimer( this );
- CONNECT( p_hideTimer, timeout(), this, hideFSC() );
p_hideTimer->setSingleShot( true );
+ CONNECT( p_hideTimer, timeout(), this, hideFSC() );
/* slow hiding timer */
#if HAVE_TRANSPARENCY
p_slowHideTimer = new QTimer( this );
CONNECT( p_slowHideTimer, timeout(), this, slowHideFSC() );
+ f_opacity = var_InheritFloat( p_intf, "qt-fs-opacity" );
#endif
vlc_mutex_init_recursive( &lock );
- CONNECT( THEMIM->getIM(), voutListChanged( vout_thread_t **, int ),
- this, setVoutList( vout_thread_t **, int ) );
+ DCONNECT( THEMIM->getIM(), voutListChanged( vout_thread_t **, int ),
+ this, setVoutList( vout_thread_t **, int ) );
/* First Move */
QRect rect1 = getSettings()->value( "FullScreen/screen" ).toRect();
QPoint pos1 = getSettings()->value( "FullScreen/pos" ).toPoint();
- int number = config_GetInt( p_intf, "qt-fullscreen-screennumber" );
+ int number = var_InheritInteger( p_intf, "qt-fullscreen-screennumber" );
if( number == -1 || number > QApplication::desktop()->numScreens() )
number = QApplication::desktop()->screenNumber( p_intf->p_sys->p_mi );
}
#if HAVE_TRANSPARENCY
- setWindowOpacity( config_GetFloat( p_intf, "qt-fs-opacity" ) );
+ setWindowOpacity( f_opacity );
+#endif
+
+#ifdef Q_WS_X11
+ // Tell kwin that we do not want a shadow around the fscontroller
+ setMask( QRegion( 0, 0, width(), height() ) );
#endif
show();
/**
* event handling
- * events: show, hide, start timer for hidding
+ * events: show, hide, start timer for hiding
*/
void FullscreenControllerWidget::customEvent( QEvent *event )
{
p_hideTimer->stop();
#if HAVE_TRANSPARENCY
p_slowHideTimer->stop();
- setWindowOpacity( DEFAULT_OPACITY );
+ setWindowOpacity( f_opacity );
#endif
event->accept();
}
const char *variable, vlc_value_t old_val,
vlc_value_t new_val, void *data )
{
+ VLC_UNUSED( variable ); VLC_UNUSED( old_val );
+
vout_thread_t *p_vout = (vout_thread_t *) vlc_object;
msg_Dbg( p_vout, "Qt4: Fullscreen state changed" );
vlc_value_t old_val, vlc_value_t new_val,
void *data )
{
+ VLC_UNUSED( variable ); VLC_UNUSED( old_val );
+
vout_thread_t *p_vout = (vout_thread_t *)vlc_object;
FullscreenControllerWidget *p_fs = (FullscreenControllerWidget *)data;
/* Get the value from the Vout - Trust the vout more than Qt */
- const int i_mousex = var_GetInteger( p_vout, "mouse-x" );
- const int i_mousey = var_GetInteger( p_vout, "mouse-y" );
-
- p_fs->mouseChanged( p_vout, i_mousex, i_mousey );
+ p_fs->mouseChanged( p_vout, new_val.coords.x, new_val.coords.y );
return VLC_SUCCESS;
}
bool b_fs, int i_timeout )
{
/* FIXME - multiple vout (ie multiple mouse position ?) and thread safety if multiple vout ? */
- msg_Dbg( p_vout, "Qt: Entering Fullscreen" );
vlc_mutex_lock( &lock );
/* Entering fullscreen, register callback */
if( b_fs && !b_fullscreen )
{
+ msg_Dbg( p_vout, "Qt: Entering Fullscreen" );
b_fullscreen = true;
i_hide_timeout = i_timeout;
var_AddCallback( p_vout, "mouse-moved",
/* Quitting fullscreen, unregistering callback */
else if( !b_fs && b_fullscreen )
{
+ msg_Dbg( p_vout, "Qt: Quitting Fullscreen" );
b_fullscreen = false;
i_hide_timeout = i_timeout;
var_DelCallback( p_vout, "mouse-moved",
FullscreenControllerWidgetMouseMoved, this );
- /* Force fs hidding */
+ /* Force fs hiding */
IMEvent *eHide = new IMEvent( FullscreenControlHide_Type, 0 );
QApplication::postEvent( this, eHide );
}
/**
* Mouse change callback (show/hide the controller on mouse movement)
*/
-void FullscreenControllerWidget::mouseChanged( vout_thread_t *p_vout, int i_mousex, int i_mousey )
+void FullscreenControllerWidget::mouseChanged( vout_thread_t *, int i_mousex, int i_mousey )
{
bool b_toShow;
projects / vlc / blobdiff