summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/plugins/todolist/todolist.pro3
-rw-r--r--core/pim/today/plugins/todolist/todoplugin.cpp2
-rw-r--r--core/pim/today/plugins/todolist/todopluginwidget.cpp46
-rw-r--r--core/pim/today/plugins/todolist/todopluginwidget.h8
4 files changed, 29 insertions, 30 deletions
diff --git a/core/pim/today/plugins/todolist/todolist.pro b/core/pim/today/plugins/todolist/todolist.pro
index 1f9c61c..38db406 100644
--- a/core/pim/today/plugins/todolist/todolist.pro
+++ b/core/pim/today/plugins/todolist/todolist.pro
@@ -1,8 +1,7 @@
TEMPLATE = lib
-#TEMPLATE = app
CONFIG -= moc
-CONFIG += qt debug
+CONFIG += qt release
# Input
HEADERS = todoplugin.h todopluginimpl.h todopluginconfig.h \
todopluginwidget.h
diff --git a/core/pim/today/plugins/todolist/todoplugin.cpp b/core/pim/today/plugins/todolist/todoplugin.cpp
index e10b414..b5abbd3 100644
--- a/core/pim/today/plugins/todolist/todoplugin.cpp
+++ b/core/pim/today/plugins/todolist/todoplugin.cpp
@@ -31,9 +31,9 @@ QString TodolistPlugin::pluginName() const {
return QObject::tr( "Todolist plugin" );
}
double TodolistPlugin::versionNumber() const {
- return 0.7;
+ return 0.8;
}
QString TodolistPlugin::pixmapNameWidget() const {
return "TodoList";
diff --git a/core/pim/today/plugins/todolist/todopluginwidget.cpp b/core/pim/today/plugins/todolist/todopluginwidget.cpp
index 320969e..773e5cf 100644
--- a/core/pim/today/plugins/todolist/todopluginwidget.cpp
+++ b/core/pim/today/plugins/todolist/todopluginwidget.cpp
@@ -35,9 +35,11 @@ TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name )
if ( todo ) {
delete todo;
}
- todo = new ToDoDB();
+
+ todo = new OTodoAccess();
+ todo->load();
readConfig();
getTodo();
}
@@ -66,52 +68,46 @@ void TodolistPluginWidget::getTodo() {
delete todoLabel;
}
todoLabel = new OClickableLabel( this );
- todoLabel->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ) );
connect( todoLabel, SIGNAL( clicked() ), this, SLOT( startTodolist() ) );
QString output;
QString tmpout;
int count = 0;
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 < m_maxLinesTask ) ) {
- QString desc = (*it).summary();
+ m_list = todo->overDue();
+
+ for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
+ if (!(*m_it).isCompleted() && ( ammount < m_maxLinesTask ) ) {
+ QString desc = (*m_it).summary();
if( desc.isEmpty() ) {
- desc = (*it).description();
+ desc = (*m_it).description();
}
tmpout += "<font color=#e00000><b>-" + desc.mid( 0, m_maxCharClip ) + "</b></font><br>";
ammount++;
}
}
// get total number of still open todos
- QValueList<ToDoEvent> openTodo = todo->rawToDos();
- qBubbleSort( openTodo );
- for ( QValueList<ToDoEvent>::Iterator it = openTodo.begin();
- it != openTodo.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 < m_maxLinesTask ) ) {
- QString desc = (*it).summary();
- if( desc.isEmpty() ) {
- desc = (*it).description();
- }
- tmpout += "<b>-</b>" + desc.mid( 0, m_maxCharClip ) + "<br>";
- ammount++;
+ m_list = todo->sorted( true, 1, 4, 1);
+
+ for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
+ count +=1;
+ // not the overdues, we allready got them, and not if we are
+ // over the maxlines
+ if ( !(*m_it).isOverdue() && ( ammount < m_maxLinesTask ) ) {
+ QString desc = (*m_it).summary();
+ if( desc.isEmpty() ) {
+ desc = (*m_it).description();
}
+ tmpout += "<b>-</b>" + desc.mid( 0, m_maxCharClip ) + "<br>";
+ ammount++;
}
}
-
if ( count > 0 ) {
if( count == 1 ) {
output += QObject::tr( "There is <b> 1</b> active task: <br>" );
} else {
diff --git a/core/pim/today/plugins/todolist/todopluginwidget.h b/core/pim/today/plugins/todolist/todopluginwidget.h
index 970f430..37b0ee1 100644
--- a/core/pim/today/plugins/todolist/todopluginwidget.h
+++ b/core/pim/today/plugins/todolist/todopluginwidget.h
@@ -19,9 +19,10 @@
#include <qstring.h>
#include <qwidget.h>
-#include <opie/tododb.h>
+#include <opie/otodo.h>
+#include <opie/otodoaccess.h>
#include <opie/oclickablelabel.h>
class TodolistPluginWidget : public QWidget {
@@ -36,9 +37,12 @@ protected slots:
void startTodolist();
private:
OClickableLabel *todoLabel;
- ToDoDB *todo;
+
+ OTodoAccess *todo;
+ OTodoAccess::List m_list;
+ OTodoAccess::List::Iterator m_it;
void readConfig();
void getTodo();
int m_maxLinesTask;