/*****************************************************************************
* main_interface.cpp : Main interface
****************************************************************************
- * Copyright (C) 2006-2008 the VideoLAN team
+ * Copyright (C) 2006-2009 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
#include "components/interface_widgets.hpp"
#include "components/controller.hpp"
#include "components/playlist/playlist.hpp"
+#include "dialogs/external.hpp"
#include "menus.hpp"
#include "recents.hpp"
vlc_value_t old_val, vlc_value_t new_val, void *param );
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 *);
MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
{
playlistVisible = false;
input_name = "";
fullscreenControls = NULL;
+ cryptedLabel = NULL;
+ controls = NULL;
+ inputC = NULL;
+ b_shouldHide = false;
+
+ bgWasVisible = false;
+ i_bg_height = 0;
/* Ask for privacy */
askForPrivacy();
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();
-
/* Do we want anoying popups or not */
notificationEnabled = (bool)config_GetInt( p_intf, "qt-notification" );
+ /**************
+ * Status Bar *
+ **************/
+ createStatusBar();
+
/**************************
* UI and Widgets design
**************************/
setVLCWindowsTitle();
- handleMainUi( settings );
+ createMainWidget( settings );
+
+ /************
+ * Menu Bar *
+ ************/
+ QVLCMenu::createMenuBar( this, p_intf );
+ CONNECT( THEMIM->getIM(), voutListChanged( vout_thread_t **, int ),
+ this, destroyPopupMenu() );
#if 0
/* Create a Dock to get the playlist */
dockPL->hide();
#endif
- /**************************
- * Menu Bar and Status Bar
- **************************/
- QVLCMenu::createMenuBar( this, p_intf, visualSelectorEnabled );
-
- /* StatusBar Creation */
- createStatusBar();
-
/********************
* Input Manager *
********************/
MainInputManager::getInstance( p_intf );
+ /*********************************
+ * Create the Systray Management *
+ *********************************/
+ initSystray();
+
/**************************
* Various CONNECTs on IM *
**************************/
this, updateSystrayTooltipStatus( int ) );
}
- /* END CONNECTS ON IM */
+ /* END CONNECTS ON IM */
/************
* Callbacks
************/
- var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
- var_AddCallback( p_intf, "interaction", InteractCallback, this );
- interaction_Register( p_intf );
-
var_AddCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
/* Register callback for the intf-popupmenu variable */
this, SLOT(releaseVideoSlot( void )), Qt::BlockingQueuedConnection );
if( videoWidget )
+ {
CONNECT( this, askVideoToResize( unsigned int, unsigned int ),
videoWidget, SetSizing( unsigned int, unsigned int ) );
+ connect( this, SIGNAL(askVideoToShow( unsigned int, unsigned int)),
+ videoWidget, SLOT(SetSizing(unsigned int, unsigned int )),
+ Qt::BlockingQueuedConnection );
+ }
+
CONNECT( this, askUpdate(), this, doComponentsUpdate() );
+ CONNECT( THEDP, toolBarConfUpdated(), this, recreateToolbars() );
/* Size and placement of interface */
settings->beginGroup( "MainWindow" );
/* Playlist */
if( b_visible ) togglePlaylist();
+ /* Enable the popup menu in the MI */
+ setContextMenuPolicy( Qt::CustomContextMenu );
+ CONNECT( this, customContextMenuRequested( const QPoint& ),
+ this, popupMenu( const QPoint& ) );
+
/* Final sizing and showing */
setMinimumWidth( __MAX( controls->sizeHint().width(),
menuBar()->sizeHint().width() ) );
- show();
+ setVisible( !b_shouldHide );
/* And switch to minimal view if needed
Must be called after the show() */
if( i_visualmode == QT_MINIMAL_MODE )
- toggleMinimalView();
+ toggleMinimalView( true );
/* Update the geometry : It is useful if you switch between
qt-display-modes ?*/
updateGeometry();
resize( sizeHint() );
- /*****************************************************
- * End everything by creating the Systray Management *
- *****************************************************/
- initSystray();
}
MainInterface::~MainInterface()
{
msg_Dbg( p_intf, "Destroying the main interface" );
+ /* Unsure we hide the videoWidget before destroying it */
if( videoIsActive ) videoWidget->hide();
+ /* Save playlist state */
if( playlistWidget )
{
if( !isDocked() )
delete playlistWidget;
}
+ /* Be sure to kill the actionsManager... FIXME */
ActionsManager::killInstance();
- settings->beginGroup( "MainWindow" );
+ /* Delete the FSC controller */
+ delete fullscreenControls;
+ /* Save states */
+ settings->beginGroup( "MainWindow" );
settings->setValue( "pl-dock-status", (int)i_pl_dock );
settings->setValue( "playlist-visible", (int)playlistVisible );
settings->setValue( "adv-controls",
if( bgWidget )
settings->setValue( "backgroundSize", bgWidget->size() );
+ /* Save this size */
QVLCTools::saveWidgetPosition(settings, this);
settings->endGroup();
- var_DelCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
- /* Unregister callback for the intf-popupmenu variable */
+ /* Unregister callbacks */
+ var_DelCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
var_DelCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
- interaction_Unregister( p_intf );
- var_DelCallback( p_intf, "interaction", InteractCallback, this );
-
p_intf->p_sys->p_mi = NULL;
}
/*****************************
* Main UI handling *
*****************************/
-
-inline void MainInterface::createStatusBar()
+void MainInterface::recreateToolbars()
{
- /****************
- * Status Bar *
- ****************/
- /* Widgets Creation*/
- TimeLabel *timeLabel = new TimeLabel( p_intf );
- nameLabel = new QLabel;
- nameLabel->setTextInteractionFlags( Qt::TextSelectableByMouse
- | Qt::TextSelectableByKeyboard );
- SpeedLabel *speedLabel = new SpeedLabel( p_intf, "1.00x" );
-
- /* 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, 0 );
-
- /* timeLabel behaviour:
- - double clicking opens the goto time dialog
- - right-clicking and clicking just toggle between remaining and
- elapsed time.*/
- CONNECT( timeLabel, timeLabelDoubleClicked(), THEDP, gotoTimeDialog() );
-}
-
-inline void MainInterface::initSystray()
-{
- bool b_systrayAvailable = QSystemTrayIcon::isSystemTrayAvailable();
- bool b_systrayWanted = config_GetInt( p_intf, "qt-system-tray" );
-
- if( config_GetInt( p_intf, "qt-start-minimized") > 0 )
- {
- if( b_systrayAvailable )
- {
- b_systrayWanted = true;
- hide();
- }
- else
- msg_Err( p_intf, "cannot start minimized without system tray bar" );
- }
-
- if( b_systrayAvailable && b_systrayWanted )
- createSystray();
-}
+ settings->beginGroup( "MainWindow" );
+ delete controls;
+ delete inputC;
+ controls = new ControlsWidget( p_intf, false, this ); /* FIXME */
+ CONNECT( controls, advancedControlsToggled( bool ),
+ this, doComponentsUpdate() );
+ CONNECT( controls, sizeChanged(),
+ this, doComponentsUpdate() );
+ inputC = new InputControlsWidget( p_intf, this );
-/**
- * Give the decorations of the Main Window a correct Name.
- * If nothing is given, set it to VLC...
- **/
-void MainInterface::setVLCWindowsTitle( QString aTitle )
-{
- if( aTitle.isEmpty() )
- {
- setWindowTitle( qtr( "VLC media player" ) );
- }
- else
- {
- setWindowTitle( aTitle + " - " + qtr( "VLC media player" ) );
- }
+ mainLayout->insertWidget( 2, inputC, 0, Qt::AlignBottom );
+ mainLayout->insertWidget( settings->value( "ToolbarPos", 0 ).toInt() ? 0: 3,
+ controls, 0, Qt::AlignBottom );
+ settings->endGroup();
}
-void MainInterface::handleMainUi( QSettings *settings )
+void MainInterface::createMainWidget( QSettings *settings )
{
/* Create the main Widget and the mainLayout */
QWidget *main = new QWidget;
mainLayout->setSpacing( 0 );
mainLayout->setMargin( 0 );
- /* Create the CONTROLS Widget */
- controls = new ControlsWidget( p_intf,
- settings->value( "adv-controls", false ).toBool(), this );
- CONNECT( controls, advancedControlsToggled( bool ),
- this, doComponentsUpdate() );
- inputC = new InputControlsWidget( p_intf, this );
-
- /* Visualisation */
+ /* Visualisation */
/* Disabled for now, they SUCK */
#if 0
visualSelector = new VisualSelector( p_intf );
if( videoEmbeddedFlag )
videoWidget = new VideoWidget( p_intf );
+ /* Create the CONTROLS Widget */
+ controls = new ControlsWidget( p_intf,
+ settings->value( "adv-controls", false ).toBool(), this );
+ CONNECT( controls, advancedControlsToggled( bool ),
+ this, doComponentsUpdate() );
+ CONNECT( controls, sizeChanged(),
+ this, doComponentsUpdate() );
+ inputC = new InputControlsWidget( p_intf, this );
+
+
/* Add the controls Widget to the main Widget */
mainLayout->insertWidget( 0, bgWidget );
if( videoWidget ) mainLayout->insertWidget( 0, videoWidget, 10 );
}
}
+inline void MainInterface::createStatusBar()
+{
+ /****************
+ * Status Bar *
+ ****************/
+ /* Widgets Creation*/
+ QStatusBar *statusBarr = statusBar();
+
+ TimeLabel *timeLabel = new TimeLabel( p_intf );
+ nameLabel = new QLabel( this );
+ nameLabel->setTextInteractionFlags( Qt::TextSelectableByMouse
+ | Qt::TextSelectableByKeyboard );
+ SpeedLabel *speedLabel = new SpeedLabel( p_intf, "1.00x", this );
+
+ /* Styling those labels */
+ timeLabel->setFrameStyle( QFrame::Sunken | QFrame::Panel );
+ speedLabel->setFrameStyle( QFrame::Sunken | QFrame::Panel );
+ nameLabel->setFrameStyle( QFrame::Sunken | QFrame::StyledPanel);
+
+ /* and adding those */
+ statusBarr->addWidget( nameLabel, 8 );
+ statusBarr->addPermanentWidget( speedLabel, 0 );
+ statusBarr->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, timeLabelDoubleClicked(), THEDP, gotoTimeDialog() );
+
+ CONNECT( THEMIM->getIM(), encryptionChanged( bool ),
+ this, showCryptedLabel( bool ) );
+}
+
+inline void MainInterface::initSystray()
+{
+ bool b_systrayAvailable = QSystemTrayIcon::isSystemTrayAvailable();
+ bool b_systrayWanted = config_GetInt( p_intf, "qt-system-tray" );
+
+ if( config_GetInt( p_intf, "qt-start-minimized") > 0 )
+ {
+ if( b_systrayAvailable )
+ {
+ b_systrayWanted = true;
+ b_shouldHide = true;
+ }
+ else
+ msg_Err( p_intf, "cannot start minimized without system tray bar" );
+ }
+
+ if( b_systrayAvailable && b_systrayWanted )
+ createSystray();
+}
+
inline void MainInterface::askForPrivacy()
{
/**
int MainInterface::privacyDialog( QList<ConfigControl *> *controls )
{
- QDialog *privacy = new QDialog();
+ QDialog *privacy = new QDialog( this );
privacy->setWindowTitle( qtr( "Privacy and Network Policies" ) );
CONFIG_GENERIC( "album-art", IntegerList ); 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" ) );
if( VISIBLE( bgWidget ) )
{
- nheight += bgWidget->size().height();
- nwidth = bgWidget->size().width();
+ if( i_bg_height )
+ nheight += i_bg_height;
+ else
+ nheight += bgWidget->size().height();
+ nwidth = __MAX( nwidth, bgWidget->size().width() );
}
else if( videoIsActive && videoWidget->isVisible() )
{
nheight += videoWidget->sizeHint().height();
- nwidth = videoWidget->sizeHint().width();
+ nwidth = __MAX( nwidth, videoWidget->sizeHint().width() );
}
#if 0
if( !dockPL->isFloating() && dockPL->isVisible() && dockPL->widget() )
return QSize( nwidth, nheight );
}
-void MainInterface::toggleFSC()
+/* Video widget cannot do this synchronously as it runs in another thread */
+/* Well, could it, actually ? Probably dangerous ... */
+
+/* This function is called:
+ - toggling of minimal View
+ - through askUpdate() by Vout thread request video and resize video (zoom)
+ - Advanced buttons toggled
+ */
+void MainInterface::doComponentsUpdate()
{
- if( !fullscreenControls ) return;
+ if( isFullScreen() || isMaximized() ) return;
- IMEvent *eShow = new IMEvent( FullscreenControlToggle_Type, 0 );
- QApplication::postEvent( fullscreenControls, eShow );
+ msg_Dbg( p_intf, "Updating the geometry" );
+ /* Here we resize to sizeHint() and not adjustsize because we want
+ the videoWidget to be exactly the correctSize */
+ resize( sizeHint() );
+ // adjustSize() ;
+#ifndef NDEBUG
+ debug();
+#endif
}
void MainInterface::debug()
#endif
}
+void MainInterface::destroyPopupMenu()
+{
+ QVLCMenu::PopupMenu(p_intf, false );
+}
+
+
+void MainInterface::toggleFSC()
+{
+ if( !fullscreenControls ) return;
+
+ IMEvent *eShow = new IMEvent( FullscreenControlToggle_Type, 0 );
+ QApplication::postEvent( fullscreenControls, eShow );
+}
+
+void MainInterface::popupMenu( const QPoint &p )
+{
+ /* Ow, that's ugly: don't show the popup menu if cursor over
+ * the main menu bar or the status bar */
+ if( !childAt( p ) || ( ( childAt( p ) != menuBar() )
+ && ( childAt( p )->parentWidget() != statusBar() ) ) )
+ QVLCMenu::PopupMenu( p_intf, true );
+}
+
/****************************************************************************
* Video Handling
****************************************************************************/
unsigned int *pi_height )
{
/* Request the videoWidget */
+ if( !videoWidget ) return 0;
WId ret = videoWidget->request( p_nvout,pi_x, pi_y,
pi_width, pi_height, b_keep_size );
if( ret ) /* The videoWidget is available */
else
bgWasVisible = false;
+ /* ask videoWidget to show */
+ emit askVideoToShow( *pi_width, *pi_height );
+
/* Consider the video active now */
videoIsActive = true;
videoIsActive = false;
/* Try to resize, except when you are in Fullscreen mode */
- if( !isFullScreen() ) doComponentsUpdate();
+ doComponentsUpdate();
}
/* Call from WindowControl function */
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->videoSize.width();
- *pi_height = videoWidget->videoSize.height();
- break;
- }
case VOUT_SET_SIZE:
{
unsigned int i_width = va_arg( args, unsigned int );
{
}
-void MainInterface::toggleMinimalView()
+void MainInterface::toggleMinimalView( bool b_switch )
{
if( i_visualmode != QT_ALWAYS_VIDEO_MODE &&
i_visualmode != QT_MINIMAL_MODE )
{ /* NORMAL MODE then */
- if( !videoWidget || videoWidget->isHidden() ) emit askBgWidgetToToggle();
+ if( !videoWidget || videoWidget->isHidden() )
+ {
+ emit askBgWidgetToToggle();
+ }
else
{
/* If video is visible, then toggle the status of bgWidget */
}
}
- TOGGLEV( menuBar() );
- TOGGLEV( controls );
- TOGGLEV( statusBar() );
- TOGGLEV( inputC );
- doComponentsUpdate();
+ i_bg_height = bgWidget->height();
- QVLCMenu::minimalViewAction->setChecked( bgWasVisible );
-}
+ menuBar()->setVisible( !b_switch );
+ controls->setVisible( !b_switch );
+ statusBar()->setVisible( !b_switch );
+ inputC->setVisible( !b_switch );
-/* Video widget cannot do this synchronously as it runs in another thread */
-/* Well, could it, actually ? Probably dangerous ... */
+ doComponentsUpdate();
-/* This function is called:
- - toggling of minimal View
- - through askUpdate() by Vout thread request video and resize video (zoom)
- - Advanced buttons toggled
- */
-void MainInterface::doComponentsUpdate()
-{
- msg_Dbg( p_intf, "Updating the geometry" );
- /* Here we resize to sizeHint() and not adjustsize because we want
- the videoWidget to be exactly the correctSize */
- resize( sizeHint() );
- // adjustSize() ;
-#ifndef NDEBUG
- debug();
-#endif
+ emit minimalViewToggled( b_switch );
}
/* toggling advanced controls buttons */
nameLabel->setToolTip( " " + name +" " );
}
+/**
+ * Give the decorations of the Main Window a correct Name.
+ * If nothing is given, set it to VLC...
+ **/
+void MainInterface::setVLCWindowsTitle( QString aTitle )
+{
+ if( aTitle.isEmpty() )
+ {
+ setWindowTitle( qtr( "VLC media player" ) );
+ }
+ else
+ {
+ setWindowTitle( aTitle + " - " + qtr( "VLC media player" ) );
+ }
+}
+
+void MainInterface::showCryptedLabel( bool b_show )
+{
+ if( cryptedLabel == NULL )
+ {
+ cryptedLabel = new QLabel;
+ // The lock icon is not the right one for DRM protection/scrambled.
+ //cryptedLabel->setPixmap( QPixmap( ":/lock" ) );
+ cryptedLabel->setText( "DRM" );
+ statusBar()->addWidget( cryptedLabel );
+ }
+
+ cryptedLabel->setVisible( b_show );
+}
+
/*****************************************************************************
* Systray Icon and Systray Menu
*****************************************************************************/
{
QIcon iconVLC;
if( QDate::currentDate().dayOfYear() >= 354 )
- iconVLC = QIcon( QPixmap( ":/vlc128-christmas.png" ) );
+ iconVLC = QIcon( QPixmap( ":/logo/vlc128-christmas.png" ) );
else
- iconVLC = QIcon( QPixmap( ":/vlc128.png" ) );
+ iconVLC = QIcon( QPixmap( ":/logo/vlc128.png" ) );
sysTray = new QSystemTrayIcon( iconVLC, this );
sysTray->setToolTip( qtr( "VLC media player" ));
toggleUpdateSystrayMenu();
break;
case QSystemTrayIcon::MiddleClick:
- case QSystemTrayIcon::Context:
sysTray->showMessage( qtr( "VLC media player" ),
qtr( "Control menu for the player" ),
QSystemTrayIcon::Information, 3000 );
break;
}
}
+ QVLCMenu::updateSystrayMenu( this, p_intf );
}
/************************************************************************
void MainInterface::dropEventPlay( QDropEvent *event, bool b_play )
{
+ event->setDropAction( Qt::CopyAction );
+ if( !event->possibleActions() & Qt::CopyAction )
+ return;
+
const QMimeData *mimeData = event->mimeData();
/* D&D of a subtitles file, add it on the fly */
mimeData->urls()[0].toLocalFile() ) ),
true ) )
{
- event->acceptProposedAction();
+ event->accept();
return;
}
}
RecentsMRL::getInstance( p_intf )->addRecent( s );
}
}
- event->acceptProposedAction();
+ event->accept();
}
void MainInterface::dragEnterEvent(QDragEnterEvent *event)
{
{
SetVideoOnTopQtEvent* p_event = (SetVideoOnTopQtEvent*)event;
if( p_event->OnTop() )
- setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+ setWindowFlags( windowFlags() | Qt::WindowStaysOnTopHint );
else
- setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
- show(); /* necessary to apply window flags?? */
+ setWindowFlags( windowFlags() & ~Qt::WindowStaysOnTopHint );
+ show(); /* necessary to apply window flags */
}
}
void MainInterface::keyPressEvent( QKeyEvent *e )
{
if( ( e->modifiers() & Qt::ControlModifier ) && ( e->key() == Qt::Key_H )
- && menuBar()->isHidden() )
+ && !menuBar()->isVisible() )
{
- toggleMinimalView();
+ toggleMinimalView( false );
e->accept();
}
{
showNormal();
emit askUpdate(); // Needed if video was launched after the F11
- QVLCMenu::fullscreenViewAction->setChecked( false );
+ emit fullscreenInterfaceToggled( false );
}
else
{
showFullScreen();
- QVLCMenu::fullscreenViewAction->setChecked( true );
+ emit fullscreenInterfaceToggled( true );
}
}
-/*****************************************************************************
- * Callbacks
- *****************************************************************************/
-static int InteractCallback( vlc_object_t *p_this,
- const char *psz_var, vlc_value_t old_val,
- vlc_value_t new_val, void *param )
-{
- intf_dialog_args_t *p_arg = new intf_dialog_args_t;
- p_arg->p_dialog = (interaction_dialog_t *)(new_val.p_address);
- DialogEvent *event = new DialogEvent( INTF_DIALOG_INTERACTION, 0, p_arg );
- QApplication::postEvent( THEDP, event );
- return VLC_SUCCESS;
-}
-
/*****************************************************************************
* PopupMenuCB: callback triggered by the intf-popupmenu playlist variable.
* We don't show the menu directly here because we don't want the
projects / vlc / blobdiff