#include <QSystemTrayIcon>
#include <QSize>
#include <QMenu>
+#include <QLabel>
#include <assert.h>
#include <vlc_keys.h>
#define PREF_H 121
#else
#define PREF_W 450
- #define PREF_H 125
+ #define PREF_H 160
#endif
-#define VISIBLE(i) (i && i->isVisible())
-
#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 );
need_components_update = false;
bgWidget = NULL; videoWidget = NULL; playlistWidget = NULL;
embeddedPlaylistWasActive = videoIsActive = false;
-
- bool b_createSystray = false;
input_name = "";
/**
setFocusPolicy( Qt::StrongFocus );
setAcceptDrops(true);
setWindowIcon( QApplication::windowIcon() );
+ config_GetFloat( p_intf, "qt-opacity" );
+ setWindowOpacity( config_GetFloat( p_intf, "qt-opacity" ) );
/* Set The Video In emebedded Mode or not */
videoEmbeddedFlag = false;
alwaysVideoFlag = true;
/* Set the other interface settings */
- playlistEmbeddedFlag = settings->value("playlist-embedded", true).toBool();
- advControlsEnabled= settings->value( "adv-controls", false ).toBool();
- visualSelectorEnabled= settings->value( "visual-selector", false ).toBool();
-
-#if DEBUG_COLOR
- QPalette palette2;
- palette2.setColor(this->backgroundRole(), Qt::magenta);
- setPalette(palette2);
-#endif
-
- /**
- * UI design
- **/
+ playlistEmbeddedFlag = settings->value( "playlist-embedded", true).toBool();
+ 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,
- advControlsEnabled, visualSelectorEnabled );
+ 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;
nameLabel = new QLabel;
speedLabel = new QLabel( "1.0x" );
CONNECT( timeLabel, customContextMenuRequested( QPoint ),
this, showTimeMenu( QPoint ) );
- /* Systray */
+ /**********************
+ * Systray Management *
+ **********************/
sysTray = NULL;
+ bool b_createSystray = false;
+ bool b_systrayAvailable = QSystemTrayIcon::isSystemTrayAvailable();
if( config_GetInt( p_intf, "qt-start-minimized") )
{
- hide();
- b_createSystray = true;
+ if( b_systrayAvailable ){
+ b_createSystray = true;
+ hide(); //FIXME
+ }
+ 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 (QSystemTrayIcon::isSystemTrayAvailable() && b_createSystray )
+
+ if( b_systrayAvailable && b_createSystray )
createSystray();
/* Init input manager */
ON_TIMEOUT( updateOnTimer() );
/**
- * CONNECTs
+ * Various CONNECTs
**/
/* Connect the input manager to the GUI elements it manages */
- /* It is also connected to the control->slider */
+ /* It is also connected to the control->slider, see the ControlsWidget */
CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
this, setDisplay( float, int, int ) );
- /* Naming in the controller */
+ /** Connects on nameChanged() */
+ /* Naming in the controller statusbar */
CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
setName( QString ) );
- if( config_GetInt( p_intf, "qt-system-tray" ) && sysTray )
+ /* and in the systray */
+ if( sysTray )
{
CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
updateSystrayTooltipName( QString ) );
}
+ /* and in the title of the controller */
if( config_GetInt( p_intf, "qt-name-in-title" ) )
{
CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
setVLCWindowsTitle( QString ) );
}
- /* PLAY_STATUS */
+ /** CONNECTS on PLAY_STATUS **/
+ /* Status on the main controller */
CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) );
- if( config_GetInt( p_intf, "qt-system-tray" ) && sysTray )
+ /* and in the systray */
+ if( sysTray )
{
CONNECT( THEMIM->getIM(), statusChanged( int ), this,
updateSystrayTooltipStatus( int ) );
}
settings->setValue( "playlist-embedded", playlistEmbeddedFlag );
- settings->setValue( "adv-controls", advControlsEnabled );
+ settings->setValue( "adv-controls", isAdvancedVisible() );
settings->setValue( "pos", pos() );
settings->endGroup();
delete settings;
void MainInterface::handleMainUi( QSettings *settings )
{
+ /* Create the main Widget and the mainLayout */
QWidget *main = new QWidget( this );
mainLayout = new QVBoxLayout( main );
setCentralWidget( main );
main->setContentsMargins( 0, 0, 0, 0 );
mainLayout->setMargin( 0 );
- /* CONTROLS */
- controls = new ControlsWidget( p_intf );
+ /* Create the CONTROLS Widget */
+ controls = new ControlsWidget( p_intf,
+ settings->value( "adv-controls", false ).toBool() );
- /* Configure the UI */
+ /* Configure the Controls */
BUTTON_SET_IMG( controls->playlistButton, "" , playlist_icon.png,
- playlistEmbeddedFlag ? qtr( "Show playlist" ) :
- qtr( "Open playlist" ) );
- BUTTONACT( controls->playlistButton, playlist() );
-
-#if DEBUG_COLOR
- QPalette palette;
- palette.setColor(main->backgroundRole(), Qt::green);
- main->setPalette(palette);
-#endif
+ playlistEmbeddedFlag ? qtr( "Show playlist" ) :
+ qtr( "Open playlist" ) );
+ BUTTONACT( controls->playlistButton, togglePlaylist() );
- /* Add the controls Widget */
+ /* Add the controls Widget to the main Widget */
mainLayout->addWidget( controls );
- /* Set initial size */
- resize ( PREF_W, PREF_H );
+ /* Set initial size */
+ resize( PREF_W, PREF_H );
addSize = QSize( mainLayout->margin() * 2, PREF_H );
- /* advanced Controls handling */
- advControls = new AdvControlsWidget( p_intf );
- mainLayout->insertWidget( 0, advControls );
- advControls->updateGeometry();
- if( !advControlsEnabled ) advControls->hide();
- need_components_update = true;
-
/* Visualisation */
visualSelector = new VisualSelector( p_intf );
mainLayout->insertWidget( 0, visualSelector );
}
/**********************************************************************
- * Handling of the components
+ * Handling of sizing of the components
**********************************************************************/
void MainInterface::calculateInterfaceSize()
{
}
if( VISIBLE( visualSelector ) )
height += visualSelector->height();
- if( VISIBLE( advControls) )
+/* if( VISIBLE( advControls) )
{
height += advControls->sizeHint().height();
- }
+ }*/
mainSize = QSize( width + addSize.width(), height + addSize.height() );
}
playlistWidget->updateGeometry();
}
}
+
/****************************************************************************
* Small right-click menus
****************************************************************************/
menu.exec( QCursor::pos() );
}
-/*****************************************************************************
- * Systray Icon and Systray Menu
- *****************************************************************************/
-
-/**
- * Create a SystemTray icon and a menu that would go with it.
- * Connects to a click handler on the icon.
- **/
-void MainInterface::createSystray()
-{
- QIcon iconVLC = QIcon( QPixmap( ":/vlc128.png" ) );
- sysTray = new QSystemTrayIcon( iconVLC, this );
- sysTray->setToolTip( qtr( "VLC media player" ));
-
- systrayMenu = new QMenu( qtr( "VLC media player" ), this );
- systrayMenu->setIcon( iconVLC );
-
- QVLCMenu::updateSystrayMenu( this, p_intf, true );
- sysTray->show();
-
- 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( isHidden() )
- {
- show();
- activateWindow();
- }
- else
- {
-#ifdef WIN32
- /* check if any visible window is above vlc in the z-order,
- * but ignore the ones always on top */
- WINDOWINFO wi;
- HWND hwnd;
- wi.cbSize = sizeof( WINDOWINFO );
- for( hwnd = GetNextWindow( internalWinId(), GW_HWNDPREV );
- hwnd && !IsWindowVisible( hwnd );
- hwnd = GetNextWindow( hwnd, GW_HWNDPREV ) );
- if( !hwnd || !GetWindowInfo( hwnd, &wi ) ||
- (wi.dwExStyle&WS_EX_TOPMOST) )
-#else
- if( isActiveWindow() )
-#endif
- {
- hide();
- }
- else
- {
- activateWindow();
- }
- }
- QVLCMenu::updateSystrayMenu( this, p_intf );
-}
-
-void MainInterface::handleSystrayClick(
- QSystemTrayIcon::ActivationReason reason )
-{
- switch( reason )
- {
- case QSystemTrayIcon::Trigger:
- toggleUpdateSystrayMenu();
- break;
- case QSystemTrayIcon::MiddleClick:
- sysTray->showMessage( qtr( "VLC media player" ),
- qtr( "Control menu for the player" ),
- QSystemTrayIcon::Information, 4000 );
- 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 )
-{
- if( name.isEmpty() )
- {
- sysTray->setToolTip( qtr( "VLC media player" ) );
- }
- else
- {
- sysTray->setToolTip( name );
- }
-}
-
-/**
- * Updates the status of the systray Icon tooltip.
- * Doesn't check if the systray exists, check before you call it.
- **/
-void MainInterface::updateSystrayTooltipStatus( int i_status )
-{
- switch( i_status )
- {
- case 0:
- {
- sysTray->setToolTip( qtr( "VLC media player" ) );
- break;
- }
- case PLAYING_S:
- {
- sysTray->setToolTip( input_name );
- //+ " - " + qtr( "Playing" ) );
- break;
- }
- case PAUSE_S:
- {
- sysTray->setToolTip( input_name + " - "
- + qtr( "Paused") );
- break;
- }
- }
-}
+/****************************************************************************
+ * Video Handling
+ ****************************************************************************/
void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
int *pi_y, unsigned int *pi_width,
unsigned int *pi_height )
return i_ret;
}
-void MainInterface::advanced()
-{
- if( !VISIBLE( advControls ) )
- {
- advControls->show();
- advControlsEnabled = true;
- }
- else
- {
- advControls->hide();
- advControlsEnabled = false;
- }
- doComponentsUpdate();
-}
-
-void MainInterface::visual()
-{
- if( !VISIBLE( visualSelector) )
- {
- visualSelector->show();
- if( !THEMIM->getIM()->hasVideo() )
- {
- /* Show the background widget */
- }
- visualSelectorEnabled = true;
- }
- else
- {
- /* Stop any currently running visualization */
- visualSelector->hide();
- visualSelectorEnabled = false;
- }
- doComponentsUpdate();
-}
-
-void MainInterface::playlist()
+/*****************************************************************************
+ * Playlist, Visualisation and Menus handling
+ *****************************************************************************/
+/**
+ * Toggle the playlist widget or dialog
+ **/
+void MainInterface::togglePlaylist()
{
- // Toggle the playlist dialog
+ // Toggle the playlist dialog if not embedded and return
if( !playlistEmbeddedFlag )
{
if( playlistWidget )
return;
}
+ // Create the playlist Widget and destroy the existing dialog
if( !playlistWidget )
{
PlaylistDialog::killInstance();
if(bgWidget)
CONNECT( playlistWidget, artSet( QString ), bgWidget, setArt(QString) );
}
+
+ // And toggle visibility
if( VISIBLE( playlistWidget ) )
{
playlistWidget->hide();
}
if( VISIBLE( bgWidget ) ) bgWidget->hide();
}
- doComponentsUpdate();
-}
-/* Video widget cannot do this synchronously as it runs in another thread */
-/* Well, could it, actually ? Probably dangerous ... */
-void MainInterface::doComponentsUpdate()
-{
- calculateInterfaceSize();
- resize( mainSize );
+ doComponentsUpdate();
}
void MainInterface::undockPlaylist()
playlistEmbeddedFlag = false;
menuBar()->clear();
- QVLCMenu::createMenuBar( this, p_intf, false, advControlsEnabled,
+ QVLCMenu::createMenuBar( this, p_intf, false, isAdvancedVisible(),
visualSelectorEnabled);
if( videoIsActive )
}
}
+#if 0
+void MainInterface::visual()
+{
+ if( !VISIBLE( visualSelector) )
+ {
+ visualSelector->show();
+ if( !THEMIM->getIM()->hasVideo() )
+ {
+ /* Show the background widget */
+ }
+ visualSelectorEnabled = true;
+ }
+ else
+ {
+ /* Stop any currently running visualization */
+ visualSelector->hide();
+ visualSelectorEnabled = false;
+ }
+ doComponentsUpdate();
+}
+#endif
+
void MainInterface::toggleMenus()
{
if( menuBar()->isVisible() ) menuBar()->hide();
msg_Dbg( p_intf, "I was there: \\_o<~~ coin coin" );
}
-void MainInterface::customEvent( QEvent *event )
+/* Video widget cannot do this synchronously as it runs in another thread */
+/* Well, could it, actually ? Probably dangerous ... */
+void MainInterface::doComponentsUpdate()
{
- if( event->type() == PLDockEvent_Type )
+ 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 )
+{
+ 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+" " );
+}
+
+void MainInterface::setName( QString name )
+{
+ input_name = name;
+ nameLabel->setText( " " + name+" " );
+}
+
+void MainInterface::setStatus( int status )
+{
+ controls->setStatus( status );
+ if( sysTray )
+ updateSystrayMenu( status );
+}
+
+void MainInterface::updateOnTimer()
+{
+ /* \todo Make this event-driven */
+ if( intf_ShouldDie( p_intf ) )
{
- PlaylistDialog::killInstance();
- playlistEmbeddedFlag = true;
- menuBar()->clear();
- QVLCMenu::createMenuBar(this, p_intf, true, advControlsEnabled,
- visualSelectorEnabled);
- playlist();
+ QApplication::closeAllWindows();
+ QApplication::quit();
}
- else if ( event->type() == SetVideoOnTopEvent_Type )
+ if( need_components_update )
{
- SetVideoOnTopQtEvent* p_event = (SetVideoOnTopQtEvent*)event;
- if( p_event->OnTop() )
- setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+ doComponentsUpdate();
+ need_components_update = false;
+ }
+
+ controls->updateOnTimer();
+}
+
+/*****************************************************************************
+ * Systray Icon and Systray Menu
+ *****************************************************************************/
+
+/**
+ * Create a SystemTray icon and a menu that would go with it.
+ * Connects to a click handler on the icon.
+ **/
+void MainInterface::createSystray()
+{
+ QIcon iconVLC = QIcon( QPixmap( ":/vlc128.png" ) );
+ sysTray = new QSystemTrayIcon( iconVLC, this );
+ sysTray->setToolTip( qtr( "VLC media player" ));
+
+ systrayMenu = new QMenu( qtr( "VLC media player" ), this );
+ systrayMenu->setIcon( iconVLC );
+
+ QVLCMenu::updateSystrayMenu( this, p_intf, true );
+ sysTray->show();
+
+ 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( isHidden() )
+ {
+ show();
+ activateWindow();
+ }
+ else
+ {
+#ifdef WIN32
+ /* check if any visible window is above vlc in the z-order,
+ * but ignore the ones always on top */
+ WINDOWINFO wi;
+ HWND hwnd;
+ wi.cbSize = sizeof( WINDOWINFO );
+ for( hwnd = GetNextWindow( internalWinId(), GW_HWNDPREV );
+ hwnd && !IsWindowVisible( hwnd );
+ hwnd = GetNextWindow( hwnd, GW_HWNDPREV ) );
+ if( !hwnd || !GetWindowInfo( hwnd, &wi ) ||
+ (wi.dwExStyle&WS_EX_TOPMOST) )
+#else
+ if( isActiveWindow() )
+#endif
+ {
+ hide();
+ }
else
- setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
- show(); /* necessary to apply window flags?? */
+ {
+ activateWindow();
+ }
+ }
+ QVLCMenu::updateSystrayMenu( this, p_intf );
+}
+
+void MainInterface::handleSystrayClick(
+ QSystemTrayIcon::ActivationReason reason )
+{
+ switch( reason )
+ {
+ case QSystemTrayIcon::Trigger:
+ toggleUpdateSystrayMenu();
+ break;
+ case QSystemTrayIcon::MiddleClick:
+ sysTray->showMessage( qtr( "VLC media player" ),
+ qtr( "Control menu for the player" ),
+ QSystemTrayIcon::Information, 4000 );
+ 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 )
+{
+ if( name.isEmpty() )
+ {
+ sysTray->setToolTip( qtr( "VLC media player" ) );
+ }
+ else
+ {
+ sysTray->setToolTip( name );
+ if( notificationEnabled )
+ {
+ sysTray->showMessage( qtr( "VLC media player" ), name,
+ QSystemTrayIcon::NoIcon, 4000 );
+ }
}
}
+/**
+ * Updates the status of the systray Icon tooltip.
+ * Doesn't check if the systray exists, check before you call it.
+ **/
+void MainInterface::updateSystrayTooltipStatus( int i_status )
+{
+ switch( i_status )
+ {
+ case 0:
+ {
+ sysTray->setToolTip( qtr( "VLC media player" ) );
+ break;
+ }
+ case PLAYING_S:
+ {
+ sysTray->setToolTip( input_name );
+ //+ " - " + qtr( "Playing" ) );
+ break;
+ }
+ case PAUSE_S:
+ {
+ sysTray->setToolTip( input_name + " - "
+ + qtr( "Paused") );
+ break;
+ }
+ }
+}
/************************************************************************
- * D&D
+ * D&D Events
************************************************************************/
void MainInterface::dropEvent(QDropEvent *event)
{
}
/************************************************************************
- * Other stuff
+ * Events stuff
************************************************************************/
+void MainInterface::customEvent( QEvent *event )
+{
+ if( event->type() == PLDockEvent_Type )
+ {
+ PlaylistDialog::killInstance();
+ playlistEmbeddedFlag = true;
+ menuBar()->clear();
+ QVLCMenu::createMenuBar(this, p_intf, true, isAdvancedVisible(),
+ visualSelectorEnabled);
+ togglePlaylist();
+ }
+ else if ( event->type() == SetVideoOnTopEvent_Type )
+ {
+ SetVideoOnTopQtEvent* p_event = (SetVideoOnTopQtEvent*)event;
+ if( p_event->OnTop() )
+ setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+ else
+ setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
+ show(); /* necessary to apply window flags?? */
+ }
+}
+
void MainInterface::keyPressEvent( QKeyEvent *e )
{
int i_vlck = qtEventToVLCKey( e );
e->accept();
}
-void MainInterface::setDisplay( 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+" " );
-}
-
-void MainInterface::setName( QString name )
-{
- input_name = name;
- nameLabel->setText( " " + name+" " );
-}
-
-void MainInterface::setStatus( int status )
-{
- controls->setStatus( status );
- if( systrayMenu )
- updateSystrayMenu( status );
-}
-
-void MainInterface::updateOnTimer()
-{
- /* \todo Make this event-driven */
- // TO MOVE TO controls
- advControls->enableInput( THEMIM->getIM()->hasInput() );
- controls->enableInput( THEMIM->getIM()->hasInput() );
- advControls->enableVideo( THEMIM->getIM()->hasVideo() );
-
- if( intf_ShouldDie( p_intf ) )
- {
- QApplication::closeAllWindows();
- QApplication::quit();
- }
- if( need_components_update )
- {
- doComponentsUpdate();
- need_components_update = false;
- }
-
- controls->updateOnTimer();
-}
-
void MainInterface::closeEvent( QCloseEvent *e )
{
hide();
vlc_object_kill( p_intf );
}
+/*****************************************************************************
+ * 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 )
projects / vlc / blobdiff