3 files changed, 288 insertions, 50 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 2c2965e..c0d45c9 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -107,136 +107,136 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 
     QPEMenuBar *mb = new QPEMenuBar( bar );
     mb->setMargin( 0 );
 
     QPEToolBar *sub_bar = new QPEToolBar(this);
 
     QPopupMenu *view = new QPopupMenu( this );
     QPopupMenu *settings = new QPopupMenu( this );
 
     mb->insertItem( tr( "View" ), view );
     mb->insertItem( tr( "Settings" ), settings );
 
     QActionGroup *g = new QActionGroup( this );
     g->setExclusive( TRUE );
 
     QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ),
                               QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
     a->addTo( sub_bar );
 
     a = new QAction( tr( "Today" ), Resource::loadPixmap( "to_day" ),  QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( slotToday() ) );
     a->addTo( sub_bar );
     a->addTo( view );
-   
+
     a = new QAction( tr( "Day" ), Resource::loadPixmap( "day" ), QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( viewDay() ) );
     a->addTo( sub_bar );
     a->addTo( view );
     a->setToggleAction( TRUE );
     a->setOn( TRUE );
     dayAction = a;
 
     a = new QAction( tr( "Week" ), Resource::loadPixmap( "week" ), QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( viewWeek() ) );
     a->addTo( sub_bar );
     a->addTo( view );
     a->setToggleAction( TRUE );
     weekAction = a;
 
     a = new QAction( tr( "WeekLst" ), Resource::loadPixmap( "weeklst" ), QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( viewWeekLst() ) );
     a->addTo( sub_bar );
     a->addTo( view );
     a->setToggleAction( TRUE );
     weekLstAction = a;
 
     a = new QAction( tr( "Month" ), Resource::loadPixmap( "month" ), QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( viewMonth() ) );
     a->addTo( sub_bar );
     a->addTo( view );
     a->setToggleAction( TRUE );
     monthAction = a;
 
     a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ), QString::null, 0, g, 0 );
     connect( a, SIGNAL(activated()), this, SLOT(slotFind()) );
     a->addTo( sub_bar );
 
     a = new QAction( tr( "Alarm and Start Time..." ), QString::null, 0, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( slotSettings() ) );
     a->addTo( settings );
 
     QPopupMenu *default_view = new QPopupMenu(this);
     settings->insertItem( tr( "Default View" ),default_view );
     default_view->setCheckable(TRUE);
 
     Config config("DateBook");
     config.setGroup("Main");
     int current=config.readNumEntry("defaultview", DAY);
-    
+
     QActionGroup *ag = new QActionGroup(this);
     a = new QAction( tr( "Day" ), QString::null, 0, 0, 0, true );
     if (current==DAY) a->setOn(true), viewDay();
     ag->insert(a);
     a = new QAction( tr( "Week" ), QString::null, 0, 0, 0, true );
     if (current==WEEK) a->setOn(true), viewWeek();
     ag->insert(a);
     a = new QAction( tr( "WeekLst" ), QString::null, 0, 0, 0, true );
     if (current==WEEKLST) a->setOn(true), viewWeekLst();
     ag->insert(a);
     a = new QAction( tr( "Month" ), QString::null, 0, 0, 0, true );
     if (current==MONTH) a->setOn(true), viewMonth();
     ag->insert(a);
-    
+
     ag->addTo(default_view);
-    connect(ag, SIGNAL( selected ( QAction * ) ), 
-            this, SLOT( newDefaultView(QAction *) ) 
+    connect(ag, SIGNAL( selected ( QAction * ) ),
+            this, SLOT( newDefaultView(QAction *) )
             );
-    
+
     connect( qApp, SIGNAL(clockChanged(bool)),
              this, SLOT(changeClock(bool)) );
     connect( qApp, SIGNAL(weekChanged(bool)),
              this, SLOT(changeWeek(bool)) );
-    
+
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)),
              this, SLOT(appMessage(const QCString&, const QByteArray&)) );
 #endif
-    
+
     // listen on QPE/System
 #if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
     QCopChannel *channel = new QCopChannel( "QPE/System", this );
     connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
              this, SLOT(receive(const QCString&, const QByteArray&)) );
     channel = new QCopChannel( "QPE/Datebook", this );
     connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
              this, SLOT(receive(const QCString&, const QByteArray&)) );
-    qDebug("olle\n"); 
+    qDebug("olle\n");
 #endif
 #endif
-    
+
     qDebug("done t=%d", t.elapsed() );
 
 }
 
 void DateBook::receive( const QCString &msg, const QByteArray &data )
 {
     QDataStream stream( data, IO_ReadOnly );
     if ( msg == "timeChange(QString)" ) {
         // update active view!
         if ( dayAction->isOn() )
             viewDay();
         else if ( weekAction->isOn() )
             viewWeek();
         else if ( monthAction->isOn() )
             viewMonth();
     }
     else if (msg == "editEvent(int)") {
         int uid;
         stream >> uid;
         Event e=db->eventByUID(uid);
         editEvent(e);
     }
 }
 
@@ -288,49 +288,49 @@ QString DateBook::checkEvent(const Event &e)
     Event previous = e;
     for(int i = 0; i < 12; i++)
     {
         QDateTime next;
         if (!nextOccurance(previous, current_date.addDays(1), next)) {
             break;  // no more repeats
         }
         if(next < previous.end()) {
             checkFailed = TRUE;
             break;
         }
         current_date = next.date();
     }
 
     if(checkFailed)
         return tr("Event duration is potentially longer\n"
                   "than interval between repeats.");
 
     return QString::null;
 }
 
 QDate DateBook::currentDate()
 {
     QDate d = QDate::currentDate();
-    
+
     if ( dayView && views->visibleWidget() == dayView ) {
         d = dayView->date();
     } else if ( weekView && views->visibleWidget() == weekView ) {
         d = weekView->date();
     } else if ( weekLstView && views->visibleWidget() == weekLstView ) {
         d = weekLstView->date();
     } else if ( monthView && views->visibleWidget() == monthView ) {
         d = monthView->selectedDate();
     }
 
     return d;
 }
 
 void DateBook::view(int v, const QDate &d) {
     if (v==DAY) {
         initDay();
         dayAction->setOn( TRUE );
         dayView->setDate( d );
         views->raiseWidget( dayView );
         dayView->redraw();
     } else if (v==WEEK) {
         initWeek();
         weekAction->setOn( TRUE );
         weekView->setDate( d );
@@ -385,49 +385,49 @@ void DateBook::editEvent( const Event &e )
 
     // workaround added for text input.
     QDialog editDlg( this, 0, TRUE );
     DateEntry *entry;
     editDlg.setCaption( tr("Edit Event") );
     QVBoxLayout *vb = new QVBoxLayout( &editDlg );
     QScrollView *sv = new QScrollView( &editDlg, "scrollview" );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     // KLUDGE!!!
     sv->setHScrollBarMode( QScrollView::AlwaysOff );
     vb->addWidget( sv );
     entry = new DateEntry( onMonday, e, ampm, &editDlg, "editor" );
     entry->timezone->setEnabled( FALSE );
     sv->addChild( entry );
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     editDlg.showMaximized();
 #endif
     while (editDlg.exec() ) {
         Event newEv = entry->event();
         newEv.setUid(e.uid()); // FIXME: Hack not to clear uid
         QString error = checkEvent(newEv);
         if (!error.isNull()) {
             if (QMessageBox::warning(this, "error box",
-                                     error, "Fix it", "Continue", 
+                                     error, "Fix it", "Continue",
                                      0, 0, 1) == 0)
                 continue;
         }
         db->editEvent(e, newEv);
         emit newEvent();
         break;
     }
 }
 
 void DateBook::removeEvent( const Event &e )
 {
     if (syncing) {
         QMessageBox::warning( this, tr("Calendar"),
                               tr( "Can not edit data, currently syncing") );
         return;
     }
 
     QString strName = e.description();
 
     if ( !QPEMessageBox::confirmDelete( this, tr( "Calendar" ),strName ) )
         return;
 
     db->removeEvent( e );
     if ( views->visibleWidget() == dayView && dayView )
@@ -467,127 +467,127 @@ void DateBook::initDay()
                  this, SLOT(slotNewEventFromKey(const QString &)) );
     }
 }
 
 void DateBook::initWeek()
 {
     if ( !weekView ) {
         weekView = new DateBookWeek( ampm, onMonday, db, views, "week view" );
         weekView->setStartViewTime( startTime );
         views->addWidget( weekView, WEEK );
         connect( weekView, SIGNAL( showDate( int, int, int ) ),
                  this, SLOT( showDay( int, int, int ) ) );
         connect( this, SIGNAL( newEvent() ),
                  weekView, SLOT( redraw() ) );
     }
     //But also get it right: the year that we display can be different
     //from the year of the current date. So, first find the year
     //number of the current week.
 
     int yearNumber, totWeeks;
     calcWeek( currentDate(), totWeeks, yearNumber, onMonday );
 
     QDate d = QDate( yearNumber, 12, 31 );
     calcWeek( d, totWeeks, yearNumber, onMonday );
-    
+
     while ( totWeeks == 1 ) {
         d = d.addDays( -1 );
         calcWeek( d, totWeeks, yearNumber, onMonday );
     }
     if ( totWeeks != weekView->totalWeeks() )
         weekView->setTotalWeeks( totWeeks );
 }
 void DateBook::initWeekLst() {
   if ( !weekLstView ) {
-      weekLstView = new DateBookWeekLst( ampm, onMonday, db, 
+      weekLstView = new DateBookWeekLst( ampm, onMonday, db,
                                          views, "weeklst view" );
       views->addWidget( weekLstView, WEEKLST );
-    
+
       //weekLstView->setStartViewTime( startTime );
       connect( weekLstView, SIGNAL( showDate( int, int, int ) ),
                this, SLOT( showDay( int, int, int ) ) );
-      connect( weekLstView, SIGNAL( addEvent( const QDateTime &, 
-                                              const QDateTime &, 
+      connect( weekLstView, SIGNAL( addEvent( const QDateTime &,
+                                              const QDateTime &,
                                               const QString & ) ),
-               this, SLOT( slotNewEntry( const QDateTime &, 
-                                         const QDateTime &, 
+               this, SLOT( slotNewEntry( const QDateTime &,
+                                         const QDateTime &,
                                          const QString & ) ) );
       connect( this, SIGNAL( newEvent() ),
                weekLstView, SLOT( redraw() ) );
       connect( weekLstView, SIGNAL( editEvent( const Event & ) ),
                this, SLOT( editEvent( const Event & ) ) );
   }
 }
 
 
 void DateBook::initMonth()
 {
     if ( !monthView ) {
         monthView = new DateBookMonth( views, "month view", FALSE, db );
         views->addWidget( monthView, MONTH );
         connect( monthView, SIGNAL( dateClicked( int, int, int ) ),
              this, SLOT( showDay( int, int, int ) ) );
         connect( this, SIGNAL( newEvent() ),
                  monthView, SLOT( redraw() ) );
         qApp->processEvents();
     }
 }
 
 void DateBook::loadSettings()
 {
     {
         Config config( "qpe" );
         config.setGroup("Time");
         ampm = config.readBoolEntry( "AMPM", TRUE );
         onMonday = config.readBoolEntry( "MONDAY" );
     }
-    
+
     {
         Config config("DateBook");
         config.setGroup("Main");
         startTime = config.readNumEntry("startviewtime", 8);
         aPreset = config.readBoolEntry("alarmpreset");
         presetTime = config.readNumEntry("presettime");
     }
 }
 
 void DateBook::saveSettings()
 {
     Config config( "qpe" );
     Config configDB( "DateBook" );
     configDB.setGroup( "Main" );
     configDB.writeEntry("startviewtime",startTime);
     configDB.writeEntry("alarmpreset",aPreset);
     configDB.writeEntry("presettime",presetTime);
 }
 
 void DateBook::newDefaultView(QAction *a) {
     int val=DAY;
     if (a->text() == "Day") val=DAY;
     if (a->text() == "Week") val=WEEK;
     if (a->text() == "WeekLst") val=WEEKLST;
     if (a->text() == "Month") val=MONTH;
-    
+
     Config configDB( "DateBook" );
     configDB.setGroup( "Main" );
     configDB.writeEntry("defaultview",val);
 }
 
 void DateBook::appMessage(const QCString& msg, const QByteArray& data)
 {
     bool needShow = FALSE;
     if ( msg == "alarm(QDateTime,int)" ) {
         QDataStream ds(data,IO_ReadOnly);
         QDateTime when; int warn;
         ds >> when >> warn;
 
         // check to make it's okay to continue,
         // this is the case that the time was set ahead, and
         // we are forced given a stale alarm...
         QDateTime current = QDateTime::currentDateTime();
         if ( current.time().hour() != when.time().hour()
              && current.time().minute() != when.time().minute() )
             return;
 
         QValueList<EffectiveEvent> list = db->getEffectiveEvents(when.addSecs(warn*60));
         if ( list.count() > 0 ) {
             QString msg;
@@ -667,49 +667,49 @@ void DateBook::appMessage(const QCString& msg, const QByteArray& data)
 
 void DateBook::reload()
 {
     db->reload();
     if ( dayAction->isOn() )
         viewDay();
     else if ( weekAction->isOn() )
         viewWeek();
     else if ( monthAction->isOn() )
         viewMonth();
     syncing = FALSE;
 }
 
 void DateBook::flush()
 {
     syncing = TRUE;
     db->save();
 }
 
 void DateBook::timerEvent( QTimerEvent *e )
 {
     if ( alarmCounter < 10 ) {
         alarmCounter++;
         Sound::soundAlarm();
-    } 
+    }
     else
         killTimer( e->timerId() );
 }
 
 void DateBook::changeClock( bool newClock )
 {
     ampm = newClock;
     // repaint the affected objects...
     if (dayView) dayView->redraw();
     if (weekView) weekView->redraw();
     if (weekLstView) weekLstView->redraw();
 }
 
 void DateBook::changeWeek( bool m )
 {
     /* no need to redraw, each widget catches.  Do need to
        store though for widgets we haven't made yet */
     onMonday = m;
 }
 
 void DateBook::slotToday()
 {
     // we need to view today using default view
     viewDefault(QDate::currentDate());
@@ -955,35 +955,37 @@ void DateBook::slotDoFind( const QString& txt, const QDate &dt,
     if ( candidtate ) {
         dayView->setStartViewTime( dtEnd.time().hour() );
         dayView->setDate( dtEnd.date().year(), dtEnd.date().month(),
                           dtEnd.date().day() );
     } else {
         if ( wrapAround ) {
             emit signalWrapAround();
             rev.setStart( QDateTime(QDate(1960, 1, 1), QTime(0, 0, 0)) );
             nonrev.setStart( rev.start() );
         } else
             emit signalNotFound();
         wrapAround = !wrapAround;
     }
 }
 
 Event DateBookDBHack::eventByUID(int uid) {
 
     // FIXME: Dirty Hacks to get hold of the private event lists
     QDate start;
     QDate end=start.addDays(-1);
     QValueList<Event> myEventList=getNonRepeatingEvents(start,end);
     QValueList<Event> myRepeatEvents=getRawRepeats();
 
     QValueList<Event>::ConstIterator it;
-    
+
     for (it = myEventList.begin(); it != myEventList.end(); it++) {
         if ((*it).uid() == uid) return *it;
     }
     for (it = myRepeatEvents.begin(); it != myRepeatEvents.end(); it++) {
         if ((*it).uid() == uid) return *it;
     }
 
     qDebug("Event not found: uid=%d\n", uid);
+    Event ev;
+    return ev; // return at least
 }
 
diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp
index 67a88e9..c15ccef 100644
--- a/core/pim/datebook/datebookday.cpp
+++ b/core/pim/datebook/datebookday.cpp
@@ -1,83 +1,87 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
+#include <qmessagebox.h>
 
 #include "datebookday.h"
 #include "datebookdayheaderimpl.h"
 
 #include <qpe/datebookdb.h>
 #include <qpe/resource.h>
 #include <qpe/event.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/timestring.h>
 #include <qpe/qpedebug.h>
 
 #include <qheader.h>
 #include <qdatetime.h>
 #include <qpainter.h>
 #include <qsimplerichtext.h>
 #include <qpopupmenu.h>
 #include <qtextcodec.h>
 #include <qpalette.h>
 
+#include <qtimer.h>
+
 DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent,
                                   const char *name )
     : QTable( 24, 1, parent, name ),
       ampm( whichClock )
 {
     enableClipper(TRUE);
     setTopMargin( 0 );
     horizontalHeader()->hide();
     setLeftMargin(38);
     setColumnStretchable( 0, TRUE );
     setHScrollBarMode( QScrollView::AlwaysOff );
     verticalHeader()->setPalette(white);
     verticalHeader()->setResizeEnabled(FALSE);
     setSelectionMode( Single );
 
     // get rid of being able to edit things...
     QTableItem *tmp;
     int row;
     for ( row = 0; row < numRows(); row++ ) {
         tmp = new QTableItem( this, QTableItem::Never, QString::null);
         setItem( row, 0, tmp );
+        setRowHeight( row, 40);
     }
     initHeader();
     QObject::connect( qApp, SIGNAL(clockChanged(bool)),
                       this, SLOT(slotChangeClock(bool)) );
 }
 
 void DateBookDayView::initHeader()
 {
     QString strTmp;
     for ( int i = 0; i < 24; ++i ) {
         if ( ampm ) {
             if ( i == 0 )
                 strTmp = QString::number(12) + ":00";
             else if ( i == 12 )
                 strTmp = QString::number(12) + tr(":00p");
             else if ( i > 12 )
                 strTmp = QString::number( i - 12 ) + tr(":00p");
             else
                 strTmp = QString::number(i) + ":00";
         } else {
             if ( i < 10 )
                 strTmp = "0" + QString::number(i) + ":00";
             else
                 strTmp = QString::number(i) + ":00";
@@ -98,51 +102,55 @@ bool DateBookDayView::whichClock() const
 {
     return ampm;
 }
 
 void DateBookDayView::moveUp()
 {
     scrollBy(0, -20);
 }
 
 void DateBookDayView::moveDown()
 {
     scrollBy(0, 20);
 }
 
 void DateBookDayView::paintCell( QPainter *p, int, int, const QRect &cr, bool )
 {
     int w = cr.width();
     int h = cr.height();
     p->fillRect( 0, 0, w, h, colorGroup().brush( QColorGroup::Base ) );
     if ( showGrid() ) {
         // Draw our lines
         int x2 = w - 1;
         int y2 = h - 1;
         QPen pen( p->pen() );
-        p->setPen( colorGroup().mid() );
+        p->setPen( colorGroup().dark() );
         p->drawLine( x2, 0, x2, y2 );
         p->drawLine( 0, y2, x2, y2 );
+
+        p->setPen( colorGroup().midlight() );
+        p->drawLine( 0, y2 - h/2, x2, y2 - h/2);
+
         p->setPen( pen );
     }
 }
 
 void DateBookDayView::paintFocus( QPainter *, const QRect & )
 {
 }
 
 
 void DateBookDayView::resizeEvent( QResizeEvent *e )
 {
     QTable::resizeEvent( e );
     columnWidthChanged( 0 );
     emit sigColWidthChanged();
 }
 
 void DateBookDayView::keyPressEvent( QKeyEvent *e )
 {
     QString txt = e->text();
     if ( !txt.isNull() && txt[0] > ' ' && e->key() < 0x1000 ) {
         // we this is some sort of thing we know about...
         e->accept();
         emit sigCapturedKey( txt );
     } else {
@@ -153,233 +161,315 @@ void DateBookDayView::keyPressEvent( QKeyEvent *e )
 
 
 //===========================================================================
 
 DateBookDay::DateBookDay( bool ampm, bool startOnMonday,
                           DateBookDB *newDb, QWidget *parent,
                           const char *name )
     : QVBox( parent, name ),
       currDate( QDate::currentDate() ),
       db( newDb ),
       startTime( 0 )
 {
     widgetList.setAutoDelete( true );
     header = new DateBookDayHeader( startOnMonday, this, "day header" );
     header->setDate( currDate.year(), currDate.month(), currDate.day() );
     view = new DateBookDayView( ampm, this, "day view" );
     connect( header, SIGNAL( dateChanged( int, int, int ) ),
              this, SLOT( dateChanged( int, int, int ) ) );
     connect( view, SIGNAL( sigColWidthChanged() ),
              this, SLOT( slotColWidthChanged() ) );
     connect( qApp, SIGNAL(weekChanged(bool)),
              this, SLOT(slotWeekChanged(bool)) );
     connect( view, SIGNAL(sigCapturedKey(const QString &)),
              this, SIGNAL(sigNewEvent(const QString&)) );
+
+    QTimer *timer = new QTimer( this );
+
+    connect( timer, SIGNAL(timeout()),
+                     this, SLOT(updateView()) );//connect timer for updating timeMarker & daywidgetcolors
+    timer->start( 1000*60*5, FALSE ); //update every 5min
+
+    selectedWidget = 0;
+
+    timeMarker =  new DateBookDayTimeMarker( this );
+    timeMarker->setTime( QTime::currentTime() );
+}
+
+void DateBookDay::updateView( void )
+{
+        timeMarker->setTime( QTime::currentTime() );
+        //need to find a way to update all DateBookDayWidgets
+}
+
+void DateBookDay::setSelectedWidget( DateBookDayWidget *w )
+{
+        selectedWidget = w;
+}
+
+DateBookDayWidget * DateBookDay::getSelectedWidget( void )
+{
+        return selectedWidget;
 }
 
 void DateBookDay::selectedDates( QDateTime &start, QDateTime &end )
 {
     start.setDate( currDate );
     end.setDate( currDate );
 
     int sh=99,eh=-1;
 
     int n = dayView()->numSelections();
 
     for (int i=0; i<n; i++) {
         QTableSelection sel = dayView()->selection( i );
         sh = QMIN(sh,sel.topRow());
         eh = QMAX(sh,sel.bottomRow()+1);
     }
     if (sh > 23 || eh < 1) {
         sh=8;
         eh=9;
     }
 
     start.setTime( QTime( sh, 0, 0 ) );
     end.setTime( QTime( eh, 0, 0 ) );
 }
 
 void DateBookDay::setDate( int y, int m, int d )
 {
     header->setDate( y, m, d );
+
+    selectedWidget = 0;
 }
 
 void DateBookDay::setDate( QDate d)
 {
     header->setDate( d.year(), d.month(), d.day() );
+
+    selectedWidget = 0;
 }
 
 void DateBookDay::dateChanged( int y, int m, int d )
 {
     QDate date( y, m, d );
     if ( currDate == date )
         return;
     currDate.setYMD( y, m, d );
     relayoutPage();
     dayView()->clearSelection();
     QTableSelection ts;
     ts.init( startTime, 0 );
     ts.expandTo( startTime, 0 );
     dayView()->addSelection( ts );
+
+    selectedWidget = 0;
+
+    if (this->date() == QDate::currentDate())
+            timeMarker->show(); else timeMarker->hide();
+
 }
 
 void DateBookDay::redraw()
 {
     if ( isUpdatesEnabled() )
         relayoutPage();
 }
 
 void DateBookDay::getEvents()
 {
     widgetList.clear();
 
     QValueList<EffectiveEvent> eventList = db->getEffectiveEvents( currDate,
                                                                    currDate );
     QValueListIterator<EffectiveEvent> it;
     for ( it = eventList.begin(); it != eventList.end(); ++it ) {
         DateBookDayWidget* w = new DateBookDayWidget( *it, this );
         connect( w, SIGNAL( deleteMe( const Event & ) ),
                  this, SIGNAL( removeEvent( const Event & ) ) );
         connect( w, SIGNAL( editMe( const Event & ) ),
                  this, SIGNAL( editEvent( const Event & ) ) );
         connect( w, SIGNAL( beamMe( const Event & ) ),
                  this, SIGNAL( beamEvent( const Event & ) ) );
         widgetList.append( w );
     }
+
 }
 
 static int place( const DateBookDayWidget *item, bool *used, int maxn )
 {
     int place = 0;
     int start = item->event().start().hour();
     QTime e = item->event().end();
     int end = e.hour();
     if ( e.minute() < 5 )
         end--;
     if ( end < start )
         end = start;
     while ( place < maxn ) {
         bool free = TRUE;
         int s = start;
         while( s <= end ) {
             if ( used[10*s+place] ) {
                 free = FALSE;
                 break;
             }
             s++;
         }
         if ( free ) break;
         place++;
     }
     if ( place == maxn ) {
         return -1;
     }
     while( start <= end ) {
         used[10*start+place] = TRUE;
         start++;
     }
     return place;
 }
 
 
 void DateBookDay::relayoutPage( bool fromResize )
 {
     setUpdatesEnabled( FALSE );
     if ( !fromResize )
         getEvents();    // no need we already have them!
 
+    widgetList.sort();
+    //sorts the widgetList by the heights of the widget so that the tallest widgets are at the beginning
+    //this is needed for the simple algo below to work correctly, otherwise some widgets would be drawn outside the view
+
     int wCount = widgetList.count();
     int wid = view->columnWidth(0)-1;
+    int wd;
     int n = 1;
 
+    QArray<int> anzIntersect(wCount); //this stores the number of maximal intersections of each widget
+
+    for (int i = 0; i<wCount; anzIntersect[i] = 1, i++);
+
     if ( wCount < 20 ) {
-        for ( int i = 0; i < wCount; ) {
+
+        QArray<QRect> geometries(wCount);
+                for (int i = 0; i < wCount; geometries[i] = widgetList.at(i)->geometry(), i++);//stores geometry for each widget in vector
+
+        for ( int i = 0; i < wCount; i++)
+        {
+                QValueList<int> intersectedWidgets;
+
+                //find all widgets intersecting with widgetList.at(i)
+                for ( int j = 0; j < wCount; j++)
+                        if (i != j)
+                                if (geometries[j].intersects(geometries[i]))
+                                        intersectedWidgets.append(j);
+
+                //for each of these intersecting widgets find out how many widgets are they intersecting with
+                for ( uint j = 0; j < intersectedWidgets.count(); j++)
+                {
+                        QArray<int> inter(wCount);
+                        inter[j]=1;
+
+                        if (intersectedWidgets[j] != -1)
+                                for ( uint k = j; k < intersectedWidgets.count(); k++)
+                                        if (j != k && intersectedWidgets[k] != -1)
+                                                if (geometries[intersectedWidgets[k]].intersects(geometries[intersectedWidgets[j]]))
+                                                {
+                                                        inter[j]++;
+                                                        intersectedWidgets[k] = -1;
+                                                }
+                        if (inter[j] > anzIntersect[i]) anzIntersect[i] = inter[j] + 1;
+                }
+
+                if (anzIntersect[i] == 1 && intersectedWidgets.count()) anzIntersect[i]++;
+        }
+
+
+        for ( int i = 0; i < wCount; i++) {
             DateBookDayWidget *w = widgetList.at(i);
-            int x = 0;
-            int xp = 0;
             QRect geom = w->geometry();
-            geom.setX( x );
-            geom.setWidth( wid );
-            while ( xp < n && intersects( w, geom ) ) {
-                x += wid;
-                xp++;
-                geom.moveBy( wid, 0 );
-            }
-            if ( xp >= n ) {
-                n++;
-                wid = ( view->columnWidth(0)-1 ) / n;
-                i = 0;
-            } else {
-                w->setGeometry( geom );
-                i++;
+
+            geom.setX( 0 );
+
+            wd = (view->columnWidth(0)-1) / anzIntersect[i] - (anzIntersect[i]>1?2:0);
+
+            geom.setWidth( wd );
+
+            while ( intersects( w, geom ) ) {
+                geom.moveBy( wd + 2 + 1, 0 );
             }
+            w->setGeometry( geom );
         }
+
         view->setContentsPos( 0, startTime * view->rowHeight(0) );
+
+
     } else {
-    
-    
+
+
         int hours[24];
         memset( hours, 0, 24*sizeof( int ) );
         bool overFlow = FALSE;
         for ( int i = 0; i < wCount; i++ ) {
             DateBookDayWidget *w = widgetList.at(i);
             int start = w->event().start().hour();
             QTime e = w->event().end();
             int end = e.hour();
             if ( e.minute() < 5 )
                 end--;
             if ( end < start )
                 end = start;
             while( start <= end ) {
                 hours[start]++;
                 if ( hours[start] >= 10 )
                     overFlow = TRUE;
                 ++start;
             }
             if ( overFlow )
                 break;
         }
         for ( int i = 0; i < 24; i++ ) {
             n = QMAX( n, hours[i] );
         }
         wid = ( view->columnWidth(0)-1 ) / n;
-    
+
         bool used[24*10];
         memset( used, FALSE, 24*10*sizeof( bool ) );
-    
+
         for ( int i = 0; i < wCount; i++ ) {
             DateBookDayWidget *w = widgetList.at(i);
             int xp = place( w, used, n );
             if ( xp != -1 ) {
                 QRect geom = w->geometry();
-                geom.setX( xp*wid );
+                geom.setX( xp*(wid+2) );
                 geom.setWidth( wid );
                 w->setGeometry( geom );
             }
         }
         view->setContentsPos( 0, startTime * view->rowHeight(0) );
     }
+
+            timeMarker->setTime( QTime::currentTime() );//display timeMarker
+            timeMarker->raise();                        //on top of all widgets
     setUpdatesEnabled( TRUE );
     return;
 }
 
 DateBookDayWidget *DateBookDay::intersects( const DateBookDayWidget *item, const QRect &geom )
 {
     int i = 0;
     DateBookDayWidget *w = widgetList.at(i);
     int wCount = widgetList.count();
     while ( i < wCount && w != item ) {
         if ( w->geometry().intersects( geom ) ) {
             return w;
         }
         w = widgetList.at(++i);
     }
 
     return 0;
 }
 
 
 QDate DateBookDay::date() const
 {
     return currDate;
 }
@@ -475,79 +565,175 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e,
     }
 
     text += "<br><b>" + tr("End") + "</b>: ";
     if ( e.endDate() != ev.date() ) {
         // multi-day event.  Show end date
         text += TimeString::longDateString( e.endDate() );
     } else {
         // Show end time.
         text += TimeString::timeString( ev.end(), whichClock, FALSE );
     }
     text += "<br><br>" + strNote;
     setBackgroundMode( PaletteBase );
 
     QTime start = ev.start();
     QTime end = ev.end();
     int y = start.hour()*60+start.minute();
     int h = end.hour()*60+end.minute()-y;
     int rh = dateBook->dayView()->rowHeight(0);
     y = y*rh/60;
     h = h*rh/60;
     if ( h < 3 )
         h = 3;
     geom.setY( y );
     geom.setHeight( h );
+    geom.setX( 0 );
+    geom.setWidth(dateBook->dayView()->columnWidth(0)-1);
+
 }
 
 DateBookDayWidget::~DateBookDayWidget()
 {
 }
 
 void DateBookDayWidget::paintEvent( QPaintEvent *e )
 {
     QPainter p( this );
+
+    if (dateBook->getSelectedWidget() == this)
+    {
+                   p.setBrush( QColor( 155, 240, 230 ) ); // selected item
+    } else
+    {
+            if (dateBook->date() == QDate::currentDate())
+        {
+                QTime curTime = QTime::currentTime();
+
+            if (ev.end() < curTime)
+            {
+                      p.setBrush( QColor( 180, 180, 180 ) ); // grey, inactive
+            } else
+            {
+                    //change color in dependence of the time till the event starts
+                   int duration = curTime.secsTo(ev.start());
+                  if (duration < 0) duration = 0;
+                  int colChange = duration*160/86400; //86400: secs per day, 160: max color shift
+
+                      p.setBrush( QColor( 200-colChange, 200-colChange, 255 ) ); //blue
+            }
+         } else
+         {
+                  p.setBrush( QColor( 220, 220, 220 ) ); //light grey, inactive (not current date)
+                  //perhaps make a distinction between future/past dates
+         }
+    }
+
     p.setPen( QColor(100, 100, 100) );
-    p.setBrush( QColor( 255, 240, 230 ) ); // based on priority?
     p.drawRect(rect());
 
+ //   p.drawRect(0,0, 5, height());
+
     int y = 0;
     int d = 0;
 
     if ( ev.event().hasAlarm() ) {
         p.drawPixmap( width() - 16, 0, Resource::loadPixmap( "bell" ) );
         y = 20;
         d = 20;
     }
 
     if ( ev.event().hasRepeat() ) {
         p.drawPixmap( width() - 16, y, Resource::loadPixmap( "repeat" ) );
         d = 20;
     }
 
     QSimpleRichText rt( text, font() );
     rt.setWidth( geom.width() - d - 6 );
-    rt.draw( &p, 3, 0, e->region(), colorGroup() );
+    rt.draw( &p, 7, 0, e->region(), colorGroup() );
 }
 
 void DateBookDayWidget::mousePressEvent( QMouseEvent *e )
 {
+        DateBookDayWidget *item;
+
+        item = dateBook->getSelectedWidget();
+        if (item) item->update();
+
+        dateBook->setSelectedWidget(this);
+        update();
+        dateBook->repaint();
+
     QPopupMenu m;
     m.insertItem( tr( "Edit" ), 1 );
     m.insertItem( tr( "Delete" ), 2 );
     m.insertItem( tr( "Beam" ), 3 );
     int r = m.exec( e->globalPos() );
     if ( r == 1 ) {
         emit editMe( ev.event() );
     } else if ( r == 2 ) {
         emit deleteMe( ev.event() );
     } else if ( r == 3 ) {
         emit beamMe( ev.event() );
     }
 }
 
 void DateBookDayWidget::setGeometry( const QRect &r )
 {
     geom = r;
     setFixedSize( r.width()+1, r.height()+1 );
     dateBook->dayView()->moveChild( this, r.x(), r.y()-1 );
     show();
 }
+
+
+//---------------------------------------------------------------------------------------------
+//---------------------------------------------------------------------------------------------
+
+
+DateBookDayTimeMarker::DateBookDayTimeMarker( DateBookDay *db )
+    : QWidget( db->dayView()->viewport() ), dateBook( db )
+{
+        setBackgroundMode( PaletteBase );
+}
+
+DateBookDayTimeMarker::~DateBookDayTimeMarker()
+{
+}
+
+void DateBookDayTimeMarker::paintEvent( QPaintEvent */*e*/ )
+{
+        QPainter p( this );
+        p.setBrush( QColor( 255, 0, 0 ) );
+
+        QPen pen;
+        pen.setStyle(NoPen);
+
+        p.setPen( pen );
+        p.drawRect(rect());
+}
+
+void DateBookDayTimeMarker::setTime( const QTime &t )
+{
+        int y = t.hour()*60+t.minute();
+        int rh = dateBook->dayView()->rowHeight(0);
+        y = y*rh/60;
+
+        geom.setX( 0 );
+
+        int x = dateBook->dayView()->columnWidth(0)-1;
+        geom.setWidth( x );
+
+        geom.setY( y );
+        geom.setHeight( 1 );
+
+        setGeometry( geom );
+
+        time = t;
+}
+
+void DateBookDayTimeMarker::setGeometry( const QRect &r )
+{
+    geom = r;
+    setFixedSize( r.width()+1, r.height()+1 );
+    dateBook->dayView()->moveChild( this, r.x(), r.y()-1 );
+    show();
+}
diff --git a/core/pim/datebook/datebookday.h b/core/pim/datebook/datebookday.h
index 531fded..db0f3b6 100644
--- a/core/pim/datebook/datebookday.h
+++ b/core/pim/datebook/datebookday.h
@@ -32,107 +32,157 @@ class DateBookDB;
 class QDateTime;
 class QMouseEvent;
 class QPaintEvent;
 class QResizeEvent;
 
 class DateBookDayView : public QTable
 {
     Q_OBJECT
 public:
     DateBookDayView( bool hourClock, QWidget *parent, const char *name );
     bool whichClock() const;
 
 public slots:
     void moveUp();
     void moveDown();
 
 signals:
     void sigColWidthChanged();
     void sigCapturedKey( const QString &txt );
 protected slots:
     void slotChangeClock( bool );
 protected:
     virtual void paintCell( QPainter *p, int row, int col, const QRect &cr, bool selected );
     virtual void paintFocus( QPainter *p, const QRect &cr );
+      
     virtual void resizeEvent( QResizeEvent *e );
     void keyPressEvent( QKeyEvent *e );
     void initHeader();
 private:
     bool ampm;
 };
 
 class DateBookDay;
 class DateBookDayWidget : public QWidget
 {
     Q_OBJECT
 
 public:
     DateBookDayWidget( const EffectiveEvent &e, DateBookDay *db );
     ~DateBookDayWidget();
 
     const QRect &geometry() { return geom; }
     void setGeometry( const QRect &r );
 
     const EffectiveEvent &event() const { return ev; }
-
+        
 signals:
     void deleteMe( const Event &e );
     void editMe( const Event &e );
     void beamMe( const Event &e );
 
 protected:
     void paintEvent( QPaintEvent *e );
     void mousePressEvent( QMouseEvent *e );
 
 private:
     const EffectiveEvent ev;
     DateBookDay *dateBook;
     QString text;
     QRect geom;
 };
 
+//Marker for current time in the dayview
+class DateBookDayTimeMarker : public QWidget
+{
+    Q_OBJECT
+
+public:
+    DateBookDayTimeMarker( DateBookDay *db );
+    ~DateBookDayTimeMarker();
+
+    const QRect &geometry() { return geom; }
+    void setGeometry( const QRect &r );
+    void setTime( const QTime &t );
+
+signals: 
+
+protected:
+    void paintEvent( QPaintEvent *e );
+
+private:
+    QRect geom;
+    QTime time;
+    DateBookDay *dateBook;
+};
+
+//reimplemented the compareItems function so that it sorts DayWidgets by geometry heights
+class WidgetListClass : public QList<DateBookDayWidget>
+        {
+        private:
+                
+        int compareItems( QCollection::Item s1, QCollection::Item s2 ) 
+        { 
+                //hmm, don't punish me for that ;)
+                if (reinterpret_cast<DateBookDayWidget*>(s1)->geometry().height() > reinterpret_cast<DateBookDayWidget*>(s2)->geometry().height())
+                { 
+                        return -1;
+                } else
+                {
+                        return 1;
+                }
+        }
+        
+
+};
+
 class DateBookDay : public QVBox
 {
     Q_OBJECT
 
 public:
     DateBookDay( bool ampm, bool startOnMonday, DateBookDB *newDb,
                  QWidget *parent, const char *name );
     void selectedDates( QDateTime &start, QDateTime &end );
     QDate date() const;
     DateBookDayView *dayView() const { return view; }
     void setStartViewTime( int startHere );
     int startViewTime() const;
+    void setSelectedWidget( DateBookDayWidget * );
+    DateBookDayWidget * getSelectedWidget( void );
 
 public slots:
     void setDate( int y, int m, int d );
     void setDate( QDate );
     void redraw();
     void slotWeekChanged( bool bStartOnMonday );
+            void updateView();//updates TimeMarker and DayWidget-colors
 
 signals:
     void removeEvent( const Event& );
     void editEvent( const Event& );
     void beamEvent( const Event& );
     void newEvent();
     void sigNewEvent( const QString & );
 
 protected slots:
     void keyPressEvent(QKeyEvent *);
 
 private slots:
     void dateChanged( int y, int m, int d );
     void slotColWidthChanged() { relayoutPage(); };
 
 private:
     void getEvents();
     void relayoutPage( bool fromResize = false );
     DateBookDayWidget *intersects( const DateBookDayWidget *item, const QRect &geom );
     QDate currDate;
     DateBookDayView *view;
     DateBookDayHeader *header;
     DateBookDB *db;
-    QList<DateBookDayWidget> widgetList;
+            WidgetListClass widgetList;//reimplemented QList for sorting widgets by height
     int startTime;
+    DateBookDayWidget *selectedWidget; //actual selected widget (obviously)
+            DateBookDayTimeMarker *timeMarker;//marker for current time
 };
 
 #endif