/*****************************************************************************
- * main_inteface.cpp : Main interface
+ * main_interface.cpp : Main interface
****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006-2007 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
+ * Jean-Baptiste Kempf <jb@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
#include "qt4.hpp"
#include "main_interface.hpp"
#include "input_manager.hpp"
-#include "util/input_slider.hpp"
#include "util/qvlcframe.hpp"
#include "util/customwidgets.hpp"
#include "dialogs_provider.hpp"
#include <QStatusBar>
#include <QKeyEvent>
#include <QUrl>
+#include <QSystemTrayIcon>
+#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()
+/* 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 );
+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 *);
/* Video handling */
return p_intf->p_sys->p_mi->controlVideo( p_win, i_q, a );
}
-bool embeddedPlaylistWasActive;
-bool videoIsActive;
-QSize savedVideoSize;
-
MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
{
- /* Configuration */
- settings = new QSettings( "VideoLAN", "VLC" );
- settings->beginGroup( "MainWindow" );
-
+ /* Variables initialisation */
need_components_update = false;
bgWidget = NULL; videoWidget = NULL; playlistWidget = NULL;
embeddedPlaylistWasActive = videoIsActive = false;
+ input_name = "";
+
+ /**
+ * Configuration and settings
+ **/
+ 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;
- if( config_GetInt( p_intf, "embedded-video" ) ) videoEmbeddedFlag = true;
+ if( config_GetInt( p_intf, "embedded-video" ) )
+ videoEmbeddedFlag = true;
alwaysVideoFlag = false;
- if( videoEmbeddedFlag && config_GetInt( p_intf, "qt-always-video" ))
+ if( videoEmbeddedFlag && config_GetInt( p_intf, "qt-always-video" ) )
alwaysVideoFlag = true;
- playlistEmbeddedFlag = settings->value("playlist-embedded", true).toBool();
- advControlsEnabled= settings->value( "adv-controls", false ).toBool();
- visualSelectorEnabled= settings->value( "visual-selector", false ).toBool();
-
- /* UI */
- setWindowTitle( qtr( "VLC media player" ) );
+ /* Set the other interface settings */
+ visualSelectorEnabled = settings->value( "visual-selector", false ).toBool();
+ notificationEnabled = config_GetInt( p_intf, "qt-notification" )
+ ? true : false;
+ /**************************
+ * UI and Widgets design
+ **************************/
+ setVLCWindowsTitle();
handleMainUi( settings );
- QVLCMenu::createMenuBar( this, p_intf, playlistEmbeddedFlag,
- advControlsEnabled, visualSelectorEnabled );
- timeLabel = new QLabel( 0 );
- nameLabel = new QLabel( 0 );
- statusBar()->addWidget( nameLabel, 4 );
- statusBar()->addPermanentWidget( timeLabel, 1 );
- setFocusPolicy( Qt::StrongFocus );
- setAcceptDrops(true);
+ /* 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, visualSelectorEnabled );
+
+ /****************
+ * Status Bar *
+ ****************/
+
+ /* Widgets Creation*/
+ b_remainingTime = false;
+ timeLabel = new TimeLabel;
+ nameLabel = new QLabel;
+ 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 );
+
+ /* 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 ) );
+
+ /**********************
+ * Systray Management *
+ **********************/
+ sysTray = NULL;
+ bool b_createSystray = false;
+ bool b_systrayAvailable = QSystemTrayIcon::isSystemTrayAvailable();
+ if( config_GetInt( p_intf, "qt-start-minimized") )
+ {
+ 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( 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() );
+
+
+ /********************
+ * Various CONNECTs *
+ ********************/
- /* Volume control */
- CONNECT( ui.volumeSlider, valueChanged(int), this, updateVolume(int) );
/* Connect the input manager to the GUI elements it manages */
+ /* It is also connected to the control->slider, see the ControlsWidget */
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 ) );
+ this, setDisplayPosition( float, int, int ) );
+
+ CONNECT( THEMIM->getIM(), rateChanged( int ), this, setRate( int ) );
+
+ /**
+ * 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 ) );
+ }
+
+ /** CONNECTS on PLAY_STATUS **/
+ /* Status on the main controller */
CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) );
- CONNECT( slider, sliderDragged( float ),
- THEMIM->getIM(), sliderUpdate( float ) );
+ /* and in the systray */
+ if( sysTray )
+ {
+ CONNECT( THEMIM->getIM(), statusChanged( int ), this,
+ updateSystrayTooltipStatus( int ) );
+ }
+ /**
+ * Callbacks
+ **/
var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
var_AddCallback( p_intf, "interaction", InteractCallback, this );
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 );
+ 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 );
+ }
+
+ CONNECT( this, askReleaseVideo( void * ), this, releaseVideoSlot( void * ) );
+
+ // DEBUG FIXME
+ hide();
}
MainInterface::~MainInterface()
{
- settings->setValue( "playlist-embedded", playlistEmbeddedFlag );
- settings->setValue( "adv-controls", advControlsEnabled );
+ /* Unregister callback for the intf-popupmenu variable */
+ 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 );
+ var_DelCallback( p_playlist, "intf-show", IntfShowCB, p_intf );
+ vlc_object_release( p_playlist );
+ }
+
+ settings->setValue( "playlist-embedded", !dockPL->isFloating() );
+ settings->setValue( "adv-controls", getControlsVisibilityStatus() & CONTROLS_ADVANCED );
settings->setValue( "pos", pos() );
settings->endGroup();
delete settings;
p_intf->pf_control_window = NULL;
}
+/*****************************
+ * Main UI handling *
+ *****************************/
+
+/**
+ * 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::handleMainUi( QSettings *settings )
{
+ /* Create the main Widget and the mainLayout */
QWidget *main = new QWidget( this );
+ mainLayout = new QVBoxLayout( main );
setCentralWidget( main );
- ui.setupUi( centralWidget() );
-
- slider = new InputSlider( Qt::Horizontal, NULL );
- ui.hboxLayout->insertWidget( 0, slider );
-
- BUTTON_SET_ACT_I( ui.prevButton, "" , previous.png,
- qtr("Previous"), prev() );
- BUTTON_SET_ACT_I( ui.nextButton, "", next.png, qtr("Next"), next() );
- BUTTON_SET_ACT_I( ui.playButton, "", play.png, qtr("Play"), play() );
- BUTTON_SET_ACT_I( ui.stopButton, "", stop.png, qtr("Stop"), stop() );
-
- /* Volume */
- ui.volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) );
- ui.volumeSlider->setMaximum( 100 );
- ui.volMuteLabel->setToolTip( qtr( "Mute" ) );
- VolumeClickHandler *h = new VolumeClickHandler( p_intf, this );
- ui.volMuteLabel->installEventFilter(h);
- ui.volumeSlider->setFocusPolicy( Qt::NoFocus );
-
- BUTTON_SET_IMG( ui.playlistButton, "" , playlist_icon.png,
- playlistEmbeddedFlag ? qtr( "Show playlist" ) :
- qtr( "Open playlist" ) );
- BUTTONACT( ui.playlistButton, playlist() );
- /* Set initial size */
- resize ( PREF_W, PREF_H );
+ /* Margins, spacing */
+ main->setContentsMargins( 0, 0, 0, 0 );
+ mainLayout->setMargin( 0 );
- addSize = QSize( ui.vboxLayout->margin() * 2, PREF_H );
+ /* Create the CONTROLS Widget */
+ controls = new ControlsWidget( p_intf,
+ settings->value( "adv-controls", false ).toBool() );
- advControls = new ControlsWidget( p_intf );
- ui.vboxLayout->insertWidget( 0, advControls );
- advControls->updateGeometry();
- if( !advControlsEnabled ) advControls->hide();
- need_components_update = true;
+ /* Configure the Controls, the playlist button doesn't trigger THEDP
+ but the toggle from this MainInterface */
+ BUTTONACT( controls->playlistButton, togglePlaylist() );
+
+ /* Add the controls Widget to the main Widget */
+ mainLayout->addWidget( controls );
+
+ /* 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 );
+
+ /* Visualisation */
visualSelector = new VisualSelector( p_intf );
- ui.vboxLayout->insertWidget( 0, visualSelector );
+ mainLayout->insertWidget( 0, visualSelector );
visualSelector->hide();
+ /* And video Outputs */
if( alwaysVideoFlag )
{
bgWidget = new BackgroundWidget( p_intf );
bgWidget->widgetSize = settings->value( "backgroundSize",
- QSize( 200, 200 ) ).toSize();
+ QSize( 300, 300 ) ).toSize();
bgWidget->resize( bgWidget->widgetSize );
bgWidget->updateGeometry();
- ui.vboxLayout->insertWidget( 0, bgWidget );
+ mainLayout->insertWidget( 0, bgWidget );
+ CONNECT( this, askBgWidgetToToggle(), bgWidget, toggle() );
}
if( videoEmbeddedFlag )
{
videoWidget = new VideoWidget( p_intf );
videoWidget->widgetSize = QSize( 1, 1 );
- videoWidget->resize( videoWidget->widgetSize );
- ui.vboxLayout->insertWidget( 0, videoWidget );
+ //videoWidget->resize( videoWidget->widgetSize );
+ mainLayout->insertWidget( 0, videoWidget );
p_intf->pf_request_window = ::DoRequest;
p_intf->pf_release_window = ::DoRelease;
p_intf->pf_control_window = ::DoControl;
}
+
+ /* Finish the sizing */
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 menu for rate control
+ ****************************************************************************/
+void MainInterface::showSpeedMenu( QPoint pos )
+{
+ speedControlMenu->exec( QCursor::pos() - pos
+ + QPoint( 0, speedLabel->height() ) );
+}
+
+/****************************************************************************
+ * Video Handling
+ ****************************************************************************/
+class SetVideoOnTopQtEvent : public QEvent
+{
+public:
+ SetVideoOnTopQtEvent( bool _onTop ) :
+ QEvent( (QEvent::Type)SetVideoOnTopEvent_Type ), onTop( _onTop)
+ {
+ }
+
+ bool OnTop() const
+ {
+ return onTop;
+ }
+
+private:
+ bool onTop;
+};
+
+
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;
break;
}
case VOUT_SET_STAY_ON_TOP:
+ {
+ int i_arg = va_arg( args, int );
+ QApplication::postEvent( this, new SetVideoOnTopQtEvent( i_arg ) );
+ i_ret = VLC_SUCCESS;
+ break;
+ }
default:
msg_Warn( p_intf, "unsupported control query" );
break;
return i_ret;
}
-void MainInterface::advanced()
-{
- if( !VISIBLE( advControls ) )
+/*****************************************************************************
+ * Playlist, Visualisation and Menus handling
+ *****************************************************************************/
+/**
+ * Toggle the playlist widget or dialog
+ **/
+void MainInterface::togglePlaylist()
+{
+ /* 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 )
+ TOGGLEV( menuBar() );
+ TOGGLEV( controls );
+ TOGGLEV( statusBar() );
+ updateGeometry();
+}
+
+/* Video widget cannot do this synchronously as it runs in another thread */
+/* Well, could it, actually ? Probably dangerous ... */
+void MainInterface::doComponentsUpdate()
+{
+ calculateInterfaceSize();
+ resize( mainSize );
+}
+
+void MainInterface::toggleAdvanced()
+{
+ controls->toggleAdvanced();
+}
+
+int MainInterface::getControlsVisibilityStatus()
+{
+ return( (controls->isVisible() ? CONTROLS_VISIBLE : CONTROLS_HIDDEN )
+ + CONTROLS_ADVANCED * controls->b_advancedVisible );
+}
+
+/************************************************************************
+ * 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 ) )
{
- if( playlistWidget )
- {
- /// \todo Destroy it
- }
- THEDP->playlistDialog();
- return;
+ QApplication::closeAllWindows();
+ QApplication::quit();
+ }
+ if( need_components_update )
+ {
+ doComponentsUpdate();
+ need_components_update = false;
}
- if( !playlistWidget )
+ 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 ) );
+}
+
+/**
+ * Updates the Systray Icon's menu and toggle the main interface
+ */
+void MainInterface::toggleUpdateSystrayMenu()
+{
+ if( isHidden() )
{
- PlaylistDialog::killInstance();
- playlistWidget = new PlaylistWidget( p_intf );
- ui.vboxLayout->insertWidget( 0, playlistWidget );
- playlistWidget->widgetSize = settings->value( "playlistSize",
- QSize( 650, 310 ) ).toSize();
- playlistWidget->hide();
+ show();
+ activateWindow();
}
- if( VISIBLE( playlistWidget ) )
+ else if( isMinimized() )
{
- playlistWidget->hide();
- if( videoIsActive )
- {
- videoWidget->widgetSize = savedVideoSize;
- videoWidget->resize( videoWidget->widgetSize );
- videoWidget->updateGeometry();
- }
+ showNormal();
+ activateWindow();
}
else
{
- playlistWidget->show();
- if( videoIsActive )
+#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
{
- savedVideoSize = videoWidget->widgetSize;
- videoWidget->widgetSize.setHeight( 0 );
- videoWidget->resize( videoWidget->widgetSize );
- videoWidget->updateGeometry();
+ hide();
+ }
+ else
+ {
+ activateWindow();
}
- if( VISIBLE( bgWidget ) ) bgWidget->hide();
}
- doComponentsUpdate();
+ QVLCMenu::updateSystrayMenu( this, p_intf );
}
-/* Video widget cannot do this synchronously as it runs in another thread */
-/* Well, could it, actually ? Probably dangerous ... */
-void MainInterface::doComponentsUpdate()
+void MainInterface::handleSystrayClick(
+ QSystemTrayIcon::ActivationReason reason )
{
- calculateInterfaceSize();
- resize( mainSize );
+ 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;
+ }
}
-void MainInterface::undockPlaylist()
+/**
+ * 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( playlistWidget )
+ if( name.isEmpty() )
{
- playlistWidget->hide();
- playlistWidget->deleteLater();
- ui.vboxLayout->removeWidget( playlistWidget );
- playlistWidget = NULL;
- playlistEmbeddedFlag = false;
-
- menuBar()->clear();
- QVLCMenu::createMenuBar( this, p_intf, false, advControlsEnabled,
- visualSelectorEnabled);
-
- if( videoIsActive )
+ sysTray->setToolTip( qtr( "VLC media player" ) );
+ }
+ else
+ {
+ sysTray->setToolTip( name );
+ if( notificationEnabled && ( isHidden() || isMinimized() ) )
{
- videoWidget->widgetSize = savedVideoSize;
- videoWidget->resize( videoWidget->widgetSize );
- videoWidget->updateGeometry();
+ sysTray->showMessage( qtr( "VLC media player" ), name,
+ QSystemTrayIcon::NoIcon, 4000 );
}
-
- doComponentsUpdate();
- THEDP->playlistDialog();
}
}
-void MainInterface::customEvent( QEvent *event )
+/**
+ * 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 )
{
- if( event->type() == PLDockEvent_Type )
+ switch( i_status )
{
- PlaylistDialog::killInstance();
- playlistEmbeddedFlag = true;
- menuBar()->clear();
- QVLCMenu::createMenuBar(this, p_intf, true, advControlsEnabled,
- visualSelectorEnabled);
- playlist();
+ 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)
{
if( s.length() > 0 ) {
playlist_Add( THEPL, qtu(s), NULL,
PLAYLIST_APPEND | (first ? PLAYLIST_GO:0),
- PLAYLIST_END, VLC_TRUE );
+ PLAYLIST_END, VLC_TRUE, VLC_FALSE );
first = false;
}
}
}
/************************************************************************
- * Other stuff
+ * Events stuff
************************************************************************/
-void MainInterface::keyPressEvent( QKeyEvent *e )
+void MainInterface::customEvent( QEvent *event )
{
- int i_vlck = qtEventToVLCKey( e );
- if( i_vlck >= 0 )
+#if 0
+ if( event->type() == PLDockEvent_Type )
{
- var_SetInteger( p_intf->p_libvlc, "key-pressed", i_vlck );
- e->accept();
+ PlaylistDialog::killInstance();
+ playlistEmbeddedFlag = true;
+ menuBar()->clear();
+ QVLCMenu::createMenuBar(this, p_intf, true, visualSelectorEnabled);
+ togglePlaylist();
}
- else
- e->ignore();
-}
-
-void MainInterface::stop()
-{
- playlist_Stop( THEPL );
-}
-void MainInterface::play()
-{
- if( playlist_IsEmpty(THEPL) )
+#endif
+ /*else */
+ if ( event->type() == SetVideoOnTopEvent_Type )
{
- /* The playlist is empty, open a file requester */
- THEDP->simpleOpenDialog();
- setStatus( 0 );
- return;
+ SetVideoOnTopQtEvent* p_event = (SetVideoOnTopQtEvent*)event;
+ if( p_event->OnTop() )
+ setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+ else
+ setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
+ show(); /* necessary to apply window flags?? */
}
- THEMIM->togglePlayPause();
-}
-void MainInterface::prev()
-{
- playlist_Prev( THEPL );
-}
-void MainInterface::next()
-{
- playlist_Next( THEPL );
-}
-
-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 )
-{
- nameLabel->setText( " " + name+" " );
-}
-
-void MainInterface::setStatus( int status )
-{
- if( status == 1 ) // Playing
- ui.playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) );
- else
- ui.playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );
}
-static bool b_my_volume;
-
-void MainInterface::updateOnTimer()
+void MainInterface::keyPressEvent( QKeyEvent *e )
{
- /* \todo Make this event-driven */
- advControls->enableInput( THEMIM->getIM()->hasInput() );
- advControls->enableVideo( THEMIM->getIM()->hasVideo() );
-
- if( intf_ShouldDie( p_intf ) )
+ if( ( e->modifiers() & Qt::ControlModifier ) && ( e->key() & Qt::Key_H )
+ && menuBar()->isHidden() )
{
- QApplication::closeAllWindows();
- QApplication::quit();
- }
- if( need_components_update )
- {
- doComponentsUpdate();
- need_components_update = false;
+ toggleMinimalView();
+ e->accept();
}
- audio_volume_t i_volume;
- aout_VolumeGet( p_intf, &i_volume );
- i_volume = (i_volume * 200 )/ AOUT_VOLUME_MAX ;
- int i_gauge = ui.volumeSlider->value();
- b_my_volume = false;
- if( i_volume - i_gauge > 1 || i_gauge - i_volume > 1 )
+ int i_vlck = qtEventToVLCKey( e );
+ if( i_vlck > 0 )
{
- b_my_volume = true;
- ui.volumeSlider->setValue( i_volume );
- b_my_volume = false;
+ var_SetInteger( p_intf->p_libvlc, "key-pressed", i_vlck );
+ e->accept();
}
+ else
+ e->ignore();
}
-void MainInterface::closeEvent( QCloseEvent *e )
+void MainInterface::wheelEvent( QWheelEvent *e )
{
- hide();
- p_intf->b_die = VLC_TRUE;
+ int i_vlckey = qtWheelEventToVLCKey( e );
+ var_SetInteger( p_intf->p_libvlc, "key-pressed", i_vlckey );
+ e->accept();
}
-void MainInterface::updateVolume( int sliderVolume )
+void MainInterface::closeEvent( QCloseEvent *e )
{
- if( !b_my_volume )
- {
- int i_res = sliderVolume * AOUT_VOLUME_MAX /
- (2*ui.volumeSlider->maximum() );
- aout_VolumeSet( p_intf, i_res );
- }
+ 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 )
QApplication::postEvent( THEDP, static_cast<QEvent*>(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
+ * caller to block for a too long time.
+ *****************************************************************************/
+static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
+ vlc_value_t old_val, vlc_value_t new_val, void *param )
+{
+ intf_thread_t *p_intf = (intf_thread_t *)param;
+
+ if( p_intf->pf_show_dialog )
+ {
+ p_intf->pf_show_dialog( p_intf, INTF_DIALOG_POPUPMENU,
+ new_val.b_bool, 0 );
+ }
+
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * IntfShowCB: callback triggered by the intf-show playlist 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 )
+{
+ intf_thread_t *p_intf = (intf_thread_t *)param;
+ //p_intf->p_sys->b_intf_show = VLC_TRUE;
+
+ return VLC_SUCCESS;
+}
projects / vlc / blobdiff