X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmain_interface.cpp;h=0611c1a8123d13e13c677c91e8bdd65598a0a1bf;hb=69afa8556007dbb6424cacffb174aa3bb84733f1;hp=34d63a31de6734983a877aa948192754e3d1c1a1;hpb=662a0037cee3ddaabfb0ce0c014d2421e1d9b227;p=vlc diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp index 34d63a31de..0611c1a812 100644 --- a/modules/gui/qt4/main_interface.cpp +++ b/modules/gui/qt4/main_interface.cpp @@ -23,6 +23,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "qt4.hpp" #include "main_interface.hpp" #include "input_manager.hpp" @@ -47,7 +51,9 @@ #include #include #include +#if 0 #include +#endif #include #include #include @@ -70,39 +76,26 @@ static int IntfShowCB( vlc_object_t *p_this, const char *psz_variable, 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; playlistWidget = NULL; + bgWidget = NULL; + videoWidget = NULL; + playlistWidget = NULL; + sysTray = NULL; videoIsActive = false; - input_name = ""; playlistVisible = false; + input_name = ""; /* Ask for privacy */ - privacy(); + askForPrivacy(); /** * Configuration and settings + * Pre-building of interface **/ - settings = new QSettings( "vlc", "vlc-qt-interface" ); - settings->beginGroup( "MainWindow" ); - /* Main settings */ setFocusPolicy( Qt::StrongFocus ); setAcceptDrops( true ); @@ -110,19 +103,18 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) setWindowOpacity( config_GetFloat( p_intf, "qt-opacity" ) ); /* Set The Video In emebedded Mode or not */ - videoEmbeddedFlag = false; - if( config_GetInt( p_intf, "embedded-video" ) ) videoEmbeddedFlag = true; + videoEmbeddedFlag = config_GetInt( p_intf, "embedded-video" ); /* Are we in the enhanced always-video mode or not ? */ - alwaysVideoFlag = false; - if( videoEmbeddedFlag && config_GetInt( p_intf, "qt-always-video" ) ) - alwaysVideoFlag = true; + i_visualmode = config_GetInt( p_intf, "qt-display-mode" ); /* Set the other interface settings */ + settings = new QSettings( "vlc", "vlc-qt-interface" ); + settings->beginGroup( "MainWindow" ); + //TODO: I don't like that code visualSelectorEnabled = settings->value( "visual-selector", false ).toBool(); - notificationEnabled = config_GetInt( p_intf, "qt-notification" ) - ? true : false; + notificationEnabled = (bool)config_GetInt( p_intf, "qt-notification" ); /************************** * UI and Widgets design @@ -130,6 +122,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) setVLCWindowsTitle(); handleMainUi( settings ); +#if 0 /* Create a Dock to get the playlist */ dockPL = new QDockWidget( qtr( "Playlist" ), this ); dockPL->setSizePolicy( QSizePolicy::Preferred, @@ -139,85 +132,25 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) | Qt::RightDockWidgetArea | Qt::BottomDockWidgetArea ); dockPL->hide(); +#endif /************ * Menu Bar ************/ QVLCMenu::createMenuBar( this, p_intf, visualSelectorEnabled ); - /**************** - * Status Bar * - ****************/ - /* Widgets Creation*/ - b_remainingTime = false; - timeLabel = new TimeLabel; - timeLabel->setText( " --:--/--:-- " ); - timeLabel->setAlignment( Qt::AlignRight ); - nameLabel = new QLabel; - nameLabel->setTextInteractionFlags( Qt::TextSelectableByMouse - | Qt::TextSelectableByKeyboard ); - speedLabel = new QLabel( "1.00x" ); - speedLabel->setContextMenuPolicy ( Qt::CustomContextMenu ); - - /* Styling those labels */ - timeLabel->setFrameStyle( QFrame::Sunken | QFrame::Panel ); - 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 ); + /* StatusBar Creation */ + createStatusBar(); - /* timeLabel behaviour: - - double clicking opens the goto time dialog - - right-clicking and clicking just toggle between remaining and - elapsed time.*/ - CONNECT( timeLabel, timeLabelClicked(), this, toggleTimeDisplay() ); - CONNECT( timeLabel, timeLabelDoubleClicked(), THEDP, gotoTimeDialog() ); - CONNECT( timeLabel, timeLabelDoubleClicked(), this, toggleTimeDisplay() ); - - /* Speed Label behaviour: - - right click gives the vertical speed slider */ - CONNECT( speedLabel, customContextMenuRequested( QPoint ), - this, showSpeedMenu( QPoint ) ); - - /********************** - * Systray Management * - **********************/ - sysTray = NULL; - bool b_createSystray = false; - bool b_systrayAvailable = QSystemTrayIcon::isSystemTrayAvailable(); - if( config_GetInt( p_intf, "qt-start-minimized") ) - { - if( b_systrayAvailable ){ - b_createSystray = true; - hide(); //FIXME BUG HERE - } - else msg_Warn( p_intf, "You can't minize if you haven't a system " - "tray bar" ); - } - if( config_GetInt( p_intf, "qt-system-tray") ) - b_createSystray = true; - - if( b_systrayAvailable && b_createSystray ) - createSystray(); - - if( config_GetInt( p_intf, "qt-minimal-view" ) ) - toggleMinimalView(); /******************** * Input Manager * ********************/ MainInputManager::getInstance( p_intf ); - /******************** - * Various CONNECTs * - ********************/ + /************************** + * Various CONNECTs on IM * + **************************/ /* Connect the input manager to the GUI elements it manages */ /* It is also connected to the control->slider, see the ControlsWidget */ @@ -259,8 +192,12 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) updateSystrayTooltipStatus( int ) ); } + /* END CONNECTS ON IM */ + + /** OnTimeOut **/ - // TODO + /* TODO Remove this function, but so far, there is no choice because there + is no intf-should-die variable */ ON_TIMEOUT( updateOnTimer() ); //ON_TIMEOUT( debug() ); @@ -269,95 +206,160 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) **/ 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 * ), this, releaseVideoSlot( void * ) ); + CONNECT( this, askReleaseVideo( void * ), + this, releaseVideoSlot( void * ) ); CONNECT( this, askVideoToResize( unsigned int, unsigned int ), videoWidget, SetSizing( unsigned int, unsigned int ) ); + CONNECT( this, askUpdate(), this, doComponentsUpdate() ); - CONNECT( dockPL, topLevelChanged( bool ), this, doComponentsUpdate() ); CONNECT( controls, advancedControlsToggled( bool ), this, doComponentsUpdate() ); - move( settings->value( "pos", QPoint( 0, 0 ) ).toPoint() ); + CONNECT( fullscreenControls, advancedControlsToggled( bool ), + this, doComponentsUpdate() ); - QSize newSize = settings->value( "size", QSize( 350, 60 ) ).toSize(); - if( newSize.isValid() ) - { - resize( newSize ); - } - else - { - msg_Warn( p_intf, "Invalid size in constructor" ); - } + CONNECT( THEMIM->getIM(), inputUnset(), + fullscreenControls, unregFullscreenCallback() ); - int tgPlay = settings->value( "playlist-visible", 0 ).toInt(); + + /* Size and placement of interface */ + QVLCTools::restoreWidgetPosition(settings,this,QSize(350,60)); + + + /* Playlist */ + if( settings->value( "playlist-visible", 0 ).toInt() ) togglePlaylist(); settings->endGroup(); - if( tgPlay ) - { - togglePlaylist(); - } + show(); + if( i_visualmode == QT_MINIMAL_MODE ) + toggleMinimalView(); + + /* Update the geometry TODO: is it useful ?*/ updateGeometry(); + /***************************************************** + * End everything by creating the Systray Management * + *****************************************************/ + initSystray(); } MainInterface::~MainInterface() { 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; } /***************************** * Main UI handling * *****************************/ +inline void MainInterface::createStatusBar() +{ + /**************** + * Status Bar * + ****************/ + /* Widgets Creation*/ + b_remainingTime = false; + timeLabel = new TimeLabel; + timeLabel->setText( " --:--/--:-- " ); + timeLabel->setAlignment( Qt::AlignRight | Qt::AlignVCenter ); + nameLabel = new QLabel; + nameLabel->setTextInteractionFlags( Qt::TextSelectableByMouse + | Qt::TextSelectableByKeyboard ); + speedLabel = new SpeedLabel( p_intf, "1.00x" ); + speedLabel->setContextMenuPolicy ( Qt::CustomContextMenu ); + + /* Styling those labels */ + timeLabel->setFrameStyle( QFrame::Sunken | QFrame::Panel ); + 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: + - double clicking opens the goto time dialog + - right-clicking and clicking just toggle between remaining and + elapsed time.*/ + CONNECT( timeLabel, timeLabelClicked(), this, toggleTimeDisplay() ); + CONNECT( timeLabel, timeLabelDoubleClicked(), THEDP, gotoTimeDialog() ); + CONNECT( timeLabel, timeLabelDoubleClicked(), this, toggleTimeDisplay() ); + + /* Speed Label behaviour: + - right click gives the vertical speed slider */ + CONNECT( speedLabel, customContextMenuRequested( QPoint ), + this, showSpeedMenu( QPoint ) ); +} + +inline void MainInterface::initSystray() +{ + bool b_createSystray = false; + bool b_systrayAvailable = QSystemTrayIcon::isSystemTrayAvailable(); + if( config_GetInt( p_intf, "qt-start-minimized") ) + { + if( b_systrayAvailable ) + { + b_createSystray = true; + hide(); + } + else msg_Err( p_intf, "You can't minimize if you haven't a system " + "tray bar" ); + } + if( config_GetInt( p_intf, "qt-system-tray") ) + b_createSystray = true; + + if( b_systrayAvailable && b_createSystray ) + createSystray(); +} + /** * Give the decorations of the Main Window a correct Name. * If nothing is given, set it to VLC... @@ -383,7 +385,8 @@ void MainInterface::handleMainUi( QSettings *settings ) /* Margins, spacing */ main->setContentsMargins( 0, 0, 0, 0 ); - // main->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum ); + main->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum ); + mainLayout->setSpacing( 0 ); mainLayout->setMargin( 0 ); /* Create the CONTROLS Widget */ @@ -392,8 +395,14 @@ void MainInterface::handleMainUi( QSettings *settings ) 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 ); @@ -412,7 +421,8 @@ void MainInterface::handleMainUi( QSettings *settings ) #endif /* And video Outputs */ - if( alwaysVideoFlag ) + if( i_visualmode == QT_ALWAYS_VIDEO_MODE || + i_visualmode == QT_MINIMAL_MODE ) { bgWidget = new BackgroundWidget( p_intf ); bgWidget->resize( @@ -427,21 +437,21 @@ void MainInterface::handleMainUi( QSettings *settings ) 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 + { } /* Finish the sizing */ - updateGeometry(); + main->updateGeometry(); } -inline void MainInterface::privacy() +inline void MainInterface::askForPrivacy() { /** * Ask for the network policy on FIRST STARTUP **/ - if( config_GetInt( p_intf, "privacy-ask") ) + if( config_GetInt( p_intf, "qt-privacy-ask") ) { QList controls; if( privacyDialog( controls ) == QDialog::Accepted ) @@ -453,7 +463,8 @@ inline void MainInterface::privacy() c->doApply( p_intf ); } - config_PutInt( p_intf, "privacy-ask" , 0 ); + 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 ); } } @@ -461,7 +472,7 @@ inline void MainInterface::privacy() int MainInterface::privacyDialog( QList controls ) { - QDialog *privacy = new QDialog( this ); + QDialog *privacy = new QDialog(); privacy->setWindowTitle( qtr( "Privacy and Network policies" ) ); @@ -473,11 +484,10 @@ int MainInterface::privacyDialog( QList controls ) "

