X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmain_interface.cpp;h=a7dcbf0c6c9be8822da7b748a185866abfe3e7e3;hb=c6b0458c5df9d07d8342498bca173563b465dc79;hp=d187a2d99c86c2d65c2d35db3a533ae755ae4d3f;hpb=c6a01bb041e0e1071863b3f298eef99f72403722;p=vlc diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp index d187a2d99c..a7dcbf0c6c 100644 --- a/modules/gui/qt4/main_interface.cpp +++ b/modules/gui/qt4/main_interface.cpp @@ -51,7 +51,9 @@ #include #include #include +#if 0 #include +#endif #include #include #include @@ -74,27 +76,13 @@ 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; + bgWidget = NULL; + videoWidget = NULL; playlistWidget = NULL; sysTray = NULL; videoIsActive = false; @@ -136,14 +124,14 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) #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 /************ @@ -218,37 +206,31 @@ 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 ); - } + 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() ); + /* 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(); @@ -272,39 +254,33 @@ 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 ); - } + var_DelCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, 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; } @@ -325,7 +301,7 @@ inline void MainInterface::createStatusBar() 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 */ @@ -403,16 +379,23 @@ void MainInterface::handleMainUi( QSettings *settings ) /* Margins, spacing */ main->setContentsMargins( 0, 0, 0, 0 ); main->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum ); + mainLayout->setSpacing( 0 ); 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 ); + + /* 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(), + b_shiny ); /* 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 ); @@ -445,11 +428,7 @@ void MainInterface::handleMainUi( QSettings *settings ) 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; + mainLayout->insertWidget( 0, videoWidget, 10 ); } /* Finish the sizing */ @@ -474,6 +453,7 @@ inline void MainInterface::askForPrivacy() } 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 ); } } @@ -481,9 +461,9 @@ inline void MainInterface::askForPrivacy() int MainInterface::privacyDialog( QList controls ) { - QDialog *privacy = new QDialog( this ); + QDialog *privacy = new QDialog(); - privacy->setWindowTitle( qtr( "Privacy and Network policies" ) ); + privacy->setWindowTitle( qtr( "Privacy and Network Policies" ) ); QGridLayout *gLayout = new QGridLayout( privacy ); @@ -493,7 +473,7 @@ 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 " - "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.

\n" "

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

\n" @@ -532,12 +512,12 @@ int MainInterface::privacyDialog( QList controls ) } 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 ); @@ -622,7 +602,7 @@ 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->isVisible() ) + if( videoWidget && videoWidget->isVisible() ) { // sleep( 10 ); msg_Dbg( p_intf, "size: %i - %i", size().height(), size().width() ); @@ -665,8 +645,6 @@ private: * 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 ) @@ -683,29 +661,32 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x, 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->attachVout( p_nvout ); } return ret; } -void MainInterface::releaseVideo( void *p_win ) +void MainInterface::releaseVideo( vout_thread_t *p_vout, void *p_win ) { + fullscreenControls->detachVout( p_vout ); emit askReleaseVideo( p_win ); } @@ -714,7 +695,7 @@ void MainInterface::releaseVideoSlot( void *p_win ) videoWidget->release( p_win ); videoWidget->hide(); - if( bgWidget )// WORONG + if( bgWidget )// WRONG bgWidget->show(); adjustSize(); @@ -815,6 +796,8 @@ void MainInterface::undockPlaylist() void MainInterface::toggleMinimalView() { + /* HACK for minimalView, see menus.cpp */ + if( !menuBar()->isVisible() ) QVLCMenu::minimalViewAction->toggle(); TOGGLEV( menuBar() ); TOGGLEV( controls ); TOGGLEV( statusBar() ); @@ -900,8 +883,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 ); @@ -913,6 +903,7 @@ void MainInterface::setRate( int rate ) str.setNum( ( 1000 / (double)rate ), 'f', 2 ); str.append( "x" ); speedLabel->setText( str ); + speedLabel->setToolTip( str ); speedControl->updateControls( rate ); } @@ -1078,7 +1069,7 @@ void MainInterface::dropEvent(QDropEvent *event) { if( input_AddSubtitles( THEMIM->getInput(), qtu( mimeData->urls()[0].toString() ), - VLC_TRUE ) ) + true ) ) { event->acceptProposedAction(); return; @@ -1086,12 +1077,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; } } @@ -1200,7 +1192,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 ) { @@ -1212,13 +1203,12 @@ 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->p_mi->requestLayoutUpdate(); return VLC_SUCCESS;