summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index f5906b3..6dcc842 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -170,115 +170,115 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
170 bool b= cfg.readBoolEntry("FullScreen", 0); 170 bool b= cfg.readBoolEntry("FullScreen", 0);
171 mediaPlayerState->setFullscreen( b ); 171 mediaPlayerState->setFullscreen( b );
172 pmView->setItemChecked( -16, b ); 172 pmView->setItemChecked( -16, b );
173 173
174 // pmView->insertItem( Resource::loadPixmap("opieplayer/scale") , tr( "Scale"), mediaPlayerState, SLOT(toggleScaled() ) ); 174 // pmView->insertItem( Resource::loadPixmap("opieplayer/scale") , tr( "Scale"), mediaPlayerState, SLOT(toggleScaled() ) );
175 175
176 pmView->insertSeparator(-1); 176 pmView->insertSeparator(-1);
177 177
178 skinsMenu = new QPopupMenu( this ); 178 skinsMenu = new QPopupMenu( this );
179 pmView->insertItem( tr( "Skins" ), skinsMenu ); 179 pmView->insertItem( tr( "Skins" ), skinsMenu );
180 skinsMenu->isCheckable(); 180 skinsMenu->isCheckable();
181 populateSkinsMenu(); 181 populateSkinsMenu();
182 182
183 QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton ); 183 QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton );
184 QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton ); 184 QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton );
185 185
186 QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton ); 186 QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton );
187 187
188 tabWidget = new QTabWidget( hbox6, "tabWidget" ); 188 tabWidget = new QTabWidget( hbox6, "tabWidget" );
189// tabWidget->setTabShape(QTabWidget::Triangular); 189// tabWidget->setTabShape(QTabWidget::Triangular);
190 190
191 QWidget *pTab; 191 QWidget *pTab;
192 pTab = new QWidget( tabWidget, "pTab" ); 192 pTab = new QWidget( tabWidget, "pTab" );
193 tabWidget->insertTab( pTab,"Playlist"); 193 tabWidget->insertTab( pTab,"Playlist");
194 194
195 195
196 // Add the playlist area 196 // Add the playlist area
197 197
198 QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton ); 198 QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton );
199 d->playListFrame = vbox3; 199 d->playListFrame = vbox3;
200 d->playListFrame ->setMinimumSize(235,250); 200 d->playListFrame ->setMinimumSize(235,250);
201 201
202 QHBox *hbox2 = new QHBox( vbox3 ); hbox2->setBackgroundMode( PaletteButton ); 202 QHBox *hbox2 = new QHBox( vbox3 ); hbox2->setBackgroundMode( PaletteButton );
203 203
204 d->selectedFiles = new PlayListSelection( hbox2); 204 d->selectedFiles = new PlayListSelection( hbox2);
205 QVBox *vbox1 = new QVBox( hbox2 ); vbox1->setBackgroundMode( PaletteButton ); 205 QVBox *vbox1 = new QVBox( hbox2 ); vbox1->setBackgroundMode( PaletteButton );
206 206
207 QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold); 207 QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold);
208 208
209 QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch 209 QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch
210 new ToolButton( vbox1, tr( "Move Up" ), "opieplayer2/up", d->selectedFiles, SLOT(moveSelectedUp()) ); 210 new ToolButton( vbox1, tr( "Move Up" ), "opieplayer2/up", d->selectedFiles, SLOT(moveSelectedUp()) );
211 new ToolButton( vbox1, tr( "Remove" ), "opieplayer2/cut", d->selectedFiles, SLOT(removeSelected()) ); 211 new ToolButton( vbox1, tr( "Remove" ), "opieplayer2/cut", d->selectedFiles, SLOT(removeSelected()) );
212 new ToolButton( vbox1, tr( "Move Down" ), "opieplayer2/down", d->selectedFiles, SLOT(moveSelectedDown()) ); 212 new ToolButton( vbox1, tr( "Move Down" ), "opieplayer2/down", d->selectedFiles, SLOT(moveSelectedDown()) );
213 QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch 213 QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch
214 214
215 QWidget *aTab; 215 QWidget *aTab;
216 aTab = new QWidget( tabWidget, "aTab" ); 216 aTab = new QWidget( tabWidget, "aTab" );
217 audioView = new QListView( aTab, "Audioview" ); 217 audioView = new QListView( aTab, "Audioview" );
218 audioView->setMinimumSize(233,260); 218 audioView->setMinimumSize(233,250);
219 audioView->addColumn( tr("Title"),140); 219 audioView->addColumn( tr("Title"),140);
220 audioView->addColumn(tr("Size"), -1); 220 audioView->addColumn(tr("Size"), -1);
221 audioView->addColumn(tr("Media"),-1); 221 audioView->addColumn(tr("Media"),-1);
222 audioView->setColumnAlignment(1, Qt::AlignRight); 222 audioView->setColumnAlignment(1, Qt::AlignRight);
223 audioView->setColumnAlignment(2, Qt::AlignRight); 223 audioView->setColumnAlignment(2, Qt::AlignRight);
224 audioView->setAllColumnsShowFocus(TRUE); 224 audioView->setAllColumnsShowFocus(TRUE);
225 225
226 audioView->setMultiSelection( TRUE ); 226 audioView->setMultiSelection( TRUE );
227 audioView->setSelectionMode( QListView::Extended); 227 audioView->setSelectionMode( QListView::Extended);
228 228
229 tabWidget->insertTab(aTab,tr("Audio")); 229 tabWidget->insertTab(aTab,tr("Audio"));
230 230
231 QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold); 231 QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold);
232 232
233 QWidget *vTab; 233 QWidget *vTab;
234 vTab = new QWidget( tabWidget, "vTab" ); 234 vTab = new QWidget( tabWidget, "vTab" );
235 videoView = new QListView( vTab, "Videoview" ); 235 videoView = new QListView( vTab, "Videoview" );
236 videoView->setMinimumSize(233,260); 236 videoView->setMinimumSize(233,250);
237 237
238 videoView->addColumn(tr("Title"),140); 238 videoView->addColumn(tr("Title"),140);
239 videoView->addColumn(tr("Size"),-1); 239 videoView->addColumn(tr("Size"),-1);
240 videoView->addColumn(tr("Media"),-1); 240 videoView->addColumn(tr("Media"),-1);
241 videoView->setColumnAlignment(1, Qt::AlignRight); 241 videoView->setColumnAlignment(1, Qt::AlignRight);
242 videoView->setColumnAlignment(2, Qt::AlignRight); 242 videoView->setColumnAlignment(2, Qt::AlignRight);
243 videoView->setAllColumnsShowFocus(TRUE); 243 videoView->setAllColumnsShowFocus(TRUE);
244 videoView->setMultiSelection( TRUE ); 244 videoView->setMultiSelection( TRUE );
245 videoView->setSelectionMode( QListView::Extended); 245 videoView->setSelectionMode( QListView::Extended);
246 246
247 QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold); 247 QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold);
248 248
249 tabWidget->insertTab( vTab,tr("Video")); 249 tabWidget->insertTab( vTab,tr("Video"));
250 250
251 //playlists list 251 //playlists list
252 QWidget *LTab; 252 QWidget *LTab;
253 LTab = new QWidget( tabWidget, "LTab" ); 253 LTab = new QWidget( tabWidget, "LTab" );
254 playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy 254 playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy
255 playLists->setMinimumSize(233,260); 255 playLists->setMinimumSize(233,260);
256 tabWidget->insertTab(LTab,tr("Lists")); 256 tabWidget->insertTab(LTab,tr("Lists"));
257 257
258 connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist())); 258 connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist()));
259 259
260 connect( pmView, SIGNAL( activated(int)), this, SLOT( pmViewActivated(int) ) ); 260 connect( pmView, SIGNAL( activated(int)), this, SLOT( pmViewActivated(int) ) );
261 261
262 connect( skinsMenu, SIGNAL( activated(int)), this, SLOT(skinsMenuActivated(int) ) ); 262 connect( skinsMenu, SIGNAL( activated(int)), this, SLOT(skinsMenuActivated(int) ) );
263 263
264// connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled() ) ); 264// connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled() ) );
265 265
266 connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), 266 connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
267 this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) ); 267 this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) );
268 connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), 268 connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
269 this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); 269 this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
270 connect( audioView, SIGNAL( returnPressed( QListViewItem *)), 270 connect( audioView, SIGNAL( returnPressed( QListViewItem *)),
271 this,SLOT( playIt( QListViewItem *)) ); 271 this,SLOT( playIt( QListViewItem *)) );
272 connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); 272 connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
273 connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), 273 connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
274 this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); 274 this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
275 connect( videoView, SIGNAL( returnPressed( QListViewItem *)), 275 connect( videoView, SIGNAL( returnPressed( QListViewItem *)),
276 this,SLOT( playIt( QListViewItem *)) ); 276 this,SLOT( playIt( QListViewItem *)) );
277 connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); 277 connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
278 connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) ); 278 connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) );
279 connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*))); 279 connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*)));
280 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); 280 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) );
281 connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) ); 281 connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) );
282 connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) ); 282 connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) );
283 connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) ); 283 connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) );
284 connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); 284 connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );