summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-01-21 16:05:23 (UTC)
committer zautrix <zautrix>2005-01-21 16:05:23 (UTC)
commit5cbac3131e5cecde6042db12ca73d5cd72fbed77 (patch) (unidiff)
tree66af1682531c9e144dd6c346cd96851ad5112fb9
parent4afdcfcac216b428ada79f4750cf7447e3175333 (diff)
downloadkdepimpi-5cbac3131e5cecde6042db12ca73d5cd72fbed77.zip
kdepimpi-5cbac3131e5cecde6042db12ca73d5cd72fbed77.tar.gz
kdepimpi-5cbac3131e5cecde6042db12ca73d5cd72fbed77.tar.bz2
remove keyevent from seardialog
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/searchdialog.cpp2
-rw-r--r--korganizer/searchdialog.h2
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
@@ -341,55 +341,57 @@ void SearchDialog::search(const QRegExp &re)
341 if (mSearchAName->isChecked()) { 341 if (mSearchAName->isChecked()) {
342#if QT_VERSION >= 300 342#if QT_VERSION >= 300
343 if (re.search(a->name()) != -1) 343 if (re.search(a->name()) != -1)
344#else 344#else
345 if (re.match(a->name()) != -1) 345 if (re.match(a->name()) != -1)
346#endif 346#endif
347 { 347 {
348 mMatchedTodos.append(tod); 348 mMatchedTodos.append(tod);
349 break; 349 break;
350 } 350 }
351 } 351 }
352 if (mSearchAEmail->isChecked()) { 352 if (mSearchAEmail->isChecked()) {
353#if QT_VERSION >= 300 353#if QT_VERSION >= 300
354 if (re.search(a->email()) != -1) 354 if (re.search(a->email()) != -1)
355#else 355#else
356 if (re.match(a->email()) != -1) 356 if (re.match(a->email()) != -1)
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/*
389void SearchDialog::keyPressEvent ( QKeyEvent *e) 390void 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
@@ -42,52 +42,52 @@ using namespace KCal;
42 42
43class SearchDialog : public KDialogBase 43class SearchDialog : public KDialogBase
44{ 44{
45 Q_OBJECT 45 Q_OBJECT
46 public: 46 public:
47 SearchDialog(Calendar *calendar,CalendarView *parent=0); 47 SearchDialog(Calendar *calendar,CalendarView *parent=0);
48 virtual ~SearchDialog(); 48 virtual ~SearchDialog();
49 KOListView *listview(){ return listView;} 49 KOListView *listview(){ return listView;}
50 void updateView(); 50 void updateView();
51 51
52 public slots: 52 public slots:
53 void changeEventDisplay(Event *, int) { updateView(); } 53 void changeEventDisplay(Event *, int) { updateView(); }
54 void updateConfig(); 54 void updateConfig();
55 void updateList(); 55 void updateList();
56 protected slots: 56 protected slots:
57 void accept(); 57 void accept();
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