Resource -> OResource

3 files changed, 6 insertions, 23 deletions

diff --git a/examples/applet/applet.pro b/examples/applet/applet.pro
index 6890141..1daf1b2 100644
--- a/examples/applet/applet.pro
+++ b/examples/applet/applet.pro
@@ -7,10 +7,10 @@ TARGET  = example
 SOURCES = simpleimpl.cpp
 HEADERS = simpleimpl.h
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDSPATH += $(OPIEDIR)/include
 
-LIBS += -lqpe -lopieui2
+LIBS += -lqpe -lopiecore2 -lopieui2
 
 
 include( $(OPIEDIR)/include.pro ) 
diff --git a/examples/applet/config.in b/examples/applet/config.in
index f6a5d20..0d4d800 100644
--- a/examples/applet/config.in
+++ b/examples/applet/config.in
@@ -1,4 +1,4 @@
   config APPLET_EXAMPLE
     boolean "Taskbar Applet Example"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && EXAMPLES 
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && EXAMPLES 
diff --git a/examples/applet/simpleimpl.cpp b/examples/applet/simpleimpl.cpp
index ff651ca..d7e2db9 100644
--- a/examples/applet/simpleimpl.cpp
+++ b/examples/applet/simpleimpl.cpp
@@ -1,53 +1,36 @@
 
 #include "simpleimpl.h"
 
+#include <opie2/oresource.h> // for OResource loading
 #include <opie2/otaskbarapplet.h>
 
 #include <qpe/applnk.h> // for AppLnk
-#include <qpe/resource.h> // for Resource loading
 
 #include <qlabel.h>
 #include <qpainter.h>
 #include <qmessagebox.h>
 
 
 
 
 SimpleApplet::SimpleApplet(QWidget *parent)
     : QWidget( parent,  "Simple Applet" ) {
 /*
- * we will load an Image, scale it for the right usage
+ * we will load an Pixmap, scaled for the right usage
  * remember your applet might be used by different
  * resolutions.
- * Then we will convert the image back to an Pixmap
- * and draw this Pimxap. We need to use Image because its
- * the only class that allows scaling.
  */
 
-    QImage image = Resource::loadImage("Tux");
-    /*
-     * smooth scale to AppLnk smallIconSize for applest
-     * smallIconSize gets adjusted to the resolution
-     * so on some displays like SIMpad and a C-750 the smallIconSize
-     * is greater than on a iPAQ h3870
-     */
-    image = image.smoothScale(AppLnk::smallIconSize(), AppLnk::smallIconSize() );
-
-    /*
-     * now we need to convert the Image to a Pixmap cause these
-     * can be drawn more easily
-     */
-    m_pix = new QPixmap();
-    m_pix->convertFromImage( image );
+    m_pix = new QPixmap( Opie::Core::OResource::loadPixmap("Tux", Opie::Core::OResource::SmallIcon) );
 
     /*
      * Now we will say that we don't want to be bigger than our
      * Pixmap
      */
-    setFixedHeight(AppLnk::smallIconSize() );
+    setFixedHeight( AppLnk::smallIconSize() );
     setFixedWidth( AppLnk::smallIconSize() );
 
 }
 
 SimpleApplet::~SimpleApplet() {
     delete m_pix;