author | zautrix <zautrix> | 2005-02-21 12:28:31 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-21 12:28:31 (UTC) |
commit | b4ebc9c227f986369fe9b0193158f3893a29df08 (patch) (side-by-side diff) | |
tree | 6f117a4927fae9142b036751509925b3641b9c3f /libkdepim/kdateedit.cpp | |
parent | bb74ffa01010ca364e101e05a6b3e090ae363a0e (diff) | |
download | kdepimpi-b4ebc9c227f986369fe9b0193158f3893a29df08.zip kdepimpi-b4ebc9c227f986369fe9b0193158f3893a29df08.tar.gz kdepimpi-b4ebc9c227f986369fe9b0193158f3893a29df08.tar.bz2 |
search fixes
-rw-r--r-- | libkdepim/kdateedit.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp index 2c78ea3..946fc0d 100644 --- a/libkdepim/kdateedit.cpp +++ b/libkdepim/kdateedit.cpp @@ -77,17 +77,17 @@ KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP ) 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 @@ -112,17 +112,17 @@ KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP ) 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() { @@ -457,21 +457,23 @@ QDate KDateEdit::readDate() const 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) ) { + 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(); |