#include <QLabel>
#include <QSlider>
#include <QWidgetAction>
+#if 0
#include <QDockWidget>
+#endif
#include <QToolBar>
#include <QGroupBox>
#include <QDate>
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 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;
+ bgWidget = NULL;
+ videoWidget = NULL;
playlistWidget = NULL;
sysTray = NULL;
videoIsActive = false;
#if 0
/* Create a Dock to get the playlist */
-/* dockPL = new QDockWidget( qtr( "Playlist" ), this );
+ dockPL = new QDockWidget( qtr( "Playlist" ), this );
dockPL->setSizePolicy( QSizePolicy::Preferred,
QSizePolicy::Expanding );
dockPL->setFeatures( QDockWidget::AllDockWidgetFeatures );
dockPL->setAllowedAreas( Qt::LeftDockWidgetArea
| Qt::RightDockWidgetArea
| Qt::BottomDockWidgetArea );
- dockPL->hide();*/
+ dockPL->hide();
#endif
/************
**/
var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
var_AddCallback( p_intf, "interaction", InteractCallback, this );
- p_intf->b_interaction = VLC_TRUE;
+ p_intf->b_interaction = true;
+
+ var_AddCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
/* Register callback for the intf-popupmenu variable */
- playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf,
- VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
- if( p_playlist != NULL )
- {
- var_AddCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
- var_AddCallback( p_playlist, "intf-show", IntfShowCB, p_intf );
- vlc_object_release( p_playlist );
- }
+ playlist_t *p_playlist = pl_Yield( p_intf );
+ var_AddCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
+ pl_Release( p_intf );
/* VideoWidget connect mess to avoid different threads speaking to each other */
CONNECT( this, askReleaseVideo( void * ),
CONNECT( controls, advancedControlsToggled( bool ),
this, doComponentsUpdate() );
+ CONNECT( fullscreenControls, advancedControlsToggled( bool ),
+ this, doComponentsUpdate() );
+
+ CONNECT( THEMIM->getIM(), inputUnset(),
+ fullscreenControls, unregFullscreenCallback() );
+
+
/* Size and placement of interface */
- move( settings->value( "pos", QPoint( 0, 0 ) ).toPoint() );
+ QVLCTools::restoreWidgetPosition(settings,this,QSize(350,60));
- QSize newSize = settings->value( "size", QSize( 350, 60 ) ).toSize();
- if( newSize.isValid() )
- resize( newSize );
- else
- msg_Warn( p_intf, "Invalid size in constructor" );
/* Playlist */
if( settings->value( "playlist-visible", 0 ).toInt() ) togglePlaylist();
{
msg_Dbg( p_intf, "Destroying the main interface" );
- if( playlistWidget ) playlistWidget->savingSettings( settings );
- if( ExtendedDialog::exists() )
- ExtendedDialog::getInstance( p_intf )->savingSettings();
+ if( playlistWidget )
+ playlistWidget->savingSettings( settings );
settings->beginGroup( "MainWindow" );
-// settings->setValue( "playlist-floats", (int)(dockPL->isFloating()) );
+
+ // settings->setValue( "playlist-floats", (int)(dockPL->isFloating()) );
settings->setValue( "playlist-visible", (int)playlistVisible );
settings->setValue( "adv-controls",
getControlsVisibilityStatus() & CONTROLS_ADVANCED );
- settings->setValue( "pos", pos() );
- settings->setValue( "size", size() );
+
+ if( !videoIsActive )
+ QVLCTools::saveWidgetPosition(settings, this);
+
if( bgWidget )
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 = (playlist_t *)vlc_object_find( p_intf,
- VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
- if( p_playlist != NULL )
- {
- var_DelCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
- var_DelCallback( p_playlist, "intf-show", IntfShowCB, p_intf );
- vlc_object_release( p_playlist );
- }
+ playlist_t *p_playlist = pl_Yield( p_intf );
+ var_DelCallback( p_playlist, "intf-popupmenu", PopupMenuCB, p_intf );
+ pl_Release( p_intf );
- p_intf->b_interaction = VLC_FALSE;
+ 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;
}
nameLabel = new QLabel;
nameLabel->setTextInteractionFlags( Qt::TextSelectableByMouse
| Qt::TextSelectableByKeyboard );
- speedLabel = new QLabel( "1.00x" );
+ speedLabel = new SpeedLabel( p_intf, "1.00x" );
speedLabel->setContextMenuPolicy ( Qt::CustomContextMenu );
/* Styling those labels */
/* Margins, spacing */
main->setContentsMargins( 0, 0, 0, 0 );
main->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum );
+ mainLayout->setSpacing( 0 );
mainLayout->setMargin( 0 );
/* Create the CONTROLS Widget */
settings->value( "adv-controls", false ).toBool(),
config_GetInt( p_intf, "qt-blingbling" ) );
+ /* 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" ) );
+
/* Add the controls Widget to the main Widget */
- mainLayout->insertWidget( 0, controls );
+ mainLayout->insertWidget( 0, controls, 0, Qt::AlignBottom );
/* Create the Speed Control Widget */
speedControl = new SpeedControlWidget( p_intf );
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;
+ var_Create( p_intf, "window_widget", VLC_VAR_ADDRESS );
+ vlc_value_t val;
+ val.p_address = this;
+ var_Set( p_intf, "window_widget", val );
}
/* Finish the sizing */
}
config_PutInt( p_intf, "qt-privacy-ask" , 0 );
+ /* We have to save here because the user may not launch Prefs */
config_SaveConfigFile( p_intf, NULL );
}
}
int MainInterface::privacyDialog( QList<ConfigControl *> controls )
{
- QDialog *privacy = new QDialog( this );
+ QDialog *privacy = new QDialog();
privacy->setWindowTitle( qtr( "Privacy and Network policies" ) );
CONFIG_GENERIC_NOBOOL( "qt-updates-notif", Bool ); line++;
CONFIG_GENERIC_NOBOOL( "qt-updates-days", Integer ); line++;
#endif
+
QPushButton *ok = new QPushButton( qtr( "Ok" ) );
gLayout->addWidget( ok, 2, 2 );
{
msg_Dbg( p_intf, "size: %i - %i", size().height(), size().width() );
msg_Dbg( p_intf, "sizeHint: %i - %i", sizeHint().height(), sizeHint().width() );
- if( videoWidget->isVisible() )
+ if( videoWidget && videoWidget->isVisible() )
{
// sleep( 10 );
msg_Dbg( p_intf, "size: %i - %i", size().height(), size().width() );
emit askVideoToResize( *pi_width, *pi_height );
emit askUpdate();
+
+ fullscreenControls->regFullscreenCallback( 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 );
videoWidget->release( p_win );
videoWidget->hide();
- if( bgWidget )// WORONG
+ if( bgWidget )// WRONG
bgWidget->show();
adjustSize();
void MainInterface::setStatus( int status )
{
+ msg_Dbg( p_intf, "I was here, updating your status" );
/* Forward the status to the controls to toggle Play/Pause */
controls->setStatus( status );
+ fullscreenControls->setStatus( status );
+
+ controls->updateInput();
+ fullscreenControls->updateInput();
+ speedControl->setEnable( THEMIM->getIM()->hasInput() );
+
/* And in the systray for the menu */
if( sysTray )
QVLCMenu::updateSystrayMenu( this, p_intf );
str.setNum( ( 1000 / (double)rate ), 'f', 2 );
str.append( "x" );
speedLabel->setText( str );
+ speedLabel->setToolTip( str );
speedControl->updateControls( rate );
}
QApplication::closeAllWindows();
QApplication::quit();
}
-
- /* For some weird reasons, we have to resize the intf after intf-show
- Of course this is wrong, but I can't fix it now */
- if( p_intf->p_sys->p_mi->b_toUpdate )
- {
- doComponentsUpdate();
- p_intf->p_sys->p_mi->b_toUpdate = false;
- }
}
/*****************************************************************************
{
if( input_AddSubtitles( THEMIM->getInput(),
qtu( mimeData->urls()[0].toString() ),
- VLC_TRUE ) )
+ true ) )
{
event->acceptProposedAction();
return;
}
}
bool first = true;
- foreach( QUrl url, mimeData->urls() ) {
- QString s = url.toString();
+ foreach( QUrl url, mimeData->urls() )
+ {
+ QString s = url.toLocalFile();
if( s.length() > 0 ) {
playlist_Add( THEPL, qtu(s), NULL,
PLAYLIST_APPEND | (first ? PLAYLIST_GO:0),
- PLAYLIST_END, VLC_TRUE, VLC_FALSE );
+ PLAYLIST_END, true, false );
first = false;
}
}
vlc_value_t old_val, vlc_value_t new_val, void *param )
{
intf_thread_t *p_intf = (intf_thread_t *)param;
- msg_Dbg( p_this, "Menu Requested" ); // DEBUG to track the non disparition of the menu...
if( p_intf->pf_show_dialog )
{
}
/*****************************************************************************
- * IntfShowCB: callback triggered by the intf-show playlist variable.
+ * IntfShowCB: callback triggered by the intf-show libvlc variable.
*****************************************************************************/
static int IntfShowCB( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t old_val, vlc_value_t new_val, void *param )
{
intf_thread_t *p_intf = (intf_thread_t *)param;
- msg_Dbg( p_this, "Intf Show Requested" ); // DEBUG to track the non disparition of the menu...
p_intf->p_sys->p_mi->requestLayoutUpdate();
return VLC_SUCCESS;
projects / vlc / blobdiff