updated paths for icons

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
@@ -66,9 +66,9 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
 //    QPEApplication::grabKeyboard();
     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" ) );
 
     songInfo = new Ticker( this );
@@ -81,5 +81,5 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     slider->setMinValue( 0 );
     slider->setMaxValue( 1 );
-    slider->setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
+    slider->setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) );
     slider->setFocusPolicy( QWidget::NoFocus );
     slider->setGeometry( QRect( 7, 262, 220, 20 ) );
@@ -154,5 +154,5 @@ void AudioWidget::updateSlider( long i, long max ) {
   return;
     // Will flicker too much if we don't do this
-    // Scale to something reasonable 
+    // Scale to something reasonable
     int width = slider->width();
     int val = int((double)i * width / max);
@@ -334,5 +334,5 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e)
       case Key_Escape:
           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
@@ -68,8 +68,8 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
     QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
     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 );
 
@@ -77,5 +77,5 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
     slider->setMinValue( 0 );
     slider->setMaxValue( 1 );
-    slider->setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
+    slider->setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) );
     slider->setFocusPolicy( QWidget::NoFocus );
     slider->setGeometry( QRect( 7, 250, 220, 20 ) );
@@ -202,5 +202,5 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
             if ( videoButtons[i].isHeld ) {
                 videoButtons[i].isHeld = FALSE;
-                if ( !videoButtons[i].isToggle ) 
+                if ( !videoButtons[i].isToggle )
                     setToggleButton( i, FALSE );
             }
@@ -215,5 +215,5 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
           case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
         }
-        
+
     }
 }
@@ -229,5 +229,5 @@ void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
   mediaPlayerState->setFullscreen( FALSE );
   makeVisible();
- 
+
   mouseMoveEvent( event );
     }
@@ -242,5 +242,5 @@ void VideoWidget::makeVisible() {
   slider->hide();
     } else {
-  setBackgroundPixmap( Resource::loadPixmap( "mpegplayer/metalFinish" ) );
+  setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) );
   showNormal();
   showMaximized();
@@ -254,5 +254,5 @@ void VideoWidget::paintEvent( QPaintEvent * ) {
 
     if ( mediaPlayerState->fullscreen() ) {
-  // Clear the background 
+  // Clear the background
   p.setBrush( QBrush( Qt::black ) );
   p.drawRect( rect() );
@@ -289,5 +289,5 @@ bool VideoWidget::playVideo() {
     bool result = FALSE;
 
-    int stream = 0; 
+    int stream = 0;
 
     int sw = mediaPlayerState->curDecoder()->videoWidth( stream );
@@ -311,5 +311,5 @@ bool VideoWidget::playVideo() {
       if ( mediaPlayerState->scaled() ) {
     // maintain aspect ratio
-    if ( w * sh > sw * h ) 
+    if ( w * sh > sw * h )
         w = sw * h / sh;
     else
@@ -317,10 +317,10 @@ bool VideoWidget::playVideo() {
       } else  {
     w = sw;
-    h = sh;     
+    h = sh;
       }
 
       w--; // we can't allow libmpeg to overwrite.
       QPoint roff = qt_screen->mapToDevice( p.offset(), QSize( qt_screen->width(), qt_screen->height() ) );
-      
+
       int ox = roff.x() - height() + 2 + (height() - w) / 2;
       int oy = roff.y() + (width() - h) / 2;
@@ -347,5 +347,5 @@ bool VideoWidget::playVideo() {
       if ( mediaPlayerState->scaled() ) {
     // maintain aspect ratio
-    if ( w * sh > sw * h ) 
+    if ( w * sh > sw * h )
         w = sw * h / sh;
     else
@@ -353,5 +353,5 @@ bool VideoWidget::playVideo() {
       } else  {
     w = sw;
-    h = sh;     
+    h = sh;
       }
 
@@ -395,5 +395,5 @@ bool VideoWidget::playVideo() {
 
   // maintain aspect ratio
-  if ( w * sh > sw * h ) 
+  if ( w * sh > sw * h )
       w = sw * h / sh;
   else
@@ -468,5 +468,5 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e)
       case Key_Escape:
           break;
-        
+
     };
 }