Patch by <tboc@gmx.de> to configure the size

of the row of the dayview
Adds an option to jump to the current time in the dayview
and some small fixes ( zecke )

1 files changed, 49 insertions, 4 deletions

diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp
index c15ccef..9cc5fcd 100644
--- a/core/pim/datebook/datebookday.cpp
+++ b/core/pim/datebook/datebookday.cpp
@@ -51,25 +51,25 @@ DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent,
     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);
+        //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 )
@@ -150,58 +150,78 @@ 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 {
         // I don't know what this key is, do you?
         e->ignore();
     }
 }
 
+void DateBookDayView::setRowStyle( int style )
+{
+        if (style<0) style = 0;
+
+        for (int i=0; i<numRows(); i++)
+                setRowHeight(i, style*10+20);
+}
 
 //===========================================================================
 
 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() );
+    rowStyle = -1; // initialize with bogus values
+}
+
+void DateBookDay::setJumpToCurTime( bool bJump )
+{
+        jumpToCurTime = bJump;
+}
+
+void DateBookDay::setRowStyle( int style )
+{
+        if (rowStyle != style) view->setRowStyle( style );
+        rowStyle = style;
 }
 
 void DateBookDay::updateView( void )
 {
         timeMarker->setTime( QTime::currentTime() );
         //need to find a way to update all DateBookDayWidgets
 }
 
 void DateBookDay::setSelectedWidget( DateBookDayWidget *w )
 {
         selectedWidget = w;
 }
@@ -248,33 +268,39 @@ void DateBookDay::setDate( QDate d)
     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;
+
+    if (jumpToCurTime && this->date() == QDate::currentDate())
+    {
+            ts.init( QTime::currentTime().hour(), 0);
+        ts.expandTo( QTime::currentTime().hour(), 0);
+    } else
+    {
     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();
 
@@ -390,24 +416,27 @@ void DateBookDay::relayoutPage( bool fromResize )
             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 );
         }
 
+        if (jumpToCurTime && this->date() == QDate::currentDate())
+                view->setContentsPos( 0, QTime::currentTime().hour() * view->rowHeight(0) ); //set listview to current hour
+        else
         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();
@@ -435,29 +464,36 @@ void DateBookDay::relayoutPage( bool fromResize )
         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+2) );
                 geom.setWidth( wid );
                 w->setGeometry( geom );
             }
         }
+
+        if (jumpToCurTime && this->date() == QDate::currentDate())
+                view->setContentsPos( 0, QTime::currentTime().hour() * view->rowHeight(0) ); //set listview to current hour
+        else
         view->setContentsPos( 0, startTime * view->rowHeight(0) );
     }
 
             timeMarker->setTime( QTime::currentTime() );//display timeMarker
             timeMarker->raise();                        //on top of all widgets
+             if (this->date() == QDate::currentDate())  //only show timeMarker on current day
+            timeMarker->show(); else timeMarker->hide();
+
     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;
@@ -470,26 +506,35 @@ DateBookDayWidget *DateBookDay::intersects( const DateBookDayWidget *item, const
 
 
 QDate DateBookDay::date() const
 {
     return currDate;
 }
 
 void DateBookDay::setStartViewTime( int startHere )
 {
     startTime = startHere;
     dayView()->clearSelection();
     QTableSelection ts;
+
+            if (jumpToCurTime && this->date() == QDate::currentDate())//this should probably be in datebook.cpp where it's called?
+    {
+            ts.init( QTime::currentTime().hour(), 0);
+        ts.expandTo( QTime::currentTime().hour(), 0);
+    } else
+    {
     ts.init( startTime, 0 );
     ts.expandTo( startTime, 0 );
+    }
+
     dayView()->addSelection( ts );
 }
 
 int DateBookDay::startViewTime() const
 {
     return startTime;
 }
 
 void DateBookDay::slotWeekChanged( bool bStartOnMonday )
 {
     header->setStartOfWeek( bStartOnMonday );
     //    redraw();