#include <QSize>
#include <QMenu>
#include <QLabel>
+#include <QSlider>
+#include <QWidgetAction>
+#include <QDockWidget>
+#include <QToolBar>
#include <assert.h>
#include <vlc_keys.h>
#ifdef WIN32
#define PREF_W 410
- #define PREF_H 121
+ #define PREF_H 151
#else
- #define PREF_W 450
- #define PREF_H 125
+ #define PREF_W 400
+ #define PREF_H 140
#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 = "";
/**
* 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);
setWindowIcon( QApplication::windowIcon() );
+ 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
- **/
+ visualSelectorEnabled = settings->value( "visual-selector", false ).toBool();
+ notificationEnabled = config_GetInt( p_intf, "qt-notification" )
+ ? true : false;
+ /**************************
+ * UI and Widgets design
+ **************************/
setVLCWindowsTitle();
handleMainUi( settings );
+ /* Create a Dock to get the playlist */
+ dockPL = new QDockWidget( qtr("Playlist"), this );
+ dockPL->setAllowedAreas( Qt::LeftDockWidgetArea
+ | Qt::RightDockWidgetArea
+ | Qt::BottomDockWidgetArea );
+ dockPL->setFeatures( QDockWidget::AllDockWidgetFeatures );
+
/* Menu Bar */
- QVLCMenu::createMenuBar( this, p_intf, playlistEmbeddedFlag,
- advControlsEnabled, visualSelectorEnabled );
+ QVLCMenu::createMenuBar( this, p_intf, 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;
+ /****************
+ * Status Bar *
+ ****************/
+
+ /* Widgets Creation*/
+ b_remainingTime = false;
+ timeLabel = new TimeLabel;
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);
+
+ /* and adding those */
statusBar()->addWidget( nameLabel, 8 );
statusBar()->addPermanentWidget( speedLabel, 0 );
statusBar()->addPermanentWidget( timeLabel, 2 );
- speedLabel->setContextMenuPolicy ( Qt::CustomContextMenu );
- timeLabel->setContextMenuPolicy ( Qt::CustomContextMenu );
+
+ /* 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 */
+ /**********************
+ * 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 BUG HERE
+ }
+ 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();
+ if( config_GetInt( p_intf, "qt-minimal-view" ) )
+ toggleMinimalView();
+
/* Init input manager */
MainInputManager::getInstance( p_intf );
ON_TIMEOUT( updateOnTimer() );
+// ON_TIMEOUT( debug() );
- /**
- * 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 ) );
+ this, setDisplayPosition( float, int, int ) );
+
+ CONNECT( THEMIM->getIM(), rateChanged( int ), this, setRate( int ) );
- /* Naming in the controller */
+ /**
+ * Connects on nameChanged()
+ */
+ /* Naming in the controller statusbar */
CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
setName( QString ) );
+ /* 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 ) );
+ /* and in the systray */
if( sysTray )
{
CONNECT( THEMIM->getIM(), statusChanged( int ), this,
var_AddCallback( p_playlist, "intf-show", IntfShowCB, p_intf );
vlc_object_release( p_playlist );
}
+
+ CONNECT( this, askReleaseVideo( void * ), this, releaseVideoSlot( void * ) );
+
+ // DEBUG FIXME
+ hide();
}
MainInterface::~MainInterface()
vlc_object_release( p_playlist );
}
- settings->setValue( "playlist-embedded", playlistEmbeddedFlag );
- settings->setValue( "adv-controls", advControlsEnabled );
+ settings->setValue( "playlist-embedded", !dockPL->isFloating() );
+ settings->setValue( "adv-controls", getControlsVisibilityStatus() & CONTROLS_ADVANCED );
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 */
- BUTTON_SET_IMG( controls->playlistButton, "" , playlist_icon.png,
- playlistEmbeddedFlag ? qtr( "Show playlist" ) :
- qtr( "Open playlist" ) );
- BUTTONACT( controls->playlistButton, playlist() );
+ /* Configure the Controls, the playlist button doesn't trigger THEDP
+ but the toggle from this MainInterface */
+ BUTTONACT( controls->playlistButton, togglePlaylist() );
-#if DEBUG_COLOR
- QPalette palette;
- palette.setColor(main->backgroundRole(), Qt::green);
- main->setPalette(palette);
-#endif
-
- /* Add the controls Widget */
+ /* Add the controls Widget to the main Widget */
mainLayout->addWidget( controls );
- /* Set initial size */
- resize ( PREF_W, PREF_H );
+ /* Create the Speed Control Widget */
+ speedControl = new SpeedControlWidget( p_intf );
+ speedControlMenu = new QMenu( this );
+ QWidgetAction *widgetAction = new QWidgetAction( this );
+ widgetAction->setDefaultWidget( speedControl );
+ speedControlMenu->addAction( widgetAction );
+ /* 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 );
bgWidget->resize( bgWidget->widgetSize );
bgWidget->updateGeometry();
mainLayout->insertWidget( 0, bgWidget );
+ CONNECT( this, askBgWidgetToToggle(), bgWidget, toggle() );
}
if( videoEmbeddedFlag )
setMinimumSize( PREF_W, addSize.height() );
}
+void MainInterface::debug()
+{
+ msg_Dbg( p_intf, "size: %i - %i", controls->size().height(), controls->size().width() );
+ msg_Dbg( p_intf, "sizeHint: %i - %i", controls->sizeHint().height(), controls->sizeHint().width() );
+}
/**********************************************************************
- * Handling of the components
+ * Handling of sizing of the components
**********************************************************************/
void MainInterface::calculateInterfaceSize()
{
int width = 0, height = 0;
if( VISIBLE( bgWidget ) )
{
- width = bgWidget->widgetSize.width();
+ width = bgWidget->widgetSize.width();
height = bgWidget->widgetSize.height();
- assert( !(playlistWidget && playlistWidget->isVisible() ) );
- }
- else if( VISIBLE( playlistWidget ) )
- {
- width = playlistWidget->widgetSize.width();
- height = playlistWidget->widgetSize.height();
}
else if( videoIsActive )
{
- width = videoWidget->widgetSize.width() ;
+ width = videoWidget->widgetSize.width() ;
height = videoWidget->widgetSize.height();
}
else
{
- width = PREF_W - addSize.width();
+ width = PREF_W - addSize.width();
height = PREF_H - addSize.height();
}
- if( VISIBLE( visualSelector ) )
- height += visualSelector->height();
- if( VISIBLE( advControls) )
+ if( !dockPL->isFloating() && dockPL->widget() )
{
- height += advControls->sizeHint().height();
+ width += dockPL->widget()->width();
+ height += dockPL->widget()->height();
}
+ if( VISIBLE( visualSelector ) )
+ height += visualSelector->height();
mainSize = QSize( width + addSize.width(), height + addSize.height() );
}
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() );
+ //FIXME
+// SET_WH( playlistWidget , e->size().width() - addSize.width(),
+ // e->size().height() - addSize.height() );
playlistWidget->updateGeometry();
}
}
+
/****************************************************************************
- * 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() );
+ speedControlMenu->exec( QCursor::pos() - pos
+ + QPoint( 0, speedLabel->height() ) );
}
-void MainInterface::showTimeMenu( QPoint pos )
-{
- QMenu menu( this );
- menu.addAction( "Not Implemented Yet" );
- 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()
+/****************************************************************************
+ * Video Handling
+ ****************************************************************************/
+class SetVideoOnTopQtEvent : public QEvent
{
- if( isHidden() )
- {
- show();
- activateWindow();
- }
- else
+public:
+ SetVideoOnTopQtEvent( bool _onTop ) :
+ QEvent( (QEvent::Type)SetVideoOnTopEvent_Type ), onTop( _onTop)
{
-#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 )
+ bool OnTop() const
{
- case QSystemTrayIcon::Trigger:
- toggleUpdateSystrayMenu();
- break;
- case QSystemTrayIcon::MiddleClick:
- sysTray->showMessage( qtr( "VLC media player" ),
- qtr( "Control menu for the player" ),
- QSystemTrayIcon::Information, 4000 );
- break;
+ return onTop;
}
-}
-/**
- * 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 );
- sysTray->showMessage( qtr( "VLC media player" ), name,
- QSystemTrayIcon::NoIcon, 4000 );
- }
-}
+private:
+ bool onTop;
+};
+
-/**
- * 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;
- }
- }
-}
void *MainInterface::requestVideo( vout_thread_t *p_nvout, int *pi_x,
int *pi_y, unsigned int *pi_width,
unsigned int *pi_height )
if( ret )
{
videoIsActive = true;
- if( VISIBLE( playlistWidget ) )
- {
- embeddedPlaylistWasActive = true;
-// playlistWidget->hide();
- }
+
bool bgWasVisible = false;
if( VISIBLE( bgWidget) )
{
bgWasVisible = true;
- bgWidget->hide();
+ emit askBgWidgetToToggle();
}
+
if( THEMIM->getIM()->hasVideo() || !bgWasVisible )
{
videoWidget->widgetSize = QSize( *pi_width, *pi_height );
// videoWidget->widgetSize = bgWidget->widgeTSize;
videoWidget->widgetSize = QSize( *pi_width, *pi_height );
}
-// videoWidget->updateGeometry(); /// FIXME: Needed ?
+ videoWidget->updateGeometry(); // Needed for deinterlace
need_components_update = true;
}
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 )
bgWidget->show();
videoIsActive = false;
need_components_update = true;
}
-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 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();
+ videoWidget->updateGeometry();
need_components_update = true;
i_ret = VLC_SUCCESS;
break;
return i_ret;
}
-void MainInterface::advanced()
+/*****************************************************************************
+ * Playlist, Visualisation and Menus handling
+ *****************************************************************************/
+/**
+ * Toggle the playlist widget or dialog
+ **/
+void MainInterface::togglePlaylist()
{
- if( !VISIBLE( advControls ) )
+ /* If no playlist exist, then create one and attach it to the DockPL*/
+ if( !playlistWidget )
{
- advControls->show();
- advControlsEnabled = true;
+ msg_Dbg( p_intf, "Creating a new playlist" );
+ playlistWidget = new PlaylistWidget( p_intf );
+ if(bgWidget)
+ CONNECT( playlistWidget, artSet( QString ), bgWidget, setArt(QString) );
+
+ //FIXME
+/* playlistWidget->widgetSize = settings->value( "playlistSize",
+ QSize( 650, 310 ) ).toSize();*/
+ /* Add it to the parent DockWidget */
+ dockPL->setWidget( playlistWidget );
+
+ /* Add the dock to the main Interface */
+ addDockWidget( Qt::BottomDockWidgetArea, dockPL );
+
+ msg_Dbg( p_intf, "Creating a new playlist" );
+
+ /* Make the playlist floating is requested. Default is not. */
+ if( !settings->value( "playlist-embedded", true ).toBool() );
+ {
+ msg_Dbg( p_intf, "we don't want it inside");
+ dockPL->setFloating( true );
+ }
+
}
else
{
- advControls->hide();
- advControlsEnabled = false;
+ /* toggle the display */
+ TOGGLEV( dockPL );
}
doComponentsUpdate();
}
+void MainInterface::undockPlaylist()
+{
+ dockPL->setFloating( true );
+ doComponentsUpdate();
+}
+
+#if 0
void MainInterface::visual()
{
if( !VISIBLE( visualSelector) )
}
doComponentsUpdate();
}
+#endif
-void MainInterface::playlist()
+void MainInterface::toggleMinimalView()
{
- // Toggle the playlist dialog
- if( !playlistEmbeddedFlag )
- {
- if( playlistWidget )
- {
- /// \todo Destroy it
- }
- THEDP->playlistDialog();
- return;
- }
-
- 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) );
- }
- if( VISIBLE( playlistWidget ) )
- {
- playlistWidget->hide();
- if( bgWidget ) bgWidget->show();
- if( videoIsActive )
- {
- videoWidget->widgetSize = savedVideoSize;
- videoWidget->resize( videoWidget->widgetSize );
- videoWidget->updateGeometry();
- if( bgWidget ) bgWidget->hide();
- }
- }
- else
- {
- playlistWidget->show();
- if( videoIsActive )
- {
- savedVideoSize = videoWidget->widgetSize;
- videoWidget->widgetSize.setHeight( 0 );
- videoWidget->resize( videoWidget->widgetSize );
- videoWidget->updateGeometry();
- }
- if( VISIBLE( bgWidget ) ) bgWidget->hide();
- }
- doComponentsUpdate();
+ TOGGLEV( menuBar() );
+ TOGGLEV( controls );
+ TOGGLEV( statusBar() );
+ updateGeometry();
}
/* Video widget cannot do this synchronously as it runs in another thread */
resize( mainSize );
}
-void MainInterface::undockPlaylist()
+void MainInterface::toggleAdvanced()
{
- if( playlistWidget )
- {
- playlistWidget->hide();
- playlistWidget->deleteLater();
- mainLayout->removeWidget( playlistWidget );
- playlistWidget = NULL;
- playlistEmbeddedFlag = false;
+ controls->toggleAdvanced();
+}
- menuBar()->clear();
- QVLCMenu::createMenuBar( this, p_intf, false, advControlsEnabled,
- visualSelectorEnabled);
+int MainInterface::getControlsVisibilityStatus()
+{
+ return( (controls->isVisible() ? CONTROLS_VISIBLE : CONTROLS_HIDDEN )
+ + CONTROLS_ADVANCED * controls->b_advancedVisible );
+}
- if( videoIsActive )
- {
- videoWidget->widgetSize = savedVideoSize;
- videoWidget->resize( videoWidget->widgetSize );
- videoWidget->updateGeometry();
- }
+/************************************************************************
+ * Other stuff
+ ************************************************************************/
+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, b_remainingTime ? length - time : time );
+
+ QString title; title.sprintf( "%s/%s", psz_time, psz_length );
+ /* Add a minus to remaining time*/
+ if( b_remainingTime ) timeLabel->setText( " -"+title+" " );
+ else timeLabel->setText( " "+title+" " );
+}
+
+void MainInterface::toggleTimeDisplay()
+{
+ b_remainingTime = ( b_remainingTime ? false : true );
+}
+void MainInterface::setName( QString 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 )
+ 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( need_components_update )
+ {
doComponentsUpdate();
- THEDP->playlistDialog();
+ need_components_update = false;
}
+
+ controls->updateOnTimer();
}
-void MainInterface::toggleMenus()
+/*****************************************************************************
+ * 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()
{
- if( menuBar()->isVisible() ) menuBar()->hide();
- else menuBar()->show();
- msg_Dbg( p_intf, "I was there: \\_o<~~ coin coin" );
+ 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 ) );
}
-void MainInterface::customEvent( QEvent *event )
+/**
+ * Updates the Systray Icon's menu and toggle the main interface
+ */
+void MainInterface::toggleUpdateSystrayMenu()
{
- if( event->type() == PLDockEvent_Type )
+ if( isHidden() )
{
- PlaylistDialog::killInstance();
- playlistEmbeddedFlag = true;
- menuBar()->clear();
- QVLCMenu::createMenuBar(this, p_intf, true, advControlsEnabled,
- visualSelectorEnabled);
- playlist();
+ show();
+ activateWindow();
}
- else if ( event->type() == SetVideoOnTopEvent_Type )
+ else if( isMinimized() )
{
- SetVideoOnTopQtEvent* p_event = (SetVideoOnTopQtEvent*)event;
- if( p_event->OnTop() )
- setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+ showNormal();
+ 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.
+ **/
+void MainInterface::updateSystrayTooltipName( QString name )
+{
+ if( name.isEmpty() )
+ {
+ sysTray->setToolTip( qtr( "VLC media player" ) );
+ }
+ else
+ {
+ sysTray->setToolTip( name );
+ if( notificationEnabled && ( isHidden() || isMinimized() ) )
+ {
+ 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 );
+ 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 0
+ if( event->type() == PLDockEvent_Type )
+ {
+ PlaylistDialog::killInstance();
+ playlistEmbeddedFlag = true;
+ menuBar()->clear();
+ QVLCMenu::createMenuBar(this, p_intf, true, visualSelectorEnabled);
+ togglePlaylist();
+ }
+#endif
+ /*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 )
{
+ 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();
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( sysTray )
- 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() );
- controls->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