#include <QStatusBar>
#include <QKeyEvent>
#include <QUrl>
+#include <QSystemTrayIcon>
#include <assert.h>
#include <vlc_keys.h>
need_components_update = false;
bgWidget = NULL; videoWidget = NULL; playlistWidget = NULL;
embeddedPlaylistWasActive = videoIsActive = false;
+
+ input_name = "";
videoEmbeddedFlag = false;
if( config_GetInt( p_intf, "embedded-video" ) ) videoEmbeddedFlag = true;
visualSelectorEnabled= settings->value( "visual-selector", false ).toBool();
/* UI */
- setWindowTitle( qtr( "VLC media player" ) );
+ setVLCWindowsTitle();
handleMainUi( settings );
QVLCMenu::createMenuBar( this, p_intf, playlistEmbeddedFlag,
advControlsEnabled, visualSelectorEnabled );
/* Volume control */
CONNECT( ui.volumeSlider, valueChanged(int), this, updateVolume(int) );
+
/* Connect the input manager to the GUI elements it manages */
CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
slider, setPosition( float,int, int ) );
CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
this, setDisplay( float, int, int ) );
- CONNECT( THEMIM->getIM(), nameChanged( QString ), this,setName( QString ) );
+
+ /* Naming in the controller */
+ CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
+ setName( QString ) );
+ if( config_GetInt( p_intf, "qt-system-tray" ) )
+ {
+ CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
+ updateSystrayTooltipName(QString));
+ }
+ if( config_GetInt( p_intf, "qt-name-in-title" ) )
+ {
+ CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
+ setVLCWindowsTitle( QString ) );
+ }
+
+ /* PLAY_STATUS */
CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) );
- CONNECT( THEMIM->getIM(), navigationChanged( int ), this, setNavigation(int) );
+ CONNECT( THEMIM->getIM(), navigationChanged( int ),
+ this, setNavigation(int) );
+ if( config_GetInt( p_intf, "qt-system-tray" ) )
+ {
+ CONNECT( THEMIM->getIM(), statusChanged( int ), this,
+ updateSystrayTooltipStatus(int));
+ }
CONNECT( slider, sliderDragged( float ),
THEMIM->getIM(), sliderUpdate( float ) );
+ /* Buttons */
CONNECT( ui.prevSectionButton, clicked(), THEMIM->getIM(),
sectionPrev() );
CONNECT( ui.nextSectionButton, clicked(), THEMIM->getIM(),
p_intf->b_interaction = VLC_TRUE;
/* Register callback for the intf-popupmenu variable */
- playlist_t *p_playlist =
- (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ 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 );
}
+ if( QSystemTrayIcon::isSystemTrayAvailable() &&
+ ( config_GetInt( p_intf, "qt-start-mininimized") == 1))
+ {
+ hide();
+ createSystrayMenu();
+ }
+ if( QSystemTrayIcon::isSystemTrayAvailable() &&
+ ( config_GetInt( p_intf, "qt-system-tray") == 1))
+ createSystrayMenu();
+
}
MainInterface::~MainInterface()
{
/* Unregister callback for the intf-popupmenu variable */
- playlist_t *p_playlist =
- (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ 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 );
p_intf->pf_control_window = NULL;
}
+void MainInterface::setVLCWindowsTitle( QString aTitle )
+{
+ if( aTitle.isEmpty() )
+ {
+ this->setWindowTitle( qtr( "VLC media player" ) );
+ }
+ else
+ {
+ this->setWindowTitle( aTitle + " - " + qtr( "VLC media player" ) );
+ }
+}
+
void MainInterface::handleMainUi( QSettings *settings )
{
QWidget *main = new QWidget( this );
setMinimumSize( PREF_W, addSize.height() );
}
+void MainInterface::createSystrayMenu()
+{
+ QIcon iconVLC = QIcon( QPixmap( ":/vlc128.png" ) );
+ sysTray = new QSystemTrayIcon( iconVLC, this );
+ systrayMenu = new QMenu( qtr( "VLC media player" ), this );
+ systrayMenu->setIcon( iconVLC );
+ sysTray->setToolTip( qtr( "VLC media player" ));
+ QVLCMenu::updateSystrayMenu( this, p_intf, true );
+ sysTray->show();
+ CONNECT( sysTray, activated( QSystemTrayIcon::ActivationReason ),
+ this, handleSystrayClick( QSystemTrayIcon::ActivationReason ) );
+}
+
+void MainInterface::updateSystrayMenu( int status )
+{
+ QVLCMenu::updateSystrayMenu( this, p_intf ) ;
+}
+
+void MainInterface::toggleUpdateSystrayMenu()
+{
+ QVLCMenu::updateSystrayMenu( this, p_intf );
+ toggleVisible();
+}
+
+void MainInterface::handleSystrayClick( QSystemTrayIcon::ActivationReason reason )
+{
+ switch( reason )
+ {
+ case QSystemTrayIcon::Trigger:
+ this->toggleVisible(); break;
+ case QSystemTrayIcon::MiddleClick:
+ sysTray->showMessage( qtr( "VLC media player" ),
+ qtr( "Control menu for the player" ),
+ QSystemTrayIcon::Information, 4000 );
+ break;
+ }
+}
+
+
+void MainInterface::updateSystrayTooltipName( QString name )
+{
+ if( name.isEmpty() )
+ {
+ sysTray->setToolTip( qtr( "VLC media player" ) );
+ }
+ else
+ {
+ sysTray->setToolTip( name );
+ }
+}
+
+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;
+ }
+ }
+}
/**********************************************************************
* Handling of the components
**********************************************************************/
if( p_event->OnTop() )
setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
else
- setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
+ setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
show(); /* necessary to apply window flags?? */
}
}
void MainInterface::setName( QString name )
{
+ input_name = name;
nameLabel->setText( " " + name+" " );
+
}
void MainInterface::setStatus( int status )
ui.playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) );
else
ui.playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );
+ updateSystrayMenu( status );
}
#define HELP_MENU N_("Menu")
void MainInterface::closeEvent( QCloseEvent *e )
{
hide();
- p_intf->b_die = VLC_TRUE;
+ vlc_object_kill( p_intf );
}
void MainInterface::updateVolume( int sliderVolume )
projects / vlc / blobdiff