*
* Authors: Clément Stenac <zorglub@videolan.org>
* Jean-Baptiste Kempf <jb@videolan.org>
+ * Ilkka Ollakka <ileoo@videolan.org>
*
* 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
#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"
#include <QSize>
#include <QMenu>
#include <QLabel>
+#include <QSlider>
+#include <QWidgetAction>
+#include <QDockWidget>
+#include <QToolBar>
+#include <QGroupBox>
+#include <QDate>
+#include <QProgressBar>
#include <assert.h>
#include <vlc_keys.h>
#include <vlc_vout.h>
-#ifdef WIN32
- #define PREF_W 410
- #define PREF_H 121
-#else
- #define PREF_W 450
- #define PREF_H 160
-#endif
-
#define SET_WIDTH(i,j) i->widgetSize.setWidth(j)
#define SET_HEIGHT(i,j) i->widgetSize.setHeight(j)
#define SET_WH( i,j,k) i->widgetSize.setWidth(j); i->widgetSize.setHeight(k);
#define DS(i) i.width(),i.height()
-#define DEBUG_COLOR 0
-
/* Callback prototypes */
static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t old_val, vlc_value_t new_val, void *param );
MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
{
/* Variables initialisation */
- need_components_update = false;
+ // need_components_update = false;
bgWidget = NULL; videoWidget = NULL; playlistWidget = NULL;
- embeddedPlaylistWasActive = videoIsActive = false;
+ videoIsActive = false;
input_name = "";
+ playlistVisible = false;
+
+ /* Ask for privacy */
+ privacy();
/**
* Configuration and settings
**/
- settings = new QSettings( "VideoLAN", "VLC" );
+ settings = new QSettings( "vlc", "vlc-qt-interface" );
settings->beginGroup( "MainWindow" );
/* Main settings */
setFocusPolicy( Qt::StrongFocus );
- setAcceptDrops(true);
+ setAcceptDrops( true );
setWindowIcon( QApplication::windowIcon() );
+ 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;
+ if( config_GetInt( p_intf, "embedded-video" ) ) videoEmbeddedFlag = true;
+ /* Are we in the enhanced always-video mode or not ? */
alwaysVideoFlag = false;
if( videoEmbeddedFlag && config_GetInt( p_intf, "qt-always-video" ) )
alwaysVideoFlag = true;
/* Set the other interface settings */
- playlistEmbeddedFlag = settings->value("playlist-embedded", true).toBool();
- visualSelectorEnabled= settings->value( "visual-selector", false ).toBool();
+ //TODO: I don't like that code
+ visualSelectorEnabled = settings->value( "visual-selector", false ).toBool();
+ notificationEnabled = config_GetInt( p_intf, "qt-notification" )
+ ? true : false;
/**************************
* UI and Widgets design
setVLCWindowsTitle();
handleMainUi( settings );
- /* Menu Bar */
- QVLCMenu::createMenuBar( this, p_intf, playlistEmbeddedFlag,
- isAdvancedVisible(), visualSelectorEnabled );
-
- /* Status Bar */
- /**
- * TODO: clicking on the elapsed time should switch to the remaining time
- **/
- /**
- * TODO: do we add a label for the current Volume ?
- **/
- timeLabel = new QLabel;
+ /* Create a Dock to get the playlist */
+ 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();
+
+ /************
+ * 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;
- speedLabel = new QLabel( "1.0x" );
+ 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( timeLabel, 2 );
- speedLabel->setContextMenuPolicy ( Qt::CustomContextMenu );
- timeLabel->setContextMenuPolicy ( Qt::CustomContextMenu );
+ 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 ) );
- CONNECT( timeLabel, customContextMenuRequested( QPoint ),
- this, showTimeMenu( QPoint ) );
/**********************
* Systray Management *
{
if( b_systrayAvailable ){
b_createSystray = true;
- hide(); //FIXME
+ hide(); //FIXME BUG HERE
}
else msg_Warn( p_intf, "You can't minize if you haven't a system "
"tray bar" );
if( b_systrayAvailable && b_createSystray )
createSystray();
- /* Init input manager */
- MainInputManager::getInstance( p_intf );
- ON_TIMEOUT( updateOnTimer() );
+ if( config_GetInt( p_intf, "qt-minimal-view" ) )
+ toggleMinimalView();
- /**
- * Various CONNECTs
- **/
+ /********************
+ * Input Manager *
+ ********************/
+ MainInputManager::getInstance( p_intf );
+ /********************
+ * Various CONNECTs *
+ ********************/
/* 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, setDisplay( 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() */
+ /**
+ * 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 ) );
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 */
updateSystrayTooltipStatus( int ) );
}
+ /** OnTimeOut **/
+ // TODO
+ ON_TIMEOUT( updateOnTimer() );
+ //ON_TIMEOUT( debug() );
+
/**
* Callbacks
**/
var_AddCallback( p_playlist, "intf-show", IntfShowCB, p_intf );
vlc_object_release( p_playlist );
}
+
+ /* 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( this, askUpdate(), this, doComponentsUpdate() );
+
+ CONNECT( dockPL, topLevelChanged( bool ), this, doComponentsUpdate() );
+ CONNECT( controls, advancedControlsToggled( bool ),
+ this, doComponentsUpdate() );
+
+ move( settings->value( "pos", QPoint( 0, 0 ) ).toPoint() );
+
+ QSize newSize = settings->value( "size", QSize( 350, 60 ) ).toSize();
+ if( newSize.isValid() )
+ {
+ resize( newSize );
+ }
+ else
+ {
+ msg_Warn( p_intf, "Invalid size in constructor" );
+ }
+
+ int tgPlay = settings->value( "playlist-visible", 0 ).toInt();
+ settings->endGroup();
+
+ if( tgPlay )
+ {
+ togglePlaylist();
+ }
+
+ updateGeometry();
+
}
MainInterface::~MainInterface()
{
+ msg_Dbg( p_intf, "Destroying the main interface" );
+
+ if( playlistWidget ) playlistWidget->savingSettings( settings );
+ if( ExtendedDialog::exists() )
+ ExtendedDialog::getInstance( p_intf )->savingSettings();
+
+ settings->beginGroup( "MainWindow" );
+ 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( bgWidget )
+ settings->setValue( "backgroundSize", bgWidget->size() );
+
+ settings->endGroup();
+ delete settings;
+
/* Unregister callback for the intf-popupmenu variable */
playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_intf,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
vlc_object_release( p_playlist );
}
- settings->setValue( "playlist-embedded", playlistEmbeddedFlag );
- settings->setValue( "adv-controls", isAdvancedVisible() );
- settings->setValue( "pos", pos() );
- settings->endGroup();
- delete settings;
p_intf->b_interaction = VLC_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;
}
/*****************************
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->setMargin( 0 );
/* Create the CONTROLS Widget */
- controls = new ControlsWidget( p_intf,
- settings->value( "adv-controls", false ).toBool() );
-
- /* Configure the Controls */
- BUTTON_SET_IMG( controls->playlistButton, "" , playlist_icon.png,
- playlistEmbeddedFlag ? qtr( "Show playlist" ) :
- qtr( "Open playlist" ) );
- BUTTONACT( controls->playlistButton, togglePlaylist() );
+ /* 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" ) );
/* Add the controls Widget to the main Widget */
- mainLayout->addWidget( controls );
+ mainLayout->insertWidget( 0, controls );
+ /* Create the Speed Control Widget */
+ speedControl = new SpeedControlWidget( p_intf );
+ speedControlMenu = new QMenu( this );
- /* Set initial size */
- resize( PREF_W, PREF_H );
- addSize = QSize( mainLayout->margin() * 2, PREF_H );
+ QWidgetAction *widgetAction = new QWidgetAction( speedControl );
+ widgetAction->setDefaultWidget( speedControl );
+ speedControlMenu->addAction( widgetAction );
/* Visualisation */
+ /* Disabled for now, they SUCK */
+ #if 0
visualSelector = new VisualSelector( p_intf );
mainLayout->insertWidget( 0, visualSelector );
visualSelector->hide();
+ #endif
/* And video Outputs */
if( alwaysVideoFlag )
{
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() );
}
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;
}
/* Finish the sizing */
- setMinimumSize( PREF_W, addSize.height() );
+ updateGeometry();
+}
+
+inline void MainInterface::privacy()
+{
+ /**
+ * Ask for the network policy on FIRST STARTUP
+ **/
+ if( config_GetInt( p_intf, "privacy-ask") )
+ {
+ QList<ConfigControl *> controls;
+ if( privacyDialog( controls ) == QDialog::Accepted )
+ {
+ QList<ConfigControl *>::Iterator i;
+ for( i = controls.begin() ; i != controls.end() ; i++ )
+ {
+ ConfigControl *c = qobject_cast<ConfigControl *>(*i);
+ c->doApply( p_intf );
+ }
+
+ config_PutInt( p_intf, "privacy-ask" , 0 );
+ config_SaveConfigFile( p_intf, NULL );
+ }
+ }
+}
+
+int MainInterface::privacyDialog( QList<ConfigControl *> controls )
+{
+ QDialog *privacy = new QDialog( this );
+
+ privacy->setWindowTitle( qtr( "Privacy and Network policies" ) );
+
+ QGridLayout *gLayout = new QGridLayout( privacy );
+
+ QGroupBox *blabla = new QGroupBox( qtr( "Privacy and Network Warning" ) );
+ QGridLayout *blablaLayout = new QGridLayout( blabla );
+ QLabel *text = new QLabel( qtr(
+ "<p>The <i>VideoLAN Team</i> doesn't like when an application goes "
+ "online without authorization.</p>\n "
+ "<p><i>VLC media player</i> can request limited information on "
+ "Internet, espically to get CD Covers and songs metadata or to know "
+ "if updates are available.</p>\n"
+ "<p><i>VLC media player</i> <b>DOES NOT</b> send or collect <b>ANY</b> "
+ "information, even anonymously about your "
+ "usage.</p>\n"
+ "<p>Therefore please check the following options, the default being "
+ "almost no access on the web.</p>\n") );
+ text->setWordWrap( true );
+ text->setTextFormat( Qt::RichText );
+
+ blablaLayout->addWidget( text, 0, 0 ) ;
+
+ QGroupBox *options = new QGroupBox;
+ QGridLayout *optionsLayout = new QGridLayout( options );
+
+ gLayout->addWidget( blabla, 0, 0, 1, 3 );
+ gLayout->addWidget( options, 1, 0, 1, 3 );
+ module_config_t *p_config;
+ ConfigControl *control;
+ int line = 0;
+
+#define CONFIG_GENERIC( option, type ) \
+ p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \
+ if( p_config ) \
+ { \
+ control = new type ## ConfigControl( VLC_OBJECT(p_intf), \
+ p_config, options, false, optionsLayout, line ); \
+ controls.append( control ); \
+ }
+
+#define CONFIG_GENERIC_NOBOOL( option, type ) \
+ p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \
+ if( p_config ) \
+ { \
+ control = new type ## ConfigControl( VLC_OBJECT(p_intf), \
+ p_config, options, optionsLayout, line ); \
+ controls.append( control ); \
+ }
+
+ CONFIG_GENERIC( "album-art", IntegerList ); line++;
+ CONFIG_GENERIC_NOBOOL( "fetch-meta", Bool ); line++;
+ CONFIG_GENERIC_NOBOOL( "qt-updates-notif", Bool );
+
+ QPushButton *ok = new QPushButton( qtr( "Ok" ) );
+
+ gLayout->addWidget( ok, 2, 2 );
+
+ CONNECT( ok, clicked(), privacy, accept() );
+ 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
**********************************************************************/
-void MainInterface::calculateInterfaceSize()
+
+/* This function is probably wrong, but we don't have many many choices...
+ 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 FIXME it...
+*/
+QSize MainInterface::sizeHint() const
{
- int width = 0, height = 0;
+ 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 ) )
{
- width = bgWidget->widgetSize.width();
- height = bgWidget->widgetSize.height();
- assert( !(playlistWidget && playlistWidget->isVisible() ) );
- }
- else if( VISIBLE( playlistWidget ) )
- {
- width = playlistWidget->widgetSize.width();
- height = playlistWidget->widgetSize.height();
+ nheight += bgWidget->size().height();
+ nwidth = bgWidget->size().width();
+ msg_Dbg( p_intf, "1b %i %i", nheight, nwidth );
}
else if( videoIsActive )
{
- width = videoWidget->widgetSize.width() ;
- height = videoWidget->widgetSize.height();
+ nheight += videoWidget->size().height();
+ nwidth = videoWidget->size().width();
+ msg_Dbg( p_intf, "2 %i %i", nheight, nwidth );
}
- else
+ if( !dockPL->isFloating() && dockPL->isVisible() && dockPL->widget() )
{
- width = PREF_W - addSize.width();
- height = PREF_H - addSize.height();
+ nheight += dockPL->size().height();
+ nwidth = __MAX( nwidth, dockPL->size().width() );
+ msg_Dbg( p_intf, "3 %i %i", nheight, nwidth );
}
- if( VISIBLE( visualSelector ) )
- height += visualSelector->height();
-/* if( VISIBLE( advControls) )
- {
- height += advControls->sizeHint().height();
- }*/
- mainSize = QSize( width + addSize.width(), height + addSize.height() );
+ msg_Dbg( p_intf, "4 %i %i", nheight, nwidth );
+ return QSize( nwidth, nheight );
}
+#if 0
+/* FIXME This is dead code and need to be removed AT THE END */
void MainInterface::resizeEvent( QResizeEvent *e )
{
- videoWidget->widgetSize.setWidth( e->size().width() - addSize.width() );
+ if( videoWidget )
+ videoWidget->widgetSize.setWidth( e->size().width() - addSize.width() );
if( videoWidget && videoIsActive && videoWidget->widgetSize.height() > 1 )
{
SET_WH( videoWidget, e->size().width() - addSize.width(),
}
if( VISIBLE( playlistWidget ) )
{
- SET_WH( playlistWidget , e->size().width() - addSize.width(),
- e->size().height() - addSize.height() );
+// SET_WH( playlistWidget , e->size().width() - addSize.width(),
+ // e->size().height() - addSize.height() );
playlistWidget->updateGeometry();
}
}
+#endif
/****************************************************************************
- * Small right-click menus
+ * Small right-click menu for rate control
****************************************************************************/
void MainInterface::showSpeedMenu( QPoint pos )
{
- QMenu menu( this );
- menu.addAction( "Not Implemented Yet" );
- menu.exec( QCursor::pos() );
-}
-
-void MainInterface::showTimeMenu( QPoint pos )
-{
- QMenu menu( this );
- menu.addAction( "Not Implemented Yet" );
- menu.exec( QCursor::pos() );
+ speedControlMenu->exec( QCursor::pos() - pos
+ + QPoint( 0, speedLabel->height() ) );
}
/****************************************************************************
* Video Handling
****************************************************************************/
+class SetVideoOnTopQtEvent : public QEvent
+{
+public:
+ SetVideoOnTopQtEvent( bool _onTop ) :
+ QEvent( (QEvent::Type)SetVideoOnTopEvent_Type ), onTop( _onTop)
+ {}
+
+ bool OnTop() const
+ {
+ return onTop;
+ }
+
+private:
+ bool onTop;
+};
+
+/* 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;
- if( VISIBLE( playlistWidget ) )
- {
- embeddedPlaylistWasActive = true;
-// playlistWidget->hide();
- }
- bool bgWasVisible = false;
+ /* Did we have a bg ? Hide it! */
if( VISIBLE( bgWidget) )
{
bgWasVisible = true;
- bgWidget->hide();
+ 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(); /// FIXME: Needed ?
- need_components_update = true;
+ /* videoWidget->widgetSize = QSize( *pi_width, *pi_height );
+ }*/
+
+ videoIsActive = true;
+
+ emit askVideoToResize( *pi_width, *pi_height );
+ emit askUpdate();
}
return ret;
}
void MainInterface::releaseVideo( void *p_win )
+{
+ emit askReleaseVideo( p_win );
+}
+
+void MainInterface::releaseVideoSlot( void *p_win )
{
videoWidget->release( p_win );
- videoWidget->widgetSize = QSize( 0, 0 );
- videoWidget->resize( videoWidget->widgetSize );
+ videoWidget->hide();
- if( embeddedPlaylistWasActive )
- playlistWidget->show();
- else if( bgWidget )
+ if( bgWidget )// WORONG
bgWidget->show();
videoIsActive = false;
- need_components_update = true;
+ emit askUpdate();
}
-class SetVideoOnTopQtEvent : public QEvent
-{
-public:
- SetVideoOnTopQtEvent( bool _onTop ) :
- QEvent( (QEvent::Type)SetVideoOnTopEvent_Type ), onTop( _onTop)
- {
- }
-
- bool OnTop() const
- {
- return onTop;
- }
-
-private:
- bool onTop;
-};
-
int MainInterface::controlVideo( void *p_window, int i_query, va_list args )
{
int i_ret = VLC_EGENERIC;
{
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();
+ *pi_width = videoWidget->width();
+ *pi_height = videoWidget->height();
i_ret = VLC_SUCCESS;
break;
}
{
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();
- need_components_update = true;
+ emit askVideoToResize( i_width, i_height );
+ emit askUpdate();
+ updateGeometry();
i_ret = VLC_SUCCESS;
break;
}
**/
void MainInterface::togglePlaylist()
{
- // Toggle the playlist dialog if not embedded and return
- if( !playlistEmbeddedFlag )
- {
- if( playlistWidget )
- {
- /// \todo Destroy it
- }
- THEDP->playlistDialog();
- return;
- }
-
- // Create the playlist Widget and destroy the existing dialog
+ /* CREATION
+ If no playlist exist, then create one and attach it to the DockPL*/
if( !playlistWidget )
{
- PlaylistDialog::killInstance();
- playlistWidget = new PlaylistWidget( p_intf );
- mainLayout->insertWidget( 0, playlistWidget );
- playlistWidget->widgetSize = settings->value( "playlistSize",
- QSize( 650, 310 ) ).toSize();
- playlistWidget->hide();
- if(bgWidget)
- CONNECT( playlistWidget, artSet( QString ), bgWidget, setArt(QString) );
- }
+ playlistWidget = new PlaylistWidget( p_intf, settings, dockPL );
- // And toggle visibility
- if( VISIBLE( playlistWidget ) )
- {
- playlistWidget->hide();
- if( bgWidget ) bgWidget->show();
- if( videoIsActive )
+ /* Add it to the parent DockWidget */
+ dockPL->setWidget( playlistWidget );
+
+ /* Add the dock to the main Interface */
+ addDockWidget( Qt::BottomDockWidgetArea, dockPL );
+
+ /* Make the playlist floating is requested. Default is not. */
+ settings->beginGroup( "MainWindow" );
+ if( settings->value( "playlist-floats", 1 ).toInt() )
{
- videoWidget->widgetSize = savedVideoSize;
- videoWidget->resize( videoWidget->widgetSize );
- videoWidget->updateGeometry();
- if( bgWidget ) bgWidget->hide();
+ 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
{
- playlistWidget->show();
- if( videoIsActive )
- {
- savedVideoSize = videoWidget->widgetSize;
- videoWidget->widgetSize.setHeight( 0 );
- videoWidget->resize( videoWidget->widgetSize );
- videoWidget->updateGeometry();
- }
- if( VISIBLE( bgWidget ) ) bgWidget->hide();
+ /* toggle the visibility of the playlist */
+ TOGGLEV( dockPL );
+ resize( sizeHint() );
+ playlistVisible = !playlistVisible;
}
-
- doComponentsUpdate();
}
+/* Function called from the menu to undock the playlist */
void MainInterface::undockPlaylist()
{
- if( playlistWidget )
- {
- playlistWidget->hide();
- playlistWidget->deleteLater();
- mainLayout->removeWidget( playlistWidget );
- playlistWidget = NULL;
- playlistEmbeddedFlag = false;
+ dockPL->setFloating( true );
+ resize( sizeHint() );
+}
- menuBar()->clear();
- QVLCMenu::createMenuBar( this, p_intf, false, isAdvancedVisible(),
- visualSelectorEnabled);
+void MainInterface::toggleMinimalView()
+{
+ TOGGLEV( menuBar() );
+ TOGGLEV( controls );
+ TOGGLEV( statusBar() );
+ doComponentsUpdate();
+}
- if( videoIsActive )
- {
- videoWidget->widgetSize = savedVideoSize;
- videoWidget->resize( videoWidget->widgetSize );
- videoWidget->updateGeometry();
- }
+/* Video widget cannot do this synchronously as it runs in another thread */
+/* Well, could it, actually ? Probably dangerous ... */
+void MainInterface::doComponentsUpdate()
+{
+ resize( sizeHint() );
+ msg_Dbg( p_intf, "Updating the geometry" );
+ updateGeometry();
+}
- doComponentsUpdate();
- THEDP->playlistDialog();
- }
+/* toggling advanced controls buttons */
+void MainInterface::toggleAdvanced()
+{
+ controls->toggleAdvanced();
+}
+
+/* Get the visibility status of the controls (hidden or not, advanced or not) */
+int MainInterface::getControlsVisibilityStatus()
+{
+ return( (controls->isVisible() ? CONTROLS_VISIBLE : CONTROLS_HIDDEN )
+ + CONTROLS_ADVANCED * controls->b_advancedVisible );
}
#if 0
}
#endif
-void MainInterface::toggleMenus()
-{
- if( menuBar()->isVisible() ) menuBar()->hide();
- else menuBar()->show();
- msg_Dbg( p_intf, "I was there: \\_o<~~ coin coin" );
-}
-
-/* Video widget cannot do this synchronously as it runs in another thread */
-/* Well, could it, actually ? Probably dangerous ... */
-void MainInterface::doComponentsUpdate()
-{
- calculateInterfaceSize();
- resize( mainSize );
-}
-
-void MainInterface::toggleAdvanced()
-{
- controls->toggleAdvanced();
-}
-
-bool MainInterface::isAdvancedVisible()
-{
- return controls->b_advancedVisible;
-}
-
/************************************************************************
* Other stuff
************************************************************************/
-void MainInterface::setDisplay( float pos, int time, int length )
+void MainInterface::setDisplayPosition( float pos, int time, int length )
{
char psz_length[MSTRTIME_MAX_SIZE], psz_time[MSTRTIME_MAX_SIZE];
secstotimestr( psz_length, length );
- secstotimestr( psz_time, time );
- QString title;
- title.sprintf( "%s/%s", psz_time, psz_length );
- timeLabel->setText( " "+title+" " );
+ secstotimestr( psz_time, ( b_remainingTime && length ) ? length - time
+ : 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( " -"+timestr+" " );
+ else timeLabel->setText( " "+timestr+" " );
+}
+
+void MainInterface::toggleTimeDisplay()
+{
+ b_remainingTime = !b_remainingTime;
}
void MainInterface::setName( QString name )
{
- input_name = name;
- nameLabel->setText( " " + name+" " );
+ input_name = name; /* store it for the QSystray use */
+ /* Display it in the status bar, but also as a Tooltip in case it doesn't
+ fit in the label */
+ nameLabel->setText( " " + name + " " );
+ nameLabel->setToolTip( " " + name +" " );
}
void MainInterface::setStatus( int status )
{
+ /* Forward the status to the controls to toggle Play/Pause */
controls->setStatus( status );
+ /* And in the systray for the menu */
if( sysTray )
- updateSystrayMenu( status );
+ 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 );
+ speedControl->updateControls( rate );
}
void MainInterface::updateOnTimer()
{
- /* \todo Make this event-driven */
if( intf_ShouldDie( p_intf ) )
{
QApplication::closeAllWindows();
QApplication::quit();
}
+#if 0
if( need_components_update )
{
doComponentsUpdate();
need_components_update = false;
}
-
- controls->updateOnTimer();
+#endif
}
/*****************************************************************************
**/
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" ));
QVLCMenu::updateSystrayMenu( this, p_intf, true );
sysTray->show();
- CONNECT( sysTray, activated( QSystemTrayIcon::ActivationReason ),
+ CONNECT( sysTray, activated( QSystemTrayIcon::ActivationReason ),
this, handleSystrayClick( QSystemTrayIcon::ActivationReason ) );
}
-/**
- * Update the menu of the Systray Icon.
- * May be unneedded, since it just calls QVLCMenu::update
- * FIXME !!!
- **/
-void MainInterface::updateSystrayMenu( int status )
-{
- QVLCMenu::updateSystrayMenu( this, p_intf ) ;
-}
-
/**
* Updates the Systray Icon's menu and toggle the main interface
*/
void MainInterface::toggleUpdateSystrayMenu()
{
+ /* If hidden, show it */
if( isHidden() )
{
show();
activateWindow();
}
+ 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 */
case QSystemTrayIcon::MiddleClick:
sysTray->showMessage( qtr( "VLC media player" ),
qtr( "Control menu for the player" ),
- QSystemTrayIcon::Information, 4000 );
+ QSystemTrayIcon::Information, 3000 );
break;
}
}
/**
* Updates the name of the systray Icon tooltip.
* Doesn't check if the systray exists, check before you call it.
- * FIXME !!! Fusion with next function ?
**/
void MainInterface::updateSystrayTooltipName( QString name )
{
else
{
sysTray->setToolTip( name );
- sysTray->showMessage( qtr( "VLC media player" ), name,
- QSystemTrayIcon::NoIcon, 4000 );
+ if( notificationEnabled && ( isHidden() || isMinimized() ) )
+ {
+ sysTray->showMessage( qtr( "VLC media player" ), name,
+ QSystemTrayIcon::NoIcon, 3000 );
+ }
}
}
switch( i_status )
{
case 0:
+ case END_S:
{
sysTray->setToolTip( qtr( "VLC media player" ) );
break;
case PLAYING_S:
{
sysTray->setToolTip( input_name );
- //+ " - " + qtr( "Playing" ) );
break;
}
case PAUSE_S:
************************************************************************/
void MainInterface::customEvent( QEvent *event )
{
+#if 0
if( event->type() == PLDockEvent_Type )
{
PlaylistDialog::killInstance();
playlistEmbeddedFlag = true;
menuBar()->clear();
- QVLCMenu::createMenuBar(this, p_intf, true, isAdvancedVisible(),
- visualSelectorEnabled);
+ QVLCMenu::createMenuBar(this, p_intf, true, visualSelectorEnabled);
togglePlaylist();
}
- else if ( event->type() == SetVideoOnTopEvent_Type )
+#endif
+ /*else */
+ if ( event->type() == SetVideoOnTopEvent_Type )
{
SetVideoOnTopQtEvent* p_event = (SetVideoOnTopQtEvent*)event;
if( p_event->OnTop() )
void MainInterface::keyPressEvent( QKeyEvent *e )
{
+ if( ( e->modifiers() & Qt::ControlModifier ) && ( e->key() & Qt::Key_H )
+ && menuBar()->isHidden() )
+ {
+ toggleMinimalView();
+ e->accept();
+ }
+
int i_vlck = qtEventToVLCKey( e );
- if( i_vlck >= 0 )
+ if( i_vlck > 0 )
{
var_SetInteger( p_intf->p_libvlc, "key-pressed", i_vlck );
e->accept();
{
hide();
vlc_object_kill( p_intf );
+ QApplication::closeAllWindows();
+ QApplication::quit();
}
/*****************************************************************************
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 )
{
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;
return VLC_SUCCESS;
projects / vlc / blobdiff