summaryrefslogtreecommitdiff
Unidiff
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,7 +1,6 @@
1TEMPLATE = lib 1TEMPLATE = lib
2#TEMPLATE = app
3CONFIG -= moc 2CONFIG -= moc
4CONFIG += qt debug 3CONFIG += qt release
5 4
6# Input 5# Input
7HEADERS = todoplugin.h todopluginimpl.h todopluginconfig.h \ 6HEADERS = todoplugin.h todopluginimpl.h todopluginconfig.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
@@ -32,7 +32,7 @@ QString TodolistPlugin::pluginName() const {
32} 32}
33 33
34double TodolistPlugin::versionNumber() const { 34double TodolistPlugin::versionNumber() const {
35 return 0.7; 35 return 0.8;
36} 36}
37 37
38QString TodolistPlugin::pixmapNameWidget() const { 38QString TodolistPlugin::pixmapNameWidget() const {
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
@@ -36,7 +36,9 @@ TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name )
36 if ( todo ) { 36 if ( todo ) {
37 delete todo; 37 delete todo;
38 } 38 }
39 todo = new ToDoDB(); 39
40 todo = new OTodoAccess();
41 todo->load();
40 42
41 readConfig(); 43 readConfig();
42 getTodo(); 44 getTodo();
@@ -67,7 +69,6 @@ void TodolistPluginWidget::getTodo() {
67 } 69 }
68 70
69 todoLabel = new OClickableLabel( this ); 71 todoLabel = new OClickableLabel( this );
70 todoLabel->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ) );
71 connect( todoLabel, SIGNAL( clicked() ), this, SLOT( startTodolist() ) ); 72 connect( todoLabel, SIGNAL( clicked() ), this, SLOT( startTodolist() ) );
72 73
73 QString output; 74 QString output;
@@ -76,14 +77,13 @@ void TodolistPluginWidget::getTodo() {
76 int ammount = 0; 77 int ammount = 0;
77 78
78 // get overdue todos first 79 // get overdue todos first
79 QValueList<ToDoEvent> overDueList = todo->overDue(); 80 m_list = todo->overDue();
80 qBubbleSort( overDueList ); 81
81 for ( QValueList<ToDoEvent>::Iterator it = overDueList.begin(); 82 for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
82 it != overDueList.end(); ++it ) { 83 if (!(*m_it).isCompleted() && ( ammount < m_maxLinesTask ) ) {
83 if (!(*it).isCompleted() && ( ammount < m_maxLinesTask ) ) { 84 QString desc = (*m_it).summary();
84 QString desc = (*it).summary();
85 if( desc.isEmpty() ) { 85 if( desc.isEmpty() ) {
86 desc = (*it).description(); 86 desc = (*m_it).description();
87 } 87 }
88 tmpout += "<font color=#e00000><b>-" + desc.mid( 0, m_maxCharClip ) + "</b></font><br>"; 88 tmpout += "<font color=#e00000><b>-" + desc.mid( 0, m_maxCharClip ) + "</b></font><br>";
89 ammount++; 89 ammount++;
@@ -91,26 +91,22 @@ void TodolistPluginWidget::getTodo() {
91 } 91 }
92 92
93 // get total number of still open todos 93 // get total number of still open todos
94 QValueList<ToDoEvent> openTodo = todo->rawToDos(); 94 m_list = todo->sorted( true, 1, 4, 1);
95 qBubbleSort( openTodo ); 95
96 for ( QValueList<ToDoEvent>::Iterator it = openTodo.begin(); 96 for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
97 it != openTodo.end(); ++it ) { 97 count +=1;
98 if ( !(*it).isCompleted() ){ 98 // not the overdues, we allready got them, and not if we are
99 count +=1; 99 // over the maxlines
100 // not the overdues, we allready got them, and not if we are 100 if ( !(*m_it).isOverdue() && ( ammount < m_maxLinesTask ) ) {
101 // over the maxlines 101 QString desc = (*m_it).summary();
102 if ( !(*it).isOverdue() && ( ammount < m_maxLinesTask ) ) { 102 if( desc.isEmpty() ) {
103 QString desc = (*it).summary(); 103 desc = (*m_it).description();
104 if( desc.isEmpty() ) {
105 desc = (*it).description();
106 }
107 tmpout += "<b>-</b>" + desc.mid( 0, m_maxCharClip ) + "<br>";
108 ammount++;
109 } 104 }
105 tmpout += "<b>-</b>" + desc.mid( 0, m_maxCharClip ) + "<br>";
106 ammount++;
110 } 107 }
111 } 108 }
112 109
113
114 if ( count > 0 ) { 110 if ( count > 0 ) {
115 if( count == 1 ) { 111 if( count == 1 ) {
116 output += QObject::tr( "There is <b> 1</b> active task: <br>" ); 112 output += QObject::tr( "There is <b> 1</b> active task: <br>" );
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
@@ -20,7 +20,8 @@
20#include <qstring.h> 20#include <qstring.h>
21#include <qwidget.h> 21#include <qwidget.h>
22 22
23#include <opie/tododb.h> 23#include <opie/otodo.h>
24#include <opie/otodoaccess.h>
24#include <opie/oclickablelabel.h> 25#include <opie/oclickablelabel.h>
25 26
26 27
@@ -37,7 +38,10 @@ protected slots:
37 38
38private: 39private:
39 OClickableLabel *todoLabel; 40 OClickableLabel *todoLabel;
40 ToDoDB *todo; 41
42 OTodoAccess *todo;
43 OTodoAccess::List m_list;
44 OTodoAccess::List::Iterator m_it;
41 45
42 void readConfig(); 46 void readConfig();
43 void getTodo(); 47 void getTodo();