X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=modules%2Fgui%2Fqt4%2Fmain_interface.cpp;h=59460806499f41c311d6e727d4e9034454e5aa12;hb=32b29b9e09887f54ed205ccd22764f3e72d416a1;hp=c7c95447e42300333b87b22143f2f78b9fc19578;hpb=b069b0285106268662c02549f4949b07bc89704a;p=vlc diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp index c7c95447e4..5946080649 100644 --- a/modules/gui/qt4/main_interface.cpp +++ b/modules/gui/qt4/main_interface.cpp @@ -28,35 +28,38 @@ #endif #include "qt4.hpp" + #include "main_interface.hpp" #include "input_manager.hpp" -#include "util/qvlcframe.hpp" +#include "actions_manager.hpp" + #include "util/customwidgets.hpp" -#include "dialogs_provider.hpp" +#include "util/qt_dirs.hpp" + #include "components/interface_widgets.hpp" +#include "components/controller.hpp" #include "components/playlist/playlist.hpp" -#include "dialogs/extended.hpp" -#include "dialogs/playlist.hpp" + #include "menus.hpp" +#include "recents.hpp" -#include #include -#include -#include #include + #include -#include #include +#include + #include +#include +#include #include -#include -#include -#include #include -#include +#include #include -#include + +#include /* Wheel event */ #include /* Callback prototypes */ @@ -96,6 +99,9 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) /* Set The Video In emebedded Mode or not */ videoEmbeddedFlag = config_GetInt( p_intf, "embedded-video" ); + /* Do we confine videos within a persistent resizeable window */ + b_keep_size = config_GetInt( p_intf, "qt-keep-size" ); + /* Are we in the enhanced always-video mode or not ? */ i_visualmode = config_GetInt( p_intf, "qt-display-mode" ); @@ -103,6 +109,15 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) settings = getSettings(); settings->beginGroup( "MainWindow" ); + /** + * Retrieve saved sizes for main window + * mainBasedSize = based window size for normal mode + * (no video, no background) + * mainVideoSize = window size with video (all modes) + **/ + mainBasedSize = settings->value( "mainBasedSize", QSize( 350, 120 ) ).toSize(); + mainVideoSize = settings->value( "mainVideoSize", QSize( 400, 300 ) ).toSize(); + /* Visualisation, not really used yet */ visualSelectorEnabled = settings->value( "visual-selector", false).toBool(); @@ -131,10 +146,10 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) * Menu Bar and Status Bar **************************/ QVLCMenu::createMenuBar( this, p_intf, visualSelectorEnabled ); + /* StatusBar Creation */ createStatusBar(); - /******************** * Input Manager * ********************/ @@ -145,18 +160,14 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) **************************/ /* Connect the input manager to the GUI elements it manages */ - /* It is also connected to the control->slider, see the ControlsWidget */ - /* Change the SpeedRate in the Status */ - CONNECT( THEMIM->getIM(), rateChanged( int ), this, setRate( int ) ); - /** * Connects on nameChanged() * Those connects are not merged because different options can trigger * them down. */ /* Naming in the controller statusbar */ - CONNECT( THEMIM->getIM(), nameChanged( QString ), this, - setName( QString ) ); + CONNECT( THEMIM->getIM(), nameChanged( QString ), + this, setName( QString ) ); /* and in the systray */ if( sysTray ) { @@ -173,29 +184,22 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) /** * CONNECTS on PLAY_STATUS **/ - /* Status on the main controller */ - CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) ); - /* and in the systray */ + /* Status on the systray */ if( sysTray ) { - CONNECT( THEMIM->getIM(), statusChanged( int ), this, - updateSystrayTooltipStatus( int ) ); + CONNECT( THEMIM->getIM(), statusChanged( int ), + this, updateSystrayTooltipStatus( int ) ); } /* END CONNECTS ON IM */ - /** OnTimeOut **/ - /* TODO Remove this function, but so far, there is no choice because there - is no intf-should-die variable #1365 */ - ON_TIMEOUT( updateOnTimer() ); - /************ * Callbacks ************/ var_Create( p_intf, "interaction", VLC_VAR_ADDRESS ); var_AddCallback( p_intf, "interaction", InteractCallback, this ); - p_intf->b_interaction = true; + interaction_Register( p_intf ); var_AddCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf ); @@ -204,8 +208,9 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) /* VideoWidget connects to avoid different threads speaking to each other */ - CONNECT( this, askReleaseVideo( void * ), - this, releaseVideoSlot( void * ) ); + connect( this, SIGNAL(askReleaseVideo( void )), + this, SLOT(releaseVideoSlot( void )), Qt::BlockingQueuedConnection ); + if( videoWidget ) CONNECT( this, askVideoToResize( unsigned int, unsigned int ), videoWidget, SetSizing( unsigned int, unsigned int ) ); @@ -216,6 +221,20 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) settings->beginGroup( "MainWindow" ); QVLCTools::restoreWidgetPosition( settings, this, QSize(380, 60) ); + /* resize to previously saved main window size if appicable */ + if( b_keep_size ) + { + if( i_visualmode == QT_ALWAYS_VIDEO_MODE || + i_visualmode == QT_MINIMAL_MODE ) + { + resize( mainVideoSize ); + } + else + { + resize( mainBasedSize ); + } + } + bool b_visible = settings->value( "playlist-visible", 0 ).toInt(); settings->endGroup(); @@ -253,8 +272,12 @@ MainInterface::~MainInterface() { if( !isDocked() ) QVLCTools::saveWidgetPosition( p_intf, "Playlist", playlistWidget ); + + delete playlistWidget; } + ActionsManager::killInstance(); + settings->beginGroup( "MainWindow" ); settings->setValue( "pl-dock-status", (int)i_pl_dock ); @@ -262,6 +285,9 @@ MainInterface::~MainInterface() settings->setValue( "adv-controls", getControlsVisibilityStatus() & CONTROLS_ADVANCED ); + settings->setValue( "mainBasedSize", mainBasedSize ); + settings->setValue( "mainVideoSize", mainVideoSize ); + if( bgWidget ) settings->setValue( "backgroundSize", bgWidget->size() ); @@ -273,7 +299,7 @@ MainInterface::~MainInterface() /* Unregister callback for the intf-popupmenu variable */ var_DelCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf ); - p_intf->b_interaction = false; + interaction_Unregister( p_intf ); var_DelCallback( p_intf, "interaction", InteractCallback, this ); p_intf->p_sys->p_mi = NULL; @@ -289,14 +315,11 @@ inline void MainInterface::createStatusBar() * Status Bar * ****************/ /* Widgets Creation*/ - timeLabel = new TimeLabel( p_intf ); + TimeLabel *timeLabel = new TimeLabel( p_intf ); 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 ); + SpeedLabel *speedLabel = new SpeedLabel( p_intf, "1.00x" ); /* Styling those labels */ timeLabel->setFrameStyle( QFrame::Sunken | QFrame::Panel ); @@ -313,31 +336,25 @@ inline void MainInterface::createStatusBar() - right-clicking and clicking just toggle between remaining and elapsed time.*/ CONNECT( timeLabel, timeLabelDoubleClicked(), THEDP, gotoTimeDialog() ); - - /* 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") ) + bool b_systrayWanted = config_GetInt( p_intf, "qt-system-tray" ); + + if( config_GetInt( p_intf, "qt-start-minimized") > 0 ) { if( b_systrayAvailable ) { - b_createSystray = true; + b_systrayWanted = true; hide(); } - else msg_Err( p_intf, "You can't minimize if you haven't a system " - "tray bar" ); + else + msg_Err( p_intf, "cannot start minimized without system tray bar" ); } - if( config_GetInt( p_intf, "qt-system-tray") ) - b_createSystray = true; - if( b_systrayAvailable && b_createSystray ) + if( b_systrayAvailable && b_systrayWanted ) createSystray(); } @@ -371,25 +388,13 @@ void MainInterface::handleMainUi( QSettings *settings ) mainLayout->setMargin( 0 ); /* Create the CONTROLS Widget */ - bool b_shiny = config_GetInt( p_intf, "qt-blingbling" ); - controls = new ControlsWidget( p_intf, this, - settings->value( "adv-controls", false ).toBool(), - b_shiny ); + controls = new ControlsWidget( p_intf, + settings->value( "adv-controls", false ).toBool(), this ); CONNECT( controls, advancedControlsToggled( bool ), this, doComponentsUpdate() ); + inputC = new InputControlsWidget( p_intf, this ); - /* Add the controls Widget to the main Widget */ - mainLayout->insertWidget( 0, controls, 0, Qt::AlignBottom ); - - /* Create the Speed Control Widget */ - speedControl = new SpeedControlWidget( p_intf ); - speedControlMenu = new QMenu( this ); - - QWidgetAction *widgetAction = new QWidgetAction( speedControl ); - widgetAction->setDefaultWidget( speedControl ); - speedControlMenu->addAction( widgetAction ); - - /* Visualisation */ + /* Visualisation */ /* Disabled for now, they SUCK */ #if 0 visualSelector = new VisualSelector( p_intf ); @@ -402,7 +407,6 @@ void MainInterface::handleMainUi( QSettings *settings ) 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 && @@ -413,10 +417,14 @@ void MainInterface::handleMainUi( QSettings *settings ) /* And video Outputs */ if( videoEmbeddedFlag ) - { videoWidget = new VideoWidget( p_intf ); - mainLayout->insertWidget( 0, videoWidget, 10 ); - } + + /* Add the controls Widget to the main Widget */ + mainLayout->insertWidget( 0, bgWidget ); + if( videoWidget ) mainLayout->insertWidget( 0, videoWidget, 10 ); + mainLayout->insertWidget( 2, inputC, 0, Qt::AlignBottom ); + mainLayout->insertWidget( settings->value( "ToolbarPos", 0 ).toInt() ? 0: 3, + controls, 0, Qt::AlignBottom ); /* Finish the sizing */ main->updateGeometry(); @@ -428,11 +436,7 @@ void MainInterface::handleMainUi( QSettings *settings ) /* Create the FULLSCREEN CONTROLS Widget */ 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() ); + fullscreenControls = new FullscreenControllerWidget( p_intf ); } } @@ -542,6 +546,24 @@ int MainInterface::privacyDialog( QList *controls ) QSize MainInterface::sizeHint() const { + if( b_keep_size ) + { + if( i_visualmode == QT_ALWAYS_VIDEO_MODE || + i_visualmode == QT_MINIMAL_MODE ) + { + return mainVideoSize; + } + else + { + if( VISIBLE( bgWidget) || + ( videoIsActive && videoWidget->isVisible() ) + ) + return mainVideoSize; + else + return mainBasedSize; + } + } + int nwidth = controls->sizeHint().width(); int nheight = controls->isVisible() ? controls->size().height() @@ -591,15 +613,6 @@ void MainInterface::debug() #endif } -/**************************************************************************** - * Small right-click menu for rate control - ****************************************************************************/ -void MainInterface::showSpeedMenu( QPoint pos ) -{ - speedControlMenu->exec( QCursor::pos() - pos - + QPoint( 0, speedLabel->height() ) ); -} - /**************************************************************************** * Video Handling ****************************************************************************/ @@ -629,7 +642,8 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x, unsigned int *pi_height ) { /* Request the videoWidget */ - void *ret = videoWidget->request( p_nvout,pi_x, pi_y, pi_width, pi_height ); + void *ret = videoWidget->request( p_nvout,pi_x, pi_y, + pi_width, pi_height, b_keep_size ); if( ret ) /* The videoWidget is available */ { /* Did we have a bg ? Hide it! */ @@ -645,24 +659,20 @@ void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x, videoIsActive = true; emit askUpdate(); - - if( fullscreenControls ) fullscreenControls->attachVout( p_nvout ); } return ret; } /* Call from the WindowClose function */ -void MainInterface::releaseVideo( void *p_win ) +void MainInterface::releaseVideo( void ) { - if( fullscreenControls ) fullscreenControls->detachVout(); - if( p_win ) - emit askReleaseVideo( p_win ); + emit askReleaseVideo( ); } /* Function that is CONNECTED to the previous emit */ -void MainInterface::releaseVideoSlot( void *p_win ) +void MainInterface::releaseVideoSlot( void ) { - videoWidget->release( p_win ); + videoWidget->release( ); if( bgWasVisible ) { @@ -680,6 +690,7 @@ void MainInterface::releaseVideoSlot( void *p_win ) /* Call from WindowControl function */ int MainInterface::controlVideo( void *p_window, int i_query, va_list args ) { + VLC_UNUSED( p_window ); //FIXME remove this param int i_ret = VLC_SUCCESS; switch( i_query ) { @@ -725,7 +736,7 @@ void MainInterface::togglePlaylist() If no playlist exist, then create one and attach it to the DockPL*/ if( !playlistWidget ) { - playlistWidget = new PlaylistWidget( p_intf, this ); + playlistWidget = new PlaylistWidget( p_intf ); i_pl_dock = PL_UNDOCKED; /* i_pl_dock = (pl_dock_e)getSettings() @@ -735,6 +746,8 @@ void MainInterface::togglePlaylist() { playlistWidget->setWindowFlags( Qt::Window ); + /* This will restore the geometry but will not work for position, + because of parenting */ QVLCTools::restoreWidgetPosition( p_intf, "Playlist", playlistWidget, QSize( 600, 300 ) ); } @@ -774,7 +787,7 @@ void MainInterface::toggleMinimalView() if( i_visualmode != QT_ALWAYS_VIDEO_MODE && i_visualmode != QT_MINIMAL_MODE ) { /* NORMAL MODE then */ - if( videoWidget->isHidden() ) emit askBgWidgetToToggle(); + if( !videoWidget || videoWidget->isHidden() ) emit askBgWidgetToToggle(); else { /* If video is visible, then toggle the status of bgWidget */ @@ -785,6 +798,7 @@ void MainInterface::toggleMinimalView() TOGGLEV( menuBar() ); TOGGLEV( controls ); TOGGLEV( statusBar() ); + TOGGLEV( inputC ); doComponentsUpdate(); } @@ -812,7 +826,7 @@ void MainInterface::doComponentsUpdate() void MainInterface::toggleAdvanced() { controls->toggleAdvanced(); - if( fullscreenControls ) fullscreenControls->toggleAdvanced(); +// if( fullscreenControls ) fullscreenControls->toggleAdvanced(); } /* Get the visibility status of the controls (hidden or not, advanced or not) */ @@ -856,47 +870,6 @@ void MainInterface::setName( QString name ) nameLabel->setToolTip( " " + name +" " ); } -void MainInterface::setStatus( int status ) -{ - msg_Dbg( p_intf, "Updating the stream status: %i", status ); - - /* Forward the status to the controls to toggle Play/Pause */ - controls->setStatus( status ); - controls->updateInput(); - - if( fullscreenControls ) - { - fullscreenControls->setStatus( status ); - fullscreenControls->updateInput(); - } - - speedControl->setEnable( THEMIM->getIM()->hasInput() ); - - /* And in the systray for the menu */ - if( sysTray ) - QVLCMenu::updateSystrayMenu( this, p_intf ); -} - -void MainInterface::setRate( int rate ) -{ - QString str; - 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( !vlc_object_alive( p_intf ) ) - { - QApplication::closeAllWindows(); - QApplication::quit(); - } -} - /***************************************************************************** * Systray Icon and Systray Menu *****************************************************************************/ @@ -944,28 +917,31 @@ void MainInterface::toggleUpdateSystrayMenu() } else { - /* Visible */ + /* Visible (possibly under other windows) */ #ifdef WIN32 /* check if any visible window is above vlc in the z-order, - * but ignore the ones always on top */ + * but ignore the ones always on top + * and the ones which can't be activated */ WINDOWINFO wi; HWND hwnd; wi.cbSize = sizeof( WINDOWINFO ); for( hwnd = GetNextWindow( internalWinId(), GW_HWNDPREV ); - hwnd && !IsWindowVisible( hwnd ); + hwnd && ( !IsWindowVisible( hwnd ) || + ( GetWindowInfo( hwnd, &wi ) && + (wi.dwExStyle&WS_EX_NOACTIVATE) ) ); hwnd = GetNextWindow( hwnd, GW_HWNDPREV ) ); - if( !hwnd || !GetWindowInfo( hwnd, &wi ) || + if( !hwnd || !GetWindowInfo( hwnd, &wi ) || (wi.dwExStyle&WS_EX_TOPMOST) ) + { + hide(); + } + else + { + activateWindow(); + } #else - if( isActiveWindow() ) + hide(); #endif - { - hide(); - } - else - { - activateWindow(); - } } QVLCMenu::updateSystrayMenu( this, p_intf ); } @@ -976,13 +952,17 @@ void MainInterface::handleSystrayClick( switch( reason ) { case QSystemTrayIcon::Trigger: + case QSystemTrayIcon::DoubleClick: toggleUpdateSystrayMenu(); break; case QSystemTrayIcon::MiddleClick: + case QSystemTrayIcon::Context: sysTray->showMessage( qtr( "VLC media player" ), qtr( "Control menu for the player" ), QSystemTrayIcon::Information, 3000 ); break; + default: + break; } } @@ -1005,6 +985,8 @@ void MainInterface::updateSystrayTooltipName( QString name ) QSystemTrayIcon::NoIcon, 3000 ); } } + + QVLCMenu::updateSystrayMenu( this, p_intf ); } /** @@ -1052,7 +1034,7 @@ void MainInterface::dropEventPlay( QDropEvent *event, bool b_play ) { if( THEMIM->getIM()->hasInput() ) { - if( input_AddSubtitles( THEMIM->getInput(), + if( !input_AddSubtitle( THEMIM->getInput(), qtu( toNativeSeparators( mimeData->urls()[0].toLocalFile() ) ), true ) ) @@ -1063,7 +1045,7 @@ void MainInterface::dropEventPlay( QDropEvent *event, bool b_play ) } } bool first = b_play; - foreach( QUrl url, mimeData->urls() ) + foreach( const QUrl &url, mimeData->urls() ) { QString s = toNativeSeparators( url.toLocalFile() ); @@ -1072,6 +1054,7 @@ void MainInterface::dropEventPlay( QDropEvent *event, bool b_play ) PLAYLIST_APPEND | (first ? PLAYLIST_GO: 0), PLAYLIST_END, true, false ); first = false; + RecentsMRL::getInstance( p_intf )->addRecent( s ); } } event->acceptProposedAction(); @@ -1105,7 +1088,7 @@ void MainInterface::customEvent( QEvent *event ) } #endif /*else */ - if ( event->type() == SetVideoOnTopEvent_Type ) + if ( event->type() == (int)SetVideoOnTopEvent_Type ) { SetVideoOnTopQtEvent* p_event = (SetVideoOnTopQtEvent*)event; if( p_event->OnTop() ) @@ -1135,6 +1118,27 @@ void MainInterface::keyPressEvent( QKeyEvent *e ) e->ignore(); } +void MainInterface::resizeEvent( QResizeEvent * event ) +{ + if( b_keep_size ) + { + if( i_visualmode == QT_ALWAYS_VIDEO_MODE || + i_visualmode == QT_MINIMAL_MODE ) + { + mainVideoSize = size(); + } + else + { + if( VISIBLE( bgWidget) || + ( videoIsActive && videoWidget->isVisible() ) + ) + mainVideoSize = size(); + else + mainBasedSize = size(); + } + } +} + void MainInterface::wheelEvent( QWheelEvent *e ) { int i_vlckey = qtWheelEventToVLCKey( e ); @@ -1144,6 +1148,7 @@ void MainInterface::wheelEvent( QWheelEvent *e ) void MainInterface::closeEvent( QCloseEvent *e ) { + e->accept(); hide(); THEDP->quit(); } @@ -1186,7 +1191,7 @@ static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable, if( p_intf->pf_show_dialog ) { p_intf->pf_show_dialog( p_intf, INTF_DIALOG_POPUPMENU, - new_val.b_bool, 0 ); + new_val.b_bool, NULL ); } return VLC_SUCCESS; @@ -1204,3 +1209,4 @@ static int IntfShowCB( vlc_object_t *p_this, const char *psz_variable, /* Show event */ return VLC_SUCCESS; } +