| -rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginwidget.cpp | 12 |
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 @@ -42,12 +42,13 @@ DatebookPluginWidget::DatebookPluginWidget( QWidget *parent, const char* name ) m_layoutDates->setAutoAdd( true ); m_eventsList.setAutoDelete( true ); readConfig(); getDates(); + m_layoutDates->addStretch(5); } DatebookPluginWidget::~DatebookPluginWidget() { delete db; delete m_layoutDates; } @@ -62,13 +63,21 @@ void DatebookPluginWidget::readConfig() { m_onlyLater = cfg.readNumEntry( "onlylater", 1 ); m_moreDays = cfg.readNumEntry( "moredays", 0 ); } 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 */ void DatebookPluginWidget::getDates() { @@ -86,13 +95,13 @@ void DatebookPluginWidget::getDates() { if ( !m_onlyLater ) { count++; 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 ); l->show(); QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); @@ -110,6 +119,7 @@ void DatebookPluginWidget::getDates() { m_eventsList.append( noEvents ); noEvents->show(); noEvents->setText( QObject::tr( "No appointments today" ) ); } } + |