From 7c0ab622f1a930172a86e940ccae020dd5be9aca Mon Sep 17 00:00:00 2001 From: Dave French Date: Wed, 28 Jan 2015 12:16:21 +0000 Subject: [PATCH 1/6] Proposed fix for 1595 Instrument track activity LED lights when muted --- include/FadeButton.h | 1 + include/InstrumentTrack.h | 1 + src/gui/widgets/FadeButton.cpp | 5 +++++ src/tracks/InstrumentTrack.cpp | 15 +++++++++++++++ 4 files changed, 22 insertions(+) diff --git a/include/FadeButton.h b/include/FadeButton.h index 6e7371f9f..4f05b3491 100644 --- a/include/FadeButton.h +++ b/include/FadeButton.h @@ -39,6 +39,7 @@ public: _activated_color, QWidget * _parent ); virtual ~FadeButton(); + void setActiveColor( const QColor & activated_color ); public slots: diff --git a/include/InstrumentTrack.h b/include/InstrumentTrack.h index 16536c081..85a19c3de 100644 --- a/include/InstrumentTrack.h +++ b/include/InstrumentTrack.h @@ -225,6 +225,7 @@ protected slots: void updateBaseNote(); void updatePitch(); void updatePitchRange(); + void muteHasChanged(); private: diff --git a/src/gui/widgets/FadeButton.cpp b/src/gui/widgets/FadeButton.cpp index 3495ae959..4fea14f97 100644 --- a/src/gui/widgets/FadeButton.cpp +++ b/src/gui/widgets/FadeButton.cpp @@ -55,6 +55,11 @@ FadeButton::~FadeButton() { } +void FadeButton::setActiveColor( const QColor & activated_color ) +{ + m_activatedColor = activated_color; +} + diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index cd598529e..a527e4300 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -124,6 +124,7 @@ InstrumentTrack::InstrumentTrack( TrackContainer* tc ) : connect( &m_baseNoteModel, SIGNAL( dataChanged() ), this, SLOT( updateBaseNote() ) ); connect( &m_pitchModel, SIGNAL( dataChanged() ), this, SLOT( updatePitch() ) ); connect( &m_pitchRangeModel, SIGNAL( dataChanged() ), this, SLOT( updatePitchRange() ) ); + connect( &m_mutedModel, SIGNAL( dataChanged() ), this, SLOT( muteHasChanged() ) ); m_effectChannelModel.setRange( 0, Engine::fxMixer()->numChannels()-1, 1); @@ -136,6 +137,7 @@ InstrumentTrack::InstrumentTrack( TrackContainer* tc ) : setName( tr( "Default preset" ) ); + } @@ -549,6 +551,19 @@ void InstrumentTrack::updatePitchRange() processOutEvent( MidiEvent( MidiControlChange, midiPort()->realOutputChannel(), MidiControllerDataEntry, midiPitchRange() ) ); } +void InstrumentTrack::muteHasChanged() +{ + if( m_mutedModel.value() ) + { + m_fb->setActiveColor( QColor( "red" ) ); + } else + { + m_fb->setActiveColor( QApplication::palette().color( QPalette::Active, + QPalette::BrightText ) ); + } + +} + From 9fee116fa7886160ba1f42002be46a853d4198f1 Mon Sep 17 00:00:00 2001 From: Dave French Date: Wed, 28 Jan 2015 12:21:57 +0000 Subject: [PATCH 2/6] 1595 removed accidental blank line --- src/tracks/InstrumentTrack.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index a527e4300..6d5a3056d 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -137,7 +137,6 @@ InstrumentTrack::InstrumentTrack( TrackContainer* tc ) : setName( tr( "Default preset" ) ); - } From fa6dd6da8b559b61f57e2f304f37fd3b4a70b905 Mon Sep 17 00:00:00 2001 From: Dave French Date: Wed, 28 Jan 2015 22:12:59 +0000 Subject: [PATCH 3/6] Change color of muted activity indicator from red to grey --- src/tracks/InstrumentTrack.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index 6d5a3056d..f6168801d 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -554,7 +554,7 @@ void InstrumentTrack::muteHasChanged() { if( m_mutedModel.value() ) { - m_fb->setActiveColor( QColor( "red" ) ); + m_fb->setActiveColor( QColor( 0x282828 ) ); } else { m_fb->setActiveColor( QApplication::palette().color( QPalette::Active, From c02f043b3f5e64ef4b67a76b5e4be5c8844ad6a2 Mon Sep 17 00:00:00 2001 From: Dave French Date: Thu, 29 Jan 2015 00:27:30 +0000 Subject: [PATCH 4/6] Changed color of InstrumentTrack activity indicators mute color to use the color defined in style.css as highlight --- src/tracks/InstrumentTrack.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index f6168801d..fc2035669 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -554,7 +554,8 @@ void InstrumentTrack::muteHasChanged() { if( m_mutedModel.value() ) { - m_fb->setActiveColor( QColor( 0x282828 ) ); + m_fb->setActiveColor( QApplication::palette().color( QPalette::Active, + QPalette::Highlight ) ); } else { m_fb->setActiveColor( QApplication::palette().color( QPalette::Active, From 968d0215dfebf05563abb340becff3507c329712 Mon Sep 17 00:00:00 2001 From: Dave French Date: Thu, 29 Jan 2015 09:49:20 +0000 Subject: [PATCH 5/6] Moved Setting of activity indicator color from InstrumentTrack to InstrumentTrackView --- include/InstrumentTrack.h | 2 +- src/tracks/InstrumentTrack.cpp | 32 +++++++++++++++++--------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/include/InstrumentTrack.h b/include/InstrumentTrack.h index 85a19c3de..de5671514 100644 --- a/include/InstrumentTrack.h +++ b/include/InstrumentTrack.h @@ -225,7 +225,6 @@ protected slots: void updateBaseNote(); void updatePitch(); void updatePitchRange(); - void muteHasChanged(); private: @@ -321,6 +320,7 @@ private slots: void midiInSelected(); void midiOutSelected(); void midiConfigChanged(); + void muteHasChanged(); private: diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index fc2035669..5302658bd 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -124,7 +124,6 @@ InstrumentTrack::InstrumentTrack( TrackContainer* tc ) : connect( &m_baseNoteModel, SIGNAL( dataChanged() ), this, SLOT( updateBaseNote() ) ); connect( &m_pitchModel, SIGNAL( dataChanged() ), this, SLOT( updatePitch() ) ); connect( &m_pitchRangeModel, SIGNAL( dataChanged() ), this, SLOT( updatePitchRange() ) ); - connect( &m_mutedModel, SIGNAL( dataChanged() ), this, SLOT( muteHasChanged() ) ); m_effectChannelModel.setRange( 0, Engine::fxMixer()->numChannels()-1, 1); @@ -550,20 +549,6 @@ void InstrumentTrack::updatePitchRange() processOutEvent( MidiEvent( MidiControlChange, midiPort()->realOutputChannel(), MidiControllerDataEntry, midiPitchRange() ) ); } -void InstrumentTrack::muteHasChanged() -{ - if( m_mutedModel.value() ) - { - m_fb->setActiveColor( QApplication::palette().color( QPalette::Active, - QPalette::Highlight ) ); - } else - { - m_fb->setActiveColor( QApplication::palette().color( QPalette::Active, - QPalette::BrightText ) ); - } - -} - @@ -941,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( muteHasChanged() ) ); setModel( _it ); } @@ -1145,6 +1131,22 @@ void InstrumentTrackView::midiConfigChanged() +void InstrumentTrackView::muteHasChanged() +{ + 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 From 5ce1bd874dcc6b09f5a60040f37c07c7eae7d400 Mon Sep 17 00:00:00 2001 From: Dave French Date: Thu, 29 Jan 2015 10:13:25 +0000 Subject: [PATCH 6/6] renamed muteHasChanged to muteChanged in InstrumentTrackView --- include/InstrumentTrack.h | 2 +- src/tracks/InstrumentTrack.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/InstrumentTrack.h b/include/InstrumentTrack.h index de5671514..ffbb61ccc 100644 --- a/include/InstrumentTrack.h +++ b/include/InstrumentTrack.h @@ -320,7 +320,7 @@ private slots: void midiInSelected(); void midiOutSelected(); void midiConfigChanged(); - void muteHasChanged(); + void muteChanged(); private: diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp index 5302658bd..e9317dc52 100644 --- a/src/tracks/InstrumentTrack.cpp +++ b/src/tracks/InstrumentTrack.cpp @@ -926,7 +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( muteHasChanged() ) ); + connect( &_it->m_mutedModel, SIGNAL( dataChanged() ), this, SLOT( muteChanged() ) ); setModel( _it ); } @@ -1131,7 +1131,7 @@ void InstrumentTrackView::midiConfigChanged() -void InstrumentTrackView::muteHasChanged() +void InstrumentTrackView::muteChanged() { if(model()->m_mutedModel.value() ) {