summaryrefslogtreecommitdiff
authordrw <drw>2005-04-24 20:40:30 (UTC)
committer drw <drw>2005-04-24 20:40:30 (UTC)
commit4ae9e590b1606ff1bf437ed7c1ebe019d19edd7b (patch) (unidiff)
treed2c087c0623b6e6a0f7750069b7fc6ceea042d1a
parent01ab9377017060c7ad3ab9e4ed2b76a879d442f6 (diff)
downloadopie-4ae9e590b1606ff1bf437ed7c1ebe019d19edd7b.zip
opie-4ae9e590b1606ff1bf437ed7c1ebe019d19edd7b.tar.gz
opie-4ae9e590b1606ff1bf437ed7c1ebe019d19edd7b.tar.bz2
Resource -> OResource
Diffstat (more/less context) (ignore 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,12 +1,13 @@
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>
10 11
11AboutApplet::AboutApplet ( ) 12AboutApplet::AboutApplet ( )
12 : QObject ( 0, "AboutApplet" ), m_ad( 0l ) 13 : QObject ( 0, "AboutApplet" ), m_ad( 0l )
@@ -41,17 +42,13 @@ QString AboutApplet::tr( const char* s, const char* p ) const
41{ 42{
42 return qApp->translate( "AboutApplet", s, p ); 43 return qApp->translate( "AboutApplet", s, p );
43} 44}
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
55QPopupMenu *AboutApplet::popup ( QWidget * ) const 52QPopupMenu *AboutApplet::popup ( QWidget * ) const
56{ 53{
57 return 0; 54 return 0;
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
@@ -4,11 +4,11 @@ HEADERS = about.h
4SOURCES = about.cpp 4SOURCES = about.cpp
5INTERFACES = widget.ui 5INTERFACES = widget.ui
6TARGET = aboutapplet 6TARGET = 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 )
14target.path = $$prefix/plugins/applets 14target.path = $$prefix/plugins/applets
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
@@ -1,11 +1,11 @@
1Package: opie-aboutapplet 1Package: opie-aboutapplet
2Files: plugins/applets/libaboutapplet.so* 2Files: plugins/applets/libaboutapplet.so*
3Priority: optional 3Priority: 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
11Version: $QPE_VERSION$EXTRAVERSION 11Version: $QPE_VERSION$EXTRAVERSION