author | harlekin <harlekin> | 2003-12-05 11:20:37 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2003-12-05 11:20:37 (UTC) |
commit | 2b37759fc317b5efd9b371210b16117f7d346455 (patch) (unidiff) | |
tree | f99beb5ff1c886f9b41a2d3a34300f8f121cf738 /core/pim/today/plugins/todolist | |
parent | 1ef5137234e2b7cd0be2a220a86d848503196269 (diff) | |
download | opie-2b37759fc317b5efd9b371210b16117f7d346455.zip opie-2b37759fc317b5efd9b371210b16117f7d346455.tar.gz opie-2b37759fc317b5efd9b371210b16117f7d346455.tar.bz2 |
today in HEAD up to date
Diffstat (limited to 'core/pim/today/plugins/todolist') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/today/plugins/todolist/.cvsignore | 1 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/config.in | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todolist.pro | 19 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todoplugin.cpp | 8 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todoplugin.h | 1 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginwidget.cpp | 15 | ||||
-rw-r--r-- | core/pim/today/plugins/todolist/todopluginwidget.h | 1 |
7 files changed, 41 insertions, 6 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 @@ | |||
1 | Makefile* | 1 | Makefile* |
2 | todopluginconfigbase* | ||
2 | moc* | 3 | 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 @@ | |||
1 | config TODAY_TODOLIST | 1 | config TODAY_TODOLIST |
2 | boolean "opie-today-todolistplugin (shows the next todo entries)" | 2 | boolean "todolist" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | 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 | |||
@@ -19,4 +19,23 @@ LIBS+= -lqpe -lopie | |||
19 | DESTDIR = $(OPIEDIR)/plugins/today | 19 | DESTDIR = $(OPIEDIR)/plugins/today |
20 | TARGET = todaytodolistplugin | 20 | TARGET = todaytodolistplugin |
21 | 21 | ||
22 | TRANSLATIONS = ../../../../../i18n/de/libtodaytodolistplugin.ts \ | ||
23 | ../../../../../i18n/nl/libtodaytodolistplugin.ts \ | ||
24 | ../../../../../i18n/xx/libtodaytodolistplugin.ts \ | ||
25 | ../../../../../i18n/en/libtodaytodolistplugin.ts \ | ||
26 | ../../../../../i18n/es/libtodaytodolistplugin.ts \ | ||
27 | ../../../../../i18n/fr/libtodaytodolistplugin.ts \ | ||
28 | ../../../../../i18n/hu/libtodaytodolistplugin.ts \ | ||
29 | ../../../../../i18n/ja/libtodaytodolistplugin.ts \ | ||
30 | ../../../../../i18n/ko/libtodaytodolistplugin.ts \ | ||
31 | ../../../../../i18n/no/libtodaytodolistplugin.ts \ | ||
32 | ../../../../../i18n/pl/libtodaytodolistplugin.ts \ | ||
33 | ../../../../../i18n/pt/libtodaytodolistplugin.ts \ | ||
34 | ../../../../../i18n/pt_BR/libtodaytodolistplugin.ts \ | ||
35 | ../../../../../i18n/sl/libtodaytodolistplugin.ts \ | ||
36 | ../../../../../i18n/zh_CN/libtodaytodolistplugin.ts \ | ||
37 | ../../../../../i18n/zh_TW/libtodaytodolistplugin.ts \ | ||
38 | ../../../../../i18n/it/libtodaytodolistplugin.ts \ | ||
39 | ../../../../../i18n/da/libtodaytodolistplugin.ts | ||
40 | |||
22 | include ( $(OPIEDIR)/include.pro ) | 41 | 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,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * todoplugin.cpp | 2 | * todoplugin.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
@@ -68,3 +68,9 @@ void TodolistPlugin::refresh() { | |||
68 | m_widget->refresh(); | 68 | m_widget->refresh(); |
69 | } | 69 | } |
70 | } | 70 | } |
71 | |||
72 | void TodolistPlugin::reinitialize() { | ||
73 | if ( m_widget ) { | ||
74 | m_widget->reinitialize(); | ||
75 | } | ||
76 | } | ||
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 | |||
@@ -41,6 +41,7 @@ public: | |||
41 | QString appName() const; | 41 | QString appName() const; |
42 | bool excludeFromRefresh() const; | 42 | bool excludeFromRefresh() const; |
43 | void refresh(); | 43 | void refresh(); |
44 | void reinitialize(); | ||
44 | 45 | ||
45 | private: | 46 | private: |
46 | QGuardedPtr<TodolistPluginWidget> m_widget; | 47 | QGuardedPtr<TodolistPluginWidget> m_widget; |
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 | |||
@@ -63,7 +63,14 @@ void TodolistPluginWidget::readConfig() { | |||
63 | m_maxCharClip = cfg.readNumEntry( "maxcharclip", 38 ); | 63 | m_maxCharClip = cfg.readNumEntry( "maxcharclip", 38 ); |
64 | } | 64 | } |
65 | 65 | ||
66 | void TodolistPluginWidget:: refresh() { | 66 | void TodolistPluginWidget:: refresh() { |
67 | todo->reload(); | ||
68 | getTodo(); | ||
69 | } | ||
70 | |||
71 | void TodolistPluginWidget::reinitialize() { | ||
72 | readConfig(); | ||
73 | todo->reload(); | ||
67 | getTodo(); | 74 | getTodo(); |
68 | } | 75 | } |
69 | 76 | ||
@@ -79,7 +86,7 @@ void TodolistPluginWidget::getTodo() { | |||
79 | int ammount = 0; | 86 | int ammount = 0; |
80 | 87 | ||
81 | // get overdue todos first | 88 | // get overdue todos first |
82 | m_list = todo->overDue(); | 89 | m_list = todo->sorted( true, 3, 2, 1); |
83 | 90 | ||
84 | for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { | 91 | for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) { |
85 | if (!(*m_it).isCompleted() && ( ammount < m_maxLinesTask ) ) { | 92 | if (!(*m_it).isCompleted() && ( ammount < m_maxLinesTask ) ) { |
@@ -87,7 +94,7 @@ void TodolistPluginWidget::getTodo() { | |||
87 | if( desc.isEmpty() ) { | 94 | if( desc.isEmpty() ) { |
88 | desc = (*m_it).description(); | 95 | desc = (*m_it).description(); |
89 | } | 96 | } |
90 | tmpout += "<font color=#e00000><b>-" + desc.mid( 0, m_maxCharClip ) + "</b></font><br>"; | 97 | tmpout += "<font color=#e00000><b>[" + QString("%1").arg((*m_it).priority() ) + "]" + desc.mid( 0, m_maxCharClip ) + "</b></font><br>"; |
91 | ammount++ ; | 98 | ammount++ ; |
92 | } | 99 | } |
93 | } | 100 | } |
@@ -104,7 +111,7 @@ void TodolistPluginWidget::getTodo() { | |||
104 | if( desc.isEmpty() ) { | 111 | if( desc.isEmpty() ) { |
105 | desc = (*m_it).description(); | 112 | desc = (*m_it).description(); |
106 | } | 113 | } |
107 | tmpout += "<b>-</b>" + desc.mid( 0, m_maxCharClip ) + "<br>"; | 114 | tmpout += "<b> [" + QString("%1").arg((*m_it).priority() ) + "] </b>" + desc.mid( 0, m_maxCharClip ) + "<br>"; |
108 | ammount++; | 115 | ammount++; |
109 | } | 116 | } |
110 | } | 117 | } |
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 | |||
@@ -32,6 +32,7 @@ public: | |||
32 | ~TodolistPluginWidget(); | 32 | ~TodolistPluginWidget(); |
33 | 33 | ||
34 | void refresh(); | 34 | void refresh(); |
35 | void reinitialize(); | ||
35 | 36 | ||
36 | protected slots: | 37 | protected slots: |
37 | void startTodolist(); | 38 | void startTodolist(); |