summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-08-15 22:33:41 (UTC)
committer harlekin <harlekin>2002-08-15 22:33:41 (UTC)
commit47e3b3c20e17b257fb2d3d56bace2a89a8f0d28b (patch) (unidiff)
treecebec6dd1a9e41bd73c9f3b61ab0065b366eb904
parent5601604b83df32c6bc412325581753fa0121eed5 (diff)
downloadopie-47e3b3c20e17b257fb2d3d56bace2a89a8f0d28b.zip
opie-47e3b3c20e17b257fb2d3d56bace2a89a8f0d28b.tar.gz
opie-47e3b3c20e17b257fb2d3d56bace2a89a8f0d28b.tar.bz2
fixed pics dir
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/opie-mediaplayer2.control2
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp26
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,4 +1,4 @@
1Files: bin/opieplayer2 pics/opieplayer2 apps/Applications/mediaplayer.desktop 1Files: bin/opieplayer2 pics/opieplayer2 apps/Applications/mediaplayer.desktop
2Priority: optional 2Priority: optional
3Section: opie/applications 3Section: opie/applications
4Maintainer: L.J.Potter <ljp@llornkcor.com> 4Maintainer: L.J.Potter <ljp@llornkcor.com>
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
@@ -113,7 +113,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
113 setBackgroundMode( PaletteButton ); 113 setBackgroundMode( PaletteButton );
114 114
115 setCaption( tr("OpiePlayer") ); 115 setCaption( tr("OpiePlayer") );
116 setIcon( Resource::loadPixmap( "opieplayer/MPEGPlayer" ) ); 116 setIcon( Resource::loadPixmap( "opieplayer2/MPEGPlayer" ) );
117 117
118 setToolBarsMovable( FALSE ); 118 setToolBarsMovable( FALSE );
119 119
@@ -132,15 +132,15 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
132 tbDeletePlaylist->setFlat(TRUE); 132 tbDeletePlaylist->setFlat(TRUE);
133 tbDeletePlaylist->setFixedSize(20,20); 133 tbDeletePlaylist->setFixedSize(20,20);
134 134
135 d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), "opieplayer/add_to_playlist", 135 d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), "opieplayer2/add_to_playlist",
136 this , SLOT(addSelected()) ); 136 this , SLOT(addSelected()) );
137 d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "opieplayer/remove_from_playlist", 137 d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "opieplayer2/remove_from_playlist",
138 this , SLOT(removeSelected()) ); 138 this , SLOT(removeSelected()) );
139 d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer/play", 139 d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer2/play",
140 this , SLOT( btnPlay(bool) ), TRUE ); 140 this , SLOT( btnPlay(bool) ), TRUE );
141 d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer/shuffle", 141 d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer2/shuffle",
142 mediaPlayerState, SLOT(setShuffled(bool)), TRUE ); 142 mediaPlayerState, SLOT(setShuffled(bool)), TRUE );
143 d->tbLoop = new ToolButton( bar, tr( "Loop" ),"opieplayer/loop", 143 d->tbLoop = new ToolButton( bar, tr( "Loop" ),"opieplayer2/loop",
144 mediaPlayerState, SLOT(setLooping(bool)), TRUE ); 144 mediaPlayerState, SLOT(setLooping(bool)), TRUE );
145 tbDeletePlaylist->hide(); 145 tbDeletePlaylist->hide();
146 146
@@ -207,9 +207,9 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
207 QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold); 207 QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold);
208 208
209 QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch 209 QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch
210 new ToolButton( vbox1, tr( "Move Up" ), "opieplayer/up", d->selectedFiles, SLOT(moveSelectedUp()) ); 210 new ToolButton( vbox1, tr( "Move Up" ), "opieplayer2/up", d->selectedFiles, SLOT(moveSelectedUp()) );
211 new ToolButton( vbox1, tr( "Remove" ), "opieplayer/cut", d->selectedFiles, SLOT(removeSelected()) ); 211 new ToolButton( vbox1, tr( "Remove" ), "opieplayer2/cut", d->selectedFiles, SLOT(removeSelected()) );
212 new ToolButton( vbox1, tr( "Move Down" ), "opieplayer/down", d->selectedFiles, SLOT(moveSelectedDown()) ); 212 new ToolButton( vbox1, tr( "Move Down" ), "opieplayer2/down", d->selectedFiles, SLOT(moveSelectedDown()) );
213 QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch 213 QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch
214 214
215 QWidget *aTab; 215 QWidget *aTab;
@@ -583,7 +583,7 @@ void PlayListWidget::saveList() {
583 DocLnk lnk; 583 DocLnk lnk;
584 lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property 584 lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property
585 lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D 585 lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D
586 lnk.setIcon("opieplayer/playlist2"); 586 lnk.setIcon("opieplayer2/playlist2");
587 lnk.setName( filename); //sets file name 587 lnk.setName( filename); //sets file name
588 // qDebug(filename); 588 // qDebug(filename);
589 if(!lnk.writeLink()) { 589 if(!lnk.writeLink()) {
@@ -923,7 +923,7 @@ void PlayListWidget::populateAudioView() {
923 // qDebug(dit.current()->name()); 923 // qDebug(dit.current()->name());
924 newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), 924 newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(),
925 QString::number( QFile( dit.current()->file()).size() ), storage); 925 QString::number( QFile( dit.current()->file()).size() ), storage);
926 newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" )); 926 newItem->setPixmap(0, Resource::loadPixmap( "opieplayer2/musicfile" ));
927 } 927 }
928 } 928 }
929 929
@@ -951,7 +951,7 @@ void PlayListWidget::populateVideoView() {
951 if ( QFile( Vdit.current()->file()).exists() ) { 951 if ( QFile( Vdit.current()->file()).exists() ) {
952 newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), 952 newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(),
953 QString::number( QFile( Vdit.current()->file()).size() ), storage); 953 QString::number( QFile( Vdit.current()->file()).size() ), storage);
954 newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/videofile" )); 954 newItem->setPixmap(0, Resource::loadPixmap( "opieplayer2/videofile" ));
955 } 955 }
956 } 956 }
957} 957}
@@ -976,7 +976,7 @@ void PlayListWidget::openFile() {
976 lnk.setFile(filename); //sets File property 976 lnk.setFile(filename); //sets File property
977 lnk.setType("audio/x-mpegurl"); 977 lnk.setType("audio/x-mpegurl");
978 lnk.setExec("opieplayer"); 978 lnk.setExec("opieplayer");
979 lnk.setIcon("opieplayer/MPEGPlayer"); 979 lnk.setIcon("opieplayer2/MPEGPlayer");
980 980
981 if(!lnk.writeLink()) { 981 if(!lnk.writeLink()) {
982 qDebug("Writing doclink did not work"); 982 qDebug("Writing doclink did not work");