| -rw-r--r-- | korganizer/searchdialog.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index 59bf1a2..ef2fc1c 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -56,14 +56,19 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent) QHBoxLayout *subLayout = new QHBoxLayout(); layout->addLayout(subLayout); + /* searchLabel = new QLabel(topFrame); searchLabel->setText(i18n("Search for:")); subLayout->addWidget(searchLabel); - - searchEdit = new KLineEdit(topFrame); - subLayout->addWidget(searchEdit); - QPushButton *OkButton = new QPushButton( i18n("&Find"), topFrame ); + */ + QPushButton *OkButton = new QPushButton( i18n("Search for:"), topFrame ); //OkButton->setDefault( true ); connect(OkButton,SIGNAL(clicked()),SLOT(doSearch())); subLayout->addWidget(OkButton); + searchEdit = new KLineEdit(topFrame); + subLayout->addWidget(searchEdit); + + mAddItems = new QCheckBox(i18n("Add items"),topFrame); + subLayout->addWidget(mAddItems); + searchEdit->setText("*"); // Find all events by default searchEdit->setFocus(); @@ -273,5 +278,5 @@ void SearchDialog::search(const QRegExp &re) mEndDate->date(), false /*mInclusiveCheck->isChecked()*/ ); - + if ( !mAddItems->isChecked() ) mMatchedEvents.clear(); if ( mSearchEvent->isChecked() ) { @@ -351,4 +356,5 @@ void SearchDialog::search(const QRegExp &re) } QPtrList<Todo> todos = mCalendar->todos( ); + if ( !mAddItems->isChecked() ) mMatchedTodos.clear(); if ( mSearchTodo->isChecked() ) { @@ -418,4 +424,5 @@ void SearchDialog::search(const QRegExp &re) } } + if ( !mAddItems->isChecked() ) mMatchedJournals.clear(); if (mSearchJournal->isChecked() ) { |