summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-06-27 14:33:51 (UTC)
committer harlekin <harlekin>2002-06-27 14:33:51 (UTC)
commit63d7fd9b233a5b6a9e3670b6ef1c09a2e87ffa42 (patch) (unidiff)
treee5c81e0728f394fba918f9e71cbacd33de870aee
parent540fd6a4a7cc86070c94f41833c4b9b9fa0e9824 (diff)
downloadopie-63d7fd9b233a5b6a9e3670b6ef1c09a2e87ffa42.zip
opie-63d7fd9b233a5b6a9e3670b6ef1c09a2e87ffa42.tar.gz
opie-63d7fd9b233a5b6a9e3670b6ef1c09a2e87ffa42.tar.bz2
should fix bug #83
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/today.cpp40
1 files changed, 23 insertions, 17 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index ad1ec90..62becb0 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -13,46 +13,43 @@
13 * This program is free software; you can redistribute it and/or modify * 13 * This program is free software; you can redistribute it and/or modify *
14 * it under the terms of the GNU General Public License as published by * 14 * it under the terms of the GNU General Public License as published by *
15 * the Free Software Foundation; either version 2 of the License, or * 15 * the Free Software Foundation; either version 2 of the License, or *
16 * (at your option) any later version. * 16 * (at your option) any later version. *
17 * * 17 * *
18 ***************************************************************************/ 18 ***************************************************************************/
19 19
20#include "today.h" 20#include "today.h"
21 21
22#include <qpe/timestring.h> 22#include <qpe/timestring.h>
23#include <qpe/config.h> 23#include <qpe/config.h>
24#include <qpe/qcopenvelope_qws.h> 24#include <qpe/qcopenvelope_qws.h>
25//#include <qpe/qprocess.h>
26#include <qpe/resource.h> 25#include <qpe/resource.h>
27#include <qpe/contact.h> 26#include <qpe/contact.h>
28#include <qpe/global.h> 27#include <qpe/global.h>
29#include <qpe/qpeapplication.h> 28#include <qpe/qpeapplication.h>
30 29
31#include <qdir.h> 30#include <qdir.h>
32#include <qfile.h> 31#include <qfile.h>
33#include <qdatetime.h> 32#include <qdatetime.h>
34#include <qtextstream.h> 33#include <qtextstream.h>
35#include <qcheckbox.h> 34#include <qcheckbox.h>
36#include <qspinbox.h> 35#include <qspinbox.h>
37#include <qpushbutton.h> 36#include <qpushbutton.h>
38#include <qlabel.h> 37#include <qlabel.h>
39#include <qtimer.h> 38#include <qtimer.h>
40#include <qpixmap.h> 39#include <qpixmap.h>
41//#include <qfileinfo.h>
42#include <qlayout.h> 40#include <qlayout.h>
43#include <qtl.h> 41#include <qtl.h>
44 42
45 43
46//#include <iostream.h>
47#include <unistd.h> 44#include <unistd.h>
48#include <stdlib.h> 45#include <stdlib.h>
49 46
50int MAX_LINES_TASK; 47int MAX_LINES_TASK;
51int MAX_CHAR_CLIP; 48int MAX_CHAR_CLIP;
52int MAX_LINES_MEET; 49int MAX_LINES_MEET;
53int SHOW_LOCATION; 50int SHOW_LOCATION;
54int SHOW_NOTES; 51int SHOW_NOTES;
55// show only later dates 52// show only later dates
56int ONLY_LATER; 53int ONLY_LATER;
57int AUTOSTART; 54int AUTOSTART;
58int NEW_START=1; 55int NEW_START=1;
@@ -375,44 +372,53 @@ void Today::getMail() {
375void Today::getTodo() { 372void Today::getTodo() {
376 373
377 QString output; 374 QString output;
378 QString tmpout; 375 QString tmpout;
379 int count = 0; 376 int count = 0;
380 int ammount = 0; 377 int ammount = 0;
381 378
382 // get overdue todos first 379 // get overdue todos first
383 QValueList<ToDoEvent> overDueList = todo->overDue(); 380 QValueList<ToDoEvent> overDueList = todo->overDue();
384 qBubbleSort(overDueList); 381 qBubbleSort(overDueList);
385 for ( QValueList<ToDoEvent>::Iterator it=overDueList.begin(); 382 for ( QValueList<ToDoEvent>::Iterator it=overDueList.begin();
386 it!=overDueList.end(); ++it ) { 383 it!=overDueList.end(); ++it ) {
387 if (!(*it).isCompleted() && ( ammount < MAX_LINES_TASK) ) { 384 if (!(*it).isCompleted() && ( ammount < MAX_LINES_TASK) ) {
388 tmpout += "<font color=#e00000><b>-" +((*it).description()).mid(0, MAX_CHAR_CLIP) + "</b></font><br>"; 385 QString desc = (*it).summary();
389 ammount++; 386 if( desc.isEmpty() ) {
390 } 387 desc = (*it).description();
388 }
389 tmpout += "<font color=#e00000><b>-" + desc.mid(0, MAX_CHAR_CLIP) + "</b></font><br>";
390
391 ammount++;
392 }
391 } 393 }
392 394
393 // get total number of still open todos 395 // get total number of still open todos
394 QValueList<ToDoEvent> openTodo = todo->rawToDos(); 396 QValueList<ToDoEvent> openTodo = todo->rawToDos();
395 qBubbleSort(openTodo); 397 qBubbleSort(openTodo);
396 for ( QValueList<ToDoEvent>::Iterator it=openTodo.begin(); 398 for ( QValueList<ToDoEvent>::Iterator it=openTodo.begin();
397 it!=openTodo.end(); ++it ) { 399 it!=openTodo.end(); ++it ) {
398 if (!(*it).isCompleted()){ 400 if (!(*it).isCompleted()){
399 count +=1; 401 count +=1;
400 // not the overdues, we allready got them, and not if we are 402 // not the overdues, we allready got them, and not if we are
401 // over the maxlines 403 // over the maxlines
402 if (!(*it).isOverdue() && ( ammount < MAX_LINES_TASK) ) { 404 if (!(*it).isOverdue() && ( ammount < MAX_LINES_TASK) ) {
403 tmpout += "<b>-</b>" + ((*it).description()).mid(0, MAX_CHAR_CLIP) + "<br>"; 405 QString desc = (*it).summary();
404 ammount++; 406 if( desc.isEmpty() ) {
407 desc = (*it).description();
408 }
409 tmpout += "<b>-</b>" + desc.mid(0, MAX_CHAR_CLIP) + "<br>";
410 ammount++;
411 }
405 } 412 }
406 }
407 } 413 }
408 414
409 415
410 if (count > 0) { 416 if (count > 0) {
411 if( count == 1 ) { 417 if( count == 1 ) {
412 output = tr("There is <b> 1</b> active task: <br>" ); 418 output = tr("There is <b> 1</b> active task: <br>" );
413 } else { 419 } else {
414 output = tr("There are <b> %1</b> active tasks: <br>").arg(count); 420 output = tr("There are <b> %1</b> active tasks: <br>").arg(count);
415 } 421 }
416 output += tmpout; 422 output += tmpout;
417 } else { 423 } else {
418 output = tr("No active tasks"); 424 output = tr("No active tasks");
@@ -435,26 +441,26 @@ extern QPEApplication *todayApp;
435void Today::editCard() { 441void Today::editCard() {
436 442
437 startAddressbook(); 443 startAddressbook();
438 444
439 while( !QCopChannel::isRegistered("QPE/Addressbook")) todayApp->processEvents(); 445 while( !QCopChannel::isRegistered("QPE/Addressbook")) todayApp->processEvents();
440 QCopEnvelope v("QPE/Addressbook", "editPersonalAndClose()"); 446 QCopEnvelope v("QPE/Addressbook", "editPersonalAndClose()");
441} 447}
442 448
443/* 449/*
444 * launches datebook 450 * launches datebook
445 */ 451 */
446void Today::startDatebook() { 452void Today::startDatebook() {
447 QCopEnvelope e("QPE/System", "execute(QString)"); 453 QCopEnvelope e("QPE/System", "execute(QString)");
448 e << QString("datebook"); 454 e << QString("datebook");
449} 455}
450 456
451/* 457/*
452 * starts the edit dialog as known from datebook 458 * starts the edit dialog as known from datebook
453 */ 459 */
454void Today::editEvent(const Event &e) { 460void Today::editEvent(const Event &e) {
455 startDatebook(); 461 startDatebook();
456 462
457 while(!QCopChannel::isRegistered("QPE/Datebook")) todayApp->processEvents(); 463 while(!QCopChannel::isRegistered("QPE/Datebook")) todayApp->processEvents();
458 QCopEnvelope env("QPE/Datebook", "editEvent(int)"); 464 QCopEnvelope env("QPE/Datebook", "editEvent(int)");
459 env << e.uid(); 465 env << e.uid();
460} 466}