author | harlekin <harlekin> | 2002-11-05 00:43:46 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-11-05 00:43:46 (UTC) |
commit | 4efdcbfa9ae55ba42b10b5003c9e524b2e1f0eef (patch) (side-by-side diff) | |
tree | 2c56641bfc494138d3358fb52b22261c5be37e25 /core/pim/today | |
parent | da417964fde0079e97aa9dfd4ecdde77522d4ad9 (diff) | |
download | opie-4efdcbfa9ae55ba42b10b5003c9e524b2e1f0eef.zip opie-4efdcbfa9ae55ba42b10b5003c9e524b2e1f0eef.tar.gz opie-4efdcbfa9ae55ba42b10b5003c9e524b2e1f0eef.tar.bz2 |
transition to new opie pim api, no finished yet, but should allready close bug #1 cvs upcvs up
-rw-r--r-- | core/pim/today/plugins/todolist/todolist.pro | 3 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todoplugin.cpp | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginwidget.cpp | 46 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginwidget.h | 8 |
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,10 +1,9 @@ TEMPLATE = lib -#TEMPLATE = app CONFIG -= moc -CONFIG += qt debug +CONFIG += qt release # Input HEADERS = todoplugin.h todopluginimpl.h todopluginconfig.h \ todopluginwidget.h SOURCES = todoplugin.cpp todopluginimpl.cpp todopluginconfig.cpp \ todopluginwidget.cpp 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 @@ -29,13 +29,13 @@ TodolistPlugin::~TodolistPlugin() { 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 @@ -33,13 +33,15 @@ TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name ) todoLabel = 0l; todo = 0l; if ( todo ) { delete todo; } - todo = new ToDoDB(); + + todo = new OTodoAccess(); + todo->load(); readConfig(); getTodo(); } TodolistPluginWidget::~TodolistPluginWidget() { @@ -64,56 +66,50 @@ void TodolistPluginWidget::getTodo() { if ( todoLabel ) { 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 { output += QObject::tr( "There are <b> %1</b> active tasks: <br>" ).arg( count ); } 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 @@ -17,13 +17,14 @@ #ifndef TODOLIST_PLUGIN_WIDGET_H #define TODOLIST_PLUGIN_WIDGET_H #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 { Q_OBJECT @@ -34,13 +35,16 @@ public: 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; int m_maxCharClip; }; |