settings = getSettings();
settings->beginGroup( "MainWindow" );
+#ifdef WIN32
+ /* Volume keys */
+ p_intf->p_sys->disable_volume_keys = var_InheritBool( p_intf, "qt-disable-volume-keys" );
+#endif
+
/* */
b_plDocked = getSettings()->value( "pl-dock-status", true ).toBool();
settings->endGroup( );
- /**************
- * Status Bar *
- **************/
- createStatusBar();
+ /*********************************
+ * Create the Systray Management *
+ *********************************/
+ initSystray();
/**************************
* UI and Widgets design
this, destroyPopupMenu() );
createMainWidget( settings );
- /*********************************
- * Create the Systray Management *
- *********************************/
- initSystray();
+
+ /**************
+ * Status Bar *
+ **************/
+ createStatusBar();
+ setStatusBarVisibility( getSettings()->value( "MainWindow/status-bar-visible", false ).toBool() );
/********************
* Input Manager *
#ifndef HAVE_MAEMO
if( sysTray )
{
- CONNECT( THEMIM->getIM(), statusChanged( int ),
+ CONNECT( THEMIM->getIM(), playingStatusChanged( int ),
this, updateSystrayTooltipStatus( int ) );
}
#endif
/* VideoWidget connects for asynchronous calls */
b_videoFullScreen = false;
- b_videoOnTop = false;
connect( this, SIGNAL(askGetVideo(WId*,int*,int*,unsigned*,unsigned *)),
this, SLOT(getVideoSlot(WId*,int*,int*,unsigned*,unsigned*)),
Qt::BlockingQueuedConnection );
/**** FINAL SIZING and placement of interface */
settings->beginGroup( "MainWindow" );
- QVLCTools::restoreWidgetPosition( settings, this, QSize(400, 100) );
+ QVLCTools::restoreWidgetPosition( settings, this, QSize(600, 420) );
settings->endGroup();
b_interfaceFullScreen = isFullScreen();
/* Switch to minimal view if needed, must be called after the show() */
if( b_minimalView )
toggleMinimalView( true );
+
+ b_hasPausedWhenMinimized = false;
}
MainInterface::~MainInterface()
settings->setValue( "adv-controls",
getControlsVisibilityStatus() & CONTROLS_ADVANCED );
+ settings->setValue( "status-bar-visible", b_statusbarVisible );
/* Save the stackCentralW sizes */
settings->setValue( "bgSize", stackWidgetsSizes[bgWidget] );
/* Bg Cone */
bgWidget = new BackgroundWidget( p_intf );
stackCentralW->addWidget( bgWidget );
+ if ( !var_InheritBool( p_intf, "qt-bgcone" ) )
+ bgWidget->setWithArt( false );
+ else
+ if ( var_InheritBool( p_intf, "qt-bgcone-expands" ) )
+ bgWidget->setExpandstoHeight( true );
/* And video Outputs */
if( b_videoEmbedded )
mainLayout->insertWidget( 1, stackCentralW );
settings->beginGroup( "MainWindow" );
- stackWidgetsSizes[bgWidget] = settings->value( "bgSize", QSize( 400, 0 ) ).toSize();
+ stackWidgetsSizes[bgWidget] = settings->value( "bgSize", QSize( 600, 0 ) ).toSize();
/* Resize even if no-auto-resize, because we are at creation */
resizeStack( stackWidgetsSizes[bgWidget].width(), stackWidgetsSizes[bgWidget].height() );
QVLCMenu::PopupMenu( p_intf, false );
}
-void MainInterface::popupMenu( const QPoint &p )
+void MainInterface::popupMenu( const QPoint & )
{
QVLCMenu::PopupMenu( p_intf, true );
}
{
if( !fullscreenControls ) return;
- IMEvent *eShow = new IMEvent( FullscreenControlToggle_Type, 0 );
+ IMEvent *eShow = new IMEvent( FullscreenControlToggle_Type );
QApplication::postEvent( fullscreenControls, eShow );
}
void MainInterface::getVideoSlot( WId *p_id, int *pi_x, int *pi_y,
unsigned *pi_width, unsigned *pi_height )
{
+ /* Hidden or minimized, activate */
+ if( isHidden() || isMinimized() )
+ toggleUpdateSystrayMenu();
+
/* Request the videoWidget */
WId ret = videoWidget->request( pi_x, pi_y,
pi_width, pi_height, !b_autoresize );
* Emit askVideoOnTop() to invoke this from other thread. */
void MainInterface::setVideoOnTop( bool on_top )
{
- b_videoOnTop = on_top;
-
Qt::WindowFlags oldflags = windowFlags(), newflags;
- if( b_videoOnTop )
+ if( on_top )
newflags = oldflags | Qt::WindowStaysOnTopHint;
else
newflags = oldflags & ~Qt::WindowStaysOnTopHint;
+ if( newflags != oldflags && !b_videoFullScreen )
- if( newflags != oldflags )
{
setWindowFlags( newflags );
show(); /* necessary to apply window flags */
if( b_plDocked )
{
stackCentralW->addWidget( playlistWidget );
- stackWidgetsSizes[playlistWidget] = settings->value( "playlistSize", QSize( 500, 250 ) ).toSize();
+ stackWidgetsSizes[playlistWidget] = settings->value( "playlistSize", QSize( 600, 300 ) ).toSize();
}
else
{
{
menuBar()->setVisible( !b_minimal );
controls->setVisible( !b_minimal );
- statusBar()->setVisible( !b_minimal );
+ statusBar()->setVisible( !b_minimal && b_statusbarVisible );
inputC->setVisible( !b_minimal );
}
+ CONTROLS_ADVANCED * controls->b_advancedVisible );
}
+void MainInterface::setStatusBarVisibility( bool b_visible )
+{
+ statusBar()->setVisible( b_visible );
+ b_statusbarVisible = b_visible;
+ if( controls ) controls->setGripVisible( !b_statusbarVisible );
+}
+
#if 0
void MainInterface::visual()
{
void MainInterface::createSystray()
{
QIcon iconVLC;
- if( QDate::currentDate().dayOfYear() >= QT_CHRISTMAS_TROLL_DAY )
- iconVLC = QIcon( ":/logo/vlc128-christmas.png" );
+ if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY && var_InheritBool( p_intf, "qt-icon-change" ) )
+ iconVLC = QIcon( ":/logo/vlc128-xmas.png" );
else
iconVLC = QIcon( ":/logo/vlc128.png" );
sysTray = new QSystemTrayIcon( iconVLC, this );
sysTray->show();
CONNECT( sysTray, activated( QSystemTrayIcon::ActivationReason ),
- this, handleSystrayClick( QSystemTrayIcon::ActivationReason ) );
+ this, handleSystrayClick( QSystemTrayIcon::ActivationReason ) );
}
/**
}
#endif
+void MainInterface::changeEvent(QEvent *event)
+{
+ if( event->type() == QEvent::WindowStateChange )
+ {
+ QWindowStateChangeEvent *windowStateChangeEvent = static_cast<QWindowStateChangeEvent*>(event);
+ Qt::WindowStates newState = windowState();
+ Qt::WindowStates oldState = windowStateChangeEvent->oldState();
+
+ if( newState & Qt::WindowMinimized )
+ {
+ b_hasPausedWhenMinimized = false;
+
+ if( THEMIM->getIM()->playingStatus() == PLAYING_S &&
+ THEMIM->getIM()->hasVideo() &&
+ !THEMIM->getIM()->hasVisualisation() &&
+ var_InheritBool( p_intf, "qt-pause-minimized" ) )
+ {
+ b_hasPausedWhenMinimized = true;
+ THEMIM->pause();
+ }
+ }
+ else if( oldState & Qt::WindowMinimized && !( newState & Qt::WindowMinimized ) )
+ {
+ if( b_hasPausedWhenMinimized )
+ {
+ THEMIM->play();
+ }
+ }
+ }
+
+ QWidget::changeEvent(event);
+}
+
/************************************************************************
* D&D Events
************************************************************************/
static int PopupMenuCB( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t old_val, vlc_value_t new_val, void *param )
{
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_variable ); VLC_UNUSED( old_val );
+
intf_thread_t *p_intf = (intf_thread_t *)param;
if( p_intf->pf_show_dialog )
static int IntfShowCB( vlc_object_t *p_this, const char *psz_variable,
vlc_value_t old_val, vlc_value_t new_val, void *param )
{
+ VLC_UNUSED( p_this ); VLC_UNUSED( psz_variable ); VLC_UNUSED( old_val );
+ VLC_UNUSED( new_val );
+
intf_thread_t *p_intf = (intf_thread_t *)param;
p_intf->p_sys->p_mi->toggleFSC();
projects / vlc / blobdiff