Merge pull request LMMS#3007 from RebeccaDeField/master

Redesign Flanger
sdasda7777 · Sep 15, 2016 · 44444a8 · 44444a8
2 parents d364325 + 60c2e58
commit 44444a8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/plugins/Flanger/FlangerControlsDialog.cpp b/plugins/Flanger/FlangerControlsDialog.cpp
@@ -38,45 +38,45 @@ FlangerControlsDialog::FlangerControlsDialog( FlangerControls *controls ) :
 	QPalette pal;
 	pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap( "artwork" ) );
 	setPalette( pal );
-	setFixedSize( 200, 75 );
+	setFixedSize( 195, 75 );
 
 	Knob* delayKnob = new Knob( knobBright_26, this );
-	delayKnob->move( 20,10 );
+	delayKnob->move( 10,10 );
 	delayKnob->setVolumeKnob( false );
 	delayKnob->setModel( &controls->m_delayTimeModel );
-	delayKnob->setLabel( tr( "Delay" ) );
+	delayKnob->setLabel( tr( "DELAY" ) );
 	delayKnob->setHintText( tr( "Delay Time:" ) + " ", "s" );
 
 	TempoSyncKnob * lfoFreqKnob = new TempoSyncKnob( knobBright_26, this );
-	lfoFreqKnob->move( 53,10 );
+	lfoFreqKnob->move( 48,10 );
 	lfoFreqKnob->setVolumeKnob( false );
 	lfoFreqKnob->setModel( &controls->m_lfoFrequencyModel );
-	lfoFreqKnob->setLabel( tr( "Lfo Hz" ) );
-	lfoFreqKnob->setHintText( tr ( "Lfo:" ) , "Hz" );
+	lfoFreqKnob->setLabel( tr( "RATE" ) );
+	lfoFreqKnob->setHintText( tr ( "Rate:" ) , "Hz" );
 
 	Knob * lfoAmtKnob = new Knob( knobBright_26, this );
-	lfoAmtKnob->move( 86,10 );
+	lfoAmtKnob->move( 85,10 );
 	lfoAmtKnob->setVolumeKnob( false );
 	lfoAmtKnob->setModel( &controls->m_lfoAmountModel );
-	lfoAmtKnob->setLabel( tr( "Amt" ) );
-	lfoAmtKnob->setHintText( tr ( "Amt:" ) , "" );
+	lfoAmtKnob->setLabel( tr( "AMNT" ) );
+	lfoAmtKnob->setHintText( tr ( "Amount:" ) , "" );
 
 	Knob * feedbackKnob = new Knob( knobBright_26, this );
-	feedbackKnob->move( 119,10 );
+	feedbackKnob->move( 122,10 );
 	feedbackKnob->setVolumeKnob( true) ;
 	feedbackKnob->setModel( &controls->m_feedbackModel );
-	feedbackKnob->setLabel( tr( "Regen" ) );
+	feedbackKnob->setLabel( tr( "FDBK" ) );
 	feedbackKnob->setHintText( tr ( "Feedback Amount:" ) , "" );
 
 	Knob * whiteNoiseKnob = new Knob( knobBright_26, this );
-	whiteNoiseKnob->move( 150,10 );
+	whiteNoiseKnob->move( 156,10 );
 	whiteNoiseKnob->setVolumeKnob( true) ;
 	whiteNoiseKnob->setModel( &controls->m_whiteNoiseAmountModel );
-	whiteNoiseKnob->setLabel( tr( "Noise" ) );
+	whiteNoiseKnob->setLabel( tr( "NOISE" ) );
 	whiteNoiseKnob->setHintText( tr ( "White Noise Amount:" ) , "" );
 
-	LedCheckBox* invertCb = new LedCheckBox( tr( "" ), this );
-	invertCb->move( 15,55 );
+	LedCheckBox * invertCb = new LedCheckBox( tr( "Invert" ), this );
+	invertCb->move( 10,53 );
 
 
 

diff --git a/plugins/Flanger/artwork.png b/plugins/Flanger/artwork.png