6 files changed, 80 insertions, 5 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 8572bf9..0538511 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1197,9 +1197,16 @@
 { "Day view","Tagesansicht" },
 { "Next days","Nächste Tage" },
 { "Next week","Nächste Woche" },
 { "Next two weeks","Nächste zwei Wochen" },
 { "Next month","Nächster Monat" },
 { "Journal view","Journal" },
+{ "Display all opened","Zeige alle geöffnet" },
+{ "Display all closed","Zeige alle geschlossen" },
+{ "Display all flat","Zeige alle flach" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index e7b6755..0c39590 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2713,13 +2713,13 @@ void CalendarView::newSubTodo()
 }
 
 void CalendarView::newSubTodo(Todo *parentEvent)
 {
   
     showTodoEditor();
-    mTodoEditor->newTodo(QDateTime::currentDateTime().addDays(7),parentEvent,true);
+    mTodoEditor->newTodo(QDateTime(),parentEvent,true);
 }
 
 void CalendarView::newFloatingEvent()
 {
     DateList tmpList = mNavigator->selectedDates();
     QDate date = tmpList.first();
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 0eeacb3..002234d 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -435,13 +435,13 @@ bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
             }
         } else {
             selectItem(0);
             mActionItem = 0;
             if (me->button() == RightButton ) {
                 blockNewEvent = true;
-                qDebug("right ");
+                //qDebug("right ");
                 int x,y;
                 viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
                 int gx,gy;
                 contentsToGrid(x,y,gx,gy);
                 mStartCellX = gx;
                 mStartCellY = gy;
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index abeb068..16c19a4 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -270,14 +270,17 @@ void KOTodoEditor::setDefaults(QDateTime due,Todo *relatedEvent,bool allDay)
 {
   mRelatedTodo = relatedEvent;
       
   mGeneral->setDefaults(due,allDay);
   mDetails->setDefaults(); 
   showPage( 0 );
-  if ( mRelatedTodo )
+  if ( mRelatedTodo ) {
       mGeneral->setCategories (mRelatedTodo->categoriesStr ());
+      mGeneral->setSecrecy (mRelatedTodo->secrecy ());
+      
+  }
   mGeneral->setFocusOn( 2 );
 }
 
 void KOTodoEditor::readTodo(Todo *todo)
 {
   mGeneral->readTodo(todo);
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 30adb06..22486ba 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -426,34 +426,43 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
                              SLOT (newSubTodo())); 
   mItemPopupMenu->insertItem(i18n("Unparent Todo"), this,
                              SLOT (unparentTodo()),0,21);
   mItemPopupMenu->insertItem(i18n("Reparent Todo"), this,
                              SLOT (reparentTodo()),0,22);
   mItemPopupMenu->insertSeparator();
+#if 0
   mItemPopupMenu->insertItem(i18n("Delete completed To-Dos","Purge Completed"),
                              this, SLOT( purgeCompleted() ) );
   mItemPopupMenu->insertItem(i18n("toggle completed To-Dos","Show Completed"),
                              this, SLOT( toggleCompleted() ),0, 33 );
   mItemPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"),
                              this, SLOT( toggleQuickTodo() ),0, 34 );
   mItemPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"),
                              this, SLOT( toggleRunning() ),0, 35 );
   
+#endif
   mPopupMenu = new QPopupMenu(this);
   mPopupMenu->insertItem(SmallIconSet("todo"), i18n("New Todo..."), this,
                          SLOT (newTodo()),0,1);
   mPopupMenu->insertItem(i18n("delete completed To-Dos","Purge Completed"),
                          this, SLOT(purgeCompleted()),0,2);
   mPopupMenu->insertItem(i18n("Show Completed"),
                              this, SLOT( toggleCompleted() ),0,3 );
   mPopupMenu->insertItem(i18n("toggle quick todo","Show Quick Todo"),
                              this, SLOT( toggleQuickTodo() ),0,4 );
   mPopupMenu->insertItem(i18n("toggle running todo","Hide not Running"),
                              this, SLOT( toggleRunning() ),0,5 );
+  mPopupMenu->insertItem(i18n(" set all open","Display all opened"),
+                             this, SLOT( setAllOpen() ),0,6 );
+  mPopupMenu->insertItem(i18n(" set all close","Display all closed"),
+                             this, SLOT( setAllClose() ),0,7 );
+  mPopupMenu->insertItem(i18n(" set all flat","Display all flat"),
+                             this, SLOT( setAllFlat() ),0,8 );
   mDocPrefs = new DocPrefs( name );
