fixixixis

5 files changed, 61 insertions, 121 deletions

diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 708ac19..ed6a1c1 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -392,193 +392,193 @@
 { "Thu","Do" },
 { "Thursday","Donnerstag" },
 { "Time associated","Mit Zeit" },
 { "Time bar:","Uhrzeit Zeile:" },
 { "Time && Date","Zeit und Datum" },
 { "Time Format","Zeit Format" },
 { "Time Format(nr):","Zeit Format(Neustart!)" },
 { "Date Labels:","Datumsleiste:" },
 { "Time: ","Zeit: " },
 { "Timezone:","Zeitzone:" },
 { "To: ","Bis: " },
 { "To:","Bis:" },
 { "Today: ","Heute: " },
 { "Todo due today color:","Heute fällige To-Do's" },
 { "To-do items:","To-Do items:" },
 { "Todo overdue color:","Überfällige To-Do's" },
 { "Todo","Todo" },
 { "To-do view shows completed Todos","To-do Ansicht zeigt erledigte To-dos" },
 { "ToDoView:","Todo Ansicht:" },
 { "Toggle Alarm","Wechsle Alarm" },
 { "Toggle Allday","Umschalten Ganztag" },
 { "Tomorrow: ","Morgen: " },
 { "Tue","Di" },
 { "Tuesday","Dienstag" },
 { "Two entries are in conflict, if: ","Zwei Einträge haben einen Konflikt, wenn:" },
 { "Unable to find template '%1'.","Kann Vorlage '%1' nicht finden." },
 { "Unknown","Unbekannt" },
 { "Up","Hinauf" },
 { "Use password (if not, ask when syncing)","Passwort: (sonst jedesmal anfragen)" },
 { "User defined","Benutzerdefiniert" },
 { "User long date:","Format langes Datum:" },
 { "User short date:","Forma kurzes Datum:" },
 { "View","Ansicht" },
 { "View Fonts","Schriftarten Ansichten" },
 { "Views","Ansichten" },
 { "Wed","Mi" },
 { "Wednesday","Mittwoch" },
 { "Week %1","Woche %1" },
 { "Weekly","Wöchentlich" },
 { "Week starts on Sunday","Woche beginnt Sonntags" },
 { "What's Next View:","What's Next Anz." },
 { "What's next ?","Was kommt als nächstes?(What's Next)" },
 { "Working Hours","Tägliche Arbeitszeit" },
 { "Working hours color:","Arbeitszeit in der Agenda Ansicht:" },
 { "Write back existing entries only","Nur exisitierende Einträge zurückschreiben" },
 { "Write back synced file","Syncronisierte Datei zurückschreiben" },
 { "Yearly","Jährlich" },
 { "year(s)","Jahr(e)" },
 { "Yes","Ja" },
 { "You have %d item(s) selected.\n","Sie haben %d Einträge ausgewählt.\n" },
 { "You have to restart KOrganizer for this setting to take effect.","Sie müssem Korganizer neu starten, damit diese Einstellung aktiviert wird." },
 { "week(s) on:","Woche(n) am: " },
 { "Full menu bar(nr)","Volle Menuleiste(bn)" },
 { "Timezone has daylight saving","Zeitzone hat Sommerzeit" },
 { "Actual start and end is the\nsunday before this date.","Tatsächlicher Beginn/Ende ist der\nSonntag vor diesem Datum!" },
 { "The year in the date is ignored.","Das Jahr vom Datum wird ignoriert." },
 { "Daylight start:","Sommerzeit Start:" },
 { "Daylight end:","Sommerzeit Ende:" },
 { "Time Zone","Zeitzone" },
 { "Monday 19 April 2004: %A %d %B %Y","Montag 19 April 2004: %A %d %B %Y" },
 { "%A: Monday --- %a: Mon","%A: Montag --- %a: Mon" },
 { "minutely","minütlich" },
 { "hourly","stündlich" },
 { "daily","täglich" },
 { "weekly","wöchentlich" },
 { "monthly","monatlich" },
 { "day-monthly","tag-monatlich" },
 { "month-yearly","monat-jährlich" },
 { "day-yearly","tag-jährlich" },
 { "position-yearly","pos-jährlich" },
 { "Edit item on doubleclick (if not, show)","Editiere mit Doppelklick(wenn nicht, zeige)" },
 { "Highlight current day in agenda","Hebe >>heute<< in Agenda hervor" },
 { "Use light color for highlight current day","Helle Farbe für >>heute<< Hervorhebung" },
 { "Highlight selection in Time Edit","Hebe Auswahl in Zeit Edit hervor" },
 { "Hold fullscreen on view change","Behalte Vollbild bei Ansichswechsel" },
 { "Hold non-fullscreen on view change","Behalte Nicht-Vollbild bei Ansichtsw." },
 { "Event list view uses full window","Listenansicht nutzt Vollbild" },
 { "Set agenda to DayBeginsAt on change","Setze Agenda auf TagBeginntUm bei Wechsel" },
 { "Set agenda to current time on change","Setze Agenda auf gegenw.Zeit bei Wechsel" },
 { "Listview uses monthly timespan","Listenansicht zeigt monatliche Zeitspanne" },
 { "ViewChange","Ansichtswechsel" },
 { "Default alarm *.wav file:","Standard Alarm *.wav Datei:" },
 { "This setting is useless for 5500 user!","Diese Einst. ist nutzlos für 5500 Nutzer" },
 { "File","Datei" },
 { "Clone...","Dupliziere..." },
 { "Move...","Bewege..." },
 { "Beam...","Sende via IR..." },
 { "&Clone...","Dupliziere.." },
 { "&Move...","Bewege..." },
 { "&Beam...","Sende via IR..." },
 { "Show Completed","Zeige erledigte Todos" },
 { "Show Quick Todo","Zeige Quick Todo" },
 { "Unparent Todo","Un-sub Todo" },
 { "Save selected to file...","Speichere Selektierte..." },
 { "Add Categ. to selected...","Füge zu Selekt. Kateg. hinzu..." },
 { "Set Categ. for selected...","Setze Kateg. für Selekt." },
-{ "Beam selected via IR","Sende Selekt. via IR..." },
+{ "Beam via IR","Sende via IR" },
 { "Search","Suchen" },
 { "Date Picker","Datum auswählen" },
 { "Day View","Tagesansicht" },
 { "Work Week","Arbeitswoche" },
 { "Week","Wochenansicht" },
 { "Month","Monatsansicht" },
 { "Todo View","Todo Liste" },
 { "Journal","Journal" },
 { "Next days","Nächste Tage" },
 { "Print agenda selection...","Drucke Agendaselektion..." },
 { "Toggle DateNavigator","Navigator umschalten" },
 { "Toggle FilterView","Filteransicht umschalten" },
 { "Prev. month","Vorheriger Monat" },
 { "Go backward","Gehe zurück" },
 { "Go forward","Gehe weiter" },
 { "Synchronize","Synchronisieren" },
 { "AgendaSize","Agendagröße" },
 { "Import (*.ics/*.vcs) file","Importiere (*.ics/*.vcs) Datei" },
 { "Import last file","Importiere letzte Datei" },
 { "Import Opie/Qtopia Cal.","Importiere Opie/Qtopia Kal." },
 { "Load Calendar Backup","Lade Kalender Backup" },
 { "Save Calendar Backup...","Speichere Kalender Backup..." },
 { "Export VCalendar","Exportiere VCalendar" },
 { "Manage new categories...","Verwalte neue Kategorien..." },
 { "Beam complete calendar...","Sende kompletten Kalender..." },
 { "Beam filtered calendar...","Sende gefilterten Kalender..." },
 { "Remote via ssh","Über Netzwerk via ssh" },
 { "With local file","Mit lokaler Datei" },
 { "With last file","Mit letzter Datei" },
 { "KO/Pi: Ready for beaming","KO/Pi: Bereit zum Senden" },
 { "KO/Pi:Beaming done","KO/Pi: Senden erfolgt" },
 { "Save filename","Speichern: Dateinamen wählen" },
 { "File already exists!\nOld file from:\n%1\nOverwrite?\n","Dateiname existiert bereits!\nAlte Datei vom:\n%1\nÜberschreiben?\n" },
 { "KO/Pi: Warning!","KO/Pi: Warnung!" },
 { "Overwrite!","Überschreibe!" },
 { "KO/Pi:Saved %1","KO/Pi:Gespeichert %1" },
 { "All selected items will be\npermanently deleted.\n(Deleting items will take\nsome time on a PDA)\n","Alle selektierten Einträge werden\nunwiederbringlich gelöscht.\n(Löschen kann auf dem\nPDA einige Zeit dauern)\n" },
 { "KO/Pi Confirmation","KO/Pi Bestätigung" },
 { "Close dialog to abort deletion!","Schließe Dialog um das Löschen abzubrechen!" },
 { "Deleting item %d ...","Lösche Eintrag %d ..." },
 { "%d items remaining in list.","%d Einträge sind in der Liste verblieben." },
 { "Size","Größe" },
 { "Date","Datum" },
 { "Mime Type","Datei Typ" },
 { "All Files","Alle Dateien" },
 { "Files","Dateien" },
 { "Documents","DoKumente" },
 { "Select Categories","Selektiere Kategorien" },
 { " &Deselect All "," Auswahl aufheben " },
 { "A&dd","Hinzu" },
 { "&Modify","Ändern" },
 { "Edit Categories","Editiere Kategorien" },
 { " &Edit Categories "," &Editiere Kategorien " },
 { "Beam Options","Beam Einstellungen" },
 { " With timezone "," Mit Zeitzone " },
 { " Local time ",  " Lokale Zeit " },
 { "Manage new Categories","Verwalte neue Kategorien" },
 { "Add to category list","Füge zur Kategorieliste hinzu" },
 { "Remove from Events/Todos","Entferne von Terminen/Todos" },
 { "New categories not in list:","Kategorien, die nicht in der Liste sind:" },
 { "File format","Datei Format" },
 { "Time format","Zeit Format" },
 { "KO/Pi:Saving Data to File ...","KO/Pi: Speichere Kalender in Datei ..." },
 { "KO/Pi:File Saved. Needed %d sec, %d ms","KO/Pi: Abgespeichert in %d sec, %d ms" },
 { "h","Std" },
 { "min","Min" },
 { "hou","Std" },
 { "day","Tag" },
 { "French","Französich" },
 { "Time","Zeit" },
 { "Event Viewer","Termin Ansicht" },
 { "Cancel Sync","Sync Abbrechen" },
 { "Remote","Fern" },
 { "Local","Lokal" },
 { "Conflict! Please choose entry","Konflikt! Bitte Eintrag wählen" },
 { "Local: ","Lokal: " },
 { "Remote: ","Fern: " },
 { "Last modified: ","Zuletzt geändert: " },
 { "Location: ","Ort: " },
 { "<p><b>From:</b> %1 </p><p><b>To:</b> %2</p>","<p><b>Von:</b> %1 </p><p><b>Bis:</b> %2</p>" },
 { "<p><b>On:</b> %1</p>","<p><b>Am:</b> %1</p>" },
 { "<p><b>From:</b> %1</p> ","<p><b>Von:</b> %1</p> " },
 { "<p><b>To:</b> %1</p>","<p><b>Bis:</b> %1</p>" },
 { "<p><b>On:</b> %1</p> ","<p><b>Am:</b> %1</p> " },
 { "<p><b>From:</b> %1 <b>To:</b> %2</p>","<p><b>Von:</b> %1 <b>Bis:</b> %2</p>" },
 { "This is a %1 recurring event.","Das ist ein %1 wiederholender Termin." },
 { "<b>Next recurrence is on:</b>","<b>Nächste Wiederholung ist am:</b>" },
 { "<b>Last recurrence was on:</b>","<b>Letzte Wiederholung war am:</b>" },
 { "( %1 min before )","( %1 min vorher )" },
 { "<b>Alarm on: ","<b>Alarm am: " },
 { "<b>Details: </b>","<b>Details: </b>" },
 { "<p><b>Priority:</b> %2</p>","<p><b>Priorität:</b> %2</p>" },
 { "<p><i>%1 % completed</i></p>","<p><i>%1 % erledigt</i></p>" },
 { "Organizer","Organisator" },
 { "Save","Speichern" },
 { "Exit (+save)","Beenden (+ speichern)" },
