Skip to content

Proposed fix for #1595 Instrument track activity LED lights when muted. #1710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tresf merged 6 commits into from
Jan 29, 2015
Merged

Proposed fix for #1595 Instrument track activity LED lights when muted. #1710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7c0ab62
Proposed fix for 1595 Instrument track activity LED lights when muted
curlymorphic Jan 28, 2015
9fee116
1595 removed accidental blank line
curlymorphic Jan 28, 2015
fa6dd6d
Change color of muted activity indicator from red to grey
curlymorphic Jan 28, 2015
c02f043
Changed color of InstrumentTrack activity indicators mute color to us…
curlymorphic Jan 29, 2015
968d021
Moved Setting of activity indicator color from InstrumentTrack to Ins…
curlymorphic Jan 29, 2015
5ce1bd8
renamed muteHasChanged to muteChanged in InstrumentTrackView
curlymorphic Jan 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/FadeButton.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class FadeButton : public QAbstractButton
_activated_color, QWidget * _parent );

virtual ~FadeButton();
void setActiveColor( const QColor & activated_color );


public slots:
Expand Down
1 change: 1 addition & 0 deletions include/InstrumentTrack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@ private slots:
void midiInSelected();
void midiOutSelected();
void midiConfigChanged();
void muteChanged();


private:
Expand Down
5 changes: 5 additions & 0 deletions src/gui/widgets/FadeButton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ FadeButton::~FadeButton()
{
}

void FadeButton::setActiveColor( const QColor & activated_color )
Copy link
Member

@tresf tresf Jan 29, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI - Just noticed activated_color should probably be activatedColor. Since the rest of the var names are relatively similar we'll fix this at a later time.

{
m_activatedColor = activated_color;
}




Expand Down
17 changes: 17 additions & 0 deletions src/tracks/InstrumentTrack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
}
Expand Down Expand Up @@ -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
Expand Down