-
+ 
+  mItemPopupMenu->insertItem(i18n("Todo View"),mPopupMenu );
   mPopupMenu->setCheckable( true );
   mItemPopupMenu->setCheckable( true );
 
 
   mPopupMenu->setItemChecked( 3,KOPrefs::instance()->mShowCompletedTodo  );
   mItemPopupMenu->setItemChecked( 33 , KOPrefs::instance()->mShowCompletedTodo   );
@@ -519,12 +528,16 @@ void KOTodoView::updateView()
 {
     pendingSubtodo = 0;
     if ( mBlockUpdate ) {
         //qDebug("blocked ");
         return;
     }
+    if ( isFlatDisplay ) {
+        setAllFlat();
+        return;
+    }
     //qDebug("update ");
 //  kdDebug() << "KOTodoView::updateView()" << endl;
     QFont fo = KOPrefs::instance()->mTodoViewFont;
     mTodoListView->clear();
     if ( mName == "todolistsmall" ) {
         if ( KOPrefs::instance()->mTodoViewUsesSmallFont ) {
@@ -994,12 +1007,59 @@ void KOTodoView::setTodoModified( Todo* todo )
   todoModified( todo, KOGlobals::UNKNOWN_MODIFIED );
 }
 void KOTodoView::clearSelection()
 {
   mTodoListView->selectAll( false );
 }
+void  KOTodoView::setAllOpen()
+{
+    if ( isFlatDisplay ) {
+        isFlatDisplay = false;
+        mPopupMenu->setItemChecked( 8,false );
+        updateView();
+    }
+    setOpen(mTodoListView->firstChild(), true);
+}
+void  KOTodoView::setAllClose()
+{
+    if ( isFlatDisplay ) {
+        isFlatDisplay = false;
+        mPopupMenu->setItemChecked( 8,false );
+        updateView();
+    }
+    setOpen(mTodoListView->firstChild(), false);
+}
+void  KOTodoView::setOpen( QListViewItem* item, bool setOpenI)
+{
+
+    while ( item ) {
+        setOpen( item->firstChild(), setOpenI );
+        item->setOpen( setOpenI );
+        item = item->nextSibling();
+    }
+}
+
+void  KOTodoView::setAllFlat()
+{
+    pendingSubtodo = 0;
+    if ( mBlockUpdate ) {
+        return;
+    }
+    mPopupMenu->setItemChecked( 8,true );
+    isFlatDisplay = true;
+    QPtrList<Todo> todoList = calendar()->todos();
+    mTodoMap.clear();
+    mTodoListView->clear();
+    Todo *todo;   
+    for(todo = todoList.first(); todo; todo = todoList.next()) {
+        KOTodoViewItem *todoItem = new KOTodoViewItem(mTodoListView,todo,this);
+        mTodoMap.insert(todo,todoItem);
+    }
+    mTodoListView->setFocus();
+    processSelectionChange();
+}
 
 void KOTodoView::purgeCompleted()
 {
   emit purgeCompletedSignal();
 }
 void KOTodoView::toggleQuickTodo()
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 5ca0362..f11518d 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -158,12 +158,16 @@ class KOTodoView : public KOrg::BaseView
     void deleteTodo();
 
     void setNewPriority(int);
     void setNewPercentage(int);
     void changedCategories(int);
 
+    void setAllOpen();
+    void setAllClose();
+    void setAllFlat();
+
     void purgeCompleted();
     void toggleCompleted();
     void toggleRunning();
     void toggleQuickTodo();
     void updateTodo( Todo *, int );
 
@@ -207,13 +211,14 @@ class KOTodoView : public KOrg::BaseView
     friend class KOTodoViewItem;
     void setTodoModified( Todo* );
     QMap<Todo *,KOTodoViewItem *>::ConstIterator insertTodoItem(Todo *todo);
     void restoreItemState( QListViewItem * );
 
     bool checkTodo( Todo * );
-
+    bool isFlatDisplay;
+    void  setOpen( QListViewItem*, bool setOpen);
     KOTodoListView *mTodoListView;
     QPopupMenu *mItemPopupMenu;
     QPopupMenu *mPopupMenu;
     QPopupMenu *mPriorityPopupMenu;
     QPopupMenu *mPercentageCompletedPopupMenu;
     QPopupMenu *mCategoryPopupMenu;