Merge pull request #1710 from curlymorphic/i1595

Proposed fix for #1595 Instrument track activity LED lights when muted.
This commit is contained in:
Tres Finocchiaro
2015-01-29 13:54:53 -05:00
4 changed files with 24 additions and 0 deletions

View File

@@ -39,6 +39,7 @@ public:
_activated_color, QWidget * _parent );
virtual ~FadeButton();
void setActiveColor( const QColor & activated_color );
public slots:

View File

@@ -320,6 +320,7 @@ private slots:
void midiInSelected();
void midiOutSelected();
void midiConfigChanged();
void muteChanged();
private:

View File

@@ -55,6 +55,11 @@ FadeButton::~FadeButton()
{
}
void FadeButton::setActiveColor( const QColor & activated_color )
{
m_activatedColor = activated_color;
}

View File

@@ -926,6 +926,7 @@ InstrumentTrackView::InstrumentTrackView( InstrumentTrack * _it, TrackContainerV
connect( m_activityIndicator, SIGNAL( released() ),
this, SLOT( activityIndicatorReleased() ) );
_it->setIndicator( m_activityIndicator );
connect( &_it->m_mutedModel, SIGNAL( dataChanged() ), this, SLOT( muteChanged() ) );
setModel( _it );
}
@@ -1130,6 +1131,22 @@ void InstrumentTrackView::midiConfigChanged()
void InstrumentTrackView::muteChanged()
{
if(model()->m_mutedModel.value() )
{
m_activityIndicator->setActiveColor( QApplication::palette().color( QPalette::Active,
QPalette::Highlight ) );
} else
{
m_activityIndicator->setActiveColor( QApplication::palette().color( QPalette::Active,
QPalette::BrightText ) );
}
}
class fxLineLcdSpinBox : public LcdSpinBox