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
@@ -1011,195 +1011,202 @@
 { "<p><b>shift+P</b>: Make new <b>P</b>arent for todo selected with shift+S</p>\n","<p><b>shift+P</b>: Mache Todo zum neuen <b>P</b>arent Todo für das Todo, welches mit shift+Sselektiert wurde.</p>\n" },
 { "<p><b>shift+S</b>: Make <b>S</b>ubtodo (reparent todo)</p>\n","<p><b>shift+S</b>: Mache Todo zum <b>S</b>ubtodo</p>\n" },
 { "<p><b>shift+U</b>: <b>U</b>nparent todo (make root todo)</p>\n","<p><b>shift+U</b>: <b>U</b>nparent Todo (Mache Sub-Todo zum Toplevel Todo)</p>\n" },
 { "<p><h3>In todo view:</h3></p>\n","<p><h3>In Todo Anzige:</h3></p>\n" },
 { "<p><b>ctrl+up/down</b>: Scroll small todo view</p>\n","<p><b>ctrl+up/down</b>: Scrolle kleine Todo Ansicht</p>\n" },
 { "<p><b>up/down</b>: Scroll agenda view</p>\n","<p><b>up/down</b>: Scrolle Agenda Ansicht</p>\n" },
 { "<p><h3>In agenda view:</h3></p>\n","<p><h3>In Agenda Ansicht:</h3></p>\n" },
 { "<p><b>del,backspace</b>: Delete selected item</p>\n","<p><b>del,backspace</b>: Lösche selektiertes Item</p>\n" },
 { "<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n","<p><b>left</b>: Vorh. Woche | <b>left+ctrl</b>: Vorh. Monat</p>\n" },
 { "<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n","<p><b>right</b>: Nächste Woche | <b>right+ctrl</b>: Nächste Woche</p>\n" },
 { "<p><b>B</b>: Edit description (details) of selected item</p>\n","<p><b>B</b>: Editiere Beschreibung (Details) des selektierten Items</p>\n" },
 { "<p><b>C</b>: Show current time in agenda view</p>\n","<p><b>C</b>: Zeige aktuelle Zeit in Agenda Ansicht</p>\n" },
 { "<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n","<p><b>+,-</b> : Zoom rein/raus Agenda | <b>A</b>: Wechsle Ganztag Agenda Höhe</p>\n" },
 { "<p><b>S+ctrl</b>: Add sub-todo | <b>X</b>: Toggle datenavigator</p>\n","<p><b>S+ctrl</b>: Füge Sub-Todo hinzu | <b>X</b>: Zeige/verstecke Datenavigator</p>\n" },
 { "<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n","<p><b>T</b>: Gehe zu Heute | <b>T+ctrl</b>: Neues Todo</p>\n" },
 { "<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n","<p><b>E</b>: Editiere selektiertes Item |<b> E+ctrl</b>: Neuer Termin</p>\n" },
 { "<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n","<p><b>D</b>: Ein-Tages Ansicht | <b>M</b>: Monats Ansicht</p>\n" },
 { "<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n","<p><b>Z,Y</b>: Arbeitswochen Ansicht | <b>U</b>: Wochen Ansicht</p>\n" },
 { "<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n","<p><b>V</b>: Todo Ansicht | <b>L</b>: Termin Listen Ansicht</p>\n" },
 { "<p><b>N</b>: Next days view| <b>W</b>: What's next view\n ","<p><b>N</b>: Nächste-Tage Ansicht days view| <b>W</b>: What's next Ansicht\n " },
 { "<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n","<p><b>1-0</b> (+<b>ctrl</b>): Selektiere Filter 1-10 (11-20)</p>\n" },
 { "<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n","<p><b>O</b>: Filter An/Aus | <b>J</b>: Journal Ansicht</p>\n" },
 { "<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n","<p><b>F</b>: Zeige/verstecke Filter Ansicht |<b>F+ctrl</b>: Editiere Filter </p>\n" },
 { "<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n","<p><b>Space</b>: Zeige fullscreen | <b>P</b>: Datums Picker</p>\n" },
 { "<p><b>I</b>: Show info for selected event/todo</p>\n","<p><b>I</b>: Zeige Info (Details) für selektiertes Item</p>\n" },
 { "<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n","<p><b>H</b>: Dieser Hilfe Dialog | <b>S</b>: Such Dialog</p>\n" },
 { "<p><h2>KO/Pi key shortcuts:</h2></p>\n","<p><h2>KO/Pi Tastatur Kurzbefehle:</h2></p>\n" },
 { "After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configurable) three minutes.\nFor safety reasons there is  one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n","Nachdem etwas geändert wurde, werden die\nDaten automatisch in die Datei abgespeichert\n~/kdepim/apps/korganizer/mycalendar.ics\nnach (konfigurierbar) drei Minuten.\nAus Sicherheitsgründen wird noch einmal\nnach 10 Min. abgespeichert, wenn keine\nÄnderungen vorgenommen wurden. Die \nDaten werden automatisch gespeichert,\nwenn KO/Pi beendet wird.\nSie können eine Backup-Datei erstellen im\nMenu: Datei - Speichere Kalender Backup\n" },
 { "Auto Saving in  KOrganizer/Pi","Auto Speichern in  KOrganizer/Pi" },
 { "\nhttp://sourceforge.net/projects/kdepimpi\n","\nhttp://sourceforge.net/projects/kdepimpi\n" },
 { "\nor report them in the bugtracker on\n","\noder trage sie in dem Bugtracker ein auf\n" },
 { "\nPlease report unexpected behaviour to\nlutz@pi-sync.net\n","\nBitte melde fehlerhaftes Verhalten an\nlutz@pi-sync.net\n" },
 { "2) Audio alarm daemon\nfor Zaurus is available!\nas an additional small application\n","2) Ein Audio Alarm Daemon\nfür den Zaurus ist verfügbar\nals zusätzliche Anwendung\n" },
 { "1) Importing *.vcs or *.ics files from\nother applications may not work properly,\nif there are events with properties\nKO/Pi does not support.\n","1) Importieren von *.vcs oder *.ics Dateien von\nanderen Anwendungen kann möglicherweise\n nicht richtig funktionieren,\nwenn die Termine Eigenschaften haben,\ndie KO/Pi nicht unterstützt.\n" },
 { "Known Problems in  KOrganizer/Pi","Bekannte Probleme in  KOrganizer/Pi" },
 { "KO/Pi FAQ","KO/Pi FAQ" },
 { "(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi is based on KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi is licensed\nunder the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.korganizer.org\nwww.pi-sync.net\n","(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi basiert auf KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi ist lizensiert unter der GPL.\nKO/Pi kann kompiliert werden für\nLinux, Zaurus-PDA und Windows\nwww.korganizer.org\nwww.pi-sync.net\n" },
 { "PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n","PDA-Edition\nfür: Zaurus 5x00 / 7x0 / 8x0\n" },
 { "KOrganizer/Platform-independent\n","KOrganizer/Platform-independent\n" },
 { "About KOrganizer/Pi","Über KOrganizer/Pi" },
 { "From: ","Von: " },
 { "Remove sync info","Entferne Sync Info" },
 { "For all profiles","Für alle Profile" },
 { "Hide not Running","Verstecke nicht Laufende" },
 { "ME","ME" },
 { "Toolbar","Toolbar" },
 { "Undo Delete...","Löschen rückgängig machen..." },
 { "Undo Delete","Löschen rückgängig machen" },
 { "KDE Sync HowTo...","KDE Sync HowTo..." },
 { "Multi Sync HowTo...","Multi Sync HowTo..." },
 { "Januar","Januar" },
 { "KO/Pi Keys + Colors","KO/Pi Tasten + Farben" },
 { "No Filter","Kein Filter" },
 { "Multiple Sync options","Multi Sync Optionen" },
 { "Sync algo options","Sync Ablauf Optionen" },
 { "Apply filter when adding data to local:","Filter für das Hinzufügen von Daten zu Lokal:" },
 { "Incoming calendar filter:","Eingehender Kalender Filter:" },
 { "Incoming addressbook filter:","Eingehender Adressbuch Filter:" },
 { "Write back options","Optionen zum Zurückschreiben" },
 { "Write back (on remote) existing entries only","Schreibe nur existierende (auf Entfernt) Einträge zurück" },
 { "Apply filter when adding data to remote:","Filter für das Hinzufügen von Daten zu Entfernt:" },
 { "Outgoing calendar filter:","Ausgehender Kalender Filter:" },
 { "Outgoing addressbook filter:","Ausgehender Adressbuch Filter:" },
 { "Write back (calendar) entries for time period only","Schreibe nur Kalender Einträge für Zeitspanne zurück" },
 { "Time period","Zeitspanne" },
 { "From ","Von " },
 { " weeks in the past to "," Wochen in der Vergangenheit bis zu " },
 { " weeks in the future "," Wochen in der Zukunft " },
 { "Profile kind specific settings","Profil Art abhängige Einstellungen" },
 { "Local temp file:","Lokale temp Datei:" },
 { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" },
 { "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" },
 { "Language","Sprache" },
 { "Time Format","Zeit Format" },
 { "Time Zone","Zeit Zone" },
 { "%1 groups subscribed","%1 Guppen abboniert" },
 { "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Aktuelles Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverz.)/apps/kopiemail/localmail" },
 { "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" },
 { "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" },
 { "Save settings","Speichere Einstellungen" },
 { "Save standard","Speichere Standard" },
 { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },
 { "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" },
 { "Data storage path","Daten Speicherpfad" },
 { "Language","Sprache" },
 { "Show time in agenda items","Zeige Zeit in Agenda Items" },
 { "Color for Sundays + category "Holiday"","Farbe für Sonntags + Kategorie "Feiertag"" },
 { "Show events, that are done in \nWhat's Next view","Zeige abgelaufene Termine in\nWhat's Next Ansicht" },
 { "Hide not running Todos in To-do view","Verstecke nicht laufende Todos" },
 { "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
 { "KO/Pi","KO/Pi" },
 { "There is nothing to undo!","Es gibt nichts zum\nRückgängigmachen!" },
 { "Recreating edit dialog. Please wait...","Recreating edit dialog. Please wait..." },
 { "Sound.Al.: ","Sound.Al.: " },
 { "From: %1   To: %2   %3","Von: %1   Bis: %2   %3" },
 { "Restore","Wiederherstellen" },
 { "\nAre you sure you want\nto restore this?","\nMöchten Sie das wirklicht\nwiederherstellen?" },
 { "% completed","% komplett" },
 { "%d item(s) found.","%d Item(s) gefunden." },
 { "Set complete","Setze auf erledigt" },
 { "(cancelled)","(gecancelt)" },
 { "Click on the week number to\nshow week in agenda view","Klicke auf die Wochennummer\num die Woche in der Agenda anzuzeigen" },
 { " Local time "," Locale Zeit " },
 { "Form2","Form2" },
 { "Filter enabled","Filter angeschaltet" },
 { "Edit Filters","Ändere Filter" },
 { "Print What's Next View...","Drucke What's Next Ansicht..." },
 { "Agenda","Agenda" },
 { " ("," (" },
 { "<p><b>Due on:</b> %1</p>","<p><b>Fällig am:</b> %1</p>" },
 { "Print","Print" },
 { "&Setup Printer...","Drucker &Setup..." },
 { "View Type","Zeige Typ" },
 { "Page &orientation:","Seiten Ausrichtung:" },
 { "Use Default of Selected Style","Default des selektierten Stils" },
 { "Use Default Setting of Printer","Default Einstellung des Druckers" },
 { "Portrait","Portrait" },
 { "Landscape","Landschaft" },
 { "Print day","Drucke Tag" },
 { "CalPrintDay_Base","CalPrintDay_Base" },
 { "Date && Time Range","Datum && Zeitspanne" },
 { "&End date:","&Enddatum:" },
 { "&Start date:","&Startdatum:" },
 { "Start &time:","Startzeit:" },
 { "End ti&me:","Endzeit:" },
 { "E&xtend time range to include all events","Erweitere Zeitspanne um alle Termine einzuschliessen" },
 { "Include to&dos that are due on the printed day(s)","Inclusive To&dos, die an den selektierten Tagen fällig sind" },
 { "Alt+D","Alt+D" },
 { "&Use colors","Nutze Farben" },
 { "Alt+U","Alt+U" },
 { "Print week","Drucke Woche" },
 { "CalPrintWeek_Base","CalPrintWeek_Base" },
 { "Use &colors","Nutze Farben" },
 { "Type of View","Typ der Ansicht" },
 { "Print as &Filofax page","Drucke als &Filofax Seite" },
 { "Alt+F","Alt+F" },
 { "Print as &timetable view:","Drucke als Zeittabelle:" },
 { "Alt+T","Alt+T" },
 { "Print as split week view","Drucke als gesplittete Wochenansicht" },
 { "Print month","Drucke Monat" },
 { "CalPrintMonth_Base","CalPrintMonth_Base" },
 { "&Start month:","&Startmonat:" },
 { "&End month:","&Endmonat:" },
 { "Print week &numbers","Drucke Wochen Nummer(n)" },
 { "Print todos","Drucke Todos" },
 { "CalPrintTodoConfig_Base","CalPrintTodoConfig_Base" },
 { "Include &description of the item","Inclusive Itembeschreibung" },
 { "Include d&ue date of the item","Inclusive Fälligkeitsdatum des Items" },
 { "Include &priority of the item","Inclusive Priorität des Items" },
 { "Items to Print","Zu druckende Items" },
 { "&From:","Von:" },
 { "&To:","Bis:" },
 { "Print &all todo items","Drucke alle Todo Items" },
 { "Print only &uncompleted items","Drucke nur nicht erledigte Todos" },
 { "Only items due in the &range:","Nur Items in dem Zeitraum:" },
 { "Todo List","Todo Liste" },
 { "&Title:","&Titel:" },
 { "Co&nnect subtodos with its parent","Verbinde Unter-Todos mit ihren Ober-Todos" },
 { "Todo list","Todo Liste" },
 { "&Print...","Drucke..." },
 { "<qt>Printing on printer <b>%1</b></qt>","<qt>Drucke auf Drucker <b>%1</b></qt>" },
 { "[Unconfigured]","[Unkonfiguriert]" },
 { "OK","OK" },
 { "FilterEditor","FilterEditor" },
 { "Include","Inclusive" },
 { "Exclude","Exclusive" },
 { "Edit Selection...","Editiere Auswahl" },
 { "recurring events","wiederholende Termine" },
 { "recurr. events","wiederh.Termine" },
 { "completed to-dos","erledigte Todos" },
 { "events","Termine" },
 { "todos","Todos" },
 { "journals","Journale" },
 { "public","öffentl." },
 { "private","privat" },
 { "confidential","vertraul." },
 { "\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!","\nhat Unter-Todos.\nAlle erledigten Unter-Todos\nwerden auch gelöscht!" },
 { "Yesterday","Gestern" },
 { "Day after tomorrow","Übermorgen" },
 { "Tomorrow","Morgen" },
 { "Day before yesterday","Vorgestern" },
 { "Size %1","Größe %1" },
 { "New Agendasize: %1","Neue Agendagröße: %1" },
 { " (%1 y.)"," (%1 J.)" },
 { "Allday:","Ganztägig:" },
 { "compl.todos","erled.Todos" },
 { "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
@@ -2527,385 +2527,385 @@ void CalendarView::showTodoEditor()
 #ifdef DESKTOP_VERSION
     mTodoEditor->show();
 #else
     if ( mTodoEditor->width() < QApplication::desktop()->width() -60|| mTodoEditor->width() > QApplication::desktop()->width() ) {
         topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") );
         qDebug("KO: CalendarView: recreate mTodoEditor %d %d ",  mTodoEditor->width() ,QApplication::desktop()->width()     );
         qApp->processEvents();
         delete mTodoEditor;  
         mTodoEditor = mDialogManager->getTodoEditor(); 
         topLevelWidget()->setCaption( i18n("") );
     }
     mTodoEditor->showMaximized();
 #endif
 }
 
 void CalendarView::cloneIncidence()
 {
     Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         cloneIncidence(incidence);
     }
 }
 void CalendarView::moveIncidence()
 {
   Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         moveIncidence(incidence);
     }
 }
 void CalendarView::beamIncidence()
 {
   Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         beamIncidence(incidence);
     }
 }
 void CalendarView::toggleCancelIncidence()
 {
   Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         cancelIncidence(incidence);
     }
 }
 
 
 void CalendarView::cancelIncidence(Incidence * inc )
 {
     inc->setCancelled( ! inc->cancelled() );
     changeIncidenceDisplay( inc,KOGlobals::EVENTEDITED );
     updateView();
 }
 void CalendarView::cloneIncidence(Incidence * orgInc )
 { 
     Incidence * newInc = orgInc->clone();
     newInc->recreate();
  
     if ( newInc->type() == "Todo" ) {
         Todo* t = (Todo*) newInc; 
         showTodoEditor();
         mTodoEditor->editTodo( t );
         if ( mTodoEditor->exec() ) {
             mCalendar->addTodo( t );
             updateView();
         } else {
             delete t;
         }
     }
     else {
         Event*  e = (Event*)  newInc;
         showEventEditor();
         mEventEditor->editEvent( e );
         if ( mEventEditor->exec() ) {
             mCalendar->addEvent( e );
             updateView();
         } else {
             delete e;
         }
     }
 }
 
 void CalendarView::newEvent()
 {
     // TODO: Replace this code by a common eventDurationHint of KOBaseView.
     KOAgendaView *aView = mViewManager->agendaView();
     if (aView) {
         if (aView->selectionStart().isValid()) {
             if (aView->selectedIsAllDay()) {
                 newEvent(aView->selectionStart(),aView->selectionEnd(),true);
             } else {
                 newEvent(aView->selectionStart(),aView->selectionEnd());
             }
             return;
         }
     }
 
     QDate date = mNavigator->selectedDates().first();
     QDateTime current =  QDateTime::currentDateTime();
     if ( date <= current.date() ) {
         int hour = current.time().hour() +1;
         newEvent( QDateTime(  current.date(), QTime( hour, 0, 0 ) ),
                   QDateTime( current.date(), QTime( hour+ KOPrefs::instance()->mDefaultDuration, 0, 0 ) ) );
     } else
         newEvent( QDateTime( date, QTime( KOPrefs::instance()->mStartTime, 0, 0 ) ),
                   QDateTime( date, QTime( KOPrefs::instance()->mStartTime +
                                           KOPrefs::instance()->mDefaultDuration, 0, 0 ) ) );
 }
 
 void CalendarView::newEvent(QDateTime fh)
 {
     newEvent(fh,
              QDateTime(fh.addSecs(3600*KOPrefs::instance()->mDefaultDuration)));
 }
 
 void CalendarView::newEvent(QDate dt)
 {
     newEvent(QDateTime(dt, QTime(0,0,0)),
              QDateTime(dt, QTime(0,0,0)), true);
 }
 void CalendarView::newEvent(QDateTime fromHint, QDateTime toHint)
 {
     newEvent(fromHint,  toHint, false);
 }
 void CalendarView::newEvent(QDateTime fromHint, QDateTime toHint, bool allDay)
 {
   
     showEventEditor();
     mEventEditor->newEvent(fromHint,toHint,allDay);
     if ( mFilterView->filtersEnabled() ) {
         CalFilter *filter = mFilterView->selectedFilter();
         if (filter && filter->showCategories()) {
             mEventEditor->setCategories(filter->categoryList().join(",") );
         }
         if ( filter )
             mEventEditor->setSecrecy( filter->getSecrecy() );
     }
 }
 void  CalendarView::todoAdded(Todo * t)
 {
   
     changeTodoDisplay ( t ,KOGlobals::EVENTADDED);
     updateTodoViews();
 }
 void  CalendarView::todoChanged(Todo * t)
 {
     emit todoModified( t, 4 );
     // updateTodoViews();
 }
 void  CalendarView::todoToBeDeleted(Todo *)
 {
     //qDebug("todoToBeDeleted(Todo *) ");
     updateTodoViews();
 }
 void  CalendarView::todoDeleted()
 {
     //qDebug(" todoDeleted()");
     updateTodoViews();
 }
 
 
 void CalendarView::newTodoDateTime( QDateTime dt, bool allday )
 { 
     showTodoEditor();
     mTodoEditor->newTodo(dt,0,allday);
     if ( mFilterView->filtersEnabled() ) {
         CalFilter *filter = mFilterView->selectedFilter();
         if (filter && filter->showCategories()) {
             mTodoEditor->setCategories(filter->categoryList().join(",") );
         }
         if ( filter )
             mTodoEditor->setSecrecy( filter->getSecrecy() );
     }
 }
 
 void CalendarView::newTodo()
 { 
     newTodoDateTime( QDateTime(),true );
 }
 
 void CalendarView::newSubTodo()
 {
     Todo *todo = selectedTodo();
     if ( todo ) newSubTodo( todo );
 }
 
 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();
 
     newEvent( QDateTime( date, QTime( 12, 0, 0 ) ),
               QDateTime( date, QTime( 12, 0, 0 ) ), true );
 }
 
 
 void CalendarView::editEvent( Event *event )
 {
 
     if ( !event ) return;
     if ( event->isReadOnly() ) {
         showEvent( event );
         return;
     }
     showEventEditor();
     mEventEditor->editEvent( event , mFlagEditDescription);
 }
 void CalendarView::editJournal( Journal *jour )
 { 
     if ( !jour ) return;
     mDialogManager->hideSearchDialog();
     mViewManager->showJournalView();
     mNavigator->slotDaySelect( jour->dtStart().date() );
 }
 void CalendarView::editTodo( Todo *todo )
 {
     if ( !todo ) return;
  
     if ( todo->isReadOnly() ) {
         showTodo( todo );
         return;
     }
     showTodoEditor();
     mTodoEditor->editTodo( todo ,mFlagEditDescription);
 
 }
 
 KOEventViewerDialog* CalendarView::getEventViewerDialog()
 {
     if ( !mEventViewerDialog ) {
         mEventViewerDialog = new KOEventViewerDialog(this);
         connect( mEventViewerDialog, SIGNAL(  editIncidence( Incidence* )), this, SLOT(editIncidence( Incidence* )  ) );
         connect( this, SIGNAL(configChanged()), mEventViewerDialog, SLOT(updateConfig()));
         connect( mEventViewerDialog, SIGNAL(jumpToTime( const QDate &)), 
                  dateNavigator(), SLOT( selectWeek( const QDate & ) ) );
         connect( mEventViewerDialog, SIGNAL(showAgendaView( bool ) ), 
                  viewManager(), SLOT( showAgendaView( bool ) ) );
         connect( mEventViewerDialog, SIGNAL( todoCompleted(Todo *) ), 
                  this, SLOT( todoChanged(Todo *) ) );
         mEventViewerDialog->resize( 640, 480 );
         
     }
     return mEventViewerDialog;
 }
 void CalendarView::showEvent(Event *event)
 {
     getEventViewerDialog()->setEvent(event);
     getEventViewerDialog()->showMe();
 }
 
 void CalendarView::showTodo(Todo *event)
 {
     getEventViewerDialog()->setTodo(event);
     getEventViewerDialog()->showMe();
 }
 void CalendarView::showJournal( Journal *jour )
 { 
     getEventViewerDialog()->setJournal(jour);
     getEventViewerDialog()->showMe();
    
 }
 // void CalendarView::todoModified (Todo *event, int changed)
 // {
 //  //  if (mDialogList.find (event) != mDialogList.end ()) {
 // //     kdDebug() << "Todo modified and open" << endl;
 // //     KOTodoEditor* temp = (KOTodoEditor *) mDialogList[event];
 // //     temp->modified (changed);
 
 // //   }
 
 //   mViewManager->updateView();
 // }
 
 void CalendarView::appointment_show()
 {
     Event *anEvent = 0;
 
     Incidence *incidence = mViewManager->currentView()->selectedIncidences().first();
 
     if (mViewManager->currentView()->isEventView()) {
         if ( incidence && incidence->type() == "Event" ) {
             anEvent = static_cast<Event *>(incidence);
         }
     }
 
     if (!anEvent) {
         KNotifyClient::beep();
         return;
     }
 
     showEvent(anEvent);
 }
 
 void CalendarView::appointment_edit()
 {
     Event *anEvent = 0;
 
     Incidence *incidence = mViewManager->currentView()->selectedIncidences().first();
 
     if (mViewManager->currentView()->isEventView()) {
         if ( incidence && incidence->type() == "Event" ) {
             anEvent = static_cast<Event *>(incidence);
         }
     }
 
     if (!anEvent) {
         KNotifyClient::beep();
         return;
     }
 
     editEvent(anEvent);
 }
 
 void CalendarView::appointment_delete()
 {
     Event *anEvent = 0;
 
     Incidence *incidence = mViewManager->currentView()->selectedIncidences().first();
 
     if (mViewManager->currentView()->isEventView()) {
         if ( incidence && incidence->type() == "Event" ) {
             anEvent = static_cast<Event *>(incidence);
         }
     }
 
     if (!anEvent) {
         KNotifyClient::beep();
         return;
     }
 
     deleteEvent(anEvent);
 }
 
 void CalendarView::todo_resub( Todo * parent, Todo * sub )
 {
     if (!sub) return;
     if (!parent) return;
     if ( sub->relatedTo() )
         sub->relatedTo()->removeRelation(sub);
     sub->setRelatedTo(parent);
     sub->setRelatedToUid(parent->uid());
     parent->addRelation(sub);
     sub->updated();
     parent->updated();
     setModified(true);
     updateView();
 }
 void CalendarView::todo_unsub(Todo *anTodo )
 {
     // Todo *anTodo = selectedTodo();
     if (!anTodo) return;
     if (!anTodo->relatedTo()) return;
     anTodo->relatedTo()->removeRelation(anTodo);
     anTodo->setRelatedTo(0);
     anTodo->updated();
     anTodo->setRelatedToUid("");
     setModified(true);
     updateView();
 }
 
 void CalendarView::deleteTodo(Todo *todo)
 {
     if (!todo) {
         KNotifyClient::beep();
         return;
     }
     if (KOPrefs::instance()->mConfirm) {
         QString text = todo->summary().left(20);
         if (!todo->relations().isEmpty()) {
             text += i18n("\nhas sub-todos.\nAll completed sub-todos\nwill be deleted as well!");
 
         }
         switch (msgItemDelete(text)) {
         case KMessageBox::Continue: // OK
             bool deleteT = false;
             if (!todo->relations().isEmpty()) {
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 0eeacb3..002234d 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -249,385 +249,385 @@ void KOAgenda::init()
   mScrollBorderWidth = 8;
   mScrollDelay = 30;
   mScrollOffset = 10;
   mPaintPixmap.resize( 20,20);
   //enableClipper(true);
 
   // Grab key strokes for keyboard navigation of agenda. Seems to have no
   // effect. Has to be fixed.
   setFocusPolicy(WheelFocus);
 
   connect(&mScrollUpTimer,SIGNAL(timeout()),SLOT(scrollUp()));
   connect(&mScrollDownTimer,SIGNAL(timeout()),SLOT(scrollDown()));
   connect(&mResizeTimer,SIGNAL(timeout()),SLOT(finishResize()));
 
   mStartCellX = 0;
   mStartCellY = 0;
   mCurrentCellX = 0;
   mCurrentCellY = 0;
 
   mSelectionCellX = 0;
   mSelectionYTop = 0;
   mSelectionHeight = 0;
 
   mOldLowerScrollValue = -1;
   mOldUpperScrollValue = -1;
 
   mClickedItem = 0;
 
   mActionItem = 0;
   mActionType = NOP;
   mItemMoved = false;
 
   mSelectedItem = 0;
 
   // mItems.setAutoDelete(true);
 
   resizeContents( mGridSpacingX * mColumns + 1 , mGridSpacingY * mRows + 1 );
 
   viewport()->update();
 
   setMinimumSize(30,  1);
 //  setMaximumHeight(mGridSpacingY * mRows + 5);
 
   // Disable horizontal scrollbar. This is a hack. The geometry should be
   // controlled in a way that the contents horizontally always fits. Then it is
   // not necessary to turn off the scrollbar.
   setHScrollBarMode(AlwaysOff);
   if ( ! mAllDayMode ) 
       setVScrollBarMode(AlwaysOn);
   else
       setVScrollBarMode(AlwaysOff);
       
   setStartHour(KOPrefs::instance()->mDayBegins);
 
   calculateWorkingHours();
 
   connect(verticalScrollBar(),SIGNAL(valueChanged(int)),
           SLOT(checkScrollBoundaries(int)));
 
   // Create the Marcus Bains line.
   if(mAllDayMode)
       mMarcusBains = 0;
   else {
       mMarcusBains = new MarcusBains(this);
       addChild(mMarcusBains);
   }
 }
 
 void KOAgenda::clear()
 {
   KOAgendaItem *item;
   for ( item=mItems.first(); item != 0; item=mItems.next() ) {
     mUnusedItems.append( item );
     //item->hide();
   }
   mItems.clear();
   mSelectedItem = 0;
   clearSelection();
 }
 
 void KOAgenda::clearSelection()
 {
   mSelectionCellX = 0;
   mSelectionYTop = 0;
   mSelectionHeight = 0;
 }
 
 void KOAgenda::marcus_bains()
 {
     if(mMarcusBains) mMarcusBains->updateLocation(true);
 }
 
 
 void KOAgenda::changeColumns(int columns)
 {
   if (columns == 0) {
     kdDebug() << "KOAgenda::changeColumns() called with argument 0" << endl;
     return;
   }
 
   clear();
   
   mColumns = columns;
 //  setMinimumSize(mColumns * 10, mGridSpacingY + 1);
 //  init();
 //  update();
   //qDebug("KOAgenda::changeColumns ");
     computeSizes();
     // QResizeEvent event( size(), size() );
 
     //QApplication::sendEvent( this, &event );
 }
 
 /*
   This is the eventFilter function, which gets all events from the KOAgendaItems
   contained in the agenda. It has to handle moving and resizing for all items.
 */
 bool KOAgenda::eventFilter ( QObject *object, QEvent *event )
 {
 //  kdDebug() << "KOAgenda::eventFilter" << endl;
   switch(event->type()) {
     case QEvent::MouseButtonPress:
     case QEvent::MouseButtonDblClick:
     case QEvent::MouseButtonRelease:
     case QEvent::MouseMove:
       return eventFilter_mouse(object, static_cast<QMouseEvent *>(event));
 
     case (QEvent::Leave):
       if (!mActionItem)
         setCursor(arrowCursor);
       return true;
 
     default:
       return QScrollView::eventFilter(object,event);
   }
 }
 
 
 bool KOAgenda::eventFilter_mouse(QObject *object, QMouseEvent *me)
 {
     //qDebug("KOAgenda::eventFilter_mous ");
     QPoint viewportPos;
     if (object != viewport()) {
         viewportPos = ((QWidget *)object)->mapToParent(me->pos());
     } else {
         viewportPos = me->pos();
     }
     static int startX = 0;
     static int startY = 0;
     static bool block = true;
     switch (me->type())  {
     case QEvent::MouseButtonPress:
         //qDebug("QEvent::MouseButtonPress: ");
         //        kdDebug() << "koagenda: filtered button press" << endl;
         if (object != viewport()) {
             if (me->button() == RightButton) {
         
                 mClickedItem = (KOAgendaItem *)object;
                 if (mClickedItem) {
                     selectItem(mClickedItem);
                     // emit showIncidencePopupSignal(mClickedItem->incidence());
                 }
                 //mItemPopup->popup(QCursor::pos());
             } else {
                 mActionItem = (KOAgendaItem *)object;
                 if (mActionItem) {
                     if ( mSelectionHeight > 0 ) { 
                         int selectionCellX = mSelectionCellX * mGridSpacingX;
                         int selectionYTop = mSelectionYTop;
                         int gridSpacingX = mGridSpacingX;
                         int selectionHeight = mSelectionHeight;
                         clearSelection();
                         repaintContents( selectionCellX, selectionYTop,
                                          gridSpacingX, selectionHeight,false );
                     }
                     selectItem(mActionItem);
                     Incidence *incidence = mActionItem->incidence();
                     if ( incidence->isReadOnly() /*|| incidence->recurrence()->doesRecur() */) {
                         mActionItem = 0;
                     } else {
                         startItemAction(viewportPos);
                         startX = viewportPos.x();
                         startY = viewportPos.y(); 
                         block = true;
                     }
                 }
             }
         } 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;
                 mCurrentCellX = gx;
                 mCurrentCellY = gy;
                 mNewItemPopup->popup( viewport()->mapToGlobal( me->pos() ) );
                 
             } else {
                 blockNewEvent = false;
                 setCursor(arrowCursor);
                 startSelectAction(viewportPos);
             }
         }
         break;
 
     case QEvent::MouseButtonRelease:
         //qDebug("QEvent::MouseButtonRelease: ");
         if (me->button() == RightButton && block ) {
             if (object != viewport()) {
                 mClickedItem = (KOAgendaItem *)object;
                 if (mActionItem ) {
                     endItemAction();
                 }
                 if (mClickedItem) {
                     selectItem(mClickedItem);
                     emit showIncidencePopupSignal(mClickedItem->incidence());
                 } 
             } 
             break;
         }
         block = true;
         if (mActionItem) {  
             QPoint clipperPos = clipper()->mapFromGlobal(viewport()->mapToGlobal(viewportPos));
             //qDebug(" %d %d %d  ",clipperPos.y(),visibleHeight() , 9  );
             if ( mActionType == MOVE && (clipperPos.y() > visibleHeight()-2 ||clipperPos.y() < 0 ) ) {
                 mScrollUpTimer.stop();
                 mScrollDownTimer.stop();
                 mActionItem->resetMove();
                 placeSubCells( mActionItem );
                 // emit startDragSignal( mActionItem->incidence() );
                 setCursor( arrowCursor );
                 mActionItem = 0;
                 mActionType = NOP;
                 mItemMoved = 0;
                 return true;
             }
             endItemAction();
         } else if ( mActionType == SELECT ) {
             if (me->button() == RightButton ) {
 
             } else {
                 endSelectAction( !blockNewEvent   );
             }
         }
         break;
 
     case QEvent::MouseMove:
         if (object != viewport()) {
             KOAgendaItem *moveItem = (KOAgendaItem *)object;
             //qDebug("moveItem %d ",moveItem );
             if (!moveItem->incidence()->isReadOnly() /*&&
                                                        !moveItem->incidence()->recurrence()->doesRecur()*/ )
                 if (!mActionItem)
                     setNoActionCursor(moveItem,viewportPos);
                 else {
                     if ( block ) {
                         int dX, dY; 
                         dX = startX - viewportPos.x();
                         if ( dX < 0   )
                             dX = -dX;
                         dY = viewportPos.y() - startY;
                         if ( dY < 0 )
                             dY = -dY;
                         int diff = 30;
                         if ( QApplication::desktop()->width() < 480 )
                             diff = 15;
                         // qDebug(" %d %d ",dX, dY );
                         if (  dX > diff  || dY > diff  ) {
                             block = false;
                         }
                     }
                     if ( !block )
                         performItemAction(viewportPos);
                 }
         } else {
             if ( mActionType == SELECT ) {
                 performSelectAction( viewportPos );
             }
         }
         break;
 
     case QEvent::MouseButtonDblClick:
         if (object == viewport()) {
             selectItem(0);
             int x,y;
             viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
             int gx,gy;
             contentsToGrid(x,y,gx,gy);
             emit newEventSignal(gx,gy);
         } else {
             KOAgendaItem *doubleClickedItem = (KOAgendaItem *)object;
             selectItem(doubleClickedItem);
             if ( KOPrefs::instance()->mEditOnDoubleClick )
                 emit editIncidenceSignal(doubleClickedItem->incidence());
             else
                 emit showIncidenceSignal(doubleClickedItem->incidence());
         }
         break;
 
     default:
         break;
     }
 
     return true;
 }
 
 void KOAgenda::newItem( int item )
 {
     if ( item == 1 ) { //new event
         newEventSignal(mStartCellX ,mStartCellY  );
     } else
         if ( item == 2 ) { //new event
             newTodoSignal(mStartCellX ,mStartCellY  );
         } else 
             {
                 QDate day = mSelectedDates[mStartCellX];
                 emit showDateView( item, day );
                 // 3Day view
                 // 4Week view
                 // 5Month view
                 // 6Journal view
             }
 }
 void KOAgenda::startSelectAction(QPoint viewportPos)
 {
     //emit newStartSelectSignal();
 
   mActionType = SELECT;
 
   int x,y;
   viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
   int gx,gy;
   contentsToGrid(x,y,gx,gy);
 
   mStartCellX = gx;
   mStartCellY = gy;
   mCurrentCellX = gx;
   mCurrentCellY = gy;
 
   // Store coordinates of old selection
   int selectionX = mSelectionCellX * mGridSpacingX;
   int selectionYTop = mSelectionYTop;
   int selectionHeight = mSelectionHeight;
 
   // Store new selection
   mSelectionCellX = gx;
   mSelectionYTop = gy * mGridSpacingY;
   mSelectionHeight = mGridSpacingY;
   
   // Clear old selection
   repaintContents( selectionX, selectionYTop,
                    mGridSpacingX, selectionHeight,false );
 
   // Paint new selection
   //  repaintContents( mSelectionCellX * mGridSpacingX, mSelectionYTop,
   //               mGridSpacingX, mSelectionHeight );
 }
 
 void KOAgenda::performSelectAction(QPoint viewportPos)
 {
   int x,y;
   viewportToContents(viewportPos.x(),viewportPos.y(),x,y);
   int gx,gy;
   contentsToGrid(x,y,gx,gy);
 
   QPoint clipperPos = clipper()->
                       mapFromGlobal(viewport()->mapToGlobal(viewportPos));
   
   // Scroll if cursor was moved to upper or lower end of agenda.
   if (clipperPos.y() < mScrollBorderWidth) {
     mScrollUpTimer.start(mScrollDelay);
   } else if (visibleHeight() - clipperPos.y() <
              mScrollBorderWidth) {
     mScrollDownTimer.start(mScrollDelay);
   } else {
     mScrollUpTimer.stop();
     mScrollDownTimer.stop();
   }
 
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index abeb068..16c19a4 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -84,289 +84,292 @@ void KOTodoEditor::reload()
 void KOTodoEditor::setupGeneral()
 {
   mGeneral = new KOEditorGeneralTodo(this);
   connect ( mGeneral, SIGNAL ( allAccepted() ), this, SLOT ( slotOk () ) );
 
   // connect(mGeneral,SIGNAL(openCategoryDialog()),mCategoryDialog,SLOT(show()));
   //connect(mCategoryDialog, SIGNAL(categoriesSelected(const QString &)),
   //      mGeneral,SLOT(setCategories(const QString &)));
 
   if (KOPrefs::instance()->mCompactDialogs) {
     QFrame *topFrame = addPage(i18n("General"));
 
     QBoxLayout *topLayout = new QVBoxLayout(topFrame);  
     if ( QApplication::desktop()->width() < 480 ) {
         topLayout->setMargin(1);
         topLayout->setSpacing(1);
     } else {
         topLayout->setMargin(marginHint()-1);
         topLayout->setSpacing(spacingHint()-1);
     }
    mGeneral->initHeader(topFrame,topLayout);
     mGeneral->initTime(topFrame,topLayout); 
    mGeneral->initAlarm(topFrame,topLayout);
     mGeneral->enableAlarm( false );
     
   
     QBoxLayout *priorityLayout;
     if ( QApplication::desktop()->width() < 500 ) 
         priorityLayout = new QVBoxLayout( topLayout );
     else
         priorityLayout = new QHBoxLayout( topLayout );
     QWidget* prioWidget = new QWidget (topFrame);
     priorityLayout->addWidget(  prioWidget );
     QHBoxLayout* priorityLayout2 = new QHBoxLayout( prioWidget);
 
 
     QIconSet icon; 
     if ( QApplication::desktop()->width() < 321 ) 
         icon = SmallIcon("fileexport16");
     else
         icon = SmallIcon("fileexport");
     QPushButton * saveTemplate = new QPushButton( prioWidget);
     saveTemplate->setIconSet (icon ) ;
     int size = saveTemplate->sizeHint().height();
     saveTemplate->setFixedSize(  size, size );
     if ( QApplication::desktop()->width() < 321 ) 
         icon = SmallIcon("fileimport16");
     else
         icon = SmallIcon("fileimport");
     QPushButton * loadTemplate = new QPushButton(  prioWidget);
     loadTemplate->setIconSet (icon ) ;
     loadTemplate->setFixedSize(  size, size );
 
     priorityLayout2->addWidget(loadTemplate);
     priorityLayout2->addWidget(saveTemplate);
     mGeneral->initPriority(prioWidget,priorityLayout2);
     mGeneral->initCategories( topFrame, priorityLayout );
     topLayout->addStretch(1);
 
     QFrame *topFrame2 = addPage(i18n("Details"));
 
     QBoxLayout *topLayout2 = new QVBoxLayout(topFrame2);
     topLayout2->setMargin(marginHint());
     topLayout2->setSpacing(spacingHint());
 
     QHBoxLayout *completionLayout = new QHBoxLayout( topLayout2 );
     mGeneral->initCompletion(topFrame2,completionLayout);
     
  
     mGeneral->initSecrecy( topFrame2, topLayout2 );
     mGeneral->initDescription(topFrame2,topLayout2); 
 
     // QHBox * hb = new QHBox ( topFrame2 );
     // topLayout2->addWidget(hb);
     // hb->setSpacing( 3 );
    
     connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) );
     connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) );
 
   } else {
     QFrame *topFrame = addPage(i18n("General"));
     
     QBoxLayout *topLayout = new QVBoxLayout(topFrame);
     topLayout->setSpacing(spacingHint());
 
     mGeneral->initHeader(topFrame,topLayout);
     mGeneral->initTime(topFrame,topLayout);
     mGeneral->initStatus(topFrame,topLayout);    
     QBoxLayout *alarmLineLayout = new QHBoxLayout(topLayout);
     mGeneral->initAlarm(topFrame,alarmLineLayout); 
     mGeneral->initDescription(topFrame,topLayout);
     QBoxLayout *detailsLayout = new QHBoxLayout(topLayout);
     mGeneral->initCategories( topFrame, detailsLayout );
     mGeneral->initSecrecy( topFrame, detailsLayout );
   }
   mGeneral->finishSetup();
   
 }
 
 void KOTodoEditor::editTodo(Todo *todo, bool editDescription)
 {
     //init();
 
   mTodo = todo;
   readTodo(mTodo);
   if ( editDescription ) {
       showPage( 1 );
       mGeneral->setFocusOn( 1 );
   } else {
       showPage( 0 );
       mGeneral->setFocusOn( 2 );
   }
 }
 
 void KOTodoEditor::newTodo(QDateTime due,Todo *relatedTodo,bool allDay)
 {
     //init();
 
   mTodo = 0;
   setDefaults(due,relatedTodo,allDay);
 }
 
 void KOTodoEditor::loadDefaults()
 {
   setDefaults(QDateTime::currentDateTime().addDays(7),0,false);
 }
 
 bool KOTodoEditor::processInput( bool emitTime )
 {
   if (!validateInput()) return false;
 
   Todo *todo = 0;
 
   if (mTodo) todo = mTodo;
   else {
     todo = new Todo;
     todo->setOrganizer(KOPrefs::instance()->email());
   }
 
   writeTodo(todo);
   if ( emitTime ) {
       globalFlagBlockAgenda = 1;
       emit showAgendaView( false );
       if ( todo->hasDueDate() )
           emit jumpToTime( todo->dtDue().date() );
       globalFlagBlockAgenda = 2;
   }
   if (mTodo) {
     todo->setRevision(todo->revision()+1);
     emit todoChanged(todo);
   } else {
     mCalendar->addTodo(todo);
     mTodo = todo;
     emit todoAdded(todo);
   }
  
   return true;
 }
 
 void KOTodoEditor::deleteTodo()
 {
   if (mTodo) {
     if (KOPrefs::instance()->mConfirm) {
       switch (msgItemDelete()) {
         case KMessageBox::Continue: // OK
           emit todoToBeDeleted(mTodo);
           emit dialogClose(mTodo);
           mCalendar->deleteTodo(mTodo);
           emit todoDeleted();
           reject();
           break;
       }
     }
     else {
       emit todoToBeDeleted(mTodo);
       emit dialogClose(mTodo);
       mCalendar->deleteTodo(mTodo);
       emit todoDeleted();
       reject();
     }
   } else {
     reject();
   }
 }
 
 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);
   mDetails->readEvent(todo);
   mRelatedTodo = 0;//todo->relatedTo();
   // categories
   // mCategoryDialog->setSelected(todo->categories());
 
   // We should handle read-only events here.
 }
 
 void KOTodoEditor::writeTodo(Todo *event)
 {
   mGeneral->writeTodo(event);
   mDetails->writeEvent(event);
 
   // set related event, i.e. parent to-do in this case.
   if (mRelatedTodo) {
     event->setRelatedTo(mRelatedTodo);
   }
 }
 
 bool KOTodoEditor::validateInput()
 {
   if (!mGeneral->validateInput()) return false;
   if (!mDetails->validateInput()) return false;
   return true;
 }
 
 int KOTodoEditor::msgItemDelete()
 {
   return KMessageBox::warningContinueCancel(this,
       i18n("This item will be permanently deleted."),
       i18n("KOrganizer Confirmation"),i18n("Delete"));
 }
 
 void KOTodoEditor::modified (int modification)
 {
   if (modification == KOGlobals::CATEGORY_MODIFIED || 
       KOGlobals::UNKNOWN_MODIFIED == modification )
       //  mCategoryDialog->setSelected (mTodo->categories ());
   mGeneral->modified (mTodo, modification);
 
 }
 
 void KOTodoEditor::slotLoadTemplate()
 {
 
   QString fileName =locateLocal( "templates", "todos" ); 
   QDir t_dir;
   if ( !t_dir.exists(fileName) )
       t_dir.mkdir ( fileName );
   fileName += "/todo";
   fileName = KFileDialog::getSaveFileName(  fileName , "Load Todo template", this );
     if ( fileName.length() == 0 )
         return;
     CalendarLocal cal;
     ICalFormat format;
     if ( !format.load( &cal, fileName ) ) {
         KMessageBox::error( this, i18n("Error loading template file\n '%1'.")
                             .arg( fileName ) );
         return ;
     }
     QPtrList<Todo> todos = cal.todos();
     Todo * todo = todos.first();
     if ( !todo ) {
         KMessageBox::error( this,
                             i18n("Template does not\ncontain a valid Todo."));
     } else {
         readTodo( todo );
     }
   
 }
 
 void KOTodoEditor::slotSaveTemplate()
 {
     QString fileName =locateLocal( "templates", "todos" ); 
     QDir t_dir;
     if ( !t_dir.exists(fileName) )
         t_dir.mkdir ( fileName );
     fileName += "/todo";
     fileName = KFileDialog::getSaveFileName(  fileName , "Save as Todo template", this );
     if ( fileName.length() > 0 )
         saveTemplate( fileName );
 }
 
 void KOTodoEditor::saveTemplate( const QString &templateName )
 {
   Todo *todo = new Todo;
   writeTodo( todo );
   saveAsTemplate( todo, templateName );
 }
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 30adb06..22486ba 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -240,477 +240,490 @@ void KOTodoListView::contentsMouseMoveEvent(QMouseEvent* e)
   }
 #endif
 }
 void KOTodoListView::keyPressEvent ( QKeyEvent * e )
 {
     
     QListViewItem* cn;
     if ( e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter ) {
         cn = currentItem();
         if ( cn ) {
             KOTodoViewItem* ci = (KOTodoViewItem*)( cn ); 
             if ( ci ){
                 if ( e->state() == ShiftButton )
                     ci->setOn( false );
                 else
                     ci->setOn( true );
                 cn = cn->nextSibling();
                 if ( cn ) {
                     setCurrentItem ( cn );
                     ensureItemVisible ( cn );
                 }
                 
             }
         }
         
         return;
     }
    
     //  qDebug("KOTodoListView::keyPressEvent  ");
     if ( e->state() == Qt::ControlButton || e->state() == Qt::ShiftButton || mName != "todolistsmall"  ) {
         switch ( e->key() ) {
         case Qt::Key_Down:
         case Qt::Key_Up:
             QListView::keyPressEvent (  e );
             break; 
         case Qt::Key_Left:
         case Qt::Key_Right:
             QListView::keyPressEvent (  e );
             e->accept();
             return;
             break; 
         default:
             e->ignore();
             break;
         }
         return;
     }
     e->ignore();
 }
 void KOTodoListView::contentsMouseReleaseEvent(QMouseEvent *e)
 {
   QListView::contentsMouseReleaseEvent(e);
   mMousePressed = false;
 }
 
 void KOTodoListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
 {
   if (!e) return;
 
   QPoint vp = contentsToViewport(e->pos());
 
   QListViewItem *item = itemAt(vp);
 
   emit double_Clicked(item);
   if (!item) return;
 
   emit doubleClicked(item,vp,0);
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
 KOQuickTodo::KOQuickTodo(QWidget *parent) :
   QLineEdit(parent)
 {
   setText(i18n("Click to add a new Todo"));
 }
 
 void KOQuickTodo::focusInEvent(QFocusEvent *ev)
 {
   if ( text()==i18n("Click to add a new Todo") )
     setText("");
   QLineEdit::focusInEvent(ev);
 }
 
 void KOQuickTodo::focusOutEvent(QFocusEvent *ev)
 {
   setText(i18n("Click to add a new Todo"));
   QLineEdit::focusOutEvent(ev);
 }
 
 /////////////////////////////////////////////////////////////////////////////
 
 KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   KOrg::BaseView(calendar,parent,name)
 {
   mNavigator = 0;
   QBoxLayout *topLayout = new QVBoxLayout(this);
   mName = QString ( name );
   mBlockUpdate = false;
   mQuickAdd = new KOQuickTodo(this);
   topLayout->addWidget(mQuickAdd);
 
   if ( !KOPrefs::instance()->mEnableQuickTodo ) mQuickAdd->hide();
 
   mTodoListView = new KOTodoListView(calendar,this, name );
   topLayout->addWidget(mTodoListView);
   //mTodoListView->header()->setMaximumHeight(30);
   mTodoListView->setRootIsDecorated(true);
   mTodoListView->setAllColumnsShowFocus(true);
 
   mTodoListView->setShowSortIndicator(true);
 
   mTodoListView->addColumn(i18n("Todo"));
   mTodoListView->addColumn(i18n("Prio"));
   mTodoListView->setColumnAlignment(1,AlignHCenter);
   mTodoListView->addColumn(i18n("Complete"));
   mTodoListView->setColumnAlignment(2,AlignCenter);
 
   mTodoListView->addColumn(i18n("Due Date"));
   mTodoListView->setColumnAlignment(3,AlignLeft);
   mTodoListView->addColumn(i18n("Due Time"));
   mTodoListView->setColumnAlignment(4,AlignHCenter);
 
   mTodoListView->addColumn(i18n("Start Date"));
   mTodoListView->setColumnAlignment(5,AlignLeft);
   mTodoListView->addColumn(i18n("Start Time"));
   mTodoListView->setColumnAlignment(6,AlignHCenter);
 
   mTodoListView->addColumn(i18n("Cancelled"));
   mTodoListView->addColumn(i18n("Categories"));
 #if 0
   mTodoListView->addColumn(i18n("Sort Id"));
   mTodoListView->setColumnAlignment(4,AlignHCenter);
 #endif
 
   mTodoListView->setMinimumHeight( 60 );
   mTodoListView->setItemsRenameable( true );
   mTodoListView->setRenameable( 0 );
   mTodoListView->setColumnWidth( 0, 120 );
   mTodoListView->setColumnWidthMode(0, QListView::Manual);
   mTodoListView->setColumnWidthMode(1, QListView::Manual);
   mTodoListView->setColumnWidthMode(2, QListView::Manual);
   mTodoListView->setColumnWidthMode(3, QListView::Manual);
   mTodoListView->setColumnWidthMode(4, QListView::Manual);
   mTodoListView->setColumnWidthMode(5, QListView::Manual);
   mTodoListView->setColumnWidthMode(6, QListView::Manual);
   mTodoListView->setColumnWidthMode(7, QListView::Manual);
   mTodoListView->setColumnWidthMode(8, QListView::Manual);
  
 
   mPriorityPopupMenu = new QPopupMenu(this);
   for (int i = 1; i <= 5; i++) {
     QString label = QString ("%1").arg (i);
     mPriority[mPriorityPopupMenu->insertItem (label)] = i;
   }
   connect (mPriorityPopupMenu, SIGNAL(activated (int)), SLOT (setNewPriority(int)));
 
   mPercentageCompletedPopupMenu = new QPopupMenu(this);
   for (int i = 0; i <= 100; i+=20) {
     QString label = QString ("%1 %").arg (i);
     mPercentage[mPercentageCompletedPopupMenu->insertItem (label)] = i;
   }
   connect (mPercentageCompletedPopupMenu, SIGNAL (activated (int)), SLOT (setNewPercentage (int)));
 
 
   
   mItemPopupMenu = new QPopupMenu(this);
   mItemPopupMenu->insertItem(i18n("Show..."), this,
                              SLOT (showTodo()));
   mItemPopupMenu->insertItem(i18n("Edit..."), this,
                              SLOT (editTodo()));
   mItemPopupMenu->insertItem( i18n("Delete"), this,
                              SLOT (deleteTodo()));
   mItemPopupMenu->insertItem( i18n("Clone..."), this,
                              SLOT (cloneTodo()));
   mItemPopupMenu->insertItem( i18n("Move..."), this,
                              SLOT (moveTodo()));
   mItemPopupMenu->insertItem( i18n("Beam..."), this,
                              SLOT (beamTodo()));
   mItemPopupMenu->insertItem( i18n("Toggle Cancel"), this,
                              SLOT (cancelTodo()));
   mItemPopupMenu->insertSeparator();
 
   mItemPopupMenu->insertItem( i18n("New Todo..."), this,
                              SLOT (newTodo()));
   mItemPopupMenu->insertItem(i18n("New Sub-Todo..."), this,
                              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   );
 
   mPopupMenu->setItemChecked(4,KOPrefs::instance()->mEnableQuickTodo);
   mItemPopupMenu->setItemChecked( 34 , KOPrefs::instance()->mEnableQuickTodo );
 
   mPopupMenu->setItemChecked(5,KOPrefs::instance()->mHideNonStartedTodos);
   mItemPopupMenu->setItemChecked( 35 , KOPrefs::instance()->mHideNonStartedTodos );
 
 
   // Double clicking conflicts with opening/closing the subtree
   connect( mTodoListView, SIGNAL( doubleClicked( QListViewItem *) ),
            SLOT( editItem( QListViewItem *) ) );
   /*
   connect( mTodoListView, SIGNAL(  rightButtonClicked ( QListViewItem *,
                                                         const QPoint &,int ) ),
            SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) );
   */ 
   connect( mTodoListView, SIGNAL(  contextRequest ( QListViewItem *,
                                                         const QPoint &,int ) ),
            SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) );
   connect( mTodoListView, SIGNAL( clicked( QListViewItem * ) ),
            SLOT( itemClicked( QListViewItem * ) ) );
   connect( mTodoListView, SIGNAL( double_Clicked( QListViewItem * ) ),
            SLOT( itemDoubleClicked( QListViewItem * ) ) );
   connect( mTodoListView, SIGNAL( todoDropped( Todo * ) ),
            SLOT( updateView() ) );
   connect( mTodoListView, SIGNAL( expanded( QListViewItem * ) ),
            SLOT( itemStateChanged( QListViewItem * ) ) );
   connect( mTodoListView, SIGNAL( collapsed( QListViewItem * ) ),
            SLOT( itemStateChanged( QListViewItem * ) ) );
 
 #if 0
   connect(mTodoListView,SIGNAL(selectionChanged(QListViewItem *)),
           SLOT(selectionChanged(QListViewItem *)));
   connect(mTodoListView,SIGNAL(clicked(QListViewItem *)),
           SLOT(selectionChanged(QListViewItem *)));
   connect(mTodoListView,SIGNAL(pressed(QListViewItem *)),
           SLOT(selectionChanged(QListViewItem *)));
 #endif
   connect( mTodoListView, SIGNAL(selectionChanged() ),
            SLOT( processSelectionChange() ) );
   connect( mQuickAdd, SIGNAL( returnPressed () ),
            SLOT( addQuickTodo() ) );
  
 }
 
 KOTodoView::~KOTodoView()
 {
   delete mDocPrefs;
 }
 
 void KOTodoView::jumpToDate ()
 {
   //   if (mActiveItem) {
 //     mActiveItem->todo());
 //    if ( mActiveItem->todo()->hasDueDate() )
 //       emit mActiveItem->todo()jumpToTime( mTodo->dtDue().date() );
 }
 
 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 ) {
             int ps = fo.pointSize() -2;
             if ( ps > 12 )
                 ps -= 2;
             fo.setPointSize( ps );
         } 
     }
     
   mTodoListView->setFont( fo );
   // QFontMetrics fm ( KOPrefs::instance()->mTodoViewFont );
   //mTodoListView->header()->setMaximumHeight(fm.height());
   QPtrList<Todo> todoList = calendar()->todos();
 
 /*
   kdDebug() << "KOTodoView::updateView(): Todo List:" << endl;
   Event *t;
   for(t = todoList.first(); t; t = todoList.next()) {
     kdDebug() << "  " << t->getSummary() << endl;
 
     if (t->getRelatedTo()) {
       kdDebug() << "      (related to " << t->getRelatedTo()->getSummary() << ")" << endl;
     }
 
     QPtrList<Event> l = t->getRelations();
     Event *c;
     for(c=l.first();c;c=l.next()) {
       kdDebug() << "    - relation: " << c->getSummary() << endl;
     }
   }
 */
 
   // Put for each Event a KOTodoViewItem in the list view. Don't rely on a
   // specific order of events. That means that we have to generate parent items
   // recursively for proper hierarchical display of Todos.
   mTodoMap.clear();
   Todo *todo;
   todo = todoList.first();// todo; todo = todoList.next()) {
   while ( todo ) {
       bool next = true;
       // qDebug("todo %s ", todo->summary().latin1());
       Incidence *incidence = todo->relatedTo();
       while  ( incidence ) {
           if ( incidence->type() == "Todo") {
               //qDebug("related %s ",incidence->summary().latin1() );
               if ( !(todoList.contains ( ((Todo* )incidence ) ) )) {
                   //qDebug("related not found ");
                   todoList.remove( );
                   todo = todoList.current();
                   next = false;
                   incidence = 0;
 
               } else {
                   //qDebug("related found  ");
                   incidence = incidence->relatedTo();
               }
           } else 
               incidence = 0;
       }
       if ( next )
           todo = todoList.next();
   }
 //   qDebug("again .... ");
 //   for(todo = todoList.first(); todo; todo = todoList.next()) {
       
 //       qDebug("yytodo %s ", todo->summary().latin1());
 //   }
   //qDebug("for  ");
   for(todo = todoList.first(); todo; todo = todoList.next()) {
       if (!mTodoMap.contains(todo)  && checkTodo( todo ) )
       {
       insertTodoItem(todo);
     }
   }
   //qDebug("for end ");
   // Restore opened/closed state
   mTodoListView->blockSignals( true );
   if( mDocPrefs ) restoreItemState( mTodoListView->firstChild() );
   mTodoListView->blockSignals( false );
   mTodoListView->setFocus();
   processSelectionChange();
 }
 
 bool KOTodoView::checkTodo( Todo * todo )
 {
    
     if (  !KOPrefs::instance()->mShowCompletedTodo &&  todo->isCompleted() )
         return false;
     if ( KOPrefs::instance()->mHideNonStartedTodos && mNavigator ) {
         if ( todo->hasStartDate() ) 
             if ( mNavigator->selectedDates().last() < todo->dtStart().date() )
                 return false;
         if ( todo->hasDueDate() ) 
             if ( mNavigator->selectedDates().first() > todo->dtDue().date() )
                 return false;
     }
     return true;
 }
 
 void KOTodoView::restoreItemState( QListViewItem *item )
 {
     pendingSubtodo = 0;
   while( item ) {
     KOTodoViewItem *todoItem = (KOTodoViewItem *)item;
     todoItem->setOpen( mDocPrefs->readBoolEntry( todoItem->todo()->uid() ) );
     if( item->childCount() > 0 ) restoreItemState( item->firstChild() );
     item = item->nextSibling();
   }
 }
 
 
 QMap<Todo *,KOTodoViewItem *>::ConstIterator
   KOTodoView::insertTodoItem(Todo *todo)
 {
 
 //  kdDebug() << "KOTodoView::insertTodoItem(): " << todo->getSummary() << endl;
   // TODO: Check, if dynmaic cast is necessary
 
     pendingSubtodo = 0;
   Incidence *incidence = todo->relatedTo();
   if (incidence && incidence->type() == "Todo") {
     Todo *relatedTodo = static_cast<Todo *>(incidence);
 
 //    kdDebug() << "  has Related" << endl;
     QMap<Todo *,KOTodoViewItem *>::ConstIterator itemIterator;
     itemIterator = mTodoMap.find(relatedTodo);
     if (itemIterator == mTodoMap.end()) {
 //      kdDebug() << "    related not yet in list" << endl;
       itemIterator = insertTodoItem (relatedTodo);
     }
     // isn't this pretty stupid? We give one Todo  to the KOTodoViewItem
     // and one into the map. Sure finding is more easy but why? -zecke
     KOTodoViewItem *todoItem = new KOTodoViewItem(*itemIterator,todo,this);
     return mTodoMap.insert(todo,todoItem);
   } else {
 //    kdDebug() << "  no Related" << endl;
       // see above -zecke
     KOTodoViewItem *todoItem = new KOTodoViewItem(mTodoListView,todo,this);
     return mTodoMap.insert(todo,todoItem);
   }
 }
 
 
 void KOTodoView::updateConfig()
 {
     updateView();
   mTodoListView->repaintContents();
 }
 
 QPtrList<Incidence> KOTodoView::selectedIncidences()
 {
   QPtrList<Incidence> selected;
 
   KOTodoViewItem *item = (KOTodoViewItem *)(mTodoListView->selectedItem());
 //  if (!item) item = mActiveItem;
   if (item) selected.append(item->todo());
 
   return selected;
 }
 
 QPtrList<Todo> KOTodoView::selectedTodos()
 {
   QPtrList<Todo> selected;
 
   KOTodoViewItem *item = (KOTodoViewItem *)(mTodoListView->selectedItem());
 //  if (!item) item = mActiveItem;
   if (item) selected.append(item->todo());
 
   return selected;
 }
 
 void KOTodoView::changeEventDisplay(Event *, int)
 {
   updateView();
 }
 
 void KOTodoView::showDates(const QDate &, const QDate &)
 {
 }
 
 void KOTodoView::showEvents(QPtrList<Event>)
 {
   kdDebug() << "KOTodoView::selectEvents(): not yet implemented" << endl;
 }
 
 void KOTodoView::printPreview(CalPrinter *calPrinter, const QDate &fd,
                               const QDate &td)
 {
@@ -808,345 +821,392 @@ void KOTodoView::beamTodo()
 }
 
 
 void KOTodoView::showTodo()
 {
   if (mActiveItem) {
     emit showTodoSignal(mActiveItem->todo());
   }
 }
 
 void KOTodoView::deleteTodo()
 {
   if (mActiveItem) {
       emit deleteTodoSignal(mActiveItem->todo());
   }
 }
 
 void KOTodoView::setNewPriority(int index)
 {
   if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) {
     mActiveItem->todo()->setPriority(mPriority[index]);
     mActiveItem->construct();
    todoModified (mActiveItem->todo(), KOGlobals::PRIORITY_MODIFIED);
    mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1  );
   }
 }
 
 void KOTodoView::setNewPercentage(int index)
 {
   if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) {
     if (mPercentage[index] == 100) {
       mActiveItem->todo()->setCompleted(QDateTime::currentDateTime());
     } else {
       mActiveItem->todo()->setCompleted(false);
     }
     mActiveItem->todo()->setPercentComplete(mPercentage[index]);
     mActiveItem->construct();
     todoModified (mActiveItem->todo (), KOGlobals::COMPLETION_MODIFIED);
     mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1  );
   }
 }
 
 
 QPopupMenu * KOTodoView::getCategoryPopupMenu (KOTodoViewItem *todoItem)
 {
   QPopupMenu* tempMenu = new QPopupMenu (this);
   QStringList checkedCategories = todoItem->todo()->categories ();
 
   tempMenu->setCheckable (true);
   for (QStringList::Iterator it = KOPrefs::instance()->mCustomCategories.begin ();
        it != KOPrefs::instance()->mCustomCategories.end ();
        ++it) {
     int index = tempMenu->insertItem (*it);
     mCategory[index] = *it;
     if (checkedCategories.find (*it) != checkedCategories.end ()) tempMenu->setItemChecked (index, true);
   }
 
   connect (tempMenu, SIGNAL (activated (int)), SLOT (changedCategories (int)));
   return tempMenu;
 
 
 }
 void KOTodoView::changedCategories(int index)
 {
   if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) {
     QStringList categories = mActiveItem->todo()->categories ();
     if (categories.find (mCategory[index]) != categories.end ())
       categories.remove (mCategory[index]);
     else
       categories.insert (categories.end(), mCategory[index]);
     categories.sort ();
     mActiveItem->todo()->setCategories (categories);
     mActiveItem->construct();
     mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1  );
     todoModified (mActiveItem->todo (), KOGlobals::CATEGORY_MODIFIED);
   }
 }
 void KOTodoView::itemDoubleClicked(QListViewItem *item)
 {
     if ( pendingSubtodo != 0 ) {
         topLevelWidget()->setCaption(i18n("Reparenting aborted!"));
     }
     pendingSubtodo = 0;
     if (!item) {
         newTodo();
         return;
     }
     if ( KOPrefs::instance()->mEditOnDoubleClick )
         editItem( item );
     else
         showItem( item , QPoint(), 0 );
 }
 void KOTodoView::itemClicked(QListViewItem *item)
 {
 
   if (!item) {
       if ( pendingSubtodo != 0 ) {
           topLevelWidget()->setCaption(i18n("Reparenting aborted!"));
       }
       pendingSubtodo = 0;
       return;
   }
   KOTodoViewItem *todoItem = (KOTodoViewItem *)item;
   if ( pendingSubtodo != 0 ) {
       bool allowReparent = true;
       QListViewItem *par = item;
       while ( par ) {
           if ( par ==  pendingSubtodo ) {
               allowReparent = false;
               break;
           }
           par = par->parent();
       }
       if ( !allowReparent  ) {
           topLevelWidget()->setCaption(i18n("Recursive reparenting not possible!"));
           qDebug("Recursive reparenting not possible ");
           pendingSubtodo = 0;
       } else {
           Todo* newParent = todoItem->todo();
           Todo* newSub = pendingSubtodo->todo();
           pendingSubtodo = 0;
           emit reparentTodoSignal( newParent,newSub  );
           return;
       }
   }
   int completed = todoItem->todo()->isCompleted();  // Completed or not?
 
   if (todoItem->isOn()) {
     if (!completed) {
       todoItem->todo()->setCompleted(QDateTime::currentDateTime());
     }
   } else {
     if (completed) {
       todoItem->todo()->setCompleted(false);
     }
   }
 }
 
 void KOTodoView::setDocumentId( const QString &id )
 {
   kdDebug() << "KOTodoView::setDocumentId()" << endl;
 
   mDocPrefs->setDoc( id );
 }
 
 void KOTodoView::itemStateChanged( QListViewItem *item )
 {
   if (!item) return;
 
   KOTodoViewItem *todoItem = (KOTodoViewItem *)item;
 
 //  kdDebug() << "KOTodoView::itemStateChanged(): " << todoItem->todo()->summary() << endl;
 
   if( mDocPrefs ) mDocPrefs->writeEntry( todoItem->todo()->uid(), todoItem->isOpen() );
 }
 
 void KOTodoView::saveLayout(KConfig *config, const QString &group) const
 {
   mTodoListView->saveLayout(config,group);
 }
 
 void KOTodoView::restoreLayout(KConfig *config, const QString &group)
 {
   mTodoListView->restoreLayout(config,group);
 }
 
 void KOTodoView::processSelectionChange()
 {
 //  kdDebug() << "KOTodoView::processSelectionChange()" << endl;
 
   KOTodoViewItem *item =
     static_cast<KOTodoViewItem *>( mTodoListView->selectedItem() );
 
   if ( !item ) {
     emit incidenceSelected( 0 );
   } else {
     emit incidenceSelected( item->todo() );
   }
 }
 
 void KOTodoView::modified(bool b)
 {
   emit isModified(b);
 }
 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()
 {
     if ( mQuickAdd->isVisible() ) {
         mQuickAdd->hide();
         KOPrefs::instance()->mEnableQuickTodo = false;
     }
     else {
         mQuickAdd->show();
         KOPrefs::instance()->mEnableQuickTodo = true;
     }
     mPopupMenu->setItemChecked(4,KOPrefs::instance()->mEnableQuickTodo);
     mItemPopupMenu->setItemChecked( 34 , KOPrefs::instance()->mEnableQuickTodo );
 }
 
 void KOTodoView::toggleRunning()
 {
     KOPrefs::instance()->mHideNonStartedTodos = !KOPrefs::instance()->mHideNonStartedTodos;
     mPopupMenu->setItemChecked(5,KOPrefs::instance()->mHideNonStartedTodos);
     mItemPopupMenu->setItemChecked( 35 , KOPrefs::instance()->mHideNonStartedTodos );
     updateView();
 }
 
 void KOTodoView::toggleCompleted()
 {
     KOPrefs::instance()->mShowCompletedTodo = !KOPrefs::instance()->mShowCompletedTodo;
     mPopupMenu->setItemChecked( 3,KOPrefs::instance()->mShowCompletedTodo  );
     mItemPopupMenu->setItemChecked( 33 , KOPrefs::instance()->mShowCompletedTodo   );
     updateView();
 }
 
 void KOTodoView::addQuickTodo()
 {
   Todo *todo = new Todo();
   todo->setSummary(mQuickAdd->text());
   todo->setOrganizer(KOPrefs::instance()->email());
   CalFilter * cf = mCalendar->filter();
   if ( cf ) {
       if ( cf->isEnabled()&& cf->showCategories()) {
           todo->setCategories(cf->categoryList());
       }
       if ( cf->isEnabled() )
           todo->setSecrecy( cf->getSecrecy());
   }
   mCalendar->addTodo(todo);
   mQuickAdd->setText("");
   todoModified (todo,  KOGlobals::EVENTADDED );
   updateView();
 }
 void KOTodoView::keyPressEvent ( QKeyEvent * e )
 {
     //    e->ignore();
     //return;
     //qDebug("KOTodoView::keyPressEvent  ");
     switch ( e->key() ) {
     case Qt::Key_Down:
     case Qt::Key_Up:
         QWidget::keyPressEvent (  e );
         break; 
    
     case Qt::Key_Q:
         toggleQuickTodo();
         break; 
     case Qt::Key_U:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton ) {
             mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
             unparentTodo();
             e->accept();
         } else
             e->ignore();
         break; 
     case Qt::Key_S:
         if ( e->state() == Qt::ControlButton ) {
             e->ignore();
             break; 
         }
         if ( e->state() == Qt::ShiftButton ) {
             mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
             reparentTodo();
             e->accept();
         } else
             e->ignore();
         break; 
     case Qt::Key_P:
         if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton ) {
             mActiveItem = (KOTodoViewItem*)mTodoListView->currentItem();
             if ( pendingSubtodo )
                 itemClicked(mActiveItem);
             e->accept();
         } else
             e->ignore();
         break;  
     case Qt::Key_Escape:
         if ( pendingSubtodo ) {
             itemClicked(0);
             e->accept();
         } else
             e->ignore();
         break; 
     default:
         e->ignore();
     }
     
     if ( true ) {
         if (  e->key() == Qt::Key_I ) {
             KOTodoViewItem*cn = (KOTodoViewItem*)mTodoListView->currentItem();
             if ( cn ) {
                 mActiveItem = cn;
                 KOTodoViewItem* ci = (KOTodoViewItem*)( cn ); 
                 if ( ci ){
                     showTodo();
                     cn = (KOTodoViewItem*)cn->itemBelow();
                     if ( cn ) {
                         mTodoListView->setCurrentItem ( cn );
                         mTodoListView->ensureItemVisible ( cn );
                     }
                     
                 }
             }
             e->accept();
         
         }
         
     }
     
 }
 void KOTodoView::updateTodo( Todo * t, int type )
 {
     if  ( mBlockUpdate)
         return;
 
     QMap<Todo *,KOTodoViewItem *>::ConstIterator itemIterator;
     itemIterator = mTodoMap.find(t);
     if (itemIterator != mTodoMap.end()) {
         (*itemIterator)->construct();
     } else {
         if ( type == KOGlobals::EVENTADDED ) {
             insertTodoItem( t );
         }
     }
 
 }
 
 void KOTodoView::todoModified(Todo * t , int p )
 {
     mBlockUpdate = true;
     emit todoModifiedSignal ( t, p );
     mBlockUpdate = false;
 }
diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h
index 5ca0362..f11518d 100644
--- a/korganizer/kotodoview.h
+++ b/korganizer/kotodoview.h
@@ -1,239 +1,244 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2000, 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 #ifndef KOTODOVIEW_H
 #define KOTODOVIEW_H
 
 #include <qfont.h>
 #include <qfontmetrics.h>
 #include <qlineedit.h>
 #include <qptrlist.h>
 #include <qstrlist.h>
 #include <qlistbox.h>
 #include <qpopupmenu.h>
 #include <qlabel.h>
 #include <qmap.h>
 #include <qlistview.h>
 #include <klistview.h>
 
 #include <libkcal/calendar.h>
 #include <libkcal/todo.h>
 
 #include <korganizer/baseview.h>
 
 #include "kotodoviewitem.h"
 #include "koprefs.h"
 #include "koglobals.h"
 #include "datenavigator.h"
 
 class QDragEnterEvent;
 class QDragMoveEvent;
 class QDragLeaveEvent;
 class QDropEvent;
 
 class DocPrefs;
 
 class KOTodoListView : public KListView
 {
     Q_OBJECT
   public:
     KOTodoListView(Calendar *,QWidget *parent=0,const char *name=0);
     virtual ~KOTodoListView() {}
 
   signals:
     void todoDropped(Todo *);  
     void double_Clicked(QListViewItem *item);
 
   protected:
     void contentsDragEnterEvent(QDragEnterEvent *);
     void contentsDragMoveEvent(QDragMoveEvent *);
     void contentsDragLeaveEvent(QDragLeaveEvent *);
     void contentsDropEvent(QDropEvent *);
 
     void contentsMousePressEvent(QMouseEvent *);
     void contentsMouseMoveEvent(QMouseEvent *);
     void contentsMouseReleaseEvent(QMouseEvent *);
     void contentsMouseDoubleClickEvent(QMouseEvent *);
 
   private:
     QString mName;
     Calendar *mCalendar;
     QPoint mPressPos;
     bool mMousePressed;
     QListViewItem *mOldCurrent;
     void keyPressEvent ( QKeyEvent * ) ;
 };
 
 
 /**
   This is the line-edit on top of the todoview for fast addition of new todos
 */
 class KOQuickTodo : public QLineEdit
 {
   public:
     KOQuickTodo(QWidget *parent=0);
   protected:
     void focusInEvent(QFocusEvent *ev);
     void focusOutEvent(QFocusEvent *ev);
 };
 
 
 /**
   This class provides a multi-column list view of todo events.
 
   @short multi-column list view of todo events.
   @author Cornelius Schumacher <schumacher@kde.org>
 */
 class KOTodoView : public KOrg::BaseView
 {
     Q_OBJECT
   public:
     KOTodoView(Calendar *, QWidget* parent=0, const char* name=0 );
     ~KOTodoView();
 
     QPtrList<Incidence> selectedIncidences();
     QPtrList<Todo> selectedTodos();
 
     DateList selectedDates()
       {DateList q;
        return q;}
 
     /** Return number of shown dates. TodoView does not show dates, */
     int currentDateCount() { return 0; }
 
     void printPreview(CalPrinter *calPrinter, const QDate &fd, const QDate &td);
 
     void setDocumentId( const QString & );
 
     void saveLayout(KConfig *config, const QString &group) const;
     void restoreLayout(KConfig *config, const QString &group);
     /** Create a popup menu to set categories */
     QPopupMenu *getCategoryPopupMenu (KOTodoViewItem *todoItem);
     void setNavigator( DateNavigator* nav ) {mNavigator = nav;}
 
   public slots:
     void updateView();
     void updateConfig();
 
     void changeEventDisplay(Event *, int);
 
     void showDates(const QDate &start, const QDate &end);
     void showEvents(QPtrList<Event> eventList);
 
     void clearSelection();
     void jumpToDate ();
 
     void editItem(QListViewItem *item);
     void showItem(QListViewItem *item,const QPoint &,int);
     void popupMenu(QListViewItem *item,const QPoint &,int);
     void newTodo();
     void newSubTodo();
     void unparentTodo();
     void reparentTodo();
     void showTodo();
     void editTodo();
     void cloneTodo();
     void cancelTodo();
     void moveTodo();
     void beamTodo();
     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 );
 
     void itemClicked(QListViewItem *);
     void itemStateChanged(QListViewItem *);
     void modified(bool);
     void itemDoubleClicked(QListViewItem *item);
 
   signals:
     void newTodoSignal();
     void newSubTodoSignal(Todo *);
     void unparentTodoSignal(Todo *);
     void reparentTodoSignal( Todo *,Todo * );
     void showTodoSignal(Todo *);
 
     void editTodoSignal(Todo *);
     void deleteTodoSignal(Todo *);
     void todoModifiedSignal (Todo *, int);
 
     void isModified(bool);
     void cloneTodoSignal( Incidence * );
     void cancelTodoSignal( Incidence * );
     void moveTodoSignal( Incidence * );
     void beamTodoSignal( Incidence * );
     void purgeCompletedSignal();
 
   protected slots:
     void processSelectionChange();
     void addQuickTodo();
 
   private:
     /*
      * the TodoEditor approach is rather unscaling in the long
      * run.
      * Korganizer keeps it in memory and we need to update
      * 1. make KOTodoViewItem a QObject again?
      * 2. add a public method for setting one todo modified?
      * 3. add a private method for setting a todo modified + friend here?
      *  -- zecke 2002-07-08
      */
     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;
 
     QMap<int, int> mPercentage;
     QMap<int, int> mPriority;
     QMap<int, QString> mCategory;
     KOTodoViewItem *mActiveItem;
 
     QMap<Todo *,KOTodoViewItem *> mTodoMap;
     QString mName;
 
     DocPrefs *mDocPrefs;
     QString mCurrentDoc;
     KOQuickTodo *mQuickAdd;
     bool mBlockUpdate;
     void todoModified(Todo *, int );
     void keyPressEvent ( QKeyEvent * ) ;
     KOTodoViewItem * pendingSubtodo;
     DateNavigator* mNavigator;
 };
 
 #endif