summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/TODO2
-rw-r--r--core/pim/today/changelog8
-rw-r--r--core/pim/today/opie-today.control2
-rw-r--r--core/pim/today/today.cpp140
-rw-r--r--core/pim/today/today.h11
-rw-r--r--core/pim/today/today.pro6
6 files changed, 59 insertions, 110 deletions
diff --git a/core/pim/today/TODO b/core/pim/today/TODO
index a3b01d2..0ff4758 100644
--- a/core/pim/today/TODO
+++ b/core/pim/today/TODO
@@ -1,14 +1,12 @@
1TODO for today: 1TODO for today:
2 2
3* start the app on "resume" (partly done) 3* start the app on "resume" (partly done)
4 4
5* show alarm icons on alarm events (partly done) 5* show alarm icons on alarm events (partly done)
6 6
7* add am/pm mode instead of 24 h, take system default 7* add am/pm mode instead of 24 h, take system default
8 8
9* qcop integration for updating events? 9* qcop integration for updating events?
10 10
11* sort todos by pri.
12
13* make Opiezilla a clickable label wich is allway on the far right side of 11* make Opiezilla a clickable label wich is allway on the far right side of
14the screen , klick will open credits ,) \ No newline at end of file 12the screen , klick will open credits ,) \ No newline at end of file
diff --git a/core/pim/today/changelog b/core/pim/today/changelog
index d0dd966..8ccff3c 100644
--- a/core/pim/today/changelog
+++ b/core/pim/today/changelog
@@ -1,12 +1,20 @@
10.3.0
2
3* today uses now tododb from libopie. So major changes in the todo part:
4 - overdue items on top
5 - then sorted by date, then by priority
6* some cleanups
7* speed optimisations
8
10.2.9 90.2.9
2 10
3* Many bugfixes. 11* Many bugfixes.
4* Today now apparently sorts the dates _allways_ right, i would assume it 12* Today now apparently sorts the dates _allways_ right, i would assume it
5to be a qt bug 13to be a qt bug
6 14
70.2.8 150.2.8
8 16
9* Appointments are now clickable (connection to datebook still missing) 17* Appointments are now clickable (connection to datebook still missing)
10* autostart support (opie only) 18* autostart support (opie only)
11 19
120.2.7 200.2.7
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control
index 0c55e59..9d8444e 100644
--- a/core/pim/today/opie-today.control
+++ b/core/pim/today/opie-today.control
@@ -1,10 +1,10 @@
1Files: bin/today apps/Applications/today.desktop pics/today 1Files: bin/today apps/Applications/today.desktop pics/today
2Priority: optional 2Priority: optional
3Section: opie/applications 3Section: opie/applications
4Maintainer: Maximilian Reiß <max.reiss@gmx.de> 4Maintainer: Maximilian Reiß <max.reiss@gmx.de>
5Architecture: arm 5Architecture: arm
6Version: 0.2.9-$SUB_VERSION 6Version: 0.3.0-$SUB_VERSION
7Depends: opie-base ($QPE_VERSION) 7Depends: opie-base ($QPE_VERSION)
8License: GPL 8License: GPL
9Description: today screen 9Description: today screen
10 A short overview over current appointments and tasks. 10 A short overview over current appointments and tasks.
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 1936518..2dc96fc 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -9,28 +9,25 @@
9 * 9 *
10 */ 10 */
11/*************************************************************************** 11/***************************************************************************
12 * * 12 * *
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#include "minidom.h"
22#include "TodoItem.h"
23 21
24#include <qpe/datebookdb.h>
25#include <qpe/timestring.h> 22#include <qpe/timestring.h>
26#include <qpe/config.h> 23#include <qpe/config.h>
27#include <qpe/qcopenvelope_qws.h> 24#include <qpe/qcopenvelope_qws.h>
28#include <qpe/qprocess.h> 25#include <qpe/qprocess.h>
29#include <qpe/resource.h> 26#include <qpe/resource.h>
30#include <qpe/contact.h> 27#include <qpe/contact.h>
31#include <qpe/global.h> 28#include <qpe/global.h>
32 29
33#include <qdir.h> 30#include <qdir.h>
34#include <qfile.h> 31#include <qfile.h>
35#include <qdatetime.h> 32#include <qdatetime.h>
36#include <qtextstream.h> 33#include <qtextstream.h>
@@ -47,47 +44,49 @@
47//#include <iostream.h> 44//#include <iostream.h>
48#include <unistd.h> 45#include <unistd.h>
49#include <stdlib.h> 46#include <stdlib.h>
50 47
51int MAX_LINES_TASK; 48int MAX_LINES_TASK;
52int MAX_CHAR_CLIP; 49int MAX_CHAR_CLIP;
53int MAX_LINES_MEET; 50int MAX_LINES_MEET;
54int SHOW_LOCATION; 51int SHOW_LOCATION;
55int SHOW_NOTES; 52int SHOW_NOTES;
56// show only later dates 53// show only later dates
57int ONLY_LATER; 54int ONLY_LATER;
58int AUTOSTART; 55int AUTOSTART;
59
60int NEW_START=1; 56int NEW_START=1;
57
61/* 58/*
62 * Constructs a Example which is a child of 'parent', with the 59 * Constructs a Example which is a child of 'parent', with the
63 * name 'name' and widget flags set to 'f' 60 * name 'name' and widget flags set to 'f'
64 */ 61 */
65Today::Today( QWidget* parent, const char* name, WFlags fl ) 62Today::Today( QWidget* parent, const char* name, WFlags fl )
66 : TodayBase( parent, name, fl ), AllDateBookEvents(NULL) { 63 : TodayBase( parent, name, fl ), AllDateBookEvents(NULL) {
67 QObject::connect( (QObject*)PushButton1, SIGNAL( clicked() ), this, SLOT(startConfig() ) ); 64 QObject::connect( (QObject*)PushButton1, SIGNAL( clicked() ), this, SLOT(startConfig() ) );
68 QObject::connect( (QObject*)TodoButton, SIGNAL( clicked() ), this, SLOT(startTodo() ) ); 65 QObject::connect( (QObject*)TodoButton, SIGNAL( clicked() ), this, SLOT(startTodo() ) );
69 QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) ); 66 QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) );
70 QObject::connect( (QObject*)MailButton, SIGNAL( clicked() ), this, SLOT(startMail() ) ); 67 QObject::connect( (QObject*)MailButton, SIGNAL( clicked() ), this, SLOT(startMail() ) );
71 68
72#if defined(Q_WS_QWS) 69#if defined(Q_WS_QWS)
73#if !defined(QT_NO_COP) 70#if !defined(QT_NO_COP)
74 QCopChannel *todayChannel = new QCopChannel("QPE/Today" , this ); 71 QCopChannel *todayChannel = new QCopChannel("QPE/Today" , this );
75 connect (todayChannel, SIGNAL( received(const QCString &, const QByteArray &)), 72 connect (todayChannel, SIGNAL( received(const QCString &, const QByteArray &)),
76 this, SLOT ( channelReceived(const QCString &, const QByteArray &)) ); 73 this, SLOT ( channelReceived(const QCString &, const QByteArray &)) );
77#endif 74#endif
78#endif 75#endif
79 76
80 draw();
81 setOwnerField(); 77 setOwnerField();
78 todo = new ToDoDB;
79 getTodo();
80 draw();
82 autoStart(); 81 autoStart();
83} 82}
84 83
85/* 84/*
86 * Qcop receive method. 85 * Qcop receive method.
87 */ 86 */
88void Today::channelReceived(const QCString &msg, const QByteArray & data) { 87void Today::channelReceived(const QCString &msg, const QByteArray & data) {
89 QDataStream stream(data, IO_ReadOnly ); 88 QDataStream stream(data, IO_ReadOnly );
90 if ( msg == "message(QString)" ) { 89 if ( msg == "message(QString)" ) {
91 QString message; 90 QString message;
92 stream >> message; 91 stream >> message;
93 setOwnerField(message); 92 setOwnerField(message);
@@ -135,27 +134,33 @@ void Today::autoStart() {
135 e << QString("remove"); 134 e << QString("remove");
136 e << QString("today"); 135 e << QString("today");
137 } 136 }
138} 137}
139 138
140/* 139/*
141 * Repaint method. Reread all fields. 140 * Repaint method. Reread all fields.
142 */ 141 */
143void Today::draw() { 142void Today::draw() {
144 init(); 143 init();
145 getDates(); 144 getDates();
146 getMail(); 145 getMail();
147 getTodo(); 146
147 // if the todolist.xml file was not modified in between, do not parse it.
148 if (checkIfModified()) {
149 todo = new ToDoDB;
150 getTodo();
151 }
152
148 // how often refresh 153 // how often refresh
149 QTimer::singleShot( 10*1000, this, SLOT(draw() ) ); 154 QTimer::singleShot( 20*1000, this, SLOT(draw() ) );
150} 155}
151 156
152/* 157/*
153 * Check if the todolist.xml was modified (if there are new entries. 158 * Check if the todolist.xml was modified (if there are new entries.
154 * Returns true if it was modified. 159 * Returns true if it was modified.
155 */ 160 */
156bool Today::checkIfModified() { 161bool Today::checkIfModified() {
157 162
158 QDir dir; 163 QDir dir;
159 QString homedir = dir.homeDirPath (); 164 QString homedir = dir.homeDirPath ();
160 QString time; 165 QString time;
161 166
@@ -173,27 +178,27 @@ bool Today::checkIfModified() {
173 return true; 178 return true;
174 } 179 }
175} 180}
176 181
177 182
178/* 183/*
179 * Init stuff needed for today. Reads the config file. 184 * Init stuff needed for today. Reads the config file.
180 */ 185 */
181void Today::init() { 186void Today::init() {
182 QDate date = QDate::currentDate(); 187 QDate date = QDate::currentDate();
183 QString time = (tr( date.toString()) ); 188 QString time = (tr( date.toString()) );
184 189
185 TextLabel1->setText(time); 190 TextLabel1->setText(QString("<font color=#FFFFFF>" + time + "</font>"));
186 db = new DateBookDB; 191 db = new DateBookDB;
187 192
188 // read config 193 // read config
189 Config cfg("today"); 194 Config cfg("today");
190 cfg.setGroup("BaseConfig"); 195 cfg.setGroup("BaseConfig");
191 196
192 // -- config file section -- 197 // -- config file section --
193 // how many lines should be showed in the task section 198 // how many lines should be showed in the task section
194 MAX_LINES_TASK = cfg.readNumEntry("maxlinestask",5); 199 MAX_LINES_TASK = cfg.readNumEntry("maxlinestask",5);
195 // after how many chars should the be cut off on tasks and notes 200 // after how many chars should the be cut off on tasks and notes
196 MAX_CHAR_CLIP = cfg.readNumEntry("maxcharclip",40); 201 MAX_CHAR_CLIP = cfg.readNumEntry("maxcharclip",40);
197 // how many lines should be showed in the datebook section 202 // how many lines should be showed in the datebook section
198 MAX_LINES_MEET = cfg.readNumEntry("maxlinesmeet",5); 203 MAX_LINES_MEET = cfg.readNumEntry("maxlinesmeet",5);
199 // If location is to be showed too, 1 to activate it. 204 // If location is to be showed too, 1 to activate it.
@@ -254,25 +259,25 @@ void Today::startConfig() {
254 cfg.write(); 259 cfg.write();
255 NEW_START=1; 260 NEW_START=1;
256 draw(); 261 draw();
257 autoStart(); 262 autoStart();
258} 263}
259 264
260 265
261/* 266/*
262 * Get all events that are in the datebook xml file for today 267 * Get all events that are in the datebook xml file for today
263 */ 268 */
264void Today::getDates() { 269void Today::getDates() {
265 QDate date = QDate::currentDate(); 270 QDate date = QDate::currentDate();
266 271
267 if (AllDateBookEvents) delete AllDateBookEvents; 272 if (AllDateBookEvents) delete AllDateBookEvents;
268 AllDateBookEvents = new QWidget( ); 273 AllDateBookEvents = new QWidget( );
269 QVBoxLayout* layoutDates = new QVBoxLayout(AllDateBookEvents); 274 QVBoxLayout* layoutDates = new QVBoxLayout(AllDateBookEvents);
270 275
271 QValueList<EffectiveEvent> list = db->getEffectiveEvents(date, date); 276 QValueList<EffectiveEvent> list = db->getEffectiveEvents(date, date);
272 277
273 qBubbleSort(list); 278 qBubbleSort(list);
274 // printf("Get dates\n"); 279 // printf("Get dates\n");
275 280
276 Config config( "qpe" ); 281 Config config( "qpe" );
277 // if 24 h format 282 // if 24 h format
278 //bool ampm = config.readBoolEntry( "AMPM", TRUE ); 283 //bool ampm = config.readBoolEntry( "AMPM", TRUE );
@@ -313,137 +318,77 @@ void Today::getDates() {
313 } 318 }
314 } else { 319 } else {
315 QLabel* noEvents = new QLabel(AllDateBookEvents); 320 QLabel* noEvents = new QLabel(AllDateBookEvents);
316 noEvents->setText("No appointments today"); 321 noEvents->setText("No appointments today");
317 layoutDates->addWidget(noEvents); 322 layoutDates->addWidget(noEvents);
318 } 323 }
319 324
320 layoutDates->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding)); 325 layoutDates->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
321 sv1->addChild(AllDateBookEvents); 326 sv1->addChild(AllDateBookEvents);
322 AllDateBookEvents->show(); 327 AllDateBookEvents->show();
323} 328}
324 329
325/*
326 * Parse in the todolist.xml
327 */
328QList<TodoItem> Today::loadTodo(const char *filename) {
329 DOM *todo;
330 ELE *tasks;
331 ELE **tasklist;
332 ATT **attlist;
333 int i, j;
334 char *description;
335 int completed;
336 int priority;
337 TodoItem *tmp;
338 QList<TodoItem> loadtodolist;
339
340 todo = minidom_load(filename);
341
342 tasks = todo->el;
343 tasks = tasks->el[0]; /*!DOCTYPE-quickhack*/
344 if(tasks) {
345 tasklist = tasks->el;
346 i = 0;
347 while((tasklist) && (tasklist[i])) {
348 attlist = tasklist[i]->at;
349 j = 0;
350 description = NULL;
351 priority = -1;
352 completed = -1;
353 while((attlist) && (attlist[j])) {
354 if(!attlist[j]->name) {
355 continue;
356 }
357 if(!strcmp(attlist[j]->name, "Description")) {
358 description = attlist[j]->value;
359 }
360 // get Completed tag (0 or 1)
361 if(!strcmp(attlist[j]->name, "Completed")) {
362 QString s = attlist[j]->name;
363 if(s == "Completed") {
364 completed = QString(attlist[j]->value).toInt();
365 }
366 }
367 // get Priority (1 to 5)
368 if(!strcmp(attlist[j]->name, "Priority")) {
369 QString s = attlist[j]->name;
370 if(s == "Priority") {
371 priority = QString(attlist[j]->value).toInt();
372 }
373 }
374 j++;
375 }
376 if(description) {
377 tmp = new TodoItem(description, completed, priority);
378 loadtodolist.append(tmp);
379 }
380 i++;
381 }
382 }
383
384 minidom_free(todo);
385
386 return loadtodolist;
387}
388
389 330
390void Today::getMail() { 331void Today::getMail() {
391 Config cfg("opiemail"); 332 Config cfg("opiemail");
392 cfg.setGroup("today"); 333 cfg.setGroup("today");
393 334
394 // how many lines should be showed in the task section 335 // how many lines should be showed in the task section
395 int NEW_MAILS = cfg.readNumEntry("newmails",0); 336 int NEW_MAILS = cfg.readNumEntry("newmails",0);
396 int OUTGOING = cfg.readNumEntry("outgoing",0); 337 int OUTGOING = cfg.readNumEntry("outgoing",0);
397 338
398 QString output = tr("<b>%1</b> new mail(s), <b>%2</b> outgoing").arg(NEW_MAILS).arg(OUTGOING); 339 QString output = tr("<b>%1</b> new mail(s), <b>%2</b> outgoing").arg(NEW_MAILS).arg(OUTGOING);
399 340
400 MailField->setText(output); 341 MailField->setText(output);
401} 342}
402 343
403 344
404/* 345/*
405 * Get the todos 346 * Get the todos
406 */ 347 */
407void Today::getTodo() { 348void Today::getTodo() {
408 349
409 // if the todolist.xml file was not modified in between, do not parse it.
410 if (!checkIfModified() && !NEW_START) {
411 return;
412 }
413 // since it was the new start or the return from config dialog, set it to 0 again.
414 NEW_START=0;
415
416 QString output; 350 QString output;
417 QString tmpout; 351 QString tmpout;
418 int count = 0; 352 int count = 0;
419 353 int ammount = 0;
420 QDir dir; 354
421 QString homedir = dir.homeDirPath (); 355 // get overdue todos first
422 // see if todolist.xml does exist. 356 QValueList<ToDoEvent> overDueList = todo->overDue();
423 QFile f(homedir +"/Applications/todolist/todolist.xml"); 357 qBubbleSort(overDueList);
424 if ( f.exists() ) { 358 for ( QValueList<ToDoEvent>::Iterator it=overDueList.begin();
425 QList<TodoItem> todolist = loadTodo(homedir +"/Applications/todolist/todolist.xml"); 359 it!=overDueList.end(); ++it ) {
426 360 if (!(*it).isCompleted() && ( ammount < MAX_LINES_TASK) ) {
427 TodoItem *item; 361 tmpout += "<font color=#e00000><b>-" +((*it).description()).mid(0, MAX_CHAR_CLIP) + "</b></font><br>";
428 for( item = todolist.first(); item; item = todolist.next()) { 362 ammount++;
429 if (!(item->getCompleted() == 1) ) { 363 }
430 count++;
431 if (count <= MAX_LINES_TASK) {
432 tmpout += "<b>- </b>" + QString(((item)->getDescription().mid(0, MAX_CHAR_CLIP) + ("<br>")));
433 } 364 }
365
366 // get total number of still open todos
367 QValueList<ToDoEvent> open = todo->rawToDos();
368 qBubbleSort(open);
369 for ( QValueList<ToDoEvent>::Iterator it=open.begin();
370 it!=open.end(); ++it ) {
371 if (!(*it).isCompleted()){
372 count +=1;
373 // not the overdues, we allready got them, and not if we are
374 // over the maxlines
375 if (!(*it).isOverdue() && ( ammount < MAX_LINES_TASK) ) {
376 tmpout += "<b>-</b>" + ((*it).description()).mid(0, MAX_CHAR_CLIP) + "<br>";
377 ammount++;
434 } 378 }
435 } 379 }
436 } 380 }
437 381
382
438 if (count > 0) { 383 if (count > 0) {
439 if( count == 1 ) { 384 if( count == 1 ) {
440 output = tr("There is <b> 1</b> active task: <br>" ); 385 output = tr("There is <b> 1</b> active task: <br>" );
441 } else { 386 } else {
442 output = tr("There are <b> %1</b> active tasks: <br>").arg(count); 387 output = tr("There are <b> %1</b> active tasks: <br>").arg(count);
443 } 388 }
444 output += tmpout; 389 output += tmpout;
445 } else { 390 } else {
446 output = tr("No active tasks"); 391 output = tr("No active tasks");
447 } 392 }
448 393
449 TodoField->setText(tr(output)); 394 TodoField->setText(tr(output));
@@ -494,25 +439,25 @@ Today::~Today() {
494 439
495 440
496/* 441/*
497 * Gets the events for the current day, if it should get all dates 442 * Gets the events for the current day, if it should get all dates
498 */ 443 */
499DateBookEvent::DateBookEvent(const EffectiveEvent &ev, 444DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
500 QWidget* parent = 0, 445 QWidget* parent = 0,
501 const char* name = 0, 446 const char* name = 0,
502 WFlags fl = 0) : 447 WFlags fl = 0) :
503 ClickableLabel(parent,name,fl), event(ev) { 448 ClickableLabel(parent,name,fl), event(ev) {
504 449
505 QString msg; 450 QString msg;
506 QTime time = QTime::currentTime(); 451 //QTime time = QTime::currentTime();
507 452
508 if (!ONLY_LATER) { 453 if (!ONLY_LATER) {
509 msg += "<B>" + (ev).description() + "</B>"; 454 msg += "<B>" + (ev).description() + "</B>";
510 if ( (ev).event().hasAlarm() ) { 455 if ( (ev).event().hasAlarm() ) {
511 msg += " <b>[with alarm]</b>"; 456 msg += " <b>[with alarm]</b>";
512 } 457 }
513 // include location or not 458 // include location or not
514 if (SHOW_LOCATION == 1) { 459 if (SHOW_LOCATION == 1) {
515 msg += "<BR><i>" + (ev).location(); 460 msg += "<BR><i>" + (ev).location();
516 msg += "</i>"; 461 msg += "</i>";
517 } 462 }
518 463
@@ -562,27 +507,24 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev,
562 } else { 507 } else {
563 // start time of event 508 // start time of event
564 msg += "<br>" + TimeString::timeString(QTime((ev).event().start().time()) ) 509 msg += "<br>" + TimeString::timeString(QTime((ev).event().start().time()) )
565 // end time of event 510 // end time of event
566 + "<b> - </b>" + TimeString::timeString(QTime((ev).event().end().time()) ); 511 + "<b> - </b>" + TimeString::timeString(QTime((ev).event().end().time()) );
567 } 512 }
568 // include possible note or not 513 // include possible note or not
569 if (SHOW_NOTES == 1) { 514 if (SHOW_NOTES == 1) {
570 msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP) + "<br>"; 515 msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
571 } 516 }
572 } 517 }
573 518
574 // if (msg.isEmpty()) {
575 // msg = tr("No more appointments today");
576 // }
577 setText(msg); 519 setText(msg);
578 connect(this, SIGNAL(clicked()), this, SLOT(editMe())); 520 connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
579 setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) ); 521 setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
580} 522}
581 523
582 524
583void DateBookEvent::editMe() { 525void DateBookEvent::editMe() {
584 emit editEvent(event.event()); 526 emit editEvent(event.event());
585} 527}
586 528
587void DateBookEventLater::editMe() { 529void DateBookEventLater::editMe() {
588 emit editEvent(event.event()); 530 emit editEvent(event.event());
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index 6dec2c2..6048781 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -15,28 +15,29 @@
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 20
21#ifndef TODAY_H 21#ifndef TODAY_H
22#define TODAY_H 22#define TODAY_H
23 23
24#include <qpe/datebookdb.h> 24#include <qpe/datebookdb.h>
25#include <qpe/event.h> 25#include <qpe/event.h>
26 26
27#include <opie/tododb.h>
28
27#include <qdatetime.h> 29#include <qdatetime.h>
28#include <qlist.h> 30#include <qlist.h>
29 31
30#include "TodoItem.h"
31#include "todayconfig.h" 32#include "todayconfig.h"
32#include "todaybase.h" 33#include "todaybase.h"
33#include "clickablelabel.h" 34#include "clickablelabel.h"
34 35
35class QVBoxLayout; 36class QVBoxLayout;
36 37
37class Today : public TodayBase { 38class Today : public TodayBase {
38 Q_OBJECT 39 Q_OBJECT
39 40
40 public: 41 public:
41 Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); 42 Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
42 ~Today(); 43 ~Today();
@@ -48,30 +49,30 @@ class Today : public TodayBase {
48 void startMail(); 49 void startMail();
49 void draw(); 50 void draw();
50 void editEvent(const Event &e); 51 void editEvent(const Event &e);
51 private: 52 private:
52 void init(); 53 void init();
53 void getDates(); 54 void getDates();
54 void getTodo(); 55 void getTodo();
55 void getMail(); 56 void getMail();
56 void autoStart(); 57 void autoStart();
57 bool checkIfModified(); 58 bool checkIfModified();
58 void setOwnerField(); 59 void setOwnerField();
59 void setOwnerField(QString &string); 60 void setOwnerField(QString &string);
60 QList<TodoItem> loadTodo(const char *filename); 61 private slots:
61private slots: 62 void channelReceived(const QCString &msg, const QByteArray & data);
62 void channelReceived(const QCString &msg, const QByteArray & data); 63
63
64 private: 64 private:
65 DateBookDB *db; 65 DateBookDB *db;
66 ToDoDB *todo;
66 todayconfig *conf; 67 todayconfig *conf;
67 QWidget* AllDateBookEvents; 68 QWidget* AllDateBookEvents;
68 //Config cfg; 69 //Config cfg;
69 int MAX_LINES_TASK; 70 int MAX_LINES_TASK;
70 int MAX_CHAR_CLIP; 71 int MAX_CHAR_CLIP;
71 int MAX_LINES_MEET; 72 int MAX_LINES_MEET;
72 int SHOW_LOCATION; 73 int SHOW_LOCATION;
73 int SHOW_NOTES; 74 int SHOW_NOTES;
74}; 75};
75 76
76class DateBookEvent: public ClickableLabel { 77class DateBookEvent: public ClickableLabel {
77 Q_OBJECT 78 Q_OBJECT
diff --git a/core/pim/today/today.pro b/core/pim/today/today.pro
index e61480c..b20baea 100644
--- a/core/pim/today/today.pro
+++ b/core/pim/today/today.pro
@@ -1,13 +1,13 @@
1 TEMPLATE= app 1 TEMPLATE= app
2 #CONFIG = qt warn_on debug 2 #CONFIG = qt warn_on debug
3 CONFIG = qt warn_on release 3 CONFIG = qt warn_on release
4 HEADERS = today.h TodoItem.h minidom.h todaybase.h todayconfig.h clickablelabel.h 4 HEADERS = today.h todaybase.h todayconfig.h clickablelabel.h
5 SOURCES = main.cpp today.cpp todaybase.cpp todayconfig.cpp minidom.c TodoItem.cpp clickablelabel.cpp 5 SOURCES = main.cpp today.cpp todaybase.cpp todayconfig.cpp clickablelabel.cpp
6 6
7 INCLUDEPATH+= $(OPIEDIR)/include 7 INCLUDEPATH+= $(OPIEDIR)/include
8 DEPENDPATH+= $(OPIEDIR)/include 8 DEPENDPATH+= $(OPIEDIR)/include
9LIBS += -lqpe 9LIBS += -lqpe -lopie
10 INTERFACES= 10 INTERFACES=
11 TARGET = today 11 TARGET = today
12 DESTDIR = $(OPIEDIR)/bin 12 DESTDIR = $(OPIEDIR)/bin
13TRANSLATIONS = ../i18n/pt_BR/today.ts 13TRANSLATIONS = ../i18n/pt_BR/today.ts