2 files changed, 61 insertions, 17 deletions

diff --git a/core/pim/datebook/dateentry.ui b/core/pim/datebook/dateentry.ui
index dc5195f..1a712ec 100644
--- a/core/pim/datebook/dateentry.ui
+++ b/core/pim/datebook/dateentry.ui
@@ -43,7 +43,7 @@
     <grid>
         <property stdset="1">
             <name>margin</name>
-            <number>0</number>
+            <number>2</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
@@ -147,7 +147,7 @@
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Description</string>
+                <string>Description </string>
             </property>
         </widget>
         <widget row="1"  column="1"  rowspan="1"  colspan="3" >
@@ -209,7 +209,7 @@
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Start - End</string>
+                <string>Start - End </string>
             </property>
         </widget>
         <widget row="3"  column="1" >
@@ -265,6 +265,28 @@
                 <name>hAlign</name>
             </property>
         </widget>
+        <spacer row="3"  column="2"  rowspan="2"  colspan="1" >
+            <property>
+                <name>name</name>
+                <cstring>Spacer1_2</cstring>
+            </property>
+            <property stdset="1">
+                <name>orientation</name>
+                <enum>Horizontal</enum>
+            </property>
+            <property stdset="1">
+                <name>sizeType</name>
+                <enum>Expanding</enum>
+            </property>
+            <property>
+                <name>sizeHint</name>
+                <size>
+                    <width>20</width>
+                    <height>20</height>
+                </size>
+            </property>
+        </spacer>
+
 	<widget row="5"  column="1" colspan="3">
 	    <class>TimePicker</class>
             <property stdset="1">
@@ -272,7 +294,7 @@
                 <cstring>timePickerStart</cstring>
             </property>
  	</widget>
-        <widget row="3"  column="2" colspan="2">
+        <widget row="3"  column="3" colspan="1">
             <class>QPushButton</class>
             <property stdset="1">
                 <name>name</name>
@@ -297,7 +319,7 @@
                 </size>
             </property>
         </widget>
-        <widget row="4"  column="2" colspan="2">
+        <widget row="4"  column="3" colspan="1">
             <class>QLineEdit</class>
             <property stdset="1">
                 <name>name</name>
@@ -329,7 +351,7 @@
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>TextLabel3_2</cstring>
+                <cstring>TimePickerLabel</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
@@ -563,6 +585,12 @@
         <slot>setDisabled(bool)</slot>
     </connection>
     <connection>
+        <sender>checkAllDay</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>timePickerStart</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
         <sender>checkAlarm</sender>
         <signal>toggled(bool)</signal>
         <receiver>comboSound</receiver>
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp
index f2f17c6..e14e2f5 100644
--- a/core/pim/datebook/dateentryimpl.cpp
+++ b/core/pim/datebook/dateentryimpl.cpp
@@ -68,13 +68,29 @@ bool DateEntry::eventFilter(QObject *obj, QEvent *ev )
 {
   if( ev->type() == QEvent::FocusIn ){
     if( obj == comboStart ){
-      TextLabel3_2->setText( tr("Start Time" ) );
+      timePickerStart->setHour(startTime.hour());
+      timePickerStart->setMinute(startTime.minute());
+      TimePickerLabel->setText( tr("Start Time" ) );
       m_showStart= true;
     }else if( obj == comboEnd ){
-      TextLabel3_2->setText( tr("End Time") );
+      timePickerStart->setHour(endTime.hour());
+      timePickerStart->setMinute(endTime.minute());
+      TimePickerLabel->setText( tr("End Time") );
       m_showStart = false;
     }
+  } else if( ev->type() == QEvent::FocusOut ){
+    if( obj == comboEnd ){
+      QString s;
+      s.sprintf("%.2d:%.2d",endTime.hour(), endTime.minute());
+      comboEnd->setText(s);
+    }
+    else if( obj == comboStart ){
+      QString s;
+      s.sprintf("%.2d:%.2d",startTime.hour(), startTime.minute());
+      comboStart->setText(s);
+    }
   }
+  
   return false;
 }
 
@@ -268,17 +284,18 @@ static QTime parseTime( const QString& s, bool ampm )
  */
 void DateEntry::endTimeChanged( const QString &s )
 {
-    QTime tmpTime = parseTime(s,ampm);
-    if ( endDate > startDate || tmpTime >= startTime ) {
-        endTime = tmpTime;
+  endTimeChanged( parseTime(s,ampm) );
+}
+
+void DateEntry::endTimeChanged( const QTime &t ) {
+    if ( endDate > startDate || t >= startTime ) {
+        endTime = t;
     } else {
         endTime = startTime;
         //comboEnd->setCurrentItem( comboStart->currentItem() );
     }
-    
-}
-
-void DateEntry::endTimeChanged( const QTime &t ) {
+    timePickerStart->setHour(endTime.hour());
+    timePickerStart->setMinute(endTime.minute());
 }
 
 /*
@@ -326,9 +343,8 @@ void DateEntry::startTimePicked( const QTime &t ) {
     startTimeChanged(t);
     updateTimeEdit(true,true);
   }else{
-    endTime = t;
+    endTimeChanged(t);
     updateTimeEdit(false, true );
-
   }
 }