From 3c0edb4b4c4a77b334331749dfde776911c3a3a0 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Fri, 29 Oct 2004 21:05:07 +0000
Subject: KO WN view fix

---
(limited to 'korganizer/kowhatsnextview.cpp')

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();
             }
@@ -242,14 +238,14 @@ void KOWhatsNextView::updateView()
             }
             todo = todos.next();
         }
-        if ( !itemAdded && iii == 0 ) {
+        if ( !itemAdded && iii == 0 ) { 
             // appendDay ( iii, mEventDate );
             //mText += "<table>";
             // mText += "<b><font color=\"#000080\"><em>"+i18n("No event, nothing to do.") +"</em></font></b>\n";
             mText += "<h3 align=\"center\"><font color=\"#008000\"><em>"+i18n("No event, nothing to do. ") +"</em></font></h3>\n";
             //mText +="</table>";
         }
-        if ( itemAdded )
+        if ( itemAdded   )
             mText += "</table>\n";
         mEventDate = mEventDate.addDays( 1 );
     }
@@ -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 )
--
cgit v0.9.0.2