Diffstat (limited to 'core/applets/clockapplet/clock.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | core/applets/clockapplet/clock.cpp | 6 |
1 files changed, 3 insertions, 3 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 @@ -16,30 +16,30 @@ ** ** 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() ) ); @@ -66,26 +66,26 @@ void LauncherClock::readConfig() { 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()" ); } |