summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer3/mwindow.cpp38
-rw-r--r--noncore/multimedia/opieplayer3/playlist.cpp2
2 files changed, 25 insertions, 15 deletions
diff --git a/noncore/multimedia/opieplayer3/mwindow.cpp b/noncore/multimedia/opieplayer3/mwindow.cpp
index 0898c7b..982d732 100644
--- a/noncore/multimedia/opieplayer3/mwindow.cpp
+++ b/noncore/multimedia/opieplayer3/mwindow.cpp
@@ -41,8 +41,8 @@
41#include <opie2/owidgetstack.h> 41#include <opie2/owidgetstack.h>
42#include <opie2/ofileselector.h> 42#include <opie2/ofileselector.h>
43#include <opie2/odebug.h> 43#include <opie2/odebug.h>
44#include <opie2/oresource.h>
44 45
45#include <qpe/resource.h>
46#include <qpe/qpeapplication.h> 46#include <qpe/qpeapplication.h>
47 47
48#include <qfileinfo.h> 48#include <qfileinfo.h>
@@ -329,13 +329,17 @@ void PMainWindow::slotRemoveFiles()
329 329
330void PMainWindow::setupActions() 330void PMainWindow::setupActions()
331{ 331{
332 a_appendFiles = new QAction(tr("Append file(s)"),Resource::loadIconSet( "opieplayer2/add_to_playlist" ), 0, 0, this, 0, false ); 332 a_appendFiles = new QAction(tr("Append file(s)"),Opie::Core::OResource::loadPixmap( "opieplayer2/add_to_playlist",
333 Opie::Core::OResource::SmallIcon ), 0, 0, this, 0, false );
333 connect(a_appendFiles,SIGNAL(activated()),this,SLOT(slotAppendFiles())); 334 connect(a_appendFiles,SIGNAL(activated()),this,SLOT(slotAppendFiles()));
334 a_addDir = new QAction(tr("Add directory"),Resource::loadIconSet("folder_open"),0,0,this,0,false); 335 a_addDir = new QAction(tr("Add directory"),Opie::Core::OResource::loadPixmap("folder_open",
336 Opie::Core::OResource::SmallIcon),0,0,this,0,false);
335 connect(a_addDir,SIGNAL(activated()),m_playList,SLOT(slotAppendDir())); 337 connect(a_addDir,SIGNAL(activated()),m_playList,SLOT(slotAppendDir()));
336 a_loadPlaylist = new QAction(tr("Append playlist"),Resource::loadIconSet("opieplayer2/add_to_playlist"),0,0,this,0,false); 338 a_loadPlaylist = new QAction(tr("Append playlist"),Opie::Core::OResource::loadPixmap("opieplayer2/add_to_playlist",
339 Opie::Core::OResource::SmallIcon),0,0,this,0,false);
337 connect(a_loadPlaylist,SIGNAL(activated()),m_playList,SLOT(slotOpenM3u())); 340 connect(a_loadPlaylist,SIGNAL(activated()),m_playList,SLOT(slotOpenM3u()));
338 a_savePlaylist = new QAction(tr("Save playlist"),Resource::loadIconSet("save"),0,0,this,0,false); 341 a_savePlaylist = new QAction(tr("Save playlist"),Opie::Core::OResource::loadPixmap("save",
342 Opie::Core::OResource::SmallIcon),0,0,this,0,false);
339 connect(a_savePlaylist,SIGNAL(activated()),m_playList,SLOT(slotSaveAsM3u())); 343 connect(a_savePlaylist,SIGNAL(activated()),m_playList,SLOT(slotSaveAsM3u()));
340 344
341 playlistOnly = new QActionGroup(this,"playlistgroup",false); 345 playlistOnly = new QActionGroup(this,"playlistgroup",false);
@@ -344,25 +348,32 @@ void PMainWindow::setupActions()
344 playlistOnly->insert(a_loadPlaylist); 348 playlistOnly->insert(a_loadPlaylist);
345 playlistOnly->insert(a_savePlaylist); 349 playlistOnly->insert(a_savePlaylist);
346 350
347 a_showPlaylist = new QAction(tr("Show playlist"),Resource::loadIconSet( "txt" ), 0, 0, this, 0, false ); 351 a_showPlaylist = new QAction(tr("Show playlist"),Opie::Core::OResource::loadPixmap( "txt",
352 Opie::Core::OResource::SmallIcon ), 0, 0, this, 0, false );
348 connect(a_showPlaylist,SIGNAL(activated()),this,SLOT(slotShowList())); 353 connect(a_showPlaylist,SIGNAL(activated()),this,SLOT(slotShowList()));
349 a_ShowMedia = new QAction(tr("Show media window"),Resource::loadIconSet("opieplayer2/musicfile"), 0, 0, this, 0, false ); 354 a_ShowMedia = new QAction(tr("Show media window"),Opie::Core::OResource::loadPixmap("opieplayer2/musicfile",
355 Opie::Core::OResource::SmallIcon), 0, 0, this, 0, false );
350 connect(a_ShowMedia,SIGNAL(activated()),this,SLOT(slotShowMediaWindow())); 356 connect(a_ShowMedia,SIGNAL(activated()),this,SLOT(slotShowMediaWindow()));
351 357
352 a_removeFiles = new QAction(tr("Remove file"),Resource::loadIconSet( "opieplayer2/remove_from_playlist" ), 0, 0, this, 0, false ); 358 a_removeFiles = new QAction(tr("Remove file"),Opie::Core::OResource::loadPixmap( "opieplayer2/remove_from_playlist",
359 Opie::Core::OResource::SmallIcon), 0, 0, this, 0, false );
353 connect(a_removeFiles,SIGNAL(activated()),this,SLOT(slotRemoveFiles())); 360 connect(a_removeFiles,SIGNAL(activated()),this,SLOT(slotRemoveFiles()));
354 361
355 playersGroup = new QActionGroup(this,"playgroup",false); 362 playersGroup = new QActionGroup(this,"playgroup",false);
356 363
357 a_playAction = new QAction(tr("Play list"),Resource::loadIconSet( "opieplayer2/play" ), 0, 0, this, 0, true); 364 a_playAction = new QAction(tr("Play list"),Opie::Core::OResource::loadPixmap( "opieplayer2/play",
365 Opie::Core::OResource::SmallIcon ), 0, 0, this, 0, true);
358 a_playAction->setOn(false); 366 a_playAction->setOn(false);
359 connect(a_playAction,SIGNAL(toggled(bool)),this,SLOT(slotTogglePlay(bool))); 367 connect(a_playAction,SIGNAL(toggled(bool)),this,SLOT(slotTogglePlay(bool)));
360 368
361 a_playNext = new QAction(tr("Play next in list"),Resource::loadIconSet( "fastforward" ), 0, 0, this, 0, false ); 369 a_playNext = new QAction(tr("Play next in list"),Opie::Core::OResource::loadPixmap( "fastforward",
370 Opie::Core::OResource::SmallIcon ), 0, 0, this, 0, false );
362 connect(a_playNext,SIGNAL(activated()),this,SLOT(slotPlayNext())); 371 connect(a_playNext,SIGNAL(activated()),this,SLOT(slotPlayNext()));
363 a_playPrevious = new QAction(tr("Play previous in list"),Resource::loadIconSet( "fastback" ), 0, 0, this, 0, false ); 372 a_playPrevious = new QAction(tr("Play previous in list"),Opie::Core::OResource::loadPixmap( "fastback",
373 Opie::Core::OResource::SmallIcon ), 0, 0, this, 0, false );
364 connect(a_playPrevious,SIGNAL(activated()),this,SLOT(slotPlayPrevious())); 374 connect(a_playPrevious,SIGNAL(activated()),this,SLOT(slotPlayPrevious()));
365 a_ShowFull = new QAction(tr("Show videos fullscreen"),Resource::loadIconSet( "fullscreen" ), 0, 0, this, 0, true ); 375 a_ShowFull = new QAction(tr("Show videos fullscreen"),Opie::Core::OResource::loadPixmap( "fullscreen",
376 Opie::Core::OResource::SmallIcon ), 0, 0, this, 0, true );
366 connect(a_ShowFull,SIGNAL(toggled(bool)),this,SLOT(slotToggleFull(bool))); 377 connect(a_ShowFull,SIGNAL(toggled(bool)),this,SLOT(slotToggleFull(bool)));
367 378
368 playersGroup->insert(a_playPrevious); 379 playersGroup->insert(a_playPrevious);
@@ -378,7 +389,8 @@ void PMainWindow::setupActions()
378 389
379 settingsGroup = new QActionGroup(this,"configgroup",false); 390 settingsGroup = new QActionGroup(this,"configgroup",false);
380 391
381 a_Scaleup = new QAction(tr("Scale videos larger"),Resource::loadIconSet( "fullscreen" ), 0, 0, this, 0, true ); 392 a_Scaleup = new QAction(tr("Scale videos larger"),Opie::Core::OResource::loadPixmap( "fullscreen",
393 Opie::Core::OResource::SmallIcon ), 0, 0, this, 0, true );
382 connect(a_Scaleup,SIGNAL(toggled(bool)),this,SLOT(slot_scaleupToggled(bool))); 394 connect(a_Scaleup,SIGNAL(toggled(bool)),this,SLOT(slot_scaleupToggled(bool)));
383 settingsGroup->insert(a_Scaleup); 395 settingsGroup->insert(a_Scaleup);
384} 396}
diff --git a/noncore/multimedia/opieplayer3/playlist.cpp b/noncore/multimedia/opieplayer3/playlist.cpp
index fe2dde3..eebb068 100644
--- a/noncore/multimedia/opieplayer3/playlist.cpp
+++ b/noncore/multimedia/opieplayer3/playlist.cpp
@@ -38,8 +38,6 @@
38#include <opie2/oresource.h> 38#include <opie2/oresource.h>
39#include <opie2/ofiledialog.h> 39#include <opie2/ofiledialog.h>
40 40
41#include <qpe/resource.h>
42
43#include <qfileinfo.h> 41#include <qfileinfo.h>
44#include <qmessagebox.h> 42#include <qmessagebox.h>
45#include <qdir.h> 43#include <qdir.h>