summaryrefslogtreecommitdiff
authordrw <drw>2005-04-24 21:55:58 (UTC)
committer drw <drw>2005-04-24 21:55:58 (UTC)
commitb513e26413e5b2aa7a52c23044e936a45b681f4b (patch) (side-by-side diff)
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,19 +1,19 @@
#include "lock.h"
/* OPIE */
#include <opie2/multiauthpassword.h>
+#include <opie2/oresource.h>
#include <qpe/applnk.h>
-#include <qpe/resource.h>
/* QT */
#include <qiconset.h>
#include <qpopupmenu.h>
#include <qmessagebox.h>
LockMenuApplet::LockMenuApplet()
:QObject( 0, "LockMenuApplet" )
{
}
@@ -29,28 +29,25 @@ QString LockMenuApplet::name() const
{
return tr( "Lock shortcut" );
}
QString LockMenuApplet::text() const
{
return tr( "Lock" );
}
QIconSet LockMenuApplet::icon() const
{
- QPixmap pix;
- QImage img = Resource::loadImage( "security/lock" );
- if ( !img.isNull() )
- pix.convertFromImage( img.smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+ QPixmap pix = Opie::Core::OResource::loadPixmap( "security/lock", Opie::Core::OResource::SmallIcon );
return pix;
}
QPopupMenu* LockMenuApplet::popup(QWidget*) const
{
/* no subdir */
return 0;
}
void LockMenuApplet::activated()
{
/*
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 @@
TEMPLATE = lib
CONFIG += qt plugn warn_on
HEADERS = lock.h
SOURCES = lock.cpp
TARGET = lockapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopiesecurity2
+LIBS += -lqpe -lopiecore2 -lopiesecurity2
VERSION = 1.0.0
include( $(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 @@
Package: opie-lockapplet
Files: plugins/applets/liblockapplet.so* pics/security/lock.png
Priority: optional
Section: opie/applets
Maintainer: Opie Team <opie@handhelds.org>
Architecture: arm
-Depends: task-opie-minimal, opie-security
+Depends: task-opie-minimal, libopiecore2, libopiesecurity2
Description: Lock Opie now
Button to lock Opie (as configured in the Security
settings) on demand.
Version: $QPE_VERSION$EXTRAVERSION