7 files changed, 40 insertions, 5 deletions

diff --git a/core/pim/today/plugins/todolist/.cvsignore b/core/pim/today/plugins/todolist/.cvsignore
index 2888d4a..b9284b8 100644
--- a/core/pim/today/plugins/todolist/.cvsignore
+++ b/core/pim/today/plugins/todolist/.cvsignore
@@ -1,2 +1,3 @@
 Makefile*
+todopluginconfigbase*
 moc*
diff --git a/core/pim/today/plugins/todolist/config.in b/core/pim/today/plugins/todolist/config.in
index c862f37..48ba226 100644
--- a/core/pim/today/plugins/todolist/config.in
+++ b/core/pim/today/plugins/todolist/config.in
@@ -1,4 +1,4 @@
   config TODAY_TODOLIST
-    boolean "opie-today-todolistplugin (shows the next todo entries)"
+    boolean "todolist"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/core/pim/today/plugins/todolist/todolist.pro b/core/pim/today/plugins/todolist/todolist.pro
index 0343223..6a63f4e 100644
--- a/core/pim/today/plugins/todolist/todolist.pro
+++ b/core/pim/today/plugins/todolist/todolist.pro
@@ -16,7 +16,26 @@ DEPENDPATH      += $(OPIEDIR)/include \
 
 LIBS+= -lqpe -lopie
 
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaytodolistplugin
 
+TRANSLATIONS = ../../../../../i18n/de/libtodaytodolistplugin.ts \
+         ../../../../../i18n/nl/libtodaytodolistplugin.ts \
+         ../../../../../i18n/xx/libtodaytodolistplugin.ts \
+         ../../../../../i18n/en/libtodaytodolistplugin.ts \
+         ../../../../../i18n/es/libtodaytodolistplugin.ts \
+         ../../../../../i18n/fr/libtodaytodolistplugin.ts \
+         ../../../../../i18n/hu/libtodaytodolistplugin.ts \
+         ../../../../../i18n/ja/libtodaytodolistplugin.ts \
+         ../../../../../i18n/ko/libtodaytodolistplugin.ts \
+         ../../../../../i18n/no/libtodaytodolistplugin.ts \
+         ../../../../../i18n/pl/libtodaytodolistplugin.ts \
+         ../../../../../i18n/pt/libtodaytodolistplugin.ts \
+         ../../../../../i18n/pt_BR/libtodaytodolistplugin.ts \
+         ../../../../../i18n/sl/libtodaytodolistplugin.ts \
+         ../../../../../i18n/zh_CN/libtodaytodolistplugin.ts \
+         ../../../../../i18n/zh_TW/libtodaytodolistplugin.ts \
+         ../../../../../i18n/it/libtodaytodolistplugin.ts \
+         ../../../../../i18n/da/libtodaytodolistplugin.ts
+
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/today/plugins/todolist/todoplugin.cpp b/core/pim/today/plugins/todolist/todoplugin.cpp
index 7eeb8f1..801de9d 100644
--- a/core/pim/today/plugins/todolist/todoplugin.cpp
+++ b/core/pim/today/plugins/todolist/todoplugin.cpp
@@ -1,10 +1,10 @@
 /*
  * todoplugin.cpp
  *
- * copyright   : (c) 2002 by Maximilian Reiß
+ * copyright   : (c) 2002,2003 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -65,6 +65,12 @@ bool TodolistPlugin::excludeFromRefresh() const {
 
 void TodolistPlugin::refresh()  {
     if ( m_widget )  {
         m_widget->refresh();
     }
 }
+
+void TodolistPlugin::reinitialize()  {
+    if ( m_widget )  {
+        m_widget->reinitialize();
+    }
+}
diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h
index d7b51b4..f68162f 100644
--- a/core/pim/today/plugins/todolist/todoplugin.h
+++ b/core/pim/today/plugins/todolist/todoplugin.h
@@ -38,12 +38,13 @@ public:
     QWidget* widget(QWidget *);
     QString pixmapNameConfig() const;
     TodayConfigWidget* configWidget(QWidget *);
     QString appName() const;
     bool excludeFromRefresh() const;
     void refresh();
+    void reinitialize();
 
  private:
     QGuardedPtr<TodolistPluginWidget> m_widget;
 };
 
 #endif
diff --git a/core/pim/today/plugins/todolist/todopluginwidget.cpp b/core/pim/today/plugins/todolist/todopluginwidget.cpp
index 15081ec..0364f94 100644
--- a/core/pim/today/plugins/todolist/todopluginwidget.cpp
+++ b/core/pim/today/plugins/todolist/todopluginwidget.cpp
@@ -61,12 +61,19 @@ void TodolistPluginWidget::readConfig() {
     cfg.setGroup( "config" );
     m_maxLinesTask = cfg.readNumEntry( "maxlinestask", 5 );
     m_maxCharClip =  cfg.readNumEntry( "maxcharclip", 38 );
 }
 
 void TodolistPluginWidget:: refresh()  {
+    todo->reload();
+    getTodo();
+}
+
+void TodolistPluginWidget::reinitialize() {
+    readConfig();
+    todo->reload();
     getTodo();
 }
 
 /**
  * Get the todos
  */
@@ -76,21 +83,21 @@ void TodolistPluginWidget::getTodo() {
     QString output;
     QString tmpout;
     int count = 0;
     int ammount = 0;
 
     // get overdue todos first
-    m_list = todo->overDue();
+    m_list = todo->sorted( true, 3, 2, 1);
 
     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 = (*m_it).description();
             }
-            tmpout += "<font color=#e00000><b>-" + desc.mid( 0, m_maxCharClip ) + "</b></font><br>";
+            tmpout += "<font color=#e00000><b>[" +  QString("%1").arg((*m_it).priority() )  + "]" + desc.mid( 0, m_maxCharClip ) + "</b></font><br>";
             ammount++ ;
         }
     }
 
     // get total number of still open todos
     m_list = todo->sorted( true, 1, 4, 1);
@@ -101,13 +108,13 @@ void TodolistPluginWidget::getTodo() {
         // 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>";
+            tmpout += "<b> [" +  QString("%1").arg((*m_it).priority() )  + "] </b>" + desc.mid( 0, m_maxCharClip ) + "<br>";
             ammount++;
         }
     }
 
     if ( count > 0 ) {
         if( count == 1 ) {
diff --git a/core/pim/today/plugins/todolist/todopluginwidget.h b/core/pim/today/plugins/todolist/todopluginwidget.h
index 0db65c4..9cac43d 100644
--- a/core/pim/today/plugins/todolist/todopluginwidget.h
+++ b/core/pim/today/plugins/todolist/todopluginwidget.h
@@ -29,12 +29,13 @@ class TodolistPluginWidget : public QWidget {
 
 public:
     TodolistPluginWidget( QWidget *parent,  const char *name );
     ~TodolistPluginWidget();
 
     void refresh();
+    void reinitialize();
 
 protected slots:
     void  startTodolist();
 
 private:
     OClickableLabel *todoLabel;