2 files changed, 28 insertions, 3 deletions

diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp
index 403378e..f2f17c6 100644
--- a/core/pim/datebook/dateentryimpl.cpp
+++ b/core/pim/datebook/dateentryimpl.cpp
@@ -31,2 +31,3 @@
 
+#include <qevent.h>
 #include <qcheckbox.h>
@@ -65,2 +66,16 @@ DateEntry::DateEntry( bool startOnMonday, const QDateTime &start,
 
+bool DateEntry::eventFilter(QObject *obj, QEvent *ev )
+{
+  if( ev->type() == QEvent::FocusIn ){
+    if( obj == comboStart ){
+      TextLabel3_2->setText( tr("Start Time" ) );
+      m_showStart= true;
+    }else if( obj == comboEnd ){
+      TextLabel3_2->setText( tr("End Time") );
+      m_showStart = false;
+    }
+  }
+  return false;
+}
+
 static void addOrPick( QComboBox* combo, const QString& t )
@@ -188,2 +203,5 @@ void DateEntry::init()
     editNote->setFixedVisibleLines(3);
+    // install eventFilters
+    comboEnd->installEventFilter( this );
+    comboStart->installEventFilter( this );
 }
@@ -306,4 +324,10 @@ void DateEntry::startTimeChanged( const QTime &t )
 void DateEntry::startTimePicked( const QTime &t ) {
+  if(m_showStart ){
     startTimeChanged(t);
     updateTimeEdit(true,true);
+  }else{
+    endTime = t;
+    updateTimeEdit(false, true );
+
+  }
 }
diff --git a/core/pim/datebook/dateentryimpl.h b/core/pim/datebook/dateentryimpl.h
index bde3119..4eb24b4 100644
--- a/core/pim/datebook/dateentryimpl.h
+++ b/core/pim/datebook/dateentryimpl.h
@@ -44,3 +44,3 @@ public:
     void setAlarmEnabled( bool alarmPreset, int presetTime, Event::SoundTypeChoice );
-
+    virtual bool eventFilter( QObject *, QEvent * );
 public slots:
@@ -69,4 +69,5 @@ private:
     Event::RepeatPattern rp;
-    bool ampm;
-    bool startWeekOnMonday;
+    bool ampm:1;
+    bool startWeekOnMonday:1;
+    bool m_showStart:1;
 };