| -rw-r--r-- | core/pim/today/TODO | 2 | ||||
| -rw-r--r-- | core/pim/today/changelog | 8 | ||||
| -rw-r--r-- | core/pim/today/opie-today.control | 2 | ||||
| -rw-r--r-- | core/pim/today/today.cpp | 140 | ||||
| -rw-r--r-- | core/pim/today/today.h | 11 | ||||
| -rw-r--r-- | core/pim/today/today.pro | 6 |
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 @@ -5,10 +5,8 @@ TODO for today: * show alarm icons on alarm events (partly done) * add am/pm mode instead of 24 h, take system default * qcop integration for updating events? -* sort todos by pri. - * make Opiezilla a clickable label wich is allway on the far right side of the 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,6 +1,14 @@ +0.3.0 + +* today uses now tododb from libopie. So major changes in the todo part: + - overdue items on top + - then sorted by date, then by priority +* some cleanups +* speed optimisations + 0.2.9 * Many bugfixes. * Today now apparently sorts the dates _allways_ right, i would assume it to be a qt bug 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 @@ Files: bin/today apps/Applications/today.desktop pics/today Priority: optional Section: opie/applications Maintainer: Maximilian Reiß <max.reiss@gmx.de> Architecture: arm -Version: 0.2.9-$SUB_VERSION +Version: 0.3.0-$SUB_VERSION Depends: opie-base ($QPE_VERSION) License: GPL Description: today screen 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 @@ -15,16 +15,13 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "today.h" -#include "minidom.h" -#include "TodoItem.h" -#include <qpe/datebookdb.h> #include <qpe/timestring.h> #include <qpe/config.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/qprocess.h> #include <qpe/resource.h> #include <qpe/contact.h> @@ -53,14 +50,14 @@ int MAX_CHAR_CLIP; int MAX_LINES_MEET; int SHOW_LOCATION; int SHOW_NOTES; // show only later dates int ONLY_LATER; int AUTOSTART; - int NEW_START=1; + /* * Constructs a Example which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ Today::Today( QWidget* parent, const char* name, WFlags fl ) : TodayBase( parent, name, fl ), AllDateBookEvents(NULL) { @@ -74,14 +71,16 @@ Today::Today( QWidget* parent, const char* name, WFlags fl ) QCopChannel *todayChannel = new QCopChannel("QPE/Today" , this ); connect (todayChannel, SIGNAL( received(const QCString &, const QByteArray &)), this, SLOT ( channelReceived(const QCString &, const QByteArray &)) ); #endif #endif - draw(); setOwnerField(); + todo = new ToDoDB; + getTodo(); + draw(); autoStart(); } /* * Qcop receive method. */ @@ -141,15 +140,21 @@ void Today::autoStart() { * Repaint method. Reread all fields. */ void Today::draw() { init(); getDates(); getMail(); - getTodo(); + + // if the todolist.xml file was not modified in between, do not parse it. + if (checkIfModified()) { + todo = new ToDoDB; + getTodo(); + } + // how often refresh - QTimer::singleShot( 10*1000, this, SLOT(draw() ) ); + QTimer::singleShot( 20*1000, this, SLOT(draw() ) ); } /* * Check if the todolist.xml was modified (if there are new entries. * Returns true if it was modified. */ @@ -179,15 +184,15 @@ bool Today::checkIfModified() { * Init stuff needed for today. Reads the config file. */ void Today::init() { QDate date = QDate::currentDate(); QString time = (tr( date.toString()) ); - TextLabel1->setText(time); + TextLabel1->setText(QString("<font color=#FFFFFF>" + time + "</font>")); db = new DateBookDB; - + // read config Config cfg("today"); cfg.setGroup("BaseConfig"); // -- config file section -- // how many lines should be showed in the task section @@ -260,13 +265,13 @@ void Today::startConfig() { /* * Get all events that are in the datebook xml file for today */ void Today::getDates() { QDate date = QDate::currentDate(); - + if (AllDateBookEvents) delete AllDateBookEvents; AllDateBookEvents = new QWidget( ); QVBoxLayout* layoutDates = new QVBoxLayout(AllDateBookEvents); QValueList<EffectiveEvent> list = db->getEffectiveEvents(date, date); @@ -319,76 +324,12 @@ void Today::getDates() { layoutDates->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding)); sv1->addChild(AllDateBookEvents); AllDateBookEvents->show(); } -/* - * Parse in the todolist.xml - */ -QList<TodoItem> Today::loadTodo(const char *filename) { - DOM *todo; - ELE *tasks; - ELE **tasklist; - ATT **attlist; - int i, j; - char *description; - int completed; - int priority; - TodoItem *tmp; - QList<TodoItem> loadtodolist; - - todo = minidom_load(filename); - - tasks = todo->el; - tasks = tasks->el[0]; /*!DOCTYPE-quickhack*/ - if(tasks) { - tasklist = tasks->el; - i = 0; - while((tasklist) && (tasklist[i])) { - attlist = tasklist[i]->at; - j = 0; - description = NULL; - priority = -1; - completed = -1; - while((attlist) && (attlist[j])) { - if(!attlist[j]->name) { - continue; - } - if(!strcmp(attlist[j]->name, "Description")) { - description = attlist[j]->value; - } - // get Completed tag (0 or 1) - if(!strcmp(attlist[j]->name, "Completed")) { - QString s = attlist[j]->name; - if(s == "Completed") { - completed = QString(attlist[j]->value).toInt(); - } - } - // get Priority (1 to 5) - if(!strcmp(attlist[j]->name, "Priority")) { - QString s = attlist[j]->name; - if(s == "Priority") { - priority = QString(attlist[j]->value).toInt(); - } - } - j++; - } - if(description) { - tmp = new TodoItem(description, completed, priority); - loadtodolist.append(tmp); - } - i++; - } - } - - minidom_free(todo); - - return loadtodolist; -} - void Today::getMail() { Config cfg("opiemail"); cfg.setGroup("today"); // how many lines should be showed in the task section @@ -403,41 +344,45 @@ void Today::getMail() { /* * Get the todos */ void Today::getTodo() { - // if the todolist.xml file was not modified in between, do not parse it. - if (!checkIfModified() && !NEW_START) { - return; - } - // since it was the new start or the return from config dialog, set it to 0 again. - NEW_START=0; - QString output; QString tmpout; int count = 0; - - QDir dir; - QString homedir = dir.homeDirPath (); - // see if todolist.xml does exist. - QFile f(homedir +"/Applications/todolist/todolist.xml"); - if ( f.exists() ) { - QList<TodoItem> todolist = loadTodo(homedir +"/Applications/todolist/todolist.xml"); - - TodoItem *item; - for( item = todolist.first(); item; item = todolist.next()) { - if (!(item->getCompleted() == 1) ) { - count++; - if (count <= MAX_LINES_TASK) { - tmpout += "<b>- </b>" + QString(((item)->getDescription().mid(0, MAX_CHAR_CLIP) + ("<br>"))); + int ammount = 0; + + // get overdue todos first + QValueList<ToDoEvent> overDueList = todo->overDue(); + qBubbleSort(overDueList); + for ( QValueList<ToDoEvent>::Iterator it=overDueList.begin(); + it!=overDueList.end(); ++it ) { + if (!(*it).isCompleted() && ( ammount < MAX_LINES_TASK) ) { + tmpout += "<font color=#e00000><b>-" +((*it).description()).mid(0, MAX_CHAR_CLIP) + "</b></font><br>"; + ammount++; + } } + + // get total number of still open todos + QValueList<ToDoEvent> open = todo->rawToDos(); + qBubbleSort(open); + for ( QValueList<ToDoEvent>::Iterator it=open.begin(); + it!=open.end(); ++it ) { + if (!(*it).isCompleted()){ + count +=1; + // not the overdues, we allready got them, and not if we are + // over the maxlines + if (!(*it).isOverdue() && ( ammount < MAX_LINES_TASK) ) { + tmpout += "<b>-</b>" + ((*it).description()).mid(0, MAX_CHAR_CLIP) + "<br>"; + ammount++; } } } + if (count > 0) { if( count == 1 ) { output = tr("There is <b> 1</b> active task: <br>" ); } else { output = tr("There are <b> %1</b> active tasks: <br>").arg(count); } @@ -500,13 +445,13 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, QWidget* parent = 0, const char* name = 0, WFlags fl = 0) : ClickableLabel(parent,name,fl), event(ev) { QString msg; - QTime time = QTime::currentTime(); + //QTime time = QTime::currentTime(); if (!ONLY_LATER) { msg += "<B>" + (ev).description() + "</B>"; if ( (ev).event().hasAlarm() ) { msg += " <b>[with alarm]</b>"; } @@ -568,15 +513,12 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev, // include possible note or not if (SHOW_NOTES == 1) { msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP) + "<br>"; } } - // if (msg.isEmpty()) { - // msg = tr("No more appointments today"); - // } setText(msg); connect(this, SIGNAL(clicked()), this, SLOT(editMe())); setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) ); } 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 @@ -21,16 +21,17 @@ #ifndef TODAY_H #define TODAY_H #include <qpe/datebookdb.h> #include <qpe/event.h> +#include <opie/tododb.h> + #include <qdatetime.h> #include <qlist.h> -#include "TodoItem.h" #include "todayconfig.h" #include "todaybase.h" #include "clickablelabel.h" class QVBoxLayout; @@ -54,18 +55,18 @@ class Today : public TodayBase { void getTodo(); void getMail(); void autoStart(); bool checkIfModified(); void setOwnerField(); void setOwnerField(QString &string); - QList<TodoItem> loadTodo(const char *filename); -private slots: - void channelReceived(const QCString &msg, const QByteArray & data); - + private slots: + void channelReceived(const QCString &msg, const QByteArray & data); + private: DateBookDB *db; + ToDoDB *todo; todayconfig *conf; QWidget* AllDateBookEvents; //Config cfg; int MAX_LINES_TASK; int MAX_CHAR_CLIP; int MAX_LINES_MEET; 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 @@ TEMPLATE = app #CONFIG = qt warn_on debug CONFIG = qt warn_on release -HEADERS = today.h TodoItem.h minidom.h todaybase.h todayconfig.h clickablelabel.h -SOURCES = main.cpp today.cpp todaybase.cpp todayconfig.cpp minidom.c TodoItem.cpp clickablelabel.cpp +HEADERS = today.h todaybase.h todayconfig.h clickablelabel.h +SOURCES = main.cpp today.cpp todaybase.cpp todayconfig.cpp clickablelabel.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopie INTERFACES = TARGET = today DESTDIR = $(OPIEDIR)/bin TRANSLATIONS = ../i18n/pt_BR/today.ts |