summaryrefslogtreecommitdiff
path: root/core/pim/today/today.cpp
Unidiff
Diffstat (limited to 'core/pim/today/today.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/today.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 0ab7a2a..01d1a13 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -122,25 +122,25 @@ void Today::setOwnerField(QString &message) {
122 OwnerField->setText("<b>" + message + "</b>"); 122 OwnerField->setText("<b>" + message + "</b>");
123 } 123 }
124} 124}
125 125
126/* 126/*
127 * Autostart, uses the new (opie only) autostart method in the launcher code. 127 * Autostart, uses the new (opie only) autostart method in the launcher code.
128 * If registered against that today ist started on each resume. 128 * If registered against that today ist started on each resume.
129 */ 129 */
130void Today::autoStart() { 130void Today::autoStart() {
131 Config cfg("today"); 131 Config cfg("today");
132 cfg.setGroup("Autostart"); 132 cfg.setGroup("Autostart");
133 int AUTOSTART = cfg.readNumEntry("autostart",1); 133 int AUTOSTART = cfg.readNumEntry("autostart",1);
134 qDebug(QString("%1").arg(AUTOSTART)); 134// qDebug(QString("%1").arg(AUTOSTART));
135 if (AUTOSTART) { 135 if (AUTOSTART) {
136 QCopEnvelope e("QPE/System", "autoStart(QString, QString, QString)"); 136 QCopEnvelope e("QPE/System", "autoStart(QString, QString, QString)");
137 e << QString("add"); 137 e << QString("add");
138 e << QString("today"); 138 e << QString("today");
139 e << AUTOSTART_TIMER; 139 e << AUTOSTART_TIMER;
140 } else { 140 } else {
141 qDebug("Nun in else bei autostart"); 141 qDebug("Nun in else bei autostart");
142 QCopEnvelope e("QPE/System", "autoStart(QString, QString)"); 142 QCopEnvelope e("QPE/System", "autoStart(QString, QString)");
143 e << QString("remove"); 143 e << QString("remove");
144 e << QString("today"); 144 e << QString("today");
145 } 145 }
146} 146}
@@ -470,24 +470,25 @@ Today::~Today() {
470DateBookEvent::DateBookEvent(const EffectiveEvent &ev, 470DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
471 QWidget* parent = 0, 471 QWidget* parent = 0,
472 int SHOW_LOCATION = 0, 472 int SHOW_LOCATION = 0,
473 int SHOW_NOTES = 0, 473 int SHOW_NOTES = 0,
474 const char* name = 0, 474 const char* name = 0,
475 WFlags fl = 0) : 475 WFlags fl = 0) :
476 ClickableLabel(parent,name,fl), event(ev) { 476 ClickableLabel(parent,name,fl), event(ev) {
477 477
478 QString msg; 478 QString msg;
479 //QTime time = QTime::currentTime(); 479 //QTime time = QTime::currentTime();
480 480
481 Config config( "qpe" ); 481 Config config( "qpe" );
482 config.setGroup( "Time" );
482 // if 24 h format 483 // if 24 h format
483 ampm = config.readBoolEntry( "AMPM", TRUE ); 484 ampm = config.readBoolEntry( "AMPM", TRUE );
484 485
485 486
486 if (!ONLY_LATER) { 487 if (!ONLY_LATER) {
487 msg += "<B>" + (ev).description() + "</B>"; 488 msg += "<B>" + (ev).description() + "</B>";
488 if ( (ev).event().hasAlarm() ) { 489 if ( (ev).event().hasAlarm() ) {
489 msg += " <b>[with alarm]</b>"; 490 msg += " <b>[with alarm]</b>";
490 } 491 }
491 // include location or not 492 // include location or not
492 if (SHOW_LOCATION == 1) { 493 if (SHOW_LOCATION == 1) {
493 msg += "<BR><i>" + (ev).location() + "</i>"; 494 msg += "<BR><i>" + (ev).location() + "</i>";
@@ -536,24 +537,25 @@ QString DateBookEvent::ampmTime(QTime tm) {
536DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev, 537DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev,
537 QWidget* parent = 0, 538 QWidget* parent = 0,
538 int SHOW_LOCATION = 0, 539 int SHOW_LOCATION = 0,
539 int SHOW_NOTES = 0, 540 int SHOW_NOTES = 0,
540 const char* name = 0, 541 const char* name = 0,
541 WFlags fl = 0) : 542 WFlags fl = 0) :
542 ClickableLabel(parent,name,fl), event(ev) { 543 ClickableLabel(parent,name,fl), event(ev) {
543 544
544 QString msg; 545 QString msg;
545 QTime time = QTime::currentTime(); 546 QTime time = QTime::currentTime();
546 547
547 Config config( "qpe" ); 548 Config config( "qpe" );
549 config.setGroup( "Time" );
548 // if 24 h format 550 // if 24 h format
549 ampm = config.readBoolEntry( "AMPM", TRUE ); 551 ampm = config.readBoolEntry( "AMPM", TRUE );
550 552
551 553
552 if ((time.toString() <= TimeString::dateString((ev).event().end())) ) { 554 if ((time.toString() <= TimeString::dateString((ev).event().end())) ) {
553 // show only later appointments 555 // show only later appointments
554 msg += "<B>" + (ev).description() + "</B>"; 556 msg += "<B>" + (ev).description() + "</B>";
555 if ( (ev).event().hasAlarm() ) { 557 if ( (ev).event().hasAlarm() ) {
556 msg += " <b>[with alarm]</b>"; 558 msg += " <b>[with alarm]</b>";
557 } 559 }
558 // include location or not 560 // include location or not
559 if (SHOW_LOCATION == 1) { 561 if (SHOW_LOCATION == 1) {