@@ -1103,390 +1103,396 @@
 { "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 Untertodos 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 Untertodos.\nAlle erledigten Untertodos\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" },
 { "This month","Dieser Monat" },
 { "Journal view","Journal" },
 { "Display all opened","Zeige alle geöffnet" },
 { "Display all closed","Zeige alle geschlossen" },
 { "Display all flat","Zeige alle flach" },
 { "<p><i>Completed on %1</i></p>","<p><i>Erledigt am %1</i></p>" },
 { "Default todo done color:","Standard Todo erledigt Farbe" },
 { "Select week %1-%2","Wähle Woche %1-%2" },
 { "Select Week","Wähle Woche" },
-{ "Set alarm for selected...","Setze Alarm für Selekt..." },
+{ "Set alarm...","Setze Alarm..." },
 { "Set Alarm!","Setze Alarm!" },
 { "Changed alarm for %1 items","Alarm für %1 Items geändert" },
 { " and "," und " },
 { "<IMG src="%1"> only )","nur <IMG src="%1"> )" },
 { "Mail to selected","Mail an Ausgewählte" },
 { "Mail to all","Mail an Alle" },
 { "Week view mode uses bigger font","Wochenansicht Modus nutzt größeren Font" },
 { "Set reminder ON with offset to:","Alarm AN mit Offset auf:" },
 { " on"," am" },
 { " completed on "," erledigt am " },
 { "Save as Event template","Speichere als Vorlage" },
 { "Load Event template","Lade Termin Vorlage" },
 { "Save as Journal template","Speichere als Journal Vorlage" },
 { "Insert Journal template","Füge Journal Vorlage ein" },
 { "Sub todos:<br>","Unter Todos:<br>" },
 { "Parent todo:<br>","Über Todo:<br>" },
 { "Set current as color category","Setze Gewählte als Farbkategorie" },
 { " completed"," erledigt" },
 { "(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi is based on KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) and the KDE team.\nKOrganizer/Pi is licensed under the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.pi-sync.info --- www.korganizer.org\nSpecial thanks to Michael and Ben\nfor intensive testing!","(c)2004 Lutz Rogowski (rogowski@kde.org)\nKO/Pi basiert auf KOrganizer\n(c)2002,2003 Cornelius Schumacher\n(schumacher@kde.org) und das KDE Team.\nKOrganizer/Pi ist lizensiert unter der GPL.\nKO/Pi kann kompiliert werden für\nLinux, Zaurus-PDA und Windows\nwww.pi-sync.info --- www.korganizer.org\nBesonderen Dank an Michael und Ben\nfür intensives Testen!" },
 { "Syncing aborted. Nothing synced.","Syncing abgebrochen.Nichts wurde gesynct." },
 { "Connected! Sending request for remote file ...","Verbunden! Sende Daten Anfrage..." },
 { "Trying to connect to remote...","Versuche mit Gegenstelle zu verbinden..." },
 { "Connection to remote\nhost timed out!\nDid you forgot to enable\nsyncing on remote host?","Verbindungsversuch wegen\nZeitüberschreitung gescheitert!\nWurde vergessen Pi-Sync auf\nder Gegenstelle anzuschalten?" },
 { "ERROR: Receiving remote file failed.","FEHLER: Empfang der entfernten Daten fehlgeschlagen." },
 { "Error","Fehler" },
 { ""You entered an invalid date!\n Date changed  to current date.","Ungültiges Datum eingegeben.\nSetze heutiges Datum." },
 { "You entered an invalid date!\n Will use current date instead.","Ungültiges Datum eingegeben.\nSetze stattdessen heutiges Datum." },
 { "Warning","Warnung" },
 { "Select week number","Wähle Wochen Nummer" },
 { "Februar","Februar" },
 { "Click on the week number to\nshow week zoomed","Klicke auf die Wochennummer\num die Woche groß zu zeigen" },
 { "W","W" },
 { "Click on this to\nselect week number","Klicke hierauf um\ndie Woche auszuwählen" },
 { "T: %1","T: %1" },
 { "Start: ","Start: " },
 { "Pi-Sync options for device: ","Pi-Sync Einstellungen für Gerät: " },
 { "Password for remote access:","Passwort für fernen Zugriff:" },
 { "Remote IP address:","Ferne IP Adresse:" },
 { "Remote port number:","Ferne Port Nummer:" },
 { "Remote file saved to temp file.","Ferne Daten in temp Datei gespeichert." },
 { "Remote from: ","Fern von: " },
 { "Local from: ","Lokal von: " },
 { "Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n %d incoming filtered out\n %d outgoing filtered out\n","Synchronisationsübersicht:\n\n %d lokal hinzugefügt\n %d fern hinzugefügt\n %d lokal geändert\n %d fern geändert\n %d lokal gelöscht\n %d fern gelöscht\n %d eingehende ausgefiltert\n %d ausgehende ausgefiltert\n" },
 { "Local calendar changed!\n","Lokaler Kalender geändert!\n" },
 { "Write back","Schreibe zurück" },
 { "KO/Pi  Synchronization","KO/Pi  Synchronisation" },
 { "Pi-Sync succesful!","Pi-Sync erfolgreich!" },
 { "Received sync request","Sync Anfrage erhalten" },
 { "Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog.","Ferne Synchronisation ...\n\nBenutze diese Anwendung nicht!\n\nWenn das Syncen fehlschlägt kann\ndieser Dialog geschlossen werden." },
 { "Saving Data to temp file ...","Speichere Daten in temp Datei..." },
 { "Data saved to temp file!","Daten in temp Datei gespeichert!" },
 { "Sending file...","Sende Datei..." },
 { "Waiting for synced file...","Warte auf gesyncte Daten..." },
 { "Receiving synced file...","Gesyncte Daten erhalten..." },
 { "Received %1 bytes","%1 Bytes erhalten" },
 { "Writing file to disk...","Speichere Datei..." },
 { "Pi-Sync successful!","Pi-Sync erfolgreich!" },
 { "Clock skew of\nsyncing devices\nis %1 seconds!","Uhrzeitunterschied der\nsyncenden Geräte\nist %1 Sekunden!" },
 { "Synchronize!","Synchronisiere!" },
 { "High clock skew!","Großer Uhrzeitunterschied!" },
 { "ADJUST\nYOUR\nCLOCKS!","JUSTIERE\nDIE\nUHREN!" },
 { "The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!","Die Uhren der syncenden Geräte\nhaben einen Unterschied von\nmehr als 5 Minuten. Bitte die\nUhrzeiten anpassen. Sie können\nfalsche Sync-Resultate erhalten!\nBitte das Syncen bestätigen!" },
 { "This is a %1 recurring todo.","Das ist eine %1 wiederholende Aufgabe." },
 { "<p><b>Start on:</b> %1</p>","<p><b>Start am:</b> %1</p>" },
 { "List week view","Listenwochenansicht" },
 { "List week","Listenwochenansicht" },
 { "Next Week","Nächste Woche" },
 { "Previous Week","Vorherige Woche" },
 { "No items were found matching\nyour search expression.\nUse the wildcard characters\n'*' and '?' where needed.","Keine Einträge gefunden die\ndem Suchausdruck entsprechen.\nBenutze Platzhalter Zeichen\n'*' und '?' wo benötigt." },
 { "Show in todo/event viewer:","Zeige in Termin/Todo Anzeige:" },
 { "Details","Details" },
 { "Created time","Erstellt Zeit" },
 { "Last modified time","Geändert Zeit" },
 { "Show in What'sThis quick overview:","Zeige in What'sThis Schnellübersicht:" },
 { "View Options","Anzeige Optionen" },
 { "<b>Created: ","<b>Erstellt am: " },
 { "<b>Last modified: ","<b>Zuletzt geändert am: " },
 { "Journal: ","Journal: " },
 { "yearly","jährlich" },
 { "(%1) ","%1-" },
 { "<p><b>K</b>: Week view in Month view syle</p>\n","<p><b>K</b>: Wochenansicht in Art der Monatsansicht</p>\n" },
 { "Enable tooltips displaying summary of ev.","Titel-Tooltips anzeigen" },
 { "Enable scrollbars in month view cells","Scrollbar in Zellen anzeigen" },
 { "Summary/Loc.","Titel/Ort" },
 { "No items found. Use '*' and '?' where needed.","Nichts gefunden. Benutze '*' and '?' wo benötigt." },
 { "Week Number","Wochennummer" },
 { "Import","Importiere" },
 { "Export","Exportiere" },
 { "Beam","Beame" },
-{ "Export selected","Exportiere Selektierte" },
+{ "Export","Exportiere" },
 { "As iCal (ics) file...","Als iCal (ics) Datei..." },
 { "As vCal (vcs) file...","Als vCal (vcs) Datei..." },
 { "Journal/Details...","Journale/Details..." },
 { "Agenda View","Agenda Ansicht" },
 { "Show current time","Zeige aktuelle Zeit" },
 { "Edit new item","Bearbeite neuen Eintrag" },
 { "Please select at least one\nof the types to search for:\n\nEvents\nTodos\nJournals","Bitte wählen Sie mindestens\neinen dieser Typen\num darin zu suchen:\n\nTermine\nTodos\nJournale" },
 { "There is no next alarm.","Es gibt keinen nächsten Alarm." },
 { "%1 %2 - %3 (next event/todo with alarm)","%1 %2 - %3 (nächster Termin/Todo mit Alarm)" },
 { "The next alarm is in:\n","Der nächste Alarm ist in:\n" },
 { "%1 days\n","%1 Tagen\n" },
 { "1 day\n","1 Tag\n" },
 { "%1 hours\n","%1 Stunden\n" },
 { "1 hour\n","1 Stunde\n" },
 { "%1 minutes\n","%1 Minuten\n" },
 { "1 minute\n","1 Minute\n" },
 { "Only one toolbar","Nur eine Toolbar" },
 { "Print","Drucke" },
 { "Print selected event / todo...","Drucke ausgewählten Termin / Todo..." },
 { "There is nothing selected!","Es ist nichts ausgewählt!" },
 { "\n\nDo you really want to print this item?","\n\nMöchten Sie wirklich diesen Eintrag ausdrucken? " },
 { "KO/Pi Print Confirmation","KO/Pi Druckbestätigung" },
 { "This prints the view as you see it.\n(With the complete content, of course.)\nYou may change the print layout by resizing the view.\nPrint unscaled may print several pages\ndepending on the amount of data.\nPrint scaled down will print all on one page.\nPrint scaled up/down will print all on one page,\nbut will scale up the text to page boundaries,\nif the text is smaller than the page.\nYou can select page geometry setup in the next dialog.\n","Dies druckt die Ansicht wie man sie sieht.\n(Mit dem kompletten Inhalt natürlich.)\nMan kann das Layout ändern durch ändern der Fenstergröße.\nDrucke unskaliert druckt ggf. mehrere Seiten\nabhängig von der Menge der Daten.\nDrucke runterskaliert um auf eine Seite zu passen\ndruckt alles auf eine Seite.\nDrucke hoch/runterskaliert um genau auf eine Seite zu passen\nvergrößert den Text gegebenenfalls.\nDas Seitenlayout kann im nächsten Dialog gewählt werden.\n" },
 { "KO/Pi Printout","KO/Pi Ausdruck" },
 { "Print unscaled","Drucke unskaliert" },
 { "Print scaled down to fit one page","Drucke runterskaliert um auf eine Seite zu passen." },
 { "Print scaled up/down to fit one page","Drucke hoch/runterskaliert um genau auf eine Seite zu passen." },
 { "Printout Mode","Druck Modus" },
 { "Filter menu icon","Filtermenu Icon" },
 { "<p><b>A+(shift or ctrl)</b>: Show occurence of next alarm</p>\n","<p><b>A+(shift oder ctrl)</b>: Zeige Zeit bis zum nächsten Alarm</p>\n" },
 { "<p><b>N</b>: Switch to next view which has a toolbar icon</p>\n","<p><b>N</b>: Wechsle zur nächsten Ansicht, die ein Icon in der Toolbar hat</p>\n" },
 { "%1d","%1t" },
 { "%1h","%1std" },
 { "%1min","%1min" },
 { "( %1 before )","( %1 vorher )" },
 { "The next alarm is in\nless than one minute!","Der nächste Alarm kommt in\nweniger als einer Minute!" },
 { "\nThe internal alarm notification is disabled!\n","\nDie interne Alarmbenachrichtigung ist ausgeschaltet!\n" },
 { "Enable it in the settings menu, TAB alarm.","Schalten Sie sie an im Menu Einstellungen, TAB Alarm." },
 { "Show Sync Events","Zeige Sync-Ereignisse" },
 { "Use short date in WN+Event view","Zeige Kurzdatum in WN+Terminanzeige" },
 { "Number of max.displayed todo prios:","Anzahl max.angezeigter Todo-Prios:" },
 { " on "," am " },
 { "On: ","Am: " },
 { "<i>The recurrence is computed from the start datetime!</i>","<i>Die Wiederholung wird vom Startwert aus berechnet!</i>" },
 { "Start/Stop todo...","Starte/Stoppe Todo..." },
 { "Color for running todos:","Farbe für laufende Todos:" },
 { "The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?","Das Todo\n%1\nist gestartet.\nWollen Sie es\nauf gestoppt setzen?" },
 { "Todo is started","Todo ist gestartet" },
 { "Stop todo","Stoppe Todo" },
 { "Todo is stopped","Todo ist gestoppt" },
 { "Start todo","Starte Todo" },
 { "The todo\n%1\nis stopped.\nDo you want to set\nthe state to started?","Das Todo\n%1\nist gestoppt.\nWollen Sie es auf\ngestartet setzen?" },
 { "The todo\n%1\nwill be cloned!\nIt has subtodos!\nDo you want to clone\nall subtodos as well?","Das Todo\n%1\nwird geklont!\nEs hat Untertodos!\nMöchten Sie alle\nUntertodos auch klonen?" },
 { "Todo has subtodos","Todo hat Untertodos" },
 { "Block popup until mouse button release","Sperre Popup bis Mausknopf losgelassen" },
 { "Colors","Farben" },
 { "Click on new parent item","Klicke auf neues Übertodo" },
 { "Reparenting aborted!","Übertodo setzen abgebrochen" },
 { "Cannot move Todo to itself\nor a child of itself","Kann nicht Todo auf\nsich selbst oder\nein Untertodo verschieben" },
 { "Recursive reparenting not possible!","Rekursives Verschieben nicht möglich" },
 { "Delete all completed todos?\n(Completed recurring todos\nwill not be deleted!)","Entferne alle erledigten Todos?\n(Erledigte wiederholende Todos\nwerden nicht gelöscht!)" },
 { "Alternating background of list views","Abwechselnder Hintergrund für Listen" },
 { "times","Zeiten" },
 { "The todo\n%1\nhas subtodos!\nDo you want to set\nthe categories for\nall subtodos as well?","Das Todo\n%1\nhat Untertodos!\nMöchten Sie die Kategorien\nauch für alle Untertodos setzen?" },
 { "Backup enabled","Backup angeschaltet" },
 { "Use standard backup dir","Standard Backupverzeichnis" },
 { "Number of Backups:","Anzahl der Backups" },
 { "Make backup every ","Mache ein Backup alle " },
 { " days"," Tage" }, 
 { "Creating backup ... please wait ...","Erstelle Backup ... bitte warten ..." },
 { "Backup Failed!","Backup Problem!" },
 { "Try again now","Versuche jetzt nochmal" },
 { "Try again later","Versuche später nochmal" },
 { "Try again tomorrow","Versuche morgen nochmal" },
 { "Disable backup","Schalte Backup ab" },
 { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" },
 { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" },
 { "Choose action","Wähle Aktion" },
 { "Comment for todo:","Kommentar zum Todo:" },
 { "Stop+note","Stop+Notiz" },
 { "Agenda view shows completed todos","Agenda Ansicht zeigt erledigte Todos" },
 { "KO/Pi: Missing alarms!","KO/Pi: Verpasste Alarme!" },
 { "You missed the alarms for the following events or todos:","Sie verpassten die Alarme für folgende Termine oder Todos:" },
 { "Print complete list","Drucke komplette Liste" },
 { "Hide all selected","Verstecke Selektierte" },
 { "Add items","hinzufügen" },
 { "One (or more) selected\ntodo has subtodos!\nDo you want to select\nall subtodos of all\nselected todos as well?","Ein (oder mehrere) ausgewähltes\nTodo hat Untertodos!\nMöchten Sie der Auswahlliste\nalle Untertodos von allen\nausgewählten Todos hinzufügen?" },
 { "Print List View...","Drucke Listenansicht..." },
 { "You can make a printout of the <b>List View</b> and the list view in the <b>Search Dialog</b>! To do this, please go to the <b>List View/Search Dialog</b>. Right click on the list. Select in the popup menu the entry <b>Print complete list</b>. That prints the list as you see it. You can remove items from the list before printing without deleting the corresponding event/todo! Simply select all items you do not want to print out. Then right click on one of the items and choose <b>Hide selected items</b>. After that you can print the list without these items.","Sie können die <b>Listenansicht</b> und die Listenansicht im <b>Suchdialog</b> ausdrucken! Um das zu machen gehen Sie bitte zur <b>Listenansicht</b> oder zum <b>Suchdialog</b>. Rechtsklicken Sie auf die Liste. Wählen Sie im Popupmenu den Eintrag <b>Drucke komplette Liste</b>. Das druckt die Liste so, wie man sie sieht. Sie können Listeneinträge entfernen ohne die korrespondierenden Ereignisse/Todos zu löschen! Selektieren sie einfach alle Einträge, die sie nicht ausdrucken möchten. Dann Rechtsklicken Sie auf einen Eintrag und wählen <b>Verstecke Selektierte</b>. Danach können Sie die Liste ohne diese Einträge ausdrucken." },
 { "Configure KO/Pi...","Konfiguriere KO/Pi..." },
 { "Global Settings...","Globale Einstellungen..." },
 { "<p><b>R</b>: Toggle Resource View |<b>F</b>: Edit filter </p>\n","<p><b>R</b>: Zeige Resource Ansicht | <b>F</b>: Editiere Filter </p>\n" },
 { "(disabled)","(abgeschaltet)" },
 { "New Calendar","Neuer Kalender" },
 { "Calendar","Kalender" },
 { "Filter selector","Filterauswahl" },
 { "Filtermenu","Filtermenu" },
 { "Toggle Fullscreen","Vollbild umschalten" },
 { "Toggle Resource View","Resourcenansicht umschalten" },
 { "Storage HowTo...","Speicherort HowTo..." },
 { "Timetracking HowTo...","Timetracking HowTo..." },
 { "Juni","Juni" },
 { "Juli","Juli" },
 { "ToDo:","ToDo:" },
 { "Set Calendar","Setze Kalender" },
 { "Todo: %1","Todo: %1" },
 { ": (Prio ",": (Prio " },
 { "Todos","Todos" },
 { "Todo Viewer","Todo Viewer" },
 { "Todo ","Todo " },
 { " Calendar \n Resource "," Kalender \n Resource " },
 { " Color "," Farbe " },
 { "The calendar <b>%1</b> is displaying file <b>%2</b>. Do you want to remove this calendar from KO/Pi? (The file is not removed!)","Der Kalender <b>%1</b> zeigt die Datei <b>%2</b>. Möchten Sie diesen Kalender aus KO/Pi entfernen? (Die Datei wird dabei nicht gelöscht!)" },
 { "The calendar <b>%1</b> is displaying file <b>%2</b>","Der Kalender <b>%1</b> zeigt die Datei <b>%2</b>" },
 { "Add new Calendar","Füge Kalender hinzu" },
 { "<b>Name of new calendar:</b>","<b>Name des Kalenders:</b>" },
 { "<b>Local ical (*.ics) file:</b>","<b>Lokale ical (*.ics) Datei:</b>" },
 { "Sorry, the calendar name is empty!","Sorry, der Kalendername ist leer!" },
 { "Sorry, the file name is empty!","Sorry, der Dateiname ist leer!" },
 { "Error loading calendar file\n%1.","Fehler beim Laden der Kalenderdatei\n%1." },
 { "The calendar <b>%1</b> is not loaded! Loading of file <b>%2</b> failed! <b>Try again to load the calendar?</b>","Der Kalender <b>%1</b> ist nicht geladen! Das Laden der Datei <b>%2</b> schlug fehl! <b>Soll erneut versucht werden den Kalender zu laden?</b>" },
 { "Global application font for all apps:","Globale Schriftart:" },
 { "Application Font","Applikationsschriftart" },
 { "Kx/Pi","Kx/Pi" },
 { "Backup","Backup" },
 { "KDE-Pim Global Settings","KDE-Pim Globale Einstellungen" },
 { "Sorry, the calendar name \n%1\nalready exists!\nPlease choose another name!","Sorry, der Kalendername \n%1\nist schon in Benutzung!\nBitte wählen Sie einen anderen!" },
 { "Sorry, the file \n%1\nis already loaded!\nPlease choose another file!","Sorry, die Datei \n%1\nist schon geladen!\nBitte wählen Sie eine andere!" },
 { "Choose Color","Wähle Farbe" },
 { " OK "," OK " },
 { " Cancel "," Abbrechen " },
 { "Matching items will be added to list","Passende werden zur Liste hinzugefügt" },
 { "Matching items will be removed from list","Passende werden von der Liste entfernt" },
 { "Search on displayed list only","Suche auf der dargestellten Liste" },
 { "List will be cleared before search","Liste wird vor der Suche gelöscht" },
 { "<center>%1</center> <center>is not running. Do you want to set\nthe state to running?</center>","<center>%1</center> <center>ist nicht am Laufen. Möchten Sie den Zustand auf "laufend" setzen?</center>" },
 { "%1\nis running!","%1\nist am Laufen!" },
 { "Additional Comment:","Zusätzlicher Kommentar:" },
 { "Stop and save","Stopp und Speichern" },
 { "Continue running","Weiter laufen lassen" },
 { "Stop - do not save","Stopp - nicht Speichern" },
 { "Do you really want to set\nthe state to stopped\nwithout saving the data?","Möchten sie den Zustand\nwirklich auf gestoppt setzen\nohne die Daten abzuspeichern?" },
 { "Time mismatch!","Zeiten stimmen nicht!" },
 { "The start time is\nafter the end time!","Die Startzeit ist\nhinter der Endzeit!" },
 { "Yes, stop todo","Ja, stoppe Todo" },
 { "Todo stopped - no data saved because runtime was < 15 sec!","Todo gestoppt - nichts gespeichert da Laufzeit < 15 sec!" },
 { "Todo started! Double click again to stop!","Todo gestartet! Doppelklicke um es zu stoppen!" },
 { "Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.","Bitte wählen Sie den <b>Default-Kalender</b> in dieser Spalte. Neu angelegte oder importierte Einträge werden dem Default-Kalender hinzugefügt." },
 { "Spouse","Ehegatte" },
 { "Notes","Notizen" },
 { "Messanger","Messanger" },
 { "Assistant","Assistent" },
 { "Manager","Manager" },
 { "Secrecy","Sichtbar" },
 { "male","männlich" },
 { "female","weiblich" },
 { "Hide!","Verbergen!" },
 { "Show!","Anzeigen!" },
 { "Details","Details" },
 { "Profession","Beruf" },
 { "Children","Kinder" },
 { "Department","Abteilung" },
 { "Backup cancelled","Backup abgebrochen" },
 { "Backup globally disabled","Backup global abgeschaltet" },
 { "Backup succesfully finished","Backup erfolgreich beendet" },
 { "(Hint: You can enable automatic backup in the global settings!)","(Hinweis: Sie können ein automatisches Backup in den globalen Einstellungen konfigurieren!)" },
 { "This will <b>backup all calendar files</b> to the directory %1 %2","Das schreibt ein <b>Backup aller Kalenderdateien</b> in das Verzeichnis %1 %2" },
 { "Birthdays","Geburtstage" },
 { "KO/Pi import information!","KO/Pi Import Information!" },
 { "Start this todo\nand stop all running","Starte dieses Todo\nund stoppe alle Laufenden" },
 { "Cancel - do not start"," Abbrechen - Todo nicht starten" }, 
 { "The timezone has changed!\nShould the calendar be reloaded\nto shift the time of the events?\nPlease read Menu: Help->FAQ:\n"How do I change the timezone?"\nas well!","Die Zeitzone wurde geändert!\nSollen die Kalender neu geladen\nwerden num die Zeiten\nder Termine zu ändern?\nBitte lesen Sie auch\nMenu: Help->FAQ:\n"How do I change the timezone?"" },
 { "Reload","Neu laden" },
 { "Timezone settings","Zeitzoneneinstellung" },
 { "Title: ","Titel: " },
 { "Journal from: ","Journal vom: " },
 { "Journal: %1 from ","Journal: %1 vom " },
 { "<b>Click here to edit categories: </b>","<b>Klicke hier um Kategorien zu ändern: </b>" },
 { "Selected Item","Ausgewähltes Item" },
 { "Select Date...","Wähle Datum..." },
 { "After importing/loading/syncing there may be new categories in events or todos which are not added automatically to the category list. Please choose what to do <b>now</b>:","Nach dem Importieren/Laden/Syncen kann es neue Kategorien in den Terminen oder Todos geben, die nicht automatisch der Kategorieliste hinzugefügt werden. Bitte wählen Sie, was <b>jetzt</b> passieren soll:" },
 { "Change category list now!","Ändere Kategorieliste jetzt!" },
 { "Edit category list...","Ändere Kategorieliste..." },
 { "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" },
 { "Filepath: ","Dateipfad: " },
 { "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" },
 { "<b>WARNING:</b> There is a pending suspended alarm!","<b>WARNUNG:</b> Es gibt einen laufenden Suspendalarm!" },
 { "Pending Suspend Alarm","Laufender Suspend Alarm" },
 { "Error loading calendar %1","Fehler beim Laden von Kalender %1" },
 { "Calendar(s) not loaded:","Nicht geladene(r) Kalender:" },
 { "Loding of calendar(s) failed","Laden von Kalendern fehlgeschlagen" },
-{ "","" },
-{ "","" },
+{ "Alarm Options","Alarm Einstellungen" },
+{ "Delete selected...","Lösche Ausgewählte..." },
+{ "None","Nichts" },
+{ "Selection","Auswahl" },
+{ "Set categories","Setze Kategorien" },
+{ "This adds the selected\nitems to the calendar\n%1\nand removes them from\ntheir current calendar!","Das fügt die ausgewählten\nEinträge dem Kalender\n%1\nhinzu und entfernt sie von\nihrem aktuellen Kalender!" },
+{ "Reset","Neu setzen" },
+{ "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
\ No newline at end of file
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index e5e3704..4c815d8 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -197,530 +197,470 @@ bool ListItemVisitor::visit(Todo *t)
     mItem->setText(11, KOPrefs::instance()->calName( t->calID() ));
 
     QString key;
     QDate d;
     if (t->hasDueDate()) {
         d = t->dtDue().date();
         QTime tm = t->doesFloat() ? QTime(0,0) : t->dtDue().time();
         key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute());
         mItem->setSortKey(7,key);
     }
     if ( t->hasStartDate() ) {
         d = t->dtStart().date();
         QTime tm = t->doesFloat() ? QTime(0,0) : t->dtStart().time();
         key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute());
         mItem->setSortKey(1,key);
     }
     return true;
 }
 
 bool ListItemVisitor::visit(Journal * j)
 { 
     
     QString des;
     if ( !j->summary().isEmpty() ) {
         des = j->summary();
     } else {
         des = j->description().left(30);
         des = des.simplifyWhiteSpace ();
         des.replace (QRegExp ("\\n"),"" );
         des.replace (QRegExp ("\\r"),"" );
     }
     mItem->setText(0,i18n("Journal: ")+des.left(25));
     mItem->setText(1,j->dtStartDateStr());
     mItem->setText(2,"---");
     mItem->setText(3,"---");
     mItem->setText(4,"---");
     mItem->setText(5,"---");
     mItem->setText(6,"---");
     mItem->setText(7,j->dtStartDateStr());
     mItem->setText(8,"---");
     mItem->setText(9,"---");
     mItem->setText(10,j->categoriesStr());
     mItem->setText(11, KOPrefs::instance()->calName( j->calID() ));
 
     QString key;
     QDate d = j->dtStart().date();
     key.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
     mItem->setSortKey(1,key);
     mItem->setSortKey(7,key);
 
     return true;
 }
 
 KOListView::KOListView(Calendar *calendar, QWidget *parent,
                        const char *name)
     : KOEventView(calendar, parent, name)
 {
     
     mActiveItem = 0;
     mForceShowCompletedTodos = false;
     mListView = new KOListViewListView(this);
     mListView->addColumn(i18n("Summary"));
     mListView->addColumn(i18n("Start Date"));
     mListView->addColumn(i18n("Start Time"));
     mListView->addColumn(i18n("End Date"));
     mListView->addColumn(i18n("End Time"));
     mListView->addColumn(i18n("Alarm")); // alarm set?
     mListView->addColumn(i18n("Recurs")); // recurs?
     mListView->addColumn(i18n("Due Date"));
     mListView->addColumn(i18n("Due Time"));
     mListView->addColumn(i18n("Cancelled"));
     mListView->addColumn(i18n("Categories"));
     mListView->addColumn(i18n("Calendar"));
 
     mListView->setColumnAlignment(0,AlignLeft);
     mListView->setColumnAlignment(1,AlignLeft);
     mListView->setColumnAlignment(2,AlignHCenter);
     mListView->setColumnAlignment(3,AlignLeft);
     mListView->setColumnAlignment(4,AlignHCenter);
     mListView->setColumnAlignment(5,AlignLeft);
     mListView->setColumnAlignment(6,AlignLeft);
     mListView->setColumnAlignment(7,AlignLeft);
     mListView->setColumnAlignment(8,AlignLeft);
     mListView->setColumnAlignment(9,AlignLeft);
     mListView->setColumnAlignment(10,AlignLeft);
     mListView->setColumnAlignment(11,AlignLeft);
     mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this);
 
     int iii = 0;
     for ( iii = 0; iii< 12 ; ++iii )
         mListView->setColumnWidthMode( iii, QListView::Manual );
 
     QBoxLayout *layoutTop = new QVBoxLayout(this);
     layoutTop->addWidget(mListView);
     mListView->setFont ( KOPrefs::instance()->mListViewFont );
     mPopupMenu = eventPopup();
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
-                                  i18n("Select all"),this,
-                                  SLOT(allSelection()),true);
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
-                                  i18n("Deselect all"),this,
-                                  SLOT(clearSelection()),true);
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
-                                  i18n("Delete all selected"),this,
-                                  SLOT(deleteAll()),true);
-
+    QPopupMenu* selPopup = new QPopupMenu ( this );
+    mPopupMenu->insertSeparator();
+    
+    selPopup->insertItem(i18n("All"),this,
+                                  SLOT(allSelection()));
+    selPopup->insertItem(i18n("None"),this,
+                                  SLOT(clearSelection()));
+    selPopup->insertItem(i18n("Delete selected..."),this,
+                                  SLOT(deleteAll()));
+    mPopupMenu->insertItem(i18n("Selection"), selPopup );
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Hide all selected"),this,
                                   SLOT(hideAll()),true);
 
     mPopupMenu->insertSeparator();
 #ifdef DESKTOP_VERSION
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Print complete list"),this,
                                   SLOT(printList()),true);
     mPopupMenu->insertSeparator();
 #endif
     mCalPopup = new QPopupMenu ( this );
     mPopupMenu->insertItem( i18n("Set Calendar"),  mCalPopup );
 
