summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-09 15:46:08 (UTC)
committer simon <simon>2002-12-09 15:46:08 (UTC)
commitaa766a6a0818ed0b756f8cd67fc4a1c85906f224 (patch) (side-by-side diff)
treefe6af32c30e0355f839a8a574d1ec7d8a7561fd5
parent21738c78103c42605625f85abf7bfd0d6beaad3f (diff)
downloadopie-aa766a6a0818ed0b756f8cd67fc4a1c85906f224.zip
opie-aa766a6a0818ed0b756f8cd67fc4a1c85906f224.tar.gz
opie-aa766a6a0818ed0b756f8cd67fc4a1c85906f224.tar.bz2
- toggleButton and setToggleButton now operate on a Button object instead
of an index
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp6
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h4
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.cpp12
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h4
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp14
5 files changed, 17 insertions, 23 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 8c7e614..ef606ab 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -341,7 +341,7 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
if ( isOnButton && !buttons[i].isHeld ) {
buttons[i].isHeld = TRUE;
- toggleButton(i);
+ toggleButton( buttons[ i ] );
switch (i) {
case VolumeUp:
emit moreClicked();
@@ -358,13 +358,13 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
}
} else if ( !isOnButton && buttons[i].isHeld ) {
buttons[i].isHeld = FALSE;
- toggleButton(i);
+ toggleButton( buttons[ i ] );
}
} else {
if ( buttons[i].isHeld ) {
buttons[i].isHeld = FALSE;
if ( buttons[i].type != ToggleButton ) {
- setToggleButton( i, FALSE );
+ setToggleButton( buttons[ i ], FALSE );
}
qDebug("mouseEvent %d", i);
handleCommand( static_cast<Command>( i ), buttons[ i ].isDown );
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 9b276b5..092e5ce 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -59,13 +59,13 @@ public slots:
void updateSlider( long, long );
void sliderPressed( );
void sliderReleased( );
- void setLooping( bool b) { setToggleButton( Loop, b ); }
+ void setLooping( bool b) { setToggleButton( buttons[ Loop ], b ); }
void setPosition( long );
void setSeekable( bool );
public:
virtual void setLength( long );
- virtual void setPlaying( bool b) { setToggleButton( Play, b ); }
+ virtual void setPlaying( bool b) { setToggleButton( buttons[ Play ], b ); }
virtual void setDisplayType( MediaPlayerState::DisplayType displayType );
signals:
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 9c5291b..66129c9 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -114,20 +114,14 @@ void MediaWidget::paintButton( QPainter &p, const Button &button )
p.drawPixmap( upperLeftOfButtonMask, button.pixUp );
}
-void MediaWidget::setToggleButton( int buttonId, bool down )
+void MediaWidget::setToggleButton( Button &button, bool down )
{
- qDebug("setToggleButton %d", buttonId );
-
- Button &button = buttons[ buttonId ];
-
if ( down != button.isDown )
- toggleButton( buttonId );
+ toggleButton( button );
}
-void MediaWidget::toggleButton( int buttonId )
+void MediaWidget::toggleButton( Button &button )
{
- Button &button = buttons[ buttonId ];
-
button.isDown = !button.isDown;
paintButton( button );
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index b7860dc..05b7b71 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -91,8 +91,8 @@ protected:
void paintButton( const Button &button );
void paintButton( QPainter &p, const Button &button );
- void setToggleButton( int buttonId, bool down );
- void toggleButton( int buttonId );
+ void setToggleButton( Button &button, bool down );
+ void toggleButton( Button &button );
MediaPlayerState &mediaPlayerState;
PlayListWidget &playList;
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index db4a396..673c9e8 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -250,7 +250,7 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
if ( isOnButton && !buttons[i].isHeld ) {
buttons[i].isHeld = TRUE;
- toggleButton(i);
+ toggleButton( buttons[ i ] );
switch (i) {
case VideoVolUp:
@@ -262,25 +262,25 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
}
} else if ( !isOnButton && buttons[i].isHeld ) {
buttons[i].isHeld = FALSE;
- toggleButton(i);
+ toggleButton( buttons[ i ] );
}
} else {
if ( buttons[i].isHeld ) {
buttons[i].isHeld = FALSE;
if ( buttons[i].type != ToggleButton ) {
- setToggleButton( i, FALSE );
+ setToggleButton( buttons[ i ], FALSE );
}
switch(i) {
case VideoPlay: {
if( mediaPlayerState.isPaused() ) {
- setToggleButton( i, FALSE );
+ setToggleButton( buttons[ i ], FALSE );
mediaPlayerState.setPaused( FALSE );
return;
} else if( !mediaPlayerState.isPaused() ) {
- setToggleButton( i, TRUE );
+ setToggleButton( buttons[ i ], TRUE );
mediaPlayerState.setPaused( TRUE );
return;
} else {
@@ -423,11 +423,11 @@ XineVideoWidget* VideoWidget::vidWidget() {
void VideoWidget::setFullscreen ( bool b ) {
- setToggleButton( VideoFullscreen, b );
+ setToggleButton( buttons[ VideoFullscreen ], b );
}
void VideoWidget::setPlaying( bool b) {
- setToggleButton( VideoPlay, b );
+ setToggleButton( buttons[ VideoPlay ], b );
}