| -rw-r--r-- | core/applets/vtapplet/opie-vtapplet.control | 2 | ||||
| -rw-r--r-- | core/applets/vtapplet/vt.cpp | 10 | ||||
| -rw-r--r-- | core/applets/vtapplet/vtapplet.pro | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/core/applets/vtapplet/opie-vtapplet.control b/core/applets/vtapplet/opie-vtapplet.control index a1662f1..ae504a9 100644 --- a/core/applets/vtapplet/opie-vtapplet.control +++ b/core/applets/vtapplet/opie-vtapplet.control @@ -1,9 +1,9 @@ Package: opie-vtapplet Files: plugins/applets/libvtapplet.so* Priority: optional Section: opie/applets Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2 Description: Switch to another virtual terminal Version: $QPE_VERSION$EXTRAVERSION diff --git a/core/applets/vtapplet/vt.cpp b/core/applets/vtapplet/vt.cpp index ae89635..0d4e657 100644 --- a/core/applets/vtapplet/vt.cpp +++ b/core/applets/vtapplet/vt.cpp @@ -12,14 +12,16 @@ **********************************************************************/ #include "vt.h" /* OPIE */ #include <opie2/odebug.h> +#include <opie2/oresource.h> + #include <qpe/applnk.h> -#include <qpe/resource.h> + using namespace Opie::Core; /* QT */ #include <qpopupmenu.h> /* STD */ @@ -65,17 +67,13 @@ QString VTApplet::tr( const char* s, const char* p ) const return qApp->translate( "VTApplet", s, p ); } */ QIconSet VTApplet::icon ( ) const { - QPixmap pix; - QImage img = Resource::loadImage ( "terminal" ); - - if ( !img. isNull ( )) - pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); + QPixmap pix = Opie::Core::OResource::loadPixmap( "terminal", Opie::Core::OResource::SmallIcon ); return pix; } QPopupMenu *VTApplet::popup ( QWidget* parent ) const { odebug << "VTApplet::popup" << oendl; diff --git a/core/applets/vtapplet/vtapplet.pro b/core/applets/vtapplet/vtapplet.pro index 6c4873c..912af58 100644 --- a/core/applets/vtapplet/vtapplet.pro +++ b/core/applets/vtapplet/vtapplet.pro @@ -3,11 +3,11 @@ CONFIG += qt warn_on HEADERS = vt.h SOURCES = vt.cpp TARGET = vtapplet 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 |