2 files changed, 14 insertions, 14 deletions

diff --git a/noncore/multimedia/opieplayer2/opie-mediaplayer2.control b/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
index 3869b14..6825fb9 100644
--- a/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
+++ b/noncore/multimedia/opieplayer2/opie-mediaplayer2.control
@@ -1,5 +1,5 @@
-Files: bin/opieplayer2  pics/opieplayer2 apps/Applications/mediaplayer.desktop
+Files: bin/opieplayer2 pics/opieplayer2 apps/Applications/mediaplayer.desktop
 Priority: optional
 Section: opie/applications
 Maintainer: L.J.Potter <ljp@llornkcor.com>
 Architecture: arm
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 83161ec..e33998f 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -112,9 +112,9 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
     setBackgroundMode( PaletteButton );
 
     setCaption( tr("OpiePlayer") );
-    setIcon( Resource::loadPixmap( "opieplayer/MPEGPlayer" ) );
+    setIcon( Resource::loadPixmap( "opieplayer2/MPEGPlayer" ) );
 
     setToolBarsMovable( FALSE );
 
     // Create Toolbar
@@ -131,17 +131,17 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     tbDeletePlaylist = new QPushButton( Resource::loadIconSet("trash"),"",bar,"close");
     tbDeletePlaylist->setFlat(TRUE);
     tbDeletePlaylist->setFixedSize(20,20);
 
-    d->tbAddToList =  new ToolButton( bar, tr( "Add to Playlist" ), "opieplayer/add_to_playlist",
+    d->tbAddToList =  new ToolButton( bar, tr( "Add to Playlist" ), "opieplayer2/add_to_playlist",
                                       this , SLOT(addSelected()) );
-    d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "opieplayer/remove_from_playlist",
+    d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "opieplayer2/remove_from_playlist",
                                           this , SLOT(removeSelected()) );
-    d->tbPlay    = new ToolButton( bar, tr( "Play" ), "opieplayer/play",
+    d->tbPlay    = new ToolButton( bar, tr( "Play" ), "opieplayer2/play",
                                    this , SLOT( btnPlay(bool) ), TRUE );
-    d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer/shuffle",
+    d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer2/shuffle",
                                    mediaPlayerState, SLOT(setShuffled(bool)), TRUE );
-    d->tbLoop    = new ToolButton( bar, tr( "Loop" ),"opieplayer/loop",
+    d->tbLoop    = new ToolButton( bar, tr( "Loop" ),"opieplayer2/loop",
                                    mediaPlayerState, SLOT(setLooping(bool)), TRUE );
     tbDeletePlaylist->hide();
 
     QPopupMenu *pmPlayList = new QPopupMenu( this );
@@ -206,11 +206,11 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 
     QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold);
 
     QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch
-    new ToolButton( vbox1, tr( "Move Up" ),   "opieplayer/up",   d->selectedFiles, SLOT(moveSelectedUp()) );
-    new ToolButton( vbox1, tr( "Remove" ),    "opieplayer/cut",  d->selectedFiles, SLOT(removeSelected()) );
-    new ToolButton( vbox1, tr( "Move Down" ), "opieplayer/down", d->selectedFiles, SLOT(moveSelectedDown()) );
+    new ToolButton( vbox1, tr( "Move Up" ),   "opieplayer2/up",   d->selectedFiles, SLOT(moveSelectedUp()) );
+    new ToolButton( vbox1, tr( "Remove" ),    "opieplayer2/cut",  d->selectedFiles, SLOT(removeSelected()) );
+    new ToolButton( vbox1, tr( "Move Down" ), "opieplayer2/down", d->selectedFiles, SLOT(moveSelectedDown()) );
     QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch
 
     QWidget *aTab;
     aTab = new QWidget( tabWidget, "aTab" );
@@ -582,9 +582,9 @@ void PlayListWidget::saveList() {
 
         DocLnk lnk;
         lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property
         lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D
-        lnk.setIcon("opieplayer/playlist2");
+        lnk.setIcon("opieplayer2/playlist2");
         lnk.setName( filename); //sets file name
         // qDebug(filename);
         if(!lnk.writeLink()) {
             qDebug("Writing doclink did not work");
@@ -922,9 +922,9 @@ void PlayListWidget::populateAudioView() {
         if ( QFile( dit.current()->file()).exists()  ) {
             // qDebug(dit.current()->name());
             newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(),
                                                    QString::number( QFile( dit.current()->file()).size() ), storage);
-            newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" ));
+            newItem->setPixmap(0, Resource::loadPixmap( "opieplayer2/musicfile" ));
         }
     }
 
 }
@@ -950,9 +950,9 @@ void PlayListWidget::populateVideoView() {
         QListViewItem * newItem;
         if ( QFile( Vdit.current()->file()).exists() ) {
             newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(),
                                                    QString::number( QFile( Vdit.current()->file()).size() ), storage);
-            newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/videofile" ));
+            newItem->setPixmap(0, Resource::loadPixmap( "opieplayer2/videofile" ));
         }
     }
 }
 
@@ -975,9 +975,9 @@ void PlayListWidget::openFile() {
             lnk.setName(filename); //sets file name
             lnk.setFile(filename); //sets File property
             lnk.setType("audio/x-mpegurl");
             lnk.setExec("opieplayer");
-            lnk.setIcon("opieplayer/MPEGPlayer");
+            lnk.setIcon("opieplayer2/MPEGPlayer");
 
             if(!lnk.writeLink()) {
                     qDebug("Writing doclink did not work");
             }