X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmain_interface.cpp;h=0611c1a8123d13e13c677c91e8bdd65598a0a1bf;hb=69afa8556007dbb6424cacffb174aa3bb84733f1;hp=474867c68003747953c9d11b8086dd26adb83c4d;hpb=1e6611ff9d558aeec43a781b816a5aa114105bec;p=vlc
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 474867c680..0611c1a812 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -6,6 +6,7 @@
*
* Authors: Clément Stenac
* Jean-Baptiste Kempf
+ * Ilkka Ollakka
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,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"
@@ -29,6 +34,8 @@
#include "util/customwidgets.hpp"
#include "dialogs_provider.hpp"
#include "components/interface_widgets.hpp"
+#include "components/playlist/playlist.hpp"
+#include "dialogs/extended.hpp"
#include "dialogs/playlist.hpp"
#include "menus.hpp"
@@ -44,9 +51,13 @@
#include
#include
#include
+#if 0
#include
+#endif
#include
#include
+#include
+#include
#include
#include
@@ -65,54 +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;
- embeddedPlaylistWasActive = videoIsActive = false;
+ // need_components_update = false;
+ bgWidget = NULL;
+ videoWidget = NULL;
+ playlistWidget = NULL;
+ sysTray = NULL;
+ videoIsActive = false;
+ playlistVisible = false;
input_name = "";
- /**
- * Ask for the network policy on FIRST STARTUP
- **/
- if( config_GetInt( p_intf, "privacy-ask") )
- {
- QList controls;
- privacyDialog( controls );
-
- QList::Iterator i;
- for( i = controls.begin() ; i != controls.end() ; i++ )
- {
- ConfigControl *c = qobject_cast(*i);
- c->doApply( p_intf );
- }
-
- config_PutInt( p_intf, "privacy-ask" , 0 );
- config_SaveConfigFile( p_intf, NULL );
- }
+ /* Ask for 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 );
@@ -120,18 +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" );
- alwaysVideoFlag = false;
- if( videoEmbeddedFlag && config_GetInt( p_intf, "qt-always-video" ) )
- alwaysVideoFlag = true;
+ /* Are we in the enhanced always-video mode or not ? */
+ 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
@@ -139,97 +122,47 @@ 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, QSizePolicy::MinimumExpanding );
+ 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();
+#endif
/************
- * Menu Bar
+ * Menu Bar
************/
QVLCMenu::createMenuBar( this, p_intf, visualSelectorEnabled );
- /****************
- * Status Bar *
- ****************/
-
- /* Widgets Creation*/
- b_remainingTime = false;
- timeLabel = new TimeLabel;
- 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);
-
- /* and adding those */
- statusBar()->addWidget( nameLabel, 8 );
- statusBar()->addPermanentWidget( speedLabel, 0 );
- statusBar()->addPermanentWidget( timeLabel, 2 );
-
- /* 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();
+ /* StatusBar Creation */
+ createStatusBar();
- /* Init input manager */
- MainInputManager::getInstance( p_intf );
- ON_TIMEOUT( updateOnTimer() );
- //ON_TIMEOUT( debug() );
/********************
- * Various CONNECTs *
+ * Input Manager *
********************/
+ MainInputManager::getInstance( p_intf );
+ /**************************
+ * 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 */
CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
this, setDisplayPosition( float, int, int ) );
-
+ /* 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,
@@ -247,7 +180,9 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
setVLCWindowsTitle( QString ) );
}
- /** CONNECTS on PLAY_STATUS **/
+ /**
+ * CONNECTS on PLAY_STATUS
+ **/
/* Status on the main controller */
CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) );
/* and in the systray */
@@ -257,68 +192,174 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
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 */
+ ON_TIMEOUT( updateOnTimer() );
+ //ON_TIMEOUT( debug() );
+
/**
* Callbacks
**/
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 );
- CONNECT( this, askReleaseVideo( void * ), this, releaseVideoSlot( void * ) );
+ /* 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 ) );
- CONNECT( dockPL, topLevelChanged( bool ), this, doComponentsUpdate() );
- // DEBUG FIXME
- hide();
+ CONNECT( this, askUpdate(), this, doComponentsUpdate() );
+ CONNECT( controls, advancedControlsToggled( bool ),
+ this, doComponentsUpdate() );
- updateGeometry();
+ CONNECT( fullscreenControls, advancedControlsToggled( bool ),
+ this, doComponentsUpdate() );
+
+ CONNECT( THEMIM->getIM(), inputUnset(),
+ fullscreenControls, unregFullscreenCallback() );
+
+
+ /* Size and placement of interface */
+ QVLCTools::restoreWidgetPosition(settings,this,QSize(350,60));
+
+
+ /* Playlist */
+ if( settings->value( "playlist-visible", 0 ).toInt() ) togglePlaylist();
settings->endGroup();
+
+ 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()
{
- if( playlistWidget ) playlistWidget->saveSettings( settings );
+ msg_Dbg( p_intf, "Destroying the main interface" );
+
+ if( playlistWidget )
+ playlistWidget->savingSettings( settings );
settings->beginGroup( "MainWindow" );
- settings->setValue( "playlist-floats", dockPL->isFloating() );
- settings->setValue( "adv-controls", getControlsVisibilityStatus() & CONTROLS_ADVANCED );
- settings->setValue( "pos", pos() );
+
+ // settings->setValue( "playlist-floats", (int)(dockPL->isFloating()) );
+ settings->setValue( "playlist-visible", (int)playlistVisible );
+ settings->setValue( "adv-controls",
+ getControlsVisibilityStatus() & CONTROLS_ADVANCED );
+
+ 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 );
- }
-
- p_intf->b_interaction = VLC_FALSE;
+ 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 = 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...
@@ -338,31 +379,36 @@ void MainInterface::setVLCWindowsTitle( QString aTitle )
void MainInterface::handleMainUi( QSettings *settings )
{
/* Create the main Widget and the mainLayout */
- QWidget *main = new QWidget( this );
- mainLayout = new QVBoxLayout( main );
+ QWidget *main = new QWidget;
setCentralWidget( main );
+ mainLayout = new QVBoxLayout( main );
/* 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" );
- controls = new ControlsWidget( p_intf,
+ /* bool b_shiny = config_GetInt( p_intf, "qt-blingbling" ); */
+ controls = new ControlsWidget( p_intf, this,
settings->value( "adv-controls", false ).toBool(),
- b_shiny );
+ config_GetInt( p_intf, "qt-blingbling" ) );
- /* Configure the Controls, the playlist button doesn't trigger THEDP
- but the toggle from this MainInterface */
- BUTTONACT( controls->playlistButton, togglePlaylist() );
+ /* 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->addWidget( controls );
+ 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( this );
+
+ QWidgetAction *widgetAction = new QWidgetAction( speedControl );
widgetAction->setDefaultWidget( speedControl );
speedControlMenu->addAction( widgetAction );
@@ -375,12 +421,12 @@ 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->widgetSize = settings->value( "backgroundSize",
- QSize( 300, 300 ) ).toSize();
- bgWidget->resize( bgWidget->widgetSize );
+ bgWidget->resize(
+ settings->value( "backgroundSize", QSize( 300, 150 ) ).toSize() );
bgWidget->updateGeometry();
mainLayout->insertWidget( 0, bgWidget );
CONNECT( this, askBgWidgetToToggle(), bgWidget, toggle() );
@@ -389,22 +435,44 @@ void MainInterface::handleMainUi( QSettings *settings )
if( videoEmbeddedFlag )
{
videoWidget = new VideoWidget( p_intf );
- videoWidget->widgetSize = QSize( 1, 1 );
- //videoWidget->resize( videoWidget->widgetSize );
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::askForPrivacy()
+{
+ /**
+ * Ask for the network policy on FIRST STARTUP
+ **/
+ if( config_GetInt( p_intf, "qt-privacy-ask") )
+ {
+ QList controls;
+ if( privacyDialog( controls ) == QDialog::Accepted )
+ {
+ QList::Iterator i;
+ for( i = controls.begin() ; i != controls.end() ; i++ )
+ {
+ ConfigControl *c = qobject_cast(*i);
+ c->doApply( p_intf );
+ }
+
+ 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 );
+ }
+ }
}
-void MainInterface::privacyDialog( QList controls )
+int MainInterface::privacyDialog( QList controls )
{
- QDialog *privacy = new QDialog( this );
+ QDialog *privacy = new QDialog();
privacy->setWindowTitle( qtr( "Privacy and Network policies" ) );
@@ -414,13 +482,12 @@ void MainInterface::privacyDialog( QList controls )
QGridLayout *blablaLayout = new QGridLayout( blabla );
QLabel *text = new QLabel( qtr(
"The VideoLAN Team doesn't like when an application goes "
- "online without authorisation.
\n "
+ "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 );
@@ -457,22 +524,19 @@ void 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" ) );
gLayout->addWidget( ok, 2, 2 );
CONNECT( ok, clicked(), privacy, accept() );
- privacy->exec();
+ return privacy->exec();
}
-//FIXME remove me at the end...
-void MainInterface::debug()
-{
- msg_Dbg( p_intf, "size: %i - %i", controls->size().height(), controls->size().width() );
- msg_Dbg( p_intf, "sizeHint: %i - %i", controls->sizeHint().height(), controls->sizeHint().width() );
-}
/**********************************************************************
* Handling of sizing of the components
@@ -482,28 +546,45 @@ void MainInterface::debug()
Since we can't know from the playlist Widget if we are inside a dock or not,
because the playlist Widget can be called by THEDP, as a separate windows for
the skins.
- Maybe the other solution is to redefine the sizeHint() of the playlist and
- ask _parent->isFloating()...
- If you think this would be better, please FIX it...
+ Maybe the other solution is to redefine the sizeHint() of the playlist and
+ ask _parent->isFloating()...
+ If you think this would be better, please FIXME it...
*/
+#if 0
QSize MainInterface::sizeHint() const
{
- QSize tempSize = controls->sizeHint() +
- QSize( 100, menuBar()->size().height() + statusBar()->size().height() );
-
+ int nwidth = controls->sizeHint().width();
+ int nheight = controls->isVisible() ?
+ controls->size().height()
+ + menuBar()->size().height()
+ + statusBar()->size().height()
+ : 0 ;
+
+ msg_Dbg( p_intf, "1 %i %i", nheight, nwidth );
if( VISIBLE( bgWidget ) )
- tempSize += bgWidget->sizeHint();
+ {
+ nheight += bgWidget->size().height();
+ nwidth = bgWidget->size().width();
+ msg_Dbg( p_intf, "1b %i %i", nheight, nwidth );
+ }
else if( videoIsActive )
- tempSize += videoWidget->size();
-
- if( !dockPL->isFloating() && dockPL->widget() )
- tempSize += dockPL->widget()->size();
-
- return tempSize;
+ {
+ nheight += videoWidget->size().height();
+ nwidth = videoWidget->size().width();
+ msg_Dbg( p_intf, "2 %i %i", nheight, nwidth );
+ }
+/* 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
-/* This is dead code and need to be removed AT THE END */
+/* FIXME This is dead code and need to be removed AT THE END */
void MainInterface::resizeEvent( QResizeEvent *e )
{
if( videoWidget )
@@ -516,7 +597,6 @@ void MainInterface::resizeEvent( QResizeEvent *e )
}
if( VISIBLE( playlistWidget ) )
{
- //FIXME
// SET_WH( playlistWidget , e->size().width() - addSize.width(),
// e->size().height() - addSize.height() );
playlistWidget->updateGeometry();
@@ -524,13 +604,32 @@ 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
****************************************************************************/
void MainInterface::showSpeedMenu( QPoint pos )
{
speedControlMenu->exec( QCursor::pos() - pos
- + QPoint( 0, speedLabel->height() ) );
+ + QPoint( 0, speedLabel->height() ) );
}
/****************************************************************************
@@ -552,40 +651,60 @@ 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,
int *pi_y, unsigned int *pi_width,
unsigned int *pi_height )
{
+ bool bgWasVisible = false;
+
+ /* Request the videoWidget */
void *ret = videoWidget->request( p_nvout,pi_x, pi_y, pi_width, pi_height );
- if( ret )
+ if( ret ) /* The videoWidget is available */
{
- videoIsActive = true;
- bool bgWasVisible = false;
-
- /* Did we have a bg ? */
+ /* Did we have a bg ? Hide it! */
if( VISIBLE( bgWidget) )
{
bgWasVisible = true;
emit askBgWidgetToToggle();
}
- if( THEMIM->getIM()->hasVideo() || !bgWasVisible )
+ /*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->updateGeometry(); // Needed for deinterlace
- updateGeometry();
+ /* videoWidget->widgetSize = QSize( *pi_width, *pi_height );
+ }*/
+
+ videoIsActive = true;
+
+ 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 );
@@ -596,45 +715,42 @@ void MainInterface::releaseVideoSlot( void *p_win )
videoWidget->release( p_win );
videoWidget->hide();
- if( bgWidget )
+ if( bgWidget )// WRONG
bgWidget->show();
+ adjustSize();
videoIsActive = false;
- updateGeometry();
}
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->widgetSize.width();
- *pi_height = videoWidget->widgetSize.height();
- i_ret = VLC_SUCCESS;
+ *pi_width = videoWidget->videoSize.width();
+ *pi_height = videoWidget->videoSize.height();
break;
}
case VOUT_SET_SIZE:
{
unsigned int i_width = va_arg( args, unsigned int );
unsigned int i_height = va_arg( args, unsigned int );
- videoWidget->widgetSize = QSize( i_width, i_height );
- videoWidget->updateGeometry();
- updateGeometry();
- i_ret = VLC_SUCCESS;
+ emit askVideoToResize( i_width, i_height );
+ emit askUpdate();
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;
}
@@ -649,15 +765,13 @@ int MainInterface::controlVideo( void *p_window, int i_query, va_list args )
**/
void MainInterface::togglePlaylist()
{
- /* CREATION
+ THEDP->playlistDialog();
+#if 0
+ /* CREATION
If no playlist exist, then create one and attach it to the DockPL*/
if( !playlistWidget )
{
- msg_Dbg( p_intf, "Creating a new playlist" );
- playlistWidget = new PlaylistWidget( p_intf, settings );
- if( bgWidget )
- CONNECT( playlistWidget, artSet( QString ),
- bgWidget, setArt(QString) );
+ playlistWidget = new PlaylistWidget( p_intf, settings, dockPL );
/* Add it to the parent DockWidget */
dockPL->setWidget( playlistWidget );
@@ -666,29 +780,38 @@ void MainInterface::togglePlaylist()
addDockWidget( Qt::BottomDockWidgetArea, dockPL );
/* Make the playlist floating is requested. Default is not. */
- if( settings->value( "playlist-floats", false ).toBool() );
+ settings->beginGroup( "MainWindow" );
+ if( settings->value( "playlist-floats", 1 ).toInt() )
{
- msg_Dbg( p_intf, "we don't want it inside");
+ msg_Dbg( p_intf, "we don't want the playlist inside");
dockPL->setFloating( true );
}
+ settings->endGroup();
+ settings->beginGroup( "playlist" );
+ dockPL->move( settings->value( "pos", QPoint( 0,0 ) ).toPoint() );
+ QSize newSize = settings->value( "size", QSize( 400, 300 ) ).toSize();
+ if( newSize.isValid() )
+ dockPL->resize( newSize );
+ settings->endGroup();
+
+ dockPL->show();
+ playlistVisible = true;
}
else
{
/* toggle the visibility of the playlist */
TOGGLEV( dockPL );
- //resize(sizeHint());
+ resize( sizeHint() );
+ playlistVisible = !playlistVisible;
}
-#if 0
- doComponentsUpdate();
-#endif
- updateGeometry();
+ #endif
}
/* Function called from the menu to undock the playlist */
void MainInterface::undockPlaylist()
{
- dockPL->setFloating( true );
- updateGeometry();
+// dockPL->setFloating( true );
+ adjustSize();
}
void MainInterface::toggleMinimalView()
@@ -696,14 +819,16 @@ void MainInterface::toggleMinimalView()
TOGGLEV( menuBar() );
TOGGLEV( controls );
TOGGLEV( statusBar() );
- updateGeometry();
+ doComponentsUpdate();
}
/* Video widget cannot do this synchronously as it runs in another thread */
/* Well, could it, actually ? Probably dangerous ... */
void MainInterface::doComponentsUpdate()
{
- updateGeometry();
+ msg_Dbg( p_intf, "Updating the geometry" );
+// resize( sizeHint() );
+ debug();
}
/* toggling advanced controls buttons */
@@ -751,18 +876,18 @@ void MainInterface::setDisplayPosition( float pos, int time, int length )
secstotimestr( psz_time, ( b_remainingTime && length ) ? length - time
: time );
- QString title;
- title.sprintf( "%s/%s", psz_time,
+ QString timestr;
+ timestr.sprintf( "%s/%s", psz_time,
( !length && time ) ? "--:--" : psz_length );
/* Add a minus to remaining time*/
- if( b_remainingTime && length ) timeLabel->setText( " -"+title+" " );
- else timeLabel->setText( " "+title+" " );
+ if( b_remainingTime && length ) timeLabel->setText( " -"+timestr+" " );
+ else timeLabel->setText( " "+timestr+" " );
}
void MainInterface::toggleTimeDisplay()
{
- b_remainingTime = ( b_remainingTime ? false : true );
+ b_remainingTime = !b_remainingTime;
}
void MainInterface::setName( QString name )
@@ -776,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 );
@@ -786,29 +918,21 @@ void MainInterface::setStatus( int status )
void MainInterface::setRate( int rate )
{
QString str;
- str.setNum( ( 1000 / (double)rate), 'f', 2 );
+ str.setNum( ( 1000 / (double)rate ), 'f', 2 );
str.append( "x" );
speedLabel->setText( str );
+ speedLabel->setToolTip( str );
speedControl->updateControls( rate );
}
void MainInterface::updateOnTimer()
{
- /* \todo Make this event-driven */
+ /* 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
-
- controls->updateOnTimer();
}
/*****************************************************************************
@@ -821,7 +945,11 @@ void MainInterface::updateOnTimer()
**/
void MainInterface::createSystray()
{
- QIcon iconVLC = QIcon( QPixmap( ":/vlc128.png" ) );
+ QIcon iconVLC;
+ if( QDate::currentDate().dayOfYear() >= 354 )
+ iconVLC = QIcon( QPixmap( ":/vlc128-christmas.png" ) );
+ else
+ iconVLC = QIcon( QPixmap( ":/vlc128.png" ) );
sysTray = new QSystemTrayIcon( iconVLC, this );
sysTray->setToolTip( qtr( "VLC media player" ));
@@ -840,6 +968,7 @@ void MainInterface::createSystray()
*/
void MainInterface::toggleUpdateSystrayMenu()
{
+ /* If hidden, show it */
if( isHidden() )
{
show();
@@ -847,11 +976,13 @@ void MainInterface::toggleUpdateSystrayMenu()
}
else if( isMinimized() )
{
+ /* Minimized */
showNormal();
activateWindow();
}
else
{
+ /* Visible */
#ifdef WIN32
/* check if any visible window is above vlc in the z-order,
* but ignore the ones always on top */
@@ -888,7 +1019,7 @@ void MainInterface::handleSystrayClick(
case QSystemTrayIcon::MiddleClick:
sysTray->showMessage( qtr( "VLC media player" ),
qtr( "Control menu for the player" ),
- QSystemTrayIcon::Information, 4000 );
+ QSystemTrayIcon::Information, 3000 );
break;
}
}
@@ -909,7 +1040,7 @@ void MainInterface::updateSystrayTooltipName( QString name )
if( notificationEnabled && ( isHidden() || isMinimized() ) )
{
sysTray->showMessage( qtr( "VLC media player" ), name,
- QSystemTrayIcon::NoIcon, 4000 );
+ QSystemTrayIcon::NoIcon, 3000 );
}
}
}
@@ -923,6 +1054,7 @@ void MainInterface::updateSystrayTooltipStatus( int i_status )
switch( i_status )
{
case 0:
+ case END_S:
{
sysTray->setToolTip( qtr( "VLC media player" ) );
break;
@@ -955,7 +1087,7 @@ void MainInterface::dropEvent(QDropEvent *event)
{
if( input_AddSubtitles( THEMIM->getInput(),
qtu( mimeData->urls()[0].toString() ),
- VLC_TRUE ) )
+ true ) )
{
event->acceptProposedAction();
return;
@@ -963,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;
}
}
@@ -1043,7 +1176,15 @@ void MainInterface::wheelEvent( QWheelEvent *e )
void MainInterface::closeEvent( QCloseEvent *e )
{
hide();
- vlc_object_kill( p_intf );
+ THEDP->quit();
+}
+
+void MainInterface::toggleFullScreen( void )
+{
+ if( isFullScreen() )
+ showNormal();
+ else
+ showFullScreen();
}
/*****************************************************************************
@@ -1080,13 +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;
- //p_intf->p_sys->b_intf_show = VLC_TRUE;
+ p_intf->p_sys->p_mi->requestLayoutUpdate();
return VLC_SUCCESS;
}