better export

1 files changed, 31 insertions, 4 deletions

diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index be51694..5797d1b 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -283,11 +283,11 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     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()),
@@ -666,15 +666,42 @@ void KOListView::writeToFile( bool iCal )
     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 ) {