search fixes

1 files changed, 7 insertions, 5 deletions

diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp
index 2c78ea3..946fc0d 100644
--- a/libkdepim/kdateedit.cpp
+++ b/libkdepim/kdateedit.cpp
@@ -73,25 +73,25 @@ KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP )
       // mDateFrame->setFrameStyle(QFrame::PopupPanel | QFrame::Raised);
       mDateFrame->setFrameStyle( QFrame::WinPanel |QFrame::Raised );
       mDateFrame->setLineWidth(3);
       mDateFrame->hide();
 
       mDatePicker = new KDatePicker(mDateFrame,QDate::currentDate());
       connect(mDatePicker,SIGNAL(dateEntered(QDate)),SLOT(setDate(QDate)));
       connect(mDatePicker,SIGNAL(dateEntered(QDate)),SIGNAL(dateChanged(QDate)));
       connect(mDatePicker,SIGNAL(dateSelected(QDate)),SLOT(setDate(QDate)));
       connect(mDatePicker,SIGNAL(dateSelected(QDate)),SIGNAL(dateChanged(QDate)));
       connect(mDatePicker,SIGNAL(dateSelected(QDate)),mDateFrame,SLOT(hide()));
       connect(mDateButton,SIGNAL(clicked()),SLOT(toggleDatePicker()));
-      
+      mDateButton->setFocusPolicy( QWidget::NoFocus ); 
       //mDateFrame->resize( 400, 300 );
       
   }
       connect(mDateEdit,SIGNAL(returnPressed()),SLOT(lineEnterPressed()));
       connect(mDateEdit,SIGNAL(textChanged(const QString &)),
               SLOT(textChanged(const QString &)));
 
   // Create the keyword list. This will be used to match against when the user
   // enters information.
   mKeywordMap[i18n("tomorrow")] = 1;
   mKeywordMap[i18n("today")] = 0;
   mKeywordMap[i18n("yesterday")] = -1;
@@ -108,25 +108,25 @@ KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP )
   int currentDay = QDate::currentDate().dayOfWeek();
   for (int i = 1; i <= 7; ++i)
   {
     dayName = KGlobal::locale()->weekDayName(i).lower();
     if (i >= currentDay)
       mKeywordMap[dayName] = i - currentDay;
     else
       mKeywordMap[dayName] = 7 - currentDay + i;
   }
 
   mTextChanged = false;
   mHandleInvalid = false;
-  QWidget::setTabOrder( mDateEdit, mDateButton );
+  // QWidget::setTabOrder( mDateEdit, mDateButton );
 }
 
 KDateEdit::~KDateEdit()
 {
   delete mDateFrame;
 }
 void KDateEdit::clear()
 {
   bool b = mDateEdit->signalsBlocked();
   mDateEdit->blockSignals(true);
   mDateEdit->setText("");
   mDateEdit->blockSignals(b);
@@ -453,28 +453,30 @@ QDate KDateEdit::readDate() const
   else
   {
     date = KGlobal::locale()->readDate(text);
   }
 
   return date;
 }
 
 bool KDateEdit::eventFilter(QObject *, QEvent *e)
 {
   // We only process the focus out event if the text has changed
   // since we got focus
-  if ((e->type() == QEvent::FocusOut) && mTextChanged)
+  if ((e->type() == QEvent::FocusOut) )
   {
-    lineEnterPressed();
-    mTextChanged = false;
+      if ( mTextChanged ) {
+          lineEnterPressed();
+          mTextChanged = false;
+      }
   }
   // switch dateFormShort by double klick with mouse
   else if (e->type() == QEvent::MouseButtonDblClick)
   {
       toggleDateFormat();
   }
   else if (e->type() == QEvent::FocusIn) 
   {
     maxDay = readDate().day();
   }
 
   return false;