#include <QSize>
#include <QMenu>
#include <QLabel>
+#include <QSlider>
+#include <QWidgetAction>
+#include <QDockWidget>
+#include <QToolBar>
+#include <QGroupBox>
#include <assert.h>
#include <vlc_keys.h>
#include <vlc_vout.h>
-#ifdef WIN32
- #define PREF_W 410
- #define PREF_H 151
-#else
- #define PREF_W 450
- #define PREF_H 160
-#endif
-
#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);
embeddedPlaylistWasActive = videoIsActive = false;
input_name = "";
+ /**
+ * Ask for the network policy on FIRST STARTUP
+ **/
+ if( config_GetInt( p_intf, "privacy-ask") )
+ {
+ QList<ConfigControl *> controls;
+ privacyDialog( controls );
+
+ QList<ConfigControl *>::Iterator i;
+ for( i = controls.begin() ; i != controls.end() ; i++ )
+ {
+ ConfigControl *c = qobject_cast<ConfigControl *>(*i);
+ c->doApply( p_intf );
+ }
+
+ config_PutInt( p_intf, "privacy-ask" , 0 );
+ config_SaveConfigFile( p_intf, NULL );
+ }
+
/**
* 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);
+ setAcceptDrops( true );
setWindowIcon( QApplication::windowIcon() );
setWindowOpacity( config_GetFloat( p_intf, "qt-opacity" ) );
alwaysVideoFlag = true;
/* Set the other interface settings */
- 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,
- visualSelectorEnabled );
+ /* Create a Dock to get the playlist */
+ dockPL = new QDockWidget( qtr("Playlist"), this );
+ dockPL->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::MinimumExpanding );
+ dockPL->setFeatures( QDockWidget::AllDockWidgetFeatures );
+ dockPL->setAllowedAreas( Qt::LeftDockWidgetArea
+ | Qt::RightDockWidgetArea
+ | Qt::BottomDockWidgetArea );
- /* Status Bar */
- /**
- * TODO: clicking on the elapsed time should switch to the remaining time
- **/
- /**
- * TODO: do we add a label for the current Volume ?
- **/
+ /************
+ * Menu Bar
+ ************/
+ QVLCMenu::createMenuBar( this, p_intf, visualSelectorEnabled );
+
+ /****************
+ * Status Bar *
+ ****************/
+
+ /* Widgets Creation*/
b_remainingTime = false;
- timeLabel = new QLabel;
+ 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->installEventFilter( this );
+
+ /* 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 Management *
{
if( b_systrayAvailable ){
b_createSystray = true;
- hide(); //FIXME
+ hide(); //FIXME BUG HERE
}
else msg_Warn( p_intf, "You can't minize if you haven't a system "
"tray bar" );
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
- **/
+ /********************
+ * Various CONNECTs *
+ ********************/
/* 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 ),
this, setDisplayPosition( float, int, int ) );
-
+
CONNECT( THEMIM->getIM(), rateChanged( int ), this, setRate( int ) );
-
- /** Connects on nameChanged() */
+
+ /**
+ * Connects on nameChanged()
+ */
/* Naming in the controller statusbar */
CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
setName( QString ) );
var_AddCallback( p_playlist, "intf-show", IntfShowCB, p_intf );
vlc_object_release( p_playlist );
}
+
+ CONNECT( this, askReleaseVideo( void * ), this, releaseVideoSlot( void * ) );
+
+ CONNECT( dockPL, topLevelChanged( bool ), this, doComponentsUpdate() );
+ // DEBUG FIXME
+ hide();
+
+
+ updateGeometry();
+ settings->endGroup();
}
MainInterface::~MainInterface()
var_DelCallback( p_playlist, "intf-show", IntfShowCB, p_intf );
vlc_object_release( p_playlist );
}
-
- settings->setValue( "playlist-embedded", playlistEmbeddedFlag );
- settings->setValue( "adv-controls", getControlsVisibilityStatus() & 0x1 );
+ settings->beginGroup( "MainWindow" );
+ settings->setValue( "playlist-floats", dockPL->isFloating() );
+ settings->setValue( "adv-controls", getControlsVisibilityStatus() & CONTROLS_ADVANCED );
settings->setValue( "pos", pos() );
+ playlistWidget->saveSettings( settings );
settings->endGroup();
delete settings;
p_intf->b_interaction = VLC_FALSE;
}
}
-
void MainInterface::handleMainUi( QSettings *settings )
{
/* Create the main Widget and the mainLayout */
mainLayout->setMargin( 0 );
/* Create the CONTROLS Widget */
+ bool b_shiny = config_GetInt( p_intf, "qt-blingbling" );
controls = new ControlsWidget( p_intf,
- settings->value( "adv-controls", false ).toBool() );
+ settings->value( "adv-controls", false ).toBool(),
+ b_shiny );
- /* Configure the Controls */
- BUTTON_SET_IMG( controls->playlistButton, "" , playlist_icon.png,
- playlistEmbeddedFlag ? qtr( "Show playlist" ) :
- qtr( "Open playlist" ) );
+ /* 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 );
-
- /* Set initial size */
- resize( PREF_W, PREF_H );
- addSize = QSize( mainLayout->margin() * 2, 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 );
/* Visualisation */
+ /* Disabled for now, they SUCK */
+ #if 0
visualSelector = new VisualSelector( p_intf );
mainLayout->insertWidget( 0, visualSelector );
visualSelector->hide();
+ #endif
/* And video Outputs */
if( alwaysVideoFlag )
bgWidget->resize( bgWidget->widgetSize );
bgWidget->updateGeometry();
mainLayout->insertWidget( 0, bgWidget );
+ CONNECT( this, askBgWidgetToToggle(), bgWidget, toggle() );
}
if( videoEmbeddedFlag )
}
/* Finish the sizing */
- setMinimumSize( PREF_W, addSize.height() );
+ updateGeometry();
+}
+
+void MainInterface::privacyDialog( QList<ConfigControl *> controls )
+{
+ QDialog *privacy = new QDialog( this );
+
+ privacy->setWindowTitle( qtr( "Privacy and Network policies" ) );
+
+ QGridLayout *gLayout = new QGridLayout( privacy );
+
+ QGroupBox *blabla = new QGroupBox( qtr( "Privacy and Network Warning" ) );
+ QGridLayout *blablaLayout = new QGridLayout( blabla );
+ QLabel *text = new QLabel( qtr(
+ "<p>The <i>VideoLAN Team</i> doesn't like when an application goes "
+ "online without authorisation.</p>\n "
+ "<p><i>VLC media player</i> can request limited information on "
+ "Internet, espically to get CD Covers and songs metadata or to know "
+ "if updates are available.</p>\n"
+ "<p><i>VLC media player</i> <b>DOES NOT</b> send or collect <b>ANY</b> "
+ "information, even anonymously about your "
+ "usage.</p>\n"
+ "<p>Therefore please check the following options, the default being "
+ "almost no access on the web.</p>\n") );
+ text->setWordWrap( true );
+ text->setTextFormat( Qt::RichText );
+
+ blablaLayout->addWidget( text, 0, 0 ) ;
+
+ QGroupBox *options = new QGroupBox;
+ QGridLayout *optionsLayout = new QGridLayout( options );
+
+ gLayout->addWidget( blabla, 0, 0, 1, 3 );
+ gLayout->addWidget( options, 1, 0, 1, 3 );
+ module_config_t *p_config;
+ ConfigControl *control;
+ int line = 0;
+
+#define CONFIG_GENERIC( option, type ) \
+ p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \
+ if( p_config ) \
+ { \
+ control = new type ## ConfigControl( VLC_OBJECT(p_intf), \
+ p_config, options, false, optionsLayout, line ); \
+ controls.append( control ); \
+ }
+
+#define CONFIG_GENERIC_NOBOOL( option, type ) \
+ p_config = config_FindConfig( VLC_OBJECT(p_intf), option ); \
+ if( p_config ) \
+ { \
+ control = new type ## ConfigControl( VLC_OBJECT(p_intf), \
+ p_config, options, optionsLayout, line ); \
+ controls.append( control ); \
+ }
+
+ CONFIG_GENERIC( "album-art", IntegerList ); line++;
+ CONFIG_GENERIC_NOBOOL( "fetch-meta", Bool ); line++;
+ CONFIG_GENERIC_NOBOOL( "qt-updates-notif", Bool );
+
+ QPushButton *ok = new QPushButton( qtr( "Ok" ) );
+
+ gLayout->addWidget( ok, 2, 2 );
+
+ CONNECT( ok, clicked(), privacy, accept() );
+ privacy->exec();
+}
+
+//FIXME remove me at the end...
+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 sizing of the components
**********************************************************************/
-void MainInterface::calculateInterfaceSize()
+
+/* This function is probably wrong, but we don't have many many choices...
+ Since we can't know from the playlist Widget if we are inside a dock or not,
+ because the playlist Widget can be called by THEDP, as a separate windows for
+ the skins.
+ Maybe the other solution is to redefine the sizeHint() of the playlist and
+ ask _parent->isFloating()...
+ If you think this would be better, please FIX it...
+*/
+QSize MainInterface::sizeHint() const
{
- int width = 0, height = 0;
+ QSize tempSize = controls->sizeHint() +
+ QSize( 100, menuBar()->size().height() + statusBar()->size().height() );
+
if( VISIBLE( bgWidget ) )
- {
- width = bgWidget->widgetSize.width();
- height = bgWidget->widgetSize.height();
- assert( !(playlistWidget && playlistWidget->isVisible() ) );
- }
- else if( VISIBLE( playlistWidget ) )
- {
- width = playlistWidget->widgetSize.width();
- height = playlistWidget->widgetSize.height();
- }
+ tempSize += bgWidget->sizeHint();
else if( videoIsActive )
- {
- width = videoWidget->widgetSize.width() ;
- height = videoWidget->widgetSize.height();
- }
- else
- {
- width = PREF_W - addSize.width();
- height = PREF_H - addSize.height();
- }
- if( VISIBLE( visualSelector ) )
- height += visualSelector->height();
-/* if( VISIBLE( advControls) )
- {
- height += advControls->sizeHint().height();
- }*/
- mainSize = QSize( width + addSize.width(), height + addSize.height() );
+ tempSize += videoWidget->size();
+
+ if( !dockPL->isFloating() && dockPL->widget() )
+ tempSize += dockPL->widget()->size();
+
+ return tempSize;
}
+#if 0
+/* This is dead code and need to be removed AT THE END */
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();
}
}
+#endif
/****************************************************************************
- * 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() );
-}
-
-void MainInterface::showTimeMenu( QPoint pos )
-{
- QMenu menu( this );
- menu.addAction( qtr("Elapsed Time") , this, SLOT( setElapsedTime() ) );
- menu.addAction( qtr("Remaining Time") , this, SLOT( setRemainTime() ) );
- menu.exec( QCursor::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;
+
+ /* Did we have a bg ? */
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 ?
- need_components_update = true;
+ videoWidget->updateGeometry(); // Needed for deinterlace
+ updateGeometry();
}
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;
+ updateGeometry();
}
-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();
- need_components_update = true;
+ videoWidget->updateGeometry();
+ updateGeometry();
i_ret = VLC_SUCCESS;
break;
}
**/
void MainInterface::togglePlaylist()
{
- // Toggle the playlist dialog if not embedded and return
- if( !playlistEmbeddedFlag )
- {
- if( playlistWidget )
- {
- /// \todo Destroy it
- }
- THEDP->playlistDialog();
- return;
- }
-
- // Create the playlist Widget and destroy the existing dialog
+ /* CREATION
+ If no playlist exist, then create one and attach it to the DockPL*/
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) );
- }
+ msg_Dbg( p_intf, "Creating a new playlist" );
+ playlistWidget = new PlaylistWidget( p_intf, settings );
+ if( bgWidget )
+ CONNECT( playlistWidget, artSet( QString ),
+ bgWidget, setArt(QString) );
- // And toggle visibility
- if( VISIBLE( playlistWidget ) )
- {
- playlistWidget->hide();
- if( bgWidget ) bgWidget->show();
- if( videoIsActive )
+ /* Add it to the parent DockWidget */
+ dockPL->setWidget( playlistWidget );
+
+ /* Add the dock to the main Interface */
+ addDockWidget( Qt::BottomDockWidgetArea, dockPL );
+
+ /* Make the playlist floating is requested. Default is not. */
+ if( settings->value( "playlist-floats", false ).toBool() );
{
- videoWidget->widgetSize = savedVideoSize;
- videoWidget->resize( videoWidget->widgetSize );
- videoWidget->updateGeometry();
- if( bgWidget ) bgWidget->hide();
+ msg_Dbg( p_intf, "we don't want it inside");
+ dockPL->setFloating( true );
}
}
else
{
- playlistWidget->show();
- if( videoIsActive )
- {
- savedVideoSize = videoWidget->widgetSize;
- videoWidget->widgetSize.setHeight( 0 );
- videoWidget->resize( videoWidget->widgetSize );
- videoWidget->updateGeometry();
- }
- if( VISIBLE( bgWidget ) ) bgWidget->hide();
+ /* toggle the visibility of the playlist */
+ TOGGLEV( dockPL );
+ //resize(sizeHint());
}
-
+#if 0
doComponentsUpdate();
+#endif
+ updateGeometry();
}
+/* Function called from the menu to undock the playlist */
void MainInterface::undockPlaylist()
{
- if( playlistWidget )
- {
- playlistWidget->hide();
- playlistWidget->deleteLater();
- mainLayout->removeWidget( playlistWidget );
- playlistWidget = NULL;
- playlistEmbeddedFlag = false;
+ dockPL->setFloating( true );
+ updateGeometry();
+}
- menuBar()->clear();
- QVLCMenu::createMenuBar( this, p_intf, false, visualSelectorEnabled);
+void MainInterface::toggleMinimalView()
+{
+ TOGGLEV( menuBar() );
+ TOGGLEV( controls );
+ TOGGLEV( statusBar() );
+ updateGeometry();
+}
- if( videoIsActive )
- {
- videoWidget->widgetSize = savedVideoSize;
- videoWidget->resize( videoWidget->widgetSize );
- videoWidget->updateGeometry();
- }
+/* Video widget cannot do this synchronously as it runs in another thread */
+/* Well, could it, actually ? Probably dangerous ... */
+void MainInterface::doComponentsUpdate()
+{
+ updateGeometry();
+}
- doComponentsUpdate();
- THEDP->playlistDialog();
- }
+/* toggling advanced controls buttons */
+void MainInterface::toggleAdvanced()
+{
+ controls->toggleAdvanced();
+}
+
+/* Get the visibility status of the controls (hidden or not, advanced or not) */
+int MainInterface::getControlsVisibilityStatus()
+{
+ return( (controls->isVisible() ? CONTROLS_VISIBLE : CONTROLS_HIDDEN )
+ + CONTROLS_ADVANCED * controls->b_advancedVisible );
}
#if 0
}
#endif
-void MainInterface::toggleMenus()
-{
- msg_Dbg( p_intf, "I HAS HERE, HIDING YOUR MENUZ: \\_o<~~ coin coin" );
- 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() ? 0x2 : 0x0 )
- + controls->b_advancedVisible );
-}
-
/************************************************************************
* Other stuff
************************************************************************/
{
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 );
- if( b_remainingTime ) timeLabel->setText( " -"+title+" " );
+ secstotimestr( psz_time, ( b_remainingTime && length ) ? length - time
+ : time );
+
+ QString title;
+ title.sprintf( "%s/%s", psz_time,
+ ( !length && time ) ? "--:--" : psz_length );
+
+ /* Add a minus to remaining time*/
+ if( b_remainingTime && length ) timeLabel->setText( " -"+title+" " );
else timeLabel->setText( " "+title+" " );
}
b_remainingTime = ( b_remainingTime ? false : true );
}
-void MainInterface::setElapsedTime(){ b_remainingTime = false; }
-void MainInterface::setRemainTime(){ b_remainingTime = true; }
-
void MainInterface::setName( QString name )
{
- input_name = name;
- nameLabel->setText( " " + 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 )
- updateSystrayMenu( status );
+ QVLCMenu::updateSystrayMenu( this, p_intf );
}
void MainInterface::setRate( int rate )
{
QString str;
- str.setNum( ( 1000/(double)rate), 'f', 2 );
+ str.setNum( ( 1000 / (double)rate), 'f', 2 );
str.append( "x" );
speedLabel->setText( str );
+ speedControl->updateControls( rate );
}
void MainInterface::updateOnTimer()
QApplication::closeAllWindows();
QApplication::quit();
}
+#if 0
if( need_components_update )
{
doComponentsUpdate();
need_components_update = false;
}
+#endif
controls->updateOnTimer();
}
QVLCMenu::updateSystrayMenu( this, p_intf, true );
sysTray->show();
- CONNECT( sysTray, activated( QSystemTrayIcon::ActivationReason ),
+ 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
*/
show();
activateWindow();
}
+ else if( isMinimized() )
+ {
+ showNormal();
+ activateWindow();
+ }
else
{
#ifdef WIN32
/**
* 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 )
{
else
{
sysTray->setToolTip( name );
- if( notificationEnabled )
+ if( notificationEnabled && ( isHidden() || isMinimized() ) )
{
sysTray->showMessage( qtr( "VLC media player" ), name,
QSystemTrayIcon::NoIcon, 4000 );
case PLAYING_S:
{
sysTray->setToolTip( input_name );
- //+ " - " + qtr( "Playing" ) );
break;
}
case PAUSE_S:
************************************************************************/
void MainInterface::customEvent( QEvent *event )
{
+#if 0
if( event->type() == PLDockEvent_Type )
{
PlaylistDialog::killInstance();
QVLCMenu::createMenuBar(this, p_intf, true, visualSelectorEnabled);
togglePlaylist();
}
- else if ( event->type() == SetVideoOnTopEvent_Type )
+#endif
+ /*else */
+ if ( event->type() == SetVideoOnTopEvent_Type )
{
SetVideoOnTopQtEvent* p_event = (SetVideoOnTopQtEvent*)event;
if( p_event->OnTop() )
}
}
-bool MainInterface::eventFilter(QObject *obj, QEvent *event)
-{
- if( (obj == timeLabel) && (event->type() == QEvent::MouseButtonPress) ) toggleTimeDisplay();
-}
-
-
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();
projects / vlc / blobdiff