6 files changed, 68 insertions, 64 deletions

diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index d135647..2918097 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -17,19 +17,19 @@
 ** not clear to you.
 **
 **********************************************************************/
 #include "audiowidget.h"
 #include "mediaplayerstate.h"
 
 /* OPIE */
 #include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
 #include <qpe/config.h>
 #include <opie2/odebug.h>
+#include <opie2/oresource.h>
 
 /* QT */
 #include <qdir.h>
 
 /* STD */
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -87,19 +87,19 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
 //    QString skinPath = "opieplayer/skins/" + skin;
     QString skinPath;
     skinPath = "opieplayer2/skins/" + skin;
     if(!QDir(QString(getenv("OPIEDIR")) +"/pics/"+skinPath).exists())
        skinPath = "opieplayer2/skins/default";
 
     //    odebug << "skin path " + skinPath << oendl;
 
-    pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
-    imgUp = new QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
-    imgDn = new QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) );
+    pixBg = new QPixmap( Opie::Core::OResource::loadPixmap( QString("%1/background").arg(skinPath) ) );
+    imgUp = new QImage( Opie::Core::OResource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
+    imgDn = new QImage( Opie::Core::OResource::loadImage( QString("%1/skin_down").arg(skinPath) ) );
 
     imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 );
     imgButtonMask->fill( 0 );
 
     for ( int i = 0; i < 10; i++ ) {
         QString filename = QString(getenv("OPIEDIR")) + "/pics/" + skinPath + "/skin_mask_" + skin_mask_file_names[i] + ".png";
         masks[i] = new QBitmap( filename );
 
diff --git a/core/multimedia/opieplayer/inputDialog.cpp b/core/multimedia/opieplayer/inputDialog.cpp
index 44a1cdd..b76004e 100644
--- a/core/multimedia/opieplayer/inputDialog.cpp
+++ b/core/multimedia/opieplayer/inputDialog.cpp
@@ -1,30 +1,31 @@
 #include "inputDialog.h"
 
-#include <qpe/resource.h>
-
 #include <opie2/ofiledialog.h>
+#include <opie2/oresource.h>
+
+#include <qpe/applnk.h>
 
 #include <qlineedit.h>
 #include <qpushbutton.h>
 
 using namespace Opie::Ui;
 InputDialog::InputDialog( QWidget* parent,  const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl ) {
     if ( !name ) {
         setName( "InputDialog" );
     }
     resize( 234, 115);
     setMaximumSize( QSize( 240, 40));
     setCaption( tr( name ) );
 
     QPushButton *browserButton;
-    browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton");
-    browserButton->setGeometry( QRect( 205, 10, 22, 22));
+    browserButton = new QPushButton( Opie::Core::OResource::loadPixmap("fileopen", Opie::Core::OResource::SmallIcon),"",this,"BrowseButton");
+    browserButton->setGeometry( QRect( 205, 10, AppLnk::smallIconSize(), AppLnk::smallIconSize()));
     connect( browserButton, SIGNAL(released()),this,SLOT(browse()));
     LineEdit1 = new QLineEdit( this, "LineEdit1" );
     LineEdit1->setGeometry( QRect( 4, 10, 190, 22 ) );
     LineEdit1->setFocus();
 }
 /*
  * return the current text(input)
  */
diff --git a/core/multimedia/opieplayer/om3u.cpp b/core/multimedia/opieplayer/om3u.cpp
index 7149a8e..48aa47e 100644
--- a/core/multimedia/opieplayer/om3u.cpp
+++ b/core/multimedia/opieplayer/om3u.cpp
@@ -1,37 +1,36 @@
 /*
-                            This file is part of the Opie Project
+                             This file is part of the Opie Project
 
-                             Copyright (c)  2002 L. Potter <ljp@llornkcor.com>
+                             Copyright (C) 2002 L. Potter <ljp@llornkcor.com>
               =.
             .=l.
-           .>+-=
- _;:,     .>    :=|.         This program is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This program is distributed in the hope that
-     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      General Public License for more
-++=   -.     .`     .:       details.
- :     =  ...= . :.=-
- -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           General Public License along with
-    --        :-=`           this library; see the file COPYING.LIB.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
-
 */
 
 #include "om3u.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 
 
diff --git a/core/multimedia/opieplayer/om3u.h b/core/multimedia/opieplayer/om3u.h
index 9c7cf9a..b944d6f 100644
--- a/core/multimedia/opieplayer/om3u.h
+++ b/core/multimedia/opieplayer/om3u.h
@@ -1,50 +1,48 @@
 /*
-                            This file is part of the Opie Project
+                             This file is part of the Opie Project
 
-                             Copyright (c)  2002 L. Potter <ljp@llornkcor.com>
+                             Copyright (C) 2002 L. Potter <ljp@llornkcor.com>
               =.
             .=l.
-           .>+-=
- _;:,     .>    :=|.         This program is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This program is distributed in the hope that
-     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      General Public License for more
-++=   -.     .`     .:       details.
- :     =  ...= . :.=-
- -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           General Public License along with
-    --        :-=`           this library; see the file COPYING.LIB.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+:     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
-
 */
 
 #ifndef OM3U_H
 #define OM3U_H
 
 #include "playlistwidget.h"
 
 #include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/storage.h>
 #include <qpe/mimetype.h>
 #include <qpe/global.h>
-#include <qpe/resource.h>
 
 #include <qdir.h>
 #include <qregexp.h>
 #include <qstring.h>
 #include <qtextstream.h>
 #include <qstringlist.h>
 #include <qcstring.h>
 #include <qfile.h>
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index db2bf1b..c0a0029 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -23,19 +23,21 @@
 #include "playlistselection.h"
 #include "playlistwidget.h"
 #include "mediaplayerstate.h"
 #include "inputDialog.h"
 #include "audiowidget.h"
 #include "videowidget.h"
 
 /* OPIE */
+#include <qpe/qpeapplication.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/lnkproperties.h>
 #include <opie2/odebug.h>
+#include <opie2/oresource.h>
 
 /* QT */
 #include <qtoolbar.h>
 #include <qaction.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 //#include <qtimer.h>
 
@@ -83,18 +85,19 @@ public:
 };
 
 
 class ToolButton : public QToolButton {
 public:
     ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
             : QToolButton( parent, name ) {
         setTextLabel( name );
-        setPixmap( Resource::loadPixmap( icon ) );
+        setPixmap( Opie::Core::OResource::loadPixmap( icon, Opie::Core::OResource::SmallIcon ) );
         setAutoRaise( TRUE );
+        setUsesBigPixmap( qApp->desktop()->size().width() > 330 );
         setFocusPolicy( QWidget::NoFocus );
         setToggleButton( t );
         connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
         QPEMenuToolFocusManager::manager()->addWidget( this );
     }
 };
 
 
