summaryrefslogtreecommitdiff
path: root/examples/menuapplet
authordrw <drw>2005-06-15 22:39:20 (UTC)
committer drw <drw>2005-06-15 22:39:20 (UTC)
commite0205bac48b9d23af9feb48004c24fcf7a5e8200 (patch) (side-by-side diff)
tree2faa077192fd0bfc4fc409f0513cc0e82113fa9e /examples/menuapplet
parentd2474c8e654d223b85b6200ce09fabd3a40af8e3 (diff)
downloadopie-e0205bac48b9d23af9feb48004c24fcf7a5e8200.zip
opie-e0205bac48b9d23af9feb48004c24fcf7a5e8200.tar.gz
opie-e0205bac48b9d23af9feb48004c24fcf7a5e8200.tar.bz2
Resource -> OResource
Diffstat (limited to 'examples/menuapplet') (more/less context) (ignore whitespace changes)
-rw-r--r--examples/menuapplet/config.in2
-rw-r--r--examples/menuapplet/example.cpp9
-rw-r--r--examples/menuapplet/menuapplet.pro2
3 files changed, 4 insertions, 9 deletions
diff --git a/examples/menuapplet/config.in b/examples/menuapplet/config.in
index 3167478..9425d9f 100644
--- a/examples/menuapplet/config.in
+++ b/examples/menuapplet/config.in
@@ -1,4 +1,4 @@
config EXAMPLE_MENU
boolean "O-Menu Applet"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && EXAMPLES
diff --git a/examples/menuapplet/example.cpp b/examples/menuapplet/example.cpp
index 8ae77da..079030f 100644
--- a/examples/menuapplet/example.cpp
+++ b/examples/menuapplet/example.cpp
@@ -1,10 +1,9 @@
#include "example.h"
-#include <qpe/applnk.h>
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
/* QT */
#include <qiconset.h>
#include <qpopupmenu.h>
#include <qmessagebox.h>
@@ -32,17 +31,13 @@ QString MenuAppletExample::text() const
return tr( "Click the white rabbit" );
}
QIconSet MenuAppletExample::icon() const
{
- QPixmap pix;
- QImage img = Resource::loadImage( "Tux" );
- if ( !img.isNull() )
- pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
- return pix;
+ return Opie::Core::OResource::loadPixmap( "Tux", Opie::Core::OResource::SmallIcon );
}
QPopupMenu* MenuAppletExample::popup(QWidget*) const
{
/* no subdir */
return 0;
diff --git a/examples/menuapplet/menuapplet.pro b/examples/menuapplet/menuapplet.pro
index 1e20e78..e8858ec 100644
--- a/examples/menuapplet/menuapplet.pro
+++ b/examples/menuapplet/menuapplet.pro
@@ -3,10 +3,10 @@ CONFIG += qt plugn warn_on
HEADERS = example.h
SOURCES = example.cpp
TARGET = example_applet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe
+LIBS += -lqpe -lopiecore2
VERSION = 1.0.0
include( $(OPIEDIR)/include.pro )