Diffstat (limited to 'core/pim/today/plugins/datebook/datebookevent.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/today/plugins/datebook/datebookevent.cpp | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp index c37813b..0a0d186 100644 --- a/core/pim/today/plugins/datebook/datebookevent.cpp +++ b/core/pim/today/plugins/datebook/datebookevent.cpp @@ -7,32 +7,36 @@ */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "datebookevent.h" #include <qpe/config.h> #include <qpe/timestring.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/qpeapplication.h> +#include <opie/odevice.h> + +using namespace Opie; + DateBookEvent::DateBookEvent(const EffectiveEvent &ev, QWidget* parent, bool show_location, bool show_notes, int maxCharClip, const char* name, WFlags fl) : OClickableLabel(parent,name,fl), event(ev) { setAlignment( AlignTop ); QString msg; Config config( "qpe" ); config.setGroup( "Time" ); // if 24 h format @@ -49,74 +53,64 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, } if ( ( TimeString::timeString( QTime( (ev).event().start().time() ) ) == "00:00" ) && ( TimeString::timeString( QTime( (ev).event().end().time() ) ) == "23:59" ) ) { msg += "<br>All day"; } else { // start time of event msg += "<br>" + ampmTime(QTime( (ev).event().start().time() ) ) // end time of event + "<b> - </b>" + ampmTime(QTime( (ev).event().end().time() ) ); } // include possible note or not if ( show_notes ) { msg += "<br> <i>note</i>:" +( (ev).notes() ).mid( 0, maxCharClip ); } - setText( msg ); connect( this, SIGNAL( clicked() ), this, SLOT( editMe() ) ); - // setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) ); } /** * AM/PM timestring conversion. * @param tm the timestring * @return formatted to am/pm is system is set to it */ QString DateBookEvent::ampmTime( QTime tm ) { - QString s; if( ampm ) { int hour = tm.hour(); if ( hour == 0 ) { hour = 12; } if ( hour > 12 ) { hour -= 12; } s.sprintf( "%2d:%02d %s", hour, tm.minute(), (tm.hour() >= 12) ? "PM" : "AM" ); return s; } else { s.sprintf( "%2d:%02d", tm.hour(), tm.minute() ); return s; } - } /** * starts the edit dialog as known from datebook */ void DateBookEvent::editEventSlot( const Event &e ) { - startDatebook(); - while( !QCopChannel::isRegistered( "QPE/Datebook" ) ) qApp->processEvents(); - QCopEnvelope env( "QPE/Datebook", "editEvent(int)" ); - env << e.uid(); + if ( ODevice::inst()->system() == System_Zaurus ) { + QCopEnvelope env( "QPE/Application/datebook", "raise()" ); + } else { + QCopEnvelope env( "QPE/Datebook", "editEvent(int)" ); + env << e.uid(); + } } -/** - * launches datebook - */ -void DateBookEvent::startDatebook() { - QCopEnvelope e( "QPE/System", "execute(QString)" ); - e << QString( "datebook" ); -} - void DateBookEvent::editMe() { - emit editEvent( event.event() ); + emit editEvent( event.event() ); } |