/*****************************************************************************
* Controller.cpp : Controller for the main interface
****************************************************************************
- * Copyright (C) 2006-2008 the VideoLAN team
+ * Copyright (C) 2006-2009 the VideoLAN team
* $Id$
*
* Authors: Jean-Baptiste Kempf <jb@videolan.org>
#include "dialogs_provider.hpp" /* Opening Dialogs */
#include "input_manager.hpp"
+#include "actions_manager.hpp"
#include "util/input_slider.hpp" /* InputSlider */
#include "util/customwidgets.hpp" /* qEventToKey */
#include <QSignalMapper>
#include <QTimer>
+//#define DEBUG_LAYOUT 1
+
/**********************************************************************
* TEH controls
**********************************************************************/
/* Main action provider */
toolbarActionsMapper = new QSignalMapper( this );
- CONNECT( toolbarActionsMapper, mapped( int ), this, doAction( int ) );
+ CONNECT( toolbarActionsMapper, mapped( int ),
+ ActionsManager::getInstance( p_intf ), doAction( int ) );
CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) );
}
emit inputIsRecordable( b_hasInput &&
var_GetBool( THEMIM->getInput(), "can-record" ) );
+
+ emit inputIsTrickPlayable( b_hasInput &&
+ var_GetBool( THEMIM->getInput(), "can-rewind" ) );
}
/* Generic button setup */
/* Open the generic config line for the toolbar, parse it
* and create the widgets accordingly */
-void AbstractController::parseAndCreate( QString config,
+void AbstractController::parseAndCreate( const QString& config,
QBoxLayout *controlLayout )
{
QStringList list = config.split( ";", QString::SkipEmptyParts ) ;
/* Special case for SPACERS, who aren't QWidgets */
if( i_type == WIDGET_SPACER )
{
- controlLayout->insertSpacing( i_index, 16 );
+ controlLayout->insertSpacing( i_index, 12 );
return;
}
if( i_type == WIDGET_SPACER_EXTEND )
{
- controlLayout->insertStretch( i_index, 16 );
+ controlLayout->insertStretch( i_index, 12 );
return;
}
CONNECT_MAP( a ); \
SET_MAPPING( a, b );
#define BUTTON_SET_BAR( a_button ) \
- a_button->setToolTip( tooltipL[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? */
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 )
{
- bool b_flat = options & WIDGET_FLAT;
- bool b_big = options & WIDGET_BIG;
+ 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 )
}
break;
case STOP_BUTTON:{
- QToolButton *stopButton = new QToolButton;
- setupButton( stopButton );
- CONNECT_MAP_SET( stopButton, STOP_ACTION );
- BUTTON_SET_BAR( stopButton );
- widget = stopButton;
+ NORMAL_BUTTON( STOP );
}
break;
case OPEN_BUTTON:{
- QToolButton *openButton = new QToolButton;
- setupButton( openButton );
- CONNECT_MAP_SET( openButton, OPEN_ACTION );
- BUTTON_SET_BAR( openButton );
- widget = openButton;
+ NORMAL_BUTTON( OPEN );
}
break;
case PREVIOUS_BUTTON:{
- QToolButton *prevButton = new QToolButton;
- setupButton( prevButton );
- CONNECT_MAP_SET( prevButton, PREVIOUS_ACTION );
- BUTTON_SET_BAR( prevButton );
- widget = prevButton;
+ NORMAL_BUTTON( PREVIOUS );
}
break;
- case NEXT_BUTTON:
- {
- QToolButton *nextButton = new QToolButton;
- setupButton( nextButton );
- CONNECT_MAP_SET( nextButton, NEXT_ACTION );
- BUTTON_SET_BAR( nextButton );
- widget = nextButton;
+ case NEXT_BUTTON: {
+ NORMAL_BUTTON( NEXT );
}
break;
case SLOWER_BUTTON:{
- QToolButton *slowerButton = new QToolButton;
- setupButton( slowerButton );
- CONNECT_MAP_SET( slowerButton, SLOWER_ACTION );
- BUTTON_SET_BAR( slowerButton );
- ENABLE_ON_INPUT( slowerButton );
- widget = slowerButton;
+ NORMAL_BUTTON( SLOWER );
+ ENABLE_ON_INPUT( SLOWERButton );
}
break;
case FASTER_BUTTON:{
- QToolButton *fasterButton = new QToolButton;
- setupButton( fasterButton );
- CONNECT_MAP_SET( fasterButton, FASTER_ACTION );
- BUTTON_SET_BAR( fasterButton );
- ENABLE_ON_INPUT( fasterButton );
- widget = fasterButton;
+ NORMAL_BUTTON( FASTER );
+ ENABLE_ON_INPUT( FASTERButton );
}
break;
case FRAME_BUTTON: {
- QToolButton *frameButton = new QToolButton;
- setupButton( frameButton );
- CONNECT_MAP_SET( frameButton, FRAME_ACTION );
- BUTTON_SET_BAR( frameButton );
- ENABLE_ON_VIDEO( frameButton );
- widget = frameButton;
+ NORMAL_BUTTON( FRAME );
+ ENABLE_ON_VIDEO( FRAMEButton );
}
break;
- case FULLSCREEN_BUTTON:{
- QToolButton *fullscreenButton = new QToolButton;
- setupButton( fullscreenButton );
- CONNECT_MAP_SET( fullscreenButton, FULLSCREEN_ACTION );
- BUTTON_SET_BAR( fullscreenButton );
- ENABLE_ON_VIDEO( fullscreenButton );
- widget = fullscreenButton;
- }
- break;
- case DEFULLSCREEN_BUTTON:{
- QToolButton *fullscreenButton = new QToolButton;
- setupButton( fullscreenButton );
- CONNECT_MAP_SET( fullscreenButton, FULLSCREEN_ACTION );
- BUTTON_SET_BAR( fullscreenButton )
- ENABLE_ON_VIDEO( fullscreenButton );
- widget = fullscreenButton;
+ case FULLSCREEN_BUTTON:
+ case DEFULLSCREEN_BUTTON:
+ {
+ NORMAL_BUTTON( FULLSCREEN );
+ ENABLE_ON_VIDEO( FULLSCREENButton );
}
break;
case EXTENDED_BUTTON:{
- QToolButton *extSettingsButton = new QToolButton;
- setupButton( extSettingsButton );
- CONNECT_MAP_SET( extSettingsButton, EXTENDED_ACTION );
- BUTTON_SET_BAR( extSettingsButton )
- widget = extSettingsButton;
+ NORMAL_BUTTON( EXTENDED );
}
break;
case PLAYLIST_BUTTON:{
- QToolButton *playlistButton = new QToolButton;
- setupButton( playlistButton );
- CONNECT_MAP_SET( playlistButton, PLAYLIST_ACTION );
- BUTTON_SET_BAR( playlistButton );
- widget = playlistButton;
+ NORMAL_BUTTON( PLAYLIST );
}
break;
case SNAPSHOT_BUTTON:{
- QToolButton *snapshotButton = new QToolButton;
- setupButton( snapshotButton );
- CONNECT_MAP_SET( snapshotButton, SNAPSHOT_ACTION );
- BUTTON_SET_BAR( snapshotButton );
- ENABLE_ON_VIDEO( snapshotButton );
- widget = snapshotButton;
+ NORMAL_BUTTON( SNAPSHOT );
+ ENABLE_ON_VIDEO( SNAPSHOTButton );
}
break;
case RECORD_BUTTON:{
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 );
widget = telexFrame();
widget->hide();
break;
+ case VOLUME_SPECIAL:
+ b_special = true;
case VOLUME:
{
- SoundWidget *snd = new SoundWidget( this, p_intf, b_shiny );
+ SoundWidget *snd = new SoundWidget( this, p_intf, b_shiny, b_special );
widget = snd;
}
break;
setupButton( reverseButton );
CONNECT_MAP_SET( reverseButton, REVERSE_ACTION );
BUTTON_SET_BAR( reverseButton );
- ENABLE_ON_INPUT( 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: {
- QToolButton *skipBakButton = new QToolButton;
- setupButton( skipBakButton );
- CONNECT_MAP_SET( skipBakButton, SKIP_BACK_ACTION );
- BUTTON_SET_BAR( skipBakButton );
- ENABLE_ON_INPUT( skipBakButton );
- widget = skipBakButton;
+ NORMAL_BUTTON( SKIP_BACK );
+ ENABLE_ON_INPUT( SKIP_BACKButton );
}
break;
case SKIP_FW_BUTTON: {
- QToolButton *skipFwButton = new QToolButton;
- setupButton( skipFwButton );
- CONNECT_MAP_SET( skipFwButton, SKIP_FW_ACTION );
- BUTTON_SET_BAR( skipFwButton );
- ENABLE_ON_INPUT( skipFwButton );
- widget = skipFwButton;
+ 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:
/* Customize Buttons */
if( b_flat || b_big )
{
- QToolButton *tmpButton = qobject_cast<QToolButton *>(widget);
- if( tmpButton )
+ QFrame *frame = qobject_cast<QFrame *>(widget);
+ if( frame )
{
- if( b_flat )
- tmpButton->setAutoRaise( b_flat );
- if( b_big )
- {
- tmpButton->setFixedSize( QSize( 32, 32 ) );
- tmpButton->setIconSize( QSize( 26, 26 ) );
- }
+ 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 AbstractController::applyAttributes( QToolButton *tmpButton, bool b_flat, bool b_big )
+{
+ if( tmpButton )
+ {
+ if( b_flat )
+ tmpButton->setAutoRaise( b_flat );
+ if( b_big )
+ {
+ tmpButton->setFixedSize( QSize( 32, 32 ) );
+ tmpButton->setIconSize( QSize( 26, 26 ) );
+ }
+ }
+}
QFrame *AbstractController::discFrame()
{
QToolButton *prevSectionButton = new QToolButton( discFrame );
setupButton( prevSectionButton );
- BUTTON_SET_BAR2( prevSectionButton, dvd_prev,
+ BUTTON_SET_BAR2( prevSectionButton, toolbar/dvd_prev,
qtr("Previous Chapter/Title" ) );
discLayout->addWidget( prevSectionButton );
QToolButton *menuButton = new QToolButton( discFrame );
setupButton( menuButton );
discLayout->addWidget( menuButton );
- BUTTON_SET_BAR2( menuButton, dvd_menu, qtr( "Menu" ) );
+ BUTTON_SET_BAR2( menuButton, toolbar/dvd_menu, qtr( "Menu" ) );
QToolButton *nextSectionButton = new QToolButton( discFrame );
setupButton( nextSectionButton );
discLayout->addWidget( nextSectionButton );
- BUTTON_SET_BAR2( nextSectionButton, dvd_next,
+ BUTTON_SET_BAR2( nextSectionButton, toolbar/dvd_next,
qtr("Next Chapter/Title" ) );
/* Change the navigation button display when the IM
sectionNext() );
CONNECT( menuButton, clicked(), THEMIM->getIM(),
sectionMenu() );
+ connect( THEMIM->getIM(), SIGNAL( titleChanged( bool ) ),
+ this, SIGNAL( sizeChanged() ) );
return discFrame;
}
/**
* Telextext QFrame
**/
- TeletextController *telexFrame = new TeletextController;
+ QFrame *telexFrame = new QFrame;
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;
- telexFrame->telexOn = telexOn;
setupButton( telexOn );
- BUTTON_SET_BAR2( telexOn, tv, qtr( "Teletext Activation" ) );
+ BUTTON_SET_BAR2( telexOn, toolbar/tv, qtr( "Teletext Activation" ) );
+ telexOn->setEnabled( false );
+ telexOn->setCheckable( true );
+
telexLayout->addWidget( telexOn );
/* Teletext Activation and set */
CONNECT( telexOn, clicked( bool ),
THEMIM->getIM(), activateTeletext( bool ) );
- CONNECT( THEMIM->getIM(), teletextActivated( bool ),
- telexFrame, enableTeletextButtons( bool ) );
-
+ CONNECT( THEMIM->getIM(), teletextPossible( bool ),
+ telexOn, setEnabled( bool ) );
/* Transparency button */
QToolButton *telexTransparent = new QToolButton;
- telexFrame->telexTransparent = telexTransparent;
setupButton( telexTransparent );
- BUTTON_SET_BAR2( telexTransparent, tvtelx,
+ BUTTON_SET_BAR2( telexTransparent, toolbar/tvtelx,
qtr( "Toggle Transparency " ) );
telexTransparent->setEnabled( false );
+ telexTransparent->setCheckable( true );
telexLayout->addWidget( telexTransparent );
/* Transparency change and set */
CONNECT( telexTransparent, clicked( bool ),
THEMIM->getIM(), telexSetTransparency( bool ) );
CONNECT( THEMIM->getIM(), teletextTransparencyActivated( bool ),
- telexFrame, toggleTeletextTransparency( bool ) );
+ telexTransparent, setChecked( bool ) );
/* Page setting */
- QSpinBox *telexPage = new QSpinBox;
- telexFrame->telexPage = telexPage;
+ QSpinBox *telexPage = new QSpinBox( telexFrame );
telexPage->setRange( 0, 999 );
telexPage->setValue( 100 );
telexPage->setAccelerated( true );
CONNECT( THEMIM->getIM(), newTelexPageSet( int ),
telexPage, setValue( int ) );
+ 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
-//* Actions */
-void AbstractController::doAction( int id_action )
-{
- switch( id_action )
- {
- case PLAY_ACTION:
- play(); break;
- case PREVIOUS_ACTION:
- prev(); break;
- case NEXT_ACTION:
- next(); break;
- case STOP_ACTION:
- stop(); break;
- case SLOWER_ACTION:
- slower(); break;
- case FASTER_ACTION:
- faster(); break;
- case FULLSCREEN_ACTION:
- fullscreen(); break;
- case EXTENDED_ACTION:
- extSettings(); break;
- case PLAYLIST_ACTION:
- playlist(); break;
- case SNAPSHOT_ACTION:
- snapshot(); break;
- case RECORD_ACTION:
- record(); break;
- case ATOB_ACTION:
- THEMIM->getIM()->setAtoB(); break;
- case FRAME_ACTION:
- frame(); break;
- case REVERSE_ACTION:
- reverse(); break;
- case SKIP_BACK_ACTION:
- var_SetInteger( p_intf->p_libvlc, "key-pressed",
- ACTIONID_JUMP_BACKWARD_SHORT );
- break;
- case SKIP_FW_ACTION:
- var_SetInteger( p_intf->p_libvlc, "key-pressed",
- ACTIONID_JUMP_FORWARD_SHORT );
- break;
- default:
- msg_Dbg( p_intf, "Action: %i", id_action );
- break;
- }
-}
-
-void AbstractController::stop()
-{
- THEMIM->stop();
-}
-
-void AbstractController::play()
-{
- if( THEPL->current.i_size == 0 )
- {
- /* The playlist is empty, open a file requester */
- THEDP->openFileDialog();
- return;
- }
- THEMIM->togglePlayPause();
-}
-
-void AbstractController::prev()
-{
- THEMIM->prev();
-}
-
-void AbstractController::next()
-{
- THEMIM->next();
-}
-
-/**
- * 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 AbstractController::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 );
- }
-}
-
-void AbstractController::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 );
- vlc_object_release( p_vout );
- }
-}
-
-void AbstractController::extSettings()
-{
- THEDP->extendedDialog();
-}
-
-void AbstractController::reverse()
-{
- THEMIM->getIM()->reverse();
-}
-
-void AbstractController::slower()
-{
- THEMIM->getIM()->slower();
-}
-
-void AbstractController::faster()
-{
- THEMIM->getIM()->faster();
-}
-
-void AbstractController::playlist()
-{
- if( p_intf->p_sys->p_mi ) p_intf->p_sys->p_mi->togglePlaylist();
-}
-
-void AbstractController::record()
-{
- input_thread_t *p_input = THEMIM->getInput();
- if( p_input )
- {
- /* 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
- {
- /* '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 );
- }
-#endif
- }
-}
-
-void AbstractController::frame()
-{
- input_thread_t *p_input = THEMIM->getInput();
- if( p_input )
- var_SetVoid( p_input, "frame-next" );
-}
-
#include <QHBoxLayout>
/*****************************
* DA Control Widget !
QWidget *_parent ) :
AbstractController( _p_i, _parent )
{
- setSizePolicy( QSizePolicy::Preferred , QSizePolicy::Maximum );
-
/* advanced Controls handling */
b_advancedVisible = b_advControls;
+#if DEBUG_LAYOUT
+ setStyleSheet( " background: red ");
+#endif
QVBoxLayout *controlLayout = new QVBoxLayout( this );
- controlLayout->setLayoutMargins( 6, 4, 6, 2, 5 );
+ controlLayout->setContentsMargins( 4, 2, 4, 0 );
controlLayout->setSpacing( 0 );
QHBoxLayout *controlLayout1 = new QHBoxLayout;
- controlLayout1->setSpacing( 0 );
+ controlLayout1->setSpacing( 0 ); controlLayout1->setMargin( 0 );
- QString line1 = getSettings()->value( "MainWindow/MainToolbar1",
- "64;36;37;38;65").toString();
+ QString line1 = getSettings()->value( "MainToolbar1", MAIN_TB1_DEFAULT )
+ .toString();
parseAndCreate( line1, controlLayout1 );
- /* QString line2 = QString( "%1-2;%2;%3;%4;%5;%6;%6;%7;%8;%9;%6;%10;%11-4")
- .arg( PLAY_BUTTON ) .arg( WIDGET_SPACER )
- .arg( PREVIOUS_BUTTON ) .arg( STOP_BUTTON )
- .arg( NEXT_BUTTON ) .arg( WIDGET_SPACER )
- .arg( FULLSCREEN_BUTTON ) .arg( PLAYLIST_BUTTON )
- .arg( EXTENDED_BUTTON ) .arg( WIDGET_SPACER_EXTEND )
- .arg( VOLUME );
- msg_Dbg( p_intf, "%s", qtu( line2 )); */
-
QHBoxLayout *controlLayout2 = new QHBoxLayout;
- controlLayout2->setSpacing( 0 );
- QString line2 = getSettings()->value( "MainWindow/MainToolbar2",
- "0-2;64;3;1;4;64;7;10;9;65;34-4" ).toString();
+ controlLayout2->setSpacing( 0 ); controlLayout2->setMargin( 0 );
+ QString line2 = getSettings()->value( "MainToolbar2", MAIN_TB2_DEFAULT )
+ .toString();
parseAndCreate( line2, controlLayout2 );
if( !b_advancedVisible && advControls ) advControls->hide();
controlLayout = new QHBoxLayout( this );
controlLayout->setMargin( 0 );
controlLayout->setSpacing( 0 );
+#if DEBUG_LAYOUT
+ setStyleSheet( " background: orange ");
+#endif
- /* QString line = QString( "%1;%2;%3").arg( RECORD_BUTTON )
- .arg( SNAPSHOT_BUTTON )
- .arg( ATOB_BUTTON )
- .arg( FRAME_BUTTON ); */
- QString line = getSettings()->value( "MainWindow/AdvToolbar",
- "12;11;13;14" ).toString();
+ QString line = getSettings()->value( "AdvToolbar", ADV_TB_DEFAULT )
+ .toString();
parseAndCreate( line, controlLayout );
}
controlLayout = new QHBoxLayout( this );
controlLayout->setMargin( 0 );
controlLayout->setSpacing( 0 );
+#if DEBUG_LAYOUT
+ setStyleSheet( " background: green ");
+#endif
- /* QString line = QString( "%1-%2;%3;%4-%2")
- .arg( SLOWER_BUTTON ).arg( WIDGET_FLAT )
- .arg( INPUT_SLIDER )
- .arg( FASTER_BUTTON ); */
- QString line = getSettings()->value( "MainWindow/InputToolbar",
- "5-1;33;6-1" ).toString();
+ QString line = getSettings()->value( "InputToolbar", INPT_TB_DEFAULT ).toString();
parseAndCreate( line, controlLayout );
}
/**********************************************************************
* Fullscrenn control widget
**********************************************************************/
-FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i )
- : AbstractController( _p_i )
+FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i, QWidget *_parent )
+ : AbstractController( _p_i, _parent )
{
i_mouse_last_x = -1;
i_mouse_last_y = -1;
setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum );
QVBoxLayout *controlLayout2 = new QVBoxLayout( this );
- controlLayout2->setLayoutMargins( 5, 2, 5, 2, 5 );
+ controlLayout2->setContentsMargins( 4, 6, 4, 2 );
/* First line */
InputControlsWidget *inputC = new InputControlsWidget( p_intf, this );
controlLayout2->addWidget( inputC );
- /* Second line */
-/* QString line = QString( "%1-2;%2;%3;%4;%5;%2;%6;%2;%7;%2;%8;%9;%10-4")
- .arg( PLAY_BUTTON )
- .arg( WIDGET_SPACER )
- .arg( PREVIOUS_BUTTON )
- .arg( STOP_BUTTON )
- .arg( NEXT_BUTTON )
- .arg( MENU_BUTTONS )
- .arg( TELETEXT_BUTTONS )
- .arg( DEFULLSCREEN_BUTTON )
- .arg( WIDGET_SPACER_EXTEND )
- .arg( TIME_LABEL )
- .arg( VOLUME ); */
-
controlLayout = new QHBoxLayout;
- QString line = getSettings()->value( "MainWindow/FSCtoolbar",
- "0-2;64;3;1;4;64;36;64;37;64;8;65;35-4;34" ).toString();
+ QString line = getSettings()->value( "MainWindow/FSCtoolbar", FSC_TB_DEFAULT ).toString();
parseAndCreate( line, controlLayout );
controlLayout2->addLayout( controlLayout );
CONNECT( p_slowHideTimer, timeout(), this, slowHideFSC() );
#endif
- adjustSize (); /* need to get real width and height for moving */
+ vlc_mutex_init_recursive( &lock );
-#ifdef WIN32TRICK
- setWindowOpacity( 0.0 );
- b_fscHidden = true;
- adjustSize();
- show();
-#endif
+ CONNECT( THEMIM->getIM(), voutListChanged( vout_thread_t **, int ),
+ this, setVoutList( vout_thread_t **, int ) );
- vlc_mutex_init_recursive( &lock );
+ /* 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 );
+
+ 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 );
+ }
- CONNECT( THEMIM->getIM(), voutListChanged( vout_thread_t **, int ), this, setVoutList( vout_thread_t **, int ) );
}
FullscreenControllerWidget::~FullscreenControllerWidget()
{
- getSettings()->setValue( "FullScreen/pos", pos() );
+ 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();
- /* center down */
+
int number = QApplication::desktop()->screenNumber( p_intf->p_sys->p_mi );
- if( number != i_screennumber )
- {
- msg_Dbg( p_intf, "Calculation fullscreen controllers center");
- /* screen has changed, calculate new position */
- QRect screenRes = QApplication::desktop()->screenGeometry(number);
- QPoint pos = QPoint( screenRes.x() + (screenRes.width() / 2) - (width() / 2),
- screenRes.y() + screenRes.height() - height());
- move( pos );
- i_screennumber = number;
- }
-#ifdef WIN32TRICK
- // after quiting and going to fs, we need to call show()
- if( isHidden() )
- show();
- if( b_fscHidden )
+
+ 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();
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 )
-#else
- if( b_fs && !isVisible() )
-#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();
}
/**
* 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 );
}
/* */
fullscreenChanged( p_vout, false, 0 );
vout.removeAll( p_vout );
vlc_mutex_unlock( &lock );
+
+ vlc_object_release( VLC_OBJECT(p_vout) );
}
/* Vout to track */
foreach( vout_thread_t *p_vout, add )
{
- vlc_object_hold( (vlc_object_t*)p_vout );
+ vlc_object_hold( VLC_OBJECT(p_vout) );
vlc_mutex_lock( &lock );
vout.append( p_vout );
/* 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)
*/
{
/* Show event */
IMEvent *eShow = new IMEvent( FullscreenControlShow_Type, 0 );
- QApplication::postEvent( this, static_cast<QEvent *>(eShow) );
+ QApplication::postEvent( this, eShow );
/* Plan hide event */
IMEvent *eHide = new IMEvent( FullscreenControlPlanHide_Type, 0 );
- QApplication::postEvent( this, static_cast<QEvent *>(eHide) );
+ QApplication::postEvent( this, eHide );
}
}
projects / vlc / blobdiff