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
@@ -34,25 +34,25 @@
             <y>0</y>
             <width>242</width>
             <height>339</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>New Event</string>
     </property>
     <grid>
         <property stdset="1">
             <name>margin</name>
-            <number>0</number>
+            <number>2</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>0</number>
         </property>
         <widget row="1"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel2</cstring>
             </property>
             <property stdset="1">
@@ -138,25 +138,25 @@
                 <name>duplicatesEnabled</name>
                 <bool>false</bool>
             </property>
         </widget>
         <widget row="0"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel1</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Description</string>
+                <string>Description </string>
             </property>
         </widget>
         <widget row="1"  column="1"  rowspan="1"  colspan="3" >
             <class>QComboBox</class>
             <item>
                 <property>
                     <name>text</name>
                     <string></string>
                 </property>
             </item>
             <item>
                 <property>
@@ -200,25 +200,25 @@
                 <name>name</name>
                 <cstring>comboCategory</cstring>
             </property>
         </widget>
         <widget row="3"  column="0" rowspan="2">
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TextLabel3</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Start - End</string>
+                <string>Start - End </string>
             </property>
         </widget>
         <widget row="3"  column="1" >
             <class>QPushButton</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>buttonStart</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>Jan 02 00</string>
             </property>
@@ -256,57 +256,79 @@
                     <width>70</width>
                     <height>32767</height>
                 </size>
             </property>
             <property stdset="1">
                 <name>alignment</name>
                 <set>AlignHCenter</set>
             </property>
             <property>
                 <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">
                 <name>name</name>
                 <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>
                 <cstring>buttonEnd</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>Jan 02 00</string>
             </property>
             <property stdset="1">
                 <name>minimumSize</name>
                 <size>
                     <width>70</width>
                     <height>0</height>
                 </size>
             </property>
             <property stdset="1">
                 <name>maximumSize</name>
                 <size>
                     <width>70</width>
                     <height>32767</height>
                 </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>
                 <cstring>comboEnd</cstring>
             </property>
             <property stdset="1">
                 <name>minimumSize</name>
                 <size>
                     <width>70</width>
                     <height>0</height>
                 </size>
             </property>
@@ -320,25 +342,25 @@
             <property stdset="1">
                 <name>alignment</name>
                 <set>AlignHCenter</set>
             </property>
             <property>
                 <name>hAlign</name>
             </property>
         </widget>
         <widget row="5"  column="0" >
             <class>QLabel</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>TextLabel3_2</cstring>
+                <cstring>TimePickerLabel</cstring>
             </property>
             <property stdset="1">
                 <name>text</name>
                 <string>Start time</string>
             </property>
         </widget>
         <widget row="6"  column="0" >
             <class>QCheckBox</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>checkAllDay</cstring>
             </property>
@@ -554,24 +576,30 @@
         <sender>comboStart</sender>
         <signal>textChanged(const QString &amp;)</signal>
         <receiver>DateEntryBase</receiver>
         <slot>startTimeEdited( const QString &amp; )</slot>
     </connection>
     <connection>
         <sender>checkAllDay</sender>
         <signal>toggled(bool)</signal>
         <receiver>comboEnd</receiver>
         <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>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
         <sender>checkAllDay</sender>
         <signal>toggled(bool)</signal>
         <receiver>comboStart</receiver>
         <slot>setDisabled(bool)</slot>
     </connection>
     <slot access="public">endDateChanged( const QString &amp; )</slot>
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
@@ -59,31 +59,47 @@ DateEntry::DateEntry( bool startOnMonday, const QDateTime &start,
       ampm( whichClock ),
       startWeekOnMonday( startOnMonday )
 {
     init();
     setDates(start,end);
     setFocusProxy(comboDescription);
 }
 
 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;
 }
 
 static void addOrPick( QComboBox* combo, const QString& t )
 {
     // Pick an  item if one excists
     for (int i=0; i<combo->count(); i++) {
         if ( combo->text(i) == t ) {
             combo->setCurrentItem(i);
             return;
         }
     }
@@ -259,35 +275,36 @@ static QTime parseTime( const QString& s, bool ampm )
         minute = 59;
     } else if ( hour < 0 )
         hour = 0;
     tmpTime.setHMS( hour, minute, 0 );
     return tmpTime;
 }
 
 /*
  * public slot
  */
 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());
 }
 
 /*
  * public slot
  */
 void DateEntry::startDateChanged( int y, int m, int d )
 {
     QDate prev = startDate;
     startDate.setYMD( y, m, d );
     if ( rp.type == Event::Weekly &&
          startDate.dayOfWeek() != prev.dayOfWeek() ) {
         // if we change the start of a weekly repeating event
@@ -317,27 +334,26 @@ void DateEntry::startTimeEdited( const QString &s )
 
 void DateEntry::startTimeChanged( const QTime &t )
 {
     int duration=startTime.secsTo(endTime);
     startTime = t;
     endTime=t.addSecs(duration);
 }
 void DateEntry::startTimePicked( const QTime &t ) {
   if(m_showStart ){
     startTimeChanged(t);
     updateTimeEdit(true,true);
   }else{
-    endTime = t;
+    endTimeChanged(t);
     updateTimeEdit(false, true );
-
   }
 }
 
 /*
  * public slot
  */
 void DateEntry::typeChanged( const QString &s )
 {
     bool b = s != "All Day";
     buttonStart->setEnabled( b );
     comboStart->setEnabled( b );
     comboEnd->setEnabled( b );