| -rw-r--r-- | core/multimedia/opieplayer/audiowidget.cpp | 16 | ||||
| -rw-r--r-- | core/multimedia/opieplayer/videowidget.cpp | 36 |
2 files changed, 26 insertions, 26 deletions
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp index cda3f77..3212001 100644 --- a/core/multimedia/opieplayer/audiowidget.cpp +++ b/core/multimedia/opieplayer/audiowidget.cpp @@ -67,7 +67,7 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : setCaption( tr("OpiePlayer") ); - setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) ); - pixmaps[0] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButtonsAll" ) ); - pixmaps[1] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButtonsBig" ) ); - pixmaps[2] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaControls" ) ); - pixmaps[3] = new QPixmap( Resource::loadPixmap( "mpegplayer/animatedButton" ) ); + setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) ); + pixmaps[0] = new QPixmap( Resource::loadPixmap( "opieplayer/mediaButtonsAll" ) ); + pixmaps[1] = new QPixmap( Resource::loadPixmap( "opieplayer/mediaButtonsBig" ) ); + pixmaps[2] = new QPixmap( Resource::loadPixmap( "opieplayer/mediaControls" ) ); + pixmaps[3] = new QPixmap( Resource::loadPixmap( "opieplayer/animatedButton" ) ); @@ -82,3 +82,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : slider->setMaxValue( 1 ); - slider->setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) ); + slider->setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) ); slider->setFocusPolicy( QWidget::NoFocus ); @@ -155,3 +155,3 @@ void AudioWidget::updateSlider( long i, long max ) { // Will flicker too much if we don't do this - // Scale to something reasonable + // Scale to something reasonable int width = slider->width(); @@ -335,3 +335,3 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) break; - + }; diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp index 23b36e5..70b4a95 100644 --- a/core/multimedia/opieplayer/videowidget.cpp +++ b/core/multimedia/opieplayer/videowidget.cpp @@ -69,6 +69,6 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : setCaption( tr("OpiePlayer") ); - setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) ); - pixmaps[0] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButton0a" ) ); - pixmaps[1] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaButton0b" ) ); - pixmaps[2] = new QPixmap( Resource::loadPixmap( "mpegplayer/mediaControls0" ) ); + setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) ); + pixmaps[0] = new QPixmap( Resource::loadPixmap( "opieplayer/mediaButton0a" ) ); + pixmaps[1] = new QPixmap( Resource::loadPixmap( "opieplayer/mediaButton0b" ) ); + pixmaps[2] = new QPixmap( Resource::loadPixmap( "opieplayer/mediaControls0" ) ); currentFrame = new QImage( 220 + 2, 160, (QPixmap::defaultDepth() == 16) ? 16 : 32 ); @@ -78,3 +78,3 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : slider->setMaxValue( 1 ); - slider->setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) ); + slider->setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) ); slider->setFocusPolicy( QWidget::NoFocus ); @@ -203,3 +203,3 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { videoButtons[i].isHeld = FALSE; - if ( !videoButtons[i].isToggle ) + if ( !videoButtons[i].isToggle ) setToggleButton( i, FALSE ); @@ -216,3 +216,3 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { } - + } @@ -230,3 +230,3 @@ void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { makeVisible(); - + mouseMoveEvent( event ); @@ -243,3 +243,3 @@ void VideoWidget::makeVisible() { } else { - setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) ); + setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) ); showNormal(); @@ -255,3 +255,3 @@ void VideoWidget::paintEvent( QPaintEvent * ) { if ( mediaPlayerState->fullscreen() ) { - // Clear the background + // Clear the background p.setBrush( QBrush( Qt::black ) ); @@ -290,3 +290,3 @@ bool VideoWidget::playVideo() { - int stream = 0; + int stream = 0; @@ -312,3 +312,3 @@ bool VideoWidget::playVideo() { // maintain aspect ratio - if ( w * sh > sw * h ) + if ( w * sh > sw * h ) w = sw * h / sh; @@ -318,3 +318,3 @@ bool VideoWidget::playVideo() { w = sw; - h = sh; + h = sh; } @@ -323,3 +323,3 @@ bool VideoWidget::playVideo() { QPoint roff = qt_screen->mapToDevice( p.offset(), QSize( qt_screen->width(), qt_screen->height() ) ); - + int ox = roff.x() - height() + 2 + (height() - w) / 2; @@ -348,3 +348,3 @@ bool VideoWidget::playVideo() { // maintain aspect ratio - if ( w * sh > sw * h ) + if ( w * sh > sw * h ) w = sw * h / sh; @@ -354,3 +354,3 @@ bool VideoWidget::playVideo() { w = sw; - h = sh; + h = sh; } @@ -396,3 +396,3 @@ bool VideoWidget::playVideo() { // maintain aspect ratio - if ( w * sh > sw * h ) + if ( w * sh > sw * h ) w = sw * h / sh; @@ -469,3 +469,3 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) break; - + }; |