+    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
+                                  i18n("Set categories")+"...",this,
+                                  SLOT(setCat()),true);
+    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
+                                  i18n("Set alarm..."),this,
+                                  SLOT(setAlarm()),true); 
     QObject::connect(mCalPopup,SIGNAL(aboutToShow()),this,
                      SLOT( populateCalPopup() ));
     QObject::connect(mCalPopup,SIGNAL(activated( int )),this,
                      SLOT( setCalendar( int ) ));
     QPopupMenu * exportPO = new QPopupMenu ( this );
-    mPopupMenu->insertItem( i18n("Export selected"),  exportPO );
+    mPopupMenu->insertItem( i18n("Export"),  exportPO );
     exportPO->insertItem( i18n("As iCal (ics) file..."),this,
                                   SLOT(saveToFile()));
     exportPO->insertItem( i18n("As vCal (vcs) file..."),this,
                                   SLOT(saveToFileVCS()));
     exportPO->insertItem( i18n("Journal/Details..."),this,
                                   SLOT(saveDescriptionToFile()));
     // mPopupMenu->insertSeparator();
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
-                                  i18n("Add Categ. to selected..."),this,
-                                  SLOT(addCat()),true);
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
-                                  i18n("Set Categ. for selected..."),this,
-                                  SLOT(setCat()),true);
+    // mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
+    //                            i18n("Add Categ. to selected..."),this,
+    //                            SLOT(addCat()),true);
     //mPopupMenu->insertSeparator();
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
-                                  i18n("Set alarm for selected..."),this,
-                                  SLOT(setAlarm()),true);
-
-
-    
 #ifndef DESKTOP_VERSION
     mPopupMenu->insertSeparator();
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
-                                  i18n("Beam selected via IR"),this,
+                                  i18n("Beam via IR"),this,
                                   SLOT(beamSelected()),true);
 #endif
     /*
       mPopupMenu = new QPopupMenu;
       mPopupMenu->insertItem(i18n("Edit Event"), this,
       SLOT (editEvent()));
       mPopupMenu->insertItem(SmallIcon("delete"), i18n("Delete Event"), this,
       SLOT (deleteEvent()));
       mPopupMenu->insertSeparator();
       mPopupMenu->insertItem(i18n("Show Dates"), this,
       SLOT(showDates()));
       mPopupMenu->insertItem(i18n("Hide Dates"), this,
       SLOT(hideDates()));
     */
     QObject::connect(mListView,SIGNAL( newEvent()),
                      this,SIGNAL(signalNewEvent()));
     QObject::connect(mListView,SIGNAL(doubleClicked(QListViewItem *)),
                      this,SLOT(defaultItemAction(QListViewItem *)));
     QObject::connect(mListView,SIGNAL(rightButtonPressed( QListViewItem *,
                                                            const QPoint &, int )),
                      this,SLOT(popupMenu(QListViewItem *,const QPoint &,int)));
     QObject::connect(mListView,SIGNAL(currentChanged(QListViewItem *)),
                      SLOT(processSelectionChange(QListViewItem *)));
     QObject::connect(mListView,SIGNAL(showIncidence(Incidence *)),
                      SIGNAL(showIncidenceSignal(Incidence *)) );
 
     readSettings(KOGlobals::config(),"KOListView Layout");
 }
 
 KOListView::~KOListView()
 {
     delete mPopupMenu;
 #if QT_VERSION >= 0x030000
 
 #else
     delete mKOListViewWhatsThis;
 #endif 
 }
 
 QString KOListView::getWhatsThisText(QPoint p)
 {
     KOListViewItem* item = ( KOListViewItem* ) mListView->itemAt( p );
     if ( item )
         return KIncidenceFormatter::instance()->getFormattedText( item->data(),
                                                                   KOPrefs::instance()->mWTshowDetails,
                                                                   KOPrefs::instance()->mWTshowCreated,
                                                                   KOPrefs::instance()->mWTshowChanged);
     return i18n("That is the list view" );
 
 }
 
 void KOListView::setCalendar( int c )
 {
     int result = QMessageBox::warning( this, i18n("KO/Pi: Information!"),
                                        i18n("This adds the selected\nitems to the calendar\n%1\nand removes them from\ntheir current calendar!").arg( KOPrefs::instance()->calName( c ) ),
                                        i18n("Continue"), i18n("Cancel"), 0,
                                        0, 1 );
     if ( result != 0 ) {
         return;
     }
     
     QPtrList<Incidence> delSel = getSelectedIncidences() ;
     int icount = delSel.count();
     if ( icount ) {
         Incidence *incidence = delSel.first();
         while ( incidence ) {
             incidence->setCalID( c );
             KOListViewItem * item = getItemForEvent( incidence );
             if ( item ) {
                 ListItemVisitor v(item, mStartDate );
                 incidence->accept(v);
             }
             incidence = delSel.next();
         }
     }
     QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
     while ( cal ) {
         mCalendar->setCalendarEnabled( cal->mCalNumber,cal->isEnabled );
         mCalendar->setAlarmEnabled( cal->mCalNumber, cal->isAlarmEnabled );
         mCalendar->setReadOnly( cal->mCalNumber, cal->isReadOnly );
         if ( cal->isStandard )
             mCalendar->setDefaultCalendar( cal->mCalNumber );
         cal = calendars.next();
     }
     mCalendar->setSyncEventsReadOnly();
     mCalendar->reInitAlarmSettings();
 
 }
 void KOListView::populateCalPopup()
 {
     mCalPopup->clear();
     KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
     while ( kkf ) {
-        int index = mCalPopup->insertItem( kkf->mName, kkf->mCalNumber);
+        int index = mCalPopup->insertItem( kkf->mName+"...", kkf->mCalNumber);
         if ( kkf->mErrorOnLoad || kkf->isReadOnly )
         mCalPopup->setItemEnabled( index, false );
         kkf = KOPrefs::instance()->mCalendars.next();
     }
 }
 void KOListView::updateList()
 {
     // qDebug(" KOListView::updateList() ");
 
 }
 
 void KOListView::clearList()
 {
     clear ();
 }
