diff --git a/plugins/waveshaper/add1_active.png b/plugins/waveshaper/add1_active.png index 89ae87e0f..71979b181 100644 Binary files a/plugins/waveshaper/add1_active.png and b/plugins/waveshaper/add1_active.png differ diff --git a/plugins/waveshaper/add1_inactive.png b/plugins/waveshaper/add1_inactive.png index 94213a27c..9557735ed 100644 Binary files a/plugins/waveshaper/add1_inactive.png and b/plugins/waveshaper/add1_inactive.png differ diff --git a/plugins/waveshaper/artwork.png b/plugins/waveshaper/artwork.png index 25c715144..be099b178 100644 Binary files a/plugins/waveshaper/artwork.png and b/plugins/waveshaper/artwork.png differ diff --git a/plugins/waveshaper/reset_active.png b/plugins/waveshaper/reset_active.png index 7bb3957ee..915e2aede 100644 Binary files a/plugins/waveshaper/reset_active.png and b/plugins/waveshaper/reset_active.png differ diff --git a/plugins/waveshaper/reset_inactive.png b/plugins/waveshaper/reset_inactive.png index 5c3955b2b..b23b48520 100644 Binary files a/plugins/waveshaper/reset_inactive.png and b/plugins/waveshaper/reset_inactive.png differ diff --git a/plugins/waveshaper/smooth_active.png b/plugins/waveshaper/smooth_active.png index a44bef32d..29e880834 100644 Binary files a/plugins/waveshaper/smooth_active.png and b/plugins/waveshaper/smooth_active.png differ diff --git a/plugins/waveshaper/smooth_inactive.png b/plugins/waveshaper/smooth_inactive.png index eb689a500..c924b58cf 100644 Binary files a/plugins/waveshaper/smooth_inactive.png and b/plugins/waveshaper/smooth_inactive.png differ diff --git a/plugins/waveshaper/sub1_active.png b/plugins/waveshaper/sub1_active.png index b82eb2585..434baca32 100644 Binary files a/plugins/waveshaper/sub1_active.png and b/plugins/waveshaper/sub1_active.png differ diff --git a/plugins/waveshaper/sub1_inactive.png b/plugins/waveshaper/sub1_inactive.png index 075239fd4..a766e6a19 100644 Binary files a/plugins/waveshaper/sub1_inactive.png and b/plugins/waveshaper/sub1_inactive.png differ diff --git a/plugins/waveshaper/wavegraph.png b/plugins/waveshaper/wavegraph.png index 650fcec02..658af767a 100644 Binary files a/plugins/waveshaper/wavegraph.png and b/plugins/waveshaper/wavegraph.png differ diff --git a/plugins/waveshaper/waveshaper_control_dialog.cpp b/plugins/waveshaper/waveshaper_control_dialog.cpp index 90e1c964f..726a49a96 100644 --- a/plugins/waveshaper/waveshaper_control_dialog.cpp +++ b/plugins/waveshaper/waveshaper_control_dialog.cpp @@ -44,23 +44,23 @@ waveShaperControlDialog::waveShaperControlDialog( pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap( "artwork" ) ); setPalette( pal ); - setFixedSize( 224, 300 ); + setFixedSize( 224, 274 ); Graph * waveGraph = new Graph( this, Graph::LinearNonCyclicStyle, 204, 205 ); - waveGraph -> move( 10, 32 ); + waveGraph -> move( 10, 6 ); waveGraph -> setModel( &_controls -> m_wavegraphModel ); waveGraph -> setAutoFillBackground( true ); pal = QPalette(); pal.setBrush( backgroundRole(), PLUGIN_NAME::getIconPixmap("wavegraph") ); waveGraph->setPalette( pal ); - waveGraph->setGraphColor( QColor( 170, 255, 255 ) ); + waveGraph->setGraphColor( QColor( 85, 204, 145 ) ); waveGraph -> setMaximumSize( 204, 205 ); Knob * inputKnob = new Knob( knobBright_26, this); inputKnob -> setVolumeKnob( true ); inputKnob -> setVolumeRatio( 1.0 ); - inputKnob -> move( 14, 251 ); + inputKnob -> move( 26, 225 ); inputKnob->setModel( &_controls->m_inputModel ); inputKnob->setLabel( tr( "INPUT" ) ); inputKnob->setHintText( tr( "Input gain:" ) , "" ); @@ -68,42 +68,42 @@ waveShaperControlDialog::waveShaperControlDialog( Knob * outputKnob = new Knob( knobBright_26, this ); outputKnob -> setVolumeKnob( true ); outputKnob -> setVolumeRatio( 1.0 ); - outputKnob -> move( 54, 251 ); + outputKnob -> move( 76, 225 ); outputKnob->setModel( &_controls->m_outputModel ); outputKnob->setLabel( tr( "OUTPUT" ) ); outputKnob->setHintText( tr( "Output gain:" ), "" ); PixmapButton * resetButton = new PixmapButton( this, tr("Reset waveform") ); - resetButton -> move( 164, 251 ); - resetButton -> resize( 12, 48 ); + resetButton -> move( 162, 221 ); + resetButton -> resize( 13, 46 ); resetButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "reset_active" ) ); resetButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "reset_inactive" ) ); ToolTip::add( resetButton, tr( "Click here to reset the wavegraph back to default" ) ); PixmapButton * smoothButton = new PixmapButton( this, tr("Smooth waveform") ); - smoothButton -> move( 164, 267 ); - smoothButton -> resize( 12, 48 ); + smoothButton -> move( 162, 237 ); + smoothButton -> resize( 13, 46 ); smoothButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "smooth_active" ) ); smoothButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "smooth_inactive" ) ); ToolTip::add( smoothButton, tr( "Click here to apply smoothing to wavegraph" ) ); PixmapButton * addOneButton = new PixmapButton( this, tr("Increase graph amplitude by 1dB") ); - addOneButton -> move( 133, 251 ); - addOneButton -> resize( 12, 29 ); + addOneButton -> move( 131, 221 ); + addOneButton -> resize( 13, 29 ); addOneButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "add1_active" ) ); addOneButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "add1_inactive" ) ); ToolTip::add( addOneButton, tr( "Click here to increase wavegraph amplitude by 1dB" ) ); PixmapButton * subOneButton = new PixmapButton( this, tr("Decrease graph amplitude by 1dB") ); - subOneButton -> move( 133, 267 ); - subOneButton -> resize( 12, 29 ); + subOneButton -> move( 131, 237 ); + subOneButton -> resize( 13, 29 ); subOneButton -> setActiveGraphic( PLUGIN_NAME::getIconPixmap( "sub1_active" ) ); subOneButton -> setInactiveGraphic( PLUGIN_NAME::getIconPixmap( "sub1_inactive" ) ); ToolTip::add( subOneButton, tr( "Click here to decrease wavegraph amplitude by 1dB" ) ); LedCheckBox * clipInputToggle = new LedCheckBox( "Clip input", this, tr( "Clip input" ), LedCheckBox::Green ); - clipInputToggle -> move( 133, 283 ); + clipInputToggle -> move( 131, 252 ); clipInputToggle -> setModel( &_controls -> m_clipModel ); ToolTip::add( clipInputToggle, tr( "Clip input signal to 0dB" ) ); diff --git a/src/gui/widgets/Graph.cpp b/src/gui/widgets/Graph.cpp index ead7ee86c..7d65415f2 100644 --- a/src/gui/widgets/Graph.cpp +++ b/src/gui/widgets/Graph.cpp @@ -385,7 +385,7 @@ void Graph::paintEvent( QPaintEvent * ) if( m_mouseDown ) { QPoint cursor = mapFromGlobal( QCursor::pos() ); - p.setPen( QColor( 0xAA, 0xFF, 0x00, 0x70 ) ); + p.setPen( QColor( 0x70, 0x7C, 0x91 ) ); p.drawLine( 2, cursor.y(), width()-2, cursor.y() ); p.drawLine( cursor.x(), 2, cursor.x(), height()-2 ); }