Diffstat (limited to 'core/multimedia/opieplayer/playlistwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index 3c5734e..a0bf4db 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -205,25 +205,25 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
205 | menu->insertItem( tr( "Skins" ), skinsMenu ); | 205 | menu->insertItem( tr( "Skins" ), skinsMenu ); |
206 | skinsMenu->isCheckable(); | 206 | skinsMenu->isCheckable(); |
207 | connect( skinsMenu, SIGNAL( activated( int ) ) , | 207 | connect( skinsMenu, SIGNAL( activated( int ) ) , |
208 | this, SLOT( skinsMenuActivated( int ) ) ); | 208 | this, SLOT( skinsMenuActivated( int ) ) ); |
209 | populateSkinsMenu(); | 209 | populateSkinsMenu(); |
210 | 210 | ||
211 | QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton ); | 211 | QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton ); |
212 | QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton ); | 212 | QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton ); |
213 | 213 | ||
214 | QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton ); | 214 | QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton ); |
215 | 215 | ||
216 | tabWidget = new QTabWidget( hbox6, "tabWidget" ); | 216 | tabWidget = new QTabWidget( hbox6, "tabWidget" ); |
217 | tabWidget->setTabShape(QTabWidget::Triangular); | 217 | // tabWidget->setTabShape(QTabWidget::Triangular); |
218 | 218 | ||
219 | QWidget *pTab; | 219 | QWidget *pTab; |
220 | pTab = new QWidget( tabWidget, "pTab" ); | 220 | pTab = new QWidget( tabWidget, "pTab" ); |
221 | // playlistView = new QListView( pTab, "playlistview" ); | 221 | // playlistView = new QListView( pTab, "playlistview" ); |
222 | // playlistView->setMinimumSize(236,260); | 222 | // playlistView->setMinimumSize(236,260); |
223 | tabWidget->insertTab( pTab,"Playlist"); | 223 | tabWidget->insertTab( pTab,"Playlist"); |
224 | 224 | ||
225 | 225 | ||
226 | // Add the playlist area | 226 | // Add the playlist area |
227 | 227 | ||
228 | QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton ); | 228 | QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton ); |
229 | d->playListFrame = vbox3; | 229 | d->playListFrame = vbox3; |
@@ -316,25 +316,28 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
316 | this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); | 316 | this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); |
317 | connect( videoView, SIGNAL( returnPressed( QListViewItem *)), | 317 | connect( videoView, SIGNAL( returnPressed( QListViewItem *)), |
318 | this,SLOT( playIt( QListViewItem *)) ); | 318 | this,SLOT( playIt( QListViewItem *)) ); |
319 | connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); | 319 | connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); |
320 | 320 | ||
321 | 321 | ||
322 | //playlists | 322 | //playlists |
323 | connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) ); | 323 | connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) ); |
324 | 324 | ||
325 | 325 | ||
326 | connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*))); | 326 | connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*))); |
327 | 327 | ||
328 | // connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); | 328 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); |
329 | |||
330 | |||
331 | |||
329 | connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) ); | 332 | connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) ); |
330 | connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) ); | 333 | connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) ); |
331 | connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) ); | 334 | connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) ); |
332 | 335 | ||
333 | connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); | 336 | connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); |
334 | 337 | ||
335 | setCentralWidget( vbox5 ); | 338 | setCentralWidget( vbox5 ); |
336 | 339 | ||
337 | Config cfg( "OpiePlayer" ); | 340 | Config cfg( "OpiePlayer" ); |
338 | readConfig( cfg ); | 341 | readConfig( cfg ); |
339 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist","default"); | 342 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist","default"); |
340 | loadList(DocLnk( currentPlaylist)); | 343 | loadList(DocLnk( currentPlaylist)); |
@@ -715,25 +718,25 @@ void PlayListWidget::addSelected() { | |||
715 | if ( it.current()->isSelected() ) { | 718 | if ( it.current()->isSelected() ) { |
716 | 719 | ||
717 | filename = it.current()->text(3); | 720 | filename = it.current()->text(3); |
718 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 721 | lnk.setName( QFileInfo(filename).baseName() ); //sets name |
719 | lnk.setFile( filename ); //sets file name | 722 | lnk.setFile( filename ); //sets file name |
720 | d->selectedFiles->addToSelection( lnk); | 723 | d->selectedFiles->addToSelection( lnk); |
721 | } | 724 | } |
722 | } | 725 | } |
723 | videoView->clearSelection(); | 726 | videoView->clearSelection(); |
724 | } | 727 | } |
725 | break; | 728 | break; |
726 | }; | 729 | }; |
727 | tabWidget->setCurrentPage(0); | 730 | // tabWidget->setCurrentPage(0); |
728 | writeCurrentM3u(); | 731 | writeCurrentM3u(); |
729 | 732 | ||
730 | } | 733 | } |
731 | 734 | ||
732 | void PlayListWidget::removeSelected() { | 735 | void PlayListWidget::removeSelected() { |
733 | d->selectedFiles->removeSelected( ); | 736 | d->selectedFiles->removeSelected( ); |
734 | } | 737 | } |
735 | 738 | ||
736 | void PlayListWidget::playIt( QListViewItem *) { | 739 | void PlayListWidget::playIt( QListViewItem *) { |
737 | // d->setDocumentUsed = FALSE; | 740 | // d->setDocumentUsed = FALSE; |
738 | // mediaPlayerState->curPosition =0; | 741 | // mediaPlayerState->curPosition =0; |
739 | qDebug("playIt"); | 742 | qDebug("playIt"); |
@@ -752,25 +755,25 @@ void PlayListWidget::addToSelection( QListViewItem *it) { | |||
752 | break; | 755 | break; |
753 | }; | 756 | }; |
754 | // case 1: { | 757 | // case 1: { |
755 | DocLnk lnk; | 758 | DocLnk lnk; |
756 | QString filename; | 759 | QString filename; |
757 | 760 | ||
758 | filename=it->text(3); | 761 | filename=it->text(3); |
759 | lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name | 762 | lnk.setName( fullBaseName ( QFileInfo(filename)) ); //sets name |
760 | lnk.setFile( filename ); //sets file name | 763 | lnk.setFile( filename ); //sets file name |
761 | d->selectedFiles->addToSelection( lnk); | 764 | d->selectedFiles->addToSelection( lnk); |
762 | 765 | ||
763 | writeCurrentM3u(); | 766 | writeCurrentM3u(); |
764 | tabWidget->setCurrentPage(0); | 767 | // tabWidget->setCurrentPage(0); |
765 | 768 | ||
766 | } | 769 | } |
767 | } | 770 | } |
768 | 771 | ||
769 | void PlayListWidget::tabChanged(QWidget *) { | 772 | void PlayListWidget::tabChanged(QWidget *) { |
770 | 773 | ||
771 | switch ( tabWidget->currentPageIndex()) { | 774 | switch ( tabWidget->currentPageIndex()) { |
772 | case 0: | 775 | case 0: |
773 | { | 776 | { |
774 | if( !tbDeletePlaylist->isHidden()) | 777 | if( !tbDeletePlaylist->isHidden()) |
775 | tbDeletePlaylist->hide(); | 778 | tbDeletePlaylist->hide(); |
776 | d->tbRemoveFromList->setEnabled(TRUE); | 779 | d->tbRemoveFromList->setEnabled(TRUE); |