1 files changed, 12 insertions, 8 deletions

diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 3a95978..3fd9740 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -81,5 +81,5 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
     layout->addWidget(subjectGroup);
 
-    mSummaryCheck = new QCheckBox(i18n("Summaries"),subjectGroup);
+    mSummaryCheck = new QCheckBox(i18n("Summary/Loc."),subjectGroup);
     mSummaryCheck->setChecked(true);
     mDescriptionCheck = new QCheckBox(i18n("Descriptions"),subjectGroup);
@@ -186,11 +186,5 @@ 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 {
         QString mess; 
@@ -199,4 +193,5 @@ void SearchDialog::doSearch()
 
     }
+    searchEdit->setFocus();
 }
 void SearchDialog::updateConfig()
@@ -244,4 +239,13 @@ void SearchDialog::search(const QRegExp &re)
                             continue;
                         }
+#if QT_VERSION >= 0x030000
+                if (re.search(ev->location()) != -1) 
+#else
+                    if (re.match(ev->location()) != -1) 
+#endif
+                        {
+                            mMatchedEvents.append(ev);
+                            continue;
+                        }
             }
             if (mDescriptionCheck->isChecked()) {