diff --git a/data/themes/default/controller_bg.png b/data/themes/default/controller_bg.png index dc9c9f011..6d7830fff 100644 Binary files a/data/themes/default/controller_bg.png and b/data/themes/default/controller_bg.png differ diff --git a/data/themes/default/effect_plugin.png b/data/themes/default/effect_plugin.png index 81b0e0519..567bc31ae 100644 Binary files a/data/themes/default/effect_plugin.png and b/data/themes/default/effect_plugin.png differ diff --git a/data/themes/default/lfo_controller_artwork.png b/data/themes/default/lfo_controller_artwork.png index 8bd9dbed3..f1ddacec0 100644 Binary files a/data/themes/default/lfo_controller_artwork.png and b/data/themes/default/lfo_controller_artwork.png differ diff --git a/data/themes/default/style.css b/data/themes/default/style.css index 61332cab4..0aed57e49 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -178,12 +178,6 @@ EffectSelectDialog QScrollArea { background: #5b6571; } -ControllerRackView QScrollArea, ControllerRackView QVBoxLayout { - border-radius: 2px; - border: 1px solid rgba(0,0,0, 64); - background: #49515b; -} - EffectControlDialog QGroupBox { background: #49515b; margin-top: 1ex; diff --git a/plugins/peak_controller_effect/artwork.png b/plugins/peak_controller_effect/artwork.png index e063fb9fd..1c5d5defb 100644 Binary files a/plugins/peak_controller_effect/artwork.png and b/plugins/peak_controller_effect/artwork.png differ diff --git a/src/gui/AutomationEditor.cpp b/src/gui/AutomationEditor.cpp index b0a5b5a33..ce3847f0e 100644 --- a/src/gui/AutomationEditor.cpp +++ b/src/gui/AutomationEditor.cpp @@ -1532,7 +1532,7 @@ void AutomationEditor::paintEvent( QPaintEvent * _pe ) int len_ticks = 4; timeMap & time_map = m_pattern->getTimeMap(); timeMap::iterator it = time_map.begin(); - p.setPen( QColor( 0xFF, 0xDF, 0x20 ) ); + p.setPen( QColor( 0xCF, 0xD9, 0xFF ) ); while( it+1 != time_map.end() ) { @@ -1603,7 +1603,7 @@ void AutomationEditor::paintEvent( QPaintEvent * _pe ) QFont f = p.font(); f.setBold( TRUE ); p.setFont( pointSize<14>( f ) ); - p.setPen( QColor( 0, 255, 0 ) ); + p.setPen( QColor( 74, 253, 133 ) ); p.drawText( VALUES_WIDTH + 20, TOP_MARGIN + 40, width() - VALUES_WIDTH - 20 - SCROLLBAR_SIZE, grid_height - 40, Qt::TextWordWrap, @@ -1722,7 +1722,7 @@ void AutomationEditor::drawLevelTick( QPainter & _p, int _tick, float _level, rect_height = (int)( _level * m_y_delta ); } - QColor current_color( 0xFF, 0xB0, 0x00 ); + QColor current_color( 0x9F, 0xAF, 0xFF ); if( _is_selected == TRUE ) { current_color.setRgb( 0x00, 0x40, 0xC0 ); diff --git a/src/gui/AutomationPatternView.cpp b/src/gui/AutomationPatternView.cpp index 3d2638c94..c4d260c53 100644 --- a/src/gui/AutomationPatternView.cpp +++ b/src/gui/AutomationPatternView.cpp @@ -199,9 +199,9 @@ void AutomationPatternView::paintEvent( QPaintEvent * ) QLinearGradient lingrad( 0, 0, 0, height() ); const QColor c = isSelected() ? QColor( 0, 0, 224 ) : QColor( 96, 96, 96 ); - lingrad.setColorAt( 0, c ); - lingrad.setColorAt( 0.5, Qt::black ); - lingrad.setColorAt( 1, c ); + lingrad.setColorAt( 0, QColor(16, 16, 16) ); + lingrad.setColorAt( 0.5, c ); + lingrad.setColorAt( 1, QColor(16, 16, 16) ); p.setBrush( lingrad ); p.setPen( QColor( 0, 0, 0 ) ); p.drawRect( QRect( 0, 0, width() - 1, height() - 1 ) ); @@ -235,8 +235,8 @@ void AutomationPatternView::paintEvent( QPaintEvent * ) p.scale( 1.0f, -h ); QLinearGradient lin2grad( 0, min, 0, max ); - const QColor cl = QColor( 255, 224, 0 ); - const QColor cd = QColor( 229, 158, 0 ); + const QColor cl = QColor( 0xCF, 0xDA, 0xFF ); + const QColor cd = QColor( 0x99, 0xAF, 0xFF ); lin2grad.setColorAt( 1, cl ); lin2grad.setColorAt( 0, cd ); diff --git a/src/gui/PianoView.cpp b/src/gui/PianoView.cpp index adbb06552..18a916a1e 100644 --- a/src/gui/PianoView.cpp +++ b/src/gui/PianoView.cpp @@ -805,9 +805,12 @@ void PianoView::paintEvent( QPaintEvent * ) const int base_key = ( m_piano != NULL ) ? m_piano->instrumentTrack()->baseNoteModel()->value() : 0; - g.setColorAt( 0, QColor( 0, 96, 0 ) ); - g.setColorAt( 0.1, QColor( 64, 255, 64 ) ); - g.setColorAt( 1, QColor( 0, 96, 0 ) ); + g.setColorAt( 0, QApplication::palette().color( QPalette::Active, + QPalette::BrightText ).darker(220) ); + g.setColorAt( 0.1, QApplication::palette().color( QPalette::Active, + QPalette::BrightText ) ); + g.setColorAt( 1, QApplication::palette().color( QPalette::Active, + QPalette::BrightText ) ); if( KEY_ORDER[base_key % KeysPerOctave] == Piano::WhiteKey ) { p.fillRect( QRect( getKeyX( base_key ), 1, PW_WHITE_KEY_WIDTH-1, diff --git a/src/gui/piano_roll.cpp b/src/gui/piano_roll.cpp index 8e18f38d1..be14b6da6 100644 --- a/src/gui/piano_roll.cpp +++ b/src/gui/piano_roll.cpp @@ -844,10 +844,9 @@ inline void pianoRoll::drawNoteRect( QPainter & _p, int _x, int _y, ( (float)( PanningRight - _n->getPanning() ) ) / ( (float)( PanningRight - PanningLeft ) ) * 2.0f ); - const QColor defaultNoteColor( 0x00, 0xAA, 0x00 ); + const QColor defaultNoteColor( 0x4A, 0xFD, 0x85 ); QColor col = defaultNoteColor; - col = QColor( 0x00, 0xAA, 0x00 ); if( _n->length() < 0 ) { //step note @@ -915,7 +914,7 @@ inline void pianoRoll::drawDetuningInfo( QPainter & _p, note * _n, int _x, int _y ) { int middle_y = _y + KEY_LINE_HEIGHT / 2; - _p.setPen( QColor( 0xFF, 0xDF, 0x20 ) ); + _p.setPen( QColor( 0x99, 0xAF, 0xFF ) ); int old_x = 0; int old_y = 0; @@ -3130,7 +3129,7 @@ void pianoRoll::paintEvent( QPaintEvent * _pe ) QFont f = p.font(); f.setBold( true ); p.setFont( pointSize<14>( f ) ); - p.setPen( QColor( 0, 255, 0 ) ); + p.setPen( QColor( 0x4A, 0xFD, 0x85 ) ); p.drawText( WHITE_KEY_WIDTH + 20, PR_TOP_MARGIN + 40, tr( "Please open a pattern by double-clicking " "on it!" ) ); diff --git a/src/gui/widgets/EnvelopeAndLfoView.cpp b/src/gui/widgets/EnvelopeAndLfoView.cpp index ae796f0d8..1ce05044c 100644 --- a/src/gui/widgets/EnvelopeAndLfoView.cpp +++ b/src/gui/widgets/EnvelopeAndLfoView.cpp @@ -425,7 +425,7 @@ void EnvelopeAndLfoView::paintEvent( QPaintEvent * ) static_cast( 128 - 32 * gray_amount ) ), 2 ) ); - const QColor end_points_color( 0xFF, 0xBF, 0x22 ); + const QColor end_points_color( 0x99, 0xAF, 0xFF ); const QColor end_points_bg_color( 0, 0, 2 ); const int y_base = ENV_GRAPH_Y + s_envGraph->height() - 3; @@ -541,7 +541,7 @@ void EnvelopeAndLfoView::paintEvent( QPaintEvent * ) old_y = cur_y; } - p.setPen( QColor( 255, 192, 0 ) ); + p.setPen( QColor( 201, 201, 225 ) ); int ms_per_osc = static_cast( SECS_PER_LFO_OSCILLATION * m_lfoSpeedKnob->value() * 1000.0f ); diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp index e2bfb9b6b..d57ca8447 100644 --- a/src/tracks/SampleTrack.cpp +++ b/src/tracks/SampleTrack.cpp @@ -332,13 +332,15 @@ void SampleTCOView::paintEvent( QPaintEvent * _pe ) QLinearGradient grad( 0, 0, 0, height() ); if( isSelected() ) { - grad.setColorAt( 1, QColor( 0, 0, 224 ) ); grad.setColorAt( 0, QColor( 0, 0, 128 ) ); + grad.setColorAt( 0.5, QColor( 0, 0, 224 ) ); + grad.setColorAt( 1, QColor( 0, 0, 128 ) ); } else { - grad.setColorAt( 0, QColor( 96, 96, 96 ) ); - grad.setColorAt( 1, QColor( 16, 16, 16 ) ); + grad.setColorAt( 0, QColor( 16, 16, 16 ) ); + grad.setColorAt( 0.5, QColor( 96, 96, 96 ) ); + grad.setColorAt( 0, QColor( 16, 16, 16 ) ); } p.fillRect( _pe->rect(), grad ); @@ -350,7 +352,7 @@ void SampleTCOView::paintEvent( QPaintEvent * _pe ) } else { - p.setPen( QColor( 64, 224, 160 ) ); + p.setPen( QColor( 74, 253, 133 ) ); } QRect r = QRect( 1, 1, qMax( static_cast( m_tco->sampleLength() * diff --git a/src/tracks/pattern.cpp b/src/tracks/pattern.cpp index 197c411f0..54c7ef41c 100644 --- a/src/tracks/pattern.cpp +++ b/src/tracks/pattern.cpp @@ -1112,9 +1112,9 @@ void patternView::paintEvent( QPaintEvent * ) QLinearGradient lingrad( 0, 0, 0, height() ); const QColor c = isSelected() ? QColor( 0, 0, 224 ) : QColor( 96, 96, 96 ); - lingrad.setColorAt( 0, c ); - lingrad.setColorAt( 0.5, Qt::black ); - lingrad.setColorAt( 1, c ); + lingrad.setColorAt( 0, QColor( 16, 16, 16 ) ); + lingrad.setColorAt( 0.5, c ); + lingrad.setColorAt( 1, QColor( 16, 16, 16 ) ); p.setBrush( lingrad ); p.setPen( QColor( 0, 0, 0 ) ); //p.drawRect( 0, 0, width() - 1, height() - 1 ); @@ -1172,11 +1172,11 @@ void patternView::paintEvent( QPaintEvent * ) } else if( m_pat->m_frozenPattern != NULL ) { - p.setPen( QColor( 0x00, 0xE0, 0xFF ) ); + p.setPen( QColor( 0x70, 0xFF, 0xFF ) ); } else { - p.setPen( QColor( 0xFF, 0xB0, 0x00 ) ); + p.setPen( QColor( 0x77, 0xC7, 0xD8 ) ); } for( NoteVector::Iterator it = @@ -1287,7 +1287,7 @@ void patternView::paintEvent( QPaintEvent * ) else if( m_pat->m_frozenPattern != NULL ) { p.setBrush( QBrush() ); - p.setPen( QColor( 0, 224, 255 ) ); + p.setPen( QColor( 0x70, 255, 255 ) ); p.drawRect( 0, 0, width()-1, height() - 1 ); p.drawPixmap( 3, height() - s_frozen->height() - 4, *s_frozen ); }