author | zautrix <zautrix> | 2005-01-21 16:05:23 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-21 16:05:23 (UTC) |
commit | 5cbac3131e5cecde6042db12ca73d5cd72fbed77 (patch) (unidiff) | |
tree | 66af1682531c9e144dd6c346cd96851ad5112fb9 | |
parent | 4afdcfcac216b428ada79f4750cf7447e3175333 (diff) | |
download | kdepimpi-5cbac3131e5cecde6042db12ca73d5cd72fbed77.zip kdepimpi-5cbac3131e5cecde6042db12ca73d5cd72fbed77.tar.gz kdepimpi-5cbac3131e5cecde6042db12ca73d5cd72fbed77.tar.bz2 |
remove keyevent from seardialog
-rw-r--r-- | korganizer/searchdialog.cpp | 2 | ||||
-rw-r--r-- | korganizer/searchdialog.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 5bd7c6f..72ee1d2 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp | |||
@@ -357,39 +357,41 @@ void SearchDialog::search(const QRegExp &re) | |||
357 | #endif | 357 | #endif |
358 | { | 358 | { |
359 | mMatchedTodos.append(tod); | 359 | mMatchedTodos.append(tod); |
360 | break; | 360 | break; |
361 | } | 361 | } |
362 | } | 362 | } |
363 | } | 363 | } |
364 | } | 364 | } |
365 | } | 365 | } |
366 | } | 366 | } |
367 | mMatchedJournals.clear(); | 367 | mMatchedJournals.clear(); |
368 | if (mSearchJournal->isChecked() ) { | 368 | if (mSearchJournal->isChecked() ) { |
369 | QPtrList<Journal> journals = mCalendar->journals( ); | 369 | QPtrList<Journal> journals = mCalendar->journals( ); |
370 | Journal* journ; | 370 | Journal* journ; |
371 | 371 | ||
372 | for(journ=journals.first();journ;journ=journals.next()) { | 372 | for(journ=journals.first();journ;journ=journals.next()) { |
373 | if ( journ->dtStart().date() <= mEndDate->date() | 373 | if ( journ->dtStart().date() <= mEndDate->date() |
374 | &&journ->dtStart().date() >= mStartDate->date()) { | 374 | &&journ->dtStart().date() >= mStartDate->date()) { |
375 | #if QT_VERSION >= 300 | 375 | #if QT_VERSION >= 300 |
376 | if (re.search(journ->description()) != -1) | 376 | if (re.search(journ->description()) != -1) |
377 | #else | 377 | #else |
378 | if (re.match(journ->description()) != -1) | 378 | if (re.match(journ->description()) != -1) |
379 | #endif | 379 | #endif |
380 | { | 380 | { |
381 | mMatchedJournals.append(journ); | 381 | mMatchedJournals.append(journ); |
382 | continue; | 382 | continue; |
383 | } | 383 | } |
384 | } | 384 | } |
385 | } | 385 | } |
386 | } | 386 | } |
387 | 387 | ||
388 | } | 388 | } |
389 | /* | ||
389 | void SearchDialog::keyPressEvent ( QKeyEvent *e) | 390 | void SearchDialog::keyPressEvent ( QKeyEvent *e) |
390 | { | 391 | { |
391 | 392 | ||
392 | e->ignore(); | 393 | e->ignore(); |
393 | 394 | ||
394 | } | 395 | } |
396 | */ | ||
395 | //mMatchedJournals; | 397 | //mMatchedJournals; |
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h index a03c586..ebcff7a 100644 --- a/korganizer/searchdialog.h +++ b/korganizer/searchdialog.h | |||
@@ -58,36 +58,36 @@ class SearchDialog : public KDialogBase | |||
58 | void doSearch(); | 58 | void doSearch(); |
59 | void searchTextChanged( const QString &_text ); | 59 | void searchTextChanged( const QString &_text ); |
60 | 60 | ||
61 | signals: | 61 | signals: |
62 | void showEventSignal(Event *); | 62 | void showEventSignal(Event *); |
63 | void editEventSignal(Event *); | 63 | void editEventSignal(Event *); |
64 | void deleteEventSignal(Event *); | 64 | void deleteEventSignal(Event *); |
65 | 65 | ||
66 | private: | 66 | private: |
67 | void search(const QRegExp &); | 67 | void search(const QRegExp &); |
68 | 68 | ||
69 | Calendar *mCalendar; | 69 | Calendar *mCalendar; |
70 | 70 | ||
71 | QPtrList<Event> mMatchedEvents; | 71 | QPtrList<Event> mMatchedEvents; |
72 | QPtrList<Todo> mMatchedTodos; | 72 | QPtrList<Todo> mMatchedTodos; |
73 | QPtrList<Journal> mMatchedJournals; | 73 | QPtrList<Journal> mMatchedJournals; |
74 | 74 | ||
75 | QLabel *searchLabel; | 75 | QLabel *searchLabel; |
76 | QLineEdit *searchEdit; | 76 | QLineEdit *searchEdit; |
77 | KOListView *listView; | 77 | KOListView *listView; |
78 | 78 | ||
79 | KDateEdit *mStartDate; | 79 | KDateEdit *mStartDate; |
80 | KDateEdit *mEndDate; | 80 | KDateEdit *mEndDate; |
81 | // QCheckBox *mInclusiveCheck; | 81 | // QCheckBox *mInclusiveCheck; |
82 | QCheckBox *mSummaryCheck; | 82 | QCheckBox *mSummaryCheck; |
83 | QCheckBox *mDescriptionCheck; | 83 | QCheckBox *mDescriptionCheck; |
84 | QCheckBox *mCategoryCheck; | 84 | QCheckBox *mCategoryCheck; |
85 | QCheckBox *mSearchEvent; | 85 | QCheckBox *mSearchEvent; |
86 | QCheckBox *mSearchTodo; | 86 | QCheckBox *mSearchTodo; |
87 | QCheckBox *mSearchJournal; | 87 | QCheckBox *mSearchJournal; |
88 | QCheckBox *mSearchAName; | 88 | QCheckBox *mSearchAName; |
89 | QCheckBox *mSearchAEmail; | 89 | QCheckBox *mSearchAEmail; |
90 | void keyPressEvent ( QKeyEvent *e) ; | 90 | //void keyPressEvent ( QKeyEvent *e) ; |
91 | }; | 91 | }; |
92 | 92 | ||
93 | #endif | 93 | #endif |