3 files changed, 185 insertions, 6 deletions

diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro
index 8f76c48..84f3343 100644
--- a/libopie2/opiecore/opiecore.pro
+++ b/libopie2/opiecore/opiecore.pro
@@ -1,53 +1,55 @@
 TEMPLATE    = lib
 CONFIG      += qt warn_on
 DESTDIR     = $(OPIEDIR)/lib
 HEADERS     = oapplication.h            \
               oconfig.h                 \
               odebug.h                  \
               oglobal.h                 \
               oglobalsettings.h         \
               oinputsystem.h            \
               okeyconfigmanager.h       \
               okeyfilter.h              \
-              opluginloader.h           \
+              opluginloader.h           \
               oprocess.h                \
               oprocctrl.h               \
-              osharedpointer.h          \
+              oresource.h               \
+              osharedpointer.h          \
               osmartpointer.h           \
               ostorageinfo.h            \
               xmltree.h
 
 SOURCES     = oapplication.cpp          \
               oconfig.cpp               \
               odebug.cpp                \
               oglobal.cpp               \
               oglobalsettings.cpp       \
               oinputsystem.cpp          \
               okeyconfigmanager.cpp     \
               okeyfilter.cpp            \
-              opluginloader.cpp         \
+              opluginloader.cpp         \
               oprocess.cpp              \
-                      oprocctrl.cpp             \    
-              osmartpointer.cpp         \
+              oprocctrl.cpp             \
+              oresource.cpp             \
+              osmartpointer.cpp         \
               ostorageinfo.cpp          \
               xmltree.cpp
 
 
 # The following files are currently not compileable on mac !
 # Therfore I removed them from the build .. (eilers)
 
 CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
 !contains( CONFTEST, y ) {
-HEADERS     += ofilenotify.h 
+HEADERS     += ofilenotify.h
 SOURCES     += ofilenotify.cpp
 } else {
     message( "ofilenotify is not available in a mac build !" )
 }
 
 include( device/device.pro )
 
 INTERFACES  =
 TARGET      = opiecore2
 VERSION     = 1.9.3
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
diff --git a/libopie2/opiecore/oresource.cpp b/libopie2/opiecore/oresource.cpp
new file mode 100644
index 0000000..88058d0
--- a/dev/null
+++ b/libopie2/opiecore/oresource.cpp
@@ -0,0 +1,85 @@
+/*
+                             This file is part of the Opie Project
+
+                             Copyright (C) 2005 Dan Williams <drw@handhelds.org>
+                             Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         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 <opie2/oapplication.h>
+#include <opie2/odebug.h>
+
+#include <qpe/applnk.h>
+
+#include "oresource.h"
+
+namespace Opie {
+namespace Core {
+
+QImage OResource::loadImage( const QString &name, Scale scale )
+{
+    // Load image
+    QString filename;
+    filename.sprintf( "%spics/%s.png", (const char*) oApp->qpeDir(), (const char*) name );
+    QImage image( filename );
+    if ( image.isNull() )
+        odebug << "libopie2 OResource: can't find image " << filename << oendl;
+
+    // Scale image (if necessary)
+    if ( scale == SmallIcon )
+    {
+        // Retrieve size of small icons
+        if ( smallIconSize == -1 )
+            smallIconSize = AppLnk::smallIconSize();
+
+        // Scale image
+        return image.smoothScale( smallIconSize, smallIconSize );
+    }
+    else if ( scale == BigIcon )
+    {
+        // Retrieve size of big icons
+        if ( bigIconSize == -1 )
+            bigIconSize = AppLnk::bigIconSize();
+
+        // Scale image
+        return image.smoothScale( bigIconSize, bigIconSize );
+    }
+    else
+        return image;
+}
+
+QPixmap OResource::loadPixmap( const QString &name, Scale scale )
+{
+    QPixmap pixmap;
+    pixmap.convertFromImage( loadImage( name, scale ) );
+    return pixmap;
+}
+
+} // namespace Core
+} // namespace Opie
+
+
+
diff --git a/libopie2/opiecore/oresource.h b/libopie2/opiecore/oresource.h
new file mode 100644
index 0000000..8c67ced
--- a/dev/null
+++ b/libopie2/opiecore/oresource.h
@@ -0,0 +1,92 @@
+/*
+                             This file is part of the Opie Project
+
+                             Copyright (C) 2005 Dan Williams <drw@handhelds.org>
+                             Copyright (C) 2003 Michael Lauer <mickey@tm.informatik.uni-frankfurt.de>
+                             Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org>
+              =.
+            .=l.
+           .>+-=
+ _;:,     .>    :=|.         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 ORESOURCE_H
+#define ORESOURCE_H
+
+#include <qimage.h>
+#include <qpixmap.h>
+
+namespace Opie {
+namespace Core {
+
+static int smallIconSize = -1; // Size of small icons (width & height)
+static int bigIconSize   = -1; // Size of large icons (width & height)
+
+
+class OResource
+{
+    public:
+        /**
+         * Image scaling options.
+         *
+         * NoScale   - no scaling of image will be performed
+         * SmallIcon - image will be scaled based using SmallIconSize value
+         *           for width and height
+         * BigIcon   - image will be scaled based on BigIconSize value for
+         *             width and height
+         *
+         * Note: SmallIconSize and BigIconSize are run-time configuration
+         *       options defined in qpe.conf (Appearance section)
+         */
+        enum Scale { NoScale = 0, SmallIcon, BigIcon };
+
+        /**
+         * Constructor
+         */
+        OResource() {}
+
+        /**
+         *  Load specified image.
+         *
+         * @param name - name of pixmap image to load
+         * @param scale - scaling (if any) to preform on image
+         *
+         * @return QImage containing image loaded (and scaled if appropriate)
+         **/
+        static QImage loadImage( const QString &name, Scale scale = NoScale );
+
+        /**
+         *  Load specified image.
+         *
+         * @param name - name of pixmap image to load
+         * @param scale - scaling (if any) to preform on image
+         *
+         * @return QPixmap containing image loaded (and scaled if appropriate)
+         **/
+        static QPixmap loadPixmap( const QString &name, Scale scale = NoScale );
+};
+
+} // namespace Core
+} // namespace Opie
+
+#endif