/*****************************************************************************
- * interface_widgets.cpp : Custom widgets for the main interface
+ * Controller.cpp : Controller for the main interface
****************************************************************************
- * Copyright ( C ) 2006 the VideoLAN team
+ * Copyright (C) 2006-2009 the VideoLAN team
* $Id$
*
- * Authors: Clément Stenac <zorglub@videolan.org>
- * Jean-Baptiste Kempf <jb@videolan.org>
- * Rafaël Carré <funman@videolanorg>
+ * Authors: Jean-Baptiste Kempf <jb@videolan.org>
* Ilkka Ollakka <ileoo@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
#endif
#include <vlc_vout.h>
+#include <vlc_keys.h>
-#include "dialogs_provider.hpp"
+#include "components/controller.hpp"
+#include "components/controller_widget.hpp"
#include "components/interface_widgets.hpp"
-#include "main_interface.hpp"
+
+#include "dialogs_provider.hpp" /* Opening Dialogs */
#include "input_manager.hpp"
-#include "menus.hpp"
-#include "util/input_slider.hpp"
-#include "util/customwidgets.hpp"
+#include "actions_manager.hpp"
+
+#include "util/input_slider.hpp" /* InputSlider */
+#include "util/customwidgets.hpp" /* qEventToKey */
-#include <QLabel>
#include <QSpacerItem>
-#include <QCursor>
-#include <QPushButton>
#include <QToolButton>
#include <QHBoxLayout>
-#include <QMenu>
-#include <QPalette>
-#include <QResizeEvent>
-#include <QDate>
+#include <QSignalMapper>
+#include <QTimer>
-#define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a media")
+//#define DEBUG_LAYOUT 1
/**********************************************************************
* TEH controls
**********************************************************************/
-static void setupSmallButton( QPushButton *aButton )
-{
- aButton->setMaximumSize( QSize( 26, 26 ) );
- aButton->setMinimumSize( QSize( 26, 26 ) );
- aButton->setIconSize( QSize( 20, 20 ) );
- aButton->setFocusPolicy( Qt::NoFocus );
-}
-
-/* init static variables in advanced controls */
-mtime_t AdvControlsWidget::timeA = 0;
-mtime_t AdvControlsWidget::timeB = 0;
-
-AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i, bool b_fsCreation = false ) :
- QFrame( NULL ), p_intf( _p_i )
+/******
+ * This is an abstract Toolbar/Controller
+ * This has helper to create any toolbar, any buttons and to manage the actions
+ *
+ *****/
+AbstractController::AbstractController( intf_thread_t * _p_i, QWidget *_parent )
+ : QFrame( _parent )
{
- QHBoxLayout *advLayout = new QHBoxLayout( this );
- advLayout->setMargin( 0 );
- advLayout->setSpacing( 0 );
- advLayout->setAlignment( Qt::AlignBottom );
-
- /* A to B Button */
- ABButton = new QPushButton;
- setupSmallButton( ABButton );
- advLayout->addWidget( ABButton );
- BUTTON_SET_ACT_I( ABButton, "", atob_nob,
- qtr( "Loop from point A to point B continuously.\nClick to set point A" ),
- fromAtoB() );
- timeA = timeB = 0;
- i_last_input_id = 0;
- /* in FS controller we skip this, because we dont want to have it double
- controlled */
- if( !b_fsCreation )
- CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
- this, AtoBLoop( float, int, int ) );
- /* set up synchronization between main controller and fs controller */
- CONNECT( THEMIM->getIM(), advControlsSetIcon(), this, setIcon() );
- connect( this, SIGNAL( timeChanged() ),
- THEMIM->getIM(), SIGNAL( advControlsSetIcon()));
-#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() );
-#endif
-
- /* Record Button */
- recordButton = new QPushButton;
- setupSmallButton( recordButton );
- advLayout->addWidget( recordButton );
- BUTTON_SET_ACT_I( recordButton, "", record,
- qtr( "Record" ), record() );
-
- /* Snapshot Button */
- snapshotButton = new QPushButton;
- setupSmallButton( snapshotButton );
- advLayout->addWidget( snapshotButton );
- BUTTON_SET_ACT_I( snapshotButton, "", snapshot,
- qtr( "Take a snapshot" ), snapshot() );
+ p_intf = _p_i;
+ advControls = 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 ) );
}
-AdvControlsWidget::~AdvControlsWidget()
-{}
-
-void AdvControlsWidget::enableInput( bool enable )
+/* Reemit some signals on status Change to activate some buttons */
+void AbstractController::setStatus( int status )
{
- int i_input_id = 0;
- if( THEMIM->getInput() != NULL )
- {
- input_item_t *p_item = input_GetItem( THEMIM->getInput() );
- i_input_id = p_item->i_id;
+ bool b_hasInput = THEMIM->getIM()->hasInput();
+ /* Activate the interface buttons according to the presence of the input */
+ emit inputExists( b_hasInput );
- recordButton->setVisible( var_GetBool( THEMIM->getInput(), "can-record" ) );
- }
- else
- {
- recordButton->setVisible( false );
- }
+ emit inputPlaying( status == PLAYING_S );
- ABButton->setEnabled( enable );
- recordButton->setEnabled( enable );
+ emit inputIsRecordable( b_hasInput &&
+ var_GetBool( THEMIM->getInput(), "can-record" ) );
- if( enable && ( i_last_input_id != i_input_id ) )
- {
- timeA = timeB = 0;
- i_last_input_id = i_input_id;
- emit timeChanged();
- }
+ emit inputIsTrickPlayable( b_hasInput &&
+ var_GetBool( THEMIM->getInput(), "can-rewind" ) );
}
-void AdvControlsWidget::enableVideo( bool enable )
+/* Generic button setup */
+void AbstractController::setupButton( QAbstractButton *aButton )
{
- snapshotButton->setEnabled( enable );
-#if 0
- frameButton->setEnabled( enable );
-#endif
+ static QSizePolicy sizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );
+ sizePolicy.setHorizontalStretch( 0 );
+ sizePolicy.setVerticalStretch( 0 );
+
+ aButton->setSizePolicy( sizePolicy );
+ aButton->setFixedSize( QSize( 26, 26 ) );
+ aButton->setIconSize( QSize( 20, 20 ) );
+ aButton->setFocusPolicy( Qt::NoFocus );
}
-void AdvControlsWidget::snapshot()
+/* Open the generic config line for the toolbar, parse it
+ * and create the widgets accordingly */
+void AbstractController::parseAndCreate( const QString& config,
+ QBoxLayout *controlLayout )
{
- vout_thread_t *p_vout =
- (vout_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
- if( p_vout )
+ QStringList list = config.split( ";", QString::SkipEmptyParts ) ;
+ for( int i = 0; i < list.size(); i++ )
{
- vout_Control( p_vout, VOUT_SNAPSHOT );
- vlc_object_release( p_vout );
+ QStringList list2 = list.at( i ).split( "-" );
+ if( list2.size() < 1 )
+ {
+ msg_Warn( p_intf, "Parsing error. Report this" );
+ continue;
+ }
+
+ bool ok;
+ int i_option = WIDGET_NORMAL;
+ buttonType_e i_type = (buttonType_e)list2.at( 0 ).toInt( &ok );
+ if( !ok )
+ {
+ msg_Warn( p_intf, "Parsing error 0. Please report this" );
+ continue;
+ }
+
+ if( list2.size() > 1 )
+ {
+ i_option = list2.at( 1 ).toInt( &ok );
+ if( !ok )
+ {
+ msg_Warn( p_intf, "Parsing error 1. Please report this" );
+ continue;
+ }
+ }
+
+ createAndAddWidget( controlLayout, -1, i_type, i_option );
}
}
-/* Function called when the button is clicked() */
-void AdvControlsWidget::fromAtoB()
+void AbstractController::createAndAddWidget( QBoxLayout *controlLayout,
+ int i_index,
+ buttonType_e i_type,
+ int i_option )
{
- if( !timeA )
+ /* Special case for SPACERS, who aren't QWidgets */
+ if( i_type == WIDGET_SPACER )
{
- timeA = var_GetTime( THEMIM->getInput(), "time" );
- emit timeChanged();
+ controlLayout->insertSpacing( i_index, 12 );
return;
}
- if( !timeB )
+
+ if( i_type == WIDGET_SPACER_EXTEND )
{
- timeB = var_GetTime( THEMIM->getInput(), "time" );
- var_SetTime( THEMIM->getInput(), "time" , timeA );
- emit timeChanged();
+ controlLayout->insertStretch( i_index, 12 );
return;
}
- timeA = 0;
- timeB = 0;
- emit timeChanged();
+
+ QWidget *widg = createWidget( i_type, i_option );
+ if( !widg ) return;
+
+ controlLayout->insertWidget( i_index, widg );
}
-/* setting/synchro icons after click on main or fs controller */
-void AdvControlsWidget::setIcon()
+
+#define CONNECT_MAP( a ) CONNECT( a, clicked(), toolbarActionsMapper, map() )
+#define SET_MAPPING( a, b ) toolbarActionsMapper->setMapping( a , b )
+#define CONNECT_MAP_SET( a, b ) \
+ CONNECT_MAP( a ); \
+ SET_MAPPING( a, b );
+#define BUTTON_SET_BAR( a_button ) \
+ a_button->setToolTip( qtr( tooltipL[button] ) ); \
+ a_button->setIcon( QIcon( iconL[button] ) );
+#define BUTTON_SET_BAR2( button, image, tooltip ) \
+ button->setToolTip( tooltip ); \
+ button->setIcon( QIcon( ":/"#image ) );
+
+#define ENABLE_ON_VIDEO( a ) \
+ CONNECT( THEMIM->getIM(), voutChanged( bool ), a, setEnabled( bool ) ); \
+ a->setEnabled( THEMIM->getIM()->hasVideo() ); /* TODO: is this necessary? when input is started before the interface? */
+
+#define ENABLE_ON_INPUT( a ) \
+ CONNECT( this, inputExists( bool ), a, setEnabled( bool ) ); \
+ a->setEnabled( THEMIM->getIM()->hasInput() ); /* TODO: is this necessary? when input is started before the interface? */
+
+#define NORMAL_BUTTON( name ) \
+ QToolButton * name ## Button = new QToolButton; \
+ setupButton( name ## Button ); \
+ CONNECT_MAP_SET( name ## Button, name ## _ACTION ); \
+ BUTTON_SET_BAR( name ## Button ); \
+ widget = name ## Button;
+
+QWidget *AbstractController::createWidget( buttonType_e button, int options )
{
- if( !timeA && !timeB)
- {
- ABButton->setIcon( QIcon( ":/atob_nob" ) );
- ABButton->setToolTip( qtr( "Loop from point A to point B continuously\nClick to set point A" ) );
- }
- else if( timeA && !timeB )
- {
- ABButton->setIcon( QIcon( ":/atob_noa" ) );
- ABButton->setToolTip( qtr( "Click to set point B" ) );
- }
- else if( timeA && timeB )
+
+ bool b_flat = options & WIDGET_FLAT;
+ bool b_big = options & WIDGET_BIG;
+ bool b_shiny = options & WIDGET_SHINY;
+ bool b_special = false;
+
+ QWidget *widget = NULL;
+ switch( button )
{
- ABButton->setIcon( QIcon( ":/atob" ) );
- ABButton->setToolTip( qtr( "Stop the A to B loop" ) );
+ case PLAY_BUTTON: {
+ PlayButton *playButton = new PlayButton;
+ setupButton( playButton );
+ BUTTON_SET_BAR( playButton );
+ CONNECT_MAP_SET( playButton, PLAY_ACTION );
+ CONNECT( this, inputPlaying( bool ),
+ playButton, updateButton( bool ));
+ widget = playButton;
+ }
+ break;
+ case STOP_BUTTON:{
+ NORMAL_BUTTON( STOP );
+ }
+ break;
+ case OPEN_BUTTON:{
+ NORMAL_BUTTON( OPEN );
+ }
+ break;
+ case PREVIOUS_BUTTON:{
+ NORMAL_BUTTON( PREVIOUS );
+ }
+ break;
+ case NEXT_BUTTON: {
+ NORMAL_BUTTON( NEXT );
+ }
+ break;
+ case SLOWER_BUTTON:{
+ NORMAL_BUTTON( SLOWER );
+ ENABLE_ON_INPUT( SLOWERButton );
+ }
+ break;
+ case FASTER_BUTTON:{
+ NORMAL_BUTTON( FASTER );
+ ENABLE_ON_INPUT( FASTERButton );
+ }
+ break;
+ case FRAME_BUTTON: {
+ NORMAL_BUTTON( FRAME );
+ ENABLE_ON_VIDEO( FRAMEButton );
+ }
+ break;
+ case FULLSCREEN_BUTTON:
+ case DEFULLSCREEN_BUTTON:
+ {
+ NORMAL_BUTTON( FULLSCREEN );
+ ENABLE_ON_VIDEO( FULLSCREENButton );
+ }
+ break;
+ case EXTENDED_BUTTON:{
+ NORMAL_BUTTON( EXTENDED );
+ }
+ break;
+ case PLAYLIST_BUTTON:{
+ NORMAL_BUTTON( PLAYLIST );
+ }
+ break;
+ case SNAPSHOT_BUTTON:{
+ NORMAL_BUTTON( SNAPSHOT );
+ ENABLE_ON_VIDEO( SNAPSHOTButton );
+ }
+ break;
+ case RECORD_BUTTON:{
+ QToolButton *recordButton = new QToolButton;
+ setupButton( recordButton );
+ CONNECT_MAP_SET( recordButton, RECORD_ACTION );
+ BUTTON_SET_BAR( recordButton );
+ ENABLE_ON_INPUT( recordButton );
+ recordButton->setCheckable( true );
+ CONNECT( THEMIM->getIM(), recordingStateChanged( bool ),
+ recordButton, setChecked( bool ) );
+ widget = recordButton;
+ }
+ break;
+ case ATOB_BUTTON: {
+ AtoB_Button *ABButton = new AtoB_Button;
+ setupButton( ABButton );
+ ABButton->setShortcut( qtr("Shift+L") );
+ BUTTON_SET_BAR( ABButton );
+ ENABLE_ON_INPUT( ABButton );
+ CONNECT_MAP_SET( ABButton, ATOB_ACTION );
+ CONNECT( THEMIM->getIM(), AtoBchanged( bool, bool),
+ ABButton, setIcons( bool, bool ) );
+ widget = ABButton;
+ }
+ break;
+ case INPUT_SLIDER: {
+ InputSlider *slider = new InputSlider( Qt::Horizontal, NULL );
+
+ /* 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 ) );
+ widget = slider;
+ }
+ break;
+ case MENU_BUTTONS:
+ widget = discFrame();
+ widget->hide();
+ break;
+ case TELETEXT_BUTTONS:
+ widget = telexFrame();
+ widget->hide();
+ break;
+ case VOLUME_SPECIAL:
+ b_special = true;
+ case VOLUME:
+ {
+ SoundWidget *snd = new SoundWidget( this, p_intf, b_shiny, b_special );
+ widget = snd;
+ }
+ break;
+ case TIME_LABEL:
+ {
+ TimeLabel *timeLabel = new TimeLabel( p_intf );
+ widget = timeLabel;
+ }
+ break;
+ case SPLITTER:
+ {
+ QFrame *line = new QFrame;
+ line->setFrameShape( QFrame::VLine );
+ line->setFrameShadow( QFrame::Raised );
+ line->setLineWidth( 0 );
+ line->setMidLineWidth( 1 );
+ widget = line;
+ }
+ break;
+ case ADVANCED_CONTROLLER:
+ {
+ advControls = new AdvControlsWidget( p_intf, this );
+ widget = advControls;
+ }
+ break;
+ case REVERSE_BUTTON:{
+ QToolButton *reverseButton = new QToolButton;
+ setupButton( reverseButton );
+ CONNECT_MAP_SET( reverseButton, REVERSE_ACTION );
+ BUTTON_SET_BAR( reverseButton );
+ reverseButton->setCheckable( true );
+ /* You should, of COURSE change this to the correct event,
+ when/if we have one, that tells us if trickplay is possible . */
+ CONNECT( this, inputIsTrickPlayable( bool ), reverseButton, setVisible( bool ) );
+ reverseButton->setVisible( false );
+ widget = reverseButton;
+ }
+ break;
+ case SKIP_BACK_BUTTON: {
+ NORMAL_BUTTON( SKIP_BACK );
+ ENABLE_ON_INPUT( SKIP_BACKButton );
+ }
+ break;
+ case SKIP_FW_BUTTON: {
+ NORMAL_BUTTON( SKIP_FW );
+ ENABLE_ON_INPUT( SKIP_FWButton );
+ }
+ break;
+ case QUIT_BUTTON: {
+ NORMAL_BUTTON( QUIT );
+ }
+ break;
+ case RANDOM_BUTTON: {
+ NORMAL_BUTTON( RANDOM );
+ RANDOMButton->setCheckable( true );
+ RANDOMButton->setChecked( var_GetBool( THEPL, "random" ) );
+ CONNECT( THEMIM, randomChanged( bool ),
+ RANDOMButton, setChecked( bool ) );
+ }
+ break;
+ case LOOP_BUTTON:{
+ LoopButton *loopButton = new LoopButton;
+ 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 ) );
+ CONNECT( loopButton, clicked(), THEMIM, loopRepeatLoopStatus() );
+ widget = loopButton;
+ }
+ break;
+ default:
+ msg_Warn( p_intf, "This should not happen %i", button );
+ break;
}
-}
-/* Function called regularly when in an AtoB loop */
-void AdvControlsWidget::AtoBLoop( float f_pos, int i_time, int i_length )
-{
- if( timeB )
+ /* Customize Buttons */
+ if( b_flat || b_big )
{
- if( ( i_time >= (int)( timeB/1000000 ) )
- || ( i_time < (int)( timeA/1000000 ) ) )
- var_SetTime( THEMIM->getInput(), "time" , timeA );
+ QFrame *frame = qobject_cast<QFrame *>(widget);
+ if( frame )
+ {
+ QList<QToolButton *> allTButtons = frame->findChildren<QToolButton *>();
+ for( int i = 0; i < allTButtons.size(); i++ )
+ applyAttributes( allTButtons[i], b_flat, b_big );
+ }
+ else
+ {
+ QToolButton *tmpButton = qobject_cast<QToolButton *>(widget);
+ if( tmpButton )
+ applyAttributes( tmpButton, b_flat, b_big );
+ }
}
+ return widget;
}
+#undef NORMAL_BUTTON
-void AdvControlsWidget::record()
+void AbstractController::applyAttributes( QToolButton *tmpButton, bool b_flat, bool b_big )
{
- input_thread_t *p_input = THEMIM->getInput();
- if( p_input )
+ if( tmpButton )
{
- /* This method won't work fine if the stream can't be cut anywhere */
- const bool b_recording = var_GetBool( p_input, "record" );
- var_SetBool( p_input, "record", !b_recording );
-#if 0
- else
+ if( b_flat )
+ tmpButton->setAutoRaise( b_flat );
+ if( b_big )
{
- /* 'record' access-filter is not loaded, we open Save dialog */
- input_item_t *p_item = input_GetItem( p_input );
- if( !p_item )
- return;
-
- char *psz = input_item_GetURI( p_item );
- if( psz )
- THEDP->streamingDialog( NULL, psz, true );
+ tmpButton->setFixedSize( QSize( 32, 32 ) );
+ tmpButton->setIconSize( QSize( 26, 26 ) );
}
-#endif
}
}
-#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,
- bool b_fsCreation) :
- QFrame( _p_mi ), p_intf( _p_i )
+QFrame *AbstractController::discFrame()
{
- setSizePolicy( QSizePolicy::Preferred , QSizePolicy::Maximum );
-
- /** The main Slider **/
- slider = new InputSlider( Qt::Horizontal, NULL );
- /* 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 QToolButton;
- slowerButton->setAutoRaise( true );
- slowerButton->setMaximumSize( QSize( 26, 20 ) );
- slowerButton->setFocusPolicy( Qt::NoFocus );
-
- BUTTON_SET_ACT_I( slowerButton, "", slower, qtr( "Slower" ), slower() );
-
- fasterButton = new QToolButton;
- fasterButton->setAutoRaise( true );
- fasterButton->setMaximumSize( QSize( 26, 20 ) );
- fasterButton->setFocusPolicy( Qt::NoFocus );
-
- BUTTON_SET_ACT_I( fasterButton, "", faster, qtr( "Faster" ), faster() );
-
- /* advanced Controls handling */
- b_advancedVisible = b_advControls;
-
- advControls = new AdvControlsWidget( p_intf, b_fsCreation );
- if( !b_advancedVisible ) advControls->hide();
-
/** Disc and Menus handling */
- discFrame = new QWidget( this );
+ QFrame *discFrame = new QFrame( this );
QHBoxLayout *discLayout = new QHBoxLayout( discFrame );
- discLayout->setSpacing( 0 );
- discLayout->setMargin( 0 );
+ discLayout->setSpacing( 0 ); discLayout->setMargin( 0 );
- prevSectionButton = new QPushButton( discFrame );
- setupSmallButton( prevSectionButton );
+ QToolButton *prevSectionButton = new QToolButton( discFrame );
+ setupButton( prevSectionButton );
+ BUTTON_SET_BAR2( prevSectionButton, toolbar/dvd_prev,
+ qtr("Previous Chapter/Title" ) );
discLayout->addWidget( prevSectionButton );
- menuButton = new QPushButton( discFrame );
- setupSmallButton( menuButton );
+ QToolButton *menuButton = new QToolButton( discFrame );
+ setupButton( menuButton );
discLayout->addWidget( menuButton );
+ BUTTON_SET_BAR2( menuButton, toolbar/dvd_menu, qtr( "Menu" ) );
- nextSectionButton = new QPushButton( discFrame );
- setupSmallButton( nextSectionButton );
+ QToolButton *nextSectionButton = new QToolButton( discFrame );
+ setupButton( nextSectionButton );
discLayout->addWidget( nextSectionButton );
-
- BUTTON_SET_IMG( prevSectionButton, "", dvd_prev, "" );
- BUTTON_SET_IMG( nextSectionButton, "", dvd_next, "" );
- BUTTON_SET_IMG( menuButton, "", dvd_menu, qtr( "Menu" ) );
-
- discFrame->hide();
-
- /* Change the navigation button display when the IM navigation changes */
- CONNECT( THEMIM->getIM(), navigationChanged( int ),
- this, setNavigation( int ) );
+ BUTTON_SET_BAR2( nextSectionButton, toolbar/dvd_next,
+ qtr("Next Chapter/Title" ) );
+
+ /* Change the navigation button display when the IM
+ navigation changes */
+ CONNECT( THEMIM->getIM(), titleChanged( bool ),
+ discFrame, setVisible( bool ) );
+ CONNECT( THEMIM->getIM(), chapterChanged( bool ),
+ menuButton, setVisible( bool ) );
/* Changes the IM navigation when triggered on the nav buttons */
CONNECT( prevSectionButton, clicked(), THEMIM->getIM(),
- sectionPrev() );
+ sectionPrev() );
CONNECT( nextSectionButton, clicked(), THEMIM->getIM(),
- sectionNext() );
+ sectionNext() );
CONNECT( menuButton, clicked(), THEMIM->getIM(),
- sectionMenu() );
+ sectionMenu() );
+ connect( THEMIM->getIM(), SIGNAL( titleChanged( bool ) ),
+ this, SIGNAL( sizeChanged() ) );
+ return discFrame;
+}
+
+QFrame *AbstractController::telexFrame()
+{
/**
* Telextext QFrame
- * TODO: Merge with upper menu in a StackLayout
**/
- telexFrame = new QWidget( this );
+ QFrame *telexFrame = new QFrame;
QHBoxLayout *telexLayout = new QHBoxLayout( telexFrame );
- telexLayout->setSpacing( 0 );
- telexLayout->setMargin( 0 );
+ 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;
+ setupButton( telexOn );
+ BUTTON_SET_BAR2( telexOn, toolbar/tv, qtr( "Teletext Activation" ) );
+ telexOn->setEnabled( false );
+ telexOn->setCheckable( true );
- telexOn = new QPushButton;
- setupSmallButton( telexOn );
telexLayout->addWidget( telexOn );
- telexTransparent = new QPushButton;
- setupSmallButton( telexTransparent );
+ /* Teletext Activation and set */
+ CONNECT( telexOn, clicked( bool ),
+ THEMIM->getIM(), activateTeletext( bool ) );
+ CONNECT( THEMIM->getIM(), teletextPossible( bool ),
+ telexOn, setEnabled( bool ) );
+
+ /* Transparency button */
+ QToolButton *telexTransparent = new QToolButton;
+ setupButton( telexTransparent );
+ BUTTON_SET_BAR2( telexTransparent, toolbar/tvtelx,
+ qtr( "Toggle Transparency " ) );
+ telexTransparent->setEnabled( false );
+ telexTransparent->setCheckable( true );
telexLayout->addWidget( telexTransparent );
- b_telexTransparent = false;
- telexPage = new QSpinBox;
+ /* Transparency change and set */
+ CONNECT( telexTransparent, clicked( bool ),
+ THEMIM->getIM(), telexSetTransparency( bool ) );
+ CONNECT( THEMIM->getIM(), teletextTransparencyActivated( bool ),
+ telexTransparent, setChecked( bool ) );
+
+
+ /* Page setting */
+ QSpinBox *telexPage = new QSpinBox( telexFrame );
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, 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 );
+ telexLayout->addWidget( telexPage );
- BUTTON_SET_IMG( telexTransparent, "", tvtelx, 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 );
- sizePolicy.setHorizontalStretch( 0 );
- sizePolicy.setVerticalStretch( 0 );
-
- /* Play */
- playButton = new QPushButton;
- playButton->setSizePolicy( sizePolicy );
- playButton->setMaximumSize( QSize( 32, 32 ) );
- playButton->setMinimumSize( QSize( 32, 32 ) );
- playButton->setIconSize( QSize( 26, 26 ) );
- playButton->setFocusPolicy( Qt::NoFocus );
-
- /** Prev + Stop + Next Block **/
- 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 */
-
- BUTTON_SET_ACT_I( playButton, "", play_b, qtr( I_PLAY_TOOLTIP ), play() );
- BUTTON_SET_ACT_I( prevButton, "" , previous_b,
- qtr( "Previous media in the playlist" ), prev() );
- BUTTON_SET_ACT_I( nextButton, "", next_b,
- qtr( "Next media in the playlist" ), next() );
- BUTTON_SET_ACT_I( stopButton, "", stop_b, qtr( "Stop playback" ), stop() );
-
- /*
- * Other first Line buttons
- */
- /* */
- CONNECT( THEMIM->getIM(), voutChanged(bool), this, enableVideo(bool) );
-
- /** Fullscreen/Visualisation **/
- fullscreenButton = new QPushButton;
- BUTTON_SET_ACT_I( fullscreenButton, "", fullscreen,
- qtr( "Toggle the video in fullscreen" ), fullscreen() );
- setupSmallButton( fullscreenButton );
-
- if( !b_fsCreation )
- {
- /** Playlist Button **/
- playlistButton = new QPushButton;
- setupSmallButton( playlistButton );
- BUTTON_SET_IMG( playlistButton, "" , playlist, qtr( "Show playlist" ) );
- CONNECT( playlistButton, clicked(), _p_mi, togglePlaylist() );
-
- /** extended Settings **/
- extSettingsButton = new QPushButton;
- BUTTON_SET_ACT_I( extSettingsButton, "", extended,
- qtr( "Show extended settings" ), extSettings() );
- setupSmallButton( extSettingsButton );
- }
-
- /* Volume */
- hVolLabel = new VolumeClickHandler( p_intf, this );
-
- volMuteLabel = new QLabel;
- volMuteLabel->setPixmap( QPixmap( ":/volume-medium" ) );
- volMuteLabel->installEventFilter( hVolLabel );
-
- if( b_shiny )
- {
- volumeSlider = new SoundSlider( this,
- config_GetInt( p_intf, "volume-step" ),
- config_GetInt( p_intf, "qt-volume-complete" ),
- config_GetPsz( p_intf, "qt-slider-colours" ) );
- }
- else
- {
- volumeSlider = new QSlider( this );
- volumeSlider->setOrientation( Qt::Horizontal );
- }
- volumeSlider->setMaximumSize( QSize( 200, 40 ) );
- volumeSlider->setMinimumSize( QSize( 85, 30 ) );
- volumeSlider->setFocusPolicy( Qt::NoFocus );
-
- /* 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 */
- CONNECT( volumeSlider, valueChanged( int ), this, updateVolume( int ) );
- 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, 18 );
- controlLayout->addWidget( slowerButton, 0, 0 );
- controlLayout->addWidget( fasterButton, 0, 19 );
-
- controlLayout->addWidget( discFrame, 1, 8, 2, 3, Qt::AlignBottom );
- controlLayout->addWidget( telexFrame, 1, 8, 2, 5, Qt::AlignBottom );
-
- controlLayout->addWidget( playButton, 2, 0, 2, 2, Qt::AlignBottom );
- controlLayout->setColumnMinimumWidth( 2, 10 );
- controlLayout->setColumnStretch( 2, 0 );
-
- controlLayout->addLayout( controlButLayout, 3, 3, 1, 3, Qt::AlignBottom );
- /* Column 6 is unused */
- controlLayout->setColumnStretch( 6, 0 );
- controlLayout->setColumnStretch( 7, 0 );
- controlLayout->setColumnMinimumWidth( 7, 10 );
-
- controlLayout->addWidget( fullscreenButton, 3, 8, Qt::AlignBottom );
- controlLayout->addWidget( playlistButton, 3, 9, Qt::AlignBottom );
- controlLayout->addWidget( extSettingsButton, 3, 10, Qt::AlignBottom );
- controlLayout->setColumnStretch( 11, 0 ); /* telex alignment */
-
- controlLayout->setColumnStretch( 12, 0 );
- controlLayout->setColumnMinimumWidth( 12, 10 );
-
- controlLayout->addWidget( advControls, 3, 13, 1, 3, Qt::AlignBottom );
-
- controlLayout->setColumnStretch( 16, 10 );
- controlLayout->setColumnMinimumWidth( 16, 10 );
-
- controlLayout->addWidget( volMuteLabel, 3, 17, Qt::AlignBottom );
- controlLayout->addWidget( volumeSlider, 3, 18, 1 , 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;
- }
-}
-
-void ControlsWidget::enableTeletext( bool b_enable )
-{
- 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( ":/tvtelx" ) );
- telexTransparent->setToolTip( qtr( "Teletext" ) );
- b_telexTransparent = false;
- }
- else
- {
- telexTransparent->setIcon( QIcon( ":/tvtelx-trans" ) );
- telexTransparent->setToolTip( qtr( "Transparent" ) );
- b_telexTransparent = true;
- }
-}
+ /* Page change and set */
+ CONNECT( telexPage, valueChanged( int ),
+ THEMIM->getIM(), telexSetPage( int ) );
+ CONNECT( THEMIM->getIM(), newTelexPageSet( int ),
+ telexPage, setValue( int ) );
-void ControlsWidget::stop()
-{
- THEMIM->stop();
+ CONNECT( THEMIM->getIM(), teletextActivated( bool ), telexPage, setEnabled( bool ) );
+ CONNECT( THEMIM->getIM(), teletextActivated( bool ), telexTransparent, setEnabled( bool ) );
+ CONNECT( THEMIM->getIM(), teletextActivated( bool ), telexOn, setChecked( bool ) );
+ return telexFrame;
}
+#undef CONNECT_MAP
+#undef SET_MAPPING
+#undef CONNECT_MAP_SET
+#undef BUTTON_SET_BAR
+#undef BUTTON_SET_BAR2
+#undef ENABLE_ON_VIDEO
+#undef ENABLE_ON_INPUT
-void ControlsWidget::play()
-{
- if( THEPL->current.i_size == 0 )
- {
- /* The playlist is empty, open a file requester */
- THEDP->openFileDialog();
- setStatus( 0 );
- return;
- }
- THEMIM->togglePlayPause();
-}
-
-void ControlsWidget::prev()
+#include <QHBoxLayout>
+/*****************************
+ * DA Control Widget !
+ *****************************/
+ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
+ bool b_advControls,
+ QWidget *_parent ) :
+ AbstractController( _p_i, _parent )
{
- THEMIM->prev();
-}
+ /* advanced Controls handling */
+ b_advancedVisible = b_advControls;
+#if DEBUG_LAYOUT
+ setStyleSheet( " background: red ");
+#endif
-void ControlsWidget::next()
-{
- THEMIM->next();
-}
+ QVBoxLayout *controlLayout = new QVBoxLayout( this );
+ controlLayout->setContentsMargins( 4, 2, 4, 0 );
+ controlLayout->setSpacing( 0 );
+ QHBoxLayout *controlLayout1 = new QHBoxLayout;
+ controlLayout1->setSpacing( 0 ); controlLayout1->setMargin( 0 );
-void ControlsWidget::setNavigation( int navigation )
-{
-#define HELP_PCH N_( "Previous chapter" )
-#define HELP_NCH N_( "Next chapter" )
+ QString line1 = getSettings()->value( "MainToolbar1", MAIN_TB1_DEFAULT )
+ .toString();
+ parseAndCreate( line1, controlLayout1 );
- // 1 = chapter, 2 = title, 0 = no
- if( navigation == 0 )
- {
- discFrame->hide();
- } else if( navigation == 1 ) {
- prevSectionButton->setToolTip( qtr( HELP_PCH ) );
- nextSectionButton->setToolTip( qtr( HELP_NCH ) );
- menuButton->show();
- discFrame->show();
- } else {
- prevSectionButton->setToolTip( qtr( HELP_PCH ) );
- nextSectionButton->setToolTip( qtr( HELP_NCH ) );
- menuButton->hide();
- discFrame->show();
- }
-}
+ QHBoxLayout *controlLayout2 = new QHBoxLayout;
+ controlLayout2->setSpacing( 0 ); controlLayout2->setMargin( 0 );
+ QString line2 = getSettings()->value( "MainToolbar2", MAIN_TB2_DEFAULT )
+ .toString();
+ parseAndCreate( line2, controlLayout2 );
-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(":/volume-muted" ) );
- volMuteLabel->setToolTip( qtr( "Unmute" ) );
- return;
- }
+ if( !b_advancedVisible && advControls ) advControls->hide();
- if( i_sliderVolume < VOLUME_MAX / 3 )
- volMuteLabel->setPixmap( QPixmap( ":/volume-low" ) );
- else if( i_sliderVolume > (VOLUME_MAX * 2 / 3 ) )
- volMuteLabel->setPixmap( QPixmap( ":/volume-high" ) );
- else volMuteLabel->setPixmap( QPixmap( ":/volume-medium" ) );
- volMuteLabel->setToolTip( qtr( "Mute" ) );
+ controlLayout->addLayout( controlLayout1 );
+ controlLayout->addLayout( controlLayout2 );
}
-void ControlsWidget::updateVolume()
-{
- /* 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;
- }
-}
+ControlsWidget::~ControlsWidget()
+{}
-void ControlsWidget::updateInput()
+void ControlsWidget::toggleAdvanced()
{
- /* Activate the interface buttons according to the presence of the input */
- enableInput( THEMIM->getIM()->hasInput() );
- enableVideo( THEMIM->getIM()->hasVideo() );
-}
+ if( !advControls ) return;
-void ControlsWidget::setStatus( int status )
-{
- if( status == PLAYING_S ) /* Playing */
+ if( !b_advancedVisible )
{
- playButton->setIcon( QIcon( ":/pause_b" ) );
- playButton->setToolTip( qtr( "Pause the playback" ) );
+ advControls->show();
+ b_advancedVisible = true;
}
else
{
- playButton->setIcon( QIcon( ":/play_b" ) );
- playButton->setToolTip( qtr( I_PLAY_TOOLTIP ) );
- }
-}
-
-/**
- * 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)
- {
- var_SetBool( p_vout, "fullscreen", !var_GetBool( p_vout, "fullscreen" ) );
- vlc_object_release( p_vout );
+ advControls->hide();
+ b_advancedVisible = false;
}
+ emit advancedControlsToggled( b_advancedVisible );
}
-void ControlsWidget::extSettings()
-{
- THEDP->extendedDialog();
-}
-
-void ControlsWidget::slower()
-{
- THEMIM->getIM()->slower();
-}
-
-void ControlsWidget::faster()
+AdvControlsWidget::AdvControlsWidget( intf_thread_t *_p_i, QWidget *_parent ) :
+ AbstractController( _p_i, _parent )
{
- THEMIM->getIM()->faster();
-}
+ controlLayout = new QHBoxLayout( this );
+ controlLayout->setMargin( 0 );
+ controlLayout->setSpacing( 0 );
+#if DEBUG_LAYOUT
+ setStyleSheet( " background: orange ");
+#endif
-void ControlsWidget::enableInput( bool enable )
-{
- slowerButton->setEnabled( enable );
- slider->setEnabled( enable );
- slider->setSliderPosition ( 0 );
- fasterButton->setEnabled( enable );
- /* Advanced Buttons too */
- advControls->enableInput( enable );
+ QString line = getSettings()->value( "AdvToolbar", ADV_TB_DEFAULT )
+ .toString();
+ parseAndCreate( line, controlLayout );
}
-void ControlsWidget::enableVideo( bool enable )
+InputControlsWidget::InputControlsWidget( intf_thread_t *_p_i, QWidget *_parent ) :
+ AbstractController( _p_i, _parent )
{
- // TODO Later make the fullscreenButton toggle Visualisation and so on.
- fullscreenButton->setEnabled( enable );
-
- /* Advanced Buttons too */
- advControls->enableVideo( enable );
-}
+ controlLayout = new QHBoxLayout( this );
+ controlLayout->setMargin( 0 );
+ controlLayout->setSpacing( 0 );
+#if DEBUG_LAYOUT
+ setStyleSheet( " background: green ");
+#endif
-void ControlsWidget::toggleAdvanced()
-{
- if( advControls && !b_advancedVisible )
- {
- advControls->show();
- b_advancedVisible = true;
- }
- else
- {
- advControls->hide();
- b_advancedVisible = false;
- }
- emit advancedControlsToggled( b_advancedVisible );
+ QString line = getSettings()->value( "InputToolbar", INPT_TB_DEFAULT ).toString();
+ parseAndCreate( line, controlLayout );
}
-
/**********************************************************************
* Fullscrenn control widget
**********************************************************************/
-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 ), p_vout(NULL)
+FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i, QWidget *_parent )
+ : AbstractController( _p_i, _parent )
{
+ i_mouse_last_x = -1;
+ i_mouse_last_y = -1;
+ b_mouse_over = false;
i_mouse_last_move_x = -1;
i_mouse_last_move_y = -1;
+#if HAVE_TRANSPARENCY
+ b_slow_hide_begin = false;
+ i_slow_hide_timeout = 1;
+#endif
+ b_fullscreen = false;
+ i_hide_timeout = 1;
+ i_screennumber = -1;
+
+ vout.clear();
setWindowFlags( Qt::ToolTip );
setMinimumWidth( 600 );
setFrameStyle( QFrame::Sunken );
setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum );
- QGridLayout *fsLayout = new QGridLayout( this );
- fsLayout->setLayoutMargins( 5, 2, 5, 2, 5 );
+ QVBoxLayout *controlLayout2 = new QVBoxLayout( this );
+ controlLayout2->setContentsMargins( 4, 6, 4, 2 );
/* First line */
- slider->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum);
- fsLayout->addWidget( slowerButton, 0, 0 );
- fsLayout->addWidget( slider, 0, 1, 1, 11 );
- fsLayout->addWidget( fasterButton, 0, 12 );
-
- /* Second line */
- fsLayout->addWidget( playButton, 1, 0, 1, 2 );
- fsLayout->addLayout( controlButLayout, 1, 2 );
-
- fsLayout->addWidget( discFrame, 1, 3 );
- fsLayout->addWidget( telexFrame, 1, 4 );
- fsLayout->addWidget( fullscreenButton, 1, 5 );
- fsLayout->addWidget( advControls, 1, 6, Qt::AlignVCenter );
+ InputControlsWidget *inputC = new InputControlsWidget( p_intf, this );
+ controlLayout2->addWidget( inputC );
- fsLayout->setColumnStretch( 7, 10 );
-
- TimeLabel *timeLabel = new TimeLabel( p_intf );
-
- fsLayout->addWidget( timeLabel, 1, 8 );
- fsLayout->addWidget( volMuteLabel, 1, 9 );
- fsLayout->addWidget( volumeSlider, 1, 10, 1, 2 );
+ controlLayout = new QHBoxLayout;
+ QString line = getSettings()->value( "MainWindow/FSCtoolbar", FSC_TB_DEFAULT ).toString();
+ parseAndCreate( line, controlLayout );
+ controlLayout2->addLayout( controlLayout );
/* hiding timer */
p_hideTimer = new QTimer( this );
CONNECT( p_slowHideTimer, timeout(), this, slowHideFSC() );
#endif
- adjustSize (); /* need to get real width and height for moving */
-
- /* center down */
- QWidget * p_desktop = QApplication::desktop()->screen(
- QApplication::desktop()->screenNumber( _p_mi ) );
-
- QPoint pos = QPoint( p_desktop->width() / 2 - width() / 2,
- p_desktop->height() - height() );
+ vlc_mutex_init_recursive( &lock );
- getSettings()->beginGroup( "FullScreen" );
- move( getSettings()->value( "pos", pos ).toPoint() );
- getSettings()->endGroup();
+ CONNECT( THEMIM->getIM(), voutListChanged( vout_thread_t **, int ),
+ this, setVoutList( vout_thread_t **, int ) );
-#ifdef WIN32TRICK
- setWindowOpacity( 0.0 );
- b_fscHidden = true;
- adjustSize();
- show();
-#endif
+ /* 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" );
+ if( number == -1 || number > QApplication::desktop()->numScreens() )
+ number = QApplication::desktop()->screenNumber( p_intf->p_sys->p_mi );
- fullscreenButton->setIcon( QIcon( ":/defullscreen" ) );
+ QRect rect = QApplication::desktop()->screenGeometry( number );
+ if( rect == rect1 && rect.contains( pos1, true ) )
+ {
+ move( pos1 );
+ i_screennumber = number;
+ screenRes = QApplication::desktop()->screenGeometry(number);
+ }
+ else
+ {
+ centerFSC( number );
+ }
- vlc_mutex_init_recursive( &lock );
}
FullscreenControllerWidget::~FullscreenControllerWidget()
{
- getSettings()->beginGroup( "FullScreen" );
- getSettings()->setValue( "pos", pos() );
- getSettings()->endGroup();
- detachVout();
+ QPoint pos1 = pos();
+ QRect rect1 = QApplication::desktop()->screenGeometry( pos1 );
+ getSettings()->setValue( "FullScreen/pos", pos1 );
+ getSettings()->setValue( "FullScreen/screen", rect1 );
+
+ setVoutList( NULL, 0 );
vlc_mutex_destroy( &lock );
}
+void FullscreenControllerWidget::centerFSC( int number )
+{
+ screenRes = QApplication::desktop()->screenGeometry(number);
+
+ /* screen has changed, calculate new position */
+ QPoint pos = QPoint( screenRes.x() + (screenRes.width() / 2) - (sizeHint().width() / 2),
+ screenRes.y() + screenRes.height() - sizeHint().height());
+ move( pos );
+
+ i_screennumber = number;
+}
+
/**
* Show fullscreen controller
*/
void FullscreenControllerWidget::showFSC()
{
adjustSize();
-#ifdef WIN32TRICK
- // after quiting and going to fs, we need to call show()
- if( isHidden() )
- show();
- if( b_fscHidden )
+ int number = QApplication::desktop()->screenNumber( p_intf->p_sys->p_mi );
+
+ if( number != i_screennumber ||
+ screenRes != QApplication::desktop()->screenGeometry(number) )
{
- b_fscHidden = false;
- setWindowOpacity( 1.0 );
+ centerFSC( number );
+ msg_Dbg( p_intf, "Recentering the Fullscreen Controller" );
}
-#else
- show();
-#endif
#if HAVE_TRANSPARENCY
- setWindowOpacity( DEFAULT_OPACITY );
+ setWindowOpacity( config_GetFloat( p_intf, "qt-fs-opacity" ) );
#endif
-}
-/**
- * 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
- b_fscHidden = true;
- setWindowOpacity( 0.0 ); // simulate hidding
-#else
- hide();
-#endif
+ show();
}
/**
}
else
{
-#ifdef WIN32TRICK
- if ( windowOpacity() > 0.0 && !b_fscHidden )
-#else
if ( windowOpacity() > 0.0 )
-#endif
{
/* we should use 0.01 because of 100 pieces ^^^
but than it cannt be done in time */
switch( event->type() )
{
+ /* This is used when the 'i' hotkey is used, to force quick toggle */
case FullscreenControlToggle_Type:
vlc_mutex_lock( &lock );
b_fs = b_fullscreen;
vlc_mutex_unlock( &lock );
+
if( b_fs )
-#ifdef WIN32TRICK
- if( b_fscHidden )
-#else
+ {
if( isHidden() )
-#endif
{
p_hideTimer->stop();
showFSC();
}
else
hideFSC();
+ }
break;
+ /* Event called to Show the FSC on mouseChanged() */
case FullscreenControlShow_Type:
vlc_mutex_lock( &lock );
b_fs = b_fullscreen;
vlc_mutex_unlock( &lock );
-#ifdef WIN32TRICK
- if( b_fs && b_fscHidden ) // FIXME I am not sure about that one
-#else
- if( b_fs && !isVisible() ) // FIXME I am not sure about that one
-#endif
+ if( b_fs )
showFSC();
+
break;
- case FullscreenControlHide_Type:
- hideFSC();
- break;
+ /* Start the timer to hide later, called usually with above case */
case FullscreenControlPlanHide_Type:
if( !b_mouse_over ) // Only if the mouse is not over FSC
planHideFSC();
break;
+ /* Hide */
+ case FullscreenControlHide_Type:
+ hideFSC();
+ break;
+ default:
+ break;
}
}
*/
void FullscreenControllerWidget::mouseMoveEvent( QMouseEvent *event )
{
- if ( event->buttons() == Qt::LeftButton )
+ if( event->buttons() == Qt::LeftButton )
{
+ if( i_mouse_last_x == -1 || i_mouse_last_y == -1 )
+ return;
+
int i_moveX = event->globalX() - i_mouse_last_x;
int i_moveY = event->globalY() - i_mouse_last_y;
{
i_mouse_last_x = event->globalX();
i_mouse_last_y = event->globalY();
+ event->accept();
+}
+
+void FullscreenControllerWidget::mouseReleaseEvent( QMouseEvent *event )
+{
+ i_mouse_last_x = -1;
+ i_mouse_last_y = -1;
+ event->accept();
}
/**
p_hideTimer->stop();
#if HAVE_TRANSPARENCY
p_slowHideTimer->stop();
+ setWindowOpacity( DEFAULT_OPACITY );
#endif
+ event->accept();
}
/**
planHideFSC();
b_mouse_over = false;
+ event->accept();
}
/**
* 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 )
- {
- var_SetInteger( p_intf->p_libvlc, "key-pressed", i_vlck );
- event->accept();
- }
- else
- event->ignore();
+ emit keyPressed( event );
}
/* */
vlc_value_t new_val, void *data )
{
vout_thread_t *p_vout = (vout_thread_t *) vlc_object;
+
msg_Dbg( p_vout, "Qt4: Fullscreen state changed" );
FullscreenControllerWidget *p_fs = (FullscreenControllerWidget *)data;
- p_fs->fullscreenChanged( p_vout, new_val.b_bool,
- var_GetInteger( p_vout, "mouse-hide-timeout" ) );
+ p_fs->fullscreenChanged( p_vout, new_val.b_bool, var_GetInteger( p_vout, "mouse-hide-timeout" ) );
return VLC_SUCCESS;
}
vlc_value_t old_val, vlc_value_t new_val,
void *data )
{
+ vout_thread_t *p_vout = (vout_thread_t *)vlc_object;
FullscreenControllerWidget *p_fs = (FullscreenControllerWidget *)data;
- int i_mousex, i_mousey;
- bool b_toShow = false;
-
/* Get the value from the Vout - Trust the vout more than Qt */
- i_mousex = var_GetInteger( p_fs->p_vout, "mouse-x" );
- i_mousey = var_GetInteger( p_fs->p_vout, "mouse-y" );
-
- /* First time */
- if( p_fs->i_mouse_last_move_x == -1 || p_fs->i_mouse_last_move_y == -1 )
- {
- p_fs->i_mouse_last_move_x = i_mousex;
- p_fs->i_mouse_last_move_y = i_mousey;
- b_toShow = true;
- }
- /* All other times */
- else
- {
- /* Trigger only if move > 3 px dans une direction */
- if( abs( p_fs->i_mouse_last_move_x - i_mousex ) > 2 ||
- abs( p_fs->i_mouse_last_move_y - i_mousey ) > 2 )
- {
- b_toShow = true;
- p_fs->i_mouse_last_move_x = i_mousex;
- p_fs->i_mouse_last_move_y = i_mousey;
- }
- }
+ const int i_mousex = var_GetInteger( p_vout, "mouse-x" );
+ const int i_mousey = var_GetInteger( p_vout, "mouse-y" );
- if( b_toShow )
- {
- /* Show event */
- IMEvent *eShow = new IMEvent( FullscreenControlShow_Type, 0 );
- QApplication::postEvent( p_fs, static_cast<QEvent *>(eShow) );
-
- /* Plan hide event */
- IMEvent *eHide = new IMEvent( FullscreenControlPlanHide_Type, 0 );
- QApplication::postEvent( p_fs, static_cast<QEvent *>(eHide) );
- }
+ p_fs->mouseChanged( p_vout, i_mousex, i_mousey );
return VLC_SUCCESS;
}
-
/**
- * It is called when video start
+ * It is call to update the list of vout handled by the fullscreen controller
*/
-void FullscreenControllerWidget::attachVout( vout_thread_t *p_nvout )
+void FullscreenControllerWidget::setVoutList( vout_thread_t **pp_vout, int i_vout )
{
- assert( p_nvout && !p_vout );
+ QList<vout_thread_t*> del;
+ QList<vout_thread_t*> add;
- p_vout = p_nvout;
+ QList<vout_thread_t*> set;
- msg_Dbg( p_vout, "Qt FS: Attaching Vout" );
- vlc_mutex_lock( &lock );
+ /* */
+ for( int i = 0; i < i_vout; i++ )
+ set += pp_vout[i];
- 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" ) );
+ /* Vout to remove */
+ vlc_mutex_lock( &lock );
+ foreach( vout_thread_t *p_vout, vout )
+ {
+ if( !set.contains( p_vout ) )
+ del += p_vout;
+ }
vlc_mutex_unlock( &lock );
-}
-/**
- * It is called after turn off video.
- */
-void FullscreenControllerWidget::detachVout()
-{
- if( p_vout )
+
+ foreach( vout_thread_t *p_vout, del )
{
- msg_Dbg( p_vout, "Qt FS: Detaching Vout" );
var_DelCallback( p_vout, "fullscreen",
- FullscreenControllerWidgetFullscreenChanged, this );
+ FullscreenControllerWidgetFullscreenChanged, this );
vlc_mutex_lock( &lock );
fullscreenChanged( p_vout, false, 0 );
+ vout.removeAll( p_vout );
vlc_mutex_unlock( &lock );
- p_vout = NULL;
+
+ vlc_object_release( VLC_OBJECT(p_vout) );
}
-}
+ /* Vout to track */
+ vlc_mutex_lock( &lock );
+ foreach( vout_thread_t *p_vout, set )
+ {
+ if( !vout.contains( p_vout ) )
+ add += p_vout;
+ }
+ vlc_mutex_unlock( &lock );
+
+ foreach( vout_thread_t *p_vout, add )
+ {
+ vlc_object_hold( VLC_OBJECT(p_vout) );
+
+ vlc_mutex_lock( &lock );
+ vout.append( p_vout );
+ 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 );
+ }
+}
/**
* Register and unregister callback for mouse moving
*/
void FullscreenControllerWidget::fullscreenChanged( vout_thread_t *p_vout,
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 );
/* Force fs hidding */
IMEvent *eHide = new IMEvent( FullscreenControlHide_Type, 0 );
- QApplication::postEvent( this, static_cast<QEvent *>(eHide) );
+ QApplication::postEvent( this, eHide );
}
vlc_mutex_unlock( &lock );
}
+/**
+ * Mouse change callback (show/hide the controller on mouse movement)
+ */
+void FullscreenControllerWidget::mouseChanged( vout_thread_t *p_vout, int i_mousex, int i_mousey )
+{
+ bool b_toShow;
+
+ /* FIXME - multiple vout (ie multiple mouse position ?) and thread safety if multiple vout ? */
+
+ b_toShow = false;
+ if( ( i_mouse_last_move_x == -1 || i_mouse_last_move_y == -1 ) ||
+ ( abs( i_mouse_last_move_x - i_mousex ) > 2 ||
+ abs( i_mouse_last_move_y - i_mousey ) > 2 ) )
+ {
+ i_mouse_last_move_x = i_mousex;
+ i_mouse_last_move_y = i_mousey;
+ b_toShow = true;
+ }
+
+ if( b_toShow )
+ {
+ /* Show event */
+ IMEvent *eShow = new IMEvent( FullscreenControlShow_Type, 0 );
+ QApplication::postEvent( this, eShow );
+
+ /* Plan hide event */
+ IMEvent *eHide = new IMEvent( FullscreenControlPlanHide_Type, 0 );
+ QApplication::postEvent( this, eHide );
+ }
+}
+
projects / vlc / blobdiff