/*****************************************************************************
* main_interface.cpp : Main interface
****************************************************************************
- * Copyright (C) 2006-2010 VideoLAN and AUTHORS
+ * Copyright (C) 2006-2011 VideoLAN and AUTHORS
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
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 IntfBossCB( vlc_object_t *p_this, const char *psz_variable,
+ vlc_value_t old_val, vlc_value_t new_val, void *param );
+static int IntfRaiseMainCB( 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 )
{
b_hideAfterCreation = false; // --qt-start-minimized
playlistVisible = false;
input_name = "";
+ b_interfaceFullScreen= false;
/* Ask for Privacy */
/* Do we want anoying popups or not */
b_notificationEnabled = var_InheritBool( p_intf, "qt-notification" );
+ /* */
+ b_pauseOnMinimize = var_InheritBool( p_intf, "qt-pause-minimized" );
+
/* Set the other interface settings */
settings = getSettings();
settings->beginGroup( "MainWindow" );
+#ifdef WIN32
+ /* Volume keys */
+ p_intf->p_sys->disable_volume_keys = var_InheritBool( p_intf, "qt-disable-volume-keys" );
+#endif
+
/* */
b_plDocked = getSettings()->value( "pl-dock-status", true ).toBool();
settings->endGroup( );
- /**************
- * Status Bar *
- **************/
- createStatusBar();
-
/**************************
* UI and Widgets design
**************************/
this, destroyPopupMenu() );
createMainWidget( settings );
- /*********************************
- * Create the Systray Management *
- *********************************/
- initSystray();
+
+ /**************
+ * Status Bar *
+ **************/
+ createStatusBar();
+ setStatusBarVisibility( getSettings()->value( "MainWindow/status-bar-visible", false ).toBool() );
/********************
* Input Manager *
taskbar_wmsg = RegisterWindowMessage("TaskbarButtonCreated");
#endif
- /************************************************************
- * Connect the input manager to the GUI elements it manages *
- ************************************************************/
+ /*********************************
+ * Create the Systray Management *
+ *********************************/
+ initSystray();
+
+ /*************************************************************
+ * Connect the input manager to the GUI elements it manages *
+ * Beware initSystray did some connects on input manager too *
+ *************************************************************/
/**
* Connects on nameChanged()
* Those connects are different because options can impeach them to trigger.
/* Main Interface statusbar */
CONNECT( THEMIM->getIM(), nameChanged( const QString& ),
this, setName( const QString& ) );
- /* and systray */
-#ifndef HAVE_MAEMO
- if( sysTray )
- {
- CONNECT( THEMIM->getIM(), nameChanged( const QString& ),
- this, updateSystrayTooltipName( const QString& ) );
- }
-#endif
/* and title of the Main Interface*/
if( var_InheritBool( p_intf, "qt-name-in-title" ) )
{
CONNECT( THEMIM->getIM(), nameChanged( const QString& ),
this, setVLCWindowsTitle( const QString& ) );
}
-
- /**
- * CONNECTS on PLAY_STATUS
- **/
- /* Status on the systray */
-#ifndef HAVE_MAEMO
- if( sysTray )
- {
- CONNECT( THEMIM->getIM(), playingStatusChanged( int ),
- this, updateSystrayTooltipStatus( int ) );
- }
-#endif
-
/* END CONNECTS ON IM */
/* VideoWidget connects for asynchronous calls */
b_videoFullScreen = false;
- b_videoOnTop = false;
connect( this, SIGNAL(askGetVideo(WId*,int*,int*,unsigned*,unsigned *)),
this, SLOT(getVideoSlot(WId*,int*,int*,unsigned*,unsigned*)),
Qt::BlockingQueuedConnection );
CONNECT( this, askToQuit(), THEDP, quit() );
+ CONNECT( this, askBoss(), this, setBoss() );
+ CONNECT( this, askRaise(), this, setRaise() );
+
/** END of CONNECTS**/
/************
* Callbacks
************/
- var_AddCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
+ var_AddCallback( p_intf->p_libvlc, "intf-toggle-fscontrol", IntfShowCB, p_intf );
+ var_AddCallback( p_intf->p_libvlc, "intf-boss", IntfBossCB, p_intf );
+ var_AddCallback( p_intf->p_libvlc, "intf-show", IntfRaiseMainCB, p_intf );
/* Register callback for the intf-popupmenu variable */
var_AddCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
/**** FINAL SIZING and placement of interface */
settings->beginGroup( "MainWindow" );
- QVLCTools::restoreWidgetPosition( settings, this, QSize(400, 100) );
+ QVLCTools::restoreWidgetPosition( settings, this, QSize(600, 420) );
settings->endGroup();
b_interfaceFullScreen = isFullScreen();
settings->setValue( "adv-controls",
getControlsVisibilityStatus() & CONTROLS_ADVANCED );
+ settings->setValue( "status-bar-visible", b_statusbarVisible );
/* Save the stackCentralW sizes */
settings->setValue( "bgSize", stackWidgetsSizes[bgWidget] );
delete statusBar();
/* Unregister callbacks */
- var_DelCallback( p_intf->p_libvlc, "intf-show", IntfShowCB, p_intf );
+ var_DelCallback( p_intf->p_libvlc, "intf-boss", IntfBossCB, p_intf );
+ var_DelCallback( p_intf->p_libvlc, "intf-show", IntfRaiseMainCB, p_intf );
+ var_DelCallback( p_intf->p_libvlc, "intf-toggle-fscontrol", IntfShowCB, p_intf );
var_DelCallback( p_intf->p_libvlc, "intf-popupmenu", PopupMenuCB, p_intf );
p_intf->p_sys->p_mi = NULL;
settings->endGroup();
}
+void MainInterface::reloadPrefs()
+{
+ b_notificationEnabled = var_InheritBool( p_intf, "qt-notification" );
+ b_pauseOnMinimize = var_InheritBool( p_intf, "qt-pause-minimized" );
+#ifdef WIN32
+ p_intf->p_sys->disable_volume_keys = var_InheritBool( p_intf, "qt-disable-volume-keys" );
+#endif
+ if( !var_InheritBool( p_intf, "qt-fs-controller" ) && fullscreenControls )
+ {
+ delete fullscreenControls;
+ fullscreenControls = NULL;
+ }
+}
+
void MainInterface::createMainWidget( QSettings *settings )
{
/* Create the main Widget and the mainLayout */
mainLayout->insertWidget( 1, stackCentralW );
settings->beginGroup( "MainWindow" );
- stackWidgetsSizes[bgWidget] = settings->value( "bgSize", QSize( 400, 0 ) ).toSize();
+ stackWidgetsSizes[bgWidget] = settings->value( "bgSize", QSize( 600, 0 ) ).toSize();
/* Resize even if no-auto-resize, because we are at creation */
resizeStack( stackWidgetsSizes[bgWidget].width(), stackWidgetsSizes[bgWidget].height() );
QVLCMenu::PopupMenu( p_intf, false );
}
-void MainInterface::popupMenu( const QPoint &p )
+void MainInterface::popupMenu( const QPoint & )
{
QVLCMenu::PopupMenu( p_intf, true );
}
{
if( !fullscreenControls ) return;
- IMEvent *eShow = new IMEvent( FullscreenControlToggle_Type, 0 );
+ IMEvent *eShow = new IMEvent( FullscreenControlToggle_Type );
QApplication::postEvent( fullscreenControls, eShow );
}
void MainInterface::getVideoSlot( WId *p_id, int *pi_x, int *pi_y,
unsigned *pi_width, unsigned *pi_height )
{
+ /* Hidden or minimized, activate */
+ if( isHidden() || isMinimized() )
+ toggleUpdateSystrayMenu();
+
/* Request the videoWidget */
WId ret = videoWidget->request( pi_x, pi_y,
pi_width, pi_height, !b_autoresize );
* Emit askVideoOnTop() to invoke this from other thread. */
void MainInterface::setVideoOnTop( bool on_top )
{
- b_videoOnTop = on_top;
-
Qt::WindowFlags oldflags = windowFlags(), newflags;
- if( b_videoOnTop )
+ if( on_top )
newflags = oldflags | Qt::WindowStaysOnTopHint;
else
newflags = oldflags & ~Qt::WindowStaysOnTopHint;
+ if( newflags != oldflags && !b_videoFullScreen )
- if( newflags != oldflags )
{
setWindowFlags( newflags );
show(); /* necessary to apply window flags */
if( b_plDocked )
{
stackCentralW->addWidget( playlistWidget );
- stackWidgetsSizes[playlistWidget] = settings->value( "playlistSize", QSize( 500, 250 ) ).toSize();
+ stackWidgetsSizes[playlistWidget] = settings->value( "playlistSize", QSize( 600, 300 ) ).toSize();
}
else
{
{
menuBar()->setVisible( !b_minimal );
controls->setVisible( !b_minimal );
- statusBar()->setVisible( !b_minimal );
+ statusBar()->setVisible( !b_minimal && b_statusbarVisible );
inputC->setVisible( !b_minimal );
}
+ CONTROLS_ADVANCED * controls->b_advancedVisible );
}
+void MainInterface::setStatusBarVisibility( bool b_visible )
+{
+ statusBar()->setVisible( b_visible );
+ b_statusbarVisible = b_visible;
+ if( controls ) controls->setGripVisible( !b_statusbarVisible );
+}
+
#if 0
void MainInterface::visual()
{
void MainInterface::createSystray()
{
QIcon iconVLC;
- if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY )
+ if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY && var_InheritBool( p_intf, "qt-icon-change" ) )
iconVLC = QIcon( ":/logo/vlc128-xmas.png" );
else
iconVLC = QIcon( ":/logo/vlc128.png" );
sysTray->show();
CONNECT( sysTray, activated( QSystemTrayIcon::ActivationReason ),
- this, handleSystrayClick( QSystemTrayIcon::ActivationReason ) );
+ this, handleSystrayClick( QSystemTrayIcon::ActivationReason ) );
+
+ /* Connects on nameChanged() */
+ CONNECT( THEMIM->getIM(), nameChanged( const QString& ),
+ this, updateSystrayTooltipName( const QString& ) );
+ /* Connect PLAY_STATUS on the systray */
+ CONNECT( THEMIM->getIM(), playingStatusChanged( int ),
+ this, updateSystrayTooltipStatus( int ) );
}
/**
hide();
#endif
}
- QVLCMenu::updateSystrayMenu( this, p_intf );
+ if( sysTray )
+ QVLCMenu::updateSystrayMenu( this, p_intf );
}
+/* First Item of the systray menu */
void MainInterface::showUpdateSystrayMenu()
{
if( isHidden() )
QVLCMenu::updateSystrayMenu( this, p_intf );
}
+/* First Item of the systray menu */
void MainInterface::hideUpdateSystrayMenu()
{
hide();
QVLCMenu::updateSystrayMenu( this, p_intf );
}
+/* Click on systray Icon */
void MainInterface::handleSystrayClick(
QSystemTrayIcon::ActivationReason reason )
{
b_hasPausedWhenMinimized = false;
if( THEMIM->getIM()->playingStatus() == PLAYING_S &&
- THEMIM->getIM()->hasVideo() &&
- !THEMIM->getIM()->hasVisualisation() &&
- var_InheritBool( p_intf, "qt-pause-minimized" ) )
+ THEMIM->getIM()->hasVideo() && !THEMIM->getIM()->hasVisualisation() &&
+ b_pauseOnMinimize )
{
b_hasPausedWhenMinimized = true;
THEMIM->pause();
const QMimeData *mimeData = event->mimeData();
/* D&D of a subtitles file, add it on the fly */
- if( mimeData->urls().size() == 1 && THEMIM->getIM()->hasInput() )
+ if( mimeData->urls().count() == 1 && THEMIM->getIM()->hasInput() )
{
if( !input_AddSubtitle( THEMIM->getInput(),
qtu( toNativeSeparators( mimeData->urls()[0].toLocalFile() ) ),
void MainInterface::closeEvent( QCloseEvent *e )
{
- e->ignore(); /* Do not quit */
// hide();
emit askToQuit(); /* ask THEDP to quit, so we have a unique method */
+ /* Accept session quit. Otherwise we break the desktop mamager. */
+ e->accept();
}
void MainInterface::setInterfaceFullScreen( bool fs )
emit fullscreenInterfaceToggled( b_interfaceFullScreen );
}
+void MainInterface::emitBoss()
+{
+ emit askBoss();
+}
+void MainInterface::setBoss()
+{
+ THEMIM->pause();
+#ifndef HAVE_MAEMO
+ if( sysTray )
+ {
+ hide();
+ }
+ else
+#endif
+ {
+ showMinimized();
+ }
+}
+
+void MainInterface::emitRaise()
+{
+ emit askRaise();
+}
+void MainInterface::setRaise()
+{
+ activateWindow();
+ raise();
+}
+
/*****************************************************************************
* PopupMenuCB: callback triggered by the intf-popupmenu playlist variable.
* We don't show the menu directly here because we don't want the
static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t old_val, vlc_value_t new_val, void *param )
{
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_variable ); VLC_UNUSED( old_val );
+
intf_thread_t *p_intf = (intf_thread_t *)param;
if( p_intf->pf_show_dialog )
}
/*****************************************************************************
- * IntfShowCB: callback triggered by the intf-show libvlc variable.
+ * IntfShowCB: callback triggered by the intf-toggle-fscontrol 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 )
{
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_variable ); VLC_UNUSED( old_val );
+ VLC_UNUSED( new_val );
+
intf_thread_t *p_intf = (intf_thread_t *)param;
p_intf->p_sys->p_mi->toggleFSC();
/* Show event */
return VLC_SUCCESS;
}
+
+/*****************************************************************************
+ * IntfRaiseMainCB: callback triggered by the intf-show-main libvlc variable.
+ *****************************************************************************/
+static int IntfRaiseMainCB( vlc_object_t *p_this, const char *psz_variable,
+ vlc_value_t old_val, vlc_value_t new_val, void *param )
+{
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_variable ); VLC_UNUSED( old_val );
+ VLC_UNUSED( new_val );
+
+ intf_thread_t *p_intf = (intf_thread_t *)param;
+ p_intf->p_sys->p_mi->emitRaise();
+
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * IntfBossCB: callback triggered by the intf-boss libvlc variable.
+ *****************************************************************************/
+static int IntfBossCB( vlc_object_t *p_this, const char *psz_variable,
+ vlc_value_t old_val, vlc_value_t new_val, void *param )
+{
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_variable ); VLC_UNUSED( old_val );
+ VLC_UNUSED( new_val );
+
+ intf_thread_t *p_intf = (intf_thread_t *)param;
+ p_intf->p_sys->p_mi->emitBoss();
+
+ return VLC_SUCCESS;
+}
projects / vlc / blobdiff