| author | harlekin <harlekin> | 2004-03-01 15:47:43 (UTC) |
|---|---|---|
| committer | harlekin <harlekin> | 2004-03-01 15:47:43 (UTC) |
| commit | 87676b131aad1bfe979570a48107527db4040020 (patch) (unidiff) | |
| tree | 9f7ee88adc4b8987e8d3387e2370719078f7ff5e /core/pim/today/plugins/datebook/datebookpluginwidget.cpp | |
| parent | c50e4c32d34a0550f167480b6306aac632fb201c (diff) | |
| download | opie-87676b131aad1bfe979570a48107527db4040020.zip opie-87676b131aad1bfe979570a48107527db4040020.tar.gz opie-87676b131aad1bfe979570a48107527db4040020.tar.bz2 | |
today plus datebook, mail, todolist plugins libopie1->libopie2
Diffstat (limited to 'core/pim/today/plugins/datebook/datebookpluginwidget.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | core/pim/today/plugins/datebook/datebookpluginwidget.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp index 1b11d1b..b6707df 100644 --- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * datebookpluginwidget.cpp | 2 | * datebookpluginwidget.cpp |
| 3 | * | 3 | * |
| 4 | * copyright : (c) 2002,2003 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003, 2004 by Maximilian Reiß |
| 5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
| 6 | * | 6 | * |
| 7 | */ | 7 | */ |
| @@ -100,18 +100,18 @@ void DatebookPluginWidget::getDates() { | |||
| 100 | m_eventsList.append( l ); | 100 | m_eventsList.append( l ); |
| 101 | l->show(); | 101 | l->show(); |
| 102 | QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); | 102 | QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); |
| 103 | } else { | 103 | } else { |
| 104 | if ( ( QDateTime::currentDateTime() <= (*it).event().end() ) | 104 | if ( ( QDateTime::currentDateTime() <= (*it).event().end() ) |
| 105 | // Show events which span over many days and are not elapsed. | 105 | // Show events which span over many days and are not elapsed. |
| 106 | || ( ( (*it).event().start().date() != date ) && ( QDateTime::currentDateTime() <= (*it).event().end() ) ) | 106 | || ( ( (*it).event().start().date() != date ) && ( QDateTime::currentDateTime() <= (*it).event().end() ) ) |
| 107 | // Show repeated event for today that is not elapsed. | 107 | // Show repeated event for today that is not elapsed. |
| 108 | || ( ( (*it).event().repeatType() != Event::NoRepeat ) | 108 | || ( ( (*it).event().repeatType() != Event::NoRepeat ) |
| 109 | && ( ( date.dayOfWeek() == (*it).date().dayOfWeek() ) | 109 | && ( ( date.dayOfWeek() == (*it).date().dayOfWeek() ) |
| 110 | && ( QTime::currentTime() < (*it).event().start().time() ) ) ) | 110 | && ( QTime::currentTime() < (*it).event().start().time() ) ) ) |
| 111 | // Show repeated event for next days. | 111 | // Show repeated event for next days. |
| 112 | || ( ( (*it).event().repeatType() != Event::NoRepeat ) | 112 | || ( ( (*it).event().repeatType() != Event::NoRepeat ) |
| 113 | && ( date.dayOfWeek() != (*it).date().dayOfWeek() ) ) | 113 | && ( date.dayOfWeek() != (*it).date().dayOfWeek() ) ) |
| 114 | ) | 114 | ) |
| 115 | { | 115 | { |
| 116 | count++; | 116 | count++; |
| 117 | // show only later appointments | 117 | // show only later appointments |