The VideoLAN Team doesn't like when an application goes " "online without authorization.

\n " "

VLC media player can request limited information on " - "Internet, espically to get CD Covers and songs metadata or to know " + "the Internet, especially to get CD covers and songs metadata or to know " "if updates are available.

\n" "

VLC media player DOES NOT send or collect ANY " - "information, even anonymously about your " - "usage.

\n" + "information, even anonymously, about your usage.

\n" "

Therefore please check the following options, the default being " "almost no access on the web.

\n") ); text->setWordWrap( true ); @@ -514,7 +524,10 @@ int MainInterface::privacyDialog( QList controls ) CONFIG_GENERIC( "album-art", IntegerList ); line++; CONFIG_GENERIC_NOBOOL( "fetch-meta", Bool ); line++; - CONFIG_GENERIC_NOBOOL( "qt-updates-notif", Bool ); +#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" ) ); @@ -524,12 +537,6 @@ int MainInterface::privacyDialog( QList controls ) return privacy->exec(); } -//FIXME remove me at the end... -void MainInterface::debug() -{ - msg_Dbg( p_intf, "size: %i - %i", size().height(), size().width() ); - msg_Dbg( p_intf, "sizeHint: %i - %i", sizeHint().height(), sizeHint().width() ); -} /********************************************************************** * Handling of sizing of the components @@ -543,6 +550,7 @@ void MainInterface::debug() ask _parent->isFloating()... If you think this would be better, please FIXME it... */ +#if 0 QSize MainInterface::sizeHint() const { int nwidth = controls->sizeHint().width(); @@ -565,16 +573,16 @@ QSize MainInterface::sizeHint() const nwidth = videoWidget->size().width(); msg_Dbg( p_intf, "2 %i %i", nheight, nwidth ); } - if( !dockPL->isFloating() && dockPL->isVisible() && dockPL->widget() ) +/* 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 ); - } + }*/ 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 ) @@ -596,6 +604,25 @@ void MainInterface::resizeEvent( QResizeEvent *e ) } #endif +void MainInterface::requestLayoutUpdate() +{ + emit askUpdate(); +} + +//FIXME remove me at the end... +void MainInterface::debug() +{ + msg_Dbg( p_intf, "size: %i - %i", size().height(), size().width() ); + msg_Dbg( p_intf, "sizeHint: %i - %i", sizeHint().height(), sizeHint().width() ); + if( videoWidget && videoWidget->isVisible() ) + { +// sleep( 10 ); + msg_Dbg( p_intf, "size: %i - %i", size().height(), size().width() ); + msg_Dbg( p_intf, "sizeHint: %i - %i", sizeHint().height(), sizeHint().width() ); + } + adjustSize(); +} + /**************************************************************************** * Small right-click menu for rate control ****************************************************************************/ @@ -624,6 +651,12 @@ private: bool onTop; }; +/** + * README + * README + * 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, @@ -659,10 +692,19 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x, 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 ); @@ -673,25 +715,24 @@ void MainInterface::releaseVideoSlot( void *p_win ) videoWidget->release( p_win ); videoWidget->hide(); - if( bgWidget )// WORONG + if( bgWidget )// WRONG bgWidget->show(); + adjustSize(); videoIsActive = false; - emit askUpdate(); } int MainInterface::controlVideo( void *p_window, int i_query, va_list args ) { - int i_ret = VLC_EGENERIC; + int i_ret = VLC_SUCCESS; switch( i_query ) { case VOUT_GET_SIZE: { unsigned int *pi_width = va_arg( args, unsigned int * ); unsigned int *pi_height = va_arg( args, unsigned int * ); - *pi_width = videoWidget->width(); - *pi_height = videoWidget->height(); - i_ret = VLC_SUCCESS; + *pi_width = videoWidget->videoSize.width(); + *pi_height = videoWidget->videoSize.height(); break; } case VOUT_SET_SIZE: @@ -700,18 +741,16 @@ int MainInterface::controlVideo( void *p_window, int i_query, va_list args ) unsigned int i_height = va_arg( args, unsigned int ); emit askVideoToResize( i_width, i_height ); emit askUpdate(); - updateGeometry(); - i_ret = VLC_SUCCESS; break; } case VOUT_SET_STAY_ON_TOP: { int i_arg = va_arg( args, int ); QApplication::postEvent( this, new SetVideoOnTopQtEvent( i_arg ) ); - i_ret = VLC_SUCCESS; break; } default: + i_ret = VLC_EGENERIC; msg_Warn( p_intf, "unsupported control query" ); break; } @@ -726,6 +765,8 @@ int MainInterface::controlVideo( void *p_window, int i_query, va_list args ) **/ void MainInterface::togglePlaylist() { + THEDP->playlistDialog(); +#if 0 /* CREATION If no playlist exist, then create one and attach it to the DockPL*/ if( !playlistWidget ) @@ -763,13 +804,14 @@ void MainInterface::togglePlaylist() resize( sizeHint() ); playlistVisible = !playlistVisible; } + #endif } /* Function called from the menu to undock the playlist */ void MainInterface::undockPlaylist() { - dockPL->setFloating( true ); - resize( sizeHint() ); +// dockPL->setFloating( true ); + adjustSize(); } void MainInterface::toggleMinimalView() @@ -784,9 +826,9 @@ void MainInterface::toggleMinimalView() /* Well, could it, actually ? Probably dangerous ... */ void MainInterface::doComponentsUpdate() { - resize( sizeHint() ); msg_Dbg( p_intf, "Updating the geometry" ); - updateGeometry(); +// resize( sizeHint() ); + debug(); } /* toggling advanced controls buttons */ @@ -859,8 +901,15 @@ void MainInterface::setName( QString name ) 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 ); @@ -872,23 +921,18 @@ void MainInterface::setRate( int rate ) str.setNum( ( 1000 / (double)rate ), 'f', 2 ); str.append( "x" ); speedLabel->setText( str ); + speedLabel->setToolTip( str ); speedControl->updateControls( rate ); } void MainInterface::updateOnTimer() { + /* No event for dying */ if( intf_ShouldDie( p_intf ) ) { QApplication::closeAllWindows(); QApplication::quit(); } -#if 0 - if( need_components_update ) - { - doComponentsUpdate(); - need_components_update = false; - } -#endif } /***************************************************************************** @@ -1043,7 +1087,7 @@ void MainInterface::dropEvent(QDropEvent *event) { if( input_AddSubtitles( THEMIM->getInput(), qtu( mimeData->urls()[0].toString() ), - VLC_TRUE ) ) + true ) ) { event->acceptProposedAction(); return; @@ -1051,12 +1095,13 @@ void MainInterface::dropEvent(QDropEvent *event) } } 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; } } @@ -1131,9 +1176,15 @@ void MainInterface::wheelEvent( QWheelEvent *e ) void MainInterface::closeEvent( QCloseEvent *e ) { hide(); - vlc_object_kill( p_intf ); - QApplication::closeAllWindows(); - QApplication::quit(); + THEDP->quit(); +} + +void MainInterface::toggleFullScreen( void ) +{ + if( isFullScreen() ) + showNormal(); + else + showFullScreen(); } /***************************************************************************** @@ -1159,7 +1210,6 @@ static int PopupMenuCB( 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, "Menu Requested" ); // DEBUG to track the non disparition of the menu... if( p_intf->pf_show_dialog ) { @@ -1171,14 +1221,13 @@ static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable, } /***************************************************************************** - * 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->b_intf_show = VLC_TRUE; + p_intf->p_sys->p_mi->requestLayoutUpdate(); return VLC_SUCCESS; }