summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp10
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h4
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp21
3 files changed, 18 insertions, 17 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index c148820..12f91a9 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -122,3 +122,3 @@ AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
122 122
123 buttons.push_back( button ); 123 buttons.insert( i, button );
124 } 124 }
@@ -210,3 +210,3 @@ void AudioWidget::resizeEvent( QResizeEvent * ) {
210 210
211 for ( uint i = 0; i < buttons.size(); i++ ) { 211 for ( uint i = 0; i < buttons.count(); i++ ) {
212 if ( !buttons[i].mask.isNull() ) { 212 if ( !buttons[i].mask.isNull() ) {
@@ -353,3 +353,3 @@ void AudioWidget::timerEvent( QTimerEvent * ) {
353void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { 353void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
354 for ( unsigned int i = 0; i < buttons.size(); i++ ) { 354 for ( unsigned int i = 0; i < buttons.count(); i++ ) {
355 if ( event->state() == QMouseEvent::LeftButton ) { 355 if ( event->state() == QMouseEvent::LeftButton ) {
@@ -416,3 +416,3 @@ void AudioWidget::paintEvent( QPaintEvent * pe ) {
416 p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() ); 416 p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() );
417 for ( unsigned int i = 0; i < buttons.size(); i++ ) 417 for ( unsigned int i = 0; i < buttons.count(); i++ )
418 paintButton( p, i ); 418 paintButton( p, i );
@@ -422,3 +422,3 @@ void AudioWidget::paintEvent( QPaintEvent * pe ) {
422 QPainter p( this ); 422 QPainter p( this );
423 for ( unsigned int i = 0; i < buttons.size(); i++ ) 423 for ( unsigned int i = 0; i < buttons.count(); i++ )
424 paintButton( p, i ); 424 paintButton( p, i );
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 504b705..49bf024 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -53,2 +53,4 @@ public:
53 typedef std::vector<Button> ButtonVector; 53 typedef std::vector<Button> ButtonVector;
54 // when the transition is done this should be Command -> Button
55 typedef QMap<int, Button> ButtonMap;
54 56
@@ -93,3 +95,3 @@ protected:
93 95
94 ButtonVector buttons; 96 ButtonMap buttons;
95 97
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 380c703..7d85d63 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -76,10 +76,9 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
76 76
77 buttons.reserve( 7 ); 77 buttons.insert( 0, toggleButton ); // play
78 buttons.push_back( toggleButton ); // play 78 buttons.insert( 1, toggleButton ); // stop
79 buttons.push_back( defaultButton ); // stop 79 buttons.insert( 2, toggleButton ); // next
80 buttons.push_back( defaultButton ); // next 80 buttons.insert( 3, toggleButton ); // previous
81 buttons.push_back( defaultButton ); // previous 81 buttons.insert( 4, toggleButton ); // volUp
82 buttons.push_back( defaultButton ); // volUp 82 buttons.insert( 5, toggleButton ); // volDown
83 buttons.push_back( defaultButton ); // volDown 83 buttons.insert( 6, toggleButton ); // fullscreen
84 buttons.push_back( toggleButton ); //fullscreen
85 84
@@ -273,3 +272,3 @@ void VideoWidget::paintButton( QPainter &p, int i ) {
273void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { 272void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
274 for ( unsigned int i = 0; i < buttons.size(); i++ ) { 273 for ( unsigned int i = 0; i < buttons.count(); i++ ) {
275 if ( event->state() == QMouseEvent::LeftButton ) { 274 if ( event->state() == QMouseEvent::LeftButton ) {
@@ -415,3 +414,3 @@ void VideoWidget::paintEvent( QPaintEvent * pe) {
415 p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() ); 414 p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() );
416 for ( unsigned int i = 0; i < buttons.size(); i++ ) { 415 for ( unsigned int i = 0; i < buttons.count(); i++ ) {
417 paintButton( p, i ); 416 paintButton( p, i );
@@ -422,3 +421,3 @@ void VideoWidget::paintEvent( QPaintEvent * pe) {
422 QPainter p( this ); 421 QPainter p( this );
423 for ( unsigned int i = 0; i < buttons.size(); i++ ) 422 for ( unsigned int i = 0; i < buttons.count(); i++ )
424 paintButton( p, i ); 423 paintButton( p, i );