summaryrefslogtreecommitdiff
path: root/examples/menuapplet
Unidiff
Diffstat (limited to 'examples/menuapplet') (more/less context) (show 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 @@
1 config EXAMPLE_MENU 1 config EXAMPLE_MENU
2 boolean "O-Menu Applet" 2 boolean "O-Menu Applet"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES 4 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,7 +1,6 @@
1#include "example.h" 1#include "example.h"
2 2
3#include <qpe/applnk.h> 3#include <opie2/oresource.h>
4#include <qpe/resource.h>
5 4
6/* QT */ 5/* QT */
7#include <qiconset.h> 6#include <qiconset.h>
@@ -35,11 +34,7 @@ QString MenuAppletExample::text() const
35 34
36QIconSet MenuAppletExample::icon() const 35QIconSet MenuAppletExample::icon() const
37{ 36{
38 QPixmap pix; 37 return Opie::Core::OResource::loadPixmap( "Tux", Opie::Core::OResource::SmallIcon );
39 QImage img = Resource::loadImage( "Tux" );
40 if ( !img.isNull() )
41 pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
42 return pix;
43} 38}
44 39
45QPopupMenu* MenuAppletExample::popup(QWidget*) const 40QPopupMenu* MenuAppletExample::popup(QWidget*) const
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
@@ -6,7 +6,7 @@ TARGET = example_applet
6DESTDIR = $(OPIEDIR)/plugins/applets 6DESTDIR = $(OPIEDIR)/plugins/applets
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += $(OPIEDIR)/include 8DEPENDPATH += $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe -lopiecore2
10VERSION = 1.0.0 10VERSION = 1.0.0
11 11
12include( $(OPIEDIR)/include.pro ) 12include( $(OPIEDIR)/include.pro )