summaryrefslogtreecommitdiff
Side-by-side diff
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
- buttons.push_back( button );
+ buttons.insert( i, button );
}
@@ -210,3 +210,3 @@ void AudioWidget::resizeEvent( QResizeEvent * ) {
- for ( uint i = 0; i < buttons.size(); i++ ) {
+ for ( uint i = 0; i < buttons.count(); i++ ) {
if ( !buttons[i].mask.isNull() ) {
@@ -353,3 +353,3 @@ void AudioWidget::timerEvent( QTimerEvent * ) {
void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
- for ( unsigned int i = 0; i < buttons.size(); i++ ) {
+ for ( unsigned int i = 0; i < buttons.count(); i++ ) {
if ( event->state() == QMouseEvent::LeftButton ) {
@@ -416,3 +416,3 @@ void AudioWidget::paintEvent( QPaintEvent * pe ) {
p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() );
- for ( unsigned int i = 0; i < buttons.size(); i++ )
+ for ( unsigned int i = 0; i < buttons.count(); i++ )
paintButton( p, i );
@@ -422,3 +422,3 @@ void AudioWidget::paintEvent( QPaintEvent * pe ) {
QPainter p( this );
- for ( unsigned int i = 0; i < buttons.size(); i++ )
+ for ( unsigned int i = 0; i < buttons.count(); i++ )
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:
typedef std::vector<Button> ButtonVector;
+ // when the transition is done this should be Command -> Button
+ typedef QMap<int, Button> ButtonMap;
@@ -93,3 +95,3 @@ protected:
- ButtonVector buttons;
+ ButtonMap buttons;
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
- buttons.reserve( 7 );
- buttons.push_back( toggleButton ); // play
- buttons.push_back( defaultButton ); // stop
- buttons.push_back( defaultButton ); // next
- buttons.push_back( defaultButton ); // previous
- buttons.push_back( defaultButton ); // volUp
- buttons.push_back( defaultButton ); // volDown
- buttons.push_back( toggleButton ); //fullscreen
+ buttons.insert( 0, toggleButton ); // play
+ buttons.insert( 1, toggleButton ); // stop
+ buttons.insert( 2, toggleButton ); // next
+ buttons.insert( 3, toggleButton ); // previous
+ buttons.insert( 4, toggleButton ); // volUp
+ buttons.insert( 5, toggleButton ); // volDown
+ buttons.insert( 6, toggleButton ); // fullscreen
@@ -273,3 +272,3 @@ void VideoWidget::paintButton( QPainter &p, int i ) {
void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
- for ( unsigned int i = 0; i < buttons.size(); i++ ) {
+ for ( unsigned int i = 0; i < buttons.count(); i++ ) {
if ( event->state() == QMouseEvent::LeftButton ) {
@@ -415,3 +414,3 @@ void VideoWidget::paintEvent( QPaintEvent * pe) {
p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() );
- for ( unsigned int i = 0; i < buttons.size(); i++ ) {
+ for ( unsigned int i = 0; i < buttons.count(); i++ ) {
paintButton( p, i );
@@ -422,3 +421,3 @@ void VideoWidget::paintEvent( QPaintEvent * pe) {
QPainter p( this );
- for ( unsigned int i = 0; i < buttons.size(); i++ )
+ for ( unsigned int i = 0; i < buttons.count(); i++ )
paintButton( p, i );