-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 @@ | |||
1 | Package: opie-vtapplet | 1 | Package: opie-vtapplet |
2 | Files: plugins/applets/libvtapplet.so* | 2 | Files: plugins/applets/libvtapplet.so* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applets | 4 | Section: opie/applets |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal, libopiecore2 |
8 | Description: Switch to another virtual terminal | 8 | Description: Switch to another virtual terminal |
9 | Version: $QPE_VERSION$EXTRAVERSION | 9 | 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 @@ | |||
12 | **********************************************************************/ | 12 | **********************************************************************/ |
13 | 13 | ||
14 | #include "vt.h" | 14 | #include "vt.h" |
15 | 15 | ||
16 | /* OPIE */ | 16 | /* OPIE */ |
17 | #include <opie2/odebug.h> | 17 | #include <opie2/odebug.h> |
18 | #include <opie2/oresource.h> | ||
19 | |||
18 | #include <qpe/applnk.h> | 20 | #include <qpe/applnk.h> |
19 | #include <qpe/resource.h> | 21 | |
20 | using namespace Opie::Core; | 22 | using namespace Opie::Core; |
21 | 23 | ||
22 | /* QT */ | 24 | /* QT */ |
23 | #include <qpopupmenu.h> | 25 | #include <qpopupmenu.h> |
24 | 26 | ||
25 | /* STD */ | 27 | /* STD */ |
@@ -65,17 +67,13 @@ QString VTApplet::tr( const char* s, const char* p ) const | |||
65 | return qApp->translate( "VTApplet", s, p ); | 67 | return qApp->translate( "VTApplet", s, p ); |
66 | } | 68 | } |
67 | */ | 69 | */ |
68 | 70 | ||
69 | QIconSet VTApplet::icon ( ) const | 71 | QIconSet VTApplet::icon ( ) const |
70 | { | 72 | { |
71 | QPixmap pix; | 73 | QPixmap pix = Opie::Core::OResource::loadPixmap( "terminal", Opie::Core::OResource::SmallIcon ); |
72 | QImage img = Resource::loadImage ( "terminal" ); | ||
73 | |||
74 | if ( !img. isNull ( )) | ||
75 | pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
76 | return pix; | 74 | return pix; |
77 | } | 75 | } |
78 | 76 | ||
79 | QPopupMenu *VTApplet::popup ( QWidget* parent ) const | 77 | QPopupMenu *VTApplet::popup ( QWidget* parent ) const |
80 | { | 78 | { |
81 | odebug << "VTApplet::popup" << oendl; | 79 | 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 | |||
3 | HEADERS = vt.h | 3 | HEADERS = vt.h |
4 | SOURCES = vt.cpp | 4 | SOURCES = vt.cpp |
5 | TARGET = vtapplet | 5 | TARGET = vtapplet |
6 | DESTDIR = $(OPIEDIR)/plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe -lopiecore2 |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
11 | 11 | ||
12 | include( $(OPIEDIR)/include.pro ) | 12 | include( $(OPIEDIR)/include.pro ) |
13 | target.path = $$prefix/plugins/applets | 13 | target.path = $$prefix/plugins/applets |