-rw-r--r-- | core/applets/lockapplet/lock.cpp | 7 | ||||
-rw-r--r-- | core/applets/lockapplet/lockapplet.pro | 2 | ||||
-rw-r--r-- | core/applets/lockapplet/opie-lockapplet.control | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/core/applets/lockapplet/lock.cpp b/core/applets/lockapplet/lock.cpp index 89f27bb..a831b99 100644 --- a/core/applets/lockapplet/lock.cpp +++ b/core/applets/lockapplet/lock.cpp | |||
@@ -3,7 +3,7 @@ | |||
3 | /* OPIE */ | 3 | /* OPIE */ |
4 | #include <opie2/multiauthpassword.h> | 4 | #include <opie2/multiauthpassword.h> |
5 | #include <opie2/oresource.h> | ||
5 | 6 | ||
6 | #include <qpe/applnk.h> | 7 | #include <qpe/applnk.h> |
7 | #include <qpe/resource.h> | ||
8 | 8 | ||
9 | /* QT */ | 9 | /* QT */ |
@@ -39,8 +39,5 @@ QString LockMenuApplet::text() const | |||
39 | QIconSet LockMenuApplet::icon() const | 39 | QIconSet LockMenuApplet::icon() const |
40 | { | 40 | { |
41 | QPixmap pix; | 41 | QPixmap pix = Opie::Core::OResource::loadPixmap( "security/lock", Opie::Core::OResource::SmallIcon ); |
42 | QImage img = Resource::loadImage( "security/lock" ); | ||
43 | if ( !img.isNull() ) | ||
44 | pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); | ||
45 | return pix; | 42 | return pix; |
46 | } | 43 | } |
diff --git a/core/applets/lockapplet/lockapplet.pro b/core/applets/lockapplet/lockapplet.pro index ce4761c..500acba 100644 --- a/core/applets/lockapplet/lockapplet.pro +++ b/core/applets/lockapplet/lockapplet.pro | |||
@@ -7,5 +7,5 @@ DESTDIR = $(OPIEDIR)/plugins/applets | |||
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS += -lqpe -lopiesecurity2 | 9 | LIBS += -lqpe -lopiecore2 -lopiesecurity2 |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
11 | 11 | ||
diff --git a/core/applets/lockapplet/opie-lockapplet.control b/core/applets/lockapplet/opie-lockapplet.control index cf76d69..97194ab 100644 --- a/core/applets/lockapplet/opie-lockapplet.control +++ b/core/applets/lockapplet/opie-lockapplet.control | |||
@@ -5,5 +5,5 @@ 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, opie-security | 7 | Depends: task-opie-minimal, libopiecore2, libopiesecurity2 |
8 | Description: Lock Opie now | 8 | Description: Lock Opie now |
9 | Button to lock Opie (as configured in the Security | 9 | Button to lock Opie (as configured in the Security |