Commit 165268ce authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Implement 'i' hotkey to show FSC.

Close #1783 ( rest is 1646 duplicate)
parent 66a8a1a8
...@@ -1110,6 +1110,10 @@ void FullscreenControllerWidget::customEvent( QEvent *event ) ...@@ -1110,6 +1110,10 @@ void FullscreenControllerWidget::customEvent( QEvent *event )
switch( event->type() ) switch( event->type() )
{ {
case FullscreenControlToggle_Type:
// FIXME
TOGGLEV( this );
break;
case FullscreenControlShow_Type: case FullscreenControlShow_Type:
vlc_mutex_lock( &lock ); vlc_mutex_lock( &lock );
b_fs = b_fullscreen; b_fs = b_fullscreen;
......
/***************************************************************************** /*****************************************************************************
* main_inteface.cpp : Main interface * dialogs_provider.cpp : Dialog Provider
***************************************************************************** *****************************************************************************
* Copyright (C) 2006-2007 the VideoLAN team * Copyright (C) 2006-2008 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Clément Stenac <zorglub@videolan.org> * Authors: Clément Stenac <zorglub@videolan.org>
......
...@@ -45,9 +45,10 @@ static int const VolumeChanged_Type = QEvent::User + IMEventType + 6; ...@@ -45,9 +45,10 @@ static int const VolumeChanged_Type = QEvent::User + IMEventType + 6;
static int const ItemSpuChanged_Type = QEvent::User + IMEventType + 7; static int const ItemSpuChanged_Type = QEvent::User + IMEventType + 7;
static int const ItemTeletextChanged_Type= QEvent::User + IMEventType + 8; static int const ItemTeletextChanged_Type= QEvent::User + IMEventType + 8;
static int const FullscreenControlShow_Type = QEvent::User + IMEventType + 10; static int const FullscreenControlToggle_Type = QEvent::User + IMEventType + 10;
static int const FullscreenControlHide_Type = QEvent::User + IMEventType + 11; static int const FullscreenControlShow_Type = QEvent::User + IMEventType + 11;
static int const FullscreenControlPlanHide_Type = QEvent::User + IMEventType + 12; static int const FullscreenControlHide_Type = QEvent::User + IMEventType + 12;
static int const FullscreenControlPlanHide_Type = QEvent::User + IMEventType + 13;
class IMEvent : public QEvent class IMEvent : public QEvent
{ {
......
...@@ -594,10 +594,19 @@ void MainInterface::resizeEvent( QResizeEvent *e ) ...@@ -594,10 +594,19 @@ void MainInterface::resizeEvent( QResizeEvent *e )
} }
#endif #endif
void MainInterface::toggleFSC()
{
if( !fullscreenControls ) return;
IMEvent *eShow = new IMEvent( FullscreenControlToggle_Type, 0 );
QApplication::postEvent( fullscreenControls, static_cast<QEvent *>(eShow) );
}
#if 0
void MainInterface::requestLayoutUpdate() void MainInterface::requestLayoutUpdate()
{ {
emit askUpdate(); emit askUpdate();
} }
#endif
//FIXME remove me at the end... //FIXME remove me at the end...
void MainInterface::debug() void MainInterface::debug()
...@@ -1227,7 +1236,8 @@ static int IntfShowCB( vlc_object_t *p_this, const char *psz_variable, ...@@ -1227,7 +1236,8 @@ static int IntfShowCB( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t old_val, vlc_value_t new_val, void *param ) vlc_value_t old_val, vlc_value_t new_val, void *param )
{ {
intf_thread_t *p_intf = (intf_thread_t *)param; intf_thread_t *p_intf = (intf_thread_t *)param;
p_intf->p_sys->p_mi->requestLayoutUpdate(); p_intf->p_sys->p_mi->toggleFSC();
return VLC_SUCCESS; /* Show event */
return VLC_SUCCESS;
} }
...@@ -75,8 +75,9 @@ public: ...@@ -75,8 +75,9 @@ public:
void releaseVideo( void * ); void releaseVideo( void * );
int controlVideo( void *p_window, int i_query, va_list args ); int controlVideo( void *p_window, int i_query, va_list args );
#if 0
void requestLayoutUpdate(); void requestLayoutUpdate();
#endif
/* Getters */ /* Getters */
QSystemTrayIcon *getSysTray() { return sysTray; }; QSystemTrayIcon *getSysTray() { return sysTray; };
QMenu *getSysTrayMenu() { return systrayMenu; }; QMenu *getSysTrayMenu() { return systrayMenu; };
...@@ -151,6 +152,7 @@ public slots: ...@@ -151,6 +152,7 @@ public slots:
void toggleUpdateSystrayMenu(); void toggleUpdateSystrayMenu();
void toggleAdvanced(); void toggleAdvanced();
void toggleFullScreen(); void toggleFullScreen();
void toggleFSC();
/* Manage the Video Functions from the vout threads */ /* Manage the Video Functions from the vout threads */
void releaseVideoSlot( void * ); void releaseVideoSlot( void * );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment