if multiple days are selected and only later is on still show all events on next days ,)

1 files changed, 11 insertions, 1 deletions

diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
index 896d41d..781e3a4 100644
--- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
+++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
@@ -44,8 +44,9 @@ DatebookPluginWidget::DatebookPluginWidget( QWidget *parent, const char* name )
     m_eventsList.setAutoDelete( true );
 
     readConfig();
     getDates();
+    m_layoutDates->addStretch(5);
 }
 
 DatebookPluginWidget::~DatebookPluginWidget() {
     delete db;
@@ -64,9 +65,17 @@ void DatebookPluginWidget::readConfig() {
 }
 
 void DatebookPluginWidget::refresh()  {
     m_eventsList.clear();
+
+    if ( m_layoutDates )  {
+        delete m_layoutDates;
+    }
+    m_layoutDates = new QVBoxLayout( this );
+    m_layoutDates->setAutoAdd( true );
+
     getDates();
+    m_layoutDates->addStretch(5);
 }
 
 /**
  *  Get all events that are in the datebook xml file for today
@@ -88,9 +97,9 @@ void DatebookPluginWidget::getDates() {
                     DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes );
                     m_eventsList.append( l );
                     l->show();
                     QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) );
-                } else if ( QDateTime::currentDateTime()  <= (*it).event().end() ) {
+                } else if ( QDateTime::currentDateTime()  <= (*it).event().end() ||  (*it).event().start().date() != date  ) {
                     count++;
                     // show only later appointments
                     DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes );
                     m_eventsList.append( l );
@@ -112,4 +121,5 @@ void DatebookPluginWidget::getDates() {
         noEvents->setText( QObject::tr( "No appointments today" ) );
     }
 }
 
+