author | drw <drw> | 2005-06-15 22:39:20 (UTC) |
---|---|---|
committer | drw <drw> | 2005-06-15 22:39:20 (UTC) |
commit | e0205bac48b9d23af9feb48004c24fcf7a5e8200 (patch) (side-by-side diff) | |
tree | 2faa077192fd0bfc4fc409f0513cc0e82113fa9e /examples/applet | |
parent | d2474c8e654d223b85b6200ce09fabd3a40af8e3 (diff) | |
download | opie-e0205bac48b9d23af9feb48004c24fcf7a5e8200.zip opie-e0205bac48b9d23af9feb48004c24fcf7a5e8200.tar.gz opie-e0205bac48b9d23af9feb48004c24fcf7a5e8200.tar.bz2 |
Resource -> OResource
-rw-r--r-- | examples/applet/applet.pro | 2 | ||||
-rw-r--r-- | examples/applet/config.in | 2 | ||||
-rw-r--r-- | examples/applet/simpleimpl.cpp | 25 |
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 @@ -12,3 +12,3 @@ DEPENDSPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopieui2 +LIBS += -lqpe -lopiecore2 -lopieui2 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 @@ -3,2 +3,2 @@ 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 @@ -3,2 +3,3 @@ +#include <opie2/oresource.h> // for OResource loading #include <opie2/otaskbarapplet.h> @@ -6,3 +7,2 @@ #include <qpe/applnk.h> // for AppLnk -#include <qpe/resource.h> // for Resource loading @@ -18,25 +18,8 @@ SimpleApplet::SimpleApplet(QWidget *parent) /* - * 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) ); @@ -46,3 +29,3 @@ SimpleApplet::SimpleApplet(QWidget *parent) */ - setFixedHeight(AppLnk::smallIconSize() ); + setFixedHeight( AppLnk::smallIconSize() ); setFixedWidth( AppLnk::smallIconSize() ); |