3 files changed, 44 insertions, 9 deletions

diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index be51694..5797d1b 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -274,29 +274,29 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     layoutTop->addWidget(mListView);
     mListView->setFont ( KOPrefs::instance()->mListViewFont );
     mPopupMenu = eventPopup();
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Select all"),this,
                                   SLOT(allSelection()),true);
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Deselect all"),this,
                                   SLOT(clearSelection()),true);
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Delete all selected"),this,
                                   SLOT(deleteAll()),true);
-#ifdef DESKTOP_VERSION
+
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Hide all selected"),this,
                                   SLOT(hideAll()),true);
-#endif
+
     mPopupMenu->insertSeparator();
 #ifdef DESKTOP_VERSION
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Print complete list"),this,
                                   SLOT(printList()),true);
     mPopupMenu->insertSeparator();
 #endif
     QPopupMenu * exportPO = new QPopupMenu ( this );
     mPopupMenu->insertItem( i18n("Export selected"),  exportPO );
     exportPO->insertItem( i18n("As iCal (ics) file..."),this,
                                   SLOT(saveToFile()));
     exportPO->insertItem( i18n("As vCal (vcs) file..."),this,
@@ -657,33 +657,60 @@ void KOListView::saveToFileVCS()
 }
 void KOListView::saveToFile()
 {
     writeToFile( true );
 }
 void KOListView::writeToFile( bool iCal )
 {
 
     int icount = 0;
     QPtrList<Incidence> delSel ;
     QListViewItem *item  = mListView->firstChild ();
     bool journal = iCal; // warn only for vCal
+    bool addSubTodos = false;
+    bool askSubTodos = true;
     while ( item ) {
         if ( item->isSelected() ) {
             if ( !journal )
                 if ( ((KOListViewItem *)item)->data()->typeID() == journalID )
                     journal = true;
-            delSel.append(((KOListViewItem *)item)->data());
+            Incidence* inc = ((KOListViewItem *)item)->data();
+            if ( addSubTodos ) {
+                if ( delSel.findRef( inc ) == -1 ) 
+                    delSel.append( inc );
+            } else 
+                delSel.append(inc);
+            if ( inc->typeID() == todoID ) {
+                Todo * todo = (Todo*) inc; 
+                if ( todo->relations().count() ) {
+                    if ( askSubTodos ) {
+                        int result = KMessageBox::warningYesNoCancel(this, 
+                                                                     i18n("A selected todo has subtodos!\nDo you want to export\nall subtodos of all\nselected todos as well?"),
+                                                                     i18n("Todo has subtodos"),
+                                                                     i18n("Yes"),
+                                                                     i18n("No"));
+                    if ( result == KMessageBox::Cancel ) {
+                            return;
+                        }
+                        if (result == KMessageBox::Yes) 
+                            addSubTodos = true;
+                        askSubTodos = false;
+                    }
+                    if ( addSubTodos ) {
+                        inc->addRelationsToList( &delSel );
+                    }
+                }
+            }
             ++icount;
         }
-        
         item = item->nextSibling();
     }
     if ( !iCal && journal ) {
         int result = KMessageBox::warningContinueCancel(this,
                                                         i18n("The journal entries can not be\nexported to a vCalendar file."),
                                                         i18n("Data Loss Warning"),i18n("Proceed"),i18n("Cancel"),
                                                         true);
         if (result != KMessageBox::Continue) return;
     }
     if ( icount ) {
         QString fn =  KOPrefs::instance()->mLastSaveFile;
         QString extension;
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 59bf1a2..ef2fc1c 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -46,34 +46,39 @@
 
 SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
     : QVBox( 0  )
 
 {
     mCalendar = calendar;
     QFrame *topFrame = new QFrame( this ) ;//plainPage();
     QVBoxLayout *layout = new QVBoxLayout(topFrame,KDialog::marginHint(),KDialog::spacingHint());
 
     // Search expression
     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();
     connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & )));
     connect(searchEdit, SIGNAL( returnPressed () ),this,SLOT(doSearch()));
     // Subjects to search
     // QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"),
     //                                        topFrame);
 
     QHBox *incidenceGroup = new QHBox( topFrame );
     layout->addWidget(incidenceGroup);
 
     mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup);
@@ -263,25 +268,25 @@ void SearchDialog::updateView()
     }
     listView->setStartDate( mStartDate->date() );
     listView->showEvents(mMatchedEvents);
     listView->addTodos(mMatchedTodos);
     listView->addJournals(mMatchedJournals);
 }
 
 void SearchDialog::search(const QRegExp &re)
 {
     QPtrList<Event> events = mCalendar->events( mStartDate->date(),
                                                 mEndDate->date(),
                                                 false /*mInclusiveCheck->isChecked()*/ );
-
+    if ( !mAddItems->isChecked() )
     mMatchedEvents.clear();
     if ( mSearchEvent->isChecked() ) {
         Event *ev;
         for(ev=events.first();ev;ev=events.next()) {
             if (mSummaryCheck->isChecked()) {
 #if QT_VERSION >= 0x030000
                 if (re.search(ev->summary()) != -1) 
 #else
                     if (re.match(ev->summary()) != -1) 
 #endif
                         {
                             mMatchedEvents.append(ev);
@@ -341,24 +346,25 @@ void SearchDialog::search(const QRegExp &re)
                             if (re.match(a->email()) != -1) 
 #endif
                                 {    
                                     mMatchedEvents.append(ev);
                                     break;
                                 }
                     }
                 }
             }
         }
     }
     QPtrList<Todo> todos = mCalendar->todos( );
+    if ( !mAddItems->isChecked() )
     mMatchedTodos.clear();
     if ( mSearchTodo->isChecked() ) {
         Todo *tod;
         for(tod=todos.first();tod;tod=todos.next()) {
             if (mSummaryCheck->isChecked()) {
 #if QT_VERSION >= 0x030000
                 if (re.search(tod->summary()) != -1) 
 #else
                     if (re.match(tod->summary()) != -1) 
 #endif
                         {
                             mMatchedTodos.append(tod);
@@ -408,24 +414,25 @@ void SearchDialog::search(const QRegExp &re)
 #else
                             if (re.match(a->email()) != -1) 
 #endif
                                 {    
                                     mMatchedTodos.append(tod);
                                     break;
                                 }
                     }
                 }
             }
         }
     }
+    if ( !mAddItems->isChecked() )
     mMatchedJournals.clear();
     if (mSearchJournal->isChecked() ) {
         QPtrList<Journal> 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 QT_VERSION >= 0x030000
                 if (re.search(journ->description()) != -1) 
 #else
                     if (re.match(journ->description()) != -1) 
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index 4559d20..11ad2f0 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -80,16 +80,17 @@ class SearchDialog : public  QVBox
     KOListView *listView;
     
     KDateEdit *mStartDate;
     KDateEdit *mEndDate;
     QCheckBox *mSummaryCheck;
     QCheckBox *mDescriptionCheck;
     QCheckBox *mCategoryCheck;
     QCheckBox *mSearchEvent;
     QCheckBox *mSearchTodo;
     QCheckBox *mSearchJournal;
     QCheckBox *mSearchAName;
     QCheckBox *mSearchAEmail;
+    QCheckBox *mAddItems;
     void keyPressEvent ( QKeyEvent *e) ;
 };
 
 #endif