qt4: Adds a volume-muted icon

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index 90a0220e21fe0eafcda942cd72faff06074e1079..3e1c997686f515adfaee98b535733a2b672604e0 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -197,6 +197,7 @@ EXTRA_DIST += \
        pixmaps/noart.png \
        pixmaps/playlist_icon.png \
        pixmaps/play.png \
+       pixmaps/pause.png \
        pixmaps/previous.png \
        pixmaps/spref_cone_Audio_64.png \
        pixmaps/spref_cone_Hotkeys_64.png \
@@ -207,6 +208,7 @@ EXTRA_DIST += \
        pixmaps/stop.png \
        pixmaps/volume-high.png \
        pixmaps/volume-low.png \
+       pixmaps/volume-muted.png \
        pixmaps/vlc_help_16px.png \
        pixmaps/vlc_stop_16px.png \
        pixmaps/vlc_play_16px.png \

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 3708c49e538dcbbed6c7e1e436b3a7ea07486918..51e31a0de94989b40d3f574dd447f4c09d139da8 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -560,7 +560,9 @@ void ControlsWidget::updateVolume( int i_sliderVolume )
         int i_res = i_sliderVolume * AOUT_VOLUME_MAX /
                             ( 2*volumeSlider->maximum() );
         aout_VolumeSet( p_intf, i_res );
-        if( i_sliderVolume < volumeSlider->maximum()/2 )
+        if( i_sliderVolume == 0 )
+            volMuteLabel->setPixmap( QPixmap(":/pixmaps/volume-muted.png" ) );
+        else if( i_sliderVolume < volumeSlider->maximum()/2 )
             volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-low.png" ) );
         else volMuteLabel->setPixmap( QPixmap( ":/pixmaps/volume-high.png" ) );
     }

diff --git a/modules/gui/qt4/pixmaps/volume-muted.png b/modules/gui/qt4/pixmaps/volume-muted.png
new file mode 100644 (file)
index 0000000..7022d6a
Binary files /dev/null and b/modules/gui/qt4/pixmaps/volume-muted.png differ

diff --git a/modules/gui/qt4/res.qrc b/modules/gui/qt4/res.qrc
index 9cf67fb3f93c7956bd9c6a21f6b81f978c6e5d1f..ffbffeea0c643e3bc2928a8e3c54285c93f1c27b 100644 (file)
--- a/modules/gui/qt4/res.qrc
+++ b/modules/gui/qt4/res.qrc
@@ -8,6 +8,7 @@
   <file>pixmaps/next.png</file>
   <file>pixmaps/volume-low.png</file>
   <file>pixmaps/volume-high.png</file>
+  <file>pixmaps/volume-muted.png</file>
   <file>pixmaps/go-next.png</file>
   <file alias="vlc128.png">../../../share/vlc128x128.png</file>
   <file alias="vlc48.png">../../../share/vlc48x48.png</file>