diff --git a/data/themes/default/loop_point.png b/data/themes/default/loop_point.png deleted file mode 100644 index be6499207..000000000 Binary files a/data/themes/default/loop_point.png and /dev/null differ diff --git a/data/themes/default/loop_point_b.png b/data/themes/default/loop_point_b.png new file mode 100644 index 000000000..bcd65ad08 Binary files /dev/null and b/data/themes/default/loop_point_b.png differ diff --git a/data/themes/default/loop_point_e.png b/data/themes/default/loop_point_e.png new file mode 100644 index 000000000..40fdad94a Binary files /dev/null and b/data/themes/default/loop_point_e.png differ diff --git a/include/timeline.h b/include/timeline.h index ff4661837..58322d747 100644 --- a/include/timeline.h +++ b/include/timeline.h @@ -149,7 +149,8 @@ protected: private: static QPixmap * s_timeLinePixmap; static QPixmap * s_posMarkerPixmap; - static QPixmap * s_loopPointPixmap; + static QPixmap * s_loopPointBeginPixmap; + static QPixmap * s_loopPointEndPixmap; static QPixmap * s_loopPointDisabledPixmap; AutoScrollStates m_autoScroll; diff --git a/src/core/timeline.cpp b/src/core/timeline.cpp index 6a417f57e..1aa932acf 100644 --- a/src/core/timeline.cpp +++ b/src/core/timeline.cpp @@ -47,8 +47,8 @@ QPixmap * timeLine::s_timeLinePixmap = NULL; QPixmap * timeLine::s_posMarkerPixmap = NULL; -QPixmap * timeLine::s_loopPointPixmap = NULL; - +QPixmap * timeLine::s_loopPointBeginPixmap = NULL; +QPixmap * timeLine::s_loopPointEndPixmap = NULL; timeLine::timeLine( const int _xoff, const int _yoff, const float _ppt, song::playPos & _pos, const MidiTime & _begin, @@ -81,10 +81,15 @@ timeLine::timeLine( const int _xoff, const int _yoff, const float _ppt, s_posMarkerPixmap = new QPixmap( embed::getIconPixmap( "playpos_marker" ) ); } - if( s_loopPointPixmap == NULL ) + if( s_loopPointBeginPixmap == NULL ) { - s_loopPointPixmap = new QPixmap( embed::getIconPixmap( - "loop_point" ) ); + s_loopPointBeginPixmap = new QPixmap( embed::getIconPixmap( + "loop_point_b" ) ); + } + if( s_loopPointEndPixmap == NULL ) + { + s_loopPointEndPixmap = new QPixmap( embed::getIconPixmap( + "loop_point_e" ) ); } setAttribute( Qt::WA_OpaquePaintEvent, true ); @@ -235,8 +240,8 @@ void timeLine::paintEvent( QPaintEvent * ) p.setPen( QColor( 0, 0, 0 ) ); p.setOpacity( loopPointsEnabled() ? 0.9 : 0.2 ); - p.drawPixmap( markerX( loopBegin() )+2, 2, *s_loopPointPixmap ); - p.drawPixmap( markerX( loopEnd() )+2, 2, *s_loopPointPixmap ); + p.drawPixmap( markerX( loopBegin() )+2, 2, *s_loopPointBeginPixmap ); + p.drawPixmap( markerX( loopEnd() )+2, 2, *s_loopPointEndPixmap ); p.setOpacity( 1.0 );