search fixes

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
@@ -1289,8 +1289,14 @@
 { "(%1) ","%1-" },
 { "<p><b>K</b>: Week view in Month view syle</p>\n","<p><b>K</b>: Wochenansicht in Art der Monatsansicht</p>\n" },
 { "Enable tooltips displaying summary of ev.","Titel-Tooltips anzeigen" },
 { "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
@@ -1,7 +1,7 @@
 Summary: A collection of PIM programs
 Name: KDE-Pim-Pi
-Version: 2.0.9
+Version: 2.0.10
 Release: SuSE_9.2
 Copyright:GPL
 Group: Productivity/Pim
 Source:http://sourceforge.net/projects/kdepimpi/
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 3a95978..3fd9740 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -79,9 +79,9 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
 
     QHBox *subjectGroup = new QHBox( topFrame );
     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);
     mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup);
 
@@ -184,21 +184,16 @@ void SearchDialog::doSearch()
     listView->addTodos(mMatchedTodos);
     listView->addJournals(mMatchedJournals);
 
     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; 
         mess = mess.sprintf( i18n("%d item(s) found."), mMatchedEvents.count()+ mMatchedJournals.count() + mMatchedTodos.count() );
         setCaption( i18n("KO/Pi Find: ") + mess);
 
     }
+    searchEdit->setFocus();
 }
 void SearchDialog::updateConfig()
 {
     listView->updateConfig();
@@ -242,8 +237,17 @@ void SearchDialog::search(const QRegExp &re)
                         {
                             mMatchedEvents.append(ev);
                             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()) {
 #if QT_VERSION >= 0x030000
                 if (re.search(ev->description()) != -1) 
diff --git a/libkdepim/kdateedit.cpp b/libkdepim/kdateedit.cpp
index 2c78ea3..946fc0d 100644
--- a/libkdepim/kdateedit.cpp
+++ b/libkdepim/kdateedit.cpp
@@ -81,9 +81,9 @@ KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP )
       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()));
@@ -116,9 +116,9 @@ KDateEdit::KDateEdit(QWidget *parent, const char *name, bool withoutDP )
   }
 
   mTextChanged = false;
   mHandleInvalid = false;
-  QWidget::setTabOrder( mDateEdit, mDateButton );
+  // QWidget::setTabOrder( mDateEdit, mDateButton );
 }
 
 KDateEdit::~KDateEdit()
 {
@@ -461,12 +461,14 @@ QDate KDateEdit::readDate() const
 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)
   {
diff --git a/version b/version
index dc90642..1ecc965 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "2.0.9";
+version = "2.0.10";