-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 0c3ea74..874800a 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -216,12 +216,13 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
216 | audioView->addColumn( tr("Title"),140); | 216 | audioView->addColumn( tr("Title"),140); |
217 | audioView->addColumn(tr("Size"), -1); | 217 | audioView->addColumn(tr("Size"), -1); |
218 | audioView->addColumn(tr("Media"),-1); | 218 | audioView->addColumn(tr("Media"),-1); |
219 | audioView->setColumnAlignment(1, Qt::AlignRight); | 219 | audioView->setColumnAlignment(1, Qt::AlignRight); |
220 | audioView->setColumnAlignment(2, Qt::AlignRight); | 220 | audioView->setColumnAlignment(2, Qt::AlignRight); |
221 | audioView->setAllColumnsShowFocus(TRUE); | 221 | audioView->setAllColumnsShowFocus(TRUE); |
222 | audioView->setSorting(0,TRUE); | ||
222 | 223 | ||
223 | audioView->setMultiSelection( TRUE ); | 224 | audioView->setMultiSelection( TRUE ); |
224 | audioView->setSelectionMode( QListView::Extended); | 225 | audioView->setSelectionMode( QListView::Extended); |
225 | 226 | ||
226 | Alayout->addMultiCellWidget( audioView, 0, 0, 0, 1 ); | 227 | Alayout->addMultiCellWidget( audioView, 0, 0, 0, 1 ); |
227 | 228 | ||
@@ -241,19 +242,17 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
241 | videoView->addColumn(tr("Title"),140); | 242 | videoView->addColumn(tr("Title"),140); |
242 | videoView->addColumn(tr("Size"),-1); | 243 | videoView->addColumn(tr("Size"),-1); |
243 | videoView->addColumn(tr("Media"),-1); | 244 | videoView->addColumn(tr("Media"),-1); |
244 | videoView->setColumnAlignment(1, Qt::AlignRight); | 245 | videoView->setColumnAlignment(1, Qt::AlignRight); |
245 | videoView->setColumnAlignment(2, Qt::AlignRight); | 246 | videoView->setColumnAlignment(2, Qt::AlignRight); |
246 | videoView->setAllColumnsShowFocus(TRUE); | 247 | videoView->setAllColumnsShowFocus(TRUE); |
248 | videoView->setSorting(0,TRUE); | ||
249 | |||
247 | videoView->setMultiSelection( TRUE ); | 250 | videoView->setMultiSelection( TRUE ); |
248 | videoView->setSelectionMode( QListView::Extended); | 251 | videoView->setSelectionMode( QListView::Extended); |
249 | 252 | ||
250 | // d->playListFrame->setMaximumSize(235,240); | ||
251 | // audioView->setMaximumSize(233,240); | ||
252 | // videoView->setMaximumSize(233,240); | ||
253 | |||
254 | Vlayout->addMultiCellWidget( videoView, 0, 0, 0, 1 ); | 253 | Vlayout->addMultiCellWidget( videoView, 0, 0, 0, 1 ); |
255 | 254 | ||
256 | QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold); | 255 | QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold); |
257 | 256 | ||
258 | tabWidget->insertTab( vTab,tr("Video")); | 257 | tabWidget->insertTab( vTab,tr("Video")); |
259 | 258 | ||
@@ -262,13 +261,12 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
262 | LTab = new QWidget( tabWidget, "LTab" ); | 261 | LTab = new QWidget( tabWidget, "LTab" ); |
263 | QGridLayout *Llayout = new QGridLayout( LTab ); | 262 | QGridLayout *Llayout = new QGridLayout( LTab ); |
264 | Llayout->setSpacing( 2); | 263 | Llayout->setSpacing( 2); |
265 | Llayout->setMargin( 2); | 264 | Llayout->setMargin( 2); |
266 | 265 | ||
267 | playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy | 266 | playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy |
268 | // playLists->setMinimumSize(233,260); | ||
269 | Llayout->addMultiCellWidget( playLists, 0, 0, 0, 1 ); | 267 | Llayout->addMultiCellWidget( playLists, 0, 0, 0, 1 ); |
270 | 268 | ||
271 | tabWidget->insertTab(LTab,tr("Lists")); | 269 | tabWidget->insertTab(LTab,tr("Lists")); |
272 | 270 | ||
273 | connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist())); | 271 | connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist())); |
274 | 272 | ||
@@ -906,12 +904,13 @@ void PlayListWidget::scanForAudio() { | |||
906 | for ( ; sdit.current(); ++sdit ) { | 904 | for ( ; sdit.current(); ++sdit ) { |
907 | delete sdit.current(); | 905 | delete sdit.current(); |
908 | } | 906 | } |
909 | Global::findDocuments(&files, "audio/*"); | 907 | Global::findDocuments(&files, "audio/*"); |
910 | audioScan = TRUE; | 908 | audioScan = TRUE; |
911 | } | 909 | } |
910 | |||
912 | void PlayListWidget::scanForVideo() { | 911 | void PlayListWidget::scanForVideo() { |
913 | qDebug("scan for video"); | 912 | qDebug("scan for video"); |
914 | vFiles.detachChildren(); | 913 | vFiles.detachChildren(); |
915 | QListIterator<DocLnk> sdit( vFiles.children() ); | 914 | QListIterator<DocLnk> sdit( vFiles.children() ); |
916 | for ( ; sdit.current(); ++sdit ) { | 915 | for ( ; sdit.current(); ++sdit ) { |
917 | delete sdit.current(); | 916 | delete sdit.current(); |
@@ -1108,24 +1107,24 @@ void PlayListWidget::readm3u(const QString &filename) { | |||
1108 | s=t.readLine(); | 1107 | s=t.readLine(); |
1109 | 1108 | ||
1110 | if(s.find("#",0,TRUE) == -1) { | 1109 | if(s.find("#",0,TRUE) == -1) { |
1111 | if(s.find(" ",0,TRUE) == -1) { // not sure if this is neede since cf uses vfat | 1110 | if(s.find(" ",0,TRUE) == -1) { // not sure if this is neede since cf uses vfat |
1112 | if(s.left(2) == "E:" || s.left(2) == "P:") { | 1111 | if(s.left(2) == "E:" || s.left(2) == "P:") { |
1113 | s=s.right(s.length()-2); | 1112 | s=s.right(s.length()-2); |
1114 | if(QFile(s).exists()) { | 1113 | // if(QFile(s).exists()) { |
1115 | DocLnk lnk( s ); | 1114 | DocLnk lnk( s ); |
1116 | QFileInfo f(s); | 1115 | QFileInfo f(s); |
1117 | QString name = f.baseName(); | 1116 | QString name = f.baseName(); |
1118 | name = name.right( name.length()-name.findRev( "\\",-1,TRUE ) -1 ); | 1117 | name = name.right( name.length()-name.findRev( "\\",-1,TRUE ) -1 ); |
1119 | lnk.setName( name ); | 1118 | lnk.setName( name ); |
1120 | s=s.replace( QRegExp("\\"),"/"); | 1119 | s=s.replace( QRegExp("\\"),"/"); |
1121 | lnk.setFile( s ); | 1120 | lnk.setFile( s ); |
1122 | lnk.writeLink(); | 1121 | lnk.writeLink(); |
1123 | qDebug("add "+name); | 1122 | qDebug("add "+name); |
1124 | d->selectedFiles->addToSelection( lnk); | 1123 | d->selectedFiles->addToSelection( lnk); |
1125 | } | 1124 | // } |
1126 | } else { // is url | 1125 | } else { // is url |
1127 | s.replace(QRegExp("%20")," "); | 1126 | s.replace(QRegExp("%20")," "); |
1128 | DocLnk lnk( s ); | 1127 | DocLnk lnk( s ); |
1129 | QString name; | 1128 | QString name; |
1130 | if(name.left(4)=="http") { | 1129 | if(name.left(4)=="http") { |
1131 | name = s.right( s.length() - 7); | 1130 | name = s.right( s.length() - 7); |