summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/clockapplet/clock.cpp6
-rw-r--r--core/applets/clockapplet/clockapplet.pro2
-rw-r--r--core/applets/clockapplet/config.in2
-rw-r--r--core/applets/clockapplet/opie-clockapplet.control2
4 files changed, 6 insertions, 6 deletions
diff --git a/core/applets/clockapplet/clock.cpp b/core/applets/clockapplet/clock.cpp
index d7d326d..ba8eb15 100644
--- a/core/applets/clockapplet/clock.cpp
+++ b/core/applets/clockapplet/clock.cpp
@@ -22,18 +22,18 @@
// by zecke@handhelds.org 6th of may 2004
#include "clock.h"
/* OPIE */
#include <opie2/odebug.h>
+#include <opie2/oresource.h>
#include <opie2/otaskbarapplet.h>
#include <qpe/qpeapplication.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/config.h>
-#include <qpe/resource.h>
#include <qpopupmenu.h>
using namespace Opie::Core;
using namespace Opie::Ui;
@@ -72,14 +72,14 @@ void LauncherClock::mousePressEvent( QMouseEvent * )
menu->insertItem(tr("Clock.."), 1);
Config config( "Clock" );
config.setGroup( "Daily Alarm" );
bool alarmOn = config.readBoolEntry("Enabled", FALSE);
- menu->insertItem(Resource::loadIconSet(alarmOn?"clockapplet/smallalarm":"clockapplet/smallalarm_off" ),
- tr("Alarm..."), 2);
+ menu->insertItem( Opie::Core::OResource::loadPixmap( alarmOn ? "clockapplet/smallalarm" : "clockapplet/smallalarm_off",
+ Opie::Core::OResource::SmallIcon ), tr("Alarm..."), 2 );
/* FIXME use OTaskBarApplet ### */
QPoint curPos = mapToGlobal( QPoint(0,0) );
QSize sh = menu->sizeHint();
switch (menu->exec( curPos-QPoint((sh.width()-width())/2,sh.height()) )) {
diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro
index 910f44b..b227b77 100644
--- a/core/applets/clockapplet/clockapplet.pro
+++ b/core/applets/clockapplet/clockapplet.pro
@@ -3,11 +3,11 @@ CONFIG += qt plugin warn_on
HEADERS = clock.h
SOURCES = clock.cpp
TARGET = clockapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += ..
-LIBS += -lqpe
+LIBS += -lqpe -lopiecore2
VERSION = 1.0.0
include( $(OPIEDIR)/include.pro )
target.path = $$prefix/plugins/applets
diff --git a/core/applets/clockapplet/config.in b/core/applets/clockapplet/config.in
index 6c32f79..f934743 100644
--- a/core/applets/clockapplet/config.in
+++ b/core/applets/clockapplet/config.in
@@ -1,4 +1,4 @@
config CLOCKAPPLET
boolean "opie-clockapplet (Digital clock applet)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 )
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/core/applets/clockapplet/opie-clockapplet.control b/core/applets/clockapplet/opie-clockapplet.control
index 79d9fdd..32035d4 100644
--- a/core/applets/clockapplet/opie-clockapplet.control
+++ b/core/applets/clockapplet/opie-clockapplet.control
@@ -1,10 +1,10 @@
Package: opie-clockapplet
Files: plugins/applets/libclockapplet.so*
Priority: optional
Section: opie/applets
Maintainer: Opie Team <opie@handhelds.org>
Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2
Description: Clock applet
Clock applet for the Opie environment taskbar.
Version: $QPE_VERSION$EXTRAVERSION