summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/clickablelabel.cpp6
-rw-r--r--core/pim/today/today.cpp20
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 @@
1#include "clickablelabel.h" 1#include "clickablelabel.h"
2 2
3ClickableLabel::ClickableLabel(QWidget* parent = 0, 3ClickableLabel::ClickableLabel(QWidget* parent,
4 const char* name = 0, 4 const char* name,
5 WFlags fl = 0) : 5 WFlags fl) :
6 QLabel(parent,name,fl) 6 QLabel(parent,name,fl)
7{ 7{
8 setFrameShape(NoFrame); 8 setFrameShape(NoFrame);
9 setFrameShadow(Sunken); 9 setFrameShadow(Sunken);
10} 10}
11 11
12void ClickableLabel::mousePressEvent( QMouseEvent *e ) { 12void ClickableLabel::mousePressEvent( QMouseEvent *e ) {
13 setFrameShape(Panel); 13 setFrameShape(Panel);
14 repaint(); 14 repaint();
15} 15}
16 16
17void ClickableLabel::mouseReleaseEvent( QMouseEvent *e ) { 17void ClickableLabel::mouseReleaseEvent( QMouseEvent *e ) {
18 setFrameShape(NoFrame); 18 setFrameShape(NoFrame);
19 repaint(); 19 repaint();
20 if (rect().contains(e->pos())) { 20 if (rect().contains(e->pos())) {
21 emit clicked(); 21 emit clicked();
22 } 22 }
23} 23}
24 24
25void ClickableLabel::mouseMoveEvent( QMouseEvent *e ) { 25void ClickableLabel::mouseMoveEvent( QMouseEvent *e ) {
26 if (rect().contains(e->pos())) { 26 if (rect().contains(e->pos())) {
27 setFrameShape(Panel); 27 setFrameShape(Panel);
28 } else { 28 } else {
29 setFrameShape(NoFrame); 29 setFrameShape(NoFrame);
30 } 30 }
31} 31}
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
@@ -375,239 +375,239 @@ void Today::getTodo() {
375 QString output; 375 QString output;
376 QString tmpout; 376 QString tmpout;
377 int count = 0; 377 int count = 0;
378 int ammount = 0; 378 int ammount = 0;
379 379
380 // get overdue todos first 380 // get overdue todos first
381 QValueList<ToDoEvent> overDueList = todo->overDue(); 381 QValueList<ToDoEvent> overDueList = todo->overDue();
382 qBubbleSort(overDueList); 382 qBubbleSort(overDueList);
383 for ( QValueList<ToDoEvent>::Iterator it=overDueList.begin(); 383 for ( QValueList<ToDoEvent>::Iterator it=overDueList.begin();
384 it!=overDueList.end(); ++it ) { 384 it!=overDueList.end(); ++it ) {
385 if (!(*it).isCompleted() && ( ammount < MAX_LINES_TASK) ) { 385 if (!(*it).isCompleted() && ( ammount < MAX_LINES_TASK) ) {
386 tmpout += "<font color=#e00000><b>-" +((*it).description()).mid(0, MAX_CHAR_CLIP) + "</b></font><br>"; 386 tmpout += "<font color=#e00000><b>-" +((*it).description()).mid(0, MAX_CHAR_CLIP) + "</b></font><br>";
387 ammount++; 387 ammount++;
388 } 388 }
389 } 389 }
390 390
391 // get total number of still open todos 391 // get total number of still open todos
392 QValueList<ToDoEvent> open = todo->rawToDos(); 392 QValueList<ToDoEvent> open = todo->rawToDos();
393 qBubbleSort(open); 393 qBubbleSort(open);
394 for ( QValueList<ToDoEvent>::Iterator it=open.begin(); 394 for ( QValueList<ToDoEvent>::Iterator it=open.begin();
395 it!=open.end(); ++it ) { 395 it!=open.end(); ++it ) {
396 if (!(*it).isCompleted()){ 396 if (!(*it).isCompleted()){
397 count +=1; 397 count +=1;
398 // not the overdues, we allready got them, and not if we are 398 // not the overdues, we allready got them, and not if we are
399 // over the maxlines 399 // over the maxlines
400 if (!(*it).isOverdue() && ( ammount < MAX_LINES_TASK) ) { 400 if (!(*it).isOverdue() && ( ammount < MAX_LINES_TASK) ) {
401 tmpout += "<b>-</b>" + ((*it).description()).mid(0, MAX_CHAR_CLIP) + "<br>"; 401 tmpout += "<b>-</b>" + ((*it).description()).mid(0, MAX_CHAR_CLIP) + "<br>";
402 ammount++; 402 ammount++;
403 } 403 }
404 } 404 }
405 } 405 }
406 406
407 407
408 if (count > 0) { 408 if (count > 0) {
409 if( count == 1 ) { 409 if( count == 1 ) {
410 output = tr("There is <b> 1</b> active task: <br>" ); 410 output = tr("There is <b> 1</b> active task: <br>" );
411 } else { 411 } else {
412 output = tr("There are <b> %1</b> active tasks: <br>").arg(count); 412 output = tr("There are <b> %1</b> active tasks: <br>").arg(count);
413 } 413 }
414 output += tmpout; 414 output += tmpout;
415 } else { 415 } else {
416 output = tr("No active tasks"); 416 output = tr("No active tasks");
417 } 417 }
418 418
419 TodoField->setText(tr(output)); 419 TodoField->setText(tr(output));
420} 420}
421 421
422/* 422/*
423 * launches datebook 423 * launches datebook
424 */ 424 */
425void Today::startDatebook() { 425void Today::startDatebook() {
426 QCopEnvelope e("QPE/System", "execute(QString)"); 426 QCopEnvelope e("QPE/System", "execute(QString)");
427 e << QString("datebook"); 427 e << QString("datebook");
428} 428}
429 429
430/* 430/*
431 * starts the edit dialog as known from datebook 431 * starts the edit dialog as known from datebook
432 */ 432 */
433 433
434extern QPEApplication *todayApp; 434extern QPEApplication *todayApp;
435 435
436void Today::editEvent(const Event &e) { 436void Today::editEvent(const Event &e) {
437 startDatebook(); 437 startDatebook();
438 438
439 while(!QCopChannel::isRegistered("QPE/Datebook")) todayApp->processEvents(); 439 while(!QCopChannel::isRegistered("QPE/Datebook")) todayApp->processEvents();
440 QCopEnvelope env("QPE/Datebook", "editEvent(int)"); 440 QCopEnvelope env("QPE/Datebook", "editEvent(int)");
441 env << e.uid(); 441 env << e.uid();
442} 442}
443 443
444/* 444/*
445 * launches todolist 445 * launches todolist
446 */ 446 */
447void Today::startTodo() { 447void Today::startTodo() {
448 QCopEnvelope e("QPE/System", "execute(QString)"); 448 QCopEnvelope e("QPE/System", "execute(QString)");
449 e << QString("todolist"); 449 e << QString("todolist");
450} 450}
451 451
452/* 452/*
453 * launch opiemail 453 * launch opiemail
454 */ 454 */
455void Today::startMail() { 455void Today::startMail() {
456 QCopEnvelope e("QPE/System", "execute(QString)"); 456 QCopEnvelope e("QPE/System", "execute(QString)");
457 e << QString("opiemail"); 457 e << QString("opiemail");
458//Right now start both, maybe decide which to rum via config file .. 458//Right now start both, maybe decide which to rum via config file ..
459 QCopEnvelope f("QPE/System", "execute(QString)"); 459 QCopEnvelope f("QPE/System", "execute(QString)");
460 f << QString("qtmail"); 460 f << QString("qtmail");
461} 461}
462 462
463 463
464Today::~Today() { 464Today::~Today() {
465} 465}
466 466
467/* 467/*
468 * Gets the events for the current day, if it should get all dates 468 * Gets the events for the current day, if it should get all dates
469 */ 469 */
470DateBookEvent::DateBookEvent(const EffectiveEvent &ev, 470DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
471 QWidget* parent = 0, 471 QWidget* parent,
472 int SHOW_LOCATION = 0, 472 int SHOW_LOCATION,
473 int SHOW_NOTES = 0, 473 int SHOW_NOTES,
474 const char* name = 0, 474 const char* name,
475 WFlags fl = 0) : 475 WFlags fl) :
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 config.setGroup( "Time" );
483 // if 24 h format 483 // if 24 h format
484 ampm = config.readBoolEntry( "AMPM", TRUE ); 484 ampm = config.readBoolEntry( "AMPM", TRUE );
485 485
486 486
487 if (!ONLY_LATER) { 487 if (!ONLY_LATER) {
488 msg += "<B>" + (ev).description() + "</B>"; 488 msg += "<B>" + (ev).description() + "</B>";
489 if ( (ev).event().hasAlarm() ) { 489 if ( (ev).event().hasAlarm() ) {
490 msg += " <b>[with alarm]</b>"; 490 msg += " <b>[with alarm]</b>";
491 } 491 }
492 // include location or not 492 // include location or not
493 if (SHOW_LOCATION == 1) { 493 if (SHOW_LOCATION == 1) {
494 msg += "<BR><i>" + (ev).location() + "</i>"; 494 msg += "<BR><i>" + (ev).location() + "</i>";
495 } 495 }
496 496
497 if ( (TimeString::timeString(QTime((ev).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((ev).event().end().time()) ) == "23:59") ) { 497 if ( (TimeString::timeString(QTime((ev).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((ev).event().end().time()) ) == "23:59") ) {
498 msg += "<br>All day"; 498 msg += "<br>All day";
499 } else { 499 } else {
500 // start time of event 500 // start time of event
501 msg += "<br>" + ampmTime(QTime((ev).event().start().time()) ) 501 msg += "<br>" + ampmTime(QTime((ev).event().start().time()) )
502 // end time of event 502 // end time of event
503 + "<b> - </b>" + ampmTime(QTime((ev).event().end().time()) ); 503 + "<b> - </b>" + ampmTime(QTime((ev).event().end().time()) );
504 } 504 }
505 505
506 // include possible note or not 506 // include possible note or not
507 if (SHOW_NOTES == 1) { 507 if (SHOW_NOTES == 1) {
508 msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP); 508 msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP);
509 } 509 }
510 } 510 }
511 setText(msg); 511 setText(msg);
512 connect(this, SIGNAL(clicked()), this, SLOT(editMe())); 512 connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
513 setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) ); 513 setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
514} 514}
515 515
516 516
517QString DateBookEvent::ampmTime(QTime tm) { 517QString DateBookEvent::ampmTime(QTime tm) {
518 518
519 QString s; 519 QString s;
520 if( ampm ) { 520 if( ampm ) {
521 int hour = tm.hour(); 521 int hour = tm.hour();
522 if (hour == 0) 522 if (hour == 0)
523 hour = 12; 523 hour = 12;
524 if (hour > 12) 524 if (hour > 12)
525 hour -= 12; 525 hour -= 12;
526 s.sprintf( "%2d:%02d %s", hour, tm.minute(), 526 s.sprintf( "%2d:%02d %s", hour, tm.minute(),
527 (tm.hour() >= 12) ? "PM" : "AM" ); 527 (tm.hour() >= 12) ? "PM" : "AM" );
528 return s; 528 return s;
529 } else { 529 } else {
530 s.sprintf( "%2d:%02d", tm.hour(), tm.minute() ); 530 s.sprintf( "%2d:%02d", tm.hour(), tm.minute() );
531 return s; 531 return s;
532 } 532 }
533 533
534} 534}
535 535
536 536
537DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev, 537DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev,
538 QWidget* parent = 0, 538 QWidget* parent,
539 int SHOW_LOCATION = 0, 539 int SHOW_LOCATION,
540 int SHOW_NOTES = 0, 540 int SHOW_NOTES,
541 const char* name = 0, 541 const char* name,
542 WFlags fl = 0) : 542 WFlags fl) :
543 ClickableLabel(parent,name,fl), event(ev) { 543 ClickableLabel(parent,name,fl), event(ev) {
544 544
545 QString msg; 545 QString msg;
546 QTime time = QTime::currentTime(); 546 QTime time = QTime::currentTime();
547 547
548 Config config( "qpe" ); 548 Config config( "qpe" );
549 config.setGroup( "Time" ); 549 config.setGroup( "Time" );
550 // if 24 h format 550 // if 24 h format
551 ampm = config.readBoolEntry( "AMPM", TRUE ); 551 ampm = config.readBoolEntry( "AMPM", TRUE );
552 552
553 553
554 if ((time.toString() <= TimeString::dateString((ev).event().end())) ) { 554 if ((time.toString() <= TimeString::dateString((ev).event().end())) ) {
555 // show only later appointments 555 // show only later appointments
556 msg += "<B>" + (ev).description() + "</B>"; 556 msg += "<B>" + (ev).description() + "</B>";
557 if ( (ev).event().hasAlarm() ) { 557 if ( (ev).event().hasAlarm() ) {
558 msg += " <b>[with alarm]</b>"; 558 msg += " <b>[with alarm]</b>";
559 } 559 }
560 // include location or not 560 // include location or not
561 if (SHOW_LOCATION == 1) { 561 if (SHOW_LOCATION == 1) {
562 msg += "<BR><i>" + (ev).location() + "</i>"; 562 msg += "<BR><i>" + (ev).location() + "</i>";
563 } 563 }
564 564
565 if ( (TimeString::timeString(QTime((ev).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((ev).event().end().time()) ) == "23:59") ) { 565 if ( (TimeString::timeString(QTime((ev).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((ev).event().end().time()) ) == "23:59") ) {
566 msg += "<br>All day"; 566 msg += "<br>All day";
567 } else { 567 } else {
568 // start time of event 568 // start time of event
569 msg += "<br>" + ampmTime(QTime((ev).event().start().time()) ) 569 msg += "<br>" + ampmTime(QTime((ev).event().start().time()) )
570 // end time of event 570 // end time of event
571 + "<b> - </b>" + ampmTime(QTime((ev).event().end().time()) ); 571 + "<b> - </b>" + ampmTime(QTime((ev).event().end().time()) );
572 } 572 }
573 // include possible note or not 573 // include possible note or not
574 if (SHOW_NOTES == 1) { 574 if (SHOW_NOTES == 1) {
575 msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP); 575 msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP);
576 } 576 }
577 } 577 }
578 578
579 setText(msg); 579 setText(msg);
580 connect(this, SIGNAL(clicked()), this, SLOT(editMe())); 580 connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
581 setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) ); 581 setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
582} 582}
583 583
584 584
585QString DateBookEventLater::ampmTime(QTime tm) { 585QString DateBookEventLater::ampmTime(QTime tm) {
586 586
587 QString s; 587 QString s;
588 if( ampm ) { 588 if( ampm ) {
589 int hour = tm.hour(); 589 int hour = tm.hour();
590 if (hour == 0) 590 if (hour == 0)
591 hour = 12; 591 hour = 12;
592 if (hour > 12) 592 if (hour > 12)
593 hour -= 12; 593 hour -= 12;
594 s.sprintf( "%2d:%02d %s", hour, tm.minute(), 594 s.sprintf( "%2d:%02d %s", hour, tm.minute(),
595 (tm.hour() >= 12) ? "PM" : "AM" ); 595 (tm.hour() >= 12) ? "PM" : "AM" );
596 return s; 596 return s;
597 } else { 597 } else {
598 s.sprintf( "%2d:%02d", tm.hour(), tm.minute() ); 598 s.sprintf( "%2d:%02d", tm.hour(), tm.minute() );
599 return s; 599 return s;
600 } 600 }
601 601
602} 602}
603 603
604 604
605void DateBookEvent::editMe() { 605void DateBookEvent::editMe() {
606 emit editEvent(event.event()); 606 emit editEvent(event.event());
607} 607}
608 608
609void DateBookEventLater::editMe() { 609void DateBookEventLater::editMe() {
610 emit editEvent(event.event()); 610 emit editEvent(event.event());
611} 611}
612 612
613 613