summaryrefslogtreecommitdiff
authordrw <drw>2005-05-04 21:53:48 (UTC)
committer drw <drw>2005-05-04 21:53:48 (UTC)
commit56fa3f4bcedabb5255fedca463724d57316e2cdb (patch) (unidiff)
treec8fd8e25e65d158eaf670c6d75041132584c032e
parenta19581c15cdb15f17988b6af958e6aa27eb01c7d (diff)
downloadopie-56fa3f4bcedabb5255fedca463724d57316e2cdb.zip
opie-56fa3f4bcedabb5255fedca463724d57316e2cdb.tar.gz
opie-56fa3f4bcedabb5255fedca463724d57316e2cdb.tar.bz2
Resource -> OResource
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 @@
22// by zecke@handhelds.org 6th of may 2004 22// by zecke@handhelds.org 6th of may 2004
23 23
24#include "clock.h" 24#include "clock.h"
25 25
26/* OPIE */ 26/* OPIE */
27#include <opie2/odebug.h> 27#include <opie2/odebug.h>
28#include <opie2/oresource.h>
28#include <opie2/otaskbarapplet.h> 29#include <opie2/otaskbarapplet.h>
29 30
30#include <qpe/qpeapplication.h> 31#include <qpe/qpeapplication.h>
31#include <qpe/qcopenvelope_qws.h> 32#include <qpe/qcopenvelope_qws.h>
32#include <qpe/config.h> 33#include <qpe/config.h>
33#include <qpe/resource.h>
34 34
35#include <qpopupmenu.h> 35#include <qpopupmenu.h>
36 36
37using namespace Opie::Core; 37using namespace Opie::Core;
38using namespace Opie::Ui; 38using namespace Opie::Ui;
39 39
@@ -72,14 +72,14 @@ void LauncherClock::mousePressEvent( QMouseEvent * )
72 menu->insertItem(tr("Clock.."), 1); 72 menu->insertItem(tr("Clock.."), 1);
73 73
74 74
75 Config config( "Clock" ); 75 Config config( "Clock" );
76 config.setGroup( "Daily Alarm" ); 76 config.setGroup( "Daily Alarm" );
77 bool alarmOn = config.readBoolEntry("Enabled", FALSE); 77 bool alarmOn = config.readBoolEntry("Enabled", FALSE);
78 menu->insertItem(Resource::loadIconSet(alarmOn?"clockapplet/smallalarm":"clockapplet/smallalarm_off" ), 78 menu->insertItem( Opie::Core::OResource::loadPixmap( alarmOn ? "clockapplet/smallalarm" : "clockapplet/smallalarm_off",
79 tr("Alarm..."), 2); 79 Opie::Core::OResource::SmallIcon ), tr("Alarm..."), 2 );
80 80
81 81
82 /* FIXME use OTaskBarApplet ### */ 82 /* FIXME use OTaskBarApplet ### */
83 QPoint curPos = mapToGlobal( QPoint(0,0) ); 83 QPoint curPos = mapToGlobal( QPoint(0,0) );
84 QSize sh = menu->sizeHint(); 84 QSize sh = menu->sizeHint();
85 switch (menu->exec( curPos-QPoint((sh.width()-width())/2,sh.height()) )) { 85 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
3 HEADERS = clock.h 3 HEADERS = clock.h
4 SOURCES = clock.cpp 4 SOURCES = clock.cpp
5 TARGET = clockapplet 5 TARGET = clockapplet
6 DESTDIR = $(OPIEDIR)/plugins/applets 6 DESTDIR = $(OPIEDIR)/plugins/applets
7INCLUDEPATH += $(OPIEDIR)/include 7INCLUDEPATH += $(OPIEDIR)/include
8DEPENDPATH += .. 8DEPENDPATH += ..
9LIBS += -lqpe 9LIBS += -lqpe -lopiecore2
10 VERSION = 1.0.0 10 VERSION = 1.0.0
11 11
12include( $(OPIEDIR)/include.pro ) 12include( $(OPIEDIR)/include.pro )
13target.path = $$prefix/plugins/applets 13target.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 @@
1 config CLOCKAPPLET 1 config CLOCKAPPLET
2 boolean "opie-clockapplet (Digital clock applet)" 2 boolean "opie-clockapplet (Digital clock applet)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) 4 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 @@
1Package: opie-clockapplet 1Package: opie-clockapplet
2Files: plugins/applets/libclockapplet.so* 2Files: plugins/applets/libclockapplet.so*
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 7Depends: task-opie-minimal, libopiecore2
8Description: Clock applet 8Description: Clock applet
9 Clock applet for the Opie environment taskbar. 9 Clock applet for the Opie environment taskbar.
10Version: $QPE_VERSION$EXTRAVERSION 10Version: $QPE_VERSION$EXTRAVERSION