summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 86130d5..040ef71 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -51,16 +51,18 @@
51 51
52//only needed for the random play 52//only needed for the random play
53#include <stdlib.h> 53#include <stdlib.h>
54 54
55#include "audiowidget.h" 55#include "audiowidget.h"
56#include "videowidget.h" 56#include "videowidget.h"
57 57
58extern MediaPlayerState *mediaPlayerState; 58extern MediaPlayerState *mediaPlayerState;
59// extern AudioWidget *audioUI;
60// extern VideoWidget *videoUI;
59 61
60QString audioMimes ="audio/mpeg;audio/x-wav;audio/x-ogg"; 62QString audioMimes ="audio/mpeg;audio/x-wav;audio/x-ogg";
61// no m3u's here please 63// no m3u's here please
62 64
63PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) 65PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
64 : PlayListWidgetGui( parent, name, fl ) { 66 : PlayListWidgetGui( parent, name, fl ) {
65 67
66 d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), 68 d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ),
@@ -292,17 +294,17 @@ void PlayListWidget::addAllVideoToList() {
292 writeCurrentM3u(); 294 writeCurrentM3u();
293} 295}
294 296
295 297
296void PlayListWidget::setDocument( const QString& fileref ) { 298void PlayListWidget::setDocument( const QString& fileref ) {
297 qDebug( "<<<<<<<<set document>>>>>>>>>> "+fileref ); 299 qDebug( "<<<<<<<<set document>>>>>>>>>> "+fileref );
298 fromSetDocument = TRUE; 300 fromSetDocument = TRUE;
299 if ( fileref.isNull() ) { 301 if ( fileref.isNull() ) {
300 QMessageBox::critical( 0, tr( "Invalid File" ), 302 QMessageBox::warning( this, tr( "Invalid File" ),
301 tr( "There was a problem in getting the file." ) ); 303 tr( "There was a problem in getting the file." ) );
302 return; 304 return;
303 } 305 }
304 306
305 clearList(); 307 clearList();
306 if( fileref.find( "m3u", 0, TRUE) != -1 ) { //is m3u 308 if( fileref.find( "m3u", 0, TRUE) != -1 ) { //is m3u
307 readm3u( fileref ); 309 readm3u( fileref );
308 } else if( DocLnk( fileref).file().find( "m3u", 0, TRUE) != -1 ) { 310 } else if( DocLnk( fileref).file().find( "m3u", 0, TRUE) != -1 ) {
@@ -1058,17 +1060,19 @@ void PlayListWidget::skinsMenuActivated( int item ) {
1058 for( int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) { 1060 for( int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) {
1059 skinsMenu->setItemChecked( i, FALSE ); 1061 skinsMenu->setItemChecked( i, FALSE );
1060 } 1062 }
1061 skinsMenu->setItemChecked( item, TRUE ); 1063 skinsMenu->setItemChecked( item, TRUE );
1062 1064
1063 Config cfg( "OpiePlayer" ); 1065 Config cfg( "OpiePlayer" );
1064 cfg.setGroup("Options"); 1066 cfg.setGroup("Options");
1065 cfg.writeEntry("Skin", skinsMenu->text( item ) ); 1067 cfg.writeEntry("Skin", skinsMenu->text( item ) );
1066} 1068 QMessageBox::warning( this, tr( "OpiePlayer" ),
1069 tr( "You must <b>restart</b> Opieplayer<br>to see your changes." ) );
1070}
1067 1071
1068int PlayListWidget::whichList() { 1072int PlayListWidget::whichList() {
1069 return tabWidget->currentPageIndex(); 1073 return tabWidget->currentPageIndex();
1070} 1074}
1071 1075
1072QString PlayListWidget::currentFileListPathName() { 1076QString PlayListWidget::currentFileListPathName() {
1073 switch (whichList()) { 1077 switch (whichList()) {
1074 case 1: 1078 case 1: