diff --git a/data/themes/default/add.png b/data/themes/default/add.png index e029787c7..f79fdfdba 100644 Binary files a/data/themes/default/add.png and b/data/themes/default/add.png differ diff --git a/data/themes/default/apply.png b/data/themes/default/apply.png index f547bf179..1ae48682e 100644 Binary files a/data/themes/default/apply.png and b/data/themes/default/apply.png differ diff --git a/data/themes/default/arp_down.png b/data/themes/default/arp_down.png index b0ce4a5cc..85586f7da 100644 Binary files a/data/themes/default/arp_down.png and b/data/themes/default/arp_down.png differ diff --git a/data/themes/default/arp_up.png b/data/themes/default/arp_up.png index 78e7ad37f..07a4ecc7e 100644 Binary files a/data/themes/default/arp_up.png and b/data/themes/default/arp_up.png differ diff --git a/data/themes/default/arp_up_and_down.png b/data/themes/default/arp_up_and_down.png index f72c0c940..513331df7 100644 Binary files a/data/themes/default/arp_up_and_down.png and b/data/themes/default/arp_up_and_down.png differ diff --git a/data/themes/default/autoscroll_off.png b/data/themes/default/autoscroll_off.png index c0a4f37c8..a2d56e672 100644 Binary files a/data/themes/default/autoscroll_off.png and b/data/themes/default/autoscroll_off.png differ diff --git a/data/themes/default/autoscroll_on.png b/data/themes/default/autoscroll_on.png index 29da5c1dc..8c4bb5690 100644 Binary files a/data/themes/default/autoscroll_on.png and b/data/themes/default/autoscroll_on.png differ diff --git a/data/themes/default/back_to_start.png b/data/themes/default/back_to_start.png index 5eb2c12bc..d8b8b73fe 100644 Binary files a/data/themes/default/back_to_start.png and b/data/themes/default/back_to_start.png differ diff --git a/data/themes/default/back_to_zero.png b/data/themes/default/back_to_zero.png index b89c2107a..dfde88b4e 100644 Binary files a/data/themes/default/back_to_zero.png and b/data/themes/default/back_to_zero.png differ diff --git a/data/themes/default/chord.png b/data/themes/default/chord.png index 8aa83cdbe..42165f6b0 100644 Binary files a/data/themes/default/chord.png and b/data/themes/default/chord.png differ diff --git a/data/themes/default/combobox_bg.png b/data/themes/default/combobox_bg.png index 92430c252..83bdb4140 100644 Binary files a/data/themes/default/combobox_bg.png and b/data/themes/default/combobox_bg.png differ diff --git a/data/themes/default/cpuload_bg.png b/data/themes/default/cpuload_bg.png index e0f4a1581..f05db1a06 100644 Binary files a/data/themes/default/cpuload_bg.png and b/data/themes/default/cpuload_bg.png differ diff --git a/data/themes/default/cpuload_leds.png b/data/themes/default/cpuload_leds.png index cbb3bd478..900cd5b46 100644 Binary files a/data/themes/default/cpuload_leds.png and b/data/themes/default/cpuload_leds.png differ diff --git a/data/themes/default/dont_know.png b/data/themes/default/dont_know.png index 21a0cab62..3924a9173 100644 Binary files a/data/themes/default/dont_know.png and b/data/themes/default/dont_know.png differ diff --git a/data/themes/default/edit_select.png b/data/themes/default/edit_select.png index 5019cd89a..11b674a60 100644 Binary files a/data/themes/default/edit_select.png and b/data/themes/default/edit_select.png differ diff --git a/data/themes/default/exp_wave_active.png b/data/themes/default/exp_wave_active.png index 48b4b5a89..22682a150 100644 Binary files a/data/themes/default/exp_wave_active.png and b/data/themes/default/exp_wave_active.png differ diff --git a/data/themes/default/home.png b/data/themes/default/home.png index 647e75338..84051dbb6 100644 Binary files a/data/themes/default/home.png and b/data/themes/default/home.png differ diff --git a/data/themes/default/keep_stop_position.png b/data/themes/default/keep_stop_position.png index 060297da2..561fead25 100644 Binary files a/data/themes/default/keep_stop_position.png and b/data/themes/default/keep_stop_position.png differ diff --git a/data/themes/default/lfo_d100_active.png b/data/themes/default/lfo_d100_active.png index f2a05b555..bb966c579 100644 Binary files a/data/themes/default/lfo_d100_active.png and b/data/themes/default/lfo_d100_active.png differ diff --git a/data/themes/default/lfo_x100_active.png b/data/themes/default/lfo_x100_active.png index 479ff38c1..cb563f432 100644 Binary files a/data/themes/default/lfo_x100_active.png and b/data/themes/default/lfo_x100_active.png differ diff --git a/data/themes/default/lfo_x1_active.png b/data/themes/default/lfo_x1_active.png index 3a44b3e28..2c54a6ab1 100644 Binary files a/data/themes/default/lfo_x1_active.png and b/data/themes/default/lfo_x1_active.png differ diff --git a/data/themes/default/moog_saw_wave_active.png b/data/themes/default/moog_saw_wave_active.png index 9a530a1b3..f6230f6d4 100644 Binary files a/data/themes/default/moog_saw_wave_active.png and b/data/themes/default/moog_saw_wave_active.png differ diff --git a/data/themes/default/note.png b/data/themes/default/note.png index f81425dae..9e80341e0 100644 Binary files a/data/themes/default/note.png and b/data/themes/default/note.png differ diff --git a/data/themes/default/note_double_whole.png b/data/themes/default/note_double_whole.png index 4b1e934bd..f55150f46 100644 Binary files a/data/themes/default/note_double_whole.png and b/data/themes/default/note_double_whole.png differ diff --git a/data/themes/default/note_eighth.png b/data/themes/default/note_eighth.png index f81425dae..f7cac8689 100644 Binary files a/data/themes/default/note_eighth.png and b/data/themes/default/note_eighth.png differ diff --git a/data/themes/default/note_half.png b/data/themes/default/note_half.png index aff73e593..1444bcf11 100644 Binary files a/data/themes/default/note_half.png and b/data/themes/default/note_half.png differ diff --git a/data/themes/default/note_quarter.png b/data/themes/default/note_quarter.png index 6c3acf2cd..acd47baab 100644 Binary files a/data/themes/default/note_quarter.png and b/data/themes/default/note_quarter.png differ diff --git a/data/themes/default/note_sixteenth.png b/data/themes/default/note_sixteenth.png index 661bcb7be..44c900ceb 100644 Binary files a/data/themes/default/note_sixteenth.png and b/data/themes/default/note_sixteenth.png differ diff --git a/data/themes/default/note_thirtysecond.png b/data/themes/default/note_thirtysecond.png index a3daee579..204325edc 100644 Binary files a/data/themes/default/note_thirtysecond.png and b/data/themes/default/note_thirtysecond.png differ diff --git a/data/themes/default/note_tripleteighth.png b/data/themes/default/note_tripleteighth.png index 4e4d214de..3cd7ea452 100644 Binary files a/data/themes/default/note_tripleteighth.png and b/data/themes/default/note_tripleteighth.png differ diff --git a/data/themes/default/note_triplethalf.png b/data/themes/default/note_triplethalf.png index 5c8a7e90c..a2c80fe19 100644 Binary files a/data/themes/default/note_triplethalf.png and b/data/themes/default/note_triplethalf.png differ diff --git a/data/themes/default/note_tripletquarter.png b/data/themes/default/note_tripletquarter.png index 39c037b2a..029a50300 100644 Binary files a/data/themes/default/note_tripletquarter.png and b/data/themes/default/note_tripletquarter.png differ diff --git a/data/themes/default/note_tripletsixteenth.png b/data/themes/default/note_tripletsixteenth.png index a307b542a..31ce41942 100644 Binary files a/data/themes/default/note_tripletsixteenth.png and b/data/themes/default/note_tripletsixteenth.png differ diff --git a/data/themes/default/note_tripletthirtysecond.png b/data/themes/default/note_tripletthirtysecond.png index 20e2ab65a..9f8b31122 100644 Binary files a/data/themes/default/note_tripletthirtysecond.png and b/data/themes/default/note_tripletthirtysecond.png differ diff --git a/data/themes/default/note_whole.png b/data/themes/default/note_whole.png index f178b5023..36c2308b9 100644 Binary files a/data/themes/default/note_whole.png and b/data/themes/default/note_whole.png differ diff --git a/data/themes/default/output_graph.png b/data/themes/default/output_graph.png index b1405a63b..46ec86d44 100644 Binary files a/data/themes/default/output_graph.png and b/data/themes/default/output_graph.png differ diff --git a/data/themes/default/plugins.png b/data/themes/default/plugins.png index b7cff0117..5ba9bc3c9 100644 Binary files a/data/themes/default/plugins.png and b/data/themes/default/plugins.png differ diff --git a/data/themes/default/preset_file.png b/data/themes/default/preset_file.png index c9897ae40..53a0d1159 100644 Binary files a/data/themes/default/preset_file.png and b/data/themes/default/preset_file.png differ diff --git a/data/themes/default/project_file.png b/data/themes/default/project_file.png index db0fe6e1f..724ab5cfb 100644 Binary files a/data/themes/default/project_file.png and b/data/themes/default/project_file.png differ diff --git a/data/themes/default/round_square_wave_active.png b/data/themes/default/round_square_wave_active.png index b2d794d39..0dfe2093a 100644 Binary files a/data/themes/default/round_square_wave_active.png and b/data/themes/default/round_square_wave_active.png differ diff --git a/data/themes/default/sample_file.png b/data/themes/default/sample_file.png index 30814a1b9..f2ed8d46e 100644 Binary files a/data/themes/default/sample_file.png and b/data/themes/default/sample_file.png differ diff --git a/data/themes/default/saw_wave_active.png b/data/themes/default/saw_wave_active.png index 648910b6b..62bffcc33 100644 Binary files a/data/themes/default/saw_wave_active.png and b/data/themes/default/saw_wave_active.png differ diff --git a/data/themes/default/scale.png b/data/themes/default/scale.png index fa680ab76..4b6e1427f 100644 Binary files a/data/themes/default/scale.png and b/data/themes/default/scale.png differ diff --git a/data/themes/default/sin_wave_active.png b/data/themes/default/sin_wave_active.png index 57e06d408..ec7bf0a7d 100644 Binary files a/data/themes/default/sin_wave_active.png and b/data/themes/default/sin_wave_active.png differ diff --git a/data/themes/default/square_wave_active.png b/data/themes/default/square_wave_active.png index a79a22b98..487b5aff7 100644 Binary files a/data/themes/default/square_wave_active.png and b/data/themes/default/square_wave_active.png differ diff --git a/data/themes/default/style.css b/data/themes/default/style.css index 0d199ba12..8f2c0b699 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -104,6 +104,15 @@ QScrollBar:vertical { margin: 13px 0px; } +visualizationWidget { + background: none; + border: none; +} + +cpuloadWidget { + border: none; + background: url(resources:cpuload_bg.png); +} /* scrollbar: trough clicky things */ QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal, diff --git a/data/themes/default/trackop.png b/data/themes/default/trackop.png index dcb8036e2..bc089652e 100644 Binary files a/data/themes/default/trackop.png and b/data/themes/default/trackop.png differ diff --git a/data/themes/default/trackop_c.png b/data/themes/default/trackop_c.png index fbd6343dd..418e4f8eb 100644 Binary files a/data/themes/default/trackop_c.png and b/data/themes/default/trackop_c.png differ diff --git a/data/themes/default/trackop_h.png b/data/themes/default/trackop_h.png index df1ad5642..b88839a0d 100644 Binary files a/data/themes/default/trackop_h.png and b/data/themes/default/trackop_h.png differ diff --git a/data/themes/default/triangle_wave_active.png b/data/themes/default/triangle_wave_active.png index 79a4c6807..f3ef94abc 100644 Binary files a/data/themes/default/triangle_wave_active.png and b/data/themes/default/triangle_wave_active.png differ diff --git a/data/themes/default/usr_wave_active.png b/data/themes/default/usr_wave_active.png index 336ca87c6..2309967d5 100644 Binary files a/data/themes/default/usr_wave_active.png and b/data/themes/default/usr_wave_active.png differ diff --git a/data/themes/default/white_noise_wave_active.png b/data/themes/default/white_noise_wave_active.png index 8c8fa9d7f..38b089c63 100644 Binary files a/data/themes/default/white_noise_wave_active.png and b/data/themes/default/white_noise_wave_active.png differ diff --git a/plugins/peak_controller_effect/artwork.png b/plugins/peak_controller_effect/artwork.png index 1c5d5defb..31296ca90 100644 Binary files a/plugins/peak_controller_effect/artwork.png and b/plugins/peak_controller_effect/artwork.png differ diff --git a/plugins/triple_oscillator/artwork.png b/plugins/triple_oscillator/artwork.png index 7c61a87ec..b4940ae5e 100644 Binary files a/plugins/triple_oscillator/artwork.png and b/plugins/triple_oscillator/artwork.png differ diff --git a/plugins/zynaddsubfx/artwork.png b/plugins/zynaddsubfx/artwork.png index 7d158bdaa..2ef0b5705 100644 Binary files a/plugins/zynaddsubfx/artwork.png and b/plugins/zynaddsubfx/artwork.png differ diff --git a/src/gui/widgets/cpuload_widget.cpp b/src/gui/widgets/cpuload_widget.cpp index 508581a74..f634a6b1e 100644 --- a/src/gui/widgets/cpuload_widget.cpp +++ b/src/gui/widgets/cpuload_widget.cpp @@ -45,6 +45,7 @@ cpuloadWidget::cpuloadWidget( QWidget * _parent ) : setFixedSize( m_background.width(), m_background.height() ); m_temp = QPixmap( width(), height() ); + connect( &m_updateTimer, SIGNAL( timeout() ), this, SLOT( updateCpuLoad() ) ); @@ -66,7 +67,8 @@ void cpuloadWidget::paintEvent( QPaintEvent * ) if( m_changed == true ) { m_changed = false; - + + m_temp.fill( QColor(0,0,0,0) ); QPainter p( &m_temp ); p.drawPixmap( 0, 0, m_background ); diff --git a/src/gui/widgets/visualization_widget.cpp b/src/gui/widgets/visualization_widget.cpp index 7dee75d33..2f6eebe95 100644 --- a/src/gui/widgets/visualization_widget.cpp +++ b/src/gui/widgets/visualization_widget.cpp @@ -141,7 +141,7 @@ void visualizationWidget::paintEvent( QPaintEvent * ) // and set color according to that... if( max_level * master_output < 0.9 ) { - p.setPen( QColor( 128, 224, 128 ) ); + p.setPen( QColor( 71, 253, 133 ) ); } else if( max_level * master_output < 1.0 ) {