| -rw-r--r-- | core/pim/today/clickablelabel.cpp | 6 | ||||
| -rw-r--r-- | core/pim/today/today.cpp | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/core/pim/today/clickablelabel.cpp b/core/pim/today/clickablelabel.cpp index 6912c34..e11cef6 100644 --- a/core/pim/today/clickablelabel.cpp +++ b/core/pim/today/clickablelabel.cpp @@ -1,31 +1,31 @@ #include "clickablelabel.h" -ClickableLabel::ClickableLabel(QWidget* parent = 0, - const char* name = 0, - WFlags fl = 0) : +ClickableLabel::ClickableLabel(QWidget* parent, + const char* name, + WFlags fl) : QLabel(parent,name,fl) { setFrameShape(NoFrame); setFrameShadow(Sunken); } void ClickableLabel::mousePressEvent( QMouseEvent *e ) { setFrameShape(Panel); repaint(); } void ClickableLabel::mouseReleaseEvent( QMouseEvent *e ) { setFrameShape(NoFrame); repaint(); if (rect().contains(e->pos())) { emit clicked(); } } void ClickableLabel::mouseMoveEvent( QMouseEvent *e ) { if (rect().contains(e->pos())) { setFrameShape(Panel); } else { setFrameShape(NoFrame); } } diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 01d1a13..1b4408c 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp @@ -423,168 +423,168 @@ void Today::getTodo() { * launches datebook */ void Today::startDatebook() { QCopEnvelope e("QPE/System", "execute(QString)"); e << QString("datebook"); } /* * starts the edit dialog as known from datebook */ extern QPEApplication *todayApp; void Today::editEvent(const Event &e) { startDatebook(); while(!QCopChannel::isRegistered("QPE/Datebook")) todayApp->processEvents(); QCopEnvelope env("QPE/Datebook", "editEvent(int)"); env << e.uid(); } /* * launches todolist */ void Today::startTodo() { QCopEnvelope e("QPE/System", "execute(QString)"); e << QString("todolist"); } /* * launch opiemail */ void Today::startMail() { QCopEnvelope e("QPE/System", "execute(QString)"); e << QString("opiemail"); //Right now start both, maybe decide which to rum via config file .. QCopEnvelope f("QPE/System", "execute(QString)"); f << QString("qtmail"); } Today::~Today() { } /* * Gets the events for the current day, if it should get all dates */ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, - QWidget* parent = 0, - int SHOW_LOCATION = 0, - int SHOW_NOTES = 0, - const char* name = 0, - WFlags fl = 0) : + QWidget* parent, + int SHOW_LOCATION, + int SHOW_NOTES, + const char* name, + WFlags fl) : ClickableLabel(parent,name,fl), event(ev) { QString msg; //QTime time = QTime::currentTime(); Config config( "qpe" ); config.setGroup( "Time" ); // if 24 h format ampm = config.readBoolEntry( "AMPM", TRUE ); if (!ONLY_LATER) { msg += "<B>" + (ev).description() + "</B>"; if ( (ev).event().hasAlarm() ) { msg += " <b>[with alarm]</b>"; } // include location or not if (SHOW_LOCATION == 1) { msg += "<BR><i>" + (ev).location() + "</i>"; } 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 == 1) { msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP); } } setText(msg); connect(this, SIGNAL(clicked()), this, SLOT(editMe())); setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) ); } 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; } } DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev, - QWidget* parent = 0, - int SHOW_LOCATION = 0, - int SHOW_NOTES = 0, - const char* name = 0, - WFlags fl = 0) : + QWidget* parent, + int SHOW_LOCATION, + int SHOW_NOTES, + const char* name, + WFlags fl) : ClickableLabel(parent,name,fl), event(ev) { QString msg; QTime time = QTime::currentTime(); Config config( "qpe" ); config.setGroup( "Time" ); // if 24 h format ampm = config.readBoolEntry( "AMPM", TRUE ); if ((time.toString() <= TimeString::dateString((ev).event().end())) ) { // show only later appointments msg += "<B>" + (ev).description() + "</B>"; if ( (ev).event().hasAlarm() ) { msg += " <b>[with alarm]</b>"; } // include location or not if (SHOW_LOCATION == 1) { msg += "<BR><i>" + (ev).location() + "</i>"; } 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 == 1) { msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP); } } setText(msg); connect(this, SIGNAL(clicked()), this, SLOT(editMe())); setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) ); } QString DateBookEventLater::ampmTime(QTime tm) { QString s; if( ampm ) { int hour = tm.hour(); if (hour == 0) |