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
@@ -57,13 +57,13 @@ DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent,
     // 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)) );
 }
 
@@ -156,12 +156,19 @@ void DateBookDayView::keyPressEvent( QKeyEvent *e )
     } 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 )
@@ -171,12 +178,13 @@ DateBookDay::DateBookDay( bool ampm, bool startOnMonday,
       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)) );
@@ -190,12 +198,24 @@ DateBookDay::DateBookDay( bool ampm, bool startOnMonday,
     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
@@ -254,21 +274,27 @@ void DateBookDay::dateChanged( int y, int m, int 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();
@@ -396,12 +422,15 @@ void DateBookDay::relayoutPage( bool fromResize )
 	    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 {
 
 
@@ -441,17 +470,24 @@ void DateBookDay::relayoutPage( bool fromResize )
 		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 )
 {
@@ -476,14 +512,23 @@ QDate DateBookDay::date() const
 
 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;