| -rw-r--r-- | korganizer/kowhatsnextview.cpp | 38 | ||||
| -rw-r--r-- | korganizer/kowhatsnextview.h | 2 |
2 files changed, 20 insertions, 20 deletions
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp index aa33588..2f7409d 100644 --- a/korganizer/kowhatsnextview.cpp +++ b/korganizer/kowhatsnextview.cpp @@ -70,10 +70,6 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, QWidget *parent, connect(mView,SIGNAL(showIncidence(const QString &)),SLOT(showIncidence(const QString &))); QStyleSheet* stsh = mView->styleSheet(); QStyleSheetItem * style ; - style = stsh->item ("a" ); - if ( style ) { - style->setMargin(QStyleSheetItem::MarginAll,0); - } style = stsh->item ("h2" ); if ( style ) { style->setMargin(QStyleSheetItem::MarginAll,0); @@ -82,10 +78,6 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, QWidget *parent, if ( style ) { style->setMargin(QStyleSheetItem::MarginAll,0); } - style = stsh->item ("table" ); - if ( style ) { - style->setMargin(QStyleSheetItem::MarginAll,0); - } mEventViewer = 0; QBoxLayout *topLayout = new QVBoxLayout(this); @@ -161,7 +153,7 @@ void KOWhatsNextView::updateView() QString ipath;// = new QString(); // kil.loadIcon("korganizer",KIcon::NoGroup,32,KIcon::DefaultState,&ipath); //<big><big><strong>" + date + "</strong></big></big>\n"; - mText = "<qt><table width=\"100%\">\n"; + mText = "<table width=\"100%\">\n"; //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; #ifdef DESKTOP_VERSION mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h1>"; @@ -216,14 +208,18 @@ void KOWhatsNextView::updateView() //mText += "\">"; if ( ! itemAdded ) { appendDay ( iii, mEventDate ); - itemAdded = true; } + // for first day (iii == 0) + // we may have syncevents, or events in the past, which maybe should nor be diaplayed + // for that reason we cannot append <table> in appendDay () for iii == 0 + // we must append it in the first successful call of appendEvent() Event *ev = events.first(); while(ev) { //qDebug("+++++event append %s", ev->summary().latin1()); if ( true /*!ev->recurrence()->doesRecur() || ev->recursOn( mEventDate)*/) { - appendEvent(ev, false , iii!= 0 ); + if ( appendEvent(ev, false , iii!= 0,!itemAdded ) ) + itemAdded = true; } ev = events.next(); } @@ -343,7 +339,7 @@ void KOWhatsNextView::updateView() if (replys > 0 ) mText += "</table>\n"; - mText += "</td></tr>\n</table></qt>\n"; + mText += "</td></tr>\n</table>\n"; mView->setText(mText); mView->setFocus(); @@ -357,7 +353,7 @@ void KOWhatsNextView::updateView() // test->show(); // mView->setBackgroundMode(FixedPixmap ); // mView->setBackgroundPixmap ( bPix ); - // qDebug("%s ",mText.latin1()); + qDebug("%s ",mText.latin1()); } void KOWhatsNextView::appendDay( int i, QDate eventDate ) @@ -366,7 +362,7 @@ void KOWhatsNextView::appendDay( int i, QDate eventDate ) QString day = KGlobal::locale()->formatDate( eventDate , KOPrefs::instance()->mShortDateInViewer); if ( ! KOPrefs::instance()->mShortDateInViewer && QApplication::desktop()->width() < 320 ) { if ( i == 0 ) { - mText += "<table>\n"; + //mText += "<table>\n"; return;//date = "<em><font color=\"#008000\"><em>" + day+"</font></em>"; } else if ( i == 1 ) @@ -380,7 +376,7 @@ void KOWhatsNextView::appendDay( int i, QDate eventDate ) } else { if ( i == 0 ) { - mText += "<table>\n"; + //mText += "<table>\n"; return;// date = "<font color=\"#008000\"><em>" +i18n("Today: ") +"</em>" + day+"</font>"; } @@ -430,18 +426,21 @@ void KOWhatsNextView::changeEventDisplay(Event *, int action) } } -void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed ) +bool KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed, bool appendTable ) { if ( !KOPrefs::instance()->mShowSyncEvents && ev->uid().left(15) == QString("last-syncEvent-") ) - return; + return false; QDateTime cdt = QDateTime::currentDateTime(); QDateTime noc; QString tempText; + if ( appendTable && !notRed ) { + tempText = "<table>"; + } bool ok = true; if ( reply ) { noc = ev->getNextOccurence( cdt, &ok ); if (! ok && ev->type() == "Event") - return; + return false; } tempText += "<tr><td><b>"; if (ev->type()=="Event") { @@ -486,7 +485,7 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed ) else { if ( end < cdt ) { if ( !KOPrefs::instance()->mWNViewShowsPast ) - return; + return false; tempText += "<font color=\"#F00000\">" + dateText + "</font>"; } else if ( st < cdt ) @@ -575,6 +574,7 @@ void KOWhatsNextView::appendEvent(Incidence *ev, bool reply, bool notRed ) tempText += " ["+ev->relatedTo()->summary() +"]"; tempText += "</td></tr>\n"; mText += tempText; + return true; } bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub ) diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h index 1118bdd..9049268 100644 --- a/korganizer/kowhatsnextview.h +++ b/korganizer/kowhatsnextview.h @@ -70,7 +70,7 @@ class KOWhatsNextView : public KOrg::BaseView void changeEventDisplay(Event *, int); protected: - void appendEvent(Incidence *, bool reply=false, bool notRed = true); + bool appendEvent(Incidence *, bool reply=false, bool notRed = true, bool appendTable = false); bool appendTodo(Incidence *, QString ind = "", bool isSub = false ); void appendDay( int i, QDate date ); QDate mEventDate; |