Merge pull request #206 from diizy/stable-0.4

Artwork

data/themes/default/style.css

@@ -360,13 +360,13 @@ QToolButton, toolButton {
 /* separate corner rounding for play and stop buttons! */
 
 toolButton#playButton {
-	border-top-left-radius: 8px 6px;
-	border-bottom-left-radius: 8px 6px;
+	border-top-left-radius: 5px 15px;
+	border-bottom-left-radius: 5px 15px;
 }
 
 toolButton#stopButton {
-	border-top-right-radius: 8px 6px;
-	border-bottom-right-radius: 8px 6px;	
+	border-top-right-radius: 5px 15px;
+	border-bottom-right-radius: 5px 15px;	
 }
 
 /* record and record-accompany can be styled with #recordButton and #recordAccompanyButton respectively */
@@ -454,10 +454,9 @@ FxMixerView QPushButton, EffectRackView QPushButton, ControllerRackView QPushBut
 	font-size: 10px;
 }
 
-/* has no effect yet */
-/*timeLine {
+timeLine {
 	font-size: 8px;
-}*/
+}
 
 QTreeView {
 	alternate-background-color: #747474;
@@ -534,13 +533,48 @@ sf2InstrumentView knob {
 }
 
 sfxrInstrumentView knob {
-	color: #b06319;
+	color: #000;
 	qproperty-outerColor: rgb(194, 177, 145);
 	qproperty-innerRadius: 2;
-	qproperty-outerRadius: 10;
+	qproperty-outerRadius: 9;
 	qproperty-lineWidth: 2;
 }
 
+sfxrInstrumentView knob#envKnob {
+	color:	#263352;
+	qproperty-outerColor: #4b66a4;
+}
+
+sfxrInstrumentView knob#freqKnob {
+	color:	#1e4a22;
+	qproperty-outerColor: #3c9544;
+}
+
+sfxrInstrumentView knob#changeKnob {
+	color:	#591c1c;
+	qproperty-outerColor: #b23737;
+}
+
+sfxrInstrumentView knob#sqrKnob {
+	color:	#3b2714;
+	qproperty-outerColor: #724c27;
+}
+
+sfxrInstrumentView knob#repeatKnob {
+	color:	#292929;
+	qproperty-outerColor: #515151;
+}
+
+sfxrInstrumentView knob#phaserKnob {
+	color:	#144c4d;
+	qproperty-outerColor: #299899;
+}
+
+sfxrInstrumentView knob#filterKnob {
+	color:	#47224c;
+	qproperty-outerColor: #8e4397;
+}
+
 opl2instrumentView knob {
 	color: rgb(128,128,128);
 	qproperty-outerColor: rgb(255,255,255);

plugins/sfxr/sfxr.cpp

@@ -595,6 +595,11 @@ sfxrInstrumentView::sfxrInstrumentView( Instrument * _instrument,
 	createKnob(m_susKnob, 	KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*2, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*0, "Sustain Punch");
 	createKnob(m_decKnob, 	KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*3, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*0, "Decay Time");
 
+	m_attKnob	->setObjectName( "envKnob" );
+	m_holdKnob	->setObjectName( "envKnob" );
+	m_susKnob	->setObjectName( "envKnob" );
+	m_decKnob	->setObjectName( "envKnob" );
+
 	createKnob(m_startFreqKnob,	KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*0, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*1, "Start Frequency");
 	createKnob(m_minFreqKnob, 	KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*1, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*1, "Min Frequency");
 	createKnob(m_slideKnob, 	KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*2, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*1, "Slide");
@@ -602,16 +607,34 @@ sfxrInstrumentView::sfxrInstrumentView( Instrument * _instrument,
 	createKnob(m_vibDepthKnob, 	KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*4, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*1, "Vibrato Depth");
 	createKnob(m_vibSpeedKnob, 	KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*5, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*1, "Vibrato Speed");
 
+	m_startFreqKnob	->setObjectName( "freqKnob" );
+	m_minFreqKnob	->setObjectName( "freqKnob" );
+	m_slideKnob		->setObjectName( "freqKnob" );
+	m_dSlideKnob	->setObjectName( "freqKnob" );
+	m_vibDepthKnob	->setObjectName( "freqKnob" );
+	m_vibSpeedKnob	->setObjectName( "freqKnob" );
+	
 	createKnob(m_changeAmtKnob, 	KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*0, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*2, "Change Amount");
 	createKnob(m_changeSpeedKnob, 	KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*1, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*2, "Change Speed");
 
+	m_changeAmtKnob		->setObjectName( "changeKnob" );
+	m_changeSpeedKnob	->setObjectName( "changeKnob" );
+
 	createKnob(m_sqrDutyKnob, 	KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*3, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*2, "Squre Duty(Square wave only)");
     createKnob(m_sqrSweepKnob, 	KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*4, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*2, "Squre Sweep(Square wave only)");
 
+	m_sqrDutyKnob	->setObjectName( "sqrKnob" );
+	m_sqrSweepKnob	->setObjectName( "sqrKnob" );
+
 	createKnob(m_repeatSpeedKnob, 	KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*0, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*3, "Repeat Speed");
 
-	createKnob(m_phaserOffsetKnob, 	KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*2, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*3, "Phaser Offset");
-	createKnob(m_phaserSweepKnob, 	KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*3, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*3, "Phaser Sweep");
+	m_repeatSpeedKnob	->setObjectName( "repeatKnob" );
+
+	createKnob(m_phaserOffsetKnob, 	KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*3, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*3, "Phaser Offset");
+	createKnob(m_phaserSweepKnob, 	KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*4, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*3, "Phaser Sweep");
+
+	m_phaserOffsetKnob	->setObjectName( "phaserKnob" );
+	m_phaserSweepKnob	->setObjectName( "phaserKnob" );
 
 	createKnob(m_lpFilCutKnob,		KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*0, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*4, "LP Filter Cutoff");
 	createKnob(m_lpFilCutSweepKnob, KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*1, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*4, "LP Filter Cutoff Sweep");
@@ -619,10 +642,16 @@ sfxrInstrumentView::sfxrInstrumentView( Instrument * _instrument,
 	createKnob(m_hpFilCutKnob,		KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*3, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*4, "HP Filter Cutoff");
 	createKnob(m_hpFilCutSweepKnob, KNOBS_BASE_X+KNOB_BLOCK_SIZE_X*4, KNOBS_BASE_Y+KNOB_BLOCK_SIZE_Y*4, "HP Filter Cutoff Sweep");
 
-	createButton(m_sqrWaveBtn,		KNOBS_BASE_X+WAVEFORM_BUTTON_WIDTH*0, WAVEFORM_BASE_Y, "Square Wave", "square_wave");
-	createButton(m_sawWaveBtn,		KNOBS_BASE_X+WAVEFORM_BUTTON_WIDTH*1, WAVEFORM_BASE_Y, "Saw Wave", "saw_wave");
-	createButton(m_sinWaveBtn,		KNOBS_BASE_X+WAVEFORM_BUTTON_WIDTH*2, WAVEFORM_BASE_Y, "Sine Wave", "sin_wave");
-	createButton(m_noiseWaveBtn,	KNOBS_BASE_X+WAVEFORM_BUTTON_WIDTH*3, WAVEFORM_BASE_Y, "Noise", "white_noise_wave");
+	m_lpFilCutKnob		->setObjectName( "filterKnob" );
+	m_lpFilCutSweepKnob	->setObjectName( "filterKnob" );
+	m_lpFilResoKnob		->setObjectName( "filterKnob" );
+	m_hpFilCutKnob		->setObjectName( "filterKnob" );
+	m_hpFilCutSweepKnob	->setObjectName( "filterKnob" );
+
+	createButtonLocalGraphic(m_sqrWaveBtn,		KNOBS_BASE_X+WAVEFORM_BUTTON_WIDTH*0, WAVEFORM_BASE_Y, "Square Wave", "sfxr_square_wave");
+	createButtonLocalGraphic(m_sawWaveBtn,		KNOBS_BASE_X+WAVEFORM_BUTTON_WIDTH*1, WAVEFORM_BASE_Y, "Saw Wave", "sfxr_saw_wave");
+	createButtonLocalGraphic(m_sinWaveBtn,		KNOBS_BASE_X+WAVEFORM_BUTTON_WIDTH*2, WAVEFORM_BASE_Y, "Sine Wave", "sfxr_sin_wave");
+	createButtonLocalGraphic(m_noiseWaveBtn,	KNOBS_BASE_X+WAVEFORM_BUTTON_WIDTH*3, WAVEFORM_BASE_Y, "Noise", "sfxr_white_noise_wave");
 
 	m_waveBtnGroup = new automatableButtonGroup( this );
 	m_waveBtnGroup->addButton(m_sqrWaveBtn);