2 files changed, 4 insertions, 1 deletions

diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 53fe7d0..8473db9 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -169,48 +169,49 @@ void KOWhatsNextView::updateConfig()
 }
 void KOWhatsNextView::showEvent ( QShowEvent * e )
 {
     //qDebug("KOWhatsNextView::showEvent ");
     restartTimer();
     QWidget::showEvent ( e );
 }
 void KOWhatsNextView::hideEvent ( QHideEvent * e)
 {
     //qDebug(" KOWhatsNextView::hideEvent");
     mTimer->stop();
     QWidget::hideEvent ( e );
 }
 void KOWhatsNextView::restartTimer()
 {
     //qDebug("KOWhatsNextView::restartTimer() ");
     mTimer->start( 300000  );
     //mTimer->start( 5000  );
 }
 void KOWhatsNextView::updateView()
 {
     //qDebug("KOWhatsNextView::updateView() ");
     if ( mTimer->isActive() )
          restartTimer();
+    mCurrentMaxPrio = 5;
     //qDebug("KOWhatsNextView::updateView() ");
     //  mDateLabel->setText(KGlobal::locale()->formatDate(QDate::currentDate()));
     KIconLoader kil("korganizer");
     QString ipath;// = new QString();
     //  kil.loadIcon("korganizer",KIcon::NoGroup,32,KIcon::DefaultState,&ipath);
     //<big><big><strong>" + date + "</strong></big></big>\n";
     mText = "<table width=\"100%\">\n";
     //mText += "<tr bgcolor=\"#3679AD\"><td><h2>"; 
 #ifdef DESKTOP_VERSION
     mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h1>";
 #else
     mText += "<tr bgcolor=\"#5699CD\"><td align=\"center\"><h2>";
 #endif
     //  mText += "<img src=\"";
     //   mText += ipath;
     //   mText += "\">";
     mEventDate = QDate::currentDate();
 #ifdef DESKTOP_VERSION
     mText += "<font color=\"#FFFFFF\"> <em>" +  KGlobal::locale()->formatDate( mEventDate , false )+"</em></font></h1>";
 #else
     mText += "<font color=\"#FFFFFF\"> <em>" +  KGlobal::locale()->formatDate( mEventDate , false )+"</em></font></h2>";
 #endif
     mText += "</td></tr>\n<tr  bgcolor=\"#EAF8FA\"><td>";
     int iii;
@@ -297,48 +298,49 @@ void KOWhatsNextView::updateView()
   
     int topmostPrios =  KOPrefs::instance()->mWhatsNextPrios;
     if (todos.count() > 0 && topmostPrios > 0 ) {
         //   kil.loadIcon("todo",KIcon::NoGroup,22,KIcon::DefaultState,&ipath);
         // mText += "<h2>";
         //<img src=\"";
         //     mText += ipath;
         //     mText += "\">";
         // mText += i18n("Overdue To-Do:") + "</h2>\n";
   
         //mText += "<ul>\n";
         bool gotone = false;
         int priority = 1; 
         int priosFound = 0;
 #ifdef DESKTOP_VERSION
         mText +="<p></p>";
 #endif
 
         mText +="<h2><em><font color=\"#000080\">" + i18n("Incomplete Todo:") + "</font></em></h2>\n";
         mText += "<ul>\n";
         while (!gotone && priority<6) {
             todo = todos.first();
             while(todo) {
                 if (!todo->isCompleted() && (todo->priority() == priority) ) {
+                    mCurrentMaxPrio = priority - priosFound + topmostPrios -1;
                     if ( appendTodo(todo) )
                         gotone = true;
                 }
                 todo = todos.next();
             }
             if ( gotone ) {
                 gotone = false;
                 ++priosFound;
                 if ( priosFound == topmostPrios )
                     break;
             }
             priority++;
             // kdDebug() << "adding the todos..." << endl;
         }
         mText += "</ul>\n";
     }
 
     int replys = 0;
     events = calendar()->events(QDate::currentDate(), QDate(2975,12,6));
     if (events.count() > 0) {
         Event *ev = events.first();
         while(ev) {
             Attendee *me = ev->attendeeByMails(KOPrefs::instance()->mAdditionalMails,KOPrefs::instance()->email());
             if (me!=0) {
@@ -704,49 +706,49 @@ bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub )
         QString year = "";
         int ye = ((Todo*)ev)->dtDue().date().year();
         if ( QDateTime::currentDateTime().date().year() != ye )
             year = QString::number( ye );
         QString dfs = KGlobal::locale()->dateFormatShort();
         KGlobal::locale()->setDateFormatShort("%d.%b");
         mText +="<font color=\"#00A000\"> [" + KGlobal::locale()->formatDate(((Todo*)ev)->dtDue().date(), true, KLocale::Userdefined) + "."+ year +"]</font>";
         KGlobal::locale()->setDateFormatShort(dfs);
     }
     if ( KOPrefs::instance()->mWNViewShowLocation )
         if ( !ev->location().isEmpty() )
             mText += " ("+ev->location() +")";
     if ( !isSub ) {
         if ( ((Todo*)ev)->relatedTo()&& KOPrefs::instance()->mWNViewShowsParents)
             mText += " ["+ev->relatedTo()->summary() +"]";
         mText += "</p>\n";
     }
     else {
         ind += "-";
         mText += "</li>\n";
     }
     QPtrList<Incidence> Relations = ev->relations();
     Incidence *to;
     for (to=Relations.first();to;to=Relations.next()) {
-        if (!((Todo*)to)->isCompleted())
+        if (!((Todo*)to)->isCompleted() && ((Todo*)to)->priority() <= mCurrentMaxPrio )
             appendTodo( to, ind , true );
     } 
     
     return true;
 }
 
 /*
   void KOWhatsNextView::createEventViewer()
   {
   if (!mEventViewer) {
       
   mEventViewer = new KOEventViewerDialog(this);
   }
   }
 */
 void KOWhatsNextView::setEventViewer(KOEventViewerDialog* v )
 {
     mEventViewer = v;
 }
 
 // TODO: Create this function in CalendarView and remove it from here
 void KOWhatsNextView::showIncidence(const QString &uid)
 {
  
diff --git a/korganizer/kowhatsnextview.h b/korganizer/kowhatsnextview.h
index 715037f..d6727ac 100644
--- a/korganizer/kowhatsnextview.h
+++ b/korganizer/kowhatsnextview.h
@@ -66,35 +66,36 @@ class KOWhatsNextView : public KOrg::BaseView
                               const QDate &, const QDate &);
   
   public slots:
     virtual void updateView();
     void printMe();
     virtual void showDates(const QDate &start, const QDate &end);
     virtual void showEvents(QPtrList<Event> eventList);
     void updateConfig();
     void changeEventDisplay(Event *, int);
   
   protected:
     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; 
     virtual void showEvent ( QShowEvent * );
     virtual void hideEvent ( QHideEvent * ); 
   
   private slots:
     void showIncidence(const QString &);
     void restartTimer();
 
 
   private:
+    int mCurrentMaxPrio;
   //void createEventViewer();
     QTimer* mTimer;
     WhatsNextTextBrowser *mView;
     QString mText;
     // QLabel *mDateLabel;
     KOEventViewerDialog *mEventViewer;
     
     QValueList<Incidence *> mTodos;
 };
 
 #endif