summaryrefslogtreecommitdiff
authordrw <drw>2005-04-24 21:55:58 (UTC)
committer drw <drw>2005-04-24 21:55:58 (UTC)
commitb513e26413e5b2aa7a52c23044e936a45b681f4b (patch) (unidiff)
tree6d1af1360393d5b4f51d6e4072acf85346b01469
parent40a0b1f81d5f53fede7831707d89a840d6691bd9 (diff)
downloadopie-b513e26413e5b2aa7a52c23044e936a45b681f4b.zip
opie-b513e26413e5b2aa7a52c23044e936a45b681f4b.tar.gz
opie-b513e26413e5b2aa7a52c23044e936a45b681f4b.tar.bz2
Resource -> OResource, and fix dependency on libopiesecurity2 lib
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/lockapplet/lock.cpp7
-rw-r--r--core/applets/lockapplet/lockapplet.pro2
-rw-r--r--core/applets/lockapplet/opie-lockapplet.control2
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
@@ -1,15 +1,15 @@
1#include "lock.h" 1#include "lock.h"
2 2
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 */
10#include <qiconset.h> 10#include <qiconset.h>
11#include <qpopupmenu.h> 11#include <qpopupmenu.h>
12#include <qmessagebox.h> 12#include <qmessagebox.h>
13 13
14 14
15LockMenuApplet::LockMenuApplet() 15LockMenuApplet::LockMenuApplet()
@@ -33,20 +33,17 @@ QString LockMenuApplet::name() const
33QString LockMenuApplet::text() const 33QString LockMenuApplet::text() const
34{ 34{
35 return tr( "Lock" ); 35 return tr( "Lock" );
36} 36}
37 37
38 38
39QIconSet LockMenuApplet::icon() const 39QIconSet 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}
47 44
48QPopupMenu* LockMenuApplet::popup(QWidget*) const 45QPopupMenu* LockMenuApplet::popup(QWidget*) const
49{ 46{
50 /* no subdir */ 47 /* no subdir */
51 return 0; 48 return 0;
52} 49}
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
@@ -1,12 +1,12 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt plugn warn_on 2CONFIG += qt plugn warn_on
3HEADERS = lock.h 3HEADERS = lock.h
4SOURCES = lock.cpp 4SOURCES = lock.cpp
5TARGET = lockapplet 5TARGET = lockapplet
6DESTDIR = $(OPIEDIR)/plugins/applets 6DESTDIR = $(OPIEDIR)/plugins/applets
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += $(OPIEDIR)/include 8DEPENDPATH += $(OPIEDIR)/include
9LIBS += -lqpe -lopiesecurity2 9LIBS += -lqpe -lopiecore2 -lopiesecurity2
10VERSION = 1.0.0 10VERSION = 1.0.0
11 11
12include( $(OPIEDIR)/include.pro ) 12include( $(OPIEDIR)/include.pro )
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
@@ -1,11 +1,11 @@
1Package: opie-lockapplet 1Package: opie-lockapplet
2Files: plugins/applets/liblockapplet.so* pics/security/lock.png 2Files: plugins/applets/liblockapplet.so* pics/security/lock.png
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, opie-security 7Depends: task-opie-minimal, libopiecore2, libopiesecurity2
8Description: Lock Opie now 8Description: Lock Opie now
9 Button to lock Opie (as configured in the Security 9 Button to lock Opie (as configured in the Security
10 settings) on demand. 10 settings) on demand.
11Version: $QPE_VERSION$EXTRAVERSION 11Version: $QPE_VERSION$EXTRAVERSION