summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-02-21 12:28:31 (UTC)
committer zautrix <zautrix>2005-02-21 12:28:31 (UTC)
commitb4ebc9c227f986369fe9b0193158f3893a29df08 (patch) (side-by-side diff)
tree6f117a4927fae9142b036751509925b3641b9c3f /korganizer
parentbb74ffa01010ca364e101e05a6b3e090ae363a0e (diff)
downloadkdepimpi-b4ebc9c227f986369fe9b0193158f3893a29df08.zip
kdepimpi-b4ebc9c227f986369fe9b0193158f3893a29df08.tar.gz
kdepimpi-b4ebc9c227f986369fe9b0193158f3893a29df08.tar.bz2
search fixes
Diffstat (limited to 'korganizer') (more/less context) (show whitespace changes)
-rw-r--r--korganizer/searchdialog.cpp20
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
@@ -80,7 +80,7 @@ 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);
@@ -185,19 +185,14 @@ void SearchDialog::doSearch()
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()
{
@@ -243,6 +238,15 @@ 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