@@ -122,33 +125,33 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
 //     connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) );
     channel = new QCopChannel( "QPE/Application/opieplayer", this );
     connect( channel, SIGNAL(received(const QCString&,const QByteArray&)),
         this, SLOT( qcopReceive(const QCString&,const QByteArray&)) );
 
     setBackgroundMode( PaletteButton );
 
     setCaption( tr("OpiePlayer") );
-    setIcon( Resource::loadPixmap( "opieplayer/MPEGPlayer" ) );
+    setIcon( Opie::Core::OResource::loadPixmap( "opieplayer/MPEGPlayer", Opie::Core::OResource::SmallIcon ) );
 
     setToolBarsMovable( FALSE );
 
       // Create Toolbar
     QToolBar *toolbar = new QToolBar( this );
     toolbar->setHorizontalStretchable( TRUE );
 
       // Create Menubar
     QMenuBar *menu = new QMenuBar( toolbar );
     menu->setMargin( 0 );
 
     QToolBar *bar = new QToolBar( this );
     bar->setLabel( tr( "Play Operations" ) );
 //      d->tbPlayCurList =  new ToolButton( bar, tr( "play List" ), "opieplayer/play_current_list",
 //                                        this , SLOT( addSelected()) );
-    tbDeletePlaylist = new QPushButton( Resource::loadIconSet("trash"),"",bar,"close");
+    tbDeletePlaylist = new QPushButton( Opie::Core::OResource::loadPixmap("trash", Opie::Core::OResource::SmallIcon),"",bar,"close");
     tbDeletePlaylist->setFlat(TRUE);
 
     tbDeletePlaylist->setFixedSize(20,20);
 
     d->tbAddToList =  new ToolButton( bar, tr( "Add to Playlist" ), "opieplayer/add_to_playlist",
                                       this , SLOT(addSelected()) );
     d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "opieplayer/remove_from_playlist",
                                           this , SLOT(removeSelected()) );
@@ -172,19 +175,21 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     new MenuItem( pmPlayList, tr( "Open File or URL" ), this,SLOT( openFile() ) );
     pmPlayList->insertSeparator(-1);
     new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), this,SLOT( scanForAudio() ) );
     new MenuItem( pmPlayList, tr( "Rescan for Video Files" ), this,SLOT( scanForVideo() ) );
 
     QPopupMenu *pmView = new QPopupMenu( this );
     menu->insertItem( tr( "View" ), pmView );
 
