Muted Speaker Icon update

Author: henkdegroot

Jamulus.pro

@@ -749,6 +749,7 @@ DISTFILES += ChangeLog \
     src/res/fronticonserver.png \
     src/res/mixerboardbackground.png \
     src/res/transparent1x1.png \
+    src/res/mutediconorange.png \
     src/res/instruments/accordeon.png \
     src/res/instruments/aguitar.png \
     src/res/instruments/bassguitar.png \

src/audiomixerboard.cpp

@@ -29,7 +29,8 @@
 * CChanneFader                                                                 *
 \******************************************************************************/
 CChannelFader::CChannelFader ( QWidget* pNW ) :
-    eDesign ( GD_STANDARD )
+    eDesign ( GD_STANDARD ),
+    BitmapMutedIcon( QString::fromUtf8 ( ":/png/fader/res/mutediconorange.png" ) )
 {
     // create new GUI control objects and store pointers to them (note that
     // QWidget takes the ownership of the pMainGrid so that this only has
@@ -86,7 +87,7 @@ CChannelFader::CChannelFader ( QWidget* pNW ) :
     pPan->setRange               ( 0, AUD_MIX_PAN_MAX );
     pPan->setValue               ( AUD_MIX_PAN_MAX / 2 );
     pPan->setNotchesVisible      ( true );
-    pInfoLabel->setMinimumHeight ( pPanLabel->height() ); // prevents jitter when muting/unmuting (#811)
+    pInfoLabel->setMinimumHeight ( 14 ); // prevents jitter when muting/unmuting (#811)
     pInfoLabel->setAlignment     ( Qt::AlignTop );
     pPanInfoGrid->addWidget      ( pPanLabel, 0, Qt::AlignLeft | Qt::AlignTop );
     pPanInfoGrid->addWidget      ( pInfoLabel, 0, Qt::AlignHCenter | Qt::AlignTop );
@@ -490,12 +491,12 @@ void CChannelFader::SetRemoteFaderIsMute ( const bool bIsMute )
 {
     if ( bIsMute )
     {
-        // show orange utf8 SPEAKER WITH CANCELLATION STROKE (U+1F507)
-        pInfoLabel->setText ( "<font color=\"orange\">&#128263;</font>" );
+        // show muted icon orange
+        pInfoLabel->setPixmap( BitmapMutedIcon );
     }
     else
     {
-        pInfoLabel->setText ( "" );
+        pInfoLabel->setPixmap( QPixmap() );
     }
 }
 

src/audiomixerboard.h

@@ -127,6 +127,7 @@ class CChannelFader : public QObject
     int          iRunningNewClientCnt;
     int          iInstrPicMaxWidth;
     EGUIDesign   eDesign;
+    QPixmap      BitmapMutedIcon;
 
 public slots:
     void OnLevelValueChanged ( int value ) { SendFaderLevelToServer ( value, QGuiApplication::keyboardModifiers() == Qt::ShiftModifier ); /* isolate a channel from the group temporarily with shift-click-drag (#695) */ }

src/res/mutediconorange.png

@@ -54,6 +54,7 @@
         <file>res/ledbuttonpressed.png</file>
         <file>res/mixerboardbackground.png</file>
         <file>res/transparent1x1.png</file>
+        <file>res/mutediconorange.png</file>
     </qresource>
     <qresource prefix="/png/instr">
         <file>res/instruments/none.png</file>