summaryrefslogtreecommitdiff
authordrw <drw>2005-05-04 21:53:48 (UTC)
committer drw <drw>2005-05-04 21:53:48 (UTC)
commit56fa3f4bcedabb5255fedca463724d57316e2cdb (patch) (side-by-side diff)
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
@@ -4,100 +4,100 @@
**
** This file is part of Qtopia Environment.
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
// merged in the StyleFix. Applets should raise Popup!
// 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;
LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent )
{
// If you want a sunken border around the clock do this:
// setFrameStyle( QFrame::Panel | QFrame::Sunken );
//setFont( QFont( "Helvetica", , QFont::Normal ) );
connect( qApp, SIGNAL( timeChanged() ), this, SLOT( updateTime() ) );
connect( qApp, SIGNAL( clockChanged(bool) ),
this, SLOT( slotClockChanged(bool) ) );
readConfig();
timerId = 0;
timerEvent( 0 );
show();
}
int LauncherClock::position()
{
return 10;
}
void LauncherClock::readConfig() {
Config config( "qpe" );
config.setGroup( "Time" );
ampmFormat = config.readBoolEntry( "AMPM", TRUE );
config.setGroup( "Date" );
format = config.readNumEntry("ClockApplet",0);
}
void LauncherClock::mousePressEvent( QMouseEvent * )
{
QPopupMenu *menu = new QPopupMenu(this);
menu->insertItem(tr("Set time..."), 0);
menu->insertSeparator();
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()) )) {
case 0:
Global::execute( "systemtime" );
break;
case 1: {
QCopEnvelope e("QPE/Application/clock", "showClock()" );
}
break;
case 2: {
QCopEnvelope e("QPE/Application/clock", "editDailyAlarm()" );
}
break;
default:
break;
}
delete menu;
}
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
@@ -1,13 +1,13 @@
TEMPLATE = lib
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