-    fullScreenButton = new QAction(tr("Full Screen"), Resource::loadPixmap("fullscreen"), QString::null, 0, this, 0);
+    fullScreenButton = new QAction(tr("Full Screen"), Opie::Core::OResource::loadPixmap("fullscreen", Opie::Core::OResource::SmallIcon),
+                                   QString::null, 0, this, 0);
     fullScreenButton->addTo(pmView);
-    scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("opieplayer/scale"), QString::null, 0, this, 0);
+    scaleButton = new QAction(tr("Scale"), Opie::Core::OResource::loadPixmap("opieplayer/scale", Opie::Core::OResource::SmallIcon),
+                              QString::null, 0, this, 0);
     scaleButton->addTo(pmView);
 
 
     skinsMenu = new QPopupMenu( this );
     menu->insertItem( tr( "Skins" ), skinsMenu );
     skinsMenu->isCheckable();
     connect( skinsMenu, SIGNAL( activated(int) ) ,
              this, SLOT( skinsMenuActivated(int) ) );
@@ -996,17 +1001,17 @@ void PlayListWidget::populateAudioView() {
          long size;
          if( dit.current()->file().left(4) == "http" )
             size=0;
          else
             size = QFile( dit.current()->file() ).size();
          //            odebug << dit.current()->name() << oendl;
          newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(),
                                                 QString::number(size ), storage, dit.current()->file());
-         newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" ));
+         newItem->setPixmap(0, Opie::Core::OResource::loadPixmap( "opieplayer/musicfile", Opie::Core::OResource::SmallIcon ));
       }
    }
 
 }
 
 void PlayListWidget::populateVideoView() {
     videoView->clear();
     StorageInfo storageInfo;
@@ -1025,17 +1030,17 @@ void PlayListWidget::populateVideoView() {
             if( Vdit.current()->file().find(path) != -1 ) storage=name;
         }
 
         QListViewItem * newItem;
         if ( QFile( Vdit.current()->file()).exists() ) {
             newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(),
                    QString::number( QFile( Vdit.current()->file() ).size() ),
                                                    storage, Vdit.current()->file());
-            newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/videofile" ));
+            newItem->setPixmap(0, Opie::Core::OResource::loadPixmap( "opieplayer/videofile", Opie::Core::OResource::SmallIcon ));
         }
     }
 }
 
 void PlayListWidget::openFile() {
    QString filename, name;
    InputDialog *fileDlg;
    fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0);
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index c545511..89dd89e 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -17,23 +17,24 @@
  ** not clear to you.
  **
  **********************************************************************/
 
 #include "videowidget.h"
 #include "mediaplayerstate.h"
 
 /* OPIE */
-#include <qpe/resource.h>
 #include <qpe/mediaplayerplugininterface.h>
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 #include <opie2/odebug.h>
+#include <opie2/oresource.h>
 
 /* QT */
+#include <qbitmap.h>
 #include <qdir.h>
 #include <qslider.h>
 
 
 #ifdef Q_WS_QWS
 # define USE_DIRECT_PAINTER
 # include <qdirectpainter_qws.h>
 # include <qgfxraster_qws.h>
@@ -85,19 +86,19 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
                 QString skinPath;
                 skinPath = "opieplayer2/skins/" + skin;
     if(!QDir(QString(getenv("OPIEDIR")) +"/pics/"+skinPath).exists())
                                 skinPath = "opieplayer2/skins/default";
 
 
 //     QString skinPath = "opieplayer2/skins/" + skin;
 
-                pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
-                imgUp = new QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) );
-                imgDn = new QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) );
+                pixBg = new QPixmap( Opie::Core::OResource::loadPixmap( QString("%1/background").arg(skinPath) ) );
+                imgUp = new QImage( Opie::Core::OResource::loadImage( QString("%1/skinV_up").arg(skinPath) ) );
+                imgDn = new QImage( Opie::Core::OResource::loadImage( QString("%1/skinV_down").arg(skinPath) ) );
 
                 imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 );
                 imgButtonMask->fill( 0 );
 
                 for ( int i = 0; i < 7; i++ ) {
                                 QString filename = QString( QPEApplication::qpeDir() + "pics/" + skinPath +
                                                                                                                                                 "/skinV_mask_" + skinV_mask_file_names[i] + ".png" );
                                         //      odebug << "loading "+filename << oendl;