summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/aboutapplet/about.cpp9
-rw-r--r--core/applets/aboutapplet/aboutapplet.pro2
-rw-r--r--core/applets/aboutapplet/opie-aboutapplet.control2
3 files changed, 5 insertions, 8 deletions
diff --git a/core/applets/aboutapplet/about.cpp b/core/applets/aboutapplet/about.cpp
index ec214f3..accfdd6 100644
--- a/core/applets/aboutapplet/about.cpp
+++ b/core/applets/aboutapplet/about.cpp
@@ -1,9 +1,10 @@
1#include "about.h" 1#include "about.h"
2#include "widget.h" 2#include "widget.h"
3 3
4#include <opie2/oresource.h>
5
4#include <qpe/applnk.h> 6#include <qpe/applnk.h>
5#include <qpe/qpeapplication.h> 7#include <qpe/qpeapplication.h>
6#include <qpe/resource.h>
7#include <qpe/qcopenvelope_qws.h> 8#include <qpe/qcopenvelope_qws.h>
8 9
9#include <qlabel.h> 10#include <qlabel.h>
@@ -44,11 +45,7 @@ QString AboutApplet::tr( const char* s, const char* p ) const
44 45
45QIconSet AboutApplet::icon() const 46QIconSet AboutApplet::icon() const
46{ 47{
47 QPixmap pix; 48 QPixmap pix = Opie::Core::OResource::loadPixmap ( "logo/opielogo", Opie::Core::OResource::SmallIcon );
48 QImage img = Resource::loadImage ( "logo/opielogo" );
49
50 if ( !img.isNull() )
51 pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
52 return pix; 49 return pix;
53} 50}
54 51
diff --git a/core/applets/aboutapplet/aboutapplet.pro b/core/applets/aboutapplet/aboutapplet.pro
index f12f7fd..c2841c4 100644
--- a/core/applets/aboutapplet/aboutapplet.pro
+++ b/core/applets/aboutapplet/aboutapplet.pro
@@ -7,7 +7,7 @@ TARGET = aboutapplet
7DESTDIR = $(OPIEDIR)/plugins/applets 7DESTDIR = $(OPIEDIR)/plugins/applets
8INCLUDEPATH += $(OPIEDIR)/include 8INCLUDEPATH += $(OPIEDIR)/include
9DEPENDPATH += $(OPIEDIR)/include 9DEPENDPATH += $(OPIEDIR)/include
10LIBS += -lqpe 10LIBS += -lqpe -lopiecore2
11VERSION = 1.0.0 11VERSION = 1.0.0
12 12
13include( $(OPIEDIR)/include.pro ) 13include( $(OPIEDIR)/include.pro )
diff --git a/core/applets/aboutapplet/opie-aboutapplet.control b/core/applets/aboutapplet/opie-aboutapplet.control
index 9d85de4..11fe300 100644
--- a/core/applets/aboutapplet/opie-aboutapplet.control
+++ b/core/applets/aboutapplet/opie-aboutapplet.control
@@ -4,7 +4,7 @@ Priority: optional
4Section: opie/applets 4Section: opie/applets
5Maintainer: Opie Team <opie@handhelds.org> 5Maintainer: Opie Team <opie@handhelds.org>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal, libopiecore2
8Conflicts: opie-aboutapplet-ipaq 8Conflicts: opie-aboutapplet-ipaq
9Description: About Opie 9Description: About Opie
10 About box for Opie 10 About box for Opie