select lisz view fixes

2 files changed, 51 insertions, 58 deletions

diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 5797d1b..1f3b4c6 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -388,8 +388,9 @@ void KOListView::addCat( )
 void KOListView::setCat()
 {
     setCategories( true );
 }
+
 void  KOListView::setAlarm()
 {
     KOAlarmPrefs kap( this);
     if ( !kap.exec() )
@@ -513,19 +514,10 @@ void KOListView::setCategories( bool removeOld )
 }
 
 void KOListView::beamSelected()
 {
-    int icount = 0;
-    QPtrList<Incidence> delSel ;
-    QListViewItem *item  = mListView->firstChild ();
-    while ( item ) {
-        if ( item->isSelected() ) {
-            delSel.append(((KOListViewItem *)item)->data());
-            ++icount;
-        }
-        
-        item = item->nextSibling();
-    }
+    QPtrList<Incidence> delSel = getSelectedIncidences() ;
+    int icount = delSel.count();
     if ( icount ) {
         emit beamIncidenceList( delSel );
         return;
         QString fn ;
@@ -574,19 +566,10 @@ void KOListView::saveDescriptionToFile()
                                        0, 1 );
     if ( result != 0 ) {
         return;
     }
-  int icount = 0;
-    QPtrList<Incidence> delSel ;
-    QListViewItem *item  = mListView->firstChild ();
-    while ( item ) {
-        if ( item->isSelected() ) {
-            delSel.append(((KOListViewItem *)item)->data());
-            ++icount;
-        }
-        
-        item = item->nextSibling();
-    }
+    QPtrList<Incidence> delSel = getSelectedIncidences() ;
+    int icount = delSel.count();
     if ( icount ) {
         QString fn =  KOPrefs::instance()->mLastSaveFile;
         fn =  KFileDialog::getSaveFileName( fn, i18n("Save filename"), this );
     
@@ -658,39 +641,41 @@ void KOListView::saveToFileVCS()
 void KOListView::saveToFile()
 {
     writeToFile( true );
 }
-void KOListView::writeToFile( bool iCal )
+QPtrList<Incidence> KOListView::getSelectedIncidences( bool includeEvents, bool includeTodos, bool includeJournals, bool onlyDueTodos )
 {
-
-    int icount = 0;
     QPtrList<Incidence> delSel ;
-    QListViewItem *item  = mListView->firstChild ();
-    bool journal = iCal; // warn only for vCal
     bool addSubTodos = false;
     bool askSubTodos = true;
+    QListViewItem *item  = mListView->firstChild ();
     while ( item ) {
         if ( item->isSelected() ) {
-            if ( !journal )
-                if ( ((KOListViewItem *)item)->data()->typeID() == journalID )
-                    journal = true;
             Incidence* inc = ((KOListViewItem *)item)->data();
-            if ( addSubTodos ) {
-                if ( delSel.findRef( inc ) == -1 ) 
-                    delSel.append( inc );
-            } else 
-                delSel.append(inc);
+            if ( ( addSubTodos && delSel.findRef( inc ) == -1) || !addSubTodos   ) {
+                if ( (inc->typeID() == todoID && includeTodos) || 
+                     (inc->typeID() == eventID && includeEvents) || 
+                     (inc->typeID() == journalID && includeJournals) ) {
+                    if ( inc->typeID() == todoID && onlyDueTodos ) {
+                        if ( ((Todo*)inc)->hasDueDate() )
+                            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("One (or more) selected\ntodo has subtodos!\nDo you want to select\nall subtodos of all\nselected todos as well?"),
                                                                      i18n("Todo has subtodos"),
                                                                      i18n("Yes"),
                                                                      i18n("No"));
-                    if ( result == KMessageBox::Cancel ) {
-                            return;
+                        if ( result == KMessageBox::Cancel ) {
+                            delSel.clear();
+                            return delSel;
                         }
                         if (result == KMessageBox::Yes) 
                             addSubTodos = true;
                         askSubTodos = false;
@@ -699,20 +684,36 @@ void KOListView::writeToFile( bool iCal )
                         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;
+    return delSel;
+}
+
+void KOListView::writeToFile( bool iCal )
+{
+    QPtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;
+    if ( !iCal ) {
+        bool journal = false;
+        Incidence *incidence = delSel.first();
+        while ( incidence ) {
+            if ( incidence->typeID() == journalID ) {
+                journal = true;
+                break;
+            }
+            incidence = delSel.next();
+        }
+        if ( 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 ) {
+    if ( delSel.count() ) {
         QString fn =  KOPrefs::instance()->mLastSaveFile;
         QString extension;
         if ( iCal ) {
             if ( fn.right( 4 ).lower() == ".vcs" ) {
@@ -785,20 +786,11 @@ void  KOListView::printList()
     mListView->printList();
 }
 void KOListView::deleteAll()
 {
-    int icount = 0;
-    QPtrList<Incidence> delSel ;
-    QListViewItem *item  = mListView->firstChild ();
-    while ( item ) {
-        if ( item->isSelected() ) {
-            delSel.append(((KOListViewItem *)item)->data());
-            ++icount;
-        }
-        
-        item = item->nextSibling();
-    }
-    if ( icount ) {
+    QPtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;;
+    if ( delSel.count() ) {
+        int icount = delSel.count();
         Incidence *incidence = delSel.first();
         Incidence *toDelete;   
         KOPrefs *p = KOPrefs::instance();
         bool confirm = p->mConfirm;
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index c25592d..9da5497 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -261,8 +261,9 @@ class KOListView : public KOEventView
     void clearList();
     void setStartDate(const QDate &start);
     int count();
     QString getWhatsThisText(QPoint p);
+    QPtrList<Incidence> KOListView::getSelectedIncidences( bool includeEvents = true, bool includeTodos = true , bool includeJournals = true, bool onlyDueTodos  = false );
  signals:
     void signalNewEvent();
     void beamIncidenceList(QPtrList<Incidence>);