From ab5ecfee8fedf1b257d3b195af193e3fd620d070 Mon Sep 17 00:00:00 2001
From: Vesa <contact.diizy@nbl.fi>
Date: Fri, 17 Jan 2014 20:14:18 +0200
Subject: [PATCH] Update to fx fader knob, changed fade_button (the blinky
 thing in instrument tracks)  to comply with palette

---
 data/themes/default/fader_knob.png | Bin 768 -> 759 bytes
 src/gui/widgets/fade_button.cpp    |   4 ++--
 src/tracks/InstrumentTrack.cpp     |   6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/data/themes/default/fader_knob.png b/data/themes/default/fader_knob.png
index 5a70134c189c28d30e63865282bfe024f8cddcd6..d6321023eed16a38c46fa7f946f1ab52297652a9 100644
GIT binary patch
delta 683
zcmV;c0#yBg2KNP!7YZH-1^@s6^ISx9kuxC&5CsyW&FILHTPS~VNkl<ZILnQdO;6)6
z5QZPejS#0CcO^dBqW+mZ^J5VbH+}<`1<{s6iAbQ(Drpjr?L9295)xKBQkBE#nb+^k
z*j0SS<>jS6K0fB-<AbsA-cu9>T5E1@ZWO?zO*-e8&*vmbLLA2f*g41T?JW-v4*<V_
zs{of}$;HJ5B0_&vRe0|KP)Y${ttCkkj4`2LfR$3zb&a(aV+_tYlu{_A@ZM9`HE|q=
zVm)}X*>HV*O_pWUbxpUZ_a5gQ#u#2-Ux)ByGGRKMvREu|&Jjfs-g~_FhzKIWdc7vg
zvT+!oD2kqP8^#!_szPf$gyT5o=;#Qobx`bjj-rUkWI}%wMdQlb?Up>xDT*Qh?TkeP
zW6bx;^ZA^`Vi8oWwV_!e!sFv3o6Tl?R87-R*EPnNFy}UBjG-us@lmz@y1(`WU-JW4
zYt44MB~4QfheLq7yIt4yc*C^T%w{uYvsp-5YkLh_tyVleJq_U~iVzWsqQE)V8x;_8
zquo|Yk!61w&(F_c`IS;cQ53peRn@p>fYZ}crqgKvMFg!i#+Y#I<#IWMz4tUtLs^#L
z$nCdP-tYI{D|ZXE-|oHcc7O1a<ay4^%L`Ri4GLOoDa&#kR!VVla>Ci!S?GRS)LQ%Z
zN-meIR;%%2_dEm9=M8Hgg7@8ST=}bK=RNlGDQbVcf9n|_%QDh54Hu)k<JQ{myRDSs
z$B&<!pPvT>5eb`TjA6N4vR<!;aGvMf-~Z-tI0T>F5E0TeW!LdN>5d}LbN2f^BGQA~
zZEKpQ=esxOySqD*B<U@GH{Raf!b91Ece@=T!u$I>|BCKkk@}MR#sA0EA6Cxa0EQa&
Rx&R9R002ovPDHLkV1mmsQ;z@u

delta 692
zcmV;l0!#h(1%L*S7aSc31^@s6b;vf_00006VoOIv0RI600RN!9r<0K(AqNa76XD$0
zrIAS}e`rZWK~y-)g;l{$<1i3?wp&3#m0Av{AfeC`U%-b|;<|g`1NgI^kdRQ(!T|vl
z2@MUk<9Nn<0DF^?u$CfOw%@#Y&y%sZxVQiS+}+*%TCdl$vMk4F8O)5TsxTM~exIM8
zUjjfcY!*c^n@lF->2wMqL<EI-S(cd3=g6{be+J+Z0Ax61tsPINQ|#^Sq2KQ}0(kFX
zjKT5oF_<}K)~hqDRx3O_JiwME{8q|ZYYd0OM$ibBQX)wb?Ck8I-|vH&;hcl_9?m&z
zHXCTIu~;n7%1lIfe}9LR5>-{jL(Vy9tx=X`JF^f1Qp(0Bgn;)RQc5VLpp@!PJ55uh
ze`y-8#d{x_t+g19M%~OwlHly@3`!{w5r_!hdsI~gtu?gPxVgD$XC@-#c^(}WLPX;>
zn@zW7W{zyZys++^12cn}qm%~Ndyl85C!}c_g9Nbm9$IURMk6qDJM+=e5l&A}(d+f%
z{d#y*_MhhK>+5!AV+@L-_?9*^N6npSe-lwOD$MHve$*VaN+~}Nc@O_}&tb1q^YimF
zvMh_v*MnMXF&qxNnd^oT5u76cpG9Jffz}$gx3}GfeSCaC2!X1qVv!ILj4}T=EEGx5
zR$u>7^UKQ%@;r|f6~N34Yb^%5yWPx_$plG~)HJ)s|E#sfpZoiEX00{W>vf|@e?s7*
zC_Xi}rM<1W4zBC1_qGQ3_4O62)hbrgw&u{=TET~hhd4PoiT`Y92Bk5uUk%~$@$oyD
zh_GBP0ie->wmoTen~2^Pi^cfh-~dXgwigG><q|@Ow{Kvj)K#A6vn<P6->NY7_xG>D
a{4b3`SP&_5*p2`I002ovPDHLk0$_p{@lL(~

diff --git a/src/gui/widgets/fade_button.cpp b/src/gui/widgets/fade_button.cpp
index 2dc8f6cd7..0ae0c1f89 100644
--- a/src/gui/widgets/fade_button.cpp
+++ b/src/gui/widgets/fade_button.cpp
@@ -99,10 +99,10 @@ void fadeButton::paintEvent( QPaintEvent * _pe )
 
 	int w = rect().right();
 	int h = rect().bottom();
-	p.setPen( QColor( 37, 39, 46 ) );
+	p.setPen( m_normalColor.darker(130) );
 	p.drawLine( w, 1, w, h );
 	p.drawLine( 1, h, w, h );
-	p.setPen( QColor( 145, 147, 154 ) );
+	p.setPen( m_normalColor.lighter(130) );
 	p.drawLine( 0, 0, 0, h-1 );
 	p.drawLine( 0, 0, w, 0 );
 }
diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp
index 37d8db962..441333a2d 100644
--- a/src/tracks/InstrumentTrack.cpp
+++ b/src/tracks/InstrumentTrack.cpp
@@ -1007,8 +1007,10 @@ InstrumentTrackView::InstrumentTrackView( InstrumentTrack * _it, TrackContainerV
 	m_midiInputAction->setText( tr( "Input" ) );
 	m_midiOutputAction->setText( tr( "Output" ) );
 
-	m_activityIndicator = new fadeButton( QColor( 56, 60, 72 ),
-						QColor( 64, 255, 16 ),
+	m_activityIndicator = new fadeButton( QApplication::palette().color( QPalette::Active,
+							QPalette::Background),
+						QApplication::palette().color( QPalette::Active,
+							QPalette::BrightText ),
 						getTrackSettingsWidget() );
 	m_activityIndicator->setGeometry(
 					 widgetWidth-2*24-11, 2, 8, 28 );