author | llornkcor <llornkcor> | 2002-11-14 04:07:28 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-11-14 04:07:28 (UTC) |
commit | 9daeebf24f8a7cb00216df90527d993c5ff7df0d (patch) (unidiff) | |
tree | e5e2c504a92ee6144e969eff11da95643b7eb001 | |
parent | 736339b62f325652b71615b8c3fbc0b064fcf837 (diff) | |
download | opie-9daeebf24f8a7cb00216df90527d993c5ff7df0d.zip opie-9daeebf24f8a7cb00216df90527d993c5ff7df0d.tar.gz opie-9daeebf24f8a7cb00216df90527d993c5ff7df0d.tar.bz2 |
cleanup compiler warnings
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 53cd00e..593f072 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -85,65 +85,65 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
85 | (void)new MenuItem( pmPlayList, tr( "Add all video files" ), | 85 | (void)new MenuItem( pmPlayList, tr( "Add all video files" ), |
86 | this, SLOT( addAllVideoToList() ) ); | 86 | this, SLOT( addAllVideoToList() ) ); |
87 | (void)new MenuItem( pmPlayList, tr( "Add all files" ), | 87 | (void)new MenuItem( pmPlayList, tr( "Add all files" ), |
88 | this, SLOT( addAllToList() ) ); | 88 | this, SLOT( addAllToList() ) ); |
89 | pmPlayList->insertSeparator(-1); | 89 | pmPlayList->insertSeparator(-1); |
90 | // (void)new MenuItem( pmPlayList, tr( "Save PlayList" ), | 90 | // (void)new MenuItem( pmPlayList, tr( "Save PlayList" ), |
91 | // this, SLOT( saveList() ) ); | 91 | // this, SLOT( saveList() ) ); |
92 | (void)new MenuItem( pmPlayList, tr( "Save Playlist" ), | 92 | (void)new MenuItem( pmPlayList, tr( "Save Playlist" ), |
93 | this, SLOT(writem3u() ) ); | 93 | this, SLOT(writem3u() ) ); |
94 | pmPlayList->insertSeparator(-1); | 94 | pmPlayList->insertSeparator(-1); |
95 | (void)new MenuItem( pmPlayList, tr( "Open File or URL" ), | 95 | (void)new MenuItem( pmPlayList, tr( "Open File or URL" ), |
96 | this,SLOT( openFile() ) ); | 96 | this,SLOT( openFile() ) ); |
97 | pmPlayList->insertSeparator(-1); | 97 | pmPlayList->insertSeparator(-1); |
98 | (void)new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), | 98 | (void)new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), |
99 | this,SLOT( scanForAudio() ) ); | 99 | this,SLOT( scanForAudio() ) ); |
100 | (void)new MenuItem( pmPlayList, tr( "Rescan for Video Files" ), | 100 | (void)new MenuItem( pmPlayList, tr( "Rescan for Video Files" ), |
101 | this,SLOT( scanForVideo() ) ); | 101 | this,SLOT( scanForVideo() ) ); |
102 | 102 | ||
103 | pmView->insertItem( Resource::loadPixmap("fullscreen") , tr( "Full Screen"), | 103 | pmView->insertItem( Resource::loadPixmap("fullscreen") , tr( "Full Screen"), |
104 | mediaPlayerState, SLOT( toggleFullscreen() ) ); | 104 | mediaPlayerState, SLOT( toggleFullscreen() ) ); |
105 | 105 | ||
106 | Config cfg( "OpiePlayer" ); | 106 | Config cfg( "OpiePlayer" ); |
107 | bool b= cfg.readBoolEntry("FullScreen", 0); | 107 | bool b= cfg.readBoolEntry("FullScreen", 0); |
108 | mediaPlayerState->setFullscreen( b ); | 108 | mediaPlayerState->setFullscreen( b ); |
109 | pmView->setItemChecked( -16, b ); | 109 | pmView->setItemChecked( -16, b ); |
110 | 110 | ||
111 | (void)new ToolButton( vbox1, tr( "Move Up" ), "opieplayer2/up", | 111 | (void)new ToolButton( vbox1, tr( "Move Up" ), "opieplayer2/up", |
112 | d->selectedFiles, SLOT(moveSelectedUp() ) ); | 112 | d->selectedFiles, SLOT(moveSelectedUp() ) ); |
113 | (void)new ToolButton( vbox1, tr( "Remove" ), "opieplayer2/cut", | 113 | (void)new ToolButton( vbox1, tr( "Remove" ), "opieplayer2/cut", |
114 | d->selectedFiles, SLOT(removeSelected() ) ); | 114 | d->selectedFiles, SLOT(removeSelected() ) ); |
115 | (void)new ToolButton( vbox1, tr( "Move Down" ), "opieplayer2/down", | 115 | (void)new ToolButton( vbox1, tr( "Move Down" ), "opieplayer2/down", |
116 | d->selectedFiles, SLOT(moveSelectedDown() ) ); | 116 | d->selectedFiles, SLOT(moveSelectedDown() ) ); |
117 | QVBox *stretch2 = new QVBox( vbox1 ); | 117 | // QVBox *stretch2 = new QVBox( vbox1 ); |
118 | 118 | ||
119 | connect( tbDeletePlaylist, ( SIGNAL( released() ) ), | 119 | connect( tbDeletePlaylist, ( SIGNAL( released() ) ), |
120 | SLOT( deletePlaylist() ) ); | 120 | SLOT( deletePlaylist() ) ); |
121 | connect( pmView, SIGNAL( activated( int ) ), | 121 | connect( pmView, SIGNAL( activated( int ) ), |
122 | this, SLOT( pmViewActivated( int ) ) ); | 122 | this, SLOT( pmViewActivated( int ) ) ); |
123 | connect( skinsMenu, SIGNAL( activated( int ) ) , | 123 | connect( skinsMenu, SIGNAL( activated( int ) ) , |
124 | this, SLOT( skinsMenuActivated( int ) ) ); | 124 | this, SLOT( skinsMenuActivated( int ) ) ); |
125 | connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int) ), | 125 | connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int) ), |
126 | this,SLOT( playlistViewPressed( int, QListViewItem *, const QPoint&, int ) ) ); | 126 | this,SLOT( playlistViewPressed( int, QListViewItem *, const QPoint&, int ) ) ); |
127 | connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int ) ), | 127 | connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int ) ), |
128 | this,SLOT( viewPressed( int, QListViewItem *, const QPoint&, int ) ) ); | 128 | this,SLOT( viewPressed( int, QListViewItem *, const QPoint&, int ) ) ); |
129 | connect( audioView, SIGNAL( returnPressed( QListViewItem *) ), | 129 | connect( audioView, SIGNAL( returnPressed( QListViewItem *) ), |
130 | this,SLOT( playIt( QListViewItem *) ) ); | 130 | this,SLOT( playIt( QListViewItem *) ) ); |
131 | connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), | 131 | connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), |
132 | this, SLOT( addToSelection( QListViewItem *) ) ); | 132 | this, SLOT( addToSelection( QListViewItem *) ) ); |
133 | connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int) ), | 133 | connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int) ), |
134 | this,SLOT( viewPressed( int, QListViewItem *, const QPoint&, int) ) ); | 134 | this,SLOT( viewPressed( int, QListViewItem *, const QPoint&, int) ) ); |
135 | connect( videoView, SIGNAL( returnPressed( QListViewItem *) ), | 135 | connect( videoView, SIGNAL( returnPressed( QListViewItem *) ), |
136 | this,SLOT( playIt( QListViewItem *) ) ); | 136 | this,SLOT( playIt( QListViewItem *) ) ); |
137 | connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), | 137 | connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), |
138 | this, SLOT( addToSelection( QListViewItem *) ) ); | 138 | this, SLOT( addToSelection( QListViewItem *) ) ); |
139 | connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), | 139 | connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), |
140 | this, SLOT( loadList( const DocLnk & ) ) ); | 140 | this, SLOT( loadList( const DocLnk & ) ) ); |
141 | connect( tabWidget, SIGNAL ( currentChanged(QWidget*) ), | 141 | connect( tabWidget, SIGNAL ( currentChanged(QWidget*) ), |
142 | this, SLOT( tabChanged( QWidget* ) ) ); | 142 | this, SLOT( tabChanged( QWidget* ) ) ); |
143 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), | 143 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), |
144 | d->tbPlay, SLOT( setOn( bool ) ) ); | 144 | d->tbPlay, SLOT( setOn( bool ) ) ); |
145 | connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), | 145 | connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), |
146 | d->tbLoop, SLOT( setOn( bool ) ) ); | 146 | d->tbLoop, SLOT( setOn( bool ) ) ); |
147 | connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), | 147 | connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), |
148 | d->tbShuffle, SLOT( setOn( bool ) ) ); | 148 | d->tbShuffle, SLOT( setOn( bool ) ) ); |
149 | connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), | 149 | connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), |
@@ -269,79 +269,79 @@ void PlayListWidget::addAllToList() { | |||
269 | populateAudioView(); | 269 | populateAudioView(); |
270 | } | 270 | } |
271 | 271 | ||
272 | QListViewItemIterator audioIt( audioView ); | 272 | QListViewItemIterator audioIt( audioView ); |
273 | DocLnk lnk; | 273 | DocLnk lnk; |
274 | QString filename; | 274 | QString filename; |
275 | // iterate through all items of the listview | 275 | // iterate through all items of the listview |
276 | for ( ; audioIt.current(); ++audioIt ) { | 276 | for ( ; audioIt.current(); ++audioIt ) { |
277 | filename = audioIt.current()->text(3); | 277 | filename = audioIt.current()->text(3); |
278 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 278 | lnk.setName( QFileInfo(filename).baseName() ); //sets name |
279 | lnk.setFile( filename ); //sets file name | 279 | lnk.setFile( filename ); //sets file name |
280 | d->selectedFiles->addToSelection( lnk); | 280 | d->selectedFiles->addToSelection( lnk); |
281 | } | 281 | } |
282 | 282 | ||
283 | if(!videoScan) { | 283 | if(!videoScan) { |
284 | if(videoView->childCount() < 1) | 284 | if(videoView->childCount() < 1) |
285 | populateVideoView(); | 285 | populateVideoView(); |
286 | } | 286 | } |
287 | 287 | ||
288 | QListViewItemIterator videoIt( videoView ); | 288 | QListViewItemIterator videoIt( videoView ); |
289 | for ( ; videoIt.current(); ++videoIt ) { | 289 | for ( ; videoIt.current(); ++videoIt ) { |
290 | filename = videoIt.current()->text(3); | 290 | filename = videoIt.current()->text(3); |
291 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 291 | lnk.setName( QFileInfo(filename).baseName() ); //sets name |
292 | lnk.setFile( filename ); //sets file name | 292 | lnk.setFile( filename ); //sets file name |
293 | d->selectedFiles->addToSelection( lnk); | 293 | d->selectedFiles->addToSelection( lnk); |
294 | } | 294 | } |
295 | 295 | ||
296 | // d->selectedFiles->addToSelection( ); | 296 | // d->selectedFiles->addToSelection( ); |
297 | // if ( it.current()->isSelected() ) | 297 | // if ( it.current()->isSelected() ) |
298 | // lst->append( audioIt.current() ); | 298 | // lst->append( audioIt.current() ); |
299 | // } | 299 | // } |
300 | 300 | ||
301 | /* | 301 | |
302 | if(!audioScan) | 302 | // if(!audioScan) |
303 | scanForAudio(); | 303 | // scanForAudio(); |
304 | if(!videoScan) | 304 | // if(!videoScan) |
305 | scanForVideo(); | 305 | // scanForVideo(); |
306 | 306 | ||
307 | DocLnkSet filesAll; | 307 | // DocLnkSet filesAll; |
308 | Global::findDocuments(&filesAll, "video/*;"+audioMimes); | 308 | // Global::findDocuments(&filesAll, "video/*;"+audioMimes); |
309 | QListIterator<DocLnk> Adit( filesAll.children() ); | 309 | // QListIterator<DocLnk> Adit( filesAll.children() ); |
310 | for ( ; Adit.current(); ++Adit ) { | 310 | // for ( ; Adit.current(); ++Adit ) { |
311 | if( QFileInfo( Adit.current()->file() ).exists() ) { | 311 | // if( QFileInfo( Adit.current()->file() ).exists() ) { |
312 | d->selectedFiles->addToSelection( **Adit ); | 312 | // d->selectedFiles->addToSelection( **Adit ); |
313 | } | 313 | // } |
314 | } | 314 | // } |
315 | */ | 315 | |
316 | // qDebug("elapsed time %d", t.elapsed() ); | 316 | // qDebug("elapsed time %d", t.elapsed() ); |
317 | 317 | ||
318 | tabWidget->setCurrentPage(0); | 318 | tabWidget->setCurrentPage(0); |
319 | 319 | ||
320 | writeCurrentM3u(); | 320 | writeCurrentM3u(); |
321 | d->selectedFiles->first(); | 321 | d->selectedFiles->first(); |
322 | } | 322 | } |
323 | 323 | ||
324 | 324 | ||
325 | void PlayListWidget::addAllMusicToList() { | 325 | void PlayListWidget::addAllMusicToList() { |
326 | 326 | ||
327 | if(!audioScan) { | 327 | if(!audioScan) { |
328 | if(audioView->childCount() < 1) | 328 | if(audioView->childCount() < 1) |
329 | populateAudioView(); | 329 | populateAudioView(); |
330 | } | 330 | } |
331 | 331 | ||
332 | QListViewItemIterator audioIt( audioView ); | 332 | QListViewItemIterator audioIt( audioView ); |
333 | DocLnk lnk; | 333 | DocLnk lnk; |
334 | QString filename; | 334 | QString filename; |
335 | // iterate through all items of the listview | 335 | // iterate through all items of the listview |
336 | for ( ; audioIt.current(); ++audioIt ) { | 336 | for ( ; audioIt.current(); ++audioIt ) { |
337 | filename = audioIt.current()->text(3); | 337 | filename = audioIt.current()->text(3); |
338 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 338 | lnk.setName( QFileInfo(filename).baseName() ); //sets name |
339 | lnk.setFile( filename ); //sets file name | 339 | lnk.setFile( filename ); //sets file name |
340 | d->selectedFiles->addToSelection( lnk); | 340 | d->selectedFiles->addToSelection( lnk); |
341 | } | 341 | } |
342 | 342 | ||
343 | /* if(!audioScan) | 343 | /* if(!audioScan) |
344 | scanForAudio(); | 344 | scanForAudio(); |
345 | QListIterator<DocLnk> dit( files.children() ); | 345 | QListIterator<DocLnk> dit( files.children() ); |
346 | for ( ; dit.current(); ++dit ) { | 346 | for ( ; dit.current(); ++dit ) { |
347 | if( QFileInfo(dit.current()->file() ).exists() ) { | 347 | if( QFileInfo(dit.current()->file() ).exists() ) { |
@@ -691,149 +691,149 @@ void PlayListWidget::playSelected() { | |||
691 | btnPlay( TRUE); | 691 | btnPlay( TRUE); |
692 | } | 692 | } |
693 | 693 | ||
694 | 694 | ||
695 | void PlayListWidget::scanForAudio() { | 695 | void PlayListWidget::scanForAudio() { |
696 | // qDebug("scan for audio"); | 696 | // qDebug("scan for audio"); |
697 | files.detachChildren(); | 697 | files.detachChildren(); |
698 | QListIterator<DocLnk> sdit( files.children() ); | 698 | QListIterator<DocLnk> sdit( files.children() ); |
699 | for ( ; sdit.current(); ++sdit ) { | 699 | for ( ; sdit.current(); ++sdit ) { |
700 | delete sdit.current(); | 700 | delete sdit.current(); |
701 | } | 701 | } |
702 | // Global::findDocuments( &files, "audio/*"); | 702 | // Global::findDocuments( &files, "audio/*"); |
703 | Global::findDocuments( &files, audioMimes); | 703 | Global::findDocuments( &files, audioMimes); |
704 | audioScan = true; | 704 | audioScan = true; |
705 | populateAudioView(); | 705 | populateAudioView(); |
706 | } | 706 | } |
707 | 707 | ||
708 | void PlayListWidget::scanForVideo() { | 708 | void PlayListWidget::scanForVideo() { |
709 | // qDebug("scan for video"); | 709 | // qDebug("scan for video"); |
710 | vFiles.detachChildren(); | 710 | vFiles.detachChildren(); |
711 | QListIterator<DocLnk> sdit( vFiles.children() ); | 711 | QListIterator<DocLnk> sdit( vFiles.children() ); |
712 | for ( ; sdit.current(); ++sdit ) { | 712 | for ( ; sdit.current(); ++sdit ) { |
713 | delete sdit.current(); | 713 | delete sdit.current(); |
714 | } | 714 | } |
715 | Global::findDocuments(&vFiles, "video/*"); | 715 | Global::findDocuments(&vFiles, "video/*"); |
716 | videoScan = true; | 716 | videoScan = true; |
717 | populateVideoView(); | 717 | populateVideoView(); |
718 | } | 718 | } |
719 | 719 | ||
720 | void PlayListWidget::populateAudioView() { | 720 | void PlayListWidget::populateAudioView() { |
721 | audioView->clear(); | 721 | audioView->clear(); |
722 | StorageInfo storageInfo; | 722 | StorageInfo storageInfo; |
723 | const QList<FileSystem> &fs = storageInfo.fileSystems(); | 723 | // const QList<FileSystem> &fs = storageInfo.fileSystems(); |
724 | if(!audioScan) { | 724 | if(!audioScan) { |
725 | scanForAudio(); | 725 | scanForAudio(); |
726 | } | 726 | } |
727 | 727 | ||
728 | QListIterator<DocLnk> dit( files.children() ); | 728 | QListIterator<DocLnk> dit( files.children() ); |
729 | // QListIterator<FileSystem> it ( fs ); | 729 | // QListIterator<FileSystem> it ( fs ); |
730 | audioView->clear(); | 730 | audioView->clear(); |
731 | 731 | ||
732 | QString storage; | 732 | QString storage; |
733 | for ( ; dit.current(); ++dit ) { | 733 | for ( ; dit.current(); ++dit ) { |
734 | // // for( ; it.current(); ++it ){ | 734 | // // for( ; it.current(); ++it ){ |
735 | // const QString name = (*dit)->name(); | 735 | // const QString name = (*dit)->name(); |
736 | // const QString path = (*dit)->path(); | 736 | // const QString path = (*dit)->path(); |
737 | // if(dit.current()->file().find(path) != -1 ) { | 737 | // if(dit.current()->file().find(path) != -1 ) { |
738 | // storage = name; | 738 | // storage = name; |
739 | // // } | 739 | // // } |
740 | // } | 740 | // } |
741 | 741 | ||
742 | QListViewItem * newItem; | 742 | QListViewItem * newItem; |
743 | if ( QFile( dit.current()->file()).exists() || | 743 | if ( QFile( dit.current()->file()).exists() || |
744 | dit.current()->file().left(4) == "http" ) { | 744 | dit.current()->file().left(4) == "http" ) { |
745 | long size; | 745 | long size; |
746 | if( dit.current()->file().left(4) == "http" ) | 746 | if( dit.current()->file().left(4) == "http" ) |
747 | size=0; | 747 | size=0; |
748 | else | 748 | else |
749 | size = QFile( dit.current()->file() ).size(); | 749 | size = QFile( dit.current()->file() ).size(); |
750 | 750 | ||
751 | newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), | 751 | newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), |
752 | QString::number(size ), "" /*storage*/, | 752 | QString::number(size ), "" /*storage*/, |
753 | dit.current()->file() ); | 753 | dit.current()->file() ); |
754 | newItem->setPixmap( 0, Resource::loadPixmap( "opieplayer2/musicfile" ) ); | 754 | newItem->setPixmap( 0, Resource::loadPixmap( "opieplayer2/musicfile" ) ); |
755 | // qDebug("<<<< "+dit.current()->file()); | 755 | // qDebug("<<<< "+dit.current()->file()); |
756 | } | 756 | } |
757 | } | 757 | } |
758 | audioPopulated=true; | 758 | audioPopulated=true; |
759 | } | 759 | } |
760 | 760 | ||
761 | 761 | ||
762 | void PlayListWidget::populateVideoView() { | 762 | void PlayListWidget::populateVideoView() { |
763 | videoView->clear(); | 763 | videoView->clear(); |
764 | StorageInfo storageInfo; | 764 | StorageInfo storageInfo; |
765 | const QList<FileSystem> &fs = storageInfo.fileSystems(); | 765 | // const QList<FileSystem> &fs = storageInfo.fileSystems(); |
766 | 766 | ||
767 | if(!videoScan ) { | 767 | if(!videoScan ) { |
768 | scanForVideo(); | 768 | scanForVideo(); |
769 | } | 769 | } |
770 | 770 | ||
771 | QListIterator<DocLnk> Vdit( vFiles.children() ); | 771 | QListIterator<DocLnk> Vdit( vFiles.children() ); |
772 | // QListIterator<FileSystem> it ( fs ); | 772 | // QListIterator<FileSystem> it ( fs ); |
773 | videoView->clear(); | 773 | videoView->clear(); |
774 | QString storage, pathName; | 774 | QString storage, pathName; |
775 | for ( ; Vdit.current(); ++Vdit ) { | 775 | for ( ; Vdit.current(); ++Vdit ) { |
776 | // // for( ; it.current(); ++it ) { | 776 | // // for( ; it.current(); ++it ) { |
777 | // const QString name = (*Vdit)->name(); | 777 | // const QString name = (*Vdit)->name(); |
778 | // const QString path = (*Vdit)->path(); | 778 | // const QString path = (*Vdit)->path(); |
779 | // if( Vdit.current()->file().find(path) != -1 ) { | 779 | // if( Vdit.current()->file().find(path) != -1 ) { |
780 | // storage=name; | 780 | // storage=name; |
781 | // pathName=path; | 781 | // pathName=path; |
782 | // // } | 782 | // // } |
783 | // } | 783 | // } |
784 | 784 | ||
785 | QListViewItem * newItem; | 785 | QListViewItem * newItem; |
786 | if ( QFile( Vdit.current()->file() ).exists() ) { | 786 | if ( QFile( Vdit.current()->file() ).exists() ) { |
787 | newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), | 787 | newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), |
788 | QString::number( QFile( Vdit.current()->file() ).size() ), | 788 | QString::number( QFile( Vdit.current()->file() ).size() ), |
789 | ""/*storage*/, Vdit.current()->file()); | 789 | ""/*storage*/, Vdit.current()->file()); |
790 | newItem->setPixmap(0, Resource::loadPixmap( "opieplayer2/videofile" ) ); | 790 | newItem->setPixmap(0, Resource::loadPixmap( "opieplayer2/videofile" ) ); |
791 | } | 791 | } |
792 | } | 792 | } |
793 | videoPopulated=true; | 793 | videoPopulated=true; |
794 | } | 794 | } |
795 | 795 | ||
796 | 796 | ||
797 | void PlayListWidget::openFile() { | 797 | void PlayListWidget::openFile() { |
798 | // http://66.28.164.33:2080 | 798 | // http://66.28.164.33:2080 |
799 | // http://somafm.com/star0242.m3u | 799 | // http://somafm.com/star0242.m3u |
800 | QString filename, name; | 800 | QString filename, name; |
801 | InputDialog *fileDlg; | 801 | InputDialog *fileDlg; |
802 | fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0); | 802 | fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0); |
803 | fileDlg->exec(); | 803 | fileDlg->exec(); |
804 | if( fileDlg->result() == 1 ) { | 804 | if( fileDlg->result() == 1 ) { |
805 | filename = fileDlg->text(); | 805 | filename = fileDlg->text(); |
806 | qDebug( "Selected filename is " + filename ); | 806 | qDebug( "Selected filename is " + filename ); |
807 | Om3u *m3uList; | 807 | // Om3u *m3uList; |
808 | DocLnk lnk; | 808 | DocLnk lnk; |
809 | Config cfg( "OpiePlayer" ); | 809 | Config cfg( "OpiePlayer" ); |
810 | cfg.setGroup("PlayList"); | 810 | cfg.setGroup("PlayList"); |
811 | 811 | ||
812 | if(filename.left(4) == "http") { | 812 | if(filename.left(4) == "http") { |
813 | QString m3uFile, m3uFilePath; | 813 | QString m3uFile, m3uFilePath; |
814 | if(filename.find(":",8,TRUE) != -1) { //found a port | 814 | if(filename.find(":",8,TRUE) != -1) { //found a port |
815 | m3uFile = filename.left( filename.find( ":",8,TRUE)); | 815 | m3uFile = filename.left( filename.find( ":",8,TRUE)); |
816 | m3uFile = m3uFile.right( 7); | 816 | m3uFile = m3uFile.right( 7); |
817 | } else if(filename.left(4) == "http"){ | 817 | } else if(filename.left(4) == "http"){ |
818 | m3uFile=filename; | 818 | m3uFile=filename; |
819 | m3uFile = m3uFile.right( m3uFile.length() - 7); | 819 | m3uFile = m3uFile.right( m3uFile.length() - 7); |
820 | } else{ | 820 | } else{ |
821 | m3uFile=filename; | 821 | m3uFile=filename; |
822 | } | 822 | } |
823 | 823 | ||
824 | // qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"+ m3uFile); | 824 | // qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"+ m3uFile); |
825 | lnk.setName( filename ); //sets name | 825 | lnk.setName( filename ); //sets name |
826 | lnk.setFile( filename ); //sets file name | 826 | lnk.setFile( filename ); //sets file name |
827 | 827 | ||
828 | // lnk.setIcon("opieplayer2/musicfile"); | 828 | // lnk.setIcon("opieplayer2/musicfile"); |
829 | 829 | ||
830 | d->selectedFiles->addToSelection( lnk ); | 830 | d->selectedFiles->addToSelection( lnk ); |
831 | writeCurrentM3u(); | 831 | writeCurrentM3u(); |
832 | d->selectedFiles->setSelectedItem( lnk.name()); | 832 | d->selectedFiles->setSelectedItem( lnk.name()); |
833 | } | 833 | } |
834 | else if( filename.right( 3) == "m3u" ) { | 834 | else if( filename.right( 3) == "m3u" ) { |
835 | readm3u( filename ); | 835 | readm3u( filename ); |
836 | 836 | ||
837 | } else if( filename.right(3) == "pls" ) { | 837 | } else if( filename.right(3) == "pls" ) { |
838 | readPls( filename ); | 838 | readPls( filename ); |
839 | } else { | 839 | } else { |
@@ -1100,59 +1100,59 @@ void PlayListWidget::pmViewActivated(int index) { | |||
1100 | 1100 | ||
1101 | void PlayListWidget::populateSkinsMenu() { | 1101 | void PlayListWidget::populateSkinsMenu() { |
1102 | int item = 0; | 1102 | int item = 0; |
1103 | defaultSkinIndex = 0; | 1103 | defaultSkinIndex = 0; |
1104 | QString skinName; | 1104 | QString skinName; |
1105 | Config cfg( "OpiePlayer" ); | 1105 | Config cfg( "OpiePlayer" ); |
1106 | cfg.setGroup("Options" ); | 1106 | cfg.setGroup("Options" ); |
1107 | QString skin = cfg.readEntry( "Skin", "default" ); | 1107 | QString skin = cfg.readEntry( "Skin", "default" ); |
1108 | 1108 | ||
1109 | QDir skinsDir( QPEApplication::qpeDir() + "/pics/opieplayer2/skins" ); | 1109 | QDir skinsDir( QPEApplication::qpeDir() + "/pics/opieplayer2/skins" ); |
1110 | skinsDir.setFilter( QDir::Dirs ); | 1110 | skinsDir.setFilter( QDir::Dirs ); |
1111 | skinsDir.setSorting(QDir::Name ); | 1111 | skinsDir.setSorting(QDir::Name ); |
1112 | const QFileInfoList *skinslist = skinsDir.entryInfoList(); | 1112 | const QFileInfoList *skinslist = skinsDir.entryInfoList(); |
1113 | QFileInfoListIterator it( *skinslist ); | 1113 | QFileInfoListIterator it( *skinslist ); |
1114 | QFileInfo *fi; | 1114 | QFileInfo *fi; |
1115 | while ( ( fi = it.current() ) ) { | 1115 | while ( ( fi = it.current() ) ) { |
1116 | skinName = fi->fileName(); | 1116 | skinName = fi->fileName(); |
1117 | // qDebug( fi->fileName() ); | 1117 | // qDebug( fi->fileName() ); |
1118 | if( skinName != "." && skinName != ".." && skinName !="CVS" ) { | 1118 | if( skinName != "." && skinName != ".." && skinName !="CVS" ) { |
1119 | item = skinsMenu->insertItem( fi->fileName() ) ; | 1119 | item = skinsMenu->insertItem( fi->fileName() ) ; |
1120 | } | 1120 | } |
1121 | if( skinName == "default" ) { | 1121 | if( skinName == "default" ) { |
1122 | defaultSkinIndex = item; | 1122 | defaultSkinIndex = item; |
1123 | } | 1123 | } |
1124 | if( skinName == skin ) { | 1124 | if( skinName == skin ) { |
1125 | skinsMenu->setItemChecked( item, TRUE ); | 1125 | skinsMenu->setItemChecked( item, TRUE ); |
1126 | } | 1126 | } |
1127 | ++it; | 1127 | ++it; |
1128 | } | 1128 | } |
1129 | } | 1129 | } |
1130 | 1130 | ||
1131 | void PlayListWidget::skinsMenuActivated( int item ) { | 1131 | void PlayListWidget::skinsMenuActivated( int item ) { |
1132 | for( int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) { | 1132 | for(unsigned int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i-- ) { |
1133 | skinsMenu->setItemChecked( i, FALSE ); | 1133 | skinsMenu->setItemChecked( i, FALSE ); |
1134 | } | 1134 | } |
1135 | skinsMenu->setItemChecked( item, TRUE ); | 1135 | skinsMenu->setItemChecked( item, TRUE ); |
1136 | 1136 | ||
1137 | Config cfg( "OpiePlayer" ); | 1137 | Config cfg( "OpiePlayer" ); |
1138 | cfg.setGroup("Options"); | 1138 | cfg.setGroup("Options"); |
1139 | cfg.writeEntry("Skin", skinsMenu->text( item ) ); | 1139 | cfg.writeEntry("Skin", skinsMenu->text( item ) ); |
1140 | QMessageBox::warning( this, tr( "OpiePlayer" ), | 1140 | QMessageBox::warning( this, tr( "OpiePlayer" ), |
1141 | tr( "You must <b>restart</b> Opieplayer<br>to see your changes." ) ); | 1141 | tr( "You must <b>restart</b> Opieplayer<br>to see your changes." ) ); |
1142 | } | 1142 | } |
1143 | 1143 | ||
1144 | int PlayListWidget::whichList() { | 1144 | int PlayListWidget::whichList() { |
1145 | return tabWidget->currentPageIndex(); | 1145 | return tabWidget->currentPageIndex(); |
1146 | } | 1146 | } |
1147 | 1147 | ||
1148 | QString PlayListWidget::currentFileListPathName() { | 1148 | QString PlayListWidget::currentFileListPathName() { |
1149 | switch (whichList()) { | 1149 | switch (whichList()) { |
1150 | case 1: | 1150 | case 1: |
1151 | return audioView->currentItem()->text(3); | 1151 | return audioView->currentItem()->text(3); |
1152 | break; | 1152 | break; |
1153 | case 2: | 1153 | case 2: |
1154 | return videoView->currentItem()->text(3); | 1154 | return videoView->currentItem()->text(3); |
1155 | break; | 1155 | break; |
1156 | }; | 1156 | }; |
1157 | return ""; | 1157 | return ""; |
1158 | } | 1158 | } |