-rw-r--r-- | korganizer/kowhatsnextview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index 2f7409d..8371523 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp | |||
@@ -202,25 +202,25 @@ void KOWhatsNextView::updateView() | |||
202 | if (events.count() > 0) { | 202 | if (events.count() > 0) { |
203 | // mText += "<p></p>"; | 203 | // mText += "<p></p>"; |
204 | // kil.loadIcon("month",KIcon::NoGroup,22,KIcon::DefaultState,&ipath); | 204 | // kil.loadIcon("month",KIcon::NoGroup,22,KIcon::DefaultState,&ipath); |
205 | // mText += "<h2>"; | 205 | // mText += "<h2>"; |
206 | //mText += " <img src=\""; | 206 | //mText += " <img src=\""; |
207 | //mText += ipath; | 207 | //mText += ipath; |
208 | //mText += "\">"; | 208 | //mText += "\">"; |
209 | if ( ! itemAdded ) { | 209 | if ( ! itemAdded ) { |
210 | appendDay ( iii, mEventDate ); | 210 | appendDay ( iii, mEventDate ); |
211 | 211 | ||
212 | } | 212 | } |
213 | // for first day (iii == 0) | 213 | // for first day (iii == 0) |
214 | // we may have syncevents, or events in the past, which maybe should nor be diaplayed | 214 | // we may have syncevents, or events in the past, which maybe should not be diaplayed |
215 | // for that reason we cannot append <table> in appendDay () for iii == 0 | 215 | // for that reason we cannot append <table> in appendDay () for iii == 0 |
216 | // we must append it in the first successful call of appendEvent() | 216 | // we must append it in the first successful call of appendEvent() |
217 | Event *ev = events.first(); | 217 | Event *ev = events.first(); |
218 | while(ev) { | 218 | while(ev) { |
219 | //qDebug("+++++event append %s", ev->summary().latin1()); | 219 | //qDebug("+++++event append %s", ev->summary().latin1()); |
220 | if ( true /*!ev->recurrence()->doesRecur() || ev->recursOn( mEventDate)*/) { | 220 | if ( true /*!ev->recurrence()->doesRecur() || ev->recursOn( mEventDate)*/) { |
221 | if ( appendEvent(ev, false , iii!= 0,!itemAdded ) ) | 221 | if ( appendEvent(ev, false , iii!= 0,!itemAdded ) ) |
222 | itemAdded = true; | 222 | itemAdded = true; |
223 | } | 223 | } |
224 | ev = events.next(); | 224 | ev = events.next(); |
225 | } | 225 | } |
226 | 226 | ||
@@ -344,25 +344,25 @@ void KOWhatsNextView::updateView() | |||
344 | mView->setText(mText); | 344 | mView->setText(mText); |
345 | mView->setFocus(); | 345 | mView->setFocus(); |
346 | 346 | ||
347 | // QPixmap bPix = SmallIcon( "back" ); | 347 | // QPixmap bPix = SmallIcon( "back" ); |
348 | // qDebug("xxxxxxxxxxxxxxxxxxxxx "); | 348 | // qDebug("xxxxxxxxxxxxxxxxxxxxx "); |
349 | // QWidget* test = new QWidget(); | 349 | // QWidget* test = new QWidget(); |
350 | // test->setBackgroundMode(FixedPixmap ); | 350 | // test->setBackgroundMode(FixedPixmap ); |
351 | // test->setBackgroundPixmap ( bPix ); | 351 | // test->setBackgroundPixmap ( bPix ); |
352 | // test->resize( 300, 400 ); | 352 | // test->resize( 300, 400 ); |
353 | // test->show(); | 353 | // test->show(); |
354 | // mView->setBackgroundMode(FixedPixmap ); | 354 | // mView->setBackgroundMode(FixedPixmap ); |
355 | // mView->setBackgroundPixmap ( bPix ); | 355 | // mView->setBackgroundPixmap ( bPix ); |
356 | qDebug("%s ",mText.latin1()); | 356 | // qDebug("%s ",mText.latin1()); |
357 | } | 357 | } |
358 | 358 | ||
359 | void KOWhatsNextView::appendDay( int i, QDate eventDate ) | 359 | void KOWhatsNextView::appendDay( int i, QDate eventDate ) |
360 | { | 360 | { |
361 | QString date; | 361 | QString date; |
362 | QString day = KGlobal::locale()->formatDate( eventDate , KOPrefs::instance()->mShortDateInViewer); | 362 | QString day = KGlobal::locale()->formatDate( eventDate , KOPrefs::instance()->mShortDateInViewer); |
363 | if ( ! KOPrefs::instance()->mShortDateInViewer && QApplication::desktop()->width() < 320 ) { | 363 | if ( ! KOPrefs::instance()->mShortDateInViewer && QApplication::desktop()->width() < 320 ) { |
364 | if ( i == 0 ) { | 364 | if ( i == 0 ) { |
365 | //mText += "<table>\n"; | 365 | //mText += "<table>\n"; |
366 | return;//date = "<em><font color=\"#008000\"><em>" + day+"</font></em>"; | 366 | return;//date = "<em><font color=\"#008000\"><em>" + day+"</font></em>"; |
367 | } | 367 | } |
368 | else if ( i == 1 ) | 368 | else if ( i == 1 ) |