| -rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 6 | ||||
| -rw-r--r-- | desktop/rpm/kdepim_rpm | 2 | ||||
| -rw-r--r-- | korganizer/searchdialog.cpp | 20 | ||||
| -rw-r--r-- | libkdepim/kdateedit.cpp | 12 | ||||
| -rw-r--r-- | version | 2 |
5 files changed, 27 insertions, 15 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 3179845..1073fe7 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt @@ -1292,2 +1292,8 @@ { "Enable scrollbars in month view cells","Scrollbar in Zellen anzeigen" }, +{ "Summary/Loc.","Titel/Ort" }, +{ "No items found. Use '*' and '?' where needed.","Nichts gefunden. Benutze '*' and '?' wo benötigt." }, +{ "","" }, +{ "","" }, +{ "","" }, +{ "","" }, { "","" }, diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm index 05f61c4..5d85cb3 100644 --- a/desktop/rpm/kdepim_rpm +++ b/desktop/rpm/kdepim_rpm @@ -2,3 +2,3 @@ Summary: A collection of PIM programs Name: KDE-Pim-Pi -Version: 2.0.9 +Version: 2.0.10 Release: SuSE_9.2 diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 3a95978..3fd9740 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -82,3 +82,3 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) - mSummaryCheck = new QCheckBox(i18n("Summaries"),subjectGroup); + mSummaryCheck = new QCheckBox(i18n("Summary/Loc."),subjectGroup); mSummaryCheck->setChecked(true); @@ -187,9 +187,3 @@ void SearchDialog::doSearch() if (mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count() == 0) { - KMessageBox::information(this, - i18n("No items were found matching\nyour search expression.\nUse the wildcard characters\n'*' and '?' where needed.")); -#ifndef DESKTOP_VERSION - setCaption(i18n("Click OK to search ->")); -#else - setCaption(i18n("KO/Pi Find ")); -#endif + setCaption(i18n("No items found. Use '*' and '?' where needed.")); } else { @@ -200,2 +194,3 @@ void SearchDialog::doSearch() } + searchEdit->setFocus(); } @@ -245,2 +240,11 @@ void SearchDialog::search(const QRegExp &re) } +#if QT_VERSION >= 0x030000 + if (re.search(ev->location()) != -1) +#else + if (re.match(ev->location()) != -1) +#endif + { + mMatchedEvents.append(ev); + continue; + } } diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp index 2c78ea3..946fc0d 100644 --- a/libkdepim/kdateedit.cpp +++ b/libkdepim/kdateedit.cpp @@ -84,3 +84,3 @@ KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP ) connect(mDateButton,SIGNAL(clicked()),SLOT(toggleDatePicker())); - + mDateButton->setFocusPolicy( QWidget::NoFocus ); //mDateFrame->resize( 400, 300 ); @@ -119,3 +119,3 @@ KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP ) mHandleInvalid = false; - QWidget::setTabOrder( mDateEdit, mDateButton ); + // QWidget::setTabOrder( mDateEdit, mDateButton ); } @@ -464,6 +464,8 @@ bool KDateEdit::eventFilter(QObject *, QEvent *e) // since we got focus - if ((e->type() == QEvent::FocusOut) && mTextChanged) + if ((e->type() == QEvent::FocusOut) ) { - lineEnterPressed(); - mTextChanged = false; + if ( mTextChanged ) { + lineEnterPressed(); + mTextChanged = false; + } } @@ -1 +1 @@ -version = "2.0.9"; +version = "2.0.10"; |