#include <QToolBar>
#include <QGroupBox>
#include <QDate>
-#include <QProgressBar>
#include <assert.h>
#include <vlc_keys.h>
vlc_value_t old_val, vlc_value_t new_val, void *param );
static int InteractCallback( vlc_object_t *, const char *, vlc_value_t,
vlc_value_t, void *);
-/* Video handling */
-static void *DoRequest( intf_thread_t *p_intf, vout_thread_t *p_vout,
- int *pi1, int *pi2, unsigned int*pi3,unsigned int*pi4)
-{
- return p_intf->p_sys->p_mi->requestVideo( p_vout, pi1, pi2, pi3, pi4 );
-}
-
-static void *DoNotEmbeddedRequest( intf_thread_t *p_intf, vout_thread_t *p_vout,
- int *pi1, int *pi2, unsigned int*pi3,unsigned int*pi4)
-{
- p_intf->p_sys->p_mi->requestNotEmbeddedVideo( p_vout );
- return NULL;
-}
-
-static void DoRelease( intf_thread_t *p_intf, void *p_win )
-{
- return p_intf->p_sys->p_mi->releaseVideo( p_win );
-}
-
-static int DoControl( intf_thread_t *p_intf, void *p_win, int i_q, va_list a )
-{
- return p_intf->p_sys->p_mi->controlVideo( p_win, i_q, a );
-}
MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
{
/* Variables initialisation */
// need_components_update = false;
- bgWidget = NULL;
- videoWidget = NULL;
- playlistWidget = NULL;
- sysTray = NULL;
- videoIsActive = false;
- playlistVisible = false;
- input_name = "";
+ bgWidget = NULL;
+ videoWidget = NULL;
+ playlistWidget = NULL;
+ sysTray = NULL;
+ videoIsActive = false;
+ playlistVisible = false;
+ input_name = "";
+ fullscreenControls = NULL;
/* Ask for privacy */
askForPrivacy();
i_visualmode = config_GetInt( p_intf, "qt-display-mode" );
/* Set the other interface settings */
- settings = new QSettings( "vlc", "vlc-qt-interface" );
+ settings = getSettings();
settings->beginGroup( "MainWindow" );
//TODO: I don't like that code
var_AddCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
/* Register callback for the intf-popupmenu variable */
- playlist_t *p_playlist = pl_Yield( p_intf );
- var_AddCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
- pl_Release( p_intf );
+ var_AddCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
/* VideoWidget connect mess to avoid different threads speaking to each other */
CONNECT( this, askReleaseVideo( void * ),
this, releaseVideoSlot( void * ) );
- CONNECT( this, askVideoToResize( unsigned int, unsigned int ),
- videoWidget, SetSizing( unsigned int, unsigned int ) );
+ if( videoWidget )
+ CONNECT( this, askVideoToResize( unsigned int, unsigned int ),
+ videoWidget, SetSizing( unsigned int, unsigned int ) );
CONNECT( this, askUpdate(), this, doComponentsUpdate() );
- CONNECT( controls, advancedControlsToggled( bool ),
- this, doComponentsUpdate() );
-
- CONNECT( fullscreenControls, advancedControlsToggled( bool ),
- this, doComponentsUpdate() );
-
- CONNECT( THEMIM->getIM(), inputUnset(),
- fullscreenControls, unregFullscreenCallback() );
-
-
/* Size and placement of interface */
- QVLCTools::restoreWidgetPosition(settings,this,QSize(350,60));
+ QVLCTools::restoreWidgetPosition( settings, this, QSize(380, 60) );
/* Playlist */
/* Update the geometry TODO: is it useful ?*/
updateGeometry();
+ resize( sizeHint() );
/*****************************************************
* End everything by creating the Systray Management *
msg_Dbg( p_intf, "Destroying the main interface" );
if( playlistWidget )
- playlistWidget->savingSettings( settings );
+ playlistWidget->savingSettings();
settings->beginGroup( "MainWindow" );
settings->setValue( "backgroundSize", bgWidget->size() );
settings->endGroup();
- delete settings;
var_DelCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
/* Unregister callback for the intf-popupmenu variable */
- playlist_t *p_playlist = pl_Yield( p_intf );
- var_DelCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
- pl_Release( p_intf );
+ var_DelCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
p_intf->b_interaction = false;
var_DelCallback( p_intf, "interaction", InteractCallback, this );
- p_intf->pf_request_window = NULL;
- p_intf->pf_release_window = NULL;
- p_intf->pf_control_window = NULL;
p_intf->p_sys->p_mi = NULL;
}
timeLabel = new TimeLabel;
timeLabel->setText( " --:--/--:-- " );
timeLabel->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
+ timeLabel->setToolTip( qtr( "Toggle between elapsed and remaining time" ) );
nameLabel = new QLabel;
nameLabel->setTextInteractionFlags( Qt::TextSelectableByMouse
| Qt::TextSelectableByKeyboard );
speedLabel = new SpeedLabel( p_intf, "1.00x" );
+ speedLabel->setToolTip(
+ qtr( "Current playback speed.\nRight click to adjust" ) );
speedLabel->setContextMenuPolicy ( Qt::CustomContextMenu );
/* Styling those labels */
speedLabel->setFrameStyle( QFrame::Sunken | QFrame::Panel );
nameLabel->setFrameStyle( QFrame::Sunken | QFrame::StyledPanel);
- pgBar = new QProgressBar;
- pgBar->hide();
/* and adding those */
statusBar()->addWidget( nameLabel, 8 );
statusBar()->addPermanentWidget( speedLabel, 0 );
- statusBar()->addPermanentWidget( pgBar, 0 );
statusBar()->addPermanentWidget( timeLabel, 0 );
/* timeLabel behaviour:
mainLayout->setMargin( 0 );
/* Create the CONTROLS Widget */
- /* bool b_shiny = config_GetInt( p_intf, "qt-blingbling" ); */
+ bool b_shiny = config_GetInt( p_intf, "qt-blingbling" );
controls = new ControlsWidget( p_intf, this,
settings->value( "adv-controls", false ).toBool(),
- config_GetInt( p_intf, "qt-blingbling" ) );
+ b_shiny );
+ CONNECT( controls, advancedControlsToggled( bool ),
+ this, doComponentsUpdate() );
/* Create the FULLSCREEN CONTROLS Widget */
- /* bool b_shiny = config_GetInt( p_intf, "qt-blingbling" ); */
- fullscreenControls = new FullscreenControllerWidget( p_intf, this,
- settings->value( "adv-controls", false ).toBool(),
- config_GetInt( p_intf, "qt-blingbling" ) );
+ if( config_GetInt( p_intf, "qt-fs-controller" ) )
+ {
+ fullscreenControls = new FullscreenControllerWidget( p_intf, this,
+ settings->value( "adv-controls", false ).toBool(),
+ b_shiny );
+ CONNECT( fullscreenControls, advancedControlsToggled( bool ),
+ this, doComponentsUpdate() );
+ }
/* Add the controls Widget to the main Widget */
mainLayout->insertWidget( 0, controls, 0, Qt::AlignBottom );
visualSelector->hide();
#endif
- /* And video Outputs */
- if( i_visualmode == QT_ALWAYS_VIDEO_MODE ||
- i_visualmode == QT_MINIMAL_MODE )
+ /* Bg Cone */
+ bgWidget = new BackgroundWidget( p_intf );
+ bgWidget->resize(
+ settings->value( "backgroundSize", QSize( 300, 200 ) ).toSize() );
+ bgWidget->updateGeometry();
+ mainLayout->insertWidget( 0, bgWidget );
+ CONNECT( this, askBgWidgetToToggle(), bgWidget, toggle() );
+
+ if( i_visualmode != QT_ALWAYS_VIDEO_MODE &&
+ i_visualmode != QT_MINIMAL_MODE )
{
- bgWidget = new BackgroundWidget( p_intf );
- bgWidget->resize(
- settings->value( "backgroundSize", QSize( 300, 150 ) ).toSize() );
- bgWidget->updateGeometry();
- mainLayout->insertWidget( 0, bgWidget );
- CONNECT( this, askBgWidgetToToggle(), bgWidget, toggle() );
+ bgWidget->hide();
}
+ /* And video Outputs */
if( videoEmbeddedFlag )
{
videoWidget = new VideoWidget( p_intf );
- mainLayout->insertWidget( 0, videoWidget );
-
- p_intf->pf_request_window = ::DoRequest;
- p_intf->pf_release_window = ::DoRelease;
- p_intf->pf_control_window = ::DoControl;
- }
- else
- {
- p_intf->pf_request_window = ::DoNotEmbeddedRequest;
+ mainLayout->insertWidget( 0, videoWidget, 10 );
}
/* Finish the sizing */
if( config_GetInt( p_intf, "qt-privacy-ask") )
{
QList<ConfigControl *> controls;
- if( privacyDialog( controls ) == QDialog::Accepted )
+ if( privacyDialog( &controls ) == QDialog::Accepted )
{
QList<ConfigControl *>::Iterator i;
for( i = controls.begin() ; i != controls.end() ; i++ )
}
}
-int MainInterface::privacyDialog( QList<ConfigControl *> controls )
+int MainInterface::privacyDialog( QList<ConfigControl *> *controls )
{
QDialog *privacy = new QDialog();
- privacy->setWindowTitle( qtr( "Privacy and Network policies" ) );
+ privacy->setWindowTitle( qtr( "Privacy and Network Policies" ) );
QGridLayout *gLayout = new QGridLayout( privacy );
"<p>The <i>VideoLAN Team</i> doesn't like when an application goes "
"online without authorization.</p>\n "
"<p><i>VLC media player</i> can request limited information on "
- "the Internet, especially to get CD covers and songs metadata or to know "
+ "the Internet, especially to get CD covers or to know "
"if updates are available.</p>\n"
"<p><i>VLC media player</i> <b>DOES NOT</b> send or collect <b>ANY</b> "
"information, even anonymously, about your usage.</p>\n"
{ \
control = new type ## ConfigControl( VLC_OBJECT(p_intf), \
p_config, options, false, optionsLayout, line ); \
- controls.append( control ); \
+ controls->append( control ); \
}
#define CONFIG_GENERIC_NOBOOL( option, type ) \
{ \
control = new type ## ConfigControl( VLC_OBJECT(p_intf), \
p_config, options, optionsLayout, line ); \
- controls.append( control ); \
+ controls->append( control ); \
}
CONFIG_GENERIC( "album-art", IntegerList ); line++;
- CONFIG_GENERIC_NOBOOL( "fetch-meta", Bool ); line++;
#ifdef UPDATE_CHECK
CONFIG_GENERIC_NOBOOL( "qt-updates-notif", Bool ); line++;
CONFIG_GENERIC_NOBOOL( "qt-updates-days", Integer ); line++;
#endif
- QPushButton *ok = new QPushButton( qtr( "Ok" ) );
+ QPushButton *ok = new QPushButton( qtr( "OK" ) );
gLayout->addWidget( ok, 2, 2 );
ask _parent->isFloating()...
If you think this would be better, please FIXME it...
*/
-#if 0
+
QSize MainInterface::sizeHint() const
{
- int nwidth = controls->sizeHint().width();
+ int nwidth = __MAX( controls->sizeHint().width(),
+ menuBar()->sizeHint().width() );
int nheight = controls->isVisible() ?
controls->size().height()
+ menuBar()->size().height()
}
else if( videoIsActive )
{
- nheight += videoWidget->size().height();
- nwidth = videoWidget->size().width();
+ nheight += videoWidget->sizeHint().height();
+ nwidth = videoWidget->sizeHint().width();
msg_Dbg( p_intf, "2 %i %i", nheight, nwidth );
}
-/* if( !dockPL->isFloating() && dockPL->isVisible() && dockPL->widget() )
+#if 0
+ if( !dockPL->isFloating() && dockPL->isVisible() && dockPL->widget() )
{
nheight += dockPL->size().height();
nwidth = __MAX( nwidth, dockPL->size().width() );
msg_Dbg( p_intf, "3 %i %i", nheight, nwidth );
- }*/
+ }
+#endif
msg_Dbg( p_intf, "4 %i %i", nheight, nwidth );
return QSize( nwidth, nheight );
}
-#endif
+
#if 0
/* FIXME This is dead code and need to be removed AT THE END */
void MainInterface::resizeEvent( QResizeEvent *e )
}
#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()
{
emit askUpdate();
}
+#endif
//FIXME remove me at the end...
void MainInterface::debug()
* Thou shall not call/resize/hide widgets from on another thread.
* This is wrong, and this is TEH reason to emit signals on those Video Functions
**/
-/* function called from ::DoRequest in order to show a nice VideoWidget
- at the good size */
void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
int *pi_y, unsigned int *pi_width,
unsigned int *pi_height )
{
- bool bgWasVisible = false;
+ bgWasVisible = false;
/* Request the videoWidget */
void *ret = videoWidget->request( p_nvout,pi_x, pi_y, pi_width, pi_height );
bgWasVisible = true;
emit askBgWidgetToToggle();
}
-
- /*if( THEMIM->getIM()->hasVideo() || !bgWasVisible )
+#if 0
+ if( THEMIM->getIM()->hasVideo() || !bgWasVisible )
{
videoWidget->widgetSize = QSize( *pi_width, *pi_height );
}
else /* Background widget available, use its size */
- /*{
+ {
/* Ok, our visualizations are bad, so don't do this for the moment
* use the requested size anyway */
// videoWidget->widgetSize = bgWidget->widgeTSize;
- /* videoWidget->widgetSize = QSize( *pi_width, *pi_height );
- }*/
-
+ videoWidget->widgetSize = QSize( *pi_width, *pi_height );
+ }
+#endif
videoIsActive = true;
- emit askVideoToResize( *pi_width, *pi_height );
+// emit askVideoToResize( *pi_width, *pi_height );
emit askUpdate();
- fullscreenControls->regFullscreenCallback( p_nvout );
+ if( fullscreenControls ) fullscreenControls->attachVout( p_nvout );
}
return ret;
}
-/* function called from ::DoRequest in order to show a nice VideoWidget
- at the good size */
-void MainInterface::requestNotEmbeddedVideo( vout_thread_t *p_nvout )
-{
- fullscreenControls->regFullscreenCallback( p_nvout );
-}
-
void MainInterface::releaseVideo( void *p_win )
{
- emit askReleaseVideo( p_win );
+ if( fullscreenControls ) fullscreenControls->detachVout();
+ if( p_win )
+ emit askReleaseVideo( p_win );
}
void MainInterface::releaseVideoSlot( void *p_win )
videoWidget->release( p_win );
videoWidget->hide();
- if( bgWidget )// WORONG
+ if( bgWasVisible )
+ {
+ bgWasVisible = false;
bgWidget->show();
+ }
- adjustSize();
videoIsActive = false;
+ if( !isFullScreen() ) adjustSize();
}
int MainInterface::controlVideo( void *p_window, int i_query, va_list args )
void MainInterface::toggleMinimalView()
{
+ /* HACK for minimalView, see menus.cpp */
+ if( !menuBar()->isVisible() ) QVLCMenu::minimalViewAction->toggle();
+
+ if( i_visualmode != QT_ALWAYS_VIDEO_MODE &&
+ i_visualmode != QT_MINIMAL_MODE )
+ { /* NORMAL MODE then */
+ if( videoWidget->isHidden() ) emit askBgWidgetToToggle();
+ else
+ {
+ /* If video is visible, then toggle the status of bgWidget */
+ bgWasVisible = !bgWasVisible;
+ }
+ }
+
TOGGLEV( menuBar() );
TOGGLEV( controls );
TOGGLEV( statusBar() );
void MainInterface::toggleAdvanced()
{
controls->toggleAdvanced();
+ if( fullscreenControls ) fullscreenControls->toggleAdvanced();
}
/* Get the visibility status of the controls (hidden or not, advanced or not) */
void MainInterface::setStatus( int status )
{
- msg_Dbg( p_intf, "I was here, updating your status" );
+ msg_Dbg( p_intf, "Updating the stream status: %i", status );
+
/* Forward the status to the controls to toggle Play/Pause */
controls->setStatus( status );
- fullscreenControls->setStatus( status );
-
controls->updateInput();
- fullscreenControls->updateInput();
+
+ if( fullscreenControls )
+ {
+ fullscreenControls->setStatus( status );
+ fullscreenControls->updateInput();
+ }
+
speedControl->setEnable( THEMIM->getIM()->hasInput() );
/* And in the systray for the menu */
vlc_value_t old_val, vlc_value_t new_val, void *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;
}
projects / vlc / blobdiff