| -rw-r--r-- | core/applets/aboutapplet/about.cpp | 9 | ||||
| -rw-r--r-- | core/applets/aboutapplet/aboutapplet.pro | 2 | ||||
| -rw-r--r-- | core/applets/aboutapplet/opie-aboutapplet.control | 2 |
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,22 +1,23 @@ #include "about.h" #include "widget.h" +#include <opie2/oresource.h> + #include <qpe/applnk.h> #include <qpe/qpeapplication.h> -#include <qpe/resource.h> #include <qpe/qcopenvelope_qws.h> #include <qlabel.h> AboutApplet::AboutApplet ( ) : QObject ( 0, "AboutApplet" ), m_ad( 0l ) {} AboutApplet::~AboutApplet ( ) { delete m_ad; } int AboutApplet::position ( ) const { return 1; @@ -31,37 +32,33 @@ QString AboutApplet::text ( ) const { return tr( "About" ); } QString AboutApplet::tr( const char* s ) const { return qApp->translate( "AboutApplet", s, 0 ); } QString AboutApplet::tr( const char* s, const char* p ) const { return qApp->translate( "AboutApplet", s, p ); } QIconSet AboutApplet::icon() const { - QPixmap pix; - QImage img = Resource::loadImage ( "logo/opielogo" ); - - if ( !img.isNull() ) - pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); + QPixmap pix = Opie::Core::OResource::loadPixmap ( "logo/opielogo", Opie::Core::OResource::SmallIcon ); return pix; } QPopupMenu *AboutApplet::popup ( QWidget * ) const { return 0; } void AboutApplet::activated() { if ( !m_ad ) m_ad = new AboutWidget( 0, "aboutDialog" ); QPEApplication::showWidget( m_ad ); } 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 @@ -1,14 +1,14 @@ TEMPLATE = lib CONFIG += qt plugin warn_on HEADERS = about.h SOURCES = about.cpp INTERFACES = widget.ui TARGET = aboutapplet DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopiecore2 VERSION = 1.0.0 include( $(OPIEDIR)/include.pro ) target.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 @@ Package: opie-aboutapplet Files: plugins/applets/libaboutapplet.so* Priority: optional Section: opie/applets Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2 Conflicts: opie-aboutapplet-ipaq Description: About Opie About box for Opie Version: $QPE_VERSION$EXTRAVERSION |