From dd22c2219ec1268a76794cbc2c5edf9b9f1dc87c Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Mon, 25 Feb 2008 09:35:14 +0000 Subject: [PATCH] Qt4 - Fix art display in the bgWidget, fix one volume bug, fix fullscreen button --- modules/gui/qt4/components/interface_widgets.cpp | 12 +++++++----- modules/gui/qt4/components/interface_widgets.hpp | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp index ed780dc20b..4b1988839a 100644 --- a/modules/gui/qt4/components/interface_widgets.cpp +++ b/modules/gui/qt4/components/interface_widgets.cpp @@ -178,7 +178,7 @@ BackgroundWidget::BackgroundWidget( intf_thread_t *_p_i ) backgroundLayout->setColumnStretch( 0, 1 ); backgroundLayout->setColumnStretch( 2, 1 ); - CONNECT( THEMIM->getIM(), artChanged( QString ), this, update( QString ) ); + CONNECT( THEMIM->getIM(), artChanged( QString ), this, updateArt( QString ) ); } BackgroundWidget::~BackgroundWidget() @@ -193,9 +193,9 @@ void BackgroundWidget::resizeEvent( QResizeEvent * event ) label->show(); } -void BackgroundWidget::update( QString url ) +void BackgroundWidget::updateArt( QString url ) { - if( url.isNull() ) + if( url.isEmpty() ) { if( QDate::currentDate().dayOfYear() >= 354 ) label->setPixmap( QPixmap( ":/vlc128-christmas.png" ) ); @@ -616,11 +616,13 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i, volumeSlider->setValue( ( config_GetInt( p_intf, "volume" ) ) * VOLUME_MAX / (AOUT_VOLUME_MAX/2) ); + /* Force the update at build time in order to have a muted icon if needed */ + updateVolume( volumeSlider->value() ); + /* Volume control connection */ CONNECT( volumeSlider, valueChanged( int ), this, updateVolume( int ) ); CONNECT( THEMIM, volumeChanged( void ), this, updateVolume( void ) ); - updateInput(); } @@ -716,7 +718,7 @@ void ControlsWidget::updateInput() { /* Activate the interface buttons according to the presence of the input */ enableInput( THEMIM->getIM()->hasInput() ); - enableVideo( THEMIM->getIM()->hasVideo() ); + enableVideo( THEMIM->getIM()->hasVideo() && THEMIM->getIM()->hasInput() ); } void ControlsWidget::setStatus( int status ) diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp index f2fea47aed..f81197bd18 100644 --- a/modules/gui/qt4/components/interface_widgets.hpp +++ b/modules/gui/qt4/components/interface_widgets.hpp @@ -95,7 +95,7 @@ private: virtual void resizeEvent( QResizeEvent * event ); public slots: void toggle(){ TOGGLEV( this ); } - void update( QString ); + void updateArt( QString ); }; class VisualSelector : public QFrame -- 2.39.2