From cbf3b92b6f53ff30aca019a75170debaa94b5409 Mon Sep 17 00:00:00 2001
From: Michael Gregorius <michael.gregorius.git@arcor.de>
Date: Sun, 6 Mar 2016 22:35:43 +0100
Subject: [PATCH] Removes an unused knob and enum (knob04.png aka knobGreen_17)

Removes the knob image knob04.png. This knob corresponded to
knobGreen_17 which was not used anywhere in the code. To be able to
remove the enum value it was necessary to change the knob loading code
in Knob::onKnobNumUpdated. However, the changed implementation is more
explicit and therefore likely better to understand.
---
 data/themes/default/knob04.png | Bin 656 -> 0 bytes
 include/Knob.h                 |   2 +-
 src/gui/widgets/Knob.cpp       |  30 +++++++++++++++++++++---------
 3 files changed, 22 insertions(+), 10 deletions(-)
 delete mode 100644 data/themes/default/knob04.png

diff --git a/data/themes/default/knob04.png b/data/themes/default/knob04.png
deleted file mode 100644
index 0e3af11c878b26aa02a2df4465d8bd7dc918e235..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 656
zcmV;B0&o3^P)<h;3K|Lk000e1NJLTq000pH000pP1^@s6J8eh$00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)&dd?2rzGX+9m)10v$<2
zK~y-)mDEdUl~)u6;BWu`jWN=QQOx5u7Ewg8t&&Mq+C&E-IB=lz&ZI-7g4RcbP_P=Y
zQ0S=8u@gly=|nqGqfiQg77<a<lA7GAlR(U)CimXsz+Z`}SY4yD_u(w|+WV{>7NPUF
zm=A3Ybk$jp7RfW=fiMzvqvL1P7ru#?hnAx>m8^<nKlWg$|DuZPk^EFoMk|97<j{G9
zyktYhAi7b)EdG%EE=-{XOR!Gp749|ns5~7mDrrBVE$4e|#J{*449VOZJEhurQYj^C
zC4Jb76_^OVp02qQYx?CW`6jUs(}{DDTp2&3x>!rcfXJ%4B;TS9Ba%b;2R%N*;X=aD
zY|Z&6gKBT+hpB5k9rn-iZgbdy4~1J<Bwt_|CQ`UKarVsw3sDQd;_o8do#EpmxII}n
z<{j|pJCnFkgd4J=3ixYk(fr?r#9h?TlohjwmEHqEE3#lNL#4=XE%$4A7lO_sO4yD_
zRI=b^aaWF{_x}hw280G(_@qeP$khGmg}xkLmXF)?HiA^un)s^d<zy|nnlIm>DmRW@
zSQ%kkbGOOHZeugUsvQF~?^0^|Tw_DsXTeEqE`0YxmKzCZJs~f#FF1fE%;P?OON<6<
z@F}*Sv1sgtsQdBZpt)BrZts`p$xa+ZdEwtew!rbziJx()a@w=kRsoccQOm3@(TASG
qkjpTGhl!h6^2>Y}e|-AI8i40>GN!t%i{kwN0000<MNUMnLSTX@pfJ+_

diff --git a/include/Knob.h b/include/Knob.h
index c41ebf08d..0d031ba4f 100644
--- a/include/Knob.h
+++ b/include/Knob.h
@@ -38,7 +38,7 @@ class TextFloat;
 
 enum knobTypes
 {
-	knobDark_28, knobBright_26, knobSmall_17, knobGreen_17, knobVintage_32, knobStyled
+	knobDark_28, knobBright_26, knobSmall_17, knobVintage_32, knobStyled
 } ;
 
 
diff --git a/src/gui/widgets/Knob.cpp b/src/gui/widgets/Knob.cpp
index f13dcc1dd..6c2a9c74d 100644
--- a/src/gui/widgets/Knob.cpp
+++ b/src/gui/widgets/Knob.cpp
@@ -111,8 +111,27 @@ void Knob::onKnobNumUpdated()
 {
 	if( m_knobNum != knobStyled )
 	{
-		m_knobPixmap = new QPixmap( embed::getIconPixmap( QString( "knob0" +
-			QString::number( m_knobNum + 1 ) ).toUtf8().constData() ) );
+		QString knobFilename;
+		switch (m_knobNum)
+		{
+		case knobDark_28:
+			knobFilename = "knob01";
+			break;
+		case knobBright_26:
+			knobFilename = "knob02";
+			break;
+		case knobSmall_17:
+			knobFilename = "knob03";
+			break;
+		case knobVintage_32:
+			knobFilename = "knob05";
+			break;
+		case knobStyled: // only here to stop the compiler from complaining
+			break;
+		}
+
+		// If knobFilename is still empty here we should get the fallback pixmap of size 1x1
+		m_knobPixmap = new QPixmap( embed::getIconPixmap( knobFilename.toUtf8().constData() ) );
 
 		setFixedSize( m_knobPixmap->width(), m_knobPixmap->height() );
 	}
@@ -431,13 +450,6 @@ void Knob::drawKnob( QPainter * _p )
 			p.drawLine( ln );
 			break;
 		}
-		case knobGreen_17:
-		{
-			p.setPen( QPen( QApplication::palette().color( QPalette::Active,
-							QPalette::BrightText), 2 ) );
-			p.drawLine( calculateLine( mid, radius ) );
-			break;
-		}
 		case knobVintage_32:
 		{
 			p.setPen( QPen( QApplication::palette().color( QPalette::Active,