diff --git a/data/themes/default/pause.png b/data/themes/default/pause.png index d133bdc5f..60afb0750 100644 Binary files a/data/themes/default/pause.png and b/data/themes/default/pause.png differ diff --git a/data/themes/default/play.png b/data/themes/default/play.png index 2820368e8..1a9ccd535 100644 Binary files a/data/themes/default/play.png and b/data/themes/default/play.png differ diff --git a/data/themes/default/record.png b/data/themes/default/record.png index 7f3eef114..2a662c418 100644 Binary files a/data/themes/default/record.png and b/data/themes/default/record.png differ diff --git a/data/themes/default/record_accompany.png b/data/themes/default/record_accompany.png index 1a58c2a12..33f6411be 100644 Binary files a/data/themes/default/record_accompany.png and b/data/themes/default/record_accompany.png differ diff --git a/data/themes/default/stop.png b/data/themes/default/stop.png index 4ecbdf6ed..bc6a0a395 100644 Binary files a/data/themes/default/stop.png and b/data/themes/default/stop.png differ diff --git a/data/themes/default/style.css b/data/themes/default/style.css index a5386834e..3a896e61b 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -163,7 +163,7 @@ QToolBar { background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #98a2a7, stop:1 #5b646f); } -QToolButton, ToolButton { +QToolButton, toolButton { padding: 1px 1px 1px 1px; border-radius: 2px; border: 1px solid rgba(0,0,0,32); @@ -172,20 +172,20 @@ QToolButton, ToolButton { color: black; } -QToolButton:hover, ToolButton:hover { +QToolButton:hover, toolButton:hover { background: qradialgradient(cx:0.3, cy:0.3, radius:0.8, fx:0.3, fy:0.3, stop:0 #e0e0e0, stop:0.5 #c9c9c9, stop:1 #969696 ); border: 1px solid rgba(0,0,0,128); color: white; } -QToolButton:pressed, ToolButton:pressed { +QToolButton:pressed, toolButton:pressed { background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #969696, stop:0.5 #c9c9c9, stop:1 #969696 ); padding: 2px 1px 0px 1px; border: 1px solid rgba(0,0,0,128); color: white; } -QToolButton:checked, ToolButton:checked { +QToolButton:checked, toolButton:checked { background: qradialgradient(cx:0.3, cy:0.3, radius:0.8, fx:0.3, fy:0.3, stop:0 #e0e0e0, stop:0.8 #c9c9c9, stop:1 #c0c0c0 ); border-radius: 3px; padding: 2px 1px 0px 1px; diff --git a/src/gui/song_editor.cpp b/src/gui/song_editor.cpp index 929bdd0c0..3576bc3aa 100644 --- a/src/gui/song_editor.cpp +++ b/src/gui/song_editor.cpp @@ -252,7 +252,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) : // fill own tool-bar - m_playButton = new toolButton( embed::getIconPixmap( "play", 24, 24 ), + m_playButton = new toolButton( embed::getIconPixmap( "play" ), tr( "Play song (Space)" ), this, SLOT( play() ), m_toolBar ); @@ -275,7 +275,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) : m_recordAccompanyButton->setDisabled( true ); } - m_stopButton = new toolButton( embed::getIconPixmap( "stop", 24, 24 ), + m_stopButton = new toolButton( embed::getIconPixmap( "stop" ), tr( "Stop song (Space)" ), this, SLOT( stop() ), m_toolBar ); diff --git a/src/gui/widgets/fader.cpp b/src/gui/widgets/fader.cpp index b2b1c8270..b9f301663 100644 --- a/src/gui/widgets/fader.cpp +++ b/src/gui/widgets/fader.cpp @@ -299,7 +299,7 @@ void fader::paintEvent( QPaintEvent * ev) if( m_persistentPeak_R > 0.05 ) { - painter.fillRect( QRect( 16, persistentPeak_R, 4, 1 ), (m_persistentPeak_R < 1.0 )? QColor( 0, 200, 0) : QColor( 200, 0, 0)); + painter.fillRect( QRect( 16, persistentPeak_R, 4, 1 ), (m_persistentPeak_R < 1.0 )? QColor( 74, 253, 133) : QColor( 255, 100, 100)); } // knob