1 files changed, 19 insertions, 0 deletions

diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 0e9f64c..72359df 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -209,24 +209,27 @@ void SearchDialog::raiseAndSelect()
     else if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
         newState = VIEW_T_VIEW;
     }
     else {
         newState = VIEW_A_VIEW;
     }
     if ( newState != currentState ) {
         if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW ) {
             if ( ! mSearchJournal->isChecked() ) {
                 mSearchJournal->setChecked( true );
                 mSearchTodo->setChecked( false );
                 mSearchEvent->setChecked( false );
+                mSummaryCheck->setChecked( true ); 
+                mDescriptionCheck->setChecked( true ); 
+
             }
         }
         else if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW ) {
             if ( !  mSearchTodo->isChecked()    ) {
                 mSearchTodo->setChecked( true );
                 mSearchJournal->setChecked( false );
                 mSearchEvent->setChecked( false );
             }
         }
         else {
             if ( ! mSearchEvent->isChecked() ) {
                 mSearchEvent->setChecked( true );
@@ -541,37 +544,53 @@ void SearchDialog::search(const QRegExp &re)
     QPtrList<Journal> journals;
     if ( !mAddItems->isChecked() && !mSubItems->isChecked() ) {
         if ( mRefineItems->isChecked() ) journals = mMatchedJournals ;
         mMatchedJournals.clear();
     } 
     if (mSearchJournal->isChecked() ) {
         if ( ! mRefineItems->isChecked() ) journals = mCalendar->journals();
         Journal* journ;
         
         for(journ=journals.first();journ;journ=journals.next()) {
             if ( journ->dtStart().date() <= mEndDate->date() 
                  &&journ->dtStart().date() >= mStartDate->date()) {
+                if (mDescriptionCheck->isChecked()) {
 #if QT_VERSION >= 0x030000
                 if (re.search(journ->description()) != -1) 
 #else
                     if (re.match(journ->description()) != -1) 
 #endif
                         {
                             if ( mSubItems->isChecked() )
                                 mMatchedJournals.remove(journ);
                             else if (!mMatchedJournals.contains( journ )) 
                                 mMatchedJournals.append(journ);
                             continue;
                         }
             }
+                if (mSummaryCheck->isChecked()) {
+#if QT_VERSION >= 0x030000
+                    if (re.search(journ->summary()) != -1) 
+#else
+                        if (re.match(journ->summary()) != -1) 
+#endif
+                            {
+                                if ( mSubItems->isChecked() )
+                                    mMatchedJournals.remove(journ);
+                                else if (!mMatchedJournals.contains( journ )) 
+                                    mMatchedJournals.append(journ);
+                                continue;
+                            }
+                }
+            }
         }
     }
     if ( mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count()  < 1 ) {
         qDebug("count %d ", mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count() );
         if ( mRefineItems->isChecked() )
             mRefineItems->setChecked( false );
         else if ( mSubItems->isChecked() )
             mSubItems->setChecked( false );
     }
 }
 
 void SearchDialog::keyPressEvent ( QKeyEvent *e)