summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp39
1 files changed, 33 insertions, 6 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 0cfd720..0c3ea74 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -180,11 +180,14 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
180 tabWidget->insertTab( pTab,"Playlist"); 180 tabWidget->insertTab( pTab,"Playlist");
181 181
182 182
183 QGridLayout *Playout = new QGridLayout( pTab );
184 Playout->setSpacing( 2);
185 Playout->setMargin( 2);
186
183 // Add the playlist area 187 // Add the playlist area
184 188
185 QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton ); 189 QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton );
186 d->playListFrame = vbox3; 190 d->playListFrame = vbox3;
187 d->playListFrame ->setMinimumSize(235,250);
188 191
189 QHBox *hbox2 = new QHBox( vbox3 ); hbox2->setBackgroundMode( PaletteButton ); 192 QHBox *hbox2 = new QHBox( vbox3 ); hbox2->setBackgroundMode( PaletteButton );
190 193
@@ -199,10 +202,17 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
199 new ToolButton( vbox1, tr( "Move Down" ), "opieplayer2/down", d->selectedFiles, SLOT(moveSelectedDown()) ); 202 new ToolButton( vbox1, tr( "Move Down" ), "opieplayer2/down", d->selectedFiles, SLOT(moveSelectedDown()) );
200 QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch 203 QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch
201 204
205
206 Playout->addMultiCellWidget( vbox3, 0, 0, 0, 1 );
207
202 QWidget *aTab; 208 QWidget *aTab;
203 aTab = new QWidget( tabWidget, "aTab" ); 209 aTab = new QWidget( tabWidget, "aTab" );
210
211 QGridLayout *Alayout = new QGridLayout( aTab );
212 Alayout->setSpacing( 2);
213 Alayout->setMargin( 2);
214
204 audioView = new QListView( aTab, "Audioview" ); 215 audioView = new QListView( aTab, "Audioview" );
205 audioView->setMinimumSize(233,250);
206 audioView->addColumn( tr("Title"),140); 216 audioView->addColumn( tr("Title"),140);
207 audioView->addColumn(tr("Size"), -1); 217 audioView->addColumn(tr("Size"), -1);
208 audioView->addColumn(tr("Media"),-1); 218 audioView->addColumn(tr("Media"),-1);
@@ -213,14 +223,20 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
213 audioView->setMultiSelection( TRUE ); 223 audioView->setMultiSelection( TRUE );
214 audioView->setSelectionMode( QListView::Extended); 224 audioView->setSelectionMode( QListView::Extended);
215 225
226 Alayout->addMultiCellWidget( audioView, 0, 0, 0, 1 );
227
216 tabWidget->insertTab(aTab,tr("Audio")); 228 tabWidget->insertTab(aTab,tr("Audio"));
217 229
218 QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold); 230 QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold);
219 231
220 QWidget *vTab; 232 QWidget *vTab;
221 vTab = new QWidget( tabWidget, "vTab" ); 233 vTab = new QWidget( tabWidget, "vTab" );
234
235 QGridLayout *Vlayout = new QGridLayout( vTab );
236 Vlayout->setSpacing( 2);
237 Vlayout->setMargin( 2);
238
222 videoView = new QListView( vTab, "Videoview" ); 239 videoView = new QListView( vTab, "Videoview" );
223 videoView->setMinimumSize(233,250);
224 240
225 videoView->addColumn(tr("Title"),140); 241 videoView->addColumn(tr("Title"),140);
226 videoView->addColumn(tr("Size"),-1); 242 videoView->addColumn(tr("Size"),-1);
@@ -231,6 +247,12 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
231 videoView->setMultiSelection( TRUE ); 247 videoView->setMultiSelection( TRUE );
232 videoView->setSelectionMode( QListView::Extended); 248 videoView->setSelectionMode( QListView::Extended);
233 249
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 );
255
234 QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold); 256 QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold);
235 257
236 tabWidget->insertTab( vTab,tr("Video")); 258 tabWidget->insertTab( vTab,tr("Video"));
@@ -238,8 +260,14 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
238 //playlists list 260 //playlists list
239 QWidget *LTab; 261 QWidget *LTab;
240 LTab = new QWidget( tabWidget, "LTab" ); 262 LTab = new QWidget( tabWidget, "LTab" );
263 QGridLayout *Llayout = new QGridLayout( LTab );
264 Llayout->setSpacing( 2);
265 Llayout->setMargin( 2);
266
241 playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy 267 playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy
242 playLists->setMinimumSize(233,260); 268 // playLists->setMinimumSize(233,260);
269 Llayout->addMultiCellWidget( playLists, 0, 0, 0, 1 );
270
243 tabWidget->insertTab(LTab,tr("Lists")); 271 tabWidget->insertTab(LTab,tr("Lists"));
244 272
245 connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist())); 273 connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist()));
@@ -676,8 +704,7 @@ void PlayListWidget::removeSelected() {
676} 704}
677 705
678void PlayListWidget::playIt( QListViewItem *it) { 706void PlayListWidget::playIt( QListViewItem *it) {
679 // if(it==NULL) return; 707 if(!it) return;
680 qDebug("playIt");
681 mediaPlayerState->setPlaying(FALSE); 708 mediaPlayerState->setPlaying(FALSE);
682 mediaPlayerState->setPlaying(TRUE); 709 mediaPlayerState->setPlaying(TRUE);
683 d->selectedFiles->unSelect(); 710 d->selectedFiles->unSelect();