-void KOListView::addCat( )
-{
-    setCategories( false );
-}
+
 void KOListView::setCat()
 {
-    setCategories( true );
+
+    bool set = true;
+    int result = KMessageBox::warningYesNoCancel(this, 
+                                                 i18n("Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?"),
+                                                 i18n("Set categories"),
+                                                 i18n("Add"),
+                                                 i18n("Reset"));
+    if (result == KMessageBox::Cancel) return;
+    if (result == KMessageBox::Yes) set = false;
+    setCategories( set );
 }
 
 void  KOListView::setAlarm()
 {
     KOAlarmPrefs kap( this);
     if ( !kap.exec() )
         return;
-    QStringList itemList;
     QPtrList<KOListViewItem> sel ;
     QListViewItem *qitem  = mListView->firstChild ();
     while ( qitem ) {
         if ( qitem->isSelected() ) {
             Incidence* inc = ((KOListViewItem *) qitem)->data();
             if ( inc->typeID() != journalID ) {
                 if ( inc->typeID() == todoID ) {
                     if ( ((Todo*)inc)->hasDueDate() )
                       sel.append(((KOListViewItem *)qitem));
                 } else
                       sel.append(((KOListViewItem *)qitem));
             }
         }
         qitem = qitem->nextSibling();
     }
     int count = 0;
     KOListViewItem * item, *temp;
     item = sel.first();
     Incidence* inc;
     while ( item ) {
         inc = item->data();
             ++count;
             if (kap.mAlarmButton->isChecked()) {
                 if (inc->alarms().count() == 0) 
                     inc->newAlarm();
                 QPtrList<Alarm> alarms = inc->alarms();
                 Alarm *alarm;
                 for (alarm = alarms.first(); alarm; alarm = alarms.next() ) {
                     alarm->setEnabled(true);
                     int j = kap.mAlarmTimeEdit->value()* -60;
                     if (kap.mAlarmIncrCombo->currentItem() == 1)
                         j = j * 60;
                     else if (kap.mAlarmIncrCombo->currentItem() == 2)
                         j = j * (60 * 24);
                     alarm->setStartOffset( j );
 
                     if (!kap.mAlarmProgram.isEmpty() && kap.mAlarmProgramButton->isOn()) {
                         alarm->setProcedureAlarm(kap.mAlarmProgram);
                     }
                     else if (!kap.mAlarmSound.isEmpty() && kap.mAlarmSoundButton->isOn())
                         alarm->setAudioAlarm(kap.mAlarmSound);
                     else
                         alarm->setType(Alarm::Invalid);
                     //alarm->setAudioAlarm("default");
                     // TODO: Deal with multiple alarms
                     break; // For now, stop after the first alarm
                 }
             } else {
                 Alarm* alarm = inc->alarms().first();
                 if ( alarm ) {
                     alarm->setEnabled(false);
                     alarm->setType(Alarm::Invalid);
                 }
             }
             ListItemVisitor v(item, mStartDate );
             inc->accept(v);
             item = sel.next();
     }
     topLevelWidget()->setCaption( i18n("Changed alarm for %1 items").arg( count )  );
     qDebug("KO: Set alarm for %d items", count);
     calendar()->reInitAlarmSettings();
     QTimer::singleShot( 1, this, SLOT ( resetFocus() ) );
 }
 void KOListView::setCategories( bool removeOld )
 {
    
     KPIM::CategorySelectDialog* csd = new KPIM::CategorySelectDialog( KOPrefs::instance(), 0 );
     csd->setColorEnabled();
     if (! csd->exec()) { 
         delete csd;
         return;
     }
     QStringList catList = csd->selectedCategories();
     delete csd;
-    // if ( catList.count() == 0 )
-    //   return;
-    //catList.sort();
-    QString categoriesStr = catList.join(",");
-    int i;
-    QStringList itemList;
-    QPtrList<KOListViewItem> sel ;
-    QListViewItem *qitem  = mListView->firstChild ();
-    while ( qitem ) {
-        if ( qitem->isSelected() ) {
-            sel.append(((KOListViewItem *)qitem));
-        }
-        qitem = qitem->nextSibling();
-    }
-    KOListViewItem * item, *temp;
-    item = sel.first();
-    if( item ) {
-        Incidence* inc = item->data() ;
-        bool setSub = false;
-        if( inc->typeID() == todoID && sel.count() == 1 &&  inc->relations().count() > 0 ) {
-            int result = KMessageBox::warningYesNoCancel(this, 
-                                                         i18n("The todo\n%1\nhas subtodos!\nDo you want to set\nthe categories for\nall subtodos as well?").arg( inc->summary().left ( 25 ) ),
-                                                         i18n("Todo has subtodos"),
-                                                         i18n("Yes"),
-                                                         i18n("No"));
-            if (result == KMessageBox::Cancel) item = 0;
-            if (result == KMessageBox::Yes) setSub = true;
-        }
-        while ( item ) {
-            inc = item->data();
-            if ( removeOld ) {
-                inc->setCategories( catList, setSub );
-            } else {
-                inc->addCategories( catList, setSub );
-            } 
+    QPtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;
+    Incidence* inc = delSel.first();
+    while ( inc ) {
+        if ( removeOld ) {
+            inc->setCategories( catList, false );
+        } else {
+            inc->addCategories( catList, false );
+        } 
+        KOListViewItem* item = getItemForEvent(inc);
+        if (item) { 
             ListItemVisitor v(item, mStartDate );
             inc->accept(v);
-            item = sel.next();
         }
+        inc = delSel.next();
     }
     QTimer::singleShot( 1, this, SLOT ( resetFocus() ) );
 }
 
 void KOListView::beamSelected()
 {
     QPtrList<Incidence> delSel = getSelectedIncidences() ;
-    int icount = delSel.count();
-    if ( icount ) {
+    if ( delSel.count() )
         emit beamIncidenceList( delSel );
-        return;
-        QString fn ;
-        fn = QDir::homeDirPath()+"/kopitempbeamfile.vcs";
-        QString mes;
-        bool createbup = true;
-        if ( createbup ) {
-            QString description = "\n";
-            CalendarLocal* cal = new CalendarLocal();
-            cal->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
-            Incidence *incidence = delSel.first();
-            while ( incidence ) {
-                Incidence *in = incidence->clone();
-                description += in->summary() + "\n";
-                cal->addIncidence( in );
-                incidence = delSel.next();
-            }
-            FileStorage storage( cal, fn, new VCalFormat );
-            storage.save();
-            delete cal;
-            mes = i18n("KO/Pi: Ready for beaming");
-            topLevelWidget()->setCaption(mes); 
-
-#ifndef DESKTOP_VERSION
-            Ir *ir = new Ir( this ); 
-            connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
-            ir->send( fn, description, "text/x-vCalendar" );
-#endif
-        }
-    }
-}
-void KOListView::beamDone( Ir *ir )
-{
-#ifndef DESKTOP_VERSION
-    delete ir;
-#endif
-    topLevelWidget()->setCaption(i18n("KO/Pi:Beaming done")); 
 }
 
 void KOListView::saveDescriptionToFile()
 {
 
     int result = QMessageBox::warning( this, i18n("KO/Pi: Information!"),
                                        i18n("This saves the text/details of selected\nJournals and Events/Todos\nto a text file."),
                                        i18n("Continue"), i18n("Cancel"), 0,
                                        0, 1 );
     if ( result != 0 ) {
         return;
     }
     QPtrList<Incidence> delSel = getSelectedIncidences() ;
     int icount = delSel.count();
     if ( icount ) {
         QString fn =  KOPrefs::instance()->mLastSaveFile;
         fn =  KFileDialog::getSaveFileName( fn, i18n("Save filename"), this );
     
         if ( fn == "" )
             return;
         QFileInfo info;
         info.setFile( fn );
         QString mes;
         bool createbup = true;
         if ( info. exists() ) { 
             mes =  i18n("File already exists!\nOld file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false )  );
             int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes,
                                                i18n("Overwrite!"), i18n("Cancel"), 0,
                                                0, 1 );
             if ( result != 0 ) {
                 createbup = false;
             }
         }
         if ( createbup ) {
             QString text = i18n("KO/Pi Description/Journal save file.\nSave date: ") + 
                 KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), false);
             Incidence *incidence = delSel.first();
             icount = 0;
             while ( incidence ) {
                 if ( incidence->typeID()  == journalID ) {
                     text += "\n************************************\n";
                     if ( !incidence->summary().isEmpty() )
                         text += i18n("Journal: %1 from ").arg( incidence->summary() )  +incidence->dtStartDateStr( false );
                     else
                         text += i18n("Journal from: ") +incidence->dtStartDateStr( false );
                     if ( !incidence->location().isEmpty() )
                         text +="\n(" +  i18n("Location: ") + incidence->location()+ ")";
                     text +="\n" +  i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false);
                     text +="\n" +  i18n("Description: ") + "\n"+ incidence->description();
                     ++icount;
 
                 } else {
                     if ( !incidence->description().isEmpty() ) {
                         text += "\n************************************\n";
                         if ( incidence->typeID()  == todoID )
                             text += i18n("To-Do: ");
                         text += incidence->summary();
                         if ( !incidence->location().isEmpty() )
                             text +="\n(" +  i18n("Location: ") + incidence->location()+ ")";
                         if ( incidence->hasStartDate() )
                             text +="\n"+ i18n("Start Date: ") + incidence->dtStartStr( false );
                         text +="\n"+ i18n("Last modified: ") +KGlobal::locale()->formatDateTime(incidence->lastModified(), false);
                         text += "\n" + i18n("Description: ") + "\n" + incidence->description();
                         ++icount;
 
                     }
                 }
                 incidence = delSel.next();
             }
             QFile file( fn );
             if (!file.open( IO_WriteOnly ) ) {
                 topLevelWidget()->setCaption(i18n("File open error - nothing saved!") ); 
                 return;
             }  
             QTextStream ts( &file );
             ts << text;
             file.close();
             //qDebug("%s ", text.latin1());
             mes = i18n("KO/Pi:Saved %1 descriptions/journals").arg(icount );
             KOPrefs::instance()->mLastSaveFile = fn;
             topLevelWidget()->setCaption(mes); 
         }
     }
 }
 void KOListView::saveToFileVCS()
 {
     writeToFile( false );
 }
 void KOListView::saveToFile()
 {
     writeToFile( true );
 }
 QPtrList<Incidence> KOListView::getSelectedIncidences( bool includeEvents, bool includeTodos, bool includeJournals, bool onlyDueTodos )
 {
     QPtrList<Incidence> delSel ;
     bool addSubTodos = false;
@@ -1013,195 +953,194 @@ void KOListView::showDates(const QDate &start, const QDate &end)
     clear();
     mStartDate = start;
     QDate date = start;
     while( date <= end ) {
         addEvents(calendar()->events(date));
         addTodos(calendar()->todos(date));
         addJournals( calendar()->journals4Date(date)  );
         date = date.addDays( 1 );
     }
     emit incidenceSelected( 0 );
     updateView();
   
 }
 
 void KOListView::addEvents(QPtrList<Event> eventList)
 {
  
     Event *ev;
     for(ev = eventList.first(); ev; ev = eventList.next()) {
         addIncidence(ev);
     }
     if ( !mListView->currentItem() ){
         updateView();
     }
 }
 
 void KOListView::addTodos(QPtrList<Todo> eventList)
 {
     Todo *ev;
     for(ev = eventList.first(); ev; ev = eventList.next()) {
         addIncidence(ev);
     }
     if ( !mListView->currentItem() ){
         updateView();
     }
 }
 void KOListView::addJournals(QPtrList<Journal> eventList)
 {
     Journal *ev;
     for(ev = eventList.first(); ev; ev = eventList.next()) {
         addIncidence(ev);
     }  
     if ( !mListView->currentItem() ){
         updateView();
     }
 }
 
 void KOListView::showCompletedTodos()
 {
     mForceShowCompletedTodos = true;
 }
 void KOListView::addIncidence(Incidence *incidence)
 {
     if ( mUidDict.find( incidence->uid() ) ) return;
   
     // mListView->setFont ( KOPrefs::instance()->mListViewFont );
     if ( incidence->typeID() == todoID ) {
         if ( ! mForceShowCompletedTodos ) {
             if ( !KOPrefs::instance()->mShowCompletedTodo && ((Todo*)incidence)->isCompleted() )
                 return;
         }
     }
     mUidDict.insert( incidence->uid(), incidence );
     KOListViewItem *item = new KOListViewItem( incidence, mListView ); 
     ListItemVisitor v(item, mStartDate );
     if (incidence->accept(v)) {
         return;
     }
     else delete item;
 }
 
 void KOListView::showEvents(QPtrList<Event> eventList)
 {
     clear();
 
     addEvents(eventList);
 
     // After new creation of list view no events are selected.
     emit incidenceSelected( 0 );
 }
 int KOListView::count()
 {
     return mListView->childCount();
 }
 
 void KOListView::changeEventDisplay(Event *event, int action)
 {
     KOListViewItem *item;
 
     switch(action) {
     case KOGlobals::EVENTADDED:
         addIncidence( event );
         break;
     case KOGlobals::EVENTEDITED:
         item = getItemForEvent(event);
         if (item) { 
-            mUidDict.remove( event->uid() ); 
-            delete item;
-            addIncidence( event );
+            ListItemVisitor v(item, mStartDate );
+            ((Incidence*)event)->accept(v);
         }
         break;
     case KOGlobals::EVENTDELETED:
         item = getItemForEvent(event);
         if (item) {
             mUidDict.remove( event->uid() ); 
             delete item;
         }
         break;
     default:
         ;
     }
 }
 
 KOListViewItem *KOListView::getItemForEvent(Incidence *event)
 {
     KOListViewItem *item = (KOListViewItem *)mListView->firstChild();
     while (item) {
         if (item->data() == event) return item;
         item = (KOListViewItem *)item->nextSibling();
     }
     return 0;
 }
 
 void KOListView::defaultItemAction(QListViewItem *i)
 {
     KOListViewItem *item = static_cast<KOListViewItem *>( i );
     if ( item ) defaultAction( item->data() );
       
 }
 
 void KOListView::popupMenu(QListViewItem *item,const QPoint &,int)
 {
     mActiveItem = (KOListViewItem *)item;
     if (mActiveItem) {
         Incidence *incidence = mActiveItem->data();
         mPopupMenu->enableDefault( !mListView->hasMultiSelection( item ) );
         mPopupMenu->showIncidencePopup(incidence);
 
         /*
           if ( incidence && incidence->type() == "Event" ) {
           Event *event = static_cast<Event *>( incidence );
           mPopupMenu->showEventPopup(event);
           }
         */
     }
 }
 
 void KOListView::readSettings(KConfig *config, QString setting)
 {
     //  qDebug("KOListView::readSettings ");
     mListView->restoreLayout(config,setting);
 }
 
 void KOListView::writeSettings(KConfig *config, QString setting)
 {
     // qDebug("KOListView::writeSettings ");
     mListView->saveLayout(config, setting);
 }
 
 void KOListView::processSelectionChange(QListViewItem *)
 {
   
     KOListViewItem *item =
         static_cast<KOListViewItem *>( mListView->currentItem() );
 
     if ( !item ) {
         emit incidenceSelected( 0 );
     } else {
         emit incidenceSelected( item->data() );
     }
 }
 
 void KOListView::clearSelection()
 {
     mListView->selectAll( false );
 }
 void KOListView::allSelection()
 {
     mListView->selectAll( true );
 }
 
 void KOListView::clear()
 {
     mListView->clear();
     mUidDict.clear();
 }
 
 Incidence* KOListView::currentItem()
 {
     if ( mListView->currentItem()  )
         return ((KOListViewItem*) mListView->currentItem())->data();
     return 0;
 }
 void KOListView::keyPressEvent ( QKeyEvent *e) 
 {
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index bcef0f0..a54b550 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -1,133 +1,128 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 1999 Preston Brown
     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 _KOLISTVIEW_H
 #define _KOLISTVIEW_H
 
 #include <qlistview.h>
 #include <qmap.h>
 #include <qdict.h>
 
 #include <klistview.h>
 
-#ifndef DESKTOP_VERSION
-#include <qtopia/ir.h> 
-#else
-#define Ir char
-#endif
 #include <libkcal/incidence.h>
 
 #include "koeventview.h"
 #include "customlistviewitem.h"
 
 using namespace KCal;
 
 class KOListViewWhatsThis;
 
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qdialog.h>
 #include <qtimer.h>
 #include <qcombobox.h>
 #include <qspinbox.h>
 #include <qtooltip.h>
 #include <qcheckbox.h>
 #include <qhbox.h>
 #include <qlabel.h>
 #include <kiconloader.h>
 #include "kfiledialog.h"
 #include "koprefs.h"
 class KOAlarmPrefs : public QDialog
 {
  Q_OBJECT
   public:
     KOAlarmPrefs( QWidget *par=0, const char *name=0 ) :
       QDialog( par, name, true ) 
     {
         setCaption( i18n("Alarm Options") );
         QVBoxLayout* alarmLayout = new QVBoxLayout( this );
         alarmLayout->setSpacing( 3 );
         alarmLayout->setMargin( 3 );
         QWidget *parent = this;
         mAlarmButton = new QCheckBox(i18n("Set reminder ON with offset to:"),parent);
         alarmLayout->addWidget(mAlarmButton);
         mAlarmTimeEdit = new QSpinBox ( 0, 9999, 1, parent, "mAlarmTimeEdit  "  ) ;
         mAlarmTimeEdit->setValue( 15 );
         alarmLayout->addWidget(mAlarmTimeEdit);
         mAlarmIncrCombo = new QComboBox(false, parent);
         mAlarmIncrCombo->insertItem(i18n("minute(s)"));
         mAlarmIncrCombo->insertItem(i18n("hour(s)"));
         mAlarmIncrCombo->insertItem(i18n("day(s)"));
         alarmLayout->addWidget(mAlarmIncrCombo);
         QHBox * hb = new QHBox ( parent );
         alarmLayout->addWidget(hb);
         mAlarmSoundButton = new QPushButton(hb);
         mAlarmSoundButton->setPixmap(SmallIcon("playsound"));
         mAlarmSoundButton->setToggleButton(true);
         connect(mAlarmSoundButton, SIGNAL(clicked()), SLOT(pickAlarmSound()));
         mAlarmProgramButton = new QPushButton(hb);
         mAlarmProgramButton->setPixmap(SmallIcon("run"));
         mAlarmProgramButton->setToggleButton(true);
         connect(mAlarmProgramButton, SIGNAL(clicked()), SLOT(pickAlarmProgram()));
         mAlarmSoundButton->setMaximumWidth( mAlarmSoundButton->sizeHint().width() + 4 );
         mAlarmProgramButton->setMaximumWidth(mAlarmProgramButton->sizeHint().width() + 4 ); 
         mAlarmLabel = new QLabel( this );
         alarmLayout->addWidget( mAlarmLabel );
         mAlarmLabel->setText( "..."+KOPrefs::instance()->mDefaultAlarmFile.right( 30 )  );
         mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile;
         mAlarmSoundButton->setOn( true );
         QPushButton * ok = new QPushButton( i18n("Set Alarm!"), this );
         alarmLayout->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         alarmLayout->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
         resize( 200, 200 );
      
     }   
 
 
 
     QString mAlarmSound, mAlarmProgram ;
     QCheckBox* mAlarmButton;
     QSpinBox* mAlarmTimeEdit;
     QLabel* mAlarmLabel;
     QComboBox* mAlarmIncrCombo ;
     QPushButton* mAlarmSoundButton ,*mAlarmProgramButton;
 private slots:
 
 void pickAlarmSound()
 {
     //QString prefix = mAlarmSound;
     if (!mAlarmSoundButton->isOn()) {
         //mAlarmSound = "";
         QToolTip::remove(mAlarmSoundButton);
         QToolTip::add(mAlarmSoundButton, i18n("No sound set"));
         mAlarmProgramButton->setOn(true);
         mAlarmSoundButton->setOn(false);
     } else {
         QString fileName(KFileDialog::getOpenFileName(mAlarmSound,
                                                       i18n("*.wav|Wav Files"), 0));
         if (!fileName.isEmpty()) {
             mAlarmSound = fileName;
             mAlarmLabel->setText( "..."+fileName.right( 30 )  ); 
@@ -186,138 +181,136 @@ typedef CustomListViewItem<Incidence *> KOListViewItem;
 class ListItemVisitor : public Incidence::Visitor
 {
   public:
     ListItemVisitor(KOListViewItem *, QDate d);
     ~ListItemVisitor();
     
     bool visit(Event *);
     bool visit(Todo *);
     bool visit(Journal *);
 
   private:
     KOListViewItem *mItem;
     QDate mDate;
 };
 
 /**
   This class provides a multi-column list view of events.  It can
   display events from one particular day or several days, it doesn't 
   matter.  To use a view that only handles one day at a time, use
   KODayListView.
 
   @short multi-column list view of various events.
   @author Preston Brown <pbrown@kde.org>
   @see KOBaseView, KODayListView
 */
 class KOListView;
 
 class KOListViewListView : public KListView
 {  
    Q_OBJECT
  public:
     KOListViewListView(KOListView * lv );
     bool hasMultiSelection(QListViewItem*);
     void printList();
  signals:
     void newEvent();
     void showIncidence( Incidence* );
   public slots:
     void popupMenu();
  private: 
     QPoint mEventPos;
     QPoint mEventGlobalPos;
     QTimer* mPopupTimer;
     int mYMousePos;
     void keyPressEvent ( QKeyEvent * ) ;
     void contentsMouseDoubleClickEvent(QMouseEvent *e);
     void contentsMousePressEvent(QMouseEvent *e);
     void contentsMouseReleaseEvent(QMouseEvent *e);
     void contentsMouseMoveEvent(QMouseEvent *e);
     bool mMouseDown;
 };
 
 class KOListView : public KOEventView
 {
     Q_OBJECT
   public:
     KOListView(Calendar *calendar, QWidget *parent = 0, 
                const char *name = 0);
     ~KOListView();
 
     virtual int maxDatesHint();
     virtual int currentDateCount();
     virtual QPtrList<Incidence> selectedIncidences();
     virtual DateList selectedDates();
     
     void showDates(bool show);
     Incidence* currentItem();
     void addTodos(QPtrList<Todo> eventList);
     void addJournals(QPtrList<Journal> eventList);
     virtual void printPreview(CalPrinter *calPrinter,
                               const QDate &, const QDate &);
     
     void readSettings(KConfig *config, QString setting = "KOListView Layout");
     void writeSettings(KConfig *config, QString setting = "KOListView Layout");
     void updateList();
     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 );
     void showCompletedTodos();
  signals:
     void signalNewEvent();
     void beamIncidenceList(QPtrList<Incidence>);
 
   public slots:
     void hideAll();
     void printList();
     void resetFocus();
     virtual void updateView();
     virtual void showDates(const QDate &start, const QDate &end);
     virtual void showEvents(QPtrList<Event> eventList);
     void clearSelection();
     void allSelection();
 
     void clear();
-    void beamDone( Ir *ir );
     void showDates();
     void hideDates();
     void deleteAll();
     void saveToFile();
     void saveToFileVCS();
     void saveDescriptionToFile();
     void beamSelected();
     void updateConfig();
-    void addCat();
     void setCat();
     void setAlarm();
     void setCategories( bool removeOld );
     void changeEventDisplay(Event *, int);
   
     void defaultItemAction(QListViewItem *item);
     void popupMenu(QListViewItem *item,const QPoint &,int);
     void setCalendar( int c );
     void populateCalPopup();
 
   protected slots:
     void processSelectionChange(QListViewItem *);
 
   protected:
     void writeToFile( bool iCal );
     void addEvents(QPtrList<Event> eventList);
     void addIncidence(Incidence *);
     KOListViewItem *getItemForEvent(Incidence *event);
 
   private:
     bool mForceShowCompletedTodos;
     QPopupMenu* mCalPopup;
     KOListViewWhatsThis *mKOListViewWhatsThis;
     KOListViewListView *mListView;
     KOEventPopupMenu *mPopupMenu;
     KOListViewItem *mActiveItem;
     QDict<Incidence> mUidDict;
     QDate mStartDate;
     void keyPressEvent ( QKeyEvent * ) ;
 };
 
 #endif
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 02d7aae..6337ca5 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -136,193 +136,193 @@ KOPrefs::KOPrefs() :
   addItemBool("Enable Project View",&mEnableProjectView,false);
   addItemBool("Auto Save",&mAutoSave,false);
   addItemInt("Auto Save Interval",&mAutoSaveInterval,3);
   addItemBool("Confirm Deletes",&mConfirm,true);
   addItemString("Archive File",&mArchiveFile);
   addItemString("Html Export File",&mHtmlExportFile,
       QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html"));
   addItemBool("Html With Save",&mHtmlWithSave,false);
 
   KPrefs::setCurrentGroup("Personal Settings");
 
   addItemInt("Mail Client",&mMailClient,MailClientKMail);
   addItemBool("Use Control Center Email",&mEmailControlCenter,false);
   addItemBool("Bcc",&mBcc,false);
 
   KPrefs::setCurrentGroup("Time & Date");
 
 
   addItemInt("Default Start Time",&mStartTime,10);
   addItemInt("Default Duration",&mDefaultDuration,2);
   addItemInt("Default Alarm Time",&mAlarmTime,3);
   KPrefs::setCurrentGroup("AlarmSettings");
   addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20);
   addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7);
   addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5);
   addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3);
 
 
   KPrefs::setCurrentGroup("Calendar");
 
   addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar);
 
   KPrefs::setCurrentGroup("Fonts");
   // qDebug(" KPrefs::setCurrentGroup(Fonts); ");
   QFont fon = KGlobalSettings::generalFont();
   addItemFont("TimeBar Font",&mTimeBarFont,fon );
   addItemFont("MonthView Font",&mMonthViewFont,fon);
   addItemFont("AgendaView Font",&mAgendaViewFont,fon);
   addItemFont("MarcusBains Font",&mMarcusBainsFont,fon);
   addItemFont("TimeLabels Font",&mTimeLabelsFont,fon);
   addItemFont("TodoView Font",&mTodoViewFont,fon);
   addItemFont("ListView Font",&mListViewFont,fon);
   addItemFont("DateNavigator Font",&mDateNavigatorFont,fon);
   addItemFont("EditBox Font",&mEditBoxFont,fon);
   addItemFont("JournalView Font",&mJornalViewFont,fon);
   addItemFont("WhatsNextView Font",&mWhatsNextFont,fon);
   addItemFont("EventView Font",&mEventViewFont,fon);
 
   KPrefs::setCurrentGroup("RemoteSyncing");
   addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" );  
   addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" ); 
   addItemBool("ShowSyncEvents",&mShowSyncEvents,false); 
   addItemInt("LastSyncTime",&mLastSyncTime,0); 
 
 #ifdef _WIN32_
   QString hdp= locateLocal("data","korganizer")+"\\\\";
 #else
   QString hdp= locateLocal("data","korganizer")+"/";
 #endif
 
   KPrefs::setCurrentGroup("LoadSaveFileNames");
 
   addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" );
   addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" );
   addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" );
   addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" );
  
 
   KPrefs::setCurrentGroup("Locale");
   addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 
 
 
   KPrefs::setCurrentGroup("Colors");
   addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor);
   addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor);
   addItemColor("Event Color",&mEventColor,mDefaultCategoryColor);
   addItemColor("Todo done Color",&mTodoDoneColor,QColor(111,255,115) );
   addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor);
   addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor);
   addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor);
   addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor);
   addItemColor("Todo running Color",&mTodoRunColor,defaultTodoRunColor);
   addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 ));
   addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 ));
   addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 ));
   addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); 
   addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true);
   addItemBool("MonthViewWeek",&mMonthViewWeek,false);
   addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); 
   addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 ));
   addItemColor("AppColor2",&mAppColor2,QColor(  174,216,255 ));
   addItemBool("UseAppColors",&mUseAppColors,false); 
 
   
 
   KPrefs::setCurrentGroup("Views");
-  addItemBool("Block Popup Menu",&mBlockPopupMenu,true);
+  addItemBool("Block Popup Menu",&mBlockPopupMenu,false);
   addItemBool("Show Date Navigator",&mShowDateNavigator,true);
   addItemInt("Hour Size",&mHourSize,8);
   addItemBool("Show Daily Recurrences",&mDailyRecur,true);
   addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
   addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true);
   addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true);
   addItemBool("ShowShortMonthName",&mMonthShowShort,false);
   addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true);
   addItemBool("ShowTimesInMonthCell",&mMonthShowTimes,true);
 #ifdef DESKTOP_VERION
   addItemBool("Enable ToolTips",&mEnableToolTips,true);
 #else
   addItemBool("Enable ToolTips",&mEnableToolTips,false);
 #endif
   addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false);
   addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false);
   addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true);
   addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true);
   addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,true);
   addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false);
   addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false);
   addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true);
   addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true);
   addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);;
   addItemBool("WNViewShowsPast",&mWNViewShowsPast,true);
   addItemBool("WNViewShowLocation",&mWNViewShowLocation,false);
   addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false);
   addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true);
   addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false);
   addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false);
   addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,true);
   addItemBool("MonthViewUsesBigFont",&mMonthViewUsesBigFont,true);
   addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
   addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
 #ifdef DESKTOP_VERSION
   addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true);
 #else
   addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false);
 #endif
   addItemInt("Day Begins",&mDayBegins,7);
   addItemInt("Working Hours Start",&mWorkingHoursStart,8);
   addItemInt("Working Hours End",&mWorkingHoursEnd,17);
   addItemBool("Exclude Holidays",&mExcludeHolidays,true);
   addItemBool("Exclude Saturdays",&mExcludeSaturdays,true);
 
   addItemBool("Month View Uses Category Color",&mMonthViewUsesCategoryColor,false);
   addItemBool("Full View Month",&mFullViewMonth,true);
   addItemBool("Full View Todo",&mFullViewTodo,true);
   addItemBool("Quick Todo",&mEnableQuickTodo,false);
 
   addItemInt("Next X Days",&mNextXDays,3);
 
   KPrefs::setCurrentGroup("Printer");
 
   KPrefs::setCurrentGroup("Layout");
 
   addItemBool("CompactDialogs",&mCompactDialogs,false);
   addItemBool("VerticalScreen",&mVerticalScreen,true);
 
   KPrefs::setCurrentGroup("KOrganizer Plugins");
 
   addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays");
 
   KPrefs::setCurrentGroup("Group Scheduling");
 
   addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail);
   addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend);
   addItemStringList("AdditionalMails",&mAdditionalMails,"");
   addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto);
   addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto);
   addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto);
   addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto);
   addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto);
 
   KPrefs::setCurrentGroup( "Editors" );
 
   addItemStringList( "EventTemplates", &mEventTemplates );
   addItemStringList( "TodoTemplates", &mTodoTemplates );
 
   addItemInt("DestinationPolicy",&mDestination,standardDestination);
 
   KPrefs::setCurrentGroup( "ViewOptions" );
   addItemBool("EVshowDetails",&mEVshowDetails,true);
   addItemBool("EVshowCreated",&mEVshowCreated,true);
   addItemBool("EVshowChanged",&mEVshowChanged,true);
   addItemBool("WTshowDetails",&mWTshowDetails,false);
   addItemBool("WTshowCreated",&mWTshowCreated,false);
   addItemBool("WTshowChanged",&mWTshowChanged,false);
   mCalendars.setAutoDelete( true );
 }
 
 
 KOPrefs::~KOPrefs()
 {
   if (mInstance == this)
       mInstance = insd.setObject(0); 
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index bd191d8..792a7b8 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -362,192 +362,194 @@ void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView  )
     }
     emit signalAgendaView( mCurrentView == mAgendaView );
     //qDebug("raiseCurrentView ende ");
 
 }
 
 void KOViewManager::clearAllViews()
 {
 
     if ( mTodoView ) mTodoView->clearList();
     if ( mListView ) mListView->clearList();
 
     if ( mAgendaView ) mAgendaView->clearList();
     if ( mMonthView ) mMonthView->clearList();
     if ( mWhatsNextView ) mWhatsNextView->clearList();
     if ( mJournalView ) mJournalView->clearList();
 
 }
 void KOViewManager::updateView()
 {
     // qDebug("KOViewManager::updateView() ");
     // if we are updating mTodoView, we get endless recursion
     if ( mTodoView == mCurrentView )
         return;
     if ( mCurrentView ) mCurrentView->updateView();
 
 }
 
 void KOViewManager::updateView(const QDate &start, const QDate &end)
 {
     //  kdDebug() << "KOViewManager::updateView()" << endl;
 
     if (mCurrentView) mCurrentView->showDates(start, end);
 
     if (mTodoView && mTodoView == mCurrentView ) mTodoView->updateView();
 }
 
 
 void KOViewManager::updateWNview()
 {
     if ( mCurrentView == mWhatsNextView && mWhatsNextView )
         mWhatsNextView->updateView();
     if ( mCurrentView == mMonthView && mMonthView )
         mMonthView->updateView();
         
 }
 void KOViewManager::showWhatsNextView()
 {
     if (!mWhatsNextView) {
         mWhatsNextView = new KOWhatsNextView(mMainView->calendar(),mMainView->viewStack(),
                                              "KOViewManager::WhatsNextView");
         mWhatsNextView->setEventViewer( mMainView->getEventViewerDialog());
         connect(mMainView, SIGNAL(configChanged()), mWhatsNextView, SLOT(updateConfig()));
         addView(mWhatsNextView);
          connect(this, SIGNAL( printWNV() ),
              mWhatsNextView, SLOT( printMe() ) );
     }
     globalFlagBlockAgenda = 1;
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_WN_VIEW;
     showView(mWhatsNextView, true );
     //mWhatsNextView->updateView();
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_WN_VIEW;
 }
 
 void  KOViewManager::slotprintWNV()
 {
     if (!mWhatsNextView) 
         showWhatsNextView();
     emit  printWNV();
 
 }
 void KOViewManager::showListView()
 {
     if (!mListView) {
         mListView = new KOListView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::ListView");
         addView(mListView);
 
         connect(mListView, SIGNAL(showIncidenceSignal(Incidence *)),
                 mMainView, SLOT(showIncidence(Incidence *)));
         connect(mListView, SIGNAL(editIncidenceSignal(Incidence *)),
                 mMainView, SLOT(editIncidence(Incidence *)));
         connect(mListView, SIGNAL(deleteIncidenceSignal(Incidence *)),
                 mMainView, SLOT(deleteIncidence(Incidence *)));
         connect( mListView, SIGNAL( incidenceSelected( Incidence * ) ),
                  mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); 
         connect( mListView, SIGNAL( signalNewEvent() ),
                  mMainView, SLOT( newEvent() ) );
         connect(mMainView, SIGNAL(configChanged()), mListView, SLOT(updateConfig())); 
         connect( mListView, SIGNAL( cloneIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); 
         connect( mListView, SIGNAL( cancelIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); 
         connect( mListView, SIGNAL( moveIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( moveIncidence( Incidence * ) ) );
         connect( mListView, SIGNAL( beamIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( beamIncidence( Incidence * ) ) );
+        connect( mListView, SIGNAL( beamIncidenceList( QPtrList<Incidence>  ) ),
+                 mMainView, SLOT ( beamIncidenceList( QPtrList<Incidence>  ) ) );
     }
     // bool temp = mFlagShowNextxDays;
     //globalFlagBlockPainting = true;
     globalFlagBlockAgenda = 1;
     if ( KOPrefs::instance()->mListViewMonthTimespan ) {
         mMainView->setBlockShowDates( true );
         mMainView->dateNavigator()->selectMonth();
         mMainView->setBlockShowDates( false );
     }
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW;
     showView(mListView, KOPrefs::instance()->mFullViewTodo);
     //mFlagShowNextxDays = temp;
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_L_VIEW;
     mMainView->setScrollBarStep( 7 );
 }
 
 void KOViewManager::showAgendaView( bool fullScreen )
 {
 
     mMainView->dialogManager()->hideSearchDialog();
     // qDebug("KOViewManager::showAgendaView ");
     bool full;
     full = fullScreen;
     if (!mAgendaView) {
         full = false; 
         mAgendaView = new KOAgendaView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::AgendaView"); 
         addView(mAgendaView);
 #ifndef DESKTOP_VERSION
         QPEApplication::setStylusOperation( mAgendaView, QPEApplication::RightOnHold );
 #endif
         connect( mAgendaView, SIGNAL( incidenceChanged(Incidence  *, int )),
                  mMainView, SLOT( changeIncidenceDisplay( Incidence  *, int ) ));
 
         // SIGNALS/SLOTS FOR DAY/WEEK VIEW
 
         connect(mAgendaView,SIGNAL(showDateView( int, QDate )),SLOT(showDateView( int, QDate )));
 
         connect(mAgendaView,SIGNAL(newTodoSignal(QDateTime,bool)),
                 mMainView, SLOT(newTodoDateTime(QDateTime,bool)));
         connect(mAgendaView,SIGNAL(newEventSignal(QDateTime)),
                 mMainView, SLOT(newEvent(QDateTime)));
         connect(mAgendaView,SIGNAL(newEventSignal(QDateTime,QDateTime)),
              mMainView, SLOT(newEvent(QDateTime,QDateTime)));
         connect(mAgendaView,SIGNAL(newEventSignal(QDate)),
                 mMainView, SLOT(newEvent(QDate)));
 
         connect(mAgendaView, SIGNAL(editIncidenceSignal(Incidence *)),
                 mMainView, SLOT(editIncidence(Incidence *)));
         connect(mAgendaView, SIGNAL(showIncidenceSignal(Incidence *)),
                 mMainView, SLOT(showIncidence(Incidence *)));
         connect(mAgendaView, SIGNAL(deleteIncidenceSignal(Incidence *)),
                 mMainView, SLOT(deleteIncidence(Incidence *)));
 
         connect( mAgendaView, SIGNAL( incidenceSelected( Incidence * ) ),
                  mMainView, SLOT( processMainViewSelection( Incidence * ) ) );
 
         connect(mAgendaView, SIGNAL( toggleExpand() ),
                 mMainView, SLOT( toggleExpand() ) );
       
         connect( mAgendaView, SIGNAL( cloneIncidenceSignal(Incidence *) ), 
                  mMainView, SLOT(cloneIncidence(Incidence *) ) ) ;
         connect( mAgendaView, SIGNAL( cancelIncidenceSignal(Incidence *) ), 
                  mMainView, SLOT(cancelIncidence(Incidence *) ) ) ;
         connect(mMainView, SIGNAL(configChanged()), mAgendaView, SLOT(updateConfig())); 
         connect( mMainView, SIGNAL( todoModified( Todo *, int )), mAgendaView,
                  SLOT( updateTodo( Todo *, int ) ) );  
         connect(  mAgendaView,SIGNAL( todoMoved( Todo *, int )),
                   mMainView, SIGNAL( todoModified( Todo *, int )));
         connect( mAgendaView, SIGNAL( moveIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( moveIncidence( Incidence * ) ) );
         connect( mAgendaView, SIGNAL( beamIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( beamIncidence( Incidence * ) ) );
         connect( mAgendaView, SIGNAL( selectWeekNum( int ) ),
                  mMainView->dateNavigator(), SLOT ( selectWeek( int ) ) );
         mAgendaView->readSettings(); 
         mAgendaView->updateConfig(); 
     }
    
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_A_VIEW;
     showView( mAgendaView, full);
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_A_VIEW;
     mMainView->setScrollBarStep( 1 );
 }
 
 void KOViewManager::showDayView()
 { 
     mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
     mFlagShowNextxDays =  false;
     globalFlagBlockLabel = 1;
     globalFlagBlockAgenda = 1;
     if ( mCurrentAgendaView != 1 )
         mCurrentAgendaView = -1;
     showAgendaView();
     qApp->processEvents();  
     globalFlagBlockAgenda = 2;
     globalFlagBlockLabel = 0;