author | zautrix <zautrix> | 2004-10-31 17:36:55 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-31 17:36:55 (UTC) |
commit | 7cfdea5dbeda91ed67bfca7b2decff9ef5a66be1 (patch) (unidiff) | |
tree | 5ad2e6f91cb66a17c3e46049b71dbb8d632be31a | |
parent | 3964a158be731f1bb244ca861262df5fa8d04cf3 (diff) | |
download | kdepimpi-7cfdea5dbeda91ed67bfca7b2decff9ef5a66be1.zip kdepimpi-7cfdea5dbeda91ed67bfca7b2decff9ef5a66be1.tar.gz kdepimpi-7cfdea5dbeda91ed67bfca7b2decff9ef5a66be1.tar.bz2 |
kopi wn view fix
-rw-r--r-- | korganizer/kowhatsnextview.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 8371523..3801ed4 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp | |||
@@ -180,28 +180,29 @@ void KOWhatsNextView::updateView() | |||
180 | bool itemAdded = false; | 180 | bool itemAdded = false; |
181 | for ( iii = 0; iii < daysToShow; ++iii ) { | 181 | for ( iii = 0; iii < daysToShow; ++iii ) { |
182 | QString date; | 182 | QString date; |
183 | itemAdded = false; | 183 | itemAdded = false; |
184 | events = calendar()->events( mEventDate, true ); | 184 | events = calendar()->events( mEventDate, true ); |
185 | 185 | ||
186 | if ( iii == 0 ) { // today !!! | 186 | if ( iii == 0 ) { // today !!! |
187 | todo = todos.first(); | 187 | todo = todos.first(); |
188 | while(todo) { | 188 | while(todo) { |
189 | if ( !todo->isCompleted() &&todo->hasDueDate() && todo->dtDue().date() < mEventDate ) { | 189 | if ( !todo->isCompleted() &&todo->hasDueDate() && todo->dtDue().date() < mEventDate ) { |
190 | if ( ! itemAdded ) { | 190 | if ( ! itemAdded ) { |
191 | appendDay ( iii, mEventDate ); | 191 | appendDay ( iii, mEventDate ); |
192 | itemAdded = true; | 192 | //itemAdded = true; |
193 | 193 | ||
194 | } | 194 | } //bool reply=false, bool notRed = true, bool appendTable = false); |
195 | appendEvent(todo); | 195 | appendEvent(todo, false, false, !itemAdded ); |
196 | itemAdded = true; | ||
196 | } | 197 | } |
197 | todo = todos.next(); | 198 | todo = todos.next(); |
198 | } | 199 | } |
199 | } | 200 | } |
200 | 201 | ||
201 | 202 | ||
202 | if (events.count() > 0) { | 203 | if (events.count() > 0) { |
203 | // mText += "<p></p>"; | 204 | // mText += "<p></p>"; |
204 | // kil.loadIcon("month",KIcon::NoGroup,22,KIcon::DefaultState,&ipath); | 205 | // kil.loadIcon("month",KIcon::NoGroup,22,KIcon::DefaultState,&ipath); |
205 | // mText += "<h2>"; | 206 | // mText += "<h2>"; |
206 | //mText += " <img src=\""; | 207 | //mText += " <img src=\""; |
207 | //mText += ipath; | 208 | //mText += ipath; |
@@ -223,27 +224,28 @@ void KOWhatsNextView::updateView() | |||
223 | } | 224 | } |
224 | ev = events.next(); | 225 | ev = events.next(); |
225 | } | 226 | } |
226 | 227 | ||
227 | //mText += "</table>\n"; | 228 | //mText += "</table>\n"; |
228 | } | 229 | } |
229 | 230 | ||
230 | todo = todos.first(); | 231 | todo = todos.first(); |
231 | while(todo) { | 232 | while(todo) { |
232 | if ( !todo->isCompleted() &&todo->hasDueDate() && todo->dtDue().date() == mEventDate ) { | 233 | if ( !todo->isCompleted() &&todo->hasDueDate() && todo->dtDue().date() == mEventDate ) { |
233 | if ( ! itemAdded ) { | 234 | if ( ! itemAdded ) { |
234 | appendDay ( iii, mEventDate ); | 235 | appendDay ( iii, mEventDate ); |
235 | itemAdded = true; | 236 | //itemAdded = true; |
236 | } | 237 | } |
237 | appendEvent(todo); | 238 | appendEvent(todo, false , iii!= 0,!itemAdded); |
239 | itemAdded = true; | ||
238 | } | 240 | } |
239 | todo = todos.next(); | 241 | todo = todos.next(); |
240 | } | 242 | } |
241 | if ( !itemAdded && iii == 0 ) { | 243 | if ( !itemAdded && iii == 0 ) { |
242 | // appendDay ( iii, mEventDate ); | 244 | // appendDay ( iii, mEventDate ); |
243 | //mText += "<table>"; | 245 | //mText += "<table>"; |
244 | // mText += "<b><font color=\"#000080\"><em>"+i18n("No event, nothing to do.") +"</em></font></b>\n"; | 246 | // mText += "<b><font color=\"#000080\"><em>"+i18n("No event, nothing to do.") +"</em></font></b>\n"; |
245 | mText += "<h3 align=\"center\"><font color=\"#008000\"><em>"+i18n("No event, nothing to do. ") +"</em></font></h3>\n"; | 247 | mText += "<h3 align=\"center\"><font color=\"#008000\"><em>"+i18n("No event, nothing to do. ") +"</em></font></h3>\n"; |
246 | //mText +="</table>"; | 248 | //mText +="</table>"; |
247 | } | 249 | } |
248 | if ( itemAdded ) | 250 | if ( itemAdded ) |
249 | mText += "</table>\n"; | 251 | mText += "</table>\n"; |