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 )

9 files changed, 406 insertions, 146 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index c0d45c9..7dd93a6 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -80,6 +80,8 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
       aPreset( FALSE ),
       presetTime( -1 ),
       startTime( 8 ), // an acceptable default
+      rowStyle( 0 ),
+      bJumpToCurTime(FALSE),
       syncing(FALSE),
       inSearch(FALSE),
       alarmCounter(0)
@@ -249,6 +251,8 @@ void DateBook::slotSettings()
     DateBookSettings frmSettings( ampm, this );
     frmSettings.setStartTime( startTime );
     frmSettings.setAlarmPreset( aPreset, presetTime );
+    frmSettings.setJumpToCurTime( bJumpToCurTime );
+    frmSettings.setRowStyle( rowStyle );
 #if defined (Q_WS_QWS) || defined(_WS_QWS_)
     frmSettings.showMaximized();
 #endif
@@ -257,8 +261,12 @@ void DateBook::slotSettings()
 	aPreset = frmSettings.alarmPreset();
 	presetTime = frmSettings.presetTime();
 	startTime = frmSettings.startTime();
+	bJumpToCurTime = frmSettings.jumpToCurTime();
+	rowStyle = frmSettings.rowStyle();
 	if ( dayView )
 	    dayView->setStartViewTime( startTime );
+	    dayView->setJumpToCurTime( bJumpToCurTime );
+	    dayView->setRowStyle( rowStyle );
 	if ( weekView )
 	    weekView->setStartViewTime( startTime );
 	saveSettings();
@@ -453,6 +461,8 @@ void DateBook::initDay()
 	dayView = new DateBookDay( ampm, onMonday, db, views, "day view" );
 	views->addWidget( dayView, DAY );
 	dayView->setStartViewTime( startTime );
+	dayView->setJumpToCurTime( bJumpToCurTime );
+	dayView->setRowStyle( rowStyle );
 	connect( this, SIGNAL( newEvent() ),
 		 dayView, SLOT( redraw() ) );
 	connect( dayView, SIGNAL( newEvent() ),
@@ -547,6 +557,8 @@ void DateBook::loadSettings()
 	startTime = config.readNumEntry("startviewtime", 8);
 	aPreset = config.readBoolEntry("alarmpreset");
 	presetTime = config.readNumEntry("presettime");
+	bJumpToCurTime = config.readBoolEntry("jumptocurtime");
+	rowStyle = config.readNumEntry("rowstyle");
     }
 }
 
@@ -558,6 +570,8 @@ void DateBook::saveSettings()
     configDB.writeEntry("startviewtime",startTime);
     configDB.writeEntry("alarmpreset",aPreset);
     configDB.writeEntry("presettime",presetTime);
+    configDB.writeEntry("jumptocurtime", bJumpToCurTime);
+    configDB.writeEntry("rowstyle", rowStyle);
 }
 
 void DateBook::newDefaultView(QAction *a) {
diff --git a/core/pim/datebook/datebook.h b/core/pim/datebook/datebook.h
index e7be0dd..ba8f97e 100644
--- a/core/pim/datebook/datebook.h
+++ b/core/pim/datebook/datebook.h
@@ -114,6 +114,8 @@ private:
     bool aPreset;    // have everything set to alarm?
     int presetTime;  // the standard time for the alarm
     int startTime;
+    int rowStyle;
+    bool bJumpToCurTime; //should jump to current time in dayview?
     bool ampm;
     bool onMonday;
 
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index 609b7dc..1db3e3a 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -7,6 +7,7 @@ HEADERS	= datebookday.h \
 	  dateentryimpl.h \
 	  datebookdayheaderimpl.h \
 	  datebooksettings.h \
+	  datebooksettingsbase.h \
 	  datebookweek.h \
 	  datebookweeklst.h \
 	  datebookweekheaderimpl.h \
@@ -20,6 +21,7 @@ SOURCES	= main.cpp \
 	  datebook.cpp \
 	  dateentryimpl.cpp \
 	  datebookdayheaderimpl.cpp \
+	  datebooksettingsbase.cpp \
 	  datebooksettings.cpp \
 	  datebookweek.cpp \
 	  datebookweeklst.cpp \
@@ -31,7 +33,6 @@ SOURCES	= main.cpp \
 
 INTERFACES	= dateentry.ui \
 		  datebookdayheader.ui \
-		  datebooksettingsbase.ui \
 		  datebookweekheader.ui \
 		  datebookweeklstheader.ui \		  
  		  datebookweeklstdayhdr.ui \		  
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
@@ -60,7 +60,7 @@ DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent,
     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)),
@@ -159,6 +159,13 @@ void DateBookDayView::keyPressEvent( QKeyEvent *e )
     }
 }
 
+void DateBookDayView::setRowStyle( int style )
+{
+	if (style<0) style = 0;
+
+	for (int i=0; i<numRows(); i++)
+		setRowHeight(i, style*10+20);
+}
 
 //===========================================================================
 
@@ -174,6 +181,7 @@ DateBookDay::DateBookDay( bool ampm, bool startOnMonday,
     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() ),
@@ -193,6 +201,18 @@ DateBookDay::DateBookDay( bool ampm, bool startOnMonday,
 
     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 )
@@ -257,15 +277,21 @@ void DateBookDay::dateChanged( int y, int m, int d )
     relayoutPage();
     dayView()->clearSelection();
     QTableSelection ts;
-    ts.init( startTime, 0 );
-    ts.expandTo( startTime, 0 );
+
+    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()
@@ -399,7 +425,10 @@ void DateBookDay::relayoutPage( bool fromResize )
 	    w->setGeometry( geom );
 	}
 
-	view->setContentsPos( 0, startTime * view->rowHeight(0) );
+	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 {
@@ -444,11 +473,18 @@ void DateBookDay::relayoutPage( bool fromResize )
 		w->setGeometry( geom );
 	    }
 	}
-	view->setContentsPos( 0, startTime * view->rowHeight(0) );
+
+	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;
 }
@@ -479,8 +515,17 @@ void DateBookDay::setStartViewTime( int startHere )
     startTime = startHere;
     dayView()->clearSelection();
     QTableSelection ts;
-    ts.init( startTime, 0 );
-    ts.expandTo( startTime, 0 );
+
+    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 );
 }
 
diff --git a/core/pim/datebook/datebookday.h b/core/pim/datebook/datebookday.h
index db0f3b6..be7cc45 100644
--- a/core/pim/datebook/datebookday.h
+++ b/core/pim/datebook/datebookday.h
@@ -40,6 +40,8 @@ class DateBookDayView : public QTable
 public:
     DateBookDayView( bool hourClock, QWidget *parent, const char *name );
     bool whichClock() const;
+    
+    void setRowStyle( int style );
 
 public slots:
     void moveUp();
@@ -149,6 +151,8 @@ public:
     int startViewTime() const;
     void setSelectedWidget( DateBookDayWidget * );
     DateBookDayWidget * getSelectedWidget( void );
+    void setJumpToCurTime( bool bJump );
+    void setRowStyle( int style );
 
 public slots:
     void setDate( int y, int m, int d );
@@ -181,6 +185,8 @@ private:
     DateBookDB *db;
     WidgetListClass widgetList;	//reimplemented QList for sorting widgets by height
     int startTime;
+    bool jumpToCurTime;	//should we jump to current time in dayview?
+    int rowStyle;
     DateBookDayWidget *selectedWidget; //actual selected widget (obviously)
     DateBookDayTimeMarker *timeMarker;	//marker for current time
 };
diff --git a/core/pim/datebook/datebooksettings.cpp b/core/pim/datebook/datebooksettings.cpp
index c5d8ac1..49fcd17 100644
--- a/core/pim/datebook/datebooksettings.cpp
+++ b/core/pim/datebook/datebooksettings.cpp
@@ -133,3 +133,23 @@ void DateBookSettings::slotChangeClock( bool whichClock )
     init();
     setStartTime( saveMe );
 }
+
+void DateBookSettings::setJumpToCurTime( bool bJump )
+{
+	chkJumpToCurTime->setChecked( bJump );
+}
+
+bool DateBookSettings::jumpToCurTime() const
+{
+	return chkJumpToCurTime->isChecked();
+}
+
+void DateBookSettings::setRowStyle( int style )
+{
+	comboRowStyle->setCurrentItem( style );
+}
+
+int DateBookSettings::rowStyle() const
+{
+	return comboRowStyle->currentItem();
+}
diff --git a/core/pim/datebook/datebooksettings.h b/core/pim/datebook/datebooksettings.h
index ee9f39c..90a07f9 100644
--- a/core/pim/datebook/datebooksettings.h
+++ b/core/pim/datebook/datebooksettings.h
@@ -35,7 +35,12 @@ public:
     int presetTime() const;
     void setAlarmType( int alarmType );
     int alarmType() const;
-
+    
+    void setJumpToCurTime( bool bJump );
+    bool jumpToCurTime() const;
+    void setRowStyle( int style );
+    int rowStyle() const;
+    
 private slots:
     void slot12Hour( int );
     void slotChangeClock( bool );
diff --git a/core/pim/datebook/datebooksettingsbase.ui b/core/pim/datebook/datebooksettingsbase.ui
index 0f40773..816a441 100644
--- a/core/pim/datebook/datebooksettingsbase.ui
+++ b/core/pim/datebook/datebooksettingsbase.ui
@@ -32,7 +32,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>232</width>
+            <width>220</width>
             <height>290</height>
         </rect>
     </property>
@@ -46,16 +46,16 @@
     <property>
         <name>layoutSpacing</name>
     </property>
-    <vbox>
+    <grid>
         <property stdset="1">
             <name>margin</name>
-            <number>5</number>
+            <number>11</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
-            <number>1</number>
+            <number>6</number>
         </property>
-        <widget>
+        <widget row="0"  column="0" >
             <class>QGroupBox</class>
             <property stdset="1">
                 <name>name</name>
@@ -73,65 +73,102 @@
                 <name>title</name>
                 <string>Start viewing events</string>
             </property>
-            <vbox>
+            <widget>
+                <class>QLayoutWidget</class>
                 <property stdset="1">
-                    <name>margin</name>
-                    <number>11</number>
+                    <name>name</name>
+                    <cstring>Layout6</cstring>
                 </property>
                 <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
+                    <name>geometry</name>
+                    <rect>
+                        <x>3</x>
+                        <y>21</y>
+                        <width>210</width>
+                        <height>53</height>
+                    </rect>
                 </property>
-                <widget>
-                    <class>QLayoutWidget</class>
+                <grid>
                     <property stdset="1">
-                        <name>name</name>
-                        <cstring>Layout1</cstring>
+                        <name>margin</name>
+                        <number>0</number>
                     </property>
-                    <hbox>
+                    <property stdset="1">
+                        <name>spacing</name>
+                        <number>6</number>
+                    </property>
+                    <spacer row="1"  column="0" >
+                        <property>
+                            <name>name</name>
+                            <cstring>Spacer1</cstring>
+                        </property>
                         <property stdset="1">
-                            <name>margin</name>
-                            <number>0</number>
+                            <name>orientation</name>
+                            <enum>Vertical</enum>
                         </property>
                         <property stdset="1">
-                            <name>spacing</name>
-                            <number>6</number>
+                            <name>sizeType</name>
+                            <enum>Expanding</enum>
                         </property>
-                        <widget>
-                            <class>QLabel</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>lblStartTime</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>Start Time:</string>
-                            </property>
-                        </widget>
-                        <widget>
-                            <class>QSpinBox</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>spinStart</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>suffix</name>
-                                <string>:00</string>
-                            </property>
+                        <property>
+                            <name>sizeHint</name>
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <widget row="0"  column="0" >
+                        <class>QLayoutWidget</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>Layout1</cstring>
+                        </property>
+                        <hbox>
                             <property stdset="1">
-                                <name>wrapping</name>
-                                <bool>true</bool>
+                                <name>margin</name>
+                                <number>0</number>
                             </property>
                             <property stdset="1">
-                                <name>maxValue</name>
-                                <number>23</number>
+                                <name>spacing</name>
+                                <number>6</number>
                             </property>
-                        </widget>
-                    </hbox>
-                </widget>
-            </vbox>
+                            <widget>
+                                <class>QLabel</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>lblStartTime</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>Start Time:</string>
+                                </property>
+                            </widget>
+                            <widget>
+                                <class>QSpinBox</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>spinStart</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>suffix</name>
+                                    <string>:00</string>
+                                </property>
+                                <property stdset="1">
+                                    <name>wrapping</name>
+                                    <bool>true</bool>
+                                </property>
+                                <property stdset="1">
+                                    <name>maxValue</name>
+                                    <number>23</number>
+                                </property>
+                            </widget>
+                        </hbox>
+                    </widget>
+                </grid>
+            </widget>
         </widget>
-        <widget>
+        <widget row="1"  column="0" >
             <class>QGroupBox</class>
             <property stdset="1">
                 <name>name</name>
@@ -141,77 +178,207 @@
                 <name>title</name>
                 <string>Alarm Settings</string>
             </property>
-            <vbox>
+            <widget>
+                <class>QLayoutWidget</class>
                 <property stdset="1">
-                    <name>margin</name>
-                    <number>11</number>
+                    <name>name</name>
+                    <cstring>Layout4</cstring>
                 </property>
                 <property stdset="1">
-                    <name>spacing</name>
-                    <number>6</number>
+                    <name>geometry</name>
+                    <rect>
+                        <x>10</x>
+                        <y>20</y>
+                        <width>200</width>
+                        <height>53</height>
+                    </rect>
                 </property>
-                <widget>
-                    <class>QLayoutWidget</class>
+                <grid>
+                    <property stdset="1">
+                        <name>margin</name>
+                        <number>0</number>
+                    </property>
                     <property stdset="1">
-                        <name>name</name>
-                        <cstring>Layout6</cstring>
+                        <name>spacing</name>
+                        <number>6</number>
                     </property>
-                    <hbox>
+                    <spacer row="1"  column="0" >
+                        <property>
+                            <name>name</name>
+                            <cstring>Spacer2</cstring>
+                        </property>
                         <property stdset="1">
-                            <name>margin</name>
-                            <number>0</number>
+                            <name>orientation</name>
+                            <enum>Vertical</enum>
                         </property>
                         <property stdset="1">
-                            <name>spacing</name>
-                            <number>6</number>
+                            <name>sizeType</name>
+                            <enum>Expanding</enum>
                         </property>
-                        <widget>
-                            <class>QCheckBox</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>chkAlarmPreset</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>text</name>
-                                <string>Alarm Preset</string>
-                            </property>
-                        </widget>
-                        <widget>
-                            <class>QSpinBox</class>
-                            <property stdset="1">
-                                <name>name</name>
-                                <cstring>spinPreset</cstring>
-                            </property>
-                            <property stdset="1">
-                                <name>enabled</name>
-                                <bool>false</bool>
-                            </property>
+                        <property>
+                            <name>sizeHint</name>
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <widget row="0"  column="0" >
+                        <class>QLayoutWidget</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>Layout6</cstring>
+                        </property>
+                        <hbox>
                             <property stdset="1">
-                                <name>suffix</name>
-                                <string> minutes</string>
+                                <name>margin</name>
+                                <number>0</number>
                             </property>
                             <property stdset="1">
-                                <name>maxValue</name>
-                                <number>180</number>
+                                <name>spacing</name>
+                                <number>6</number>
                             </property>
-                            <property stdset="1">
-                                <name>minValue</name>
-                                <number>0</number>
+                            <widget>
+                                <class>QCheckBox</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>chkAlarmPreset</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>Alarm Preset</string>
+                                </property>
+                            </widget>
+                            <widget>
+                                <class>QSpinBox</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>spinPreset</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>enabled</name>
+                                    <bool>false</bool>
+                                </property>
+                                <property stdset="1">
+                                    <name>suffix</name>
+                                    <string> minutes</string>
+                                </property>
+                                <property stdset="1">
+                                    <name>maxValue</name>
+                                    <number>180</number>
+                                </property>
+                                <property stdset="1">
+                                    <name>minValue</name>
+                                    <number>0</number>
+                                </property>
+                                <property stdset="1">
+                                    <name>lineStep</name>
+                                    <number>5</number>
+                                </property>
+                                <property stdset="1">
+                                    <name>value</name>
+                                    <number>5</number>
+                                </property>
+                            </widget>
+                        </hbox>
+                    </widget>
+                </grid>
+            </widget>
+        </widget>
+        <widget row="2"  column="0" >
+            <class>QGroupBox</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>fraMisc</cstring>
+            </property>
+            <property stdset="1">
+                <name>title</name>
+                <string>Misc</string>
+            </property>
+            <widget>
+                <class>QLayoutWidget</class>
+                <property stdset="1">
+                    <name>name</name>
+                    <cstring>Layout5</cstring>
+                </property>
+                <property stdset="1">
+                    <name>geometry</name>
+                    <rect>
+                        <x>10</x>
+                        <y>40</y>
+                        <width>170</width>
+                        <height>24</height>
+                    </rect>
+                </property>
+                <hbox>
+                    <property stdset="1">
+                        <name>margin</name>
+                        <number>0</number>
+                    </property>
+                    <property stdset="1">
+                        <name>spacing</name>
+                        <number>6</number>
+                    </property>
+                    <widget>
+                        <class>QLabel</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>TextLabel1</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Row style:</string>
+                        </property>
+                    </widget>
+                    <widget>
+                        <class>QComboBox</class>
+                        <item>
+                            <property>
+                                <name>text</name>
+                                <string>Default</string>
                             </property>
-                            <property stdset="1">
-                                <name>lineStep</name>
-                                <number>5</number>
+                        </item>
+                        <item>
+                            <property>
+                                <name>text</name>
+                                <string>Medium</string>
                             </property>
-                            <property stdset="1">
-                                <name>value</name>
-                                <number>5</number>
+                        </item>
+                        <item>
+                            <property>
+                                <name>text</name>
+                                <string>Large</string>
                             </property>
-                        </widget>
-                    </hbox>
-                </widget>
-            </vbox>
+                        </item>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>comboRowStyle</cstring>
+                        </property>
+                    </widget>
+                </hbox>
+            </widget>
+            <widget>
+                <class>QCheckBox</class>
+                <property stdset="1">
+                    <name>name</name>
+                    <cstring>chkJumpToCurTime</cstring>
+                </property>
+                <property stdset="1">
+                    <name>geometry</name>
+                    <rect>
+                        <x>10</x>
+                        <y>20</y>
+                        <width>200</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property stdset="1">
+                    <name>text</name>
+                    <string>Jump to current time (dayview)</string>
+                </property>
+            </widget>
         </widget>
-    </vbox>
+    </grid>
 </widget>
 <connections>
     <connection>
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index 8e88377..58a9c53 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -20,14 +20,14 @@
 #include <qstyle.h>
 #include <qtoolbutton.h>
 #include <qvbox.h>
-#include <qsizepolicy.h> 
-#include <qabstractlayout.h> 
+#include <qsizepolicy.h>
+#include <qabstractlayout.h>
 #include <qtl.h>
 
 bool calcWeek(const QDate &d, int &week, int &year,
 	      bool startOnMonday = false);
 
-DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent,  
+DateBookWeekLstHeader::DateBookWeekLstHeader(bool /*onM*/, QWidget* parent,
 					     const char* name, WFlags fl)
     : DateBookWeekLstHeaderBase(parent, name, fl)
 {
@@ -54,12 +54,12 @@ void DateBookWeekLstHeader::setDate(const QDate &d) {
     int year,week;
     calcWeek(d,week,year,onMonday);
     labelWeek->setText("W: " + QString::number(week));
-	
+
     QDate start=date;
     QDate stop=start.addDays(6);
-    labelDate->setText( QString::number(start.day()) + " " + 
+    labelDate->setText( QString::number(start.day()) + " " +
 			start.monthName(start.month()) + " - " +
-			QString::number(stop.day()) + " " + 
+			QString::number(stop.day()) + " " +
 			start.monthName(stop.month()) );
     emit dateChanged(year,week);
 }
@@ -92,9 +92,9 @@ void DateBookWeekLstHeader::prevWeek() {
 }
 
 DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool onM,
-					     QWidget* parent, 
-					     const char* name, 
-					     WFlags fl ) 
+					     QWidget* parent,
+					     const char* name,
+					     WFlags fl )
     : DateBookWeekLstDayHdrBase(parent, name, fl) {
 
     date=d;
@@ -102,7 +102,7 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool onM,
     static const char *wdays="MTWTFSS";
     char day=wdays[d.dayOfWeek()-1];
 
-    label->setText( QString(QChar(day)) + " " + 
+    label->setText( QString(QChar(day)) + " " +
 		    QString::number(d.day()) );
     add->setText("+");
 
@@ -110,7 +110,7 @@ DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool onM,
 	QPalette pal=label->palette();
 	pal.setColor(QColorGroup::Foreground, QColor(0,0,255));
 	label->setPalette(pal);
-	
+
 	/*
 	  QFont f=label->font();
 	  f.setItalic(true);
@@ -139,9 +139,9 @@ void DateBookWeekLstDayHdr::newEvent() {
 
     emit addEvent(start,stop,"");
 }
-DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev, 
-					   QWidget* parent, 
-					   const char* name, 
+DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev,
+					   QWidget* parent,
+					   const char* name,
 					   WFlags fl) :
     OClickableLabel(parent,name,fl),
     event(ev)
@@ -165,9 +165,9 @@ void DateBookWeekLstEvent::editMe() {
 }
 
 
-DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev, 
+DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
 					 const QDate &d, bool onM,
-					 QWidget* parent,  
+					 QWidget* parent,
 					 const char* name, WFlags fl)
     : QWidget( parent, name, fl )
 {
@@ -176,13 +176,13 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
     setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
 
     QVBoxLayout *layout = new QVBoxLayout( this );
-	
+
     qBubbleSort(ev);
     QValueListIterator<EffectiveEvent> it;
     it=ev.begin();
 
     int dayOrder[7];
-    if (onMonday) 
+    if (onMonday)
 	for (int d=0; d<7; d++) dayOrder[d]=d+1;
     else {
 	for (int d=0; d<7; d++) dayOrder[d]=d;
@@ -193,16 +193,16 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
 	// Header
 	DateBookWeekLstDayHdr *hdr=new DateBookWeekLstDayHdr(d.addDays(i),
 							     onMonday,this);
-	connect(hdr, SIGNAL(showDate(int,int,int)), 
+	connect(hdr, SIGNAL(showDate(int,int,int)),
 		this, SIGNAL(showDate(int,int,int)));
-	connect(hdr, SIGNAL(addEvent(const QDateTime &, 
+	connect(hdr, SIGNAL(addEvent(const QDateTime &,
 				     const QDateTime &,
-				     const QString &)), 
-		this, SIGNAL(addEvent(const QDateTime &, 
+				     const QString &)),
+		this, SIGNAL(addEvent(const QDateTime &,
 				      const QDateTime &,
 				      const QString &)));
 	layout->addWidget(hdr);
-		
+
 	// Events
 	while ( (*it).date().dayOfWeek() == dayOrder[i] && it!=ev.end() ) {
 	    DateBookWeekLstEvent *l=new DateBookWeekLstEvent(*it,this);
@@ -211,17 +211,17 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
 		     this, SIGNAL(editEvent(const Event &)));
 	    it++;
 	}
-	
+
 	layout->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
     }
 }
 DateBookWeekLstView::~DateBookWeekLstView(){}
 void DateBookWeekLstView::keyPressEvent(QKeyEvent *e) {e->ignore();}
 
-DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1, 
-					       QValueList<EffectiveEvent> &ev2, 
+DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
+					       QValueList<EffectiveEvent> &ev2,
 					       QDate &d, bool onM,
-					       QWidget* parent,  
+					       QWidget* parent,
 					       const char* name, WFlags fl)
     : QWidget( parent, name, fl )
 {
@@ -251,8 +251,8 @@ DateBookWeekLstDblView::DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
 				   const QString &)));
 }
 
-DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB, 
-				  QWidget *parent, 
+DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB,
+				  QWidget *parent,
 				  const char *name )
     : QWidget( parent, name ),
       db( newDB ),
@@ -266,10 +266,10 @@ DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB,
 
     header=new DateBookWeekLstHeader(onM, this);
     layout->addWidget( header );
-    connect(header, SIGNAL(dateChanged(int,int)), 
+    connect(header, SIGNAL(dateChanged(int,int)),
 	    this, SLOT(dateChanged(int,int)));
     connect(header, SIGNAL(setDbl(bool)),
-	    this, SLOT(setDbl(bool))); 
+	    this, SLOT(setDbl(bool)));
 
     scroll=new QScrollView(this);
     //scroll->setVScrollBarMode(QScrollView::AlwaysOn);
@@ -310,7 +310,7 @@ QDate DateBookWeekLst::date() const {
     if (!onMonday)
 	if (dow==7) dow=1;
 	else dow++;
-	
+
     d=d.addDays( (_week-1)*7 - dow + 1 );
     return d;
 }