fixes

9 files changed, 105 insertions, 45 deletions

diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 01c34cc..f2adfc8 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,290 +1,294 @@
 
 KDE-Pim/Pi is available for four platforms:
 
 1) Windows 32 (not available for all releases)
 2) Zaurus Sharp ROM, gcc 2.95 compiled
 3) OpenZaurus ROM, gcc 3.xx compiled (not available for all releases)
 4) Linux Desktop (SuSE 9.2) (not available for all releases)
 
 Contents of the packages and how to install:
 
 
 *****************************************************
 1) Windows 32
 *****************************************************
 NOTE:
 There are two version for Windows available:
 The file
-kdepim_2.0.8_for_Windows.exe.zip, wich is for Windows 2000/XP
+kdepim_2.1.2_for_Windows.exe.zip, wich is for Windows 2000/XP
 and the file
-kdepim_2.0.8_for_Windows_98-ME.exe.zip, wich is for Windows 98/ME.
+kdepim_2.1.2_for_Windows_98-ME.exe.zip, wich is for Windows 98/ME.
 The functionality is almost the same, but in the version for Windows 98/ME
 is "Import from Outlook" disabled to make it running on Windows 98/ME.
 
-Filename: kdepim_2.0.8_for_Windows.exe.zip
+Filename: kdepim_2.1.2_for_Windows.exe.zip
 Package contains:
 KO/Pi
 KA/Pi
 Phone access(kammu.exe)
 Libs for file, dir, qtopia resources.
 
 Download file.
 Unzip the file, then you are almost done.
 When installing these package for the first time, 
 you will need to install some needed dlls which are 
 available in an extra package "kdepim334.dll". This additional package contains
 the Qt3 library qt-mt334.dll and the MSVC library msvcr71.dll 
 and the MSVC library mfc71u.dll.
 You can download the "kdepim334.dll" package at:
 http://sourceforge.net/projects/kdepimpi/
 Please choose there package/project/file:
 general Files for KDE/Pim
 Needed Windows Dlls
 kdepim334dll.zip
  
 For details read the file
 Migration-Howto.txt in the package.
 
 
 *****************************************************
 2) Zaurus Sharp ROM, gcc 2.95 compiled
 *****************************************************
 Filename: kdepim_X.X.X_for_SharpROM.ipk.zip
 Package contains:
 kaddressbook_X.X.X_arm.ipk
 korganizer-alarm_X.X.X_arm.ipk
 kmicrokdelibs_X.X.X_arm.ipk
 kmobilephoneaccess_X.X.X_arm.ipk
 ksharpPIM-DTMaccess_X.X.X_arm.ipk
 kopiemail_X.X.X_arm.ipk
 pimTABicon_X.X.X_arm.ipk
 korganizer_X.X.X_arm.ipk
 pwmanager_X.X.X_arm.ipk
 
 This package is for users of the Sharp ROM and clones.
 Users of old OpenZaurus releases, which are gcc2.95
 compiled can use it as well.
 
 CONTENT:
 
 File kmicrokdelibs_X.X.X_arm.ipk:
 The libs in this file are needed to run
 any of the included programs.
 Install it.
 
 File kaddressbook_X.X.X_arm.ipk:
 Contains KA/Pi addressbook program and needed additional libs.
 
 File korganizer-alarm_X.X.X_arm.ipk:
 Contains KO/Pi calendar program and needed additional libs.
 
 File kopiemail_X.X.X_arm.ipk:
 Contains OM/Pi email program and needed additional libs.
+You need external lib openssl to run OM/Pi.
 
 File pwmanager_X.X.X_arm.ipk:
 Contains PwM/Pi password manager program.
 
 File ksharpPIM-DTMaccess_X.X.X_arm.ipk:
 Contains needed program/lib to sync KA/Pi and KO/Pi
 with the Sharp PIM applications on the Zaurus,
 which use the new Sharp DMT Pim format.
 
 File korganizer-alarm_X.X.X_arm.ipk:
 Provides an alarm applet to get informed about alarms.
 The Zaurus will wake up from suspend
 if an event triggers an alarm.
 
 File kmobilephoneaccess_X.X.X_arm.ipk:
 Contains a command line tool for accessing mobile phones.
 It is used from Kx/Pi to sync with / export to
 mobile phones. It is not working very well, please do not
 expect too much.
 
 File pimTABicon_X.X.X_arm.ipk:
 If you insatll a program of the package, you may get
 a new TAB wchich is called Pim.
 If you did not have had this TAB on your Z, that
 TAB will not display an icon.
 Install this small package to assihn an icon to
 the new Pim TAB.
 
 
 Unzip package and install the apps in the usual way.
+You need external lib openssl to run OM/Pi.
 
 To get the character conversion in OM/Pi working, please download
 at the sourceforge project site the package
 sr-character-conversion_SharpROM_arm.ipk.zip
 from the section "general files for KDE/Pim"
 Instructions how to install this package are in a ReadMe in this file.
 
 *****************************************************
 3) OpenZaurus ROM, gcc 3.xx compiled
 *****************************************************
 Filename: kdepim_X.X.X_for_OZ-gcc3xx.ipk.zip
 Package contains:
 kaddressbook_OZ-gcc3xx_X.X.X_arm.ipk
 kmicrokdelibs_OZ-gcc3xx_X.X.X_arm.ipk
 kopiemail_OZ-gcc3xx_X.X.X_arm.ipk
 korganizer-alarm_OZ-gcc3xx_X.X.X_arm.ipk
 korganizer_OZ-gcc3xx_X.X.X_arm.ipk
 kmobilephoneaccess_OZ-gcc3xx_X.X.X_arm.ipk
 pimTABicon_OZ-gcc3xx_X.X.X_arm.ipk
 pwmanager_OZ-gcc3xx_X.X.X_arm.ipk
 
 
 This package is for users of the Open Zaurus ROM 3.3.6,
 compiled by coredump (aka known as Hentges-Rom).
 The programs may run on the new
 Open Zaurus Release 3.5.1 as well, but
 they cannot be installed there properly,
 because the package manager of OZ needs more
 information in the ipk files to install them properly.
 
 If you have Open Zaurus 3.5.1, you should use
 the packages of the OZ 3.5.1 feed,
 compiled and maintained by Hrw.
 Do not ask the OZ people about problems with these
 packages, they cannot help you.
 
 CONTENT:
 
 By the way, I cannot help you as well, because I
 am not using OZ.
 
 File kmicrokdelibs_OZ-gcc3xx_X.X.X_arm.ipk:
 The libs in this file are needed to run
 any of the included programs.
 Install it.
 
 File kaddressbook_OZ-gcc3xx_X.X.X_arm.ipk:
 Contains KA/Pi addressbook program and needed additional libs.
 
 File korganizer-alarm_OZ-gcc3xx_X.X.X_arm.ipk:
 Contains KO/Pi calendar program and needed additional libs.
 
 File kopiemail_OZ-gcc3xx_X.X.X_arm.ipk:
 Contains OM/Pi email program and needed additional libs.
+You need external lib openssl to run OM/Pi.
 
 File pwmanager_OZ-gcc3xx_X.X.X_arm.ipk:
 Contains PwM/Pi password manager program.
 
 File korganizer-alarm_OZ-gcc3xx_X.X.X_arm.ipk:
 Provides an alarm applet to get informed about alarms.
 The Zaurus will wake up from suspend
 if an event triggers an alarm.
 
 File kmobilephoneaccess_OZ-gcc3xx_X.X.X_arm.ipk:
 Contains a command line tool for accessing mobile phones.
 It is used from Kx/Pi to sync with / export to
 mobile phones. It is not working very well, please do not
 expect too much.
 
 File pimTABicon_OZ-gcc3xx_X.X.X_arm.ipk:
 If you insatll a program of the package, you may get
 a new TAB wchich is called Pim.
 If you did not have had this TAB on your Z, that
 TAB will not display an icon.
 Install this small package to assihn an icon to
 the new Pim TAB.
 
 Unzip package and install the apps in the usual way.
+You need external lib openssl to run OM/Pi.
 
 To get the character conversion in OM/Pi working, please download
 at the sourceforge project site the package
 oz-character-conversion_OZ-gcc3xx_arm.ipk.zip
 from the section "general files for KDE/Pim"
 Instructions how to install this package are in a ReadMe in this file.
 
 
 *****************************************************
 4) Linux Desktop (SuSE 9.2)
 *****************************************************
-Filename: KDE-Pim-Pi-2.0.8-SuSE_9.2.i586.rpm
+Filename: KDE-Pim-Pi-2.1.2-SuSE_9.2.i586.rpm
 Package contains:
 KAddessbook/Pi
 KOrganizer/Pi
 PasswordManager/Pi
 KPhone/Pi
 KTimeTracker/Pi
 KOPieMail/Pi
 and the needed microkde libs.
 
 Download file and install it on console with
 su
-rpm -ihv KDE-Pim-Pi-2.0.8-SuSE_9.2.i586.rpm
+rpm -ihv KDE-Pim-Pi-2.1.2-SuSE_9.2.i586.rpm
 Note:
 If you want to update, please do it with
-rpm -Uhv KDE-Pim-Pi-2.0.8-SuSE_9.2.i586.rpm
-(Uninstall with rpm -e KDE-Pim-Pi-2.0.8-SuSE_9.2)
+rpm -Uhv KDE-Pim-Pi-2.1.2-SuSE_9.2.i586.rpm
+(Uninstall with rpm -e KDE-Pim-Pi-2.1.2-SuSE_9.2)
 
 Here is the information,
 provided in the rpm file about the content:
 
 This package contains the platform-independent PIM programs from
 www.pi-sync.info, compiled for SuSE 9.2:
 KTimeTacker/Pi
 KPhone/Pi
 KAddressbook/Pi
 KOrganizer/Pi
 PasswordManager/Pi
 KOPieMail/Pi
 
 These applications do not need anything from the KDE-desktop
 at all to run on Linux. However, there is a dependency from
 two KDE libs, because a small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 
 These applications are independent from the KDE-desktop
 environment. That means, nothing of your existing
 KDE-desktop setup will be changed, or any data
 (calendar-addressbook) used by the KDE-desktop
 applications will be changed or accessed.
 These applications stores their data and config in
 $HOME/kdepim/
 However, because the same file format is used,
 an easy exchange of data with the KDE-desktop
 is possible.
 A small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 You do not need to call this program from the commandline,
 it is called from the KDE-Pim/Pi apps when you choose there:
 Sync with KDE_Desktop.
 If something is going wrong, please start the
 KDE-Pim/Pi program itself from the console to get detailed output.
 
 After installation, you should have a
 PIM-pi
 folder in your KDE start menu, where you can
 start the applications from.
 
 These programs makes it possible to sync your Zaurus easily
 (with the KDE-Pim/Pi programs running on the Zaurus)
 with the KDE-desktop calendar/addressbook data.
 If you want to use that, you have to update your
 KDE-desktop to version 3.3.0 or higher.
 SuSE 9.2 contains KDE 3.3.0 such that no update is needed.
 Actually - after the (non difficult) configuration is set up -
 with two mouseklicks on the Zaurus,
 the Zaurus syncs with the corresponding KDE-Pim/Pi
 program on the Linux Desktop which syncs automatically
 with the KDE-desktop data.
 
 If you want to use the KDE-desktop calendar/addressbook applications,
 just install these apps in this package and use them as a syncing tool for the
 Zaurus <-> KDE-desktop sync.
 The sync requires a network connection from your Zaurus to
 the PC. A detailed Sync HowTo is available in the
 Help menu of the applications.
 
 These applications makes it also possible, that you can sync
 (or just export the data to) your mobile phone with your
 data of the KDE-desktop calendar/addressbook applications.
 This is tested and working for Nokia mobile phones,
 it may work with others as well.
 (More info about that: -> Sync HowTo)
 
 NOTE:
 When using SuSE 9.1 you have to update your KDE to 3.3.x
 and you have to make an online update in SuSE 9.1 to make it
 possible to get the infrared connection working, such that
 you can sync your (Nokia) mobile phone via infrared.
\ No newline at end of file
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 7fa92bf..5693112 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1,1360 +1,1360 @@
 { "10 minutes","10 Minuten" },
 { "10th","10." },
 { "11th","11." },
 { "12 pm Format","12 AM/PM Format" },
 { "12th","12." },
 { "13th","13." },
 { "14th","14." },
 { "15th","15." },
 { "16th","16." },
 { "17th","17." },
 { "18th","18." },
 { "19th","19." },
 { "1 Day","1 Tag" },
 { "1 h","1 Std" },
 { "1 (high)","1 (hoch)" },
 { "5 (low)","5" },
 { "1st","1." },
 { "20th","20." },
 { "21st","21." },
 { "22nd","22." },
 { "23rd","23." },
 { "24:00 Hour Format","24:00 Stunden Format" },
 { "24th","24." },
 { "25th","25." },
 { "26th","26." },
 { "27th","27." },
 { "28th","28." },
 { "29th","29." },
 { "2nd","2." },
 { "30 minutes","30 Minuten" },
 { "30th","30." },
 { "31st","31." },
 { "3rd","3." },
 { "4th","4." },
 { "5 (lowest)","5 (Niedrigster)" },
 { "5th","5." },
 { "6th","6." },
 { "7th","7." },
 { "8th","8." },
 { "9th","9." },
 { "About...","Über..." },
 { "&Accept","&Akzeptieren" },
 { "Accept","Akzeptieren" },
 { "Accept A&ll","A&lles Akzepieren" },
 { "Access:","Zugriff:" },
 { "A corresponding event is missing in your calendar!","Ein zugehöriger Termin fehlt in ihrem Kalender!" },
 { "Actions","Aktionen" },
 { "Add Filter","Filter Hinzufügen" },
 { "&Add","Hinzufügen" },
 { "Add","Hinzufügen" },
 { "Additional email addresses:","Zusätzliche E-Mail Adressen:" },
 { "Additional email address:","Zusätzliche E-Mail Adresse:" },
 { "&Addressbook","&Adressbuch" },
 { "Address &Book...","Adress&buch..." },
 { "Agenda Size","Agende Größe" },
 { "Agenda Size:","Größe der Agenda:" },
 { "Agenda view:","Agenda Ansicht:" },
 { "Agenda view background color:","Hintergrund der Agenda Ansicht:" },
 { "All attendees","Alle Teilnehmer" },
 { "AllDayAgenda Height:","Höhe Ganztages Agenda:" },
 { "All day event","Ganztägig" },
 { "Anonymous","Anonym" },
 { "Apply","Anwenden" },
 { "Apr","Apr" },
 { "April","April" },
 {"Ask for every entry on conflict","Frage bei Konflikten nach"},
 { "Ask for preferences before syncing","Vor dem Syncronisieren nachfragen" },
 { "Ask for quit when closing KO/Pi","Vor dem Beenden von KO/Pi nachfragen" },
 { "Attendees","Teilnehmer" },
 { "Aug","Aug" },
 { "August","August" },
 { "Auto-Save","Automatisches Abspeichern" },
 { "Auto save delay in minutes:","Verzög.autom.Speichern in Min" },
 { "Auto saving...","Automatische Sicherung..." },
 { "Begin on:","Starte mit:" },
 { "Begins on: %1","Starte mit: %1" },
 { "<b>From:</b> %1 <b>To:</b> %2","<b>Vom:</b> %1 <b>Zum:</b> %2" },
 { "<b>On:</b> %1","<b>Am:</b> %1" },
 { "<b>On:</b> %1 <b>From:S</b> %2 <b>To:</b> %3","<b>Am:</b> %1 <b>Vom:S</b> %2 <b>Zum:</b> %3" },
 { "<b>Original event:</b><p>","<b>Original Termin:</b><p>" },
 { " - both are modified after last sync"," - beide wurden nach der letzten Syncronisation verändert" },
 { "Busy","Belegt" },
 { "&Cancel","Abbre&chen" },
 { "Cancel","Abbrechen" },
 { "Cannot delete To-Do\nwhich has children.","Kann Todo nicht löschen,\n da noch Einträge vorhanden sind" },
 { "Can't generate mail:\nNo event selected.","Kann e-Mail nicht erstellen:\nKein Termin ausgewählt." },
 { "Categories...","Kategorien..." },
 { "Categories","Kategorien" },
 { "Category","Kategorie" },
 { "Center View","Zentriere Ansicht" },
 { "Change","Ändere" },
 { "Cinema","Kino" },
 { "Click to add a new Todo","Hier klicken, um ein neues Todo anzulegen" },
 { "Clone Item","Klone Eintrag" },
 { "&Close","S&chließen" },
 { "Close","Schließen" },
 { "Close this dialog to abort deletion!","Zum Abbrechen des Löschvorganges Dialog schließen!" },
 { "Colors","Farben" },
 { "completed","erledigt" },
 { "completed on %1","erledigt am %1" },
 { "Complete","Erledigt" },
 { "Confidential","Vertraulich" },
 { "Configure...","Einstellungen..." },
 { "Confirm &deletes","Löschvogang bestätigen" },
 { "Couldn't load calendar\n '%1'.","Kann Kalender\n '%1' nicht laden." },
 { "Counter-event Viewer","Terminzähler Ansicht" },
 { "Daily ending hour:","Feierabend:" },
 { "Daily starting hour:","Anfangszeit:" },
 { "Daily","Täglich" },
 { "Date Format","Datums Format" },
 { "Date Format:","Datums Format:" },
 { "DateNavigator:(nr)","Datums Navigator" },
 { "Dates: ","Datum: " },
 { "Date && Time","Datum && Zeit" },
 { "Day begins at:","Der Tag beginnt um:" },
 { "Days in Next-X-Days:","Tage in Nächste-X-Tage:" },
 { "Days in What's Next:","Tage in What's Next:" },
 { "day(s)","Tag(e)" },
 { "Days to show in Next-X-Days view:","Welche Tage in Nächste-X-Tagen anzeigen:" },
 { "day","Tag" },
 { "Dec","Dez" },
 { "December","Dezember" },
 { "Default alarm time:","Standard Alarmzeit:" },
 { "Default appointment time:","Standard Termin Startzeit:" },
 { "Default event color:","Standard Terminfarbe:"   },
 { "Default","Standard" },
 { "Def. duration of new app.:","Standard Termin Länge:" },
 { "Delete All","Lösche alles" },
 { "Delete all selected","Lösche alle Selektierten" },
 { "Delete Current","Aktuellen löschen" },
 { "Delete Event...","Lösche Termin..." },
 { "Delete Event","Lösche Termin" },
 { "&Delete","Löschen" },
 { "Delete...","Löschen..." },
 { "Delete","Löschen" },
 { "Delete Todo...","Lösche Todo..." },
 { "Delete To-Do","Lösche Todo" },
 { "Deleting item %d ...","Lösche Eintrag %d..." },
 { "Descriptions","Beschreibungen" },
 { "Deselect all","Deselektiere Alle" },
 { "Details","Details" },
 { "Dinner","Abendessen" },
 { "Do you really want\nto close KO/Pi?","Möchten Sie wirklich\nKO/PI verlassen?" },
 { "Due Date","Fällig am" },
 { "Due: ","Fällig: "},
 { "Due Time","Fällig um"  },
 { "Due:","Fällig:"},
 { "Duration: ","Dauer: " },
 { "Edit...","Bearbeite..." },
 { "Edit","Bearbeite" },
 { "Edit Event...","Bearbeite Termin..." },
 { "Edit Event","Bearbeite Termin" },
 { "Edit exceptions","Bearbeite Ausnahmen" },
 { "EditorBox:","Editor Fenster:" },
 { "Edit Recurrence Range","Bearbeite Wiederholung"  },
 { "Edit Todo...","Berabeite Todo..." },
 { "Edit To-Do","Todo bearbeiten" },
 { "E&mail address:","E&mail Adresse:" },
 { "(EmptyEmail)","(KeineEmail)" },
 { "(EmptyName)","(KeinName)" },
 { "Enable Recurrence","Wiederholung anschalten" },
 { "End after","Endet nach"},
 { "End by:","Endet am"},
 { "End Date","End Datum" },
 { "End:","Ende:" },
 { "End Time","End Zeit" },
 { "English","Englisch" },
 { "Event","Termin" },
 { "Event list","Termin Liste" },
 { "Events","Termine" },
 { "Event Viewer:","Termin Übersicht:" },
 { "every","jede" },
 { "Exceptions...","Ausnahmen..." },
 { "Exceptions","Ausnahmen" },
 { "Exclude holidays","Ohne freie Tage" },
 { "Exclude Saturdays","Ohne Samstage" },
 { "Feb","Feb" },
 { "February","Februar" },
 { "&Find","Suche!" },
 { "Fonts","Schriftart" },
 { "Force take local entry always","Erzwinge:Nimm immer lokalen Eintrag" },
 { "Force take remote entry always","Erzwinge:Nimm immer fernen Eintrag"},
 { "Free","Frei" },
 { "Friday","Freitag" },
 { "Fri","Fr" },
 { "From:","Vom:" },
 { "Full &name:","Vor- und &Nachname:" },
 { "General","Allgemein" },
 { "German","Deutsch" },
 { "Gifts","Geschenke" },
 { "Go to Today","Heute anzeigen" },
 { "Help","Hilfe" },
 { "Hide Dates","Daten ausblenden" },
 { "Highlight color:","Markierungen:" },
 { "Holiday color:","Freie Tage:" },
 { "hour(s)","Stunde(n)" },
 { "In %1 days: ","In %1 Tagen: " },
 { "Incomplete Todo:","Unerledigte Aufgaben:" },
 { "Information","Information" },
 { "Invalid search expression,\ncannot perform ","Kann Suche nicht ausführen" },
 { "Jan","Jan" },
 { "January","Januar" },
 { "JournalView:","Journal Ansicht:" },
 { "Journals","Journale" },
 { "Jul","Jul" },
 { "July","Juli" },
 { "Jump to date","Springe zum Datum" },
 { "June","Juni" },
 { "Jun","Jun" },
 { "Key Bindings...","Tastenzuordnung..." },
 { "Kids","Kinder" },
 { "Known Problems...","Bekannte Probleme..." },
 { "KO/Pi Find ","KO/Pi Suchdialog " },
 { "KO/Pi Find: ","KO/Pi Suchen: " },
 { "KO/Pi is starting ... ","  KO/Pi startet ... \n... Zeit für eine Kaffeepause ..." },
 { "Language:(needs restart)","Sprache (Neustart!)" },
 { "Language:","Sprache" },
 { "Large","Etwas mehr" },
 { "List View:","Listenansicht:" },
 { "List View","Listenansicht" },
 { "Load/Save","Laden/Speichern" },
 { "Load Template","Lade Vorlage" },
 { "Locale","Localisation" },
 { "Local temp file:","Lokale temp. Datei:" },
 { "Location: ","Ort: " },
 { "Location:","Ort:" },
 { "Mail client","Mail Programm" },
 { "Mail Client","Mail Programm" },
 { "March","März" },
 { "Mar","Mär" },
 { "May","Mai" },
 { "M. Bains line:","M. Bains Linie:" },
 { "Medium","Medium" },
 { "Method","Methode" },
 { "minute(s)","Minute(n)" },
 { "Monday","Montag" },
 { "Mon","Mo" },
 { "Monthly","Monatlich" },
 { "Month not long enough","Monat ist nicht lang genug" },
 { "month(s)","Monat(e)" },
 { "Month view:","Monatsansicht:" },
 { "Month view uses category colors","Monatsansicht zeigt Kategorie Farben" },
 { "Todo view uses category colors","To-Do Ansicht zeigt Kategorie Farben" },
 { "Move &Down","Nach unten verschieben" },
 { "Move &Up","Nach oben verschieben" },
 { "Name:","Name:" },
 { "Name","Name" },
 { "\nAre you sure you want\nto delete this event?","\nSind Sie sicher, dass Sie\nden Termin löschen möchten?" },
 { "%n Days","%n Tage" },
 { "Never","Nie" },
 { "New event...","Neuer Termin..." },
 { "New event","Neuer Termin" },
 { "New Event...","Neuer Termin..." },
 { "New Events/Todos should","Neue Termine/Todos sollten" },
 { "&New","&Neu" },
 { "New","Neu", },
 { "New Sub-Todo...","Neues Sub-Todo..." },
 { "New Todo...","Neues Todo..." },
 { "Next Alarm: ","Nächster Alarm: ", },
 { "&Next Day","&Nächster Tag", },
 { "Next days view uses full window","Nächste-X-Tage nutzt Vollbild" },
 { "Next month","Nächster Monat" },
 { "&Next Week","&Nächste Woche" },
 { "Next year","Nächstes Jahr" },
 { "Next Year","Nächstes Jahr" },
 { "%n h","%n Std" },
 { "No ending date","Kein End-Datum", },
 { "No event, nothing to do.","Kein Termin, nichts zu tun.", },
 { "No event selected.","Kein Termin selektiert" },
 { "No","Nein" },
 { "No program set","Kein Programm ausgewählt", },
 { "Normal","Normal" },
 { "[No selection]","Keine Selektion", },
 { "No sound set","Kein Sound ausgewählt", },
 { "no time ","keine Zeit ", },
 { "no time","keine Zeit", },
 { "No Time","Keine Zeit" },
 { "November","November" },
 { "Nov","Nov", },
 { "\nThis event recurs\nover multiple dates.\n","\nDieser Termin wiederholt sich an mehreren Tagen.\n" },
 { "occurrence(s)","Vorkommen" },
 { "October","Oktober" },
 { "Oct","Okt", },
 { "O-due!","Ü-fällig! " },
 { "&OK","&OK" },
 { "Ok+Show!","Ok+Anzeigen" },
 { "Organizer: %1","Organisator %1" },
 { "Organizer","Organisator" },
 { "Owner: ","Besitzer: " },
 { "Owner:","Besitzer:" },
 { "<p><b>Priority:</b> %2</p>","<p><b>Priorität:</b> %2</p>" },
 { "Pick a date to display","Wähle einen Tag zum anzeigen aus" },
 { "Please specify a valid due date.","Bitte gültiges Fälligkeitsdatum angeben."},
 { "Please specify a valid end date,\nfor example '%1'.","Bitte gültiges Enddatum angeben,\nz.B.'%1'." },
 { "Please specify a valid start date.","Bitte gültiges Startdatum angeben." },
 { "Please specify a valid start date,\nfor example '%1'.","Bitte gültiges Startdatum angeben,\nz.B. '%1'." },
 { "Please specify a valid start time.","Bitte gültige Startzeit angeben."},
 { "Please specify a valid start time,\nfor example '%1'.","Bitte gültige Startzeit angeben,\nz.B. '%1'." },
 { "Preferences - some settings need a restart (nr)","Einstellungen - teilweise Neustart erforderlich (bn)" },
 { "&Previous Day","Vorheriger Tag" },
 { "Previous month","Vorheriger Monat" },
 { "Previous Month","Vorheriger Monat" },
 { "&Previous Week","Vorherige Woche" },
 { "Previous year","Vorheriges Jahr" },
 { "Previous Year","Vorheriges Jahr" },
 { "Printing","Drucken" },
 { "Priority:","Priorität:" },
 { "Private","Privat" },
 { "Proceed","Weiter" },
 { "Public","Öffentlich" },
 { "Purge","Entferne" },
 { "Purge Completed","Entferne erledigte Todos" },
 { "Purge Todos","Todos bereinigen" },
 { "read-only","schreibgeschützt" },
 { "Recur every","Wiederh. alle" },
 { "Recur in the month of","Wiederh. im Monat" },
 { "Recur on the","Wiederh. am" },
 { "Recur on this day","Wiederh. am diesen Tag" },
 { "Recurrence Range...","Wiederholungs Zeitraum..." },
 { "Recurrence Range","Wiederholungs Zeitraum" },
 { "Recurrence Rule","Wiederholungs Regel" },
 { "Recurrence","Wiederholung" },
 { "Recurs","Wiederholung" },
 {"&Reject","Abweisen"},
 { "Reminder:","Alarm:" },
 { "Rem.:","Alarm:" },
 { "Rem.","Alarm:" },
 { "Remote file:","Remote Datei:"},
 { "Remote IP:","Remote (ferne) IP:" },
 { "Remote syncing (via ssh/scp) network settings ","Remote Sync (via ssh/scp) Netzwerk Einstellungen " },
 { "Remote user:","Remote Benutzer"},
 { "&Remove","Entfe&rnen" },
 { "Remove","Entfernen" },
 { "Request response","Bemerkung anfordern" },
 { "Role:","Rolle:" },
 { "Role","Rolle" },
 { "Sat","Sa" },
 { "Saturday","Samstag" },
 { "Search for:","Suche nach:" },
 { "Search In","Suche in" },
 { "Search...","Suche..." },
 { "Search","Suche" },
 { "Select Addresses","Wähle Adressen" },
 { "Select all","Selektiere Alle" },
 { "Select a month","Wähle Monat" },
 { "Select a week","Wähle Woche" },
 { "Select a year","Wähle Jahr" },
 { "Send directly","Sende direkt" },
 { "&Send Messages","&Sende Nachrichten", },
 { "Sep","Sep" },
 { "September","September" },
 { "Shopping","Einkaufen" },
 { "Show Dates","Zeige Daten" },
 { "Show events that recur daily in date nav.","Zeige tägl.wiederh.Term.in Datums Nav." },
 { "Show Event...","Zeige Termin..." },
 { "Show ev. that recur weekly in date nav.","Zeige wöch.wiederh.Term.in Datums Nav." },
 { "Show Marcus Bains line","Zeige Marcus Bains Linie" },
 { "Show summary after syncing","Zeige Zusammenfassung nach Sync." },
 { "Show time as:","Zeige Zeit als" },
 { "Show Todo...","Zeige To-Do" },
 { "Show vertical screen (Needs restart)","Vertikaler Bildschirm-Layout (Neustart!)" },
 { "&Show","Zeige" },
 { "Show...","Zeige..." },
 { "Show","Zeige" },
 { "Small","Klein" },
 { "Sorry","Entschuldigung" },
 {"Sorry, the copy command failed!\nCommand was:\n","Der Kopierbefehl schlug fehl!\nBefehl war:\n"},
 { "Start:","Start:" },
 { "Start Date","Start Datum" },
 { "Start date: %1","Start Datum: %1" },
 { "Start Time","Start Zeit" },
 { "Status:","Status:" },
 { "Status","Status:" },
 { "Summaries","Titel" },
 { "Summary:","Titel:" },
 { "Summary","Titel" },
 { "Sunday","Sonntag" },
 { "Sun","So" },
 { "Sync preferences:","Sync Einstellungen" },
 { "Sync Prefs","Sync Einstellungen" },
 { "Syncronize","Daten abgleich" },
 { "Take local entry on conflict","Nimm lokalen Eintrag beim Konflikt" },
 { "Take newest entry on conflict","Nimm neuesten Eintrag beim Konflikt" },
 { "Take remote entry on conflict","Nimm fernen Eintrag beim Konflikt" },
 { "Template '%1' does not contain a valid Todo.","Template '%1' enthält kein gültiges To-Do" },
 { "Template does not contain a valid Event.","Template '%1' enthält keinen gültigen Termin" },
 { "Template...","Vorlage..." },
 { "This day","Dieser Tag" },
 { "This is an experimental feature. ","Dieses Feature ist experimentel" },
 { "This item will be\npermanently deleted.","Dieser Eintrag wird\nkomplett gelöscht." },
 { "This item will be permanently deleted.",  "Dieser Eintrag wird komplett gelöscht." },
 { "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 Beginn:" },
 { "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..." },
 { "Search","Suchen" },
 { "Date Picker","Datum auswählen" },
 { "Day View","Tagesansicht" },
 { "Work Week","Arbeitswoche" },
 { "Week","Wochenansicht" },
 { "Month","Monatsansicht" },
 { "Todo View","Todo Liste" },
-{ "Journal","Journal Ansicht" },
+{ "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 via IR" },
 { "Beam filtered calendar...","Sende gefilterten Kalender via IR" },
 { "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" },
 { "After importing/loading/syncing\nthere may be new categories in\nevents or todos\nwhich are not in the category list.\nPlease choose what to do:\n ","Nach dem Importieren/Laden/Syncen\nkann es neue Kategorien in den \nTerminen oder Todos geben, die nicht\nin der Kategorieliste enthalten sind.\nBitte wählen Sie, was passieren soll:\n " },
 { "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)" },
 { "Home","Zuhause" },
 { "Office","Büro" },
 { "Libary","Bücherei" },
 { "Doctor","Arzt" },
 { "Beach","Strand" },
 { "Conference room","Konferenzraum" },
 { "Drive Home","Heimfahrt" },
 { "Watch TV","Tv gucken" },
 { "Phone call","Telefonanruf" },
 { "Pay bill","Rechnung bezahlen" },
 { "Read book","Buch lesen" },
 { "Watering plants","Pflanzen giessen" },
 {"Appointment","Verabredung" },
 {"Birthday","Geburtstag" },
 {"Business","Geschäft" },
 {"Business Travel","Geschäftsreise" },
 {"Cinema","Kino" },
 {"Customer","Kunde" },
 {"Break","Pause" },
 {"Breakfast","Frühstück" },
 {"Competition","Wettkampf" },
 {"Dinner","Abendessen" },
 {"Education","Erziehung" },
 {"Family","Familie" },
 {"Favorites","Favoriten" },
 {"Festival","Festival" },
 {"Fishing","Angeln" },
 {"Flight","Flug" },
 {"Gifts","Geschenk" },
 {"Holiday","Feiertag" },
 {"Holiday Cards","Ansichtskarten" },
 {"Hot Contacts","Heisse Kontakte" },
 {"Hiking","Wandern" },
 {"Hunting","Jagen" },
 {"Key Customer","Wichtiger Kunde" },
 {"Kids","Kinder" },
 {"Lunch","Mittagessen" },
 {"Meeting","Treffen" },
 {"Miscellaneous","Verschiedenes" },
 {"Partner","Partner" },
 {"Party","Partie" },
 {"Personal","Privat" },
 {"Personal Travel","Privatreise"},
 {"PHB","PHB" },
 {"Phone Calls","Telefonanruf" },
 {"Projects","Projekt" },
 {"Recurring","Wiederholend" },
 {"School","Schule" },
 {"Shopping","Einkaufen" },
 {"Speach","Rede" },
 {"Special Occasion","Spez.Gelegenheit" },
 {"Sports","Sport" },
 {"Talk","Vortrag" },
 {"Travel","Reise" },
 {"TV","TV" },
 {"Germany","Deutschland" },
 {"Sweden","Schweden" },
 {"Forest","Wald" },
 { "Desert","Wüste" },
 { "Kitchen","Küche" },
 { "Lake","See" },
 {"University","Universität"},
 {"Vacation","Urlaub" },
 {"VIP","VIP" },
 { "Import Sharp Calendar","Importiere Sharp Kalender" },
 { "This todo has been cancelled!","Dieses Todo wurde gecancelt!" },
 { "This event has been cancelled!","Dieser Termin wurde gecancelt!" },
 { "Cancelled","Gecancelt" },
 { "Multiple sync","Mehrfach Sync" },
 { "Local file","Lokale Datei" },
 { "Last file","Letzte Datei" },
 { "Keys + Colors...","Tasten + Farben..." },
 { "Mini icons in toolbar(nr)","Mini Icons in ToolBar(bn)" },
 { "Quick load/save (w/o Unicode)","Schnelles Laden/Speichern (o Unicode)" },
 { "Choose...","Wähle..." },
 { "Use colors for application:","Setze Farben für Programm:" },
 { "Buttons, menus, etc.:","Knöpfe, Menu, etc.:" },
 { "Frames, labels, etc.:","Rahmen, Label, etc.:" },
 { "Show parent To-Do's","Zeige Ober-Todos" },
 { "Show location","Zeige Orte" },
 { "Show events that recur ","Zeige Termine, die sich wiederholen:" },
 { "Show in every cell ","Zeige in jeder Zelle " },
 { "short month","kurzen Monat" },
 { "icons","Icons" },
 { "Show Sat/Sun together","Zeige Sam/Son zusammen" },
 { "Categorie colors are applied to text","Kategorie Farben färben Text" },
 { "Month view uses day colors","Monatsansicht zeigt Tagesfarben" },
 { "Day color odd months","Tagesfarbe ungerade Monate" },
 { "Day color even months","Tagesfarbe gerade Monate" },
 { "Color for Sundays + category \"Holiday\"","Farbe für Sonntag + Kateg.\" Feiertag\"" },
 { "To-do view shows complete as 'xx %'","Zeige Prozent erledigt als 'xx %'" },
 { "Small To-do view uses smaller font","Kleine To-do Ansicht nutzt kleineren Font" },
 { "Colors are applied to text","Farben werden auf Text angewendet" },
 { "Use internal alarm notification","Nutze interne Alarm Benachrichtigung" },
 { "Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n","Achtung: KO/Pi muß ausgeführt werden damit die Benachrichtigung funktioniert. Empfehlung für Zaurus: Diese Option nicht wählen und KO/Pi Alarm Applet installieren.\n" },
 { "Play beeps count:","Anzahl der Alarmpiepse: " },
 { "Beeps interval in sec:","Zeitintervall der Alarmpiepse: " },
 { "Default suspend time in min:","Standard Supendierungs Zeit: " },
 { "Auto suspend count:","Anzahl der auto Suspendierungen" },
 { "Alarm *.wav file for newly created alarm:","Alarm *.wav Datei für neu angelegte Alarme:" },
 { "New profile","Neues Profil" },
 { "Clone profile","Klone Profil" },
 { "Delete profile","Lösche Profil" },
 { "Profile:","Profil:" },
 { "Include in multiple sync","Beziehe Profil in mehrfach Sync mit ein" },
 { "Force: Take local entry always","Erzwinge: Nimm immer lokalen Eintrag" },
 { "Force: Take remote entry always","Erzwinge: Nimm immer fernen Eintrag" },
 { "Show summary after sync","Zeige Zusammenfassung nach dem Synchronisieren" },
 { "Write back file","Schreibe Datei zurück" },
 { "Remote file (w down/upload command)","Entfernte Datei (via down/upload Kommando)" },
 { "Pre sync (download) command:","Bevor Sync (download) Kommando:" },
 { "Local device name:","Name dieses Gerätes:" },
 { "Ask for preferences before sync","Frage nach Synchronisationseinstellungen vor dem Syncen" },
 { "Sync preferences","Synchronisations Einstellungen" },
 { "Profile kind","Profil Art" },
 { "Local file","Lokale Datei" },
 { "Local file:","Lokale Datei:" },
 { "Post sync (upload) command:","Nach Sync (upload) Kommando:" },
 { "Fill in default values for:","Setze Beispiel Werte ein für:" },
 { "Hint: Use $PWD$ for placeholder of password!","Hinweis: Benutze $PWD$ als Platzhalter für ein Passwort!" },
 { "Synchronization Preferences","Einstellungen der Synchronisationsprofile"},
 { "Device","Gerät:" },
 { "Sync with file \n...%1\nfrom:\n%2\n","Sync mit Datei \n...%1\nvom:\n%2\n" },
 { "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","Synchronisationsübersicht:\n\n %d items lokal hinzugefügt\n %d items entfernt hinzugefügt\n %d items lokal geändert\n %d items entfernt geändert\n %d items lokal gelöscht\n %d items entfernt gelöscht\n" },
 { "Synchronization successful","Synchronisation erfolgreich" },
 { "Sync cancelled or failed. Nothing synced.","Sync abgebrochen oder fehlgeschlagen. Nichts wurde gesynced." },
 { "Sync file \n...%1\ndoes not exist!\nNothing synced!\n","Sync Datei \n...%1\nexistiert nicht!\nNichts wurde gesynced!\n" },
 { "Sync filename(*.ics/*.vcs)","Sync Dateiname(*.ics/*.vcs)" },
 { "Enter password","Passwort eingeben" },
 { "Do you really want\nto remote sync\nwith profile \n","Wollen Sie wirklich\nmit dem entfernten\nProfil syncen: \n" },
 { "Copy remote file to local machine...","Kopiere entfernte Datei auf lokalen Rechner..." },
 { "Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n","Sorry, das Kopierkommando schlug fehl!\nKommando war:\n%1\n \nVersuche Kommando von Kosole um\nDetails für das Fehlschlagen\nzu erfahren.\n" },
 { "Writing back file result: ","Resultat des Dateizurückschreibens: " },
 { "Syncronization sucessfully completed","Synchronisation erfolgreich abgeschlossen" },
 { "Edit Calendar Filters","Editiere Kalendar Filter" },
 { "Enter filter name:","Neuer Filter Name:" },
 { "Add Filter","Filter hinzufügen" },
 { "Question","Frage" },
 { "Filter position: ","Filter Position: " },
 { "Month View","Monatsansicht" },
 { "This profil cannot be deleted!\n","Dieses Profil kann\nnicht gelöscht werden!" },
 { "KO/Pi config error","KO/Pi Konfig. Fehler" },
 { "Local device name undefined!\nPlease define device name!","Name dieses Gerätes undefiniert!\nBitte Namen angeben!" },
 { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile haben denselben Namen!\nBitte unterschiedliche Namen wählen!" },
 { "Access: ","Zugriff: " },
 { "Needs Action","Aktion notwendig" },
 { "Accepted","Akzeptiert" },
 { "Declined","Abgelehnt" },
 { "Tentative","Vorläufig" },
 { "Delegated","Beauftragt" },
 { "Completed","Vollständig" },
 { "In Process","In Bearbeitung" },
 { "Participant","Teilnehmer" },
 { "Optional Participant","Möglicher Teilnehmer" },
 { "Observer","Beobachter" },
 { "Chair","Vorsitzender" },
 { "Not supported \non desktop!\n","" },
 { "Nothing selected!\n\nThis prints the full width of the Agenda view as you see it!\n\nTo determine the vertical range of the printing, please select\na vertical range (with the left mouse button down) in one column. ","Es ist nichts selektiert!\nDieses druckt die volle Breite der Agenda View, so wie man sie sieht.\nUm die vertikale Auswahl zum Drucken zu bestimmen,\nbitte einen vertikalen Zeitraum (mit gedrückter linker Maustaste)\nin einer Spalte auswählen.\n(Es wird danach direkt der Termin Dialog angezeigt\n  -  dort bitte auf Abbrechen klicken) " },
 { "Date range: ","Datums Zeitspanne: " },
 { "Not supported \non  PDA!\n","Nicht verfügbar\nauf dem PDA. " },
 { "Syncing - close to abort!","Syncing-schließe um abzubrechen." },
 { "Add / remove events","Add./entferne Termine" },
 { "File does not exist:\n '%1'.","Datei existiert nicht:\n '%1'." },
 { "Couldn't load calendar\n '%1'.","Kann Kalender nicht laden:\n '%1'." },
 { "\nThe file on disk has changed!\nFile size: %1 bytes.\nLast modified: %2\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie gepeicherte Datei wurde verändert!\nDatei Grösse: %1 Bytes.\nZuletzt geändert: %2\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" },
 { "Overwrite","Überschreiben" },
 { "Sync+save","Syncen+speichern" },
 { "Default","Standard" },
 { " Categories added to list! "," Kategorien zur Liste hinzugefügt! " },
 { "  %d items?","  %d Einträge?" },
 { "\nThis event recurs\nover multiple dates.\nAre you sure you want\nto delete this event\nand all its recurrences?","\nDieses ist ein\nwiederholender Termin!.\nSind Sie sicher, dass Sie\ndiesen Termin und alle\nWiederholungen löschen möchten?" },
 { " ?\n\nDelete:\n"," ?\n\nLösche:\n" },
 { "Current","Aktuelle" },
 { "\nThis event recurs\nover multiple dates.\nDo you want to delete\nall it's recurrences,\nor only the current one on:\n","\nDieses ist ein\nwiederholender Termin!\nMöchten sie alle Wiederholungen\nlöschen, oder nur die aktuelle am:\n" }, 
 { "All","Alle" },
 { "Data Loss Warning","Datenverlust Warnung" },
 { "Proceed","Weitermachen" },
 { "The journal entries can not be\nexported to a vCalendar file.","Die Journal Einträge können\nnicht in eine vCalendar\nDatei exportiert werden!" },
 { "Filter disabled ","Filter abgeschaltet" },
 { "Filter selected: ","Gewählter Filter: " },
 { "Toggle Cancel","Gecancelt ändern" },
 { "&Toggle Cancel","Gecancel&t ändern" },
 { "Configure Toolbar","Konfiguriere Toolbar" },
 { "Stretched TB","Gedehnte TB" },
 { "Import file \n...%1\ndoes not exist!\nNothing imported!\n","Import Datei \n...%1\nexistiert nicht!\nNichts importiert!\n" },
 { "Import filename(*.ics/*.vcs)","Import Dateiname(*.ics/*.vcs)" },
 { "When importing a calendar twice\nduplicated events will be ignored!\nYou can create a backup file with\nFile - Save Calendar Backup\nto revert importing","Wenn ein Kalender doppelt importiert\nwird, werden doppelte Einträge ignoriert!\nSie können eine Backup Datei anlegen unter\nDatei - Speichere Kalender Backup\num den Import rückgängig machen zu können.\n" },
 { "Not supported \non desktop!\n","Nur verfügbar auf PDA!" },
 { "Imported file successfully","Datei erfolgreich importiert" },
 { "Error importing file","Fehler beim Importieren der Datei" },
 { "Export vcal filename(*.vcs)","Export vcal Dateiname(*.vcs)" },
 { "Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n","Zu speichernde Datei\existiert bereits!\nExist. Datei vom:\n%1\nÜberschreiben?\n" },
 { "Overwrite!","Überschreiben!" },
 { "Import file \n...%1\nfrom:\n%2\nDuplicated entries\nwill not be imported!\n","Import Datei \n...%1\nvom:\n%2\nDuplizierte Einträge\nwerden nicht importiert!\n" },
 { "Load backup filename","Lade Backup Dateiname" },
 { "Backup file\ndoes not exist!\nNothing loaded!","Backup Datei\nexistiert nicht!\nNichts geladen!" },
 { "KO/Pi:Loaded %1","KO/Pi:Geladen %1" },
 { "Save backup filename","Speichere Backup Dateiname" },
 { "Backup file\nalready exists!\nOld backup file from:\n%1\nOverwrite?\n","Backup Datei\nexistiert bereits!\nAlte Backup Datei vom:\n%1\nÜberschreiben?\n" },
 { "KO/Pi:Saved %1","KO/Pi:Gespeichert %1" },
 { "Details of attendee","Teilnehmerdetails" },
 { "Work phone:\n","Telefon Arbeit:\n" },
 { "Work mobile phone:\n","Mobiltelefon Arbeit:\n" },
 { "Home phone:\n","Telefon privat:\n" },
 { "Mobile home phone:\n","Mobiltelefon privat:\n" },
 { "Email:\n","Email:\n" },
 { "Alarm disabled for this item","Alarm deaktiviert für dieses Item" },
 { "Audio Al.: ","Audio Al.: " },
 { "Proc.Al.: ","Proz.Al.: " },
 { "No sound set","Kein Sound definiert" },
 { "*.wav|Wav Files","*.wav|Wav Dateien" },
 { "No program set","Kein Programm definiert" },
 { "Running '%1'","Ausführen '%1'" },
 { "Playing '%1'","Abspielen '%1'" },
 { "User defined (usertranslation.txt)","Benutzerdefiniert (usertranslation.txt)" },
 { "Load!","Laden!" },
 { "Backup file from:\n%1\nLoading  backup\nfile will delete\nyour current Data!\n","Backup Datei vom:\n%1\nDas Laden der Backup Datei\nlöscht die aktuellen Daten!\n" },
 { "KO/Pi Features and hints","KO/Pi Eigenschaften und Tipps" },
 { "KO/Pi User translation HowTo","KO/Pi Benutzer-Übersetzung HowTo" },
 { "KO/Pi Synchronization HowTo","KO/Pi Synchronisation HowTo" },
 { "Features + hints...","Eigenschaften + Tipps..." },
 { "User translation...","Benutzer Übersetzung..." },
 { "Sync HowTo...","Synchronisation HowTo..." },
 { "Print calendar...","Drucke Kalender..." },
 { "Anniversary","Jahrestag" },
 { "When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n","Wenn Geburtstage mehrfach importiert\nwerden, werden doppelte Einträge ignoriert\nwenn sie nicht verändert wurden.\n" },
 { "Import Birthdays (KA/Pi)","Importiere Geburtstage (KA/Pi)" },
 { "Next recurrence is on: ","Nächste Wiederholung ist am:" },
 { "<b>Alarm on:  </b>","<b>Alarm am:  </b>" },
 { "<b>Access: </b>","<b>Zugriff: </b>" },
 { "(%1 min before)","(%1 min vorher)" },
 { "<b>Categories: </b>","<b>Kategorien: </b>" },
 { "Save Journal/Description...","Speichere Journal/Details..." },
 { "This saves the text/details of selected\nJournals and Events/Todos\nto a text file.","Das speichert den Text bzw.\ndie Details von selektierten\nJournalen und Events/Todos\nin eine Textdatei." },
 { "Continue","Weitermachen" },
 { " birthdays/anniversaries added!"," Geburts-/Jahrestage hinzugefügt" },
 { "Attendee:","Teilnehmer:" },
 { "Click OK to search ->","Klicke zum Suchen auf OK ->" },
 { "On day ","Am Tag " },
 { "%1 of ","%1 des Monats" },
 { "%1 of the year","%1 des Jahres" },
 { "Anonymous","Anonymo" },
 { "nobody@nowhere","niemand@nirgendwo" },
 { "calendar.html","calendar.html" },
 { " Local Time"," Locale Zeit" },
 { "Unknown Name","Unbekannter Name" },
 { "unknown@nowhere","unbekannt@nirgendwo" },
 { "Beam via IR!","Beam via IR!" },
 { "Next Month","Nächster Monat" },
 { "Prio","Prio" },
 { "Reparent Todo","Mache Sub-Todo" },
 { "tomorrow","morgen" },
 { "today","heute" },
 { "yesterday","gestern" },
 { "Ok","Ok" },
 { "Ok+Agenda","Ok+Agenda" },
 { "Email","Email" },
 { "RSVP","RSVP" },
 { "Email:","Email:" },
 { "Appointment Time ","Termin Zeit " },
 { "2","2" },
 { "3","3" },
 { "4","4" },
 { "  0 %","  0 %" },
 { " 20 %"," 20 %" },
 { " 40 %"," 40 %" },
 { " 60 %"," 60 %" },
 { " 80 %"," 80 %" },
 { "100 %","100 %" },
 { "Filter","Filter" },
 { "Configure","Konfiguriere" },
 { "What's Next","What's Next" },
 { "Complete calendar...","Kompletten Kalender..." },
 { "Filtered calendar...","Gefilterten Kalender..." },
 { "Export to phone","Exportiere zum Handy" },
 { "Beam receive enabled","Beam Empfang an" },
 { "What's new?","Was ist neu?" },
 { "FAQ...","FAQ..." },
 { "Licence...","Licence..." },
 { "What's This?","What's This?" },
 { "&Edit...","&Editiere..." },
 { "Oktober","Oktober" },
 { "Title","Titel" },
 { "%1 %","%1 %" },
 { "Enable Pi-Sync","Schalte Pi-Sync an" },
 { "Import!","Importiere!" },
 { "inserting birthdays - close to abort!","Burzeltage werden eingefügt - schließe um abzubrechen!" },
 { "Export to phone options","Export ans Handy Optionen" },
 { "Please read Help-Sync Howto\nto know what settings to use.","Bitte lese Hilfe-Sync Howto\num zu erfahren welche Einstellungen\ndie richtigen sind." },
 { "I/O device: ","I/O device: " },
 { "Connection: ","Connection: " },
 { "Model(opt.): ","Model(opt.): " },
 { "Write back events in future only","Schreibe nur zukünftige Termine zurück" },
 { "Max. weeks in future: ","Max. Wochen in der Zukunft: " },
 { "NOTE: This will remove all old\ntodo/calendar data on phone!","ACHTUNG: Das löscht alle alten\nTodo/Kalender Daten auf dem Handy!" },
 { "Export to mobile phone!","Exportiere auf das Handy!" },
 { "Export complete calendar","Exportiere kompletten Kalender" },
 { "Writing to phone...","Sende Daten ans Handy..." },
 { " This may take 1-3 minutes!"," Das kann 1-3 Minuten dauern!" },
 { "Retry","Nochmal versuchen" },
 { "KDE/Pim phone access","KDE/Pim Handy Zugriff" },
 { "Error accessing device!\nPlease turn on connection\nand retry!","Fehler beim Zugriff auf das Gerät!\nBitte die Verbindung aktivieren\nund nochmal versuchen!" },
 { "Error exporting to phone!","Fehler beim Export auf das Handy!" },
 { "Export filtered calendar","Exportiere gefilterten Kalender" },
 { "Preferences","Vorlieben" },
 { "Global","Global" },
 { "Phone","Phone" },
 { "SMS","SMS" },
 { "Fax","Fax" },
 { "Pager","Pager" },
 { "SIP","SIP" },
 { "Italian","Italienisch" },
 { "24:00","24:00" },
 { "12:00am","12:00am" },
 { "24.03.2004 (%d.%m.%Y|%A %d %B %Y)","24.03.2004 (%d.%m.%Y|%A %d %B %Y)" },
 { "03.24.2004 (%m.%d.%Y|%A %B %d %Y)","03.24.2004 (%m.%d.%Y|%A %B %d %Y)" },
 { "2004-03-24 (%Y-%m-%d|%A %Y %B %d)","2004-03-24 (%Y-%m-%d|%A %Y %B %d)" },
 { "Mon 19.04.04: %a %d.%m.%y","Mon 19.04.04: %a %d.%m.%y" },
 { "Mon, 19.Apr.04: %a, %d.%b.%y","Mon, 19.Apr.04: %a, %d.%b.%y" },
 { "Add 30 min to selected Timezone","Addiere 30 min zur Zeitzone" },
 { "Used Mail Client","Benutzter Mail Client" },
 { "Channel:","Channel:" },
 { "Message:","Message:" },
 { "Parameters:","Parameter:" },
 { "HINT: Delimiter=; Name=%1,Email=%2","Hinweis: Begrenzer=; Name=%1,Email=%2" },
 { "extra Message:","extra Message:" },
 { "extra Parameters:","extra Parameter:" },
 { "HINT: Emails=%1,Attachments=%2","Hinweis: Emails=%1,Attachments=%2" },
 { "External Apps.","Externe Appl." },
 { "24 hours","24 Std." },
 { "3 hours","3 Std." },
 { "1 hour","1 Std." },
 { "15 minutes","15 Min." },
 { "5 minutes","5 Min." },
 { "1 minute","1 Min." },
 { "23","23" },
 { "Mon 15","Mon 15" },
 { "Configure KO","Konfiguriere KO" },
 { "Event text","Termin Text" },
 { "ToDo","Todo" },
 { "Today","Heute" },
 { "What's Next View","What's Next Ansicht" },
 { "Allday Agenda view shows todos","Ganztag Agenda zeigt Todos" },
 { "Alarm","Alarm" },
 { "Used %1 Client","Benutzter %1 Client" },
 { "No email client installed","Kein Email Klient installiert" },
 { "Userdefined email client","Benutzerdef. Email Klient" },
 { "OM/Pi email client","OM/Pi Email Klient" },
 { "Include in multiple ","Beziehe in multiple " },
 { "calendar  ","Kalender  " },
 { "addressbook  ","Adressbuch  " },
 { "pwmanager","PWmanager" },
 { " sync"," Sync ein" },
 { "Write back synced data","Schreibe gesyncte Daten zurück" },
 { "-- Write back (on remote) existing entries only","-- Schreibe nur existierende (entfernte) Einträge zurück" },
 { "-- Write back (calendar) entries in future only","-- Schreibe nur zukünftige Kalender-Einträge zurück" },
 { "---- Max. weeks in future: ","---- Max. wochen in der Zukunft: " },
 { "Pi-Sync ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync ( direktes Kx/Pi zu Kx/Pi sync )" },
 { "Mobile device (cell phone)","Mobiles Gerät (Handy)" },
 { "Help...","Hilfe..." },
 { "Local file Cal:","Lokale Datei Kal:" },
 { "Local file ABook:","Lokale Datei ABuch:" },
 { "Local file PWMgr:","Lokale Datei PWMgr:" },
 { "Addressbook file (*.vcf) is used by KA/Pi","Adressbuch Datei (*.vcf) wird von KA/Pi genutzt" },
 { "Calendar:","Kalender:" },
 { "AddressBook:","AdressBuch:" },
 { "PWManager:","PWManager:" },
 { "Addressbook file is used by KA/Pi","Adressbuch Datei wird von KA/Pi genutzt" },
 { "ssh/scp","ssh/scp" },
 { "ftp","ftp" },
 { "Password for remote access: (could be the same for each)","Passwort für entfernten Zugriff: (kann dasselbe sein für alle)" },
 { "Remote IP address: (could be the same for each)","Entfernte IP Adresse: (kann dasselbe sein für alle)" },
 { "Remote port number: (should be different for each)","Entfernte Port Nummer: (Sollte für alle unterschiedlich sein)" },
 { "command for downloading remote file to local device","Kommando zum Download der entfernten Datei zum lokalen Gerät" },
 { "command for uploading local temp file to remote device","Kommando zum Upload der lokalen temp. Datei zum entfernten Gerät" },
 { "Insert device where\nphone is connected. E.g.:\n","Füge Device ein, an dem\ndas Handy angeschlossen ist. Z.B.:\n" },
 { "KDE-Pim sync config","KDE-Pim sync Konfig" },
 { "Insert kind of connection,e.g.:\n","Füge Art der Verbindung ein,z.B.:\n" },
 { "Recommended: Leave empty!\n(Such that model can\nbe auto detected)\nOr insert name of model:\n","Empfohlen: Leer lassen!\n(So dass das Model\nautomatisch erkannt\nwerden kann)\nOder füge Model Name ein:\n" },
 { "Port number (Default: %1)","Port Nummer (Default: %1)" },
 { "Password to enable\naccess from remote:","Passwort um entfernten\nZugriff zuzulassen:" },
 { "Automatically start\nat application startup","Starte automatisch\nbeim Programmstart" },
 { "Automatically sync\nwith KDE-Desktop","Automatischer Sync\nmit dem KDE-Desktop" },
 { "Enter port for Pi-Sync","Port Nummer für Pi-Sync" },
 { "Disable Pi-Sync","Schalte Pi-Sync aus" },
 { "Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!","Wollen Sie wirklich\nmit allen selektierten\nProfilen \"Multi-Syncen\"?\nDas Syncen dauert einige Zeit -\nalle Profile werden zweimal gesynct!" },
 { "KDE-Pim Sync","KDE-Pim Sync" },
 { "Multiple profiles","Multi-Sync Profile" },
 { "Device: ","Gerät: " },
 { "Multiple sync started.","Multi-Sync gestartet." },
 { "Nothing synced! No profiles defined for multisync!","Nichts gesynct! Keine Profile\nselektiert für Multi-Sync" },
 { "Turn filter on","Schalte Filter an" },
 { "Turn filter off","Schalte Filter aus" },
 { "Key bindings  KOrganizer/Pi","Tastatur Belegung KOrganizer/Pi" },
 { "<p><b>White</b>: Item readonly</p>\n","<p><b>Weiss</b>: Eintrag schreibgeschützt</p>\n" },
 { "<p><b>Dark yellow</b>:  Event/todo with attendees.</p>\n","<p><b>Dunkelgelb</b>:  Termin/Todo mit Teilnehmern.</p>\n" },
 { "<p><b>Black</b>: Event/todo with attendees. You are the organizer!</p>\n","<p><b>Schwarz</b>: Termin/Todo mit Teilnehmern. Sie sind der Organisator!</p>\n" },
 { "<p><b>Dark green</b>: Information(description) available.([i] in WN view)</p>\n","<p><b>Dunkelgrün</b>: Information(Beschreibung) verfügbar.([i] in WN Ansicht)</p>\n" },
 { "<p><b>Blue</b>: Recurrent event.([r] in Whats'Next view)</p>\n","<p><b>Blau</b>: Wiederholender Termin.([r] in Whats'Next Ansicht)</p>\n" },
 { "<p><b>Red</b>: Alarm set.([a] in Whats'Next view)</p>\n","<p><b>Rot</b>: Alarm gesetzt.([a] in Whats'Next Ansicht)</p>\n" },
 { "<p><b>Cross</b>: Item cancelled.([c] in Whats'Next view)</p>\n","<p><b>Kreuz</b>:  Eintrag gecancelt.([c] in Whats'Next Ansicht)</p>\n" },
 { "<p><b>(for square icons in agenda and month view)</b></p>\n","<p><b>(für quadratische Icons in Agenda und Monats Ansicht)</b></p>\n" },
 { "<p><h2>KO/Pi icon colors:</h2></p>\n","<p><h2>KO/Pi Icon Farben:</h2></p>\n" },
 { "<p><b>E</b>:  Edit item</p>\n","<p><b>E</b>:  Editiere Eintrag</p>\n" },
 { "<p><b>A</b>: Show agenda view.</p>\n","<p><b>A</b>: Zeige Agenda Ansicht.</p>\n" },
 { "<p><b>I,C</b>: Close dialog.</p>\n","<p><b>I,C</b>: Schließe Dialog.</p>\n" },
 { "<p><h3>In event/todo viewer:</h3></p>\n","<p><h3>In Termin/Todo Detail-Anzeige:</h3></p>\n" },
 { "<p><b>shift+up/down</b>: Goto first/last item</p>\n","<p><b>shift+up/down</b>: Gehe zum ersten/letzten Eintrag</p>\n" },
 { "<p><b>ctrl+up/down</b>:  Goto up/down by 20% of items</p>\n","<p><b>ctrl+up/down</b>:  Gehe hoch/runter 20% aller Einträge</p>\n" },
 { "<p><b>up/down</b>: Next/prev item</p>\n","<p><b>up/down</b>: Nächster/vorheriger Eintrag</p>\n" },
 { "<p><b>return+shift</b>: Deselect item+one step down</p>\n","<p><b>return+shift</b>: Deselektiere Item+Cursor einen Eintrag runter</p>\n" },
 { "<p><b>return</b>: Select item+one step down</p>\n","<p><b>return</b>: Selektiere Item+Cursor einen Eintrag runter</p>\n" },
 { "<p><b>I</b>: Show info of current item+one step down.</p>\n","<p><b>I</b>: Zeige Detail-Ansicht vom sel.Eintrag+Cursor einen Eintrag runter.</p>\n" },
 { "<p><h3>In list view:</h3></p>\n","<p><h3>In Listen Ansicht:</h3></p>\n" },
 { "<p><b>return+shift</b>:  Mark item as not completed+one step down</p>\n","<p><b>return+shift</b>:  Markiere Todo als nicht erledigt+Cursor einen Eintrag runter</p>\n" },
 { "<p><b>return</b>: Mark item as completed+one step down.</p>\n","<p><b>return</b>: Markiere Todo als erledigt+Cursor einen Eintrag runter.</p>\n" },
 { "<p><b>Q</b>: Toggle quick todo line edit.</p>\n","<p><b>Q</b>: Zeige/verstecke Quick Todo Eingabe Zeile.</p>\n" },
 { "<p><b>shift+P</b>: Make new <b>P</b>arent for todo selected with shift+S</p>\n","<p><b>shift+P</b>: Mache Todo zum neuen <b>P</b>arent Todo für das Todo, welches mit shift+Sselektiert wurde.</p>\n" },
 { "<p><b>shift+S</b>: Make <b>S</b>ubtodo (reparent todo)</p>\n","<p><b>shift+S</b>: Mache Todo zum <b>S</b>ubtodo</p>\n" },
 { "<p><b>shift+U</b>: <b>U</b>nparent todo (make root todo)</p>\n","<p><b>shift+U</b>: <b>U</b>nparent Todo (Mache Sub-Todo zum Toplevel Todo)</p>\n" },
 { "<p><h3>In todo view:</h3></p>\n","<p><h3>In Todo Anzige:</h3></p>\n" },
 { "<p><b>ctrl+up/down</b>: Scroll small todo view</p>\n","<p><b>ctrl+up/down</b>: Scrolle kleine Todo Ansicht</p>\n" },
 { "<p><b>up/down</b>: Scroll agenda view</p>\n","<p><b>up/down</b>: Scrolle Agenda Ansicht</p>\n" },
 { "<p><h3>In agenda view:</h3></p>\n","<p><h3>In Agenda Ansicht:</h3></p>\n" },
 { "<p><b>del,backspace</b>: Delete selected item</p>\n","<p><b>del,backspace</b>: Lösche selektiertes Item</p>\n" },
 { "<p><b>left</b>: Prev. week | <b>left+ctrl</b>: Prev. month</p>\n","<p><b>left</b>: Vorh. Woche | <b>left+ctrl</b>: Vorh. Monat</p>\n" },
 { "<p><b>right</b>: Next week | <b>right+ctrl</b>: Next month</p>\n","<p><b>right</b>: Nächste Woche | <b>right+ctrl</b>: Nächste Woche</p>\n" },
 { "<p><b>B</b>: Edit description (details) of selected item</p>\n","<p><b>B</b>: Editiere Beschreibung (Details) des selektierten Items</p>\n" },
 { "<p><b>C</b>: Show current time in agenda view</p>\n","<p><b>C</b>: Zeige aktuelle Zeit in Agenda Ansicht</p>\n" },
 { "<p><b>+,-</b> : Zoom in/out agenda | <b>A</b>: Toggle allday agenda height</p>\n","<p><b>+,-</b> : Zoom rein/raus Agenda | <b>A</b>: Wechsle Ganztag Agenda Höhe</p>\n" },
 { "<p><b>S+ctrl</b>: Add sub-todo | <b>X+ctrl</b>: Toggle datenavigator</p>\n","<p><b>S+ctrl</b>: Füge Sub-Todo hinzu | <b>X+ctrl</b>: Zeige/verstecke Datumsnavigator</p>\n" },
 { "<p><b>T</b>: Goto today | <b>T+ctrl</b>: New Todo</p>\n","<p><b>T</b>: Gehe zu Heute | <b>T+ctrl</b>: Neues Todo</p>\n" },
 { "<p><b>E</b>: Edit selected item |<b> E+ctrl</b>: New Event</p>\n","<p><b>E</b>: Editiere selektiertes Item |<b> E+ctrl</b>: Neuer Termin</p>\n" },
 { "<p><b>D</b>: One day view | <b>M</b>: Month view</p>\n","<p><b>D</b>: Ein-Tages Ansicht | <b>M</b>: Monatsansicht</p>\n" },
 { "<p><b>Z,Y</b>: Work week view | <b>U</b>: Week view</p>\n","<p><b>Z,Y</b>: Arbeitswochenansicht | <b>U</b>: Wochenansicht</p>\n" },
 { "<p><b>V</b>: Todo view | <b>L</b>: Event list view</p>\n","<p><b>V</b>: Todo Ansicht | <b>L</b>: Termin Listen Ansicht</p>\n" },
 { "<p><b>X</b>: Next X days view| <b>W</b>: What's next view\n ","<p><b>X</b>: Nächste-X-Tage Ansicht | <b>W</b>: What's Next Ansicht\n " },
 { "<p><b>1-0</b> (+<b>ctrl</b>): Select filter 1-10 (11-20)</p>\n","<p><b>1-0</b> (+<b>ctrl</b>): Selektiere Filter 1-10 (11-20)</p>\n" },
 { "<p><b>O</b>: Filter On/Off | <b>J</b>: Journal view</p>\n","<p><b>O</b>: Filter An/Aus | <b>J</b>: Journal Ansicht</p>\n" },
 { "<p><b>F</b>: Toggle filterview |<b>F+ctrl</b>: Edit filter </p>\n","<p><b>F</b>: Zeige/verstecke Filter Ansicht |<b>F+ctrl</b>: Editiere Filter </p>\n" },
 { "<p><b>Space</b>: Toggle fullscreen | <b>P</b>: Date picker</p>\n","<p><b>Space</b>: Zeige fullscreen | <b>P</b>: Datums Picker</p>\n" },
 { "<p><b>I</b>: Show info for selected event/todo</p>\n","<p><b>I</b>: Zeige Info (Details) für selektiertes Item</p>\n" },
 { "<p><b>H</b>: This help dialog | <b>S</b>: Search dialog</p>\n","<p><b>H</b>: Dieser Hilfe Dialog | <b>S</b>: Such Dialog</p>\n" },
 { "<p><h2>KO/Pi key shortcuts:</h2></p>\n","<p><h2>KO/Pi Tastatur Kurzbefehle:</h2></p>\n" },
 { "After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configurable) three minutes.\nFor safety reasons there is  one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n","Nachdem etwas geändert wurde, werden die\nDaten automatisch in die Datei abgespeichert\n~/kdepim/apps/korganizer/mycalendar.ics\nnach (konfigurierbar) drei Minuten.\nAus Sicherheitsgründen wird noch einmal\nnach 10 Min. abgespeichert, wenn keine\nÄnderungen vorgenommen wurden. Die \nDaten werden automatisch gespeichert,\nwenn KO/Pi beendet wird.\nSie können eine Backup-Datei erstellen im\nMenu: Datei - Speichere Kalender Backup\n" },
 { "Auto Saving in  KOrganizer/Pi","Auto Speichern in  KOrganizer/Pi" },
 { "\nhttp://sourceforge.net/projects/kdepimpi\n","\nhttp://sourceforge.net/projects/kdepimpi\n" },
 { "\nor report them in the bugtracker on\n","\noder trage sie in dem Bugtracker ein auf\n" },
 { "\nPlease report unexpected behaviour to\nlutz@pi-sync.info\n","\nBitte melde fehlerhaftes Verhalten an\nlutz@pi-sync.info\n" },
 { "2) Audio alarm daemon\nfor Zaurus is available!\nas an additional small application\n","2) Ein Audio Alarm Daemon\nfür den Zaurus ist verfügbar\nals zusätzliche Anwendung\n" },
 { "1) Importing *.vcs or *.ics files from\nother applications may not work properly,\nif there are events with properties\nKO/Pi does not support.\n","1) Importieren von *.vcs oder *.ics Dateien von\nanderen Anwendungen kann möglicherweise\n nicht richtig funktionieren,\nwenn die Termine Eigenschaften haben,\ndie KO/Pi nicht unterstützt.\n" },
 { "Known Problems in  KOrganizer/Pi","Bekannte Probleme in  KOrganizer/Pi" },
 { "KO/Pi FAQ","KO/Pi FAQ" },
 { "PDA-Edition\nfor: Zaurus 5x00/7x0/860/3000/6000\n","PDA-Edition\nfür: Zaurus 5x00/7x0/860/3000/6000\n" },
 { "KOrganizer/Platform-independent\n","KOrganizer/Platform-independent\n" },
 { "About KOrganizer/Pi","Über KOrganizer/Pi" },
 { "From: ","Von: " },
 { "Remove sync info","Entferne Sync Info" },
 { "For all profiles","Für alle Profile" },
 { "Hide not Running","Verstecke nicht Laufende" },
 { "ME","ME" },
 { "Toolbar","Toolbar" },
 { "Undo Delete...","Löschen rückgängig machen..." },
 { "Undo Delete","Löschen rückgängig machen" },
 { "KDE Sync HowTo...","KDE Sync HowTo..." },
 { "Multi Sync HowTo...","Multi Sync HowTo..." },
 { "Januar","Januar" },
 { "KO/Pi Keys + Colors","KO/Pi Tasten + Farben" },
 { "No Filter","Kein Filter" },
 { "Multiple Sync options","Multi Sync Optionen" },
 { "Sync algo options","Sync Ablauf Optionen" },
 { "Apply filter when adding data to local:","Filter für das Hinzufügen von Daten zu Lokal:" },
 { "Incoming calendar filter:","Eingehender Kalender Filter:" },
 { "Incoming addressbook filter:","Eingehender Adressbuch Filter:" },
 { "Write back options","Optionen zum Zurückschreiben" },
 { "Write back (on remote) existing entries only","Schreibe nur existierende (auf Entfernt) Einträge zurück" },
 { "Apply filter when adding data to remote:","Filter für das Hinzufügen von Daten zu Entfernt:" },
 { "Outgoing calendar filter:","Ausgehender Kalender Filter:" },
 { "Outgoing addressbook filter:","Ausgehender Adressbuch Filter:" },
 { "Write back (calendar) entries for time period only","Schreibe nur Kalender Einträge für Zeitspanne zurück" },
 { "Time period","Zeitspanne" },
 { "From ","Von " },
 { " weeks in the past to "," Wochen in der Vergangenheit bis zu " },
 { " weeks in the future "," Wochen in der Zukunft " },
 { "Profile kind specific settings","Profil Art abhängige Einstellungen" },
 { "Local temp file:","Lokale temp Datei:" },
 { "Multiple profiles with same name!\nPlease use unique profile names!","Mehrere Profile mit demselben Namen!\nBitte verschiedene Namen benutzen!" },
 { "Aborted! Nothing synced!","Abgebrochen! Nichts wurde gesynct!" },
 { "Language","Sprache" },
 { "Time Format","Zeit Format" },
 { "Time Zone","Zeit Zone" },
 { "%1 groups subscribed","%1 Guppen abboniert" },
 { "Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail","Aktuelles Speicherverzeichnis ist:\n%1\nIhre Mail wird gespeichert in:\n(speicherverz.)/apps/kopiemail/localmail" },
 { "<b>New data storage dir:</b>","<b>Neues Datenspeicherverzeichnis:</b>" },
 { "New dirs are created automatically","Neue Verzeichnisse werden aut. erstellt" },
 { "Save settings","Speichere Einstellungen" },
 { "Save standard","Speichere Standard" },
 { "<b>New settings are used\nafter a restart</b>","<b>Neue Einstellungen werden nach\neinem Neustart genutzt</b>" },
 { "Settings are stored in\n%1","Einstellungen werden gespeichert in:\n%1" },
 { "Data storage path","Daten Speicherpfad" },
 { "Language","Sprache" },
 { "Show time in agenda items","Zeige Zeit in Agenda Items" },
 { "Color for Sundays + category "Holiday"","Farbe für Sonntags + Kategorie "Feiertag"" },
 { "Show events, that are done","Zeige abgelaufene Termine" },
 { "Hide not running Todos in To-do view","Verstecke nicht laufende Todos" },
 { "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
 { "KO/Pi","KO/Pi" },
 { "There is nothing to undo!","Es gibt nichts zum\nRückgängigmachen!" },
 { "Recreating edit dialog. Please wait...","Recreating edit dialog. Please wait..." },
 { "Sound.Al.: ","Sound.Al.: " },
 { "From: %1   To: %2   %3","Von: %1   Bis: %2   %3" },
 { "Restore","Wiederherstellen" },
 { "\nAre you sure you want\nto restore this?","\nMöchten Sie das wirklicht\nwiederherstellen?" },
 { "% completed","% erledigt" },
 { "%d item(s) found.","%d Item(s) gefunden." },
 { "Set complete","Setze auf erledigt" },
 { "(cancelled)","(gecancelt)" },
 { "Click on the week number to\nshow week in agenda view","Klicke auf die Wochennummer\num die Woche in der Agenda anzuzeigen" },
 { " Local time "," Locale Zeit " },
 { "Form2","Form2" },
 { "Filter enabled","Filter angeschaltet" },
 { "Edit Filters","Ändere Filter" },
 { "Print What's Next View...","Drucke What's Next Ansicht..." },
 { "Agenda","Agenda" },
 { " ("," (" },
 { "<p><b>Due on:</b> %1</p>","<p><b>Fällig am:</b> %1</p>" },
 { "Print","Print" },
 { "&Setup Printer...","Drucker &Setup..." },
 { "View Type","Zeige Typ" },
 { "Page &orientation:","Seiten Ausrichtung:" },
 { "Use Default of Selected Style","Default des selektierten Stils" },
 { "Use Default Setting of Printer","Default Einstellung des Druckers" },
 { "Portrait","Portrait" },
 { "Landscape","Landschaft" },
 { "Print day","Drucke Tag" },
 { "CalPrintDay_Base","CalPrintDay_Base" },
 { "Date && Time Range","Datum && Zeitspanne" },
 { "&End date:","&Enddatum:" },
 { "&Start date:","&Startdatum:" },
 { "Start &time:","Startzeit:" },
 { "End ti&me:","Endzeit:" },
 { "E&xtend time range to include all events","Erweitere Zeitspanne um alle Termine einzuschliessen" },
 { "Include to&dos that are due on the printed day(s)","Inclusive To&dos, die an den selektierten Tagen fällig sind" },
 { "Alt+D","Alt+D" },
 { "&Use colors","Nutze Farben" },
 { "Alt+U","Alt+U" },
 { "Print week","Drucke Woche" },
 { "CalPrintWeek_Base","CalPrintWeek_Base" },
 { "Use &colors","Nutze Farben" },
 { "Type of View","Typ der Ansicht" },
 { "Print as &Filofax page","Drucke als &Filofax Seite" },
 { "Alt+F","Alt+F" },
 { "Print as &timetable view:","Drucke als Zeittabelle:" },
 { "Alt+T","Alt+T" },
 { "Print as split week view","Drucke als gesplittete Wochenansicht" },
 { "Print month","Drucke Monat" },
 { "CalPrintMonth_Base","CalPrintMonth_Base" },
 { "&Start month:","&Startmonat:" },
 { "&End month:","&Endmonat:" },
 { "Print week &numbers","Drucke Wochen Nummer(n)" },
 { "Print todos","Drucke Todos" },
 { "CalPrintTodoConfig_Base","CalPrintTodoConfig_Base" },
 { "Include &description of the item","Inclusive Itembeschreibung" },
 { "Include d&ue date of the item","Inclusive Fälligkeitsdatum des Items" },
 { "Include &priority of the item","Inclusive Priorität des Items" },
 { "Items to Print","Zu druckende Items" },
 { "&From:","Von:" },
 { "&To:","Bis:" },
 { "Print &all todo items","Drucke alle Todo Items" },
 { "Print only &uncompleted items","Drucke nur nicht erledigte Todos" },
 { "Only items due in the &range:","Nur Items in dem Zeitraum:" },
 { "Todo List","Todo Liste" },
 { "&Title:","&Titel:" },
 { "Co&nnect subtodos with its parent","Verbinde 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!" },
 { "Canged 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" },
 { "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 in WN+Agenda","Zeige Sync-Ereignisse in WN+Agenda" },
+{ "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 is gestarted" },
 { "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?" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 17a1d13..df606d0 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -1,1129 +1,1166 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Eitzenberger Thomas <thomas.eitzenberger@siemens.at>
     Parts of the source code have been copied from kdpdatebutton.cpp
 
     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 ode for Qt in the source distribution.
 */
 
 #include <qevent.h>
 #include <qpainter.h>
 #include <qptrlist.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
 
 #include <libkcal/vcaldrag.h>
 #include <libkcal/icaldrag.h>
 #include <libkcal/dndfactory.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 #include <kresources/resourceselectdialog.h>
 
 #include <kcalendarsystem.h>
 
 #ifndef KORG_NOPLUGINS
 #include "kocore.h"
 #endif
 #include "koprefs.h"
 #include "koglobals.h"
 
 #include "kodaymatrix.h"
 
 // ============================================================================
 //  D Y N A M I C   T I P
 // ============================================================================
 
 DynamicTip::DynamicTip( QWidget * parent )
     : QToolTip( parent )
 {
     matrix = (KODayMatrix*)parent;
 }
 
 class KODaymatrixWhatsThis :public QWhatsThis
 {
 public:
     KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;};
     ~KODaymatrixWhatsThis() { ;  };
 
 protected:
   virtual QString text( const QPoint& p )
   {
     return _view->getWhatsThisText( p ) ;
   }
 private:
   KODayMatrix * _view;
 };
 
 void DynamicTip::maybeTip( const QPoint &pos )
 {
   //calculate which cell of the matrix the mouse is in
   QRect sz = matrix->frameRect();
   int dheight = sz.height()*7 / 42;
   int dwidth = sz.width() / 7;
   int row = pos.y()/dheight;
   int col = pos.x()/dwidth;
 
   QRect rct(col*dwidth, row*dheight, dwidth, dheight);
 
 //  kdDebug() << "DynamicTip::maybeTip matrix cell index [" <<
 //                col << "][" << row << "] => " <<(col+row*7) << endl;
 
   //show holiday names only
   QString str = matrix->getHolidayLabel(col+row*7);
   if (str.isEmpty()) return;
   tip(rct, str);
 }
 
 
 // ============================================================================
 //  K O D A Y M A T R I X
 // ============================================================================
 
 const int KODayMatrix::NOSELECTION = -1000;
 const int KODayMatrix::NUMDAYS = 42;
 
 KODayMatrix::KODayMatrix( QWidget *parent, const char *name )
     : QFrame( parent, name , Qt::WRepaintNoErase ), mCalendar( 0 )
 
 #if 0
 KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name) :
   QFrame(parent, name)
 #endif
 { 
     oldW = 0;
     oldH = 0;
     myPix.resize( 150, 120 );
     mRedrawNeeded = true;
   mKODaymatrixWhatsThis =  new KODaymatrixWhatsThis(this);
   mPendingUpdateBeforeRepaint = false;
   mouseDown = false;
   // initialize dynamic arrays
   bDays.resize ( NUMDAYS );
   pDays.resize ( NUMDAYS );
   hDays.resize ( NUMDAYS );
   eDays.resize ( NUMDAYS );
   days = new QDate[NUMDAYS];
   daylbls = new QString[NUMDAYS];
   //events = new int[NUMDAYS];
   mToolTip = new DynamicTip(this);
 
   // set default values used for drawing the matrix
   mDefaultBackColor = palette().active().base();
   mDefaultTextColor = palette().active().foreground();
   mDefaultTextColorShaded = getShadedColor(mDefaultTextColor);
   mHolidayColorShaded = getShadedColor(KOPrefs::instance()->mHolidayColor);
   mSelectedDaysColor = QColor("white");
   mTodayMarginWidth = 2;
   mSelEnd = mSelStart = NOSELECTION;
 
   setAcceptDrops(true);
   //setFont( QFont("Arial", 10) );
 
   mUpdateTimer = new QTimer( this );
   connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( updateViewTimed() ));
   mRepaintTimer = new QTimer( this );
   connect (mRepaintTimer ,SIGNAL(timeout()), this, SLOT ( repaintViewTimed() ));
   mDayChanged = false;
   updateView();
 }
 QString KODayMatrix::getWhatsThisText( QPoint p )
 {
 
     int tmp = getDayIndexFrom(p.x(), p.y());
     if ( tmp < 0 || tmp > NUMDAYS-1 || !mCalendar )
         return QString();
     QDate mDate = days[tmp];
     QPtrList<Event> eventlist = mCalendar->events(mDate);
     Event *event;
     QStringList mToolTip;
     for(event=eventlist.first();event != 0;event=eventlist.next()) {
         QString mToolTipText;
         QString text;
         int multiday = 0;// 1 = start, 2 = midddle, 3 = end day
         if (event->isMultiDay()) {
             QString prefix = "<->";multiday = 2; 
             QString time;
             if ( event->doesRecur() ) {
                 if ( event->recursOn( mDate) ) {
                     prefix ="->" ;multiday = 1;
                 }
                 else {
                     int days =  event->dtStart().date().daysTo ( event->dtEnd().date() );
                     if ( event->recursOn( mDate.addDays( -days)) ) {
                         prefix ="<-" ;multiday = 3;
                     }
                 } 
             } else {
                 if (mDate == event->dtStart().date()) {
                     prefix ="->" ;multiday = 1;
                 } else if (mDate == event->dtEnd().date()) {
                     prefix ="<-" ;multiday = 3;
                 }
             }
             if ( !event->doesFloat() ) {
                 if ( mDate == event->dtStart().date () )
                     time = KGlobal::locale()->formatTime(event->dtStart().time())+" ";
                 else if ( mDate == event->dtEnd().date () )
                     time = KGlobal::locale()->formatTime(event->dtEnd().time())+" ";
 
             }
             text = time + event->summary();
             mToolTipText += prefix + text;
         } else {
             if (event->doesFloat()) {
                 text = event->summary();
                 mToolTipText += text;
             }
             else {
                 text = KGlobal::locale()->formatTime(event->dtStart().time());
                 text += " " + event->summary();
                 mToolTipText +=  KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
             }
         }
         if ( !event->location().isEmpty() )
             mToolTipText += " (" + event->location() + ")";
 #if QT_VERSION >= 0x030000
         mToolTipText.replace( '<' , "&lt;" );
         mToolTipText.replace( '>' , "&gt;" );
 #else
         if ( mToolTipText.find ('<') >= 0 ) {
             mToolTipText.replace( QRegExp("<") , "&lt;" );
         }
         if ( mToolTipText.find ('>') >= 0 ) {
             mToolTipText.replace( QRegExp(">") , "&gt;" );
         }
 #endif
         //qDebug("TTT: %s ", mToolTipText.latin1());
         mToolTip.append( mToolTipText );
     }
     mToolTip.sort();
     return  "<b>"+KGlobal::locale()->formatDate(days[tmp]) + "</b><br>" + mToolTip.join("<br>");
 }
 void KODayMatrix::setCalendar( Calendar *cal )
 {
   mCalendar = cal;
 
   setAcceptDrops( mCalendar );
 
   updateEvents();
 }
 
 QColor KODayMatrix::getShadedColor(QColor color)
 {
   QColor shaded;
   int h=0;
   int s=0;
   int v=0;
   color.hsv(&h,&s,&v);
   s = s/4;
   v = 192+v/4;
   shaded.setHsv(h,s,v);
 
   return shaded;
 }
 
 KODayMatrix::~KODayMatrix()
 {
     //  delete mKODaymatrixWhatsThis;
   delete [] days;
   delete [] daylbls;
   //delete [] events;
   delete mToolTip;
 }
 
 /*
 void KODayMatrix::setStartDate(QDate start)
 {
   updateView(start);
 }
 */
 
 void KODayMatrix::addSelectedDaysTo(DateList& selDays)
 {
  
   if (mSelStart == NOSELECTION) {
     return;
   }
 
   //cope with selection being out of matrix limits at top (< 0)
   int i0 = mSelStart;
   if (i0 < 0) {
     for (int i = i0; i < 0; i++) {
       selDays.append(days[0].addDays(i));
     }
     i0 = 0;
   }
 
   //cope with selection being out of matrix limits at bottom (> NUMDAYS-1)
   if (mSelEnd > NUMDAYS-1) {
     for (int i = i0; i <= NUMDAYS-1; i++) {
       selDays.append(days[i]);
     }
     for (int i = NUMDAYS; i < mSelEnd; i++) {
       selDays.append(days[0].addDays(i));
     }
 
   // apply normal routine to selection being entirely within matrix limits
   } else {
     for (int i = i0; i <= mSelEnd; i++) {
       selDays.append(days[i]);
     }
   }
 }
 
 bool KODayMatrix::setSelectedDaysFrom(const QDate& start, const QDate& end)
 {  
     mRedrawNeeded = true;
     bool noSel = (mSelEnd == NOSELECTION && mSelStart == NOSELECTION );
   mSelStart = startdate.daysTo(start);
   if ( mSelStart < 0 )
       mSelStart = 0;
   mSelEnd = startdate.daysTo(end);
   if ( mSelEnd  > NUMDAYS-1 )
       mSelEnd = NUMDAYS-1;
   if ( mSelEnd < 0 || mSelStart >  NUMDAYS-1 ) {
       clearSelection();
       if ( noSel )
           return false;
   }
  
   return true;
 }
 void KODayMatrix::clearSelection()
 {
     mSelEnd = mSelStart = NOSELECTION;
 }
 
 
 void KODayMatrix::recalculateToday()
 {
     today = -1;
     for (int i=0; i<NUMDAYS; i++) {
         //events[i] = 0;
       days[i] = startdate.addDays(i);
       daylbls[i] = QString::number( KOGlobals::self()->calendarSystem()->day( days[i] ));
       
       // if today is in the currently displayed month, hilight today
       if (days[i].year() == QDate::currentDate().year() &&
           days[i].month() == QDate::currentDate().month() &&
           days[i].day() == QDate::currentDate().day()) {
         today = i;
       }
     }
     // qDebug(QString("Today is visible at %1.").arg(today));
 }
 
 void KODayMatrix::updateView()
 {
   updateView(startdate);
 }
 void KODayMatrix::repaintViewTimed()
 { 
     mRedrawNeeded = true;
     // bDays.fill( false);
     //pDays.fill( false);
     //hDays.fill( false);
     //eDays.fill( false);
     mRepaintTimer->stop(); 
     int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday
     int i;
     for(i = 0; i < NUMDAYS; i++) {
         if ( ( (i+startDay) % 7 == 0 ) ) {
             pDays.setBit(i);
         }
     }
     repaint(false);
 }
 void KODayMatrix::computeEvent(Event *event, int i )
 {
     QString holiStr = mHolidays[i];
     if ( event->isHoliday()) {
         pDays.setBit(i);
         hDays.setBit(i);
         if ( !holiStr.isEmpty() )
             holiStr += "\n";
         holiStr += event->summary();
         if ( !event->location().isEmpty() )
             holiStr += " (" + event->location() + ")";
         mHolidays[i] =holiStr ;
+        eDays.setBit(i);
     }
-    if ( event->isBirthday()) {
-        pDays.setBit(i);
-        if ( !holiStr.isEmpty() )
-            holiStr += "\n";
-        holiStr += i18n("Birthday") + ": "+event->summary();
-        if ( !event->location().isEmpty() )
-            holiStr += " (" + event->location() + ")";
-        bDays.setBit(i);
-        mHolidays[i] =holiStr ;
+    if ( KOPrefs::instance()->mCurrentDisplayedView != VIEW_T_VIEW && KOPrefs::instance()->mCurrentDisplayedView != VIEW_J_VIEW ) {
+        if ( event->isBirthday()) {
+            pDays.setBit(i);
+            if ( !holiStr.isEmpty() )
+                holiStr += "\n";
+            holiStr += i18n("Birthday") + ": "+event->summary();
+            if ( !event->location().isEmpty() )
+                holiStr += " (" + event->location() + ")";
+            bDays.setBit(i);
+            mHolidays[i] =holiStr ;
+        }
     }
-    eDays.setBit(i);
+    if ( KOPrefs::instance()->mCurrentDisplayedView != VIEW_J_VIEW )
+        eDays.setBit(i);
 }
 void KODayMatrix::updateViewTimed()
 {
     mUpdateTimer->stop(); 
     if ( !mCalendar ) {
         qDebug("NOT CAL ");
         return;
     }
 #if 1
 
+   
  int i;
     int timeSpan = NUMDAYS-1;
     QPtrList<Event> events = mCalendar->events();
     Event *event;
     QDateTime dt;
     bool ok;
     bDays.fill( false);
     pDays.fill( false);
     hDays.fill( false);
     eDays.fill( false);
     mHolidays.clear();
     QDate mStartDate = days[0];
     QDate endDate =  mStartDate.addDays( timeSpan );
     for( event = events.first(); event; event = events.next() ) { // for event
         ushort recurType = event->recurrence()->doesRecur();
         if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) ||
             (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) {
             continue;
         }
         if ( event->doesRecur() ) {
             bool last;
             QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last );
             QDateTime incidenceEnd;
             int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date()  );
             bool invalid = false;
             while( true ) {
                     if ( incidenceStart.isValid() ) {
                         incidenceEnd = incidenceStart.addDays( eventlen );
                         int st =   incidenceStart.date().daysTo( endDate );
                         if ( st >= 0 ) { // start before timeend
                             int end = mStartDate.daysTo( incidenceEnd.date() );
                             if ( end >= 0 ) { // end after timestart --- got one!
                                 //normalize
                                 st =  timeSpan - st;
                                 if ( st < 0 ) st = 0;
                                 if ( end > timeSpan ) end = timeSpan;
                                 int iii;
                                 //qDebug("found %s %d %d ",event->summary().latin1(), st, end );
                                 for ( iii = st;iii<= end;++iii) {
                                     computeEvent( event, iii );
                                 }
                             }
                         }
                     } else {
                         if ( invalid )
                             break;
                         invalid = true;
                         //qDebug("invalid %s", event->summary().latin1());
                         incidenceStart = QDateTime( mStartDate ).addSecs( -2 );;
                     }
                     if ( last )
                         break;
                     bool ok;
                     incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok );
                     if ( ! ok )
                         break;
                     if ( incidenceStart.date() > endDate )
                         break;
             }
         } else { // no recur 
             int st =  event->dtStart().date().daysTo( endDate );
             if ( st >= 0 ) { // start before timeend
                 int end = mStartDate.daysTo( event->dtEnd().date() );
                 if ( end >= 0 ) { // end after timestart --- got one!
                     //normalize
                     st =  timeSpan - st;
                     if ( st < 0 ) st = 0;
                     if ( end > timeSpan ) end = timeSpan;
                     int iii;
                     for ( iii = st;iii<= end;++iii)
                         computeEvent( event, iii );
                 }
             }
         }
     }
     int startDay = days[0].dayOfWeek(); // 1...7 7 = sunday
     for(i = 0; i < NUMDAYS; i++) {
         if ( ( (i+startDay) % 7 == 0 ) ) {
             pDays.setBit(i);
         }
     }
-
-#if 0
-    // insert due todos
-    QPtrList<Todo> todos = calendar()->todos( );
-    Todo *todo;
-    for(todo = todos.first(); todo; todo = todos.next()) {
-        //insertTodo( todo );
-        if ( todo->hasDueDate() ) {
-            int day = mStartDate.daysTo( todo->dtDue().date() );
+    if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_T_VIEW  ) {
+        bDays.fill( false);
+        // insert due todos
+        QPtrList<Todo> todos = mCalendar->todos( );
+        Todo *todo;
+        for(todo = todos.first(); todo; todo = todos.next()) {
+            //insertTodo( todo );
+            if ( todo->hasDueDate() ) {
+                int day = mStartDate.daysTo( todo->dtDue().date() );
+                if ( day >= 0 && day < timeSpan + 1)  {
+                    int i = day;
+                    QString holiStr = mHolidays[i];
+                    pDays.setBit(i);
+                    if ( !holiStr.isEmpty() )
+                        holiStr += "\n";
+                    holiStr += i18n("Todo") + ": "+todo->summary();
+                    if ( !todo->location().isEmpty() )
+                        holiStr += " (" + todo->location() + ")";
+                    bDays.setBit(i);
+                    mHolidays[i] =holiStr ;
+                    eDays.setBit(i);
+                }
+            }
+        }
+    } 
+    if ( KOPrefs::instance()->mCurrentDisplayedView == VIEW_J_VIEW  ) {
+        bDays.fill( false);
+        // insert due todos
+        QPtrList<Journal> todos = mCalendar->journals( );
+        Journal *todo;
+        for(todo = todos.first(); todo; todo = todos.next()) {
+            int day = mStartDate.daysTo( todo->dtStart().date() );
             if ( day >= 0 && day < timeSpan + 1)  {
-                (*cells)[day]->insertTodo( todo );
+                int i = day;
+                QString holiStr = mHolidays[i];
+                pDays.setBit(i);
+                if ( !holiStr.isEmpty() )
+                    holiStr += "\n";
+                holiStr += i18n("Journal");
+                bDays.setBit(i);
+                mHolidays[i] =holiStr ;
+                eDays.setBit(i);
+                
             }
         }
     }
-#endif
-
 #else
     //qDebug("KODayMatrix::updateViewTimed ");
     for(int i = 0; i < NUMDAYS; i++) {
         // if events are set for the day then remember to draw it bold
         QPtrList<Event> eventlist = mCalendar->events(days[i]);
         Event *event;
         int numEvents = eventlist.count();
         QString holiStr = "";
         bDays.clearBit(i);
         hDays.clearBit(i);
         eDays.clearBit(i);
         for(event=eventlist.first();event != 0;event=eventlist.next()) {
             ushort recurType = event->recurrence()->doesRecur();
             if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) ||
                 (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) {
                 numEvents--;
             }
             if ( event->isHoliday()) {
                 hDays.setBit(i);
                 if ( !holiStr.isEmpty() )
                     holiStr += "\n";
                 holiStr += event->summary();
                 if ( !event->location().isEmpty() )
                      holiStr += " (" + event->location() + ")";
             }
             if ( event->isBirthday()) {
                 if ( !holiStr.isEmpty() )
                     holiStr += "\n";
                 holiStr += i18n("Birthday") + ": "+event->summary();
                 if ( !event->location().isEmpty() )
                      holiStr += " (" + event->location() + ")";
                 bDays.setBit(i);
             }
         }
         if ( numEvents ) 
             eDays.setBit(i);
         //if it is a holy day then draw it red. Sundays are consider holidays, too
         if ( (KOGlobals::self()->calendarSystem()->dayOfWeek(days[i]) == KOGlobals::self()->calendarSystem()->weekDayOfPray()) ||
              !holiStr.isEmpty()) {
             mHolidays[i] = holiStr;
         } else {
             mHolidays[i] = QString::null;
         }
     }
 #endif
     mRedrawNeeded = true;
     if ( ! mPendingUpdateBeforeRepaint )
         repaint(false);
 }
 void KODayMatrix::updateView(QDate actdate)
 {
-   
+    if ( mLastView != KOPrefs::instance()->mCurrentDisplayedView )
+        mRedrawNeeded = true;
+    mLastView = KOPrefs::instance()->mCurrentDisplayedView;
     if ( ! actdate.isValid() ) {
         //qDebug("date not valid ");
         return;
     }
     mDayChanged = false;
     //flag to indicate if the starting day of the matrix has changed by this call
     //mDayChanged = false;
     // if a new startdate is to be set then apply Cornelius's calculation
     // of the first day to be shown
     if (actdate != startdate) {
         // reset index of selection according to shift of starting date from startdate to actdate
         if (mSelStart != NOSELECTION) {
             int tmp = actdate.daysTo(startdate);
             //kdDebug() <<  "Shift of Selection1: " << mSelStart << " - " << mSelEnd << " -> " << tmp << "(" << offset << ")" << endl;
             // shift selection if new one would be visible at least partly !
 
             if (mSelStart+tmp < NUMDAYS && mSelEnd+tmp >= 0) {
                 // nested if is required for next X display pushed from a different month - correction required
                 // otherwise, for month forward and backward, it must be avoided
                 if( mSelStart > NUMDAYS || mSelStart < 0 )
                     mSelStart = mSelStart + tmp;
                 if( mSelEnd > NUMDAYS || mSelEnd < 0 )
                     mSelEnd = mSelEnd + tmp;
                     }
         }
         startdate = actdate;
         mDayChanged = true;
         recalculateToday();
         mRedrawNeeded = true;
     }
     //qDebug("restart Timer %d vis: %d", mDayChanged, isVisible() );
     if ( !isVisible() ) {
         mPendingUpdateBeforeRepaint = true; 
     } else {
 #ifdef DESKTOP_VERSION
         //mRepaintTimer->start( 100 );
         //updateViewTimed();
      mUpdateTimer->start( 50 );
 #else
         mRepaintTimer->start( 350 ); 
         mUpdateTimer->start( 800 );
 #endif
     }
 }
 void KODayMatrix::updateEvents()
 {
   if ( !mCalendar ) return;
 
   for( int i = 0; i < NUMDAYS; i++ ) {
     // if events are set for the day then remember to draw it bold
     QPtrList<Event>  eventlist = mCalendar->events( days[ i ] );
     int numEvents = eventlist.count();
     Event *event;
     for( event = eventlist.first(); event != 0;event=eventlist.next()) {
       ushort recurType = event->doesRecur();
 
       if ( ( recurType == Recurrence::rDaily &&
              !KOPrefs::instance()->mDailyRecur ) ||
            ( recurType == Recurrence::rWeekly &&
              !KOPrefs::instance()->mWeeklyRecur ) ) {
         numEvents--;
       }
     } 
     if ( numEvents ) 
         eDays.setBit(i);
     else
         eDays.clearBit(i);
   }
 }
 
 const QDate& KODayMatrix::getDate(int offset)
 {
   if (offset < 0 || offset > NUMDAYS-1) {
       qDebug("Wrong offset2 %d", offset);
     return days[0];
   }
   return days[offset];
 }
 
 QString KODayMatrix::getHolidayLabel(int offset)
 {
   if (offset < 0 || offset > NUMDAYS-1) {
       qDebug("Wrong offset1 %d", offset);
       return QString();
   }
   return mHolidays[offset];
 }
 
 int KODayMatrix::getDayIndexFrom(int x, int y)
 { 
   int colModulo = (width()-2)  % 7;
   int rowModulo = (height()-2)  % 6;
 #if 0
   return 7*(y/daysize.height()) + (KOGlobals::self()->reverseLayout() ? 
             6 - x/daysize.width() : x/daysize.width());
 #endif
   int xVal = (x-colModulo/2-2)/daysize.width();
   int yVal = (y-rowModulo/2-2)/daysize.height();
   
   
   return 7*(yVal) + xVal;
 
 }
 
 // ----------------------------------------------------------------------------
 //  M O U S E   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::mousePressEvent (QMouseEvent* e)
 {
   
     if ( e->button() == LeftButton )
         mouseDown = true; 
   mSelStart = getDayIndexFrom(e->x(), e->y());
   if (mSelStart > NUMDAYS-1) mSelStart=NUMDAYS-1;
   mSelInit = mSelStart;
   mSelEnd = mSelStart; 
   mRedrawNeeded = true;
   repaint(false);
 }
 
 void KODayMatrix::mouseReleaseEvent (QMouseEvent* e)
 {
   mRedrawNeeded = true;
   if ( e->button() == LeftButton )
       if ( ! mouseDown ) {
           return;
       }
       else
           mouseDown = false; 
   int tmp = getDayIndexFrom(e->x(), e->y());
   if (tmp > NUMDAYS-1) tmp=NUMDAYS-1;
 
   if (mSelInit > tmp) {
     mSelEnd = mSelInit;
     if (tmp != mSelStart) {
       mSelStart = tmp;
       repaint(false);
     }
   } else {
     mSelStart = mSelInit;
 
     //repaint only if selection has changed
     if (tmp != mSelEnd) {
       mSelEnd = tmp;
       repaint(false);
     }
   }
 
   DateList daylist;
     if ( mSelStart < 0 )
         mSelStart = 0;
   for (int i = mSelStart; i <= mSelEnd; i++) {
     daylist.append(days[i]);
   }
   emit selected((const DateList)daylist);
 
 }
 
 void KODayMatrix::mouseMoveEvent (QMouseEvent* e)
 { 
     if ( ! mouseDown ) {
         return;
     }
   mRedrawNeeded = true;
   int tmp = getDayIndexFrom(e->x(), e->y());
   if (tmp > NUMDAYS-1) tmp=NUMDAYS-1;
 
   if (mSelInit > tmp) {
     mSelEnd = mSelInit;
     if (tmp != mSelStart) {
       mSelStart = tmp;
       repaint(false);
     }
   } else {
     mSelStart = mSelInit;
 
     //repaint only if selection has changed
     if (tmp != mSelEnd) {
       mSelEnd = tmp;
       repaint(false);
     }
   }
 }
 
 // ----------------------------------------------------------------------------
 //  D R A G ' N   D R O P   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::dragEnterEvent(QDragEnterEvent *e)
 {
 #ifndef KORG_NODND
   if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) {
     e->ignore();
     return;
   }
 
   // some visual feedback
 //  oldPalette = palette();
 //  setPalette(my_HilitePalette);
 //  update();
 #endif
 }
 
 void KODayMatrix::dragMoveEvent(QDragMoveEvent *e)
 {
 #ifndef KORG_NODND
   if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) {
     e->ignore();
     return;
   }
 
   e->accept();
 #endif
 }
 
 void KODayMatrix::dragLeaveEvent(QDragLeaveEvent */*dl*/)
 {
 #ifndef KORG_NODND
 //  setPalette(oldPalette);
 //  update();
 #endif
 }
 
 void KODayMatrix::dropEvent(QDropEvent *e)
 {
 #ifndef KORG_NODND
 //  kdDebug() << "KODayMatrix::dropEvent(e) begin" << endl;
 
   if (!mCalendar || !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) ) {
     e->ignore();
     return;
   }
 
   DndFactory factory( mCalendar );
   Event *event = factory.createDrop(e);
 
   if (event) {
     e->acceptAction();
 
     Event *existingEvent = mCalendar->event(event->uid());
 
     if(existingEvent) {
       // uniquify event
       event->recreate();
 /*
       KMessageBox::sorry(this,
               i18n("Event already exists in this calendar."),
               i18n("Drop Event"));
       delete event;
       return;
 */
     }
 //      kdDebug() << "Drop new Event" << endl;
     // Adjust date
     QDateTime start = event->dtStart();
     QDateTime end = event->dtEnd();
     int duration = start.daysTo(end);
     int idx = getDayIndexFrom(e->pos().x(), e->pos().y());
 
     start.setDate(days[idx]);
     end.setDate(days[idx].addDays(duration));
 
     event->setDtStart(start);
     event->setDtEnd(end);
     mCalendar->addEvent(event);
 
     emit eventDropped(event);
   } else {
 //    kdDebug() << "KODayMatrix::dropEvent(): Event from drop not decodable" << endl;
     e->ignore();
   }
 #endif
 }
 
 // ----------------------------------------------------------------------------
 //  P A I N T   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::paintEvent(QPaintEvent * pevent)
 {
   
     if ( width() <= 0  || height() <= 0 )
         return;
     if ( mPendingUpdateBeforeRepaint ) {
         updateViewTimed();
         mPendingUpdateBeforeRepaint = false;
     }
 #if 0
     if ( myPix.width() != width() || myPix.height()!=height() ) {
         myPix.resize(size() );
         mRedrawNeeded = true;
     }
 #endif 
     if ( oldW != width() || oldH !=height() )
         mRedrawNeeded = true;
     
     oldH = height() ;
     oldW = width();
     if ( myPix.width() < width() || myPix.height() < height() ) {
         myPix.resize(size() );
         mRedrawNeeded = true;
         
     }
     
     if ( mRedrawNeeded ) {
         //qDebug("REDRAW ");
         QPainter p(&myPix);
         p.setFont(font());
 
 
         int dheight = daysize.height();
         int dwidth = daysize.width();
         int row,col;
         int selw, selh;
         int xyOff = frameWidth();
         int colModulo = (width()-2)  % 7;
         int rowModulo = (height()-2)  % 6;
         //qDebug("col %d  row %d ",colModulo,rowModulo  );
   
         bool isRTL = KOGlobals::self()->reverseLayout();
 
         // draw background and topleft frame
         p.fillRect(0,0,width(),height(), mDefaultBackColor);
         p.setPen(mDefaultTextColor);
         p.drawRect(0, 0, width(), height());
         int mSelStartT = mSelStart;
         int mSelEndT = mSelEnd;
         if ( mSelEndT >=  NUMDAYS )
             mSelEndT = NUMDAYS-1;
         // draw selected days with highlighted background color
         if (mSelStart != NOSELECTION) {
             bool skip = false;
             if ( ! mouseDown ) {
                 int mo = days[20].month();
                 //qDebug("--  %d %d ", mSelStartT, mSelEndT);
                 //qDebug("%d %d %d - d %d", mo,  days[mSelStartT].month() , days[mSelEndT].month(),  days[mSelEndT].day() );
                 int startMo = days[mSelStartT].month();
                 int endMo = days[mSelEndT].month();
                 if ( startMo == 12 && mo == 1 && endMo <= 2 )
                     startMo = 1;
                 if ( endMo == 1 && mo == 12 )
                     endMo = 12;
                 if ( mo == 12 && startMo == 1 )
                     startMo = 13;
                 if ( (startMo > mo || endMo < mo) ) {
                     skip = true;
                 } else {
                     if ( days[mSelStartT].month() != mo ) {
                         int add = days[mSelStartT].daysInMonth ()-days[mSelStartT].day();
                         mSelStartT += add +1;
                     }
                     if ( days[mSelEndT].month() != mo ) {
                         int sub = days[mSelEndT].day();
                         mSelEndT -= sub ;
                     }
                 }
             }
             //qDebug("SKIP %d ", skip);
             if ( ! skip ) {
                 row = mSelStartT/7;
                 col = mSelStartT -row*7;
                 QColor selcol = KOPrefs::instance()->mHighlightColor;
                 int addCol = 0;
                 int addRow = 0; 
                 int addRow2 = 0; 
                 int addCol2 = 0;
                 if (row == mSelEndT/7) { 
                     if ( rowModulo ) {
                         if ( row >= 6 - rowModulo )
                             addRow = row - 5 + rowModulo;
                     }  
                     if ( colModulo ) {
                         int colt1 = mSelEndT%7;
                         //qDebug("colt1 %d ", colt1 );
                         if ( colt1 >= 7 - colModulo )
                             addCol =  colt1 - 7 + colModulo+1; 
                         int colt = mSelStartT%7;
                         if ( colt >= 7 - colModulo )
                             addCol2 =  colt - 7 + colModulo;
                         addCol -= addCol2;
                         //qDebug("COL %d %d %d %d ",col , colt1 ,addCol ,addCol2 );
                     }
                     // Single row selection
                     //if ( row == 0)
                     //  addRow = 1;
                     p.fillRect(isRTL ? (7 - (mSelEndT-mSelStartT+1) - col)*dwidth : col*dwidth+1+addCol2,
                                row*dheight+addRow, (mSelEndT-mSelStartT+1)*dwidth+addCol, dheight+1, selcol);
                 } else {
                     // draw first row to the right
                     if ( colModulo ) {
                         if ( col >= 7 - colModulo )
                             addCol2 =  col - 7 + colModulo;
                     }
                     if ( rowModulo ) {
                         if ( row >= 6 - rowModulo )
                             addRow = row - 5 + rowModulo;
                     }  
                     //if ( row == 0)
                     //  addRow = 1; 
                     int drawWid = width()-(col*dwidth+1+addCol2)-1;
                     p.fillRect(isRTL ? 0 : col*dwidth+1+addCol2, row*dheight+addRow, drawWid,
                                dheight+1, selcol);
                     // draw full block till last line
                     selh = mSelEndT/7-row; 
                     addRow = 0;
                     if ( rowModulo ) {
                         if ( mSelEndT/7 >= 6 - rowModulo )
                             addRow = mSelEndT/7 - 5 + rowModulo;
                     }  
                     //qDebug("%d %d %d ",selh, row, addRow );
                     int addrow2 = addRow-selh+1;
                     if ( addrow2 < 0 )
                          addrow2 = 0;
                     if (selh > 1) {
                         p.fillRect(1, (row+1)*dheight+addrow2, 7*dwidth+colModulo, (selh-1)*dheight+addRow,selcol);
                     }
                     // draw last block from left to mSelEndT
                     selw = mSelEndT-7*(mSelEndT/7)+1;
                     //qDebug("esl %d ",selw );
                     int add = 0;
                     if ( colModulo ) {
                         add = 7 - colModulo;
                         if ( selw > add )
                             add = selw - add;
                         else
                             add = 0;
                     }
                     //qDebug("add %d ", add);
                     p.fillRect(isRTL ? (7-selw)*dwidth : 1, (row+selh)*dheight+addRow,
                                selw*dwidth+add, dheight+1, selcol);
                 }
             }
         }
 
         // iterate over all days in the matrix and draw the day label in appropriate colors
         QColor actcol = mDefaultTextColorShaded;
         p.setPen(actcol);
         QPen tmppen;
         for(int i = 0; i < NUMDAYS; i++) {
             row = i/7;
             col = isRTL ? 6-(i-row*7) : i-row*7;
 
             // if it is the first day of a month switch color from normal to shaded and vice versa
             if ( KOGlobals::self()->calendarSystem()->day( days[i] ) == 1) {
                 if (actcol == mDefaultTextColorShaded) {
                     actcol = mDefaultTextColor;
                 } else {
                     actcol = mDefaultTextColorShaded;
                 }
                 p.setPen(actcol);
             }
             if (actcol == mDefaultTextColorShaded) { 
                 if ( ! mouseDown ) {
                     continue;
                 }
             }
             //Reset pen color after selected days block
             if (i == mSelEndT+1) {
                 p.setPen(actcol);
             }
 
             // if today then draw rectangle around day
             if (today == i) {
                 tmppen = p.pen();
                 QPen mTodayPen(p.pen());
                 if ( daysize.width() < 20 )
                     mTodayPen.setWidth(1);
                 else
                     mTodayPen.setWidth(mTodayMarginWidth);
                 //draw red rectangle for holidays
                 if (pDays.testBit(i)) {
                     if (actcol == mDefaultTextColor) {
                         mTodayPen.setColor(KOPrefs::instance()->mHolidayColor);
                     } else {
                         mTodayPen.setColor(mHolidayColorShaded);
                     }
                 }
                 //draw gray rectangle for today if in selection
                 if (i >= mSelStartT && i <= mSelEndT) {
                     QColor grey("grey");
                     mTodayPen.setColor(grey);
                 }
                 p.setPen(mTodayPen);
 
 
                 int addCol = 0;
                 int addRow = 0;
                 if (rowModulo) { 
                     if ( row >= 6 - rowModulo )
                         addRow = row - 5 + rowModulo;
                 }  
                 if ( colModulo ) {
                     if ( col >= 7 - colModulo )
                         addCol = col - 6 + colModulo-1;
                 }
          
                 addCol += 1;
                 if ( row == 0 )
                     addRow = 1;
                 p.drawRect(col*dwidth+addCol, row*dheight+addRow, dwidth+1, dheight+1);
                 p.setPen(tmppen);
             }
 
             // if any events are on that day then draw it using a bold font
             if ( eDays.testBit(i) ) {
                 QFont myFont = font();
                 myFont.setBold(true);
                 p.setFont(myFont);
             }
 
             // if it is a holiday then use the default holiday color
             if ( pDays.testBit(i)) {
                 if (  bDays.testBit(i) ) {
                     if ( hDays.testBit(i) )
-                        p.setPen(QColor(Qt::green));
+                        p.setPen(QColor(0,200,0));
                     else
-                        p.setPen(QColor(Qt::green).dark());
+                        p.setPen(QColor(Qt::blue));
                 } else {
                     if (actcol == mDefaultTextColor ) { 
                         p.setPen(KOPrefs::instance()->mHolidayColor);
                     } else {
                         p.setPen(mHolidayColorShaded);
                     }
                 }
             }
 
             // draw selected days with special color
             // DO NOT specially highlight holidays in selection !
             if (i >= mSelStartT && i <= mSelEndT) {
                 ;//p.setPen(mSelectedDaysColor);
             }
 
             int addCol = 0;
             int addRow = 0;
             if ( colModulo ) {
                 if ( col >= 7 - colModulo )
                     addCol = col - 7 + colModulo;
             }
             if ( rowModulo ) {
                 if ( row >= 6 - rowModulo )
                     addRow = row - 5 + rowModulo;
             }
             //qDebug("add %d %d -- %d %d ", col, addCol, row, addRow);
             ++addCol;//++addCol;
             if ( row == 0)
                 addRow = 1;
             p.drawText(col*dwidth+addCol, row*dheight+addRow, dwidth, dheight,
                        Qt::AlignHCenter | Qt::AlignVCenter,  daylbls[i]);
 
             // reset color to actual color
             if (pDays.testBit(i)) {
                 p.setPen(actcol);
             }
             // reset bold font to plain font
             if ( eDays.testBit(i)) {
                 QFont myFont = font();
                 myFont.setBold(false);
                 p.setFont(myFont);
             }
         }
     } else {
         //qDebug("NO  redraw ");
     }
     
     bitBlt (this, pevent->rect().topLeft(), &myPix , pevent->rect() ,CopyROP);
     mRedrawNeeded = false;
 }
 
 // ----------------------------------------------------------------------------
 //  R E SI Z E   E V E N T   H A N D L I N G
 // ----------------------------------------------------------------------------
 
 void KODayMatrix::resizeEvent(QResizeEvent *)
 {
   QRect sz = frameRect();
   daysize.setHeight(sz.height()*7 / NUMDAYS);
   daysize.setWidth(sz.width() / 7);
 }
 
 QSize KODayMatrix::sizeHint() const
 {
 
   QFontMetrics fm ( font() );
   int wid = fm.width( "30") *7+3;
   int hei = fm.height() * 6+3;
   //qDebug("KODayMatrix::sizeHint()********************* %d %d", wid , hei);
   return   QSize ( wid, hei );
 
 }
diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h
index b686bd7..a3216d6 100644
--- a/korganizer/kodaymatrix.h
+++ b/korganizer/kodaymatrix.h
@@ -1,330 +1,331 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2001 Eitzenberger Thomas <thomas.eitzenberger@siemens.at>
 
     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 _KODAYMAT_H
 #define _KODAYMAT_H
 
 #include <libkcal/calendar.h>
 
 #include <qstring.h>
 #include <qframe.h>
 #include <qcolor.h>
 #include <qpen.h>
 #include <qdatetime.h>
 #include <qtooltip.h>
 #include <qpixmap.h>
 #include <qbitarray.h>
 #include <qmap.h>
 
 class QDragEnterEvent;
 class QDragMoveEvent;
 class QDragLeaveEvent;
 class QDropEvent;
 
 class KODayMatrix;
 class KODaymatrixWhatsThis;
 
 using namespace KCal;
 
 
 /**
  *  small helper class to dynamically show tooltips inside the day matrix.
  *  This class asks the day matrix object for a appropriate label which
  *  is in our special case the name of the holiday or null if this day is no holiday.
  */
 class DynamicTip : public QToolTip
 {
 public:
 
     /**
      * Constructor that expects a KODayMatrix object as parent.
      *
      * @param parent the parent KODayMatrix control.
      */
     DynamicTip(QWidget* parent );
 
 protected:
 
     /**
      * Qt's callback to ask the object to provide an approrpiate text for the
      * tooltip to be shown.
      *
      * @param pos coordinates of the mouse.
      */
     void maybeTip( const QPoint & pos);
 
 private:
 
     /** the parent control this tooltip is designed for. */
     KODayMatrix* matrix;
 };
 
 /**
  *  replacement for kdpdatebuton.cpp that used 42 widgets for the day matrix to be displayed.
  *  Cornelius thought this was a waste of memory and a lot of overhead.
  *  In addition the selection was not very intuitive so I decided to rewrite it using a QFrame
  *  that draws the labels and allows for dragging selection while maintaining nearly full
  *  compatibility in behaviour with its predecessor.
  *
  *  The following functionality has been changed:
  *
  *  o when shifting events in the agenda view from one day to another the day matrix is updated now
  *  o TODO ET dragging an event to the matrix will MOVE not COPY the event to the new date.
  *  o no support for Ctrl+click to create groups of dates
  *    (This has not really been supported in the predecessor. It was not very intuitive nor was it
  *     user friendly.)
  *    This feature has been replaced with dragging a selection on the matrix. The matrix will
  *    automatically choose the appropriate selection (e.g. you are not any longer able to select
  *    two distinct groups of date selections as in the old class)
  *  o now that you can select more then a week it can happen that not all selected days are
  *    displayed in the matrix. However this is preferred to the alternative which would mean to
  *    adjust the selection and leave some days undisplayed while scrolling through the months
  *
  *  @short day matrix widget of the KDateNavigator
  *
  *  @author Eitzenberger Thomas
  */
 class KODayMatrix: public QFrame {
 
     Q_OBJECT
 
 public:
 
     /** constructor to create a day matrix widget.
      *
      *  @param parent widget that is the parent of the day matrix. Normally this should
      *                be a KDateNavigator
      *  @param calendar instance of a calendar on which all calculations are based
      *  @param date start date of the matrix (is expected to be already fixed). It is
      *              assumed that this date is the first week day to be shown in the matrix.
      *  @param name name of the widget
      */
     KODayMatrix( QWidget *parent, const char *name );
     //KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const char *name );
 
     /** destructor that deallocates all dynamically allocated private members.
      */
     ~KODayMatrix();
 
     /** updates the day matrix to start with the given date. Does all the necessary
      *  checks for holidays or events on a day and stores them for display later on.
      *  Does NOT update the view visually. Call repaint() for this.
      *
      *  @param actdate recalculates the day matrix to show NUMDAYS starting from this
      *                 date.
      */
     void updateView(QDate actdate);
     void updateEvents();
 
     /** returns the QDate object associated with day indexed by the
      *  supplied offset.
      */
     const QDate& getDate(int offset);
     void setCalendar( Calendar * );
     /** returns the official name of this holy day or 0 if there is no label
      *  for this day.
      */
     QString getHolidayLabel(int offset);
 
     /** adds all actual selected days from mSelStart to mSelEnd to the supplied
      *  DateList.
      */
     void addSelectedDaysTo(DateList&);
 
     /** sets the actual to be displayed selection in the day matrix starting from
      *  start and ending with end. Theview must be manually updated by calling
      *  repaint. (?)
      */
     bool setSelectedDaysFrom(const QDate& start, const QDate& end);
     void clearSelection();
 
     /** Is today visible in the view? Keep this in sync with
     * the values today (below) can take.
     */
     bool isTodayVisible() const { return today>=0; } ;
     
     /** If today is visible, then we can find out if today is 
     * near the beginning or the end of the month.
     * This is dependent on today remaining the index
     * in the array of visible dates and going from
     * top left (0) to bottom right (41).
     */
     bool isBeginningOfMonth() const { return today<=8; } ;
     bool isEndOfMonth() const { return today>=27; } ;
     QString getWhatsThisText( QPoint ) ;
     QSize sizeHint() const;
     QRect frameRect () const { int wid = frameWidth(); return  QRect(0+wid,0+wid,width()-wid-wid,height()-wid-wid);}
 public slots:
     /** Recalculates all the flags of the days in the matrix like holidays or events
      *  on a day (Actually calls above method with the actual startdate).
      */
     void updateView();
     void updateViewTimed();
     void repaintViewTimed();
 
     /**
     * Calculate which square in the matrix should be 
     * hilighted to indicate it's today.
     */
     void recalculateToday();
     
 /*
     void setStartDate(QDate);
 */
 
 signals:
 
     /** emitted if the user selects a block of days with the mouse by dragging a rectangle
      *  inside the matrix
      *
      *  @param daylist list of days that have been selected by the user
      */
     void selected( const KCal::DateList &daylist );
 
     /** emitted if the user has dropped an event inside the matrix
      *
      *  @param event the dropped calendar event
      */
     void eventDropped(Event *event);
 
 protected:
 
     void paintEvent(QPaintEvent *ev);
 
     void mousePressEvent (QMouseEvent* e);
 
     void mouseReleaseEvent (QMouseEvent* e);
 
     void mouseMoveEvent (QMouseEvent* e);
 
     void dragEnterEvent(QDragEnterEvent *);
 
     void dragMoveEvent(QDragMoveEvent *);
 
     void dragLeaveEvent(QDragLeaveEvent *);
 
     void dropEvent(QDropEvent *);
 
     void resizeEvent(QResizeEvent *);
 
 private:
+    int mLastView;
     void computeEvent(Event *even, int dayindex );
     int oldW, oldH;
     bool mRedrawNeeded;
     KODaymatrixWhatsThis* mKODaymatrixWhatsThis;
     bool mouseDown;
     QBitArray bDays;
     QBitArray hDays;
     QBitArray eDays;
     QBitArray pDays;
     QPixmap myPix;
     QTimer* mUpdateTimer;
     QTimer* mRepaintTimer;
     bool mDayChanged;
     bool mPendingUpdateBeforeRepaint;
 
     /** returns the index of the day located at the matrix's widget (x,y) position.
      *
      *  @param x horizontal coordinate
      *  @param y vertical coordinate
      */
     int getDayIndexFrom(int x, int y);
 
     /** calculates a "shaded" color from the supplied color object.
      *  (Copied from Cornelius's kdpdatebutton.cpp)
      *
      *  @param color source based on which a shaded color should be calculated.
      */
     QColor getShadedColor(QColor color);
 
     /** number of days to be displayed. For now there is no support for any other number then 42.
         so change it at your own risk :o) */
     static const int NUMDAYS;
 
     /** calendar instance to be queried for holidays, events, ... */
     Calendar  *mCalendar;
 
     /** starting date of the matrix */
     QDate     startdate;
 
     /** array of day labels to optimeize drawing performance. */
     QString   *daylbls;
 
     /** array of days displayed to reduce memory consumption by
         subsequently calling QDate::addDays(). */
     QDate     *days;
 
     /** array of storing the number of events on a given day.
       *  used for drawing a bold font if there is at least one event on that day.
       */
     //int      *events;
 
     /** stores holiday names of the days shown in the matrix. */
     QMap<int,QString>  mHolidays;
 
     /** indey of today or -1 if today is not visible in the matrix. */
     int       today;
 
     /** index of day where dragged selection was initiated.
         used to detect "negative" timely selections */
     int       mSelInit;
 
     /** if mSelStart has this value it indicates that there is no
         actual selection in the matrix. */
     static const int NOSELECTION;
 
     /** index of first selected day. */
     int       mSelStart;
 
     /** index of last selected day. */
     int       mSelEnd;
 
     /** dynamic tooltip to handle mouse dependent tips for each day in the matrix. */
     DynamicTip* mToolTip;
 
 
     /** default background colour of the matrix. */
     QColor    mDefaultBackColor;
 
     /** default text color of the matrix. */
     QColor    mDefaultTextColor;
 
     /** default text color for days not in the actual month. */
     QColor    mDefaultTextColorShaded;
 
     /** default text color for holidays not in the actual month. */
     QColor    mHolidayColorShaded;
 
     /** text color for selected days. */
     QColor    mSelectedDaysColor;
 
     /** default width of the frame drawn around today if it is visible in the matrix. */
     int       mTodayMarginWidth;
 
     /** stores actual size of each day in the widget so that I dont need to ask this data
      *  on every repaint.
      */
     QRect     daysize;
 
 };
 
 #endif
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 843526d..ae61db6 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -536,1544 +536,1547 @@ void MonthViewCell::setMyPalette()
         mLabel->setPalette( QPalette ( mHolidayPalette.color( QPalette::Normal,QColorGroup::Base),mHolidayPalette.color(QPalette::Normal,QColorGroup::Base )  ));
         setPalette( mHolidayPalette );
         //mLabel->setPalette( mHolidayPalette );
         currentPalette = 1;
 
     } else {
         if ( mPrimary ) {
             if ( currentPalette == 2 ) return;
             mLabel->setPalette( QPalette ( mPrimaryPalette.color( QPalette::Normal,QColorGroup::Base),mPrimaryPalette.color(QPalette::Normal,QColorGroup::Base )  ));
             //mLabel->setPalette( mPrimaryPalette );
             setPalette( mPrimaryPalette );
             currentPalette = 2;
 
         } else {
             if ( currentPalette == 3 ) return;
             setPalette( mNonPrimaryPalette );
              mLabel->setPalette( QPalette ( mNonPrimaryPalette.color( QPalette::Normal,QColorGroup::Base),mNonPrimaryPalette.color(QPalette::Normal,QColorGroup::Base )  ));
              //mLabel->setPalette( mNonPrimaryPalette );;
              currentPalette = 3;
         }
     }
     //QPalette pal = palette();
     
     //mLabel->setPalette( QPalette ( pal.color( QPalette::Normal,QColorGroup::Base),pal.color(QPalette::Normal,QColorGroup::Base )  ));
 }
 QPalette  MonthViewCell::getPalette ()
 {
     if ( !KOPrefs::instance()->mMonthViewUsesDayColors )
         return mStandardPalette;
     if ( mHoliday) {
         return mHolidayPalette ;
     } else {
         if ( mPrimary ) {
             return mPrimaryPalette ;
         } 
     }
     return mNonPrimaryPalette; 
 }
 bool MonthViewCell::isPrimary() const
 {
     return mPrimary;
 }
 
 void MonthViewCell::setHoliday( bool holiday )
 {
     mHoliday = holiday; 
     //setMyPalette();
 }
 
 void MonthViewCell::setHoliday( const QString &holiday )
 {
     mHolidayString = holiday;
 
     if ( !holiday.isEmpty() ) {
         setHoliday( true );
     }
 }
 
 void MonthViewCell::startUpdateCell()
 {
     mdayCount = 0;
     setFocusPolicy(NoFocus); 
     if ( !mMonthView->isUpdatePossible() )
         return;
     MonthViewItem *mitem = (MonthViewItem*) firstItem ();
     while ( mitem ) {
         mitem->setBlockRepaint( true );
         mitem = (MonthViewItem *)mitem->next();
     }
     if ( mAvailItemList.count() > 20 ) {
         mAvailItemList.setAutoDelete( true );
         mAvailItemList.clear();
         mAvailItemList.setAutoDelete( false );
     }
    
     setPrimary( mDate.month()%2 );
     setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays);
     if ( mDate == QDate::currentDate()  ) {
         setLineWidth( 3 );
     } else {
         setLineWidth( 1 );
     }
     MonthViewItem* CurrentAvailItem = (MonthViewItem*) firstItem ();
     //clear(); 
     while ( CurrentAvailItem ) {
             MonthViewItem *item = CurrentAvailItem;
             CurrentAvailItem = (MonthViewItem *)item->next();
             mAvailItemList.append( item ); 
             takeItem ( item );
     }
 
 #ifdef DESKTOP_VERSION
     QToolTip::remove(this); 
 #endif 
     mToolTip.clear(); 
     //qApp->processEvents();
 #if 0
     if ( !mHolidayString.isEmpty() ) {
         MonthViewItem *item = new MonthViewItem( 0, mDate, mHolidayString );
         item->setPalette( mHolidayPalette );
         insertItem( item );
         mToolTip.append ( mHolidayString ); 
     }
 #endif
 }
 
 int MonthViewCell::insertEvent(Event *event)
 {
     bool useToolTips = true;
 #ifndef DESKTOP_VERSION
     useToolTips = false;
 #endif    
     QString mToolTipText;
     setFocusPolicy(WheelFocus); 
         if ( !(event->doesRecur() == Recurrence::rNone) ) {
             if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily )
                 return mdayCount;
             else
                 if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly )
                     return mdayCount;
         }
         
         if ( event->isHoliday()) {
             setHoliday( true );
             if ( mDate.dayOfWeek() == 7 )
                 setLineWidth( 3 );
         }
         QString text;
         int multiday = 0;// 1 = start, 2 = midddle, 3 = end day
         if (event->isMultiDay()) {
             QString prefix = "<->";multiday = 2; 
             QString time;
             if ( event->doesRecur() ) {
                 if ( event->recursOn( mDate) ) {
                     prefix ="->" ;multiday = 1;
                 }
                 else {
                     int days =  event->dtStart().date().daysTo ( event->dtEnd().date() );
                     if ( event->recursOn( mDate.addDays( -days)) ) {
                         prefix ="<-" ;multiday = 3;
                     }
                 } 
 
             } else {
                 if (mDate == event->dtStart().date()) {
                     prefix ="->" ;multiday = 1;
                 } else if (mDate == event->dtEnd().date()) {
                     prefix ="<-" ;multiday = 3;
                 }
             }
             if ( !event->doesFloat() ) {
                 if ( mDate == event->dtStart().date () )
                     time = KGlobal::locale()->formatTime(event->dtStart().time())+" ";
                 else if ( mDate == event->dtEnd().date () )
                     time = KGlobal::locale()->formatTime(event->dtEnd().time())+" ";
 
             }
             text = time + event->summary();
             if ( useToolTips )
                 mToolTipText += prefix + text;
         } else {
             if (event->doesFloat()) {
                 text = event->summary();
                 if ( useToolTips )
                     mToolTipText += text;
             }
             else {
                 text = KGlobal::locale()->formatTime(event->dtStart().time());
                 text += " " + event->summary();
                 if ( useToolTips )
                     mToolTipText +=  KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
             }
         }
         if ( useToolTips && ! event->location().isEmpty() ) {
             mToolTipText += " (" + event->location() +")";
         }
         MonthViewItem *item ;
         
         if ( mAvailItemList.count() ) {
             item = mAvailItemList.first();
             mAvailItemList.remove( item );
             item->recycle( event, mDate, text );
         } else {
             item = new MonthViewItem( event, mDate, text );
         }
         
         QPalette pal;
         if (KOPrefs::instance()->mMonthViewUsesCategoryColor) {    
             QStringList categories = event->categories();
             QString cat = categories.first();
             if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) {
                 pal = getPalette();
                 if (cat.isEmpty()) {
                     pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor);
                 } else {
                     pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
                 }
 
             } else {
                 if (cat.isEmpty()) {
                     pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
                 } else {
                     pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
                 } 
             }
            
         } else {
             pal = mStandardPalette ;
         }
         item->setPalette( pal );
         item->setRecur( event->recurrence()->doesRecur() );
         item->setAlarm( event->isAlarmEnabled() && multiday < 2 );
         item->setMoreInfo( event->description().length() > 0  );
 #ifdef DESKTOP_VERSION
         Attendee *me = event->attendeeByMails(KOPrefs::instance()->mAdditionalMails,
                                               KOPrefs::instance()->email());
         if ( me != 0 ) {
             if ( me->status() == Attendee::NeedsAction && me->RSVP())
                 item->setReply(true && multiday < 2);
             else
                 item->setReply(false);
         } else
             item->setReply(false);
 #endif
         item->setMultiDay( multiday );
         if ( multiday ) {
             insertItem( item ,mdayCount);
             ++mdayCount;
         } else {
             uint i;
             int pos = mdayCount;
             for ( i = mdayCount; i < count();++i ) {
                 QListBoxItem* it = this->item ( i );
                 if ( text < it->text() ) {
                     pos = i;
                     break;
                 }
                 ++pos;
             }
             insertItem( item ,pos);
         }
         if ( useToolTips ) {
             mToolTip.append( mToolTipText );
         }
         return mdayCount;
 }
 void MonthViewCell::insertTodo(Todo *todo)
 {
     setFocusPolicy(WheelFocus); 
       QString text;
         if (todo->hasDueDate()) {
             if (!todo->doesFloat()) {
                 text += KGlobal::locale()->formatTime(todo->dtDue().time());
                 text += " ";
             }
         }
         text += todo->summary();
         MonthViewItem *item ;
         if ( mAvailItemList.count() ) {
             item = mAvailItemList.first();
             mAvailItemList.remove( item );
             item->recycle( todo, mDate, text );
         } else {
             item = new MonthViewItem( todo, mDate, text );
         }
         //MonthViewItem *item = new MonthViewItem( todo, mDate, text );
         //item->setPalette( mStandardPalette );
         QPalette pal;
         if (KOPrefs::instance()->mMonthViewUsesCategoryColor) {    
             QStringList categories = todo->categories();
             QString cat = categories.first();
             if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) {
                 pal = getPalette();
                 if (cat.isEmpty()) {
                     pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor);
                 } else {
                     pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
                 }
 
             } else {
                 if (cat.isEmpty()) {
                     pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
                 } else {
                     pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
                 } 
             }
            
         } else {
             pal = mStandardPalette ;
         }
         item->setPalette( pal );
         item->setRecur( todo->recurrence()->doesRecur() );
         item->setAlarm( todo->isAlarmEnabled() );
         item->setMoreInfo( todo->description().length() > 0  );
         insertItem( item , count());
 #ifdef DESKTOP_VERSION
         mToolTip.append( text ); 
 #endif
 }
 void MonthViewCell::repaintfinishUpdateCell()
 {
     MonthViewItem *mitem = (MonthViewItem*) firstItem ();
     while ( mitem ) {
         mitem->setBlockRepaint( false );
         updateItem ( mitem );
         mitem = (MonthViewItem *)mitem->next();
     }
 }
 void MonthViewCell::finishUpdateCell()
 {
    
     
 
 #ifdef DESKTOP_VERSION
     if (mToolTip.count() > 0 ) {
         mToolTip.sort();
         QToolTip::add(this,mToolTip.join("\n"),toolTipGroup(),"");
     }
 #endif
     //sort();
     //setMyPalette(); 
     setMyPalette();
   
     resizeEvent( 0 ); 
 
 }
 void MonthViewCell::updateCell()
 {
     if ( !mMonthView->isUpdatePossible() )
         return;
     startUpdateCell();
     //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
     QPtrList<Event> events = mMonthView->calendar()->events( mDate, true );
     Event *event;
     for( event = events.first(); event; event = events.next() ) { // for event
         insertEvent(event);
     }
     // insert due todos
     QPtrList<Todo> todos = mMonthView->calendar()->todos( mDate );
     Todo *todo;
     for(todo = todos.first(); todo; todo = todos.next()) {
         insertTodo( todo );
     }
     finishUpdateCell();
     // if ( isVisible())
     //qApp->processEvents();
 }
 
 void MonthViewCell::updateConfig( bool bigFont ) // = false
 {
 
     if ( bigFont ) {
         QFont fo = KOPrefs::instance()->mMonthViewFont;
         int ps = fo.pointSize() + 2;
         if ( ps < 18 )
             ps += 2;
         fo.setPointSize( ps ); 
         setFont( fo );
     } else
         setFont( KOPrefs::instance()->mMonthViewFont );
 
     QFontMetrics fm( font() );
     mLabelSize = fm.size( 0, "30" ) + QSize( 4, 2 );
     mLabelBigSize = fm.size( 0, "Mag 30" ) + QSize( 2, 2 );
     mHolidayPalette = mStandardPalette;
     mPrimaryPalette = mStandardPalette;
     mNonPrimaryPalette = mStandardPalette;
     if ( KOPrefs::instance()->mMonthViewUsesDayColors ) {
         mHolidayPalette.setColor(QColorGroup::Base, KOPrefs::instance()->mMonthViewHolidayColor  );
         mHolidayPalette.setColor(QColorGroup::Background, KOPrefs::instance()->mMonthViewHolidayColor  );
         mHolidayPalette.setColor(QColorGroup::Foreground,  KOPrefs::instance()->mMonthViewHolidayColor.dark());
         mPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewOddColor.dark());
         mPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewOddColor);
         mPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewOddColor);
         mNonPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewEvenColor.dark());
         mNonPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewEvenColor); 
         mNonPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewEvenColor); 
     }
     //updateCell(); 
 }
 
 void MonthViewCell::enableScrollBars( bool enabled )
 {
     
     return;
     if ( enabled ) {
         QListBoxItem *fi =  firstItem ();
         if (fi ) {
             int ihei = fi->height( this );
             int hei = numRows ()  * ihei;
             if ( hei < height() - horizontalScrollBar()->height () ) {
                 setVScrollBarMode(QScrollView::AlwaysOff);
             }
             else 
                 setVScrollBarMode(QScrollView::Auto);
             if ( ihei *3 > height() ) {
                 setHScrollBarMode(QScrollView::AlwaysOff);
             }
             else {
                 setHScrollBarMode(QScrollView::Auto);
             }
         } else {
             setVScrollBarMode(QScrollView::Auto);
             setHScrollBarMode(QScrollView::Auto);
         }
     } else {
         setVScrollBarMode(QScrollView::AlwaysOff);
         setHScrollBarMode(QScrollView::AlwaysOff);
     }
 }
 
 Incidence *MonthViewCell::selectedIncidence()
 {
     int index = currentItem();
     if ( index < 0 ) return 0;
   
     MonthViewItem *mitem =
         static_cast<MonthViewItem *>( item( index ) );
 
     if ( !mitem ) return 0;
   
     return mitem->incidence();
 }
 
 QDate MonthViewCell::selectedIncidenceDate()
 {
     QDate qd;
     int index = currentItem();
     if ( index < 0 ) return qd;
   
     MonthViewItem *mitem =
         static_cast<MonthViewItem *>( item( index ) );
 
     if ( !mitem ) return qd;
   
     return mitem->incidenceDate();
 }
 
 void MonthViewCell::deselect()
 {
     clearSelection();
     enableScrollBars( false );
     // updateCell();
 }
 void MonthViewCell::select()
 {
     ;// updateCell();
 }
 
 void MonthViewCell::resizeEvent ( QResizeEvent * e )
 {
     if ( !mMonthView->isUpdatePossible() )
         return;
     //qDebug("++++++++++++++MonthViewCell::resizeEvent %d %d ", width(), height());
     deselect();
     mLabel->setMaximumHeight( height() - lineWidth()*2 );
     
     QString text;
     mLabel->setText( text );
     bool smallDisplay = QApplication::desktop()->width() < 320 && KOPrefs::instance()->mMonthViewSatSunTog;
     if ( KOPrefs::instance()->mMonthViewWeek || KOGlobals::self()->calendarSystem()->day( mDate ) == 1 || (mDate.dayOfWeek() == 7 && !smallDisplay ) || KOPrefs::instance()->mMonthShowShort) { 
         text = KOGlobals::self()->calendarSystem()->monthName( mDate, true ) + " ";
         mLabel->resize( mLabelBigSize  );
         text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) );
     } else {
         mLabel->resize( mLabelSize );
         text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) );
     }
     mLabel->setText( text );
 
     int size = height() - mLabel->height() - lineWidth()-1;
     //qDebug("LW %d ", lineWidth());
     if ( size > 0 )
         verticalScrollBar()->setMaximumHeight( size );
     size = width() - mLabel->width() -lineWidth()-1;
     if ( size > 0 )
         horizontalScrollBar()->setMaximumWidth( size );
     mLabel->move( width()-lineWidth() - mLabel->width(), height()-lineWidth() - mLabel->height() );
     //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
     // mItemList->resize ( width(), height () ); 
     if ( e )
         KNoScrollListBox::resizeEvent (  e );
 }
 
 void MonthViewCell::defaultAction( QListBoxItem *item )
 {
   
     if ( !item ) {
         QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
         emit newEventSignal( dt );
         return;
     }
 
     MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
     Incidence *incidence = eventItem->incidence();
     if ( incidence ) mMonthView->defaultAction( incidence );
 }
 void MonthViewCell::showDay()
 {
     emit showDaySignal( date() );
 }
 void MonthViewCell::newEvent()
 {
     QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
     emit newEventSignal( dt );
 }
 void MonthViewCell::cellClicked( QListBoxItem *item )
 {
     mMonthView->setSelectedCell( this );
     if ( item == 0 ) {
         QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
         emit newEventSignal( dt );
         return;
     }
 
 }
 
 void MonthViewCell::contextMenu( QListBoxItem *item )
 {
     mMonthView->setPopupCell( this );
     if ( !item )  {
         mMonthView->showContextMenu( 0 );
         return;
     }
     MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
     Incidence *incidence = eventItem->incidence();
     if ( incidence ) mMonthView->showContextMenu( incidence );
 }
 
 void MonthViewCell::selection( QListBoxItem *item )
 {
     if ( !item ) return;
 
     mMonthView->setSelectedCell( this );
 }
 
 
 // *******************************************************************************
 // *******************************************************************************
 // *******************************************************************************
 
 
 KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
     : KOEventView( calendar, parent, name ),
       mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ),
       mWidthLongDayLabel( 0 ), mSelectedCell( 0 )
 {
     mFlagKeyPressed = false;
     mShortDayLabelsM = false;
     mShortDayLabelsW = false;
     skipResize = false;
     clPending = true;
     mPopupCell = 0;
     mNavigatorBar = new NavigatorBar( QDate::currentDate(), this, "useBigPixmaps" );
     mWidStack = new QWidgetStack( this );
     QVBoxLayout* hb = new QVBoxLayout( this );
     mMonthView = new QWidget( mWidStack );
     mWeekView = new QWidget( mWidStack );
 #if QT_VERSION >= 0x030000
     mWidStack->addWidget(mMonthView );
     mWidStack->addWidget(mWeekView  );
 #else
     mWidStack->addWidget( mMonthView, 1 );
     mWidStack->addWidget( mWeekView , 1 );
 #endif
     hb->addWidget( mNavigatorBar );
     hb->addWidget( mWidStack );
     mShowWeekView = KOPrefs::instance()->mMonthViewWeek;
     updatePossible = false;
     //updatePossible = true;
     mCells.setAutoDelete( true );
     mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
     mDayLabels.resize( mDaysPerWeek );
     mDayLabelsW.resize( mDaysPerWeek );
     QFont bfont = font();
     if ( QApplication::desktop()->width() < 650 ) {
         bfont.setPointSize( bfont.pointSize() - 2 );
     }
     bfont.setBold( true );
     int i;
   
     for( i = 0; i < mDaysPerWeek; i++ ) {
         QLabel *label = new QLabel( mMonthView );
         label->setFont(bfont);
         label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         label->setLineWidth(1);
         label->setAlignment(AlignCenter);
         mDayLabels.insert( i, label );
         label = new QLabel( mWeekView );
         label->setFont(bfont);
         label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         label->setLineWidth(1);
         label->setAlignment(AlignCenter);
         mDayLabelsW.insert( i, label );
     }
 
     bfont.setBold( false );
     mWeekLabels.resize( mNumWeeks+1 );
     mWeekLabelsW.resize( 2 );
     for( i = 0; i < mNumWeeks+1; i++ ) {
         KOWeekButton *label = new KOWeekButton( mMonthView );
         label->setFocusPolicy(NoFocus); 
         label->setFont(bfont);
         connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int ))   );  
         label->setFlat(true);
         QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
         //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         //label->setLineWidth(1);
         //label->setAlignment(AlignCenter);
         mWeekLabels.insert( i, label );
     }
     mWeekLabels[mNumWeeks]->setText( i18n("W"));
     mWeekLabels[mNumWeeks]->setFocusPolicy(WheelFocus);
     QWhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nselect week number"));
     
     for( i = 0; i < 1+1; i++ ) {
         KOWeekButton *label = new KOWeekButton( mWeekView );
         label->setFocusPolicy(NoFocus); 
         label->setFont(bfont);
         connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int ))   );  
         label->setFlat(true);
         QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
         //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
         //label->setLineWidth(1);
         //label->setAlignment(AlignCenter);
         mWeekLabelsW.insert( i, label );
     }
     mWeekLabelsW[1]->setText( i18n("W"));
     mWeekLabelsW[1]->setFocusPolicy(WheelFocus); 
 
 
     int row, col;
     mCells.resize( mNumCells );
     for( row = 0; row < mNumWeeks; ++row ) {
         for( col = 0; col < mDaysPerWeek; ++col ) {
             MonthViewCell *cell = new MonthViewCell( this, mMonthView );
             mCells.insert( row * mDaysPerWeek + col, cell );
 
             connect( cell, SIGNAL( defaultAction( Incidence * ) ),
                      SLOT( defaultAction( Incidence * ) ) );
             connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
                      SIGNAL( newEventSignal( QDateTime ) ) );
             connect( cell, SIGNAL( showDaySignal( QDate ) ),
                      SIGNAL( showDaySignal( QDate ) ) );
             connect( cell, SIGNAL( nextCell() ),
                      SLOT( nextCell() ) );
             connect( cell, SIGNAL( prevCell() ),
                      SLOT( prevCell() ) );
         }
     }
     mCellsW.resize( mDaysPerWeek );
     for( col = 0; col < mDaysPerWeek; ++col ) {
         MonthViewCell *cell = new MonthViewCell( this, mWeekView );
         mCellsW.insert( col, cell );
 
         connect( cell, SIGNAL( defaultAction( Incidence * ) ),
                  SLOT( defaultAction( Incidence * ) ) );
         connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
                  SIGNAL( newEventSignal( QDateTime ) ) );
         connect( cell, SIGNAL( showDaySignal( QDate ) ),
                  SIGNAL( showDaySignal( QDate ) ) );
         connect( cell, SIGNAL( nextCell() ),
                  SLOT( nextCell() ) );
         connect( cell, SIGNAL( prevCell() ),
                  SLOT( prevCell() ) );
         cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont );
     }
 
     //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) );
     mContextMenu = eventPopup();
     mContextMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("New Event..."),this,
                                   SLOT(slotNewEvent()),false);
     mContextMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("New Todo..."),this,
                                   SLOT(slotNewTodo()),false);
     mContextMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Journal"),this,
                                   SLOT(slotEditJournal()),false);
 
 
 
     QString pathString = "";
     if ( !KOPrefs::instance()->mToolBarMiniIcons ) {
         if ( QApplication::desktop()->width() < 480 )
             pathString += "icons16/";
     } else
         pathString += "iconsmini/";
     mNewItemMenu = new QPopupMenu( this );
     mNewItemMenu->insertItem( SmallIcon( pathString +"newevent" ), i18n("New Event..."),this, SLOT(slotNewEvent()));
     mNewItemMenu->insertItem( SmallIcon( pathString +"newtodo" ),i18n("New Todo..."),this,SLOT(slotNewTodo()),false);
     mNewItemMenu->insertItem( SmallIcon( pathString +"journal" ),i18n("Journal"),this,SLOT(slotEditJournal()),false);
 
     // updateConfig(); //useless here...
     // ... but we need mWidthLongDayLabel computed
     QFontMetrics fontmetric(mDayLabels[0]->font());
     mWidthLongDayLabel = 0;
     for (int i = 0; i < 7; i++) {
         int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1));
         if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width;
     }
 
     //mWeekLabels[mNumWeeks]->setText( i18n("W"));
 
 #if 0
     if ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
     else
         mWidStack->raiseWidget( mMonthView );
 #endif
 
     emit incidenceSelected( 0 );
 
     mComputeLayoutTimer = new QTimer( this );
     connect (mComputeLayoutTimer ,SIGNAL(timeout()), this, SLOT ( slotComputeLayout()));
 
 
 #ifndef DESKTOP_VERSION
     resize( QApplication::desktop()->size() );
 #else
     resize(640, 480 );
     updatePossible = true;
 #endif
     computeLayout();
 
     if ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
     else
         mWidStack->raiseWidget( mMonthView );
 }
 
 KOMonthView::~KOMonthView()
 {
     delete mContextMenu;
 }
 
 void KOMonthView::selectInternalWeekNum ( int n )
 {
     switchView();  
     if ( !KOPrefs::instance()->mMonthViewWeek )
         emit selectMonth ();
     else
         emit selectWeekNum ( n );
 }
 
 int KOMonthView::currentWeek()
 {
     if ( mShowWeekView )
         return mWeekLabelsW[0]->getWeekNum();
     return mWeekLabels[0]->getWeekNum();
 }
 void KOMonthView::switchView()
 {
     if ( selectedCell( ) )
         selectedCell()->deselect();
     mShowWeekView = !mShowWeekView;
     KOPrefs::instance()->mMonthViewWeek = mShowWeekView;
     if ( clPending ) {
       computeLayout();
       updateConfig();
     }
     if ( mShowWeekView )
         mWidStack->raiseWidget( mWeekView );
     else
         mWidStack->raiseWidget( mMonthView ); 
     clPending = false;
 }
 
 int KOMonthView::maxDatesHint()
 {
     return mNumCells;
 }
 
 int KOMonthView::currentDateCount()
 {
     return mNumCells;
 }
 
 QPtrList<Incidence> KOMonthView::selectedIncidences()
 {
     QPtrList<Incidence> selected;
 
     if ( mSelectedCell ) {
         Incidence *incidence = mSelectedCell->selectedIncidence();
         if ( incidence ) selected.append( incidence );
     }
 
     return selected;
 }
 
 DateList KOMonthView::selectedDates()
 {
     DateList selected;
 
     if ( mSelectedCell ) {
         QDate qd = mSelectedCell->selectedIncidenceDate();
         if ( qd.isValid() ) selected.append( qd );
     }
 
     return selected;
 }
 
 void KOMonthView::printPreview(CalPrinter *calPrinter, const QDate &fd,
                                const QDate &td)
 {
 #ifndef KORG_NOPRINTER
     calPrinter->preview(CalPrinter::Month, fd, td);
 #endif
 }
 
 void KOMonthView::updateConfig()
 {
  
     int mWeekStartsMonday = KGlobal::locale()->weekStartsMonday();
 
     if ( mShowWeekView || KOPrefs::instance()->mMonthViewSatSunTog ) {
         mWeekStartsMonday = true;
     } 
     QFontMetrics fontmetric(mDayLabels[0]->font());
     mWidthLongDayLabel = 0;
 
     for (int i = 0; i < 7; i++) {
         int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1));
         if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width;
     }
     bool temp = mShowSatSunComp ;
     mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
     if ( !  mShowWeekView ) {
         if ( temp != KOPrefs::instance()->mMonthViewSatSunTog )
             computeLayout();
     }
     updateDayLabels();
     //qDebug("KOMonthView::updateConfig() %d %d %d ",height(), mDayLabels[0]->sizeHint().height() ,mNumWeeks);
     //int cellHeight = (height() - mDayLabels[0]->sizeHint().height()) /mNumWeeks;
     //resizeEvent( 0 );
     for (uint i = 0; i < mCells.count(); ++i) {
         mCells[i]->updateConfig();
     }
 
     for (uint i = 0; i < mCellsW.count(); ++i) {
         mCellsW[i]->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont);
     }
 #ifdef DESKTOP_VERSION
     MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips); 
 #endif
     updateView();
 }
 
 void KOMonthView::updateDayLabels()
 {
   
     QPtrVector<QLabel> *mDayLabelsT;
 
     mDayLabelsT = &mDayLabelsW;
     for (int i = 0; i < 7; i++) {
        {
             bool show = mShortDayLabelsW;
             if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width()  )
                 show = true;
             (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
         }
     }
     mDayLabelsT = &mDayLabels;
     for (int i = 0; i < 7; i++) {
         if (KGlobal::locale()->weekStartsMonday() || KOPrefs::instance()->mMonthViewSatSunTog ) {
             bool show = mShortDayLabelsM;
             if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width()  )
                 show = true;
             (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
         } else {
             if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsM));
             else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsM));
 
         }
     }
 
 }
 
 void KOMonthView::showDates(const QDate &start, const QDate &)
 {
     //  kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl;
 
     QPtrVector<MonthViewCell> *cells;
     QPtrVector<QLabel> *dayLabels;
     QPtrVector<KOWeekButton> *weekLabels;
     int weekNum = 6;
     mStartDate = start;
     if ( mShowWeekView ) {
         weekNum = 1;
         cells = &mCellsW;
         dayLabels = &mDayLabelsW;
         weekLabels = &mWeekLabelsW;
         if ( !KGlobal::locale()->weekStartsMonday() ) {
             mStartDate = mStartDate.addDays( 1 );
         }
     } else {
         cells = &mCells;
         dayLabels = &mDayLabels;
         weekLabels = &mWeekLabels;
     }
 
     int mWeekStartsMonday =  KGlobal::locale()->weekStartsMonday();
 
     if ( mShowWeekView || KOPrefs::instance()->mMonthViewSatSunTog ) {
         mWeekStartsMonday = true;
     } 
     int startWeekDay = mWeekStartsMonday ? 1 : 7;
 
     while( KOGlobals::self()->calendarSystem()->dayOfWeek(mStartDate) != startWeekDay ) {
         mStartDate = mStartDate.addDays( -1 );
     }
     bool primary = false;
     uint i;
     for( i = 0; i < (*cells).size(); ++i ) {
         QDate date = mStartDate.addDays( i );
         (*cells)[i]->setDate( date );
 
 #ifndef KORG_NOPLUGINS
         // add holiday, if present
         QString hstring(KOCore::self()->holiday(date));
         (*cells)[i]->setHoliday( hstring );
 #endif
 
     }
     QDate date = mStartDate.addDays( mWeekStartsMonday ? 3 : 4 );
     for( i = 0; i < weekNum; ++i ) {
         int wno;
         // remember, according to ISO 8601, the first week of the year is the
         // first week that contains a thursday.  Thus we must subtract off 4,
         // not just 1.
         int dayOfYear = date.dayOfYear();
         if (dayOfYear % 7 != 0)
             wno = dayOfYear / 7 + 1;
         else
             wno =dayOfYear / 7;
         (*weekLabels)[i]->setWeekNum( wno );
         date = date.addDays( 7 );
     }
     updateView();
 }
 
 void KOMonthView::showEvents(QPtrList<Event>)
 {
     qDebug("KOMonthView::selectEvents is not implemented yet. ");
 }
 
 void KOMonthView::changeEventDisplay(Event *, int)
 {
     // this should be re-written to be much more efficient, but this
     // quick-and-dirty-hack gets the job done for right now.
     //qDebug("KOMonthView::changeEventDisplay ");
     updateView();
 }
 
 void KOMonthView::updateView()
 { 
 
     if ( !updatePossible )
         return;
     //qDebug("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU ");
     //QTime ti;
     //ti.start();
     clearSelection();
     QPtrVector<MonthViewCell> *cells;
     if ( mShowWeekView ) {
         cells = &mCellsW;
     } else {
         cells = &mCells;
     }
 #if 1
     int i;
     int timeSpan = (*cells).size()-1;
     if ( KOPrefs::instance()->mMonthViewWeek )         
         timeSpan = 6;
     for( i = 0; i < timeSpan + 1; ++i ) {
         (*cells)[i]->startUpdateCell();
     }
  
     QPtrList<Event> events = calendar()->events();
     Event *event;
     QDateTime dt;
     bool ok;
     QDate endDate =  mStartDate.addDays( timeSpan );
     for( event = events.first(); event; event = events.next() ) { // for event
         if ( event->doesRecur() ) {
             bool last;
             QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last );
             QDateTime incidenceEnd;
             int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date()  );
             bool invalid = false;
             while( true ) {
                     if ( incidenceStart.isValid() ) {
                         incidenceEnd = incidenceStart.addDays( eventlen );
                         int st =   incidenceStart.date().daysTo( endDate );
                         if ( st >= 0 ) { // start before timeend
                             int end = mStartDate.daysTo( incidenceEnd.date() );
                             if ( end >= 0 ) { // end after timestart --- got one!
                                 //normalize
                                 st =  timeSpan - st;
                                 if ( st < 0 ) st = 0;
                                 if ( end > timeSpan ) end = timeSpan;
                                 int iii;
                                 //qDebug("found %s %d %d ",event->summary().latin1(), st, end );
                                 for ( iii = st;iii<= end;++iii) 
                                     (*cells)[iii]->insertEvent( event );
                             }
                         }
                     } else {
                         if ( invalid )
                             break;
                         invalid = true;
                         //qDebug("invalid %s", event->summary().latin1());
                         incidenceStart = QDateTime( mStartDate ).addSecs( -2 );;
                     }
                     if ( last )
                         break;
                     bool ok;
                     incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok );
                     if ( ! ok )
                         break;
                     if ( incidenceStart.date() > endDate )
                         break;
             }
         } else { // no recur 
+            if ( !KOPrefs::instance()->mShowSyncEvents && event->uid().left(2) == QString("la") )
+                if ( event->uid().left(15) == QString("last-syncEvent-")  )
+                    continue;
             int st =  event->dtStart().date().daysTo( endDate );
             if ( st >= 0 ) { // start before timeend
                 int end = mStartDate.daysTo( event->dtEnd().date() );
                 if ( end >= 0 ) { // end after timestart --- got one!
                     //normalize
                     st =  timeSpan - st;
                     if ( st < 0 ) st = 0;
                     if ( end > timeSpan ) end = timeSpan;
                     int iii;
                     for ( iii = st;iii<= end;++iii)
                         (*cells)[iii]->insertEvent( event );
                 }
             }
         }
     }
     // insert due todos
     QPtrList<Todo> todos = calendar()->todos( );
     Todo *todo;
     for(todo = todos.first(); todo; todo = todos.next()) {
         //insertTodo( todo );
         if ( todo->hasDueDate() ) {
             int day = mStartDate.daysTo( todo->dtDue().date() );
             if ( day >= 0 && day < timeSpan + 1)  {
                 (*cells)[day]->insertTodo( todo );
             }
         }
     }
 
     for( i = 0; i < timeSpan+1; ++i ) {
         (*cells)[i]->finishUpdateCell();
     }
     processSelectionChange();
     //qApp->processEvents();
      for( i = 0; i < timeSpan+1; ++i ) {
          (*cells)[i]->repaintfinishUpdateCell();
     }
      setKeyBFocus();
 #else
     // old code
     //qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ");
     int i;
     for( i = 0; i < (*cells).count(); ++i ) {
         (*cells)[i]->updateCell();
     }
  
     //qDebug("KOMonthView::updateView() ");
     processSelectionChange();
     // qDebug("---------------------------------------------------------------------+ ");
     (*cells)[0]->setFocus();
 #endif
 
     //qDebug("update time %d ", ti.elapsed());
 }
 
 void KOMonthView::setKeyBoardFocus()
 {
     //qDebug("KOMonthView::setKeyBoardFocus() ");
     bool shootAgain = false;
     if ( mShowWeekView ) {
         shootAgain = !mWeekLabelsW[1]->hasFocus();
          mWeekLabelsW[1]->setFocus();
     }
     else {
         shootAgain = !mWeekLabels[mNumWeeks]->hasFocus();
          mWeekLabels[mNumWeeks]->setFocus();
     }
     if ( shootAgain ) {
       QTimer::singleShot( 0, this, SLOT ( setKeyBFocus() ) );
     }
 }
 void KOMonthView::setKeyBFocus()
 {
     //qDebug("KOMonthView::setKeyBFocus() ");
     QTimer::singleShot( 0, this, SLOT ( setKeyBoardFocus() ) );
 }
 void KOMonthView::resizeEvent(QResizeEvent * e)
 {
     //qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
     if ( isVisible() ) {
         //qDebug("KOMonthView::isVisible ");
         slotComputeLayout();
     } else
         mComputeLayoutTimer->start( 100 );
 }
 
 void KOMonthView::slotComputeLayout()
 {
     mComputeLayoutTimer->stop();
     //qDebug("KOMonthView::Post - resizeEvent %d %d ", width(), height() );
     computeLayout();
     clPending = true;  
     setKeyBFocus();
 }
 void KOMonthView::computeLayoutWeek()
 {
     static int lastWid = 0;
     static int lastHei = 0;
     int daysToShow;
     bool combinedSatSun  = false;
     if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
         daysToShow = 6;
         combinedSatSun  = true;
     }
     int tWid = topLevelWidget()->size().width();
     int tHei = topLevelWidget()->size().height();
 
     int wid = width();//e
     int hei = height()-1-mNavigatorBar->height();
 
     if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) 
         return;
      
     if ( lastWid == width() && lastHei == height() ) {
         //qDebug("KOListWeekView::No compute layout needed ");
         return;
     }
     lastWid = width();
     lastHei = height();
 
 
     if ( wid < hei )
         daysToShow = 2;
     else
         daysToShow = 3;
     mShowSatSunComp = true;
     combinedSatSun  = true;
         
     //qDebug("KOMonthView::computeLayout() WWW ------------------------------------ ");
     QFontMetrics fm ( mWeekLabels[0]->font() );
     int weeklabelwid = fm.width( "888" );
     wid -= weeklabelwid;
 
     int colWid = wid / daysToShow;
     int lastCol = wid - ( colWid*6  ); 
     int dayLabelHei = mDayLabelsW[0]->sizeHint().height();
     int cellHei = (hei - (5- daysToShow )*dayLabelHei) /(5- daysToShow ); 
     int colModulo = wid % daysToShow;
     int rowModulo = (hei- (5- daysToShow )*dayLabelHei) % daysToShow-1;
     //qDebug("rowmod %d ", rowModulo);
     int i;
     int x,y,w,h;
     x= 0;
     y= 0;
     w = colWid;
     h = dayLabelHei ;
     for ( i = 0; i < 7; i++) {
         if ( i && !( i % daysToShow) && i < 6) {
             y += hei/(5-daysToShow);
             x = 0;
             w =  colWid;
         }
         if ( ((i) % daysToShow) >= daysToShow-colModulo ) {
             ++w;
         }
         if ( i >=  5 ) { 
             int wi = width() -  x - weeklabelwid;
             if ( i == 5 ) { 
                 mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,wi/2+wi%2,h);
             } else {
                 mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,wi,h);
             }
             x = x - w +  wi - (wi/2 );
         }
         else {
             int wi = w;  
             if ( !(( i+1) % daysToShow)) {
                 wi = width() -  x - weeklabelwid;
             }
             mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,wi,h);
         }
         x += w;                                   
     }
     x= 0;
     y= dayLabelHei;
     w = colWid;
     h = cellHei;
     int max = 0;
     for ( i = 0; i < mCellsW.count(); ++i) {
         if ( i > 6 ) {
             mCellsW[i]->hide();
             continue;
         }
         
         w = colWid;
         if ( ((i) % daysToShow) >= daysToShow-colModulo ) {
             ++w;
         }
         if ( i  == (daysToShow-1-rowModulo)*7)
             ++h; 
       
         if ( i >= 5 ) {
             if ( i ==5 ) {
                 max = h/2;
                 mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,max ); 
                 x -= w ;y += h/2;
             } else {
                 if ( ((i-1) % daysToShow) >= daysToShow-colModulo ) {
                     ++w;
                 }
                 max = h-h/2;
                 mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,max ); 
                 y -= h/2;
             }
         } else {
             max = h;
             mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h ); 
         }
                 
        
         x += w;
         if ( x + w/2 > wid ) {
             x = 0;
             y += h+dayLabelHei ;
         }
         //mCellsW[i]->dateLabel()->setMaximumHeight( max - mCellsW[i]->lineWidth()*2 );
     }
     y= dayLabelHei;
     h = cellHei ;
     mWeekLabelsW[0]->setGeometry( 0,y,weeklabelwid,hei-dayLabelHei);
     mWeekLabelsW[1]->setGeometry( 0,0,weeklabelwid,dayLabelHei);
     // qDebug("RRRRRRRRRRRRR %d %d  old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height());
     //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height());
     mShortDayLabelsW = mDayLabelsW[0]->width()-2 < mWidthLongDayLabel ;
     updateDayLabels();
     //bool forceUpdate = !updatePossible;
     updatePossible = true;
     //mWeekLabels[mNumWeeks]->setText( i18n("M"));
     //if ( forceUpdate )
     //  updateView();
 }
 void KOMonthView::computeLayout()
 {
   
 
     static int lastWid = 0;
     static int lastHei = 0;
 
     if ( mShowWeekView ){
             computeLayoutWeek();
             return;
     }
     int daysToShow = 7;
     bool combinedSatSun  = false;
     if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
         daysToShow = 6;
         combinedSatSun  = true;
     }
     int tWid = topLevelWidget()->size().width();
     int tHei = topLevelWidget()->size().height();
 
     int wid = width();//e
     int hei = height()-1-mNavigatorBar->height();
 
     if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) {
         return;  
     }
     if ( lastWid == width() && lastHei == height() ){
         //qDebug("KOMonthview::No compute layout needed ");
         return;
     }
 
     lastWid = width();
     lastHei =  height();
     //qDebug("KOMonthView::computeLayout() MMM ------------------- ");
     QFontMetrics fm ( mWeekLabels[0]->font() );
     int weeklabelwid = fm.width( "888" );
     wid -= weeklabelwid;
 
     int colWid = wid / daysToShow;
     int lastCol = wid - ( colWid*6  ); 
     int dayLabelHei = mDayLabels[0]->sizeHint().height();
     int cellHei = (hei - dayLabelHei) /6; 
     int colModulo = wid % daysToShow;
     int rowModulo = (hei- dayLabelHei) % 6;
     //qDebug("rowmod %d ", rowModulo);
     int i;
     int x,y,w,h;
     x= 0;
     y= 0;
     w = colWid;
     h = dayLabelHei ;
     for ( i = 0; i < 7; i++) {
         if ( i == daysToShow-colModulo )
             ++w;
         if ( combinedSatSun ) {
             if ( i >=  daysToShow-1 ) {
 
                 if ( i == 6 )
                     mDayLabels[i]->setGeometry( x+weeklabelwid,y,width()-x-weeklabelwid,h);
                 else
                     mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2,h);
                 x -= w/2 ;
             }
             else
                 mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h);
         } else
             mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h);
         x += w;                                   
     }
     x= 0;
     y= dayLabelHei;
     w = colWid;
     h = cellHei ;
     int max = 0;
     for ( i = 0; i < mCells.count(); ++i) {
         //qDebug("iii %d ", i);
         w = colWid;
         if ( ((i) % 7) >= 7-colModulo ) {
             ++w;
         }
         if ( i  == (6-rowModulo)*7)
             ++h; 
         if ( combinedSatSun ) {
             if ( (i)%7 >=  daysToShow-1 ) {
                 if ( (i)%7 ==  daysToShow-1 ) {
                     w = width()-x-weeklabelwid;
                     max = h/2;
                     mCells[i]->setGeometry ( x+weeklabelwid,y,w,max ); 
                     x -= w ;y += h/2;
                 } else {
                     w = width()-x-weeklabelwid;
                     max = h-h/2;
                     mCells[i]->setGeometry ( x+weeklabelwid,y,w,max ); 
                     y -= h/2;
                 }
             } else {
                 max = h;
                 mCells[i]->setGeometry ( x+weeklabelwid,y,w,h ); 
             }
                 
         }
         else {
             max = h;
             mCells[i]->setGeometry ( x+weeklabelwid,y,w,h );
         }
         x += w;
         if ( x + w/2 > wid ) {
             x = 0;
             y += h;
         } 
         //mCells[i]->dateLabel()->setMaximumHeight( max- mCells[i]->lineWidth()*2 );
     }
     y= dayLabelHei;
     h = cellHei ;
     for ( i = 0; i < 6; i++) {
         if ( i  == (6-rowModulo))
             ++h;
         mWeekLabels[i]->setGeometry( 0,y,weeklabelwid,h);
         y += h;                            
     }
     mWeekLabels[6]->setGeometry( 0,0,weeklabelwid,dayLabelHei);
     // qDebug("RRRRRRRRRRRRR %d %d  old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height());
     //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height());
     mShortDayLabelsM = mDayLabels[0]->width()-2 < mWidthLongDayLabel ;
     updateDayLabels();
     //bool forceUpdate = !updatePossible;
     updatePossible = true;
     //mWeekLabels[mNumWeeks]->setText( i18n("W"));
 }
 
 void KOMonthView::showContextMenu( Incidence *incidence )
 {
     if( incidence )
         mContextMenu->showIncidencePopup(incidence);
     else {
         //qDebug("KOMonthView::showContextMenu ");
         mNewItemMenu->popup(QCursor::pos());
     }
     /*
       if( incidence && incidence->type() == "Event" ) {
       Event *event = static_cast<Event *>(incidence);
       mContextMenu->showEventPopup(event);
       } else {
       kdDebug() << "MonthView::showContextMenu(): cast failed." << endl;
       }
     */
 }
 MonthViewCell * KOMonthView::selectedCell( )
 {
     return mSelectedCell;
 }
 void KOMonthView::setSelectedCell( MonthViewCell *cell )
 {
     //qDebug("KOMonthView::setSelectedCell %d", cell);
     if ( mSelectedCell && mSelectedCell != cell ) {
         MonthViewCell * mvc = mSelectedCell;
         mSelectedCell = cell;
         mvc->deselect();
     } else 
         mSelectedCell = cell;
     //  if ( mSelectedCell )
     //         mSelectedCell->select();
     if ( !mSelectedCell )
         emit incidenceSelected( 0 );
     else 
         emit incidenceSelected( mSelectedCell->selectedIncidence() );
 }
 
 void KOMonthView::processSelectionChange()
 {
     QPtrList<Incidence> incidences = selectedIncidences();
     if (incidences.count() > 0) {
         emit incidenceSelected( incidences.first() );
     } else {
         emit incidenceSelected( 0 );
         clearSelection();
     }
 }
 
 void KOMonthView::clearSelection()
 {
     if ( mSelectedCell ) {
         mSelectedCell->deselect();
         mSelectedCell = 0;
     }
 }
 
 void KOMonthView::keyReleaseEvent ( QKeyEvent * e)
 {
     if ( !e->isAutoRepeat() ) {
         mFlagKeyPressed = false;
     }
 }
 
 void KOMonthView::keyPressEvent ( QKeyEvent * e )
 {
    
     qApp->processEvents();
     if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
         //e->ignore();
         e->accept();
         return;
     }
     if (! e->isAutoRepeat() )
         mFlagKeyPressed = true;
     switch(e->key()) {
     case Key_Up: 
         {
             if ( mShowWeekView ) {
                 emit selectWeekNum ( currentWeek() - 1 );
             }
             else {
                 emit prevMonth();
             }
         }
         e->accept();
         break;
     case Key_Down:
         {
             if ( mShowWeekView ) {
                 emit selectWeekNum ( currentWeek() +1);
             }
             else {
                 emit nextMonth();
             }
            
         }
         e->accept();
         break;
     case Key_Return:
     case Key_Enter:
         {
             selectInternalWeekNum ( currentWeek() );
         }
         e->accept();
         break;
     case Key_D:
         if ( mSelectedCell ) {
             mSelectedCell->showDay();
             e->accept();
         } else {
             e->ignore();     
         }
         break;
     default:
         e->ignore();     
         break;
     }
 }
 
 void KOMonthView::nextCell()
 {
    bool res =  focusNextPrevChild ( true ); 
 }
 void KOMonthView::prevCell()
 {
     focusNextPrevChild ( false ); 
 }
 
 void KOMonthView::slotNewTodo()
 {
     //qDebug("KOMonthView::slotNewTodo() ");
     if ( mPopupCell ){
         QDateTime dt( mPopupCell->date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
         emit newTodoSignal(dt,true);
     }
     mPopupCell = 0;
 }
 void KOMonthView::slotNewEvent()
 {
     if ( mPopupCell ) {
         QDateTime dt( mPopupCell->date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
         emit newEventSignal( dt );
     }
     //qDebug("KOMonthView::slotNewEvent() ");
     mPopupCell = 0;
 }
 
 void KOMonthView::slotEditJournal()
 { 
     if (  mPopupCell )
         emit showJournalSignal( 7, mPopupCell->date() );
     //qDebug("KOMonthView::slotEditJournal() ");
     mPopupCell = 0;
 }
 
 void KOMonthView::setPopupCell( MonthViewCell * c)
 {
     mPopupCell = c;
 }
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index cb9c272..d9d7924 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -1,1743 +1,1746 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qgroupbox.h>
 #include <qbuttongroup.h>
 #include <qlineedit.h>
 #include <qfont.h>
 #include <qslider.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qcombobox.h>
 #include <qvbox.h>
 #include <qhbox.h>
 #include <qregexp.h>
 #include <qspinbox.h>
 #include <qdatetime.h>
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 #include <qstrlist.h>
 #include <qapplication.h>
 
 #include <kcolorbutton.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kfontdialog.h>
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 #include <kcolordialog.h>
 #include <kiconloader.h>
 #include <kemailsettings.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 
 #include <kurlrequester.h>
 #include <klineedit.h>
 
 #if defined(USE_SOLARIS)
 #include <sys/param.h>
 
 #define ZONEINFODIR    "/usr/share/lib/zoneinfo"
 #define INITFILE       "/etc/default/init"
 #endif
 
 #include "koprefs.h"
 
 #include "koprefsdialog.h"
 #include "kpimglobalprefs.h"
 
 
 KOPrefsDialog::KOPrefsDialog(QWidget *parent, char *name, bool modal) :
   KPrefsDialog(KOPrefs::instance(),parent,name,true)
 {
 
     setFont( KGlobalSettings::generalMaxFont() );
   setCaption( i18n("Preferences - some settings need a restart (nr)"));
   mCategoryDict.setAutoDelete(true);
 
   KGlobal::locale()->insertCatalogue("timezones");
   mSpacingHint = spacingHintSmall();
    mMarginHint = marginHintSmall();
 #ifndef DESKTOP_VERSION
   if ( QApplication::desktop()->height() == 480  )
       hideButtons();
 #endif
 
   setupGlobalTab();
   setupMainTab();
   // setupLocaleTab();
   //setupTimeZoneTab();
   setupTimeTab();
   //setupLocaleDateTab();
   setupFontsTab();
   setupColorsTab();
   setupViewsTab();
   //setupSyncTab();
   //setupSyncAlgTab();
   //setupPrinterTab();
   //setupGroupSchedulingTab();
   //setupGroupAutomationTab();
 
 
 }
 
 
 KOPrefsDialog::~KOPrefsDialog()
 {
 }
 void KOPrefsDialog::setupGlobalTab() 
 {
    QFrame *topFrame = addPage(i18n("Global"),0,0);
    kdelibcfg = new KDEPIMConfigWidget(  KPimGlobalPrefs::instance(), topFrame, "KCMKdeLibConfig" );
    QVBoxLayout *topLayout = new QVBoxLayout(topFrame);
    topLayout->addWidget( kdelibcfg );
 
 
 } 
 void KOPrefsDialog::setupLocaleDateTab()
 {
 #if 0
 QFrame *topFrame = addPage(i18n("Date Format"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,3,2);
    topLayout->setSpacing(mSpacingHint);
    topLayout->setMargin(mMarginHint);  
    int iii = 0;
 
    
    KPrefsDialogWidRadios *syncPrefsGroup =
        addWidRadios(i18n("Date Format:"),&(KOPrefs::instance()->mPreferredDate),topFrame);
    QString format;
    if ( QApplication::desktop()->width() < 480 )
        format = "(%d.%m.%Y)";
    else 
        format = "(%d.%m.%Y|%A %d %B %Y)";
    syncPrefsGroup->addRadio(i18n("24.03.2004 "+format));
    if ( QApplication::desktop()->width() < 480 )
        format = "(%m.%d.%Y)";
    else 
        format = "(%m.%d.%Y|%A %B %d %Y)";
    syncPrefsGroup->addRadio(i18n("03.24.2004 "+format));
    if ( QApplication::desktop()->width() < 480 )
        format = "(%Y-%m-%d)";
    else 
        format = "(%Y-%m-%d|%A %Y %B %d)";
    syncPrefsGroup->addRadio(i18n("2004-03-24 "+format));
    syncPrefsGroup->addRadio(i18n("User defined"));
    topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
    ++iii;
    QLabel * lab;
    mUserDateFormatLong = new QLineEdit(topFrame);
    lab = new QLabel(mUserDateFormatLong, i18n("User long date:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mUserDateFormatLong,iii,1);
    ++iii;
    mUserDateFormatShort = new QLineEdit(topFrame);
    lab = new QLabel(mUserDateFormatShort, i18n("User short date:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mUserDateFormatShort,iii,1);
    ++iii;
    lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame);
    topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
    ++iii;
    lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame);
    topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
    ++iii;  
    lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame);
    topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
    ++iii;
 #endif
 
 }
 
 void  KOPrefsDialog::setupLocaleTab()
 {
 #if 0
  QFrame *topFrame = addPage(i18n("Locale"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
    topLayout->setSpacing(mSpacingHint);
    topLayout->setMargin(mMarginHint);  
    int iii = 0;
  KPrefsDialogWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Language:(needs restart)"),&(KOPrefs::instance()->mPreferredLanguage),topFrame);
    syncPrefsGroup->addRadio(i18n("English"));
    syncPrefsGroup->addRadio(i18n("German")); 
    syncPrefsGroup->addRadio(i18n("French")); 
    syncPrefsGroup->addRadio(i18n("User defined (usertranslation.txt)")); 
    if (  QApplication::desktop()->width() <  300   ) 
        ;//   syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
    topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
  
    syncPrefsGroup =
        addWidRadios(i18n("Time Format(nr):"),&(KOPrefs::instance()->mPreferredTime),topFrame);
    if (  QApplication::desktop()->width() >  300   )
        syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
    syncPrefsGroup->addRadio(i18n("24:00"));
    syncPrefsGroup->addRadio(i18n("12:00am"));
    syncPrefsGroup->groupBox()-> setOrientation (Qt::Vertical);
    topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
    KPrefsDialogWidBool *sb;
   if ( QApplication::desktop()->width() <  300 ) {
        sb =
            addWidBool(i18n("Week starts on Sunday"),
                       &(KOPrefs::instance()->mWeekStartsOnSunday),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
        ++iii;   
        sb =
            addWidBool(i18n("Use short date in (WN/E) view"),
                       &(KOPrefs::instance()->mShortDateInViewer),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
    }
    else {
        QWidget * hb = new QWidget( topFrame );
        QHBoxLayout  *hbLayout = new QHBoxLayout(hb);
        sb =
            addWidBool(i18n("Week starts on Sunday"),
                       &(KOPrefs::instance()->mWeekStartsOnSunday),hb);
        hbLayout->addWidget(sb->checkBox()  );
        sb =
            addWidBool(i18n("Use short date in (WN/E) view"),
                       &(KOPrefs::instance()->mShortDateInViewer),hb);
        hbLayout->addWidget(sb->checkBox()  );
        topLayout->addMultiCellWidget(hb, iii,iii,0,1);
 
    }
   //   KPrefsDialogWidBool *sb;  //#ifndef DESKTOP_VERSION
 #if 0
   ++iii;
   sb =
            addWidBool(i18n("Quick load/save (w/o Unicode)"), 
                       &(KOPrefs::instance()->mUseQuicksave),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
 #endif
 #endif
 }
 void KOPrefsDialog::showSyncPage()
 {
     showPage ( 0 ) ;
     kdelibcfg->showTimeZoneTab() ;
 
 }
 void KOPrefsDialog::setupSyncAlgTab()
 {
 #if 0
   QLabel * lab;
    QFrame *topFrame = addPage(i18n("Sync Prefs"),0,0);
    mSetupSyncAlgTab = topFrame;
    QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
    topLayout->setSpacing(mSpacingHint);
    topLayout->setMargin(mMarginHint);  
    int iii = 0;  
    
    KPrefsDialogWidBool *sb =
        addWidBool(i18n("Ask for preferences before syncing"),
                   &(KOPrefs::instance()->mAskForPreferences),topFrame);
    topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
 
    ++iii;
 
    KPrefsDialogWidRadios *syncPrefsGroup =
       addWidRadios(i18n("Sync preferences:"),&(KOPrefs::instance()->mSyncAlgoPrefs),
                    topFrame);
    syncPrefsGroup->addRadio(i18n("Take local entry on conflict"));
    syncPrefsGroup->addRadio(i18n("Take remote entry on conflict"));
    syncPrefsGroup->addRadio(i18n("Take newest entry on conflict"));
    syncPrefsGroup->addRadio(i18n("Ask for every entry on conflict"));
    syncPrefsGroup->addRadio(i18n("Force take local entry always"));
    syncPrefsGroup->addRadio(i18n("Force take remote entry always"));
    topLayout->addMultiCellWidget( syncPrefsGroup->groupBox(),iii,iii,0,1);
    ++iii;   
   sb =
        addWidBool(i18n("Show summary after syncing"),
                   &(KOPrefs::instance()->mShowSyncSummary),topFrame);
    topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
 
    ++iii;
 #endif
 
 
 
 }
 
 
 void KOPrefsDialog::setupSyncTab()
 {
 #if 0
     QLabel * lab;
    QFrame *topFrame = addPage(i18n("Sync Network"),0,0);
    QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
    topLayout->setSpacing(mSpacingHint);
    topLayout->setMargin(mMarginHint);
    lab = new QLabel(i18n("Remote syncing (via ssh/scp)\nnetwork settings "), topFrame);
    int iii = 0;
    topLayout->addMultiCellWidget(lab , iii,iii,0,1);
    ++iii;
 
    mRemoteIPEdit = new QLineEdit(topFrame);
    lab = new QLabel(mRemoteIPEdit, i18n("Remote IP:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mRemoteIPEdit,iii,1);
    ++iii;
    mRemoteUser = new QLineEdit(topFrame);
    lab = new QLabel(mRemoteUser, i18n("Remote user:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mRemoteUser, iii,1); 
    ++iii;
 
    mRemoteFile = new QLineEdit(topFrame);
    lab = new QLabel(mRemoteFile, i18n("Remote file:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mRemoteFile,iii,1);
    ++iii;
  
    mLocalTempFile = new QLineEdit(topFrame);
    lab = new QLabel(mLocalTempFile, i18n("Local temp file:"), topFrame);
    topLayout->addWidget(lab ,iii,0);
    topLayout->addWidget(mLocalTempFile,iii,1);
    ++iii;
  
    KPrefsDialogWidBool *wb =
        addWidBool(i18n("Write back synced file"),
                   &(KOPrefs::instance()->mWriteBackFile),topFrame);
    topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1);
    ++iii;
    wb =
        addWidBool(i18n("Write back existing entries only"),
                   &(KOPrefs::instance()->mWriteBackExistingOnly),topFrame);
    topLayout->addMultiCellWidget(wb->checkBox(), iii,iii,0,1);
    ++iii;
  
 #endif
 }
 
 void KOPrefsDialog::setupMainTab()
 {
     QFrame *topFrame = addPage(i18n("General"),0,0);
     // DesktopIcon("identity",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
 
  //  KPrefsDialogWidBool *emailControlCenter =
 //       addWidBool(i18n("&Use email settings from Control Center"),
 //                  &(KOPrefs::instance()->mEmailControlCenter),topFrame);
 //   topLayout->addMultiCellWidget(emailControlCenter->checkBox(),0,0,0,1);
   // connect(emailControlCenter->checkBox(),SIGNAL(toggled(bool)),
   //      SLOT(toggleEmailSettings(bool)));
 
   mNameEdit = new QLineEdit(topFrame);
   mNameLabel = new QLabel(mNameEdit, i18n("Full &name:"), topFrame);
   topLayout->addWidget(mNameLabel,0,0);
   topLayout->addWidget(mNameEdit,0,1);
 
   mEmailEdit = new QLineEdit(topFrame);
   mEmailLabel = new QLabel(mEmailEdit, i18n("E&mail address:"),topFrame);
   topLayout->addWidget(mEmailLabel,1,0);
   topLayout->addWidget(mEmailEdit,1,1);
   KPrefsDialogWidBool *wb;
   
 
   
   KPrefsDialogWidBool *widbool = addWidBool(i18n("Full menu bar(nr)"),
              &(KOPrefs::instance()->mShowFullMenu),topFrame);
   topLayout->addMultiCellWidget(  widbool->checkBox(), 2,2,0,1); 
   
   
   widbool = addWidBool(i18n("Mini icons in toolbar(nr)"),
              &(KOPrefs::instance()->mToolBarMiniIcons),topFrame);
   topLayout->addMultiCellWidget(  widbool->checkBox(), 3,3,0,1); 
 
 
  KPrefsDialogWidBool *verticalScreen =
       addWidBool(i18n("Show vertical screen (Needs restart)"),
                  &(KOPrefs::instance()->mVerticalScreen),topFrame);
   //topLayout->addWidget(verticalScreen->checkBox(),ii++,0);
   topLayout->addMultiCellWidget(verticalScreen->checkBox(),4,4,0,1);
 
   
   int iii = 5;
   widbool = addWidBool(i18n("Block popup until mouse button release"),
              &(KOPrefs::instance()->mBlockPopupMenu),topFrame);
   topLayout->addMultiCellWidget(  widbool->checkBox(), iii,iii,0,1); 
   ++iii;
   QHBox *dummy = new QHBox(topFrame);
   new QLabel(i18n("Days in Next-X-Days:"),dummy);
   mNextXDaysSpin = new QSpinBox(2,14,1,dummy);
  
   topLayout->addMultiCellWidget(dummy,iii,iii,0,1);
 
   ++iii;
  
 
   // KPrefsDialogWidBool *bcc =
 //       addWidBool(i18n("Send copy to owner when mailing events"),
 //                  &(KOPrefs::instance()->mBcc),topFrame);
 //   topLayout->addMultiCellWidget(bcc->checkBox(),4,4,0,1);
 
 
   // QGroupBox *autoSaveGroup = new QGroupBox(1,Horizontal,i18n("Auto-Save"),  topFrame);
   //topLayout->addMultiCellWidget(autoSaveGroup,6,6,0,1);
 
   // addWidBool(i18n("Enable automatic saving of calendar"),
   //         &(KOPrefs::instance()->mAutoSave),autoSaveGroup);
 
   QHBox *intervalBox = new QHBox(topFrame);
   // intervalBox->setSpacing(mSpacingHint);
   topLayout->addMultiCellWidget(intervalBox,iii,iii,0,1);
   ++iii;
   QLabel *autoSaveIntervalLabel = new QLabel(i18n("Auto save delay in minutes:"),intervalBox);
   mAutoSaveIntervalSpin = new QSpinBox(0,500,1,intervalBox);
   autoSaveIntervalLabel->setBuddy(mAutoSaveIntervalSpin); 
   /*
   QHBox * agendasize = new QHBox ( topFrame );
   
   new QLabel (i18n("AllDayAgenda Height:"), agendasize );
   
 
   mHourSizeSlider = new QSlider(24,47,1,24,Horizontal,agendasize);
   topLayout->addMultiCellWidget(agendasize,7,7,0,1);
   */
   
 
   KPrefsDialogWidBool *ask =
     addWidBool(i18n("Ask for quit when closing KO/Pi"),
                &(KOPrefs::instance()->mAskForQuit),topFrame);
   topLayout->addMultiCellWidget(ask->checkBox(),iii,iii,0,1);
   ++iii;
  
 
   /*
   KPrefsDialogWidBool *confirmCheck =
       addWidBool(i18n("Confirm &deletes"),&(KOPrefs::instance()->mConfirm),
                  topFrame);
   topLayout->addMultiCellWidget(confirmCheck->checkBox(),7,7,0,1);
 
 
   mEnableGroupScheduling =
       addWidBool(i18n("Enable group scheduling"),
                  &(KOPrefs::instance()->mEnableGroupScheduling),topFrame);
   topLayout->addWidget(mEnableGroupScheduling->checkBox(),8,0);
   connect(mEnableGroupScheduling->checkBox(),SIGNAL(clicked()),
           SLOT(warningGroupScheduling()));
 
   mEnableProjectView =
       addWidBool(i18n("Enable project view"),
                  &(KOPrefs::instance()->mEnableProjectView),topFrame);
   topLayout->addWidget(mEnableProjectView->checkBox(),9,0);
   connect(mEnableProjectView->checkBox(),SIGNAL(clicked()),
           SLOT(warningProjectView()));
 
   // Can't be disabled anymore
   mEnableGroupScheduling->checkBox()->hide();
 
   // Disable setting, because this feature now becomes stable
   mEnableProjectView->checkBox()->hide();
 
   KPrefsDialogWidRadios *defaultFormatGroup =
       addWidRadios(i18n("Default Calendar Format"),
                    &(KOPrefs::instance()->mDefaultFormat),topFrame);
   defaultFormatGroup->addRadio(i18n("vCalendar"));
   defaultFormatGroup->addRadio(i18n("iCalendar"));
 
   topLayout->addMultiCellWidget(defaultFormatGroup->groupBox(),10,10,0,1);
 
   // Default format unconditionally is iCalendar
   defaultFormatGroup->groupBox()->hide();
 
   KPrefsDialogWidRadios *mailClientGroup =
       addWidRadios(i18n("Mail Client"),&(KOPrefs::instance()->mMailClient),
                    topFrame);
   mailClientGroup->addRadio(i18n("KMail"));
   mailClientGroup->addRadio(i18n("Sendmail"));
   topLayout->addMultiCellWidget(mailClientGroup->groupBox(),11,11,0,1);
 
   KPrefsDialogWidBool *htmlsave =
       addWidBool(i18n("Export to HTML with every save"),&(KOPrefs::instance()->mHtmlWithSave),
                  topFrame);
   topLayout->addMultiCellWidget(htmlsave->checkBox(),12,12,0,1);
 
   KPrefsDialogWidRadios *destinationGroup =
       addWidRadios(i18n("New Events/Todos should"),&(KOPrefs::instance()->mDestination),
                    topFrame);
   destinationGroup->addRadio(i18n("be added to the standard resource"));
   destinationGroup->addRadio(i18n("be asked which resource to use"));
   topLayout->addMultiCellWidget(destinationGroup->groupBox(),13,13,0,1);
 
   topLayout->setRowStretch(14,1);
   */
 }
 
 
 void KOPrefsDialog::setupTimeTab()
 {
     QFrame *topFrame = addPage(i18n("Time"),0,0);
     // DesktopIcon("clock",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,4,2);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
  
   QHBox *dummy = new QHBox(topFrame);
   KPrefsDialogWidTime *dayBegins =
       addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
                dummy);
   //topLayout->addWidget(dayBegins->label(),2,0);
   
   //topLayout->addWidget(dayBegins->spinBox(),2,1);
   topLayout->addMultiCellWidget(dummy,0,0,0,1);
 
   topLayout->addWidget(new QLabel(i18n("Default appointment time:"),
                        topFrame),1,0);
   mStartTimeSpin = new QSpinBox(0,23,1,topFrame);
   mStartTimeSpin->setSuffix(":00");
   topLayout->addWidget(mStartTimeSpin,1,1);
 
   topLayout->addWidget(new QLabel(i18n("Def. duration of new app.:"),
                        topFrame),2,0);
   mDefaultDurationSpin = new QSpinBox(0,23,1,topFrame);
   mDefaultDurationSpin->setSuffix(":00");
   topLayout->addWidget(mDefaultDurationSpin,2,1);
 
   QStringList alarmList;
   alarmList << i18n("1 minute") << i18n("5 minutes") << i18n("10 minutes")
             << i18n("15 minutes") << i18n("30 minutes")<< i18n("1 hour")<< i18n("3 hours")  << i18n("24 hours") ;
   topLayout->addWidget(new QLabel(i18n("Default alarm time:"),topFrame),
                        3,0);
   mAlarmTimeCombo = new QComboBox(topFrame);
   mAlarmTimeCombo->insertStringList(alarmList);
   topLayout->addWidget(mAlarmTimeCombo,3,1);
 
 
   QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal,
                                                i18n("Working Hours"),
                                                topFrame);
   topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1);
   workingHoursGroup->layout()->setSpacing( 0 );
   workingHoursGroup->layout()->setMargin( 4 );
   QHBox *workStartBox = new QHBox(workingHoursGroup);
   // workStartBox->setMargin( 0 );
   addWidTime(i18n("Daily starting hour:"),
              &(KOPrefs::instance()->mWorkingHoursStart),workStartBox);
 
   QHBox *workEndBox = new QHBox(workingHoursGroup);
   //workEndBox->setMargin( 0 );
   addWidTime(i18n("Daily ending hour:"),
              &(KOPrefs::instance()->mWorkingHoursEnd),workEndBox);
   QVBox *excludeBox  = new QVBox(workingHoursGroup);
   //excludeBox->setMargin( 0 );
   addWidBool(i18n("Exclude holidays"),
              &(KOPrefs::instance()->mExcludeHolidays),excludeBox);
 
   addWidBool(i18n("Exclude Saturdays"),
              &(KOPrefs::instance()->mExcludeSaturdays),excludeBox);
 
 //   KPrefsDialogWidBool *marcusBainsShowSeconds = addWidBool(i18n("Show seconds on Marcus Bains line"),
         //      &(KOPrefs::instance()->mMarcusBainsShowSeconds),
         //      topFrame);
 //   topLayout->addWidget(marcusBainsShowSeconds->checkBox(),5,0);
 
   // topLayout->setRowStretch(6,1);
 }
 
 
 void KOPrefsDialog::setupViewsTab()
 {
 
     QFrame *topFrame = addPage(i18n("Views"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,6,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
 
 //   QBoxLayout *dayBeginsLayout = new QHBoxLayout;
 //   topLayout->addLayout(dayBeginsLayout,0,0);
 
 //   KPrefsDialogWidTime *dayBegins =
 //     addWidTime(i18n("Day begins at:"),&(KOPrefs::instance()->mDayBegins),
 //                topFrame);
 //   dayBeginsLayout->addWidget(dayBegins->label());
 //   dayBeginsLayout->addStretch(1);
 //   dayBeginsLayout->addWidget(dayBegins->spinBox());
 
 //   QBoxLayout *nextDaysLayout = new QHBoxLayout;
 //   topLayout->addLayout(nextDaysLayout,1,0);
 //   nextDaysLayout->addWidget(new QLabel(i18n("Days to show in Next-X-Days view:"),topFrame));
 //   mNextXDaysSpin = new QSpinBox(2,14,1,topFrame);
 //   nextDaysLayout->addStretch(1);
 //   nextDaysLayout->addWidget(mNextXDaysSpin);
 
 
   int ii = 0; 
   KPrefsDialogWidBool *dummy =
     addWidBool(i18n("Edit item on doubleclick (if not, show)"),
                &(KOPrefs::instance()->mEditOnDoubleClick),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
   
  
 
 
  
  
   // topLayout->addWidget(hourSizeGroup,ii++,0);
   // topLayout->addMultiCellWidget(hourSizeGroup,ii,ii,0,0);
   //topLayout->setRowStretch(11,1);
 
 
 
 
 #if 0
 
    topFrame = addPage(i18n("ViewChange"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,6,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
 
 #endif
 
   dummy =
     addWidBool(i18n("Hold fullscreen on view change"),
                &(KOPrefs::instance()->mViewChangeHoldFullscreen),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
   dummy =
     addWidBool(i18n("Hold non-fullscreen on view change"),
                &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
 
   KPrefsDialogWidBool *fullViewMonth =
       addWidBool(i18n("Next days view uses full window"),
                  &(KOPrefs::instance()->mFullViewMonth),topFrame);
   topLayout->addWidget(fullViewMonth->checkBox(),ii++,0);
 
 
  KPrefsDialogWidBool *fullViewTodo =
       addWidBool(i18n("Event list view uses full window"),
                  &(KOPrefs::instance()->mFullViewTodo),topFrame);
   topLayout->addWidget(fullViewTodo->checkBox(),ii++,0);
   dummy =
     addWidBool(i18n("Listview uses monthly timespan"),
                &(KOPrefs::instance()->mListViewMonthTimespan),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
  dummy  =
     addWidBool(i18n("Highlight selection in Time Edit"),
                &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame);
    topLayout->addWidget( dummy->checkBox(), ii++,0);
 
   KPrefsDialogWidBool *dailyRecur =
     addWidBool(i18n("Show events that recur daily in date nav."),
                &(KOPrefs::instance()->mDailyRecur),topFrame);
   topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
 
   KPrefsDialogWidBool *weeklyRecur =
     addWidBool(i18n("Show ev. that recur weekly in date nav."),
                &(KOPrefs::instance()->mWeeklyRecur),topFrame);
   topLayout->addWidget(weeklyRecur->checkBox(),ii++,0);
 
 #ifdef DESKTOP_VERSION
   KPrefsDialogWidBool *enableToolTips =
       addWidBool(i18n("Enable tooltips displaying summary of ev."),
                  &(KOPrefs::instance()->mEnableToolTips),topFrame);
   topLayout->addWidget(enableToolTips->checkBox(),ii++,0);
 #endif
   //  *********************************************************
 
   topFrame = addPage(i18n("Agenda View"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,5,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
 
 
  dummy =
     addWidBool(i18n("Show time in agenda items"),
                &(KOPrefs::instance()->mShowTimeInAgenda),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
   dummy =
     addWidBool(i18n("Highlight current day in agenda"),
                &(KOPrefs::instance()->mHighlightCurrentDay),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
   dummy =
     addWidBool(i18n("Use light color for highlight current day"),
                &(KOPrefs::instance()->mUseHighlightLightColor),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
  KPrefsDialogWidBool *marcusBainsEnabled =
       addWidBool(i18n("Show current time"),
                  &(KOPrefs::instance()->mMarcusBainsEnabled),topFrame);
   topLayout->addWidget(marcusBainsEnabled->checkBox(),ii++,0);
   
 
  dummy =
     addWidBool(i18n("Set agenda to DayBeginsAt on change"),
                &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
  dummy =
     addWidBool(i18n("Set agenda to current time on change"),
                &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
 
 
 
 
 
    topFrame = addPage(i18n("Month View"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,5,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
   QLabel *lab;
   QHBox *habo = new QHBox( topFrame );
   if ( QApplication::desktop()->width() <= 480 ) {
       lab = new QLabel ( i18n("Show events that recur "), topFrame );
       topLayout->addMultiCellWidget(lab,ii, ii,0,1);
       ii++;
   } else {
       new QLabel ( i18n("Show events that recur "), habo );
   }
   dailyRecur =
     addWidBool(i18n("daily"),
                &(KOPrefs::instance()->mMonthDailyRecur),habo);
   // topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
 
   weeklyRecur =
     addWidBool(i18n("weekly"),
                &(KOPrefs::instance()->mMonthWeeklyRecur),habo);
   topLayout->addMultiCellWidget(habo,ii, ii,0,1);
   ii++;
 
 
   habo = new QHBox( topFrame ); 
   if ( QApplication::desktop()->width() <= 480 ) {
       lab = new QLabel (i18n("Show in every cell ") , topFrame );
       topLayout->addMultiCellWidget(lab,ii, ii,0,1);
       ii++;
       
   } else {
       new QLabel ( i18n("Show in every cell "), habo );
   }
   weeklyRecur = 
     addWidBool(i18n("short month"),
                &(KOPrefs::instance()->mMonthShowShort),habo);
  weeklyRecur =
     addWidBool(i18n("icons"),
                &(KOPrefs::instance()->mMonthShowIcons),habo);
  weeklyRecur =
      addWidBool(i18n("times"),
                 &(KOPrefs::instance()->mMonthShowTimes),habo);
   topLayout->addMultiCellWidget(habo,ii, ii,0,1);
   ii++;
 #ifdef DESKTOP_VERSION
  KPrefsDialogWidBool *enableMonthScroll =
       addWidBool(i18n("Enable scrollbars in month view cells"),
                  &(KOPrefs::instance()->mEnableMonthScroll),topFrame);
   topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0);
 #endif
   dummy =
     addWidBool(i18n("Week view mode uses bigger font"),
                &(KOPrefs::instance()->mMonthViewUsesBigFont),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
   dummy =
     addWidBool(i18n("Show Sat/Sun together"),
                &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
  KPrefsDialogWidBool *coloredCategoriesInMonthView =
        addWidBool(i18n("Month view uses category colors"),
                   &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame);
   topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); 
 
   dummy =
     addWidBool(i18n("Categorie colors are applied to text"),
                &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
  coloredCategoriesInMonthView =
        addWidBool(i18n("Month view uses day colors"),
                   &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame);
   topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
 
  KPrefsDialogWidColor *holidayColor =
       addWidColor(i18n("Day color odd months"),
                   &(KOPrefs::instance()->mMonthViewOddColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
 
  holidayColor =
       addWidColor(i18n("Day color even months"),
                   &(KOPrefs::instance()->mMonthViewEvenColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
 
  
   holidayColor =
       addWidColor(i18n("Color for Sundays + category \"Holiday\""),
                   &(KOPrefs::instance()->mMonthViewHolidayColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
   // *********************** What'sNext View
   topFrame = addPage(i18n("What's Next View"),0,0);
   //  DesktopIcon("viewmag",KIcon::SizeMedium));
   
   topLayout = new QGridLayout(topFrame,4,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
 
 
   QHBox* hdummy = new QHBox(topFrame);
   new QLabel(i18n("Days in What's Next:"),hdummy);
   mWhatsNextSpin = new QSpinBox(1,14,1,hdummy);
   
   topLayout->addWidget(hdummy,ii++,0);
 
   QHBox *prioBox = new QHBox(topFrame);
   // intervalBox->setSpacing(mSpacingHint);
   topLayout->addWidget(prioBox,ii++,0);
  
   QLabel *prioLabel = new QLabel(i18n("Number of max.displayed todo prios:"), prioBox);
   mPrioSpin = new QSpinBox(0,5,1,prioBox);
   if ( QApplication::desktop()->width() <  300 )
       mPrioSpin->setFixedWidth( 40 );
 
   KPrefsDialogWidBool *passwdk =
 
       addWidBool(i18n("Show events, that are done"),
                  &(KOPrefs::instance()->mWNViewShowsPast),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
   passwdk =
       addWidBool(i18n("Show parent To-Do's"),
                  &(KOPrefs::instance()->mWNViewShowsParents),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
   
   passwdk =
       addWidBool(i18n("Show location"),
                  &(KOPrefs::instance()->mWNViewShowLocation),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
   
-  passwdk =
-      addWidBool(i18n("Show Sync Events in WN+Agenda"),
-                 &(KOPrefs::instance()->mShowSyncEvents),topFrame);
-  topLayout->addWidget(passwdk->checkBox(), ii++,0);
+
   passwdk =
       addWidBool(i18n("Use short date in WN+Event view"),
                  &(KOPrefs::instance()->mShortDateInViewer),topFrame);
   topLayout->addWidget(passwdk->checkBox(), ii++,0);
    
 
  
 
   // *********************** Todo View
 
    topFrame = addPage(i18n("Todo View"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,4,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   ii = 0;
 dummy =
     addWidBool(i18n("Hide not running Todos in To-do view"),
                &(KOPrefs::instance()->mHideNonStartedTodos),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
  KPrefsDialogWidBool *showCompletedTodo =
       addWidBool(i18n("To-do view shows completed Todos"),
                  &(KOPrefs::instance()->mShowCompletedTodo),topFrame);
   topLayout->addWidget(showCompletedTodo->checkBox(),ii++,0);
  dummy =
     addWidBool(i18n("To-do view shows complete as 'xx %'"),
                &(KOPrefs::instance()->mTodoViewShowsPercentage),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
  dummy =
     addWidBool(i18n("Small To-do view uses smaller font"),
                &(KOPrefs::instance()->mTodoViewUsesSmallFont),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
 
  dummy =
     addWidBool(i18n("Todo view uses category colors"),
                &(KOPrefs::instance()->mTodoViewUsesCatColors),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
  QWidget* wid = new QWidget( topFrame );
   // Todo run today color
   KPrefsDialogWidColor *todoRunColor =
       addWidColor(i18n("Color for running todos:"),
                   &(KOPrefs::instance()->mTodoRunColor),wid);
   QHBoxLayout *widLayout = new QHBoxLayout(wid);
   widLayout->addWidget( todoRunColor->label() );
   widLayout->addWidget( todoRunColor->button() );
   topLayout->addWidget(wid,ii++,0);
 
   wid = new QWidget( topFrame );
   // Todo due today color
   KPrefsDialogWidColor *todoDueTodayColor =
       addWidColor(i18n("Todo due today color:"),
                   &(KOPrefs::instance()->mTodoDueTodayColor),wid);
   widLayout = new QHBoxLayout(wid);
   widLayout->addWidget( todoDueTodayColor->label() );
   widLayout->addWidget( todoDueTodayColor->button() );
   topLayout->addWidget(wid,ii++,0);
   //topLayout->addWidget(todoDueTodayColor->button(),ii++,1);
 
   // Todo overdue color
   wid = new QWidget( topFrame );
   widLayout = new QHBoxLayout(wid);
   KPrefsDialogWidColor *todoOverdueColor =
       addWidColor(i18n("Todo overdue color:"),
                   &(KOPrefs::instance()->mTodoOverdueColor),wid);
   widLayout->addWidget(todoOverdueColor->label());
   widLayout->addWidget(todoOverdueColor->button());
   topLayout->addWidget(wid,ii++,0);
 
  dummy =
     addWidBool(i18n("Colors are applied to text"),
                &(KOPrefs::instance()->mTodoViewUsesForegroundColor),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
  dummy =
     addWidBool(i18n("Allday Agenda view shows todos"),
                &(KOPrefs::instance()->mShowTodoInAgenda),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
    topFrame = addPage(i18n("View Options"),0,0);
 
   topLayout = new QGridLayout(topFrame,4,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
-  ii = 0;
+  ii = 0;  
+
+   dummy  =
+      addWidBool(i18n("Show Sync Events"),
+                 &(KOPrefs::instance()->mShowSyncEvents),topFrame);
+  topLayout->addWidget(dummy->checkBox(), ii++,0);
+
   lab = new QLabel( i18n("Show in todo/event viewer:"), topFrame);
   topLayout->addWidget(lab ,ii++,0);
 
   dummy = addWidBool(i18n("Details"),
                &(KOPrefs::instance()->mEVshowDetails),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
   dummy = addWidBool(i18n("Created time"),
                &(KOPrefs::instance()->mEVshowCreated),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
   dummy = addWidBool(i18n("Last modified time"),
                &(KOPrefs::instance()->mEVshowChanged),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
   lab = new QLabel( i18n("Show in What'sThis quick overview:"), topFrame);
   topLayout->addWidget(lab ,ii++,0);
 
   dummy = addWidBool(i18n("Details"),
                &(KOPrefs::instance()->mWTshowDetails),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
   dummy = addWidBool(i18n("Created time"),
                &(KOPrefs::instance()->mWTshowCreated),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
   dummy = addWidBool(i18n("Last modified time"),
                &(KOPrefs::instance()->mWTshowChanged),topFrame);
   topLayout->addWidget(dummy->checkBox(),ii++,0);
 
 
    topFrame = addPage(i18n("Alarm"),0,0);
     //  DesktopIcon("viewmag",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,2,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
   int iii = 0;
 
  dummy =
     addWidBool(i18n("Use internal alarm notification"),
                &(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame);
   topLayout->addWidget(dummy->checkBox(),iii++,0);
   lab = new QLabel( i18n("Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n"), topFrame);
 
    topLayout->addWidget(lab ,iii++,0);
 #ifndef DESKTOP_VERSION
     lab->setAlignment( AlignLeft|WordBreak|AlignTop);
 #else
     lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
     lab->setSizePolicy( QSizePolicy(  QSizePolicy::Ignored , QSizePolicy::Ignored,true) );
 #endif
  
     QHBox* dummyBox = new QHBox(topFrame);
     new QLabel(i18n("Play beeps count:"),dummyBox);
     mAlarmPlayBeeps = new QSpinBox(0,500,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
     dummyBox = new QHBox(topFrame);
     new QLabel(i18n("Beeps interval in sec:"),dummyBox);
     mAlarmBeepInterval = new QSpinBox(1,600,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
     dummyBox = new QHBox(topFrame);
     new QLabel(i18n("Default suspend time in min:"),dummyBox);
     mAlarmSuspendTime = new QSpinBox(1,600,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
     dummyBox = new QHBox(topFrame);
     new QLabel(i18n("Auto suspend count:"),dummyBox);
     mAlarmSuspendCount = new QSpinBox(0,60,1,dummyBox);
     topLayout->addWidget(dummyBox,iii++,0);
 
 
 
 
 
 
 
     QHBox* hbo = new QHBox ( topFrame );
     mDefaultAlarmFile = new QLineEdit(hbo);
     QPushButton * loadTemplate = new QPushButton(hbo); 
     QPixmap icon;
     if ( QApplication::desktop()->width() < 321 ) 
         icon = SmallIcon("fileimport16");
     else
         icon = SmallIcon("fileimport");
     loadTemplate->setIconSet (icon ) ; 
     connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( selectSoundFile() ) );
     int size = loadTemplate->sizeHint().height();
     loadTemplate->setFixedSize(  size, size );
   //lab = new QLabel( i18n("This setting is useless for 5500 user!"), topFrame);
   // topLayout->addWidget(lab ,iii++,0);
    lab = new QLabel( i18n("Alarm *.wav file for newly created alarm:"), topFrame);
    topLayout->addWidget(lab ,iii++,0);
    topLayout->addWidget(hbo,iii++,0);
   //  lab = new QLabel( i18n("Note: This does not mean, that for every alarm this file is replayed. This file here is associated with a newly created alarm."), topFrame);
 
 //    topLayout->addWidget(lab ,iii++,0);
 // #ifndef DESKTOP_VERSION
 //     lab->setAlignment( AlignLeft|WordBreak|AlignTop);
 // #else
 //     lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
 //     lab->setSizePolicy( QSizePolicy(  QSizePolicy::Ignored , QSizePolicy::Ignored,true) );
 // #endif
  
 
 }
 
 void KOPrefsDialog::selectSoundFile()
 {
     QString fileName = mDefaultAlarmFile->text();
     fileName = KFileDialog::getSaveFileName(  mDefaultAlarmFile->text() , "Choose default alarm file", this );
      if ( fileName.length() > 0 )
          mDefaultAlarmFile->setText( fileName );
 }
 void KOPrefsDialog::setupFontsTab()
 {
  
     QFrame *topFrame = addPage(i18n("Fonts"),0,0);
     //  DesktopIcon("fonts",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,7,3);
   topLayout->setSpacing(1);
   topLayout->setMargin(3);
   KPrefsDialogWidFont * tVFont;
   int i = 0;
   KPrefsDialogWidFont *timeLabelsFont =
       addWidFont(i18n("23"),i18n("DateNavigator:(nr)"),
                  &(KOPrefs::instance()->mDateNavigatorFont),topFrame);
   topLayout->addWidget(timeLabelsFont->label(),i,0);
   topLayout->addWidget(timeLabelsFont->preview(),i,1);
   topLayout->addWidget(timeLabelsFont->button(),i,2);
   ++i;
 
 
   timeLabelsFont =
       addWidFont(i18n("Mon 15"),i18n("Date Labels:"),
                  &(KOPrefs::instance()->mTimeLabelsFont),topFrame);
   topLayout->addWidget(timeLabelsFont->label(),i,0);
   topLayout->addWidget(timeLabelsFont->preview(),i,1);
   topLayout->addWidget(timeLabelsFont->button(),i,2);
   ++i;
 
   KPrefsDialogWidFont *timeBarFont =
       addWidFont(KGlobal::locale()->formatTime(QTime(12,34)),i18n("Time bar:"),
                  &(KOPrefs::instance()->mTimeBarFont),topFrame);
   topLayout->addWidget(timeBarFont->label(),i,0);
   topLayout->addWidget(timeBarFont->preview(),i,1);
   topLayout->addWidget(timeBarFont->button(),i,2);
   ++i;
 
 
   KPrefsDialogWidFont *marcusBainsFont =
       addWidFont(KGlobal::locale()->formatTime(QTime(12,34,23)),i18n("M. Bains line:"),
                  &(KOPrefs::instance()->mMarcusBainsFont),topFrame);
   topLayout->addWidget(marcusBainsFont->label(),i,0);
   topLayout->addWidget(marcusBainsFont->preview(),i,1);
   topLayout->addWidget(marcusBainsFont->button(),i,2);
   ++i;
 
   tVFont =
       addWidFont(i18n("Summary"),i18n("Event Viewer:"),
                  &(KOPrefs::instance()->mEventViewFont),topFrame);
   topLayout->addWidget(tVFont->label(),i,0);
   topLayout->addWidget(tVFont->preview(),i,1);
   topLayout->addWidget(tVFont->button(),i,2);
   ++i;
 
 
 
   tVFont =
       addWidFont(i18n("Details"),i18n("EditorBox:"),
                  &(KOPrefs::instance()->mEditBoxFont),topFrame);
   topLayout->addWidget(tVFont->label(),i,0);
   topLayout->addWidget(tVFont->preview(),i,1);
   topLayout->addWidget(tVFont->button(),i,2);
   ++i;
 
 
  
   topLayout->setColStretch(1,1);
   topLayout->setRowStretch(4,1);
 
 
   i = 0;
   topFrame = addPage(i18n("View Fonts"),0,
                              DesktopIcon("fonts",KIcon::SizeMedium));
 
   topLayout = new QGridLayout(topFrame,7,3);
   topLayout->setSpacing(1);
   topLayout->setMargin(3);
 
   tVFont =
       addWidFont(i18n("Configure KO"),i18n("What's Next View:"),
                  &(KOPrefs::instance()->mWhatsNextFont),topFrame);
   topLayout->addWidget(tVFont->label(),i,0);
   topLayout->addWidget(tVFont->preview(),i,1);
   topLayout->addWidget(tVFont->button(),i,2);
   ++i;
   KPrefsDialogWidFont *agendaViewFont =
       addWidFont(i18n("Event text"),i18n("Agenda view:"),
                  &(KOPrefs::instance()->mAgendaViewFont),topFrame);
   topLayout->addWidget(agendaViewFont->label(),i,0);
   topLayout->addWidget(agendaViewFont->preview(),i,1);
   topLayout->addWidget(agendaViewFont->button(),i,2);
   ++i;
 
 
   KPrefsDialogWidFont *monthViewFont =
       addWidFont(KGlobal::locale()->formatTime(QTime(12,34)) + " " + i18n("Event"),
                  i18n("Month view:"),&(KOPrefs::instance()->mMonthViewFont),topFrame);
   topLayout->addWidget(monthViewFont->label(),i,0);
   topLayout->addWidget(monthViewFont->preview(),i,1);
   topLayout->addWidget(monthViewFont->button(),i,2);
   ++i;
 
 
  KPrefsDialogWidFont *lVFont =
       addWidFont(i18n("Event"),i18n("List View:"),
                  &(KOPrefs::instance()->mListViewFont),topFrame);
   topLayout->addWidget(lVFont->label(),i,0);
   topLayout->addWidget(lVFont->preview(),i,1);
   topLayout->addWidget(lVFont->button(),i,2);
   ++i;
 
 
   tVFont =
       addWidFont(i18n("ToDo"),i18n("ToDoView:"),
                  &(KOPrefs::instance()->mTodoViewFont),topFrame);
   topLayout->addWidget(tVFont->label(),i,0);
   topLayout->addWidget(tVFont->preview(),i,1);
   topLayout->addWidget(tVFont->button(),i,2);
   ++i;
 
 
   tVFont =
       addWidFont(i18n("Today"),i18n("JournalView:"),
                  &(KOPrefs::instance()->mJornalViewFont),topFrame);
   topLayout->addWidget(tVFont->label(),i,0);
   topLayout->addWidget(tVFont->preview(),i,1);
   topLayout->addWidget(tVFont->button(),i,2);
   ++i;
 
 
 
 
   topLayout->setColStretch(1,1);
   topLayout->setRowStretch(4,1);
 
 
 
 
 }
 
 void KOPrefsDialog::setupColorsTab()
 {
     QFrame *topFrame = addPage(i18n("Colors"),0,0);
     //  DesktopIcon("colorize",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
   // topLayout->setSpacing(mSpacingHint);
   // topLayout->setMargin(mMarginHint);
 
   topLayout->setSpacing(2);
   topLayout->setMargin(3);
 
   int ii = 1;
   QGroupBox *categoryGroup ;
 
   categoryGroup = new QGroupBox(1,Vertical,i18n("Categories"),
                                            topFrame);
   topLayout->addMultiCellWidget(categoryGroup,0,0,0,1);
 
   mCategoryCombo = new QComboBox(categoryGroup);
   mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories);
   connect(mCategoryCombo,SIGNAL(activated(int)),SLOT(updateCategoryColor()));
    
   mCategoryButton = new KColorButton(categoryGroup);
   connect(mCategoryButton,SIGNAL(changed(const QColor &)),SLOT(setCategoryColor()));
   updateCategoryColor();
 
 
   // Holiday Color
 
   KPrefsDialogWidColor *holidayColor =
       addWidColor(i18n("Holiday color:"),
                   &(KOPrefs::instance()->mHolidayColor),topFrame);
   topLayout->addWidget(holidayColor->label(),ii,0);
   topLayout->addWidget(holidayColor->button(),ii++,1);
 
   // Highlight Color
   KPrefsDialogWidColor *highlightColor =
       addWidColor(i18n("Highlight color:"),
                   &(KOPrefs::instance()->mHighlightColor),topFrame);
   topLayout->addWidget(highlightColor->label(),ii,0);
   topLayout->addWidget(highlightColor->button(),ii++,1);
 
   // Event color
   KPrefsDialogWidColor *eventColor =
       addWidColor(i18n("Default event color:"),
                   &(KOPrefs::instance()->mEventColor),topFrame);
   topLayout->addWidget(eventColor->label(),ii,0);
   topLayout->addWidget(eventColor->button(),ii++,1);
   eventColor =
       addWidColor(i18n("Default todo done color:"),
                   &(KOPrefs::instance()->mTodoDoneColor),topFrame);
   topLayout->addWidget(eventColor->label(),ii,0);
   topLayout->addWidget(eventColor->button(),ii++,1);
 
 
   // agenda view background color
   KPrefsDialogWidColor *agendaBgColor =
       addWidColor(i18n("Agenda view background color:"),
                   &(KOPrefs::instance()->mAgendaBgColor),topFrame);
   topLayout->addWidget(agendaBgColor->label(),ii,0);
   topLayout->addWidget(agendaBgColor->button(),ii++,1);
 
   // working hours color
   KPrefsDialogWidColor *workingHoursColor =
       addWidColor(i18n("Working hours color:"),
                   &(KOPrefs::instance()->mWorkingHoursColor),topFrame);
   topLayout->addWidget(workingHoursColor->label(),ii,0);
   topLayout->addWidget(workingHoursColor->button(),ii++,1);
 
   KPrefsDialogWidBool *sb =
            addWidBool(i18n("Use colors for application:"),
                       &(KOPrefs::instance()->mUseAppColors),topFrame);
        topLayout->addMultiCellWidget(sb->checkBox(), ii, ii, 0,1 );
 
        ii++;
     KPrefsDialogWidColor *   workingHoursColor1 =
            addWidColor(i18n("Buttons, menus, etc.:"),
                        &(KOPrefs::instance()->mAppColor1),topFrame);
        topLayout->addWidget(workingHoursColor1->label(),ii,0);
        topLayout->addWidget(workingHoursColor1->button(),ii++,1);
        
       KPrefsDialogWidColor *   workingHoursColor2 =
            addWidColor(i18n("Frames, labels, etc.:"),
                        &(KOPrefs::instance()->mAppColor2),topFrame);
        topLayout->addWidget(workingHoursColor2->label(),ii,0);
        topLayout->addWidget(workingHoursColor2->button(),ii++,1);
 
 
   
 }
 
 void KOPrefsDialog::setCategoryColor()
 {
   mCategoryDict.replace(mCategoryCombo->currentText(), new QColor(mCategoryButton->color()));
 }
 
 void KOPrefsDialog::updateCategoryColor()
 {
   QString cat = mCategoryCombo->currentText();
   QColor *color = mCategoryDict.find(cat);
   if (!color) {
     color = KOPrefs::instance()->categoryColor(cat);
   }
   if (color) {
     mCategoryButton->setColor(*color);
   }
 }
 
 void KOPrefsDialog::setupPrinterTab()
 {
   mPrinterTab = addPage(i18n("Printing"),0,
                         DesktopIcon("fileprint",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(mPrinterTab,5,2);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
 
   topLayout->setRowStretch(4,1);
 }
 
 void KOPrefsDialog::setupGroupSchedulingTab()
 {
 #if 0
   QFrame *topFrame  = addPage(i18n("Group Scheduling"),0,
                               DesktopIcon("personal",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,6,2);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
 
 #if 0
   KPrefsDialogWidRadios *schedulerGroup =
       addWidRadios(i18n("Scheduler Mail Client"),&(KOPrefs::instance()->mIMIPScheduler),
                    topFrame);
   schedulerGroup->addRadio("Dummy"); // Only for debugging
   schedulerGroup->addRadio(i18n("Mail client"));
 
   topLayout->addMultiCellWidget(schedulerGroup->groupBox(),0,0,0,1);
 #endif
 
   KPrefsDialogWidRadios *sendGroup =
       addWidRadios(i18n("Scheduler Mails Should Be"),&(KOPrefs::instance()->mIMIPSend),
                    topFrame);
   sendGroup->addRadio(i18n("Send to outbox"));
   sendGroup->addRadio(i18n("Send directly"));
 
   topLayout->addMultiCellWidget(sendGroup->groupBox(),1,1,0,1);
 
   topLayout->addMultiCellWidget(new QLabel(i18n("Additional email addresses:"),topFrame),2,2,0,1);
   mAMails = new QListView(topFrame);
   mAMails->addColumn(i18n("Email"),300);
   topLayout->addMultiCellWidget(mAMails,3,3,0,1);
 
   topLayout->addWidget(new QLabel(i18n("Additional email address:"),topFrame),4,0);
   aEmailsEdit = new QLineEdit(topFrame);
   aEmailsEdit->setEnabled(false);
   topLayout->addWidget(aEmailsEdit,4,1);
 
   QPushButton *add = new QPushButton(i18n("New"),topFrame,"new");
   topLayout->addWidget(add,5,0);
   QPushButton *del = new QPushButton(i18n("Remove"),topFrame,"remove");
   topLayout->addWidget(del,5,1);
 
   //topLayout->setRowStretch(2,1);
   connect(add, SIGNAL( clicked() ), this, SLOT(addItem()) );
   connect(del, SIGNAL( clicked() ), this, SLOT(removeItem()) );
   connect(aEmailsEdit,SIGNAL( textChanged(const QString&) ), this,SLOT(updateItem()));
   connect(mAMails,SIGNAL(selectionChanged(QListViewItem *)),SLOT(updateInput()));
 #endif
 }
 
 void KOPrefsDialog::setupGroupAutomationTab()
 {
     return;
   QFrame *topFrame  = addPage(i18n("Group Automation"),0,
                               DesktopIcon("personal",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,5,1);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
 
   KPrefsDialogWidRadios *autoRefreshGroup =
       addWidRadios(i18n("Auto Send Refresh"),
                    &(KOPrefs::instance()->mIMIPAutoRefresh),topFrame);
   autoRefreshGroup->addRadio(i18n("Never"));
   autoRefreshGroup->addRadio(i18n("If attendee is in addressbook"));
   //autoRefreshGroup->addRadio(i18n("selected emails"));
   topLayout->addMultiCellWidget(autoRefreshGroup->groupBox(),0,0,0,0);
 
   KPrefsDialogWidRadios *autoInsertGroup =
       addWidRadios(i18n("Auto Insert IMIP Replies"),
                    &(KOPrefs::instance()->mIMIPAutoInsertReply),topFrame);
   autoInsertGroup->addRadio(i18n("Never"));
   autoInsertGroup->addRadio(i18n("If attendee is in addressbook"));
   //autoInsertGroup->addRadio(i18n("selected emails"));
   topLayout->addMultiCellWidget(autoInsertGroup->groupBox(),1,1,0,0);
 
   KPrefsDialogWidRadios *autoRequestGroup =
       addWidRadios(i18n("Auto Insert IMIP Requests"),
                    &(KOPrefs::instance()->mIMIPAutoInsertRequest),topFrame);
   autoRequestGroup->addRadio(i18n("Never"));
   autoRequestGroup->addRadio(i18n("If organizer is in addressbook"));
   //autoInsertGroup->addRadio(i18n("selected emails"));
   topLayout->addMultiCellWidget(autoRequestGroup->groupBox(),2,2,0,0);
 
   KPrefsDialogWidRadios *autoFreeBusyGroup =
       addWidRadios(i18n("Auto Send FreeBusy Information"),
                    &(KOPrefs::instance()->mIMIPAutoFreeBusy),topFrame);
   autoFreeBusyGroup->addRadio(i18n("Never"));
   autoFreeBusyGroup->addRadio(i18n("If requested from an email in addressbook"));
   //autoFreeBusyGroup->addRadio(i18n("selected emails"));
   topLayout->addMultiCellWidget(autoFreeBusyGroup->groupBox(),3,3,0,0);
 
   KPrefsDialogWidRadios *autoFreeBusyReplyGroup =
       addWidRadios(i18n("Auto Save FreeBusy Replies"),
                    &(KOPrefs::instance()->mIMIPAutoFreeBusyReply),topFrame);
   autoFreeBusyReplyGroup->addRadio(i18n("Never"));
   autoFreeBusyReplyGroup->addRadio(i18n("If attendee is in addressbook"));
   //autoFreeBusyGroup->addRadio(i18n("selected emails"));
   topLayout->addMultiCellWidget(autoFreeBusyReplyGroup->groupBox(),4,4,0,0);
 }
 
 void KOPrefsDialog::showPrinterTab()
 {
   showPage(pageIndex(mPrinterTab));
 }
 
 
 void KOPrefsDialog::setCombo(QComboBox *combo, const QString & text,
                                const QStringList *tags)
 {
   if (tags) {
     int i = tags->findIndex(text);
     if (i > 0) combo->setCurrentItem(i);
   } else {
     for(int i=0;i<combo->count();++i) {
       if (combo->text(i) == text) {
         combo->setCurrentItem(i);
         break;
       }
     }
   }
 }
 
 void KOPrefsDialog::usrReadConfig()
 {
   kdelibcfg->readConfig();
   mNameEdit->setText(KOPrefs::instance()->fullName());
   mEmailEdit->setText(KOPrefs::instance()->email());
 
   mAutoSaveIntervalSpin->setValue(KOPrefs::instance()->mAutoSaveInterval);
   // QDate current ( 2001, 1,1);
   //mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1));
   //mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1));
   //setCombo(mTimeZoneCombo,i18n(KOPrefs::instance()->mTimeZoneId));
   //mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset);
   mStartTimeSpin->setValue(KOPrefs::instance()->mStartTime);
   mDefaultDurationSpin->setValue(KOPrefs::instance()->mDefaultDuration);
   mAlarmTimeCombo->setCurrentItem(KOPrefs::instance()->mAlarmTime);
   // if  (KOPrefs::instance()->mAllDaySize > 47  )
   //   KOPrefs::instance()->mAllDaySize = KOPrefs::instance()->mAllDaySize/2;
   //mHourSizeSlider->setValue(KOPrefs::instance()->mAllDaySize);
 
   mNextXDaysSpin->setValue(KOPrefs::instance()->mNextXDays);
   mWhatsNextSpin->setValue(KOPrefs::instance()->mWhatsNextDays);
   mPrioSpin->setValue(KOPrefs::instance()->mWhatsNextPrios);
   // mAMails->clear();
  //  for ( QStringList::Iterator it = KOPrefs::instance()->mAdditionalMails.begin();
 //             it != KOPrefs::instance()->mAdditionalMails.end(); ++it ) {
 //     QListViewItem *item = new QListViewItem(mAMails);
 //     item->setText(0,*it);
 //     mAMails->insertItem(item);
 //   }
 
   // mRemoteIPEdit->setText(KOPrefs::instance()->mRemoteIP);
   //mRemoteUser->setText(KOPrefs::instance()->mRemoteUser);
   //mRemotePassWd->setText(KOPrefs::instance()->mRemotePassWd);
   //mRemoteFile->setText(KOPrefs::instance()->mRemoteFile);
 
   //that soundmLocalTempFile->setText(KOPrefs::instance()->mLocalTempFile);
   mDefaultAlarmFile->setText(KOPrefs::instance()->mDefaultAlarmFile);
   //QString dummy = KOPrefs::instance()->mUserDateFormatLong;
   //mUserDateFormatLong->setText(dummy.replace( QRegExp("K"), QString(",") ));
   //dummy = KOPrefs::instance()->mUserDateFormatShort;
   //mUserDateFormatShort->setText(dummy.replace( QRegExp("K"), QString(",") ));
   updateCategories();
   mAlarmPlayBeeps->setValue(KOPrefs::instance()->mAlarmPlayBeeps );
   mAlarmSuspendTime->setValue(KOPrefs::instance()->mAlarmSuspendTime );
   mAlarmSuspendCount->setValue(KOPrefs::instance()->mAlarmSuspendCount );
   mAlarmBeepInterval->setValue(KOPrefs::instance()->mAlarmBeepInterval );
 }
 
 
 void KOPrefsDialog::usrWriteConfig()
 {
 
   kdelibcfg->writeConfig();
     // KOPrefs::instance()->mRemoteIP = mRemoteIPEdit->text();
     //KOPrefs::instance()->mRemoteUser =  mRemoteUser->text();
     //KOPrefs::instance()->mRemotePassWd = mRemotePassWd->text();
     //KOPrefs::instance()->mRemoteFile= mRemoteFile->text();
     //KOPrefs::instance()->mLocalTempFile =mLocalTempFile->text();
     KOPrefs::instance()->mDefaultAlarmFile =mDefaultAlarmFile->text();
 
     //KOPrefs::instance()->mUserDateFormatShort = mUserDateFormatShort->text().replace( QRegExp(","), QString("K") );
     //KOPrefs::instance()->mUserDateFormatLong = mUserDateFormatLong->text().replace( QRegExp(","), QString("K") );
     KOPrefs::instance()->setFullName(mNameEdit->text());
     KOPrefs::instance()->setEmail(mEmailEdit->text());
     
     KOPrefs::instance()->mAutoSaveInterval = mAutoSaveIntervalSpin->value();
     
     // KOPrefs::instance()->mTimeZoneId = mTimeZoneCombo->currentText();
     //QDate date;
     //date = mStartDateSavingEdit->date();
     //int sub = 0;
     //if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59 )
     //     sub = 1;
 //     KOPrefs::instance()->mDaylightsavingStart = date.dayOfYear()-sub;
 //     date = mEndDateSavingEdit->date();
 //     if ( QDate::leapYear( date.year() ) && date.dayOfYear() > 59  )
 //         sub = 1;
 //     else 
 //         sub = 0;
 //     KOPrefs::instance()->mDaylightsavingEnd = date.dayOfYear()-sub;
 //     // KOPrefs::instance()->mTimeZoneOffset = mTimezoneOffsetSpin->value();
     
     KOPrefs::instance()->mStartTime = mStartTimeSpin->value();
     KOPrefs::instance()->mDefaultDuration = mDefaultDurationSpin->value();
     KOPrefs::instance()->mAlarmTime = mAlarmTimeCombo->currentItem();
     
     //KOPrefs::instance()->mAllDaySize = mHourSizeSlider->value();
     
     QDictIterator<QColor> it(mCategoryDict);
     while (it.current()) {
         KOPrefs::instance()->setCategoryColor(it.currentKey(),*it.current());
         ++it;
     }
     
     KOPrefs::instance()->mNextXDays = mNextXDaysSpin->value();
     KOPrefs::instance()->mWhatsNextDays = mWhatsNextSpin->value();
     KOPrefs::instance()->mWhatsNextPrios = mPrioSpin->value();
     
     KOPrefs::instance()->mAdditionalMails.clear();
     //  QListViewItem *item;
     //  item = mAMails->firstChild();
     //   while (item)
     //   {
     //     KOPrefs::instance()->mAdditionalMails.append( item->text(0) );
     //     item = item->nextSibling();
     //   }
   KOPrefs::instance()->mAlarmPlayBeeps  = mAlarmPlayBeeps->value();
   KOPrefs::instance()->mAlarmSuspendTime = mAlarmSuspendTime->value() ;
   KOPrefs::instance()->mAlarmSuspendCount= mAlarmSuspendCount->value() ;
   KOPrefs::instance()->mAlarmBeepInterval= mAlarmBeepInterval->value() ;
     
 }
 
 void KOPrefsDialog::updateCategories()
 {
   mCategoryCombo->clear();
   mCategoryDict.clear();
   mCategoryCombo->insertStringList(KOPrefs::instance()->mCustomCategories);
   updateCategoryColor();
 }
 
 void KOPrefsDialog::warningGroupScheduling()
 {
   warningExperimental(mEnableGroupScheduling->checkBox()->isChecked());
 }
 
 void KOPrefsDialog::warningProjectView()
 {
   warningExperimental(mEnableProjectView->checkBox()->isChecked());
 }
 
 void KOPrefsDialog::warningExperimental(bool on)
 {
   if (on) {
     KMessageBox::information(this,i18n("This is an experimental feature. "
         "It may not work, it may do nothing useful and it may cause data loss. "
         "Use with care.\n"
         "You have to restart KOrganizer for this setting to take effect."));
   } else {
     KMessageBox::information(this,
         i18n("You have to restart KOrganizer for this setting to take effect."));
   }
 }
 
 void KOPrefsDialog::toggleEmailSettings(bool on)
 {
   if (on) {
     mEmailEdit->setEnabled(false);
     mNameEdit->setEnabled(false);
     mEmailLabel->setEnabled(false);
     mNameLabel->setEnabled(false);
 
     KEMailSettings settings;
     mNameEdit->setText(settings.getSetting(KEMailSettings::RealName));
     mEmailEdit->setText(settings.getSetting(KEMailSettings::EmailAddress));
   } else {
     mEmailEdit->setEnabled(true);
     mNameEdit->setEnabled(true);
     mEmailLabel->setEnabled(true);
     mNameLabel->setEnabled(true);
   }
 }
 
 void KOPrefsDialog::addItem()
 {
  //  aEmailsEdit->setEnabled(true);
 //   QListViewItem *item = new QListViewItem(mAMails);
 //   mAMails->insertItem(item);
 //   mAMails->setSelected(item,true);
 //   aEmailsEdit->setText(i18n("(EmptyEmail)"));
 }
 
 void KOPrefsDialog::removeItem()
 {
 //   QListViewItem *item;
 //   item = mAMails->selectedItem();
 //   if (!item) return;
 //   mAMails->takeItem(item);
 //   item = mAMails->selectedItem();
 //   if (!item) {
 //     aEmailsEdit->setText("");
 //     aEmailsEdit->setEnabled(false);
 //   }
 //   if (mAMails->childCount() == 0) {
 //     aEmailsEdit->setEnabled(false);
 //   }
 }
 
 void KOPrefsDialog::updateItem()
 {
  //  QListViewItem *item;
 //   item = mAMails->selectedItem();
 //   if (!item) return;
 //   item->setText(0,aEmailsEdit->text());
 }
 
 void KOPrefsDialog::updateInput()
 {
 //   QListViewItem *item;
 //   item = mAMails->selectedItem();
 //   if (!item) return;
 //   aEmailsEdit->setEnabled(true);
 //   aEmailsEdit->setText(item->text(0));
 }
 void KOPrefsDialog::updateTimezoneOffset( int index )
 {
     /*
     qDebug("updateTimezoneOffset %d ", index);
     if ( index < 24 ) {
         mTimezoneOffsetSpin->setEnabled ( false );
         mTimezoneOffsetSpin->setValue( ( index-11 ) * 60 );
 
 
     } else { 
         if  ( index ==  24 ) {
             mTimezoneOffsetSpin->setEnabled ( true );
             mTimezoneOffsetSpin->setValue( KOPrefs::instance()->mTimeZoneOffset);
             
         } else {
             mTimezoneOffsetSpin->setEnabled ( false );
             mTimezoneOffsetSpin->setValue( 0 );
         }
     }
     */
 }
 
 void KOPrefsDialog::setupTimeZoneTab()
 {
 #if 0
     QFrame *topFrame = addPage(i18n("Time Zone"),0,0);
     // DesktopIcon("clock",KIcon::SizeMedium));
 
   QGridLayout *topLayout = new QGridLayout(topFrame,5,2);
   topLayout->setSpacing(mSpacingHint);
   topLayout->setMargin(mMarginHint);
 
   QHBox *timeZoneBox = new QHBox( topFrame );
   topLayout->addMultiCellWidget( timeZoneBox, 0, 0, 0, 1 );
 
   new QLabel( i18n("Timezone:"), timeZoneBox );
   mTimeZoneCombo = new QComboBox( timeZoneBox ); 
   if ( QApplication::desktop()->width() <  300 ) {
        mTimeZoneCombo->setMaximumWidth(150);
     }
 
   QStringList list;
   list = KGlobal::locale()->timeZoneList();
   mTimeZoneCombo->insertStringList(list);
 
     // find the currently set time zone and select it
   QString sCurrentlySet = KOPrefs::instance()->mTimeZoneId;
   int nCurrentlySet = 11;
   for (int i = 0; i < mTimeZoneCombo->count(); i++)
     {
       if (mTimeZoneCombo->text(i) == sCurrentlySet)
         {
          nCurrentlySet = i;
          break;
         }
     }
   mTimeZoneCombo->setCurrentItem(nCurrentlySet);
   int iii = 1;
   KPrefsDialogWidBool *sb =
       addWidBool(i18n("Timezone has daylight saving"),
                  &(KOPrefs::instance()->mUseDaylightsaving),topFrame);
   topLayout->addMultiCellWidget(sb->checkBox(), iii,iii,0,1);
   ++iii;  
   QLabel* lab = new QLabel(  i18n("Actual start and end is the\nsunday before this date."), topFrame );
   topLayout->addMultiCellWidget(lab, iii,iii,0,1);
   ++iii;   
   lab = new QLabel(  i18n("The year in the date is ignored."), topFrame );
   topLayout->addMultiCellWidget(lab, iii,iii,0,1);
   ++iii; 
   lab = new QLabel(  i18n("Daylight start:"), topFrame );
   topLayout->addWidget(lab, iii,0);
   mStartDateSavingEdit = new KDateEdit(topFrame);
   topLayout->addWidget(mStartDateSavingEdit, iii,1);
   ++iii;
 
   lab = new QLabel(  i18n("Daylight end:"), topFrame );
   topLayout->addWidget(lab, iii,0);
   mEndDateSavingEdit = new KDateEdit(topFrame);
   topLayout->addWidget(mEndDateSavingEdit, iii,1);
   ++iii;
   QDate current ( 2001, 1,1);
   mStartDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingStart-1));
   mEndDateSavingEdit->setDate(current.addDays(KOPrefs::instance()->mDaylightsavingEnd-1));
 #endif
  
 }
 
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 3aa9b6c..2e5a943 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -1,826 +1,835 @@
 /*
   This file is part of KOrganizer.
 
   Copyright (c) 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.
 */
 
 #include <qwidgetstack.h>
 
 #include <kconfig.h>
 #include <kglobal.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
 #include <qdatetime.h>
 #include "calendarview.h"
 #include "datenavigator.h"
 #include "kotodoview.h"
 #include "koagendaview.h"
 #include "kodialogmanager.h"
 #include "komonthview.h"
 #include "kolistview.h"
 #include "kowhatsnextview.h"
 #include "kojournalview.h"
 #include "kotimespanview.h"
 #include "koprefs.h"
 #include "navigatorbar.h"
 #include "kdatenavigator.h"
 
 #include "koviewmanager.h"
 //extern bool externFlagMonthviewBlockPainting;
 
 //bool globalFlagBlockPainting = false;
 int globalFlagBlockAgenda = 0;
 int globalFlagBlockLabel = 0;
 int globalFlagBlockAgendaItemPaint = 1;
 int globalFlagBlockAgendaItemUpdate = 1;
 
 
 KOViewManager::KOViewManager( CalendarView *mainView ) :
     QObject(), mMainView( mainView )
 {
     mCurrentView = 0;
     flagResetViewChangeDate = 0;
     mWhatsNextView = 0;
     mTodoView = 0;
     mAgendaView = 0;
     mMonthView = 0;
     mListView = 0;
     mJournalView = 0;
     mTimeSpanView = 0; 
     mCurrentAgendaView = 0 ;
     mFlagShowNextxDays = false;
 }
 
 KOViewManager::~KOViewManager()
 {
 }
 
 
 KOrg::BaseView *KOViewManager::currentView()
 {
     return mCurrentView;
 }
 
 void KOViewManager::readSettings(KConfig *config)
 {
     config->setGroup("General");
     QString view = config->readEntry("Current View");
     if (view == "WhatsNext") showWhatsNextView();
     else if (view == "Month") {
         if ( !KOPrefs::instance()->mMonthViewWeek )
             showMonthView();
         else
             showMonthViewWeek();
     }
     else if (view == "List") showListView();
     else if (view == "Journal") showJournalView();
     else if (view == "TimeSpan") showTimeSpanView();
     else if (view == "Todo") showTodoView();
     else {
         config->setGroup( "Views" );
         int dateCount = config->readNumEntry( "ShownDatesCount", 7 );
         mCurrentAgendaView = dateCount;
         showAgendaView();
         mCurrentAgendaView = dateCount;
 #ifdef DESKTOP_VERSION
         QTimer::singleShot( 1000, mAgendaView, SLOT ( setInitStartHour() ) );
 #endif
     }
 }
 
 void KOViewManager::showDateView( int view, QDate date)
 {
     static int lastMode = 0;
     static int lastCount = 0;
     static bool lastNDMode = false;
     static QDate lastDate;
     //qDebug("date %d %s", view, date.toString().latin1());
 
     if (view != 9)
         lastMode = 0;
     //qDebug("%d %d  ", lastNDMode, mFlagShowNextxDays );
     bool savemFlagShowNextxDays = mFlagShowNextxDays;
     mFlagShowNextxDays = false;
     if ( view == 3 ) {
         //mCurrentAgendaView = 1 ;
         lastDate = mMainView->dateNavigator()->selectedDates().first();
         lastCount = mMainView->dateNavigator()->selectedDates().count();
         lastNDMode = savemFlagShowNextxDays;
         mMainView->dateNavigator()->selectDate( date );
         lastMode = 1;
         mCurrentAgendaView = 1 ;
     } else if (view == 4 ) {
         mCurrentAgendaView = 7 ;
         mMainView->dateNavigator()->selectDates( date, 7 );
     } else if (view == 5 ) {
         mCurrentAgendaView = 14 ;
         mMainView->dateNavigator()->selectDates( date, 14);
     } else if (view == 6 ) {
         resetDateSilent( date,1);
         showMonthView();
     } else if (view == 7 ) {
         mMainView->dateNavigator()->selectDate( date );
         showJournalView();
     } else if (view == 8 ) {
         globalFlagBlockAgenda = 1;
         if ( mCurrentAgendaView != 3 )
             mCurrentAgendaView = -1;
         showAgendaView(KOPrefs::instance()->mFullViewMonth);
         globalFlagBlockAgenda = 2;
         mMainView->dateNavigator()->selectDates( date ,
                                                  KOPrefs::instance()->mNextXDays );
         mFlagShowNextxDays = true;
         mCurrentAgendaView = 3 ;
     } if (view == 9) { // return behaviour, for getting back from mode == 3 (single day mode )
         if ( lastMode ) {
             mCurrentAgendaView = lastCount ;
             mMainView->dateNavigator()->selectDates( lastDate, lastCount);
             mFlagShowNextxDays = lastNDMode;
             if ( mFlagShowNextxDays  ) {
                 mCurrentAgendaView = 3 ;
             }
         } else
             showWeekView();
     } else if (view == 10) {
         mMainView->dateNavigator()->selectDates( date,mMainView->dateNavigator()->selectedDates().count() );
     } 
 }
 
    
 
 void KOViewManager::writeSettings(KConfig *config)
 {
      config->setGroup("General");
 
     QString view;
     if (mCurrentView == mWhatsNextView) view = "WhatsNext";
     else if (mCurrentView == mMonthView) view = "Month";
     else if (mCurrentView == mListView) view = "List";
     else if (mCurrentView == mJournalView) view = "Journal";
     else if (mCurrentView == mTimeSpanView) view = "TimeSpan";
     else if (mCurrentView == mTodoView) view = "Todo";
     else view = "Agenda";
 
     config->writeEntry("Current View",view);
 
     if (mAgendaView) {
         mAgendaView->writeSettings(config);
     }
     if (mTimeSpanView) {
         mTimeSpanView->writeSettings(config);
     }
     if (mListView) {
         mListView->writeSettings(config);
     }
     if (mTodoView) {
         mTodoView->saveLayout(config,"Todo View");
     }
 }
 void KOViewManager::showNextView()
 { 
     static int selecteddatescount = 0;
     static QDate selecteddate = QDate ( 2000, 1, 1 );
     static QDate baseCycleDate = QDate ( 2000, 1, 1 );
     int newCount = mMainView->dateNavigator()->selectedDates().count();
     if ( selecteddatescount != newCount && flagResetViewChangeDate == 0 ) {
         flagResetViewChangeDate = 1;
     }
     if ( selecteddate != mMainView->dateNavigator()->selectedDates().first() )
         flagResetViewChangeDate = 1;
     if ( flagResetViewChangeDate > 0 ) {
         baseCycleDate = mMainView->dateNavigator()->selectedDates().first();
         //qDebug("newCycle ");
     }
     if (mCurrentView == mWhatsNextView) goto NEXT_X;
     if (mCurrentView == mAgendaView && mFlagShowNextxDays)  goto JOURNAL;
     if  (mCurrentView == mJournalView )  goto DAY_1;
     if (mCurrentView == mAgendaView && mCurrentAgendaView == 1 )  goto DAY_5;
     if (mCurrentView == mAgendaView && mCurrentAgendaView == 5 )  goto DAY_7;
     if  (mCurrentView == mAgendaView )  goto DAY_6;
     if  (mCurrentView == mMonthView && KOPrefs::instance()->mMonthViewWeek)  goto MONTH;
     if  (mCurrentView == mMonthView )  goto LIST;
     if (mCurrentView == mListView ) goto TODO;
     // if  (mCurrentView == mTodoView )  goto NEXT;
  NEXT:
     if ( KOPrefs::instance()->mShowIconNext )  { showWhatsNextView();goto ENTE ;}
  NEXT_X:
     if ( KOPrefs::instance()->mShowIconNextDays )  { 
         showNextXView();
         goto ENTE ;
     } 
  JOURNAL:
     if ( KOPrefs::instance()->mShowIconJournal )  { 
         resetDateSilent( baseCycleDate , 1  );  
         showJournalView() ;goto ENTE ;}
  DAY_1:
     if ( KOPrefs::instance()->mShowIconDay1 )  { 
         resetDateSilent( baseCycleDate , 2  );    
         showDayView() ;goto ENTE ;}
  DAY_5:
     if ( KOPrefs::instance()->mShowIconDay5 )  {  
         resetDateSilent( baseCycleDate , 2  );   
         showWorkWeekView() ;goto ENTE ;}
  DAY_7:
     if ( KOPrefs::instance()->mShowIconDay7 )   {  
         resetDateSilent( baseCycleDate , 2  );   
         showWeekView();goto ENTE ;}
  DAY_6:
     if ( KOPrefs::instance()->mShowIconDay6 )   { 
         resetDateSilent( baseCycleDate , 2  );  
         showMonthViewWeek();goto ENTE ;}
  MONTH:
     if ( KOPrefs::instance()->mShowIconMonth )   { 
         resetDateSilent( baseCycleDate , 2  ); 
         showMonthView();goto ENTE ;}
  LIST:
     if ( KOPrefs::instance()->mShowIconList )  {  
         resetDateSilent( baseCycleDate , 2  );
         showListView() ;goto ENTE ;}
  TODO:
     if ( KOPrefs::instance()->mShowIconTodoview ) {  showTodoView() ;goto ENTE ;}
     if ( KOPrefs::instance()->mShowIconNext )  { goto NEXT ;}
     if ( KOPrefs::instance()->mShowIconNextDays )  { goto NEXT_X ;}
     if ( KOPrefs::instance()->mShowIconJournal )  { goto  JOURNAL;}
     if ( KOPrefs::instance()->mShowIconDay1 )  { goto DAY_1 ;}
     if ( KOPrefs::instance()->mShowIconDay5 )  { goto DAY_5 ;}
     if ( KOPrefs::instance()->mShowIconDay7 )   { goto DAY_7 ;}
     if ( KOPrefs::instance()->mShowIconDay6 )   { goto DAY_6 ;}
     if ( KOPrefs::instance()->mShowIconMonth )   {goto MONTH ;}
     if ( KOPrefs::instance()->mShowIconList )  {  goto LIST ;}
     //if ( KOPrefs::instance()->mShowIconTodoview ) {  showTodoView() ;goto ENTE ;}
  ENTE:
     flagResetViewChangeDate = 0;
     selecteddatescount =  mMainView->dateNavigator()->selectedDates().count();
     selecteddate = mMainView->dateNavigator()->selectedDates().first();
 
 }
 void KOViewManager::resetDateSilent( QDate date , int days )
 {
     mMainView->dateNavigator()->blockSignals( true );
     mMainView->dateNavigator()->selectDates( date , days ); 
     mMainView->dateNavigator()->blockSignals( false );
 }
 void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
 {
     if ( flagResetViewChangeDate < 10 )
         ++flagResetViewChangeDate;
     //mFlagShowNextxDays = false;
     //if(view == mCurrentView) return;  
     if ( view == 0 ) {
         view = mCurrentView;
         if ( view == 0 )
             return;
     }
     bool callupdate = !(view == mCurrentView);
     bool full = fullScreen;
     if(view == mCurrentView && view != mWhatsNextView ) {
         if ( mCurrentAgendaView < 0 )
             return;
         if ( view != mMonthView )
             full = mMainView->leftFrame()->isVisible();
     } else {
         if ( view == mMonthView && mMonthView)
             ;//mMonthView->skipResize = true ; 
         mCurrentView = view;
         // bool full = fullScreen;
         bool isFull = !mMainView->leftFrame()->isVisible();
         if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen )
             full = true;
         if ( !isFull && KOPrefs::instance()->mViewChangeHoldNonFullscreen )
             full = false;
     }
     if ( mAgendaView ) mAgendaView->deleteSelectedDateTime();
     //raiseCurrentView( full );
     mMainView->processIncidenceSelection( 0 );
     //mMainView->updateView();
     raiseCurrentView( full, callupdate );
     mMainView->adaptNavigationUnits();
+    mMainView->updateUnmanagedViews();
 }
 
 void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView  )
 {
     mCurrentAgendaView = 0;
     if ( fullScreen ) {
         mMainView->leftFrame()->hide();
     } else {
         mMainView->leftFrame()->show();
     }
     //if ( mCurrentView == mMonthView )  qApp->processEvents();
     emit signalFullScreen( !fullScreen );
     if ( callUpdateView )
         mMainView->updateView();
         
     if ( globalFlagBlockAgenda ==  5 ) {
         globalFlagBlockAgenda =  4;
         globalFlagBlockAgendaItemPaint = 1;
     }
     mMainView->viewStack()->raiseWidget(mCurrentView);
     if ( globalFlagBlockAgenda ==  4 ) {
         if ( mCurrentView == mAgendaView ) {
             //globalFlagBlockAgenda =1 ;
             if ( KOPrefs::instance()->mSetTimeToDayStartAt )
                 mAgendaView->setStartHour( KOPrefs::instance()->mDayBegins  );
             else if ( KOPrefs::instance()->mCenterOnCurrentTime )
                 mAgendaView->setStartHour( QTime::currentTime ().hour() );
             qApp->processEvents();  
             //qDebug("qApp->processEvents() ");
             globalFlagBlockAgenda = 0;
             mAgendaView->repaintAgenda();
 
         } 
         globalFlagBlockAgenda = 0;
     }
     emit signalAgendaView( mCurrentView == mAgendaView );
     //qDebug("raiseCurrentView ende ");
 
 }
 
 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 * ) ) );
     }
     // 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;
 }
 
 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;
 }
 
 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;
     mMainView->dateNavigator()->selectDates( 1 );
     mCurrentAgendaView = 1 ;
     
 }
 
 void KOViewManager::showWorkWeekView()
 {
     mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
     mFlagShowNextxDays =  false;
     globalFlagBlockAgenda = 1;
     globalFlagBlockLabel = 1;
     if ( mCurrentAgendaView != 5 )
         mCurrentAgendaView = -1;
     showAgendaView();
     qApp->processEvents();  
     globalFlagBlockAgenda = 2;
     globalFlagBlockLabel = 0;
     mMainView->dateNavigator()->selectWorkWeek();
     mCurrentAgendaView = 5 ;
    
 }
 
 void KOViewManager::showWeekView()
 {
    
     mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
     mFlagShowNextxDays = false;
     globalFlagBlockAgenda = 1;
     globalFlagBlockLabel = 1;
     if ( mCurrentAgendaView != 7 )
         mCurrentAgendaView = -1;
     showAgendaView();
     qApp->processEvents();  
     globalFlagBlockAgenda = 2;
     globalFlagBlockLabel = 0;  
     mMainView->dateNavigator()->selectWeek();
     mCurrentAgendaView = 7 ;
 }
 
 void KOViewManager::showNextXView()
 {
       
+    KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW;
     globalFlagBlockAgenda = 1;
     if ( mCurrentAgendaView != 3 )
         mCurrentAgendaView = -1;
     showAgendaView(KOPrefs::instance()->mFullViewMonth);
     globalFlagBlockAgenda = 2;
     mMainView->dateNavigator()->selectDates( QDate::currentDate(),
                                              KOPrefs::instance()->mNextXDays );
     mFlagShowNextxDays = true;
     mCurrentAgendaView = 3 ;
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_NX_VIEW;
 }
 bool KOViewManager::showsNextDays() 
 {
     return mFlagShowNextxDays;
 }
 void KOViewManager::createMonthView()
 {
 if (!mMonthView) {
         mMonthView = new KOMonthView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::MonthView");
      
         addView(mMonthView);
         // mMonthView->show();
         // SIGNALS/SLOTS FOR MONTH VIEW
 
         connect(mMonthView,SIGNAL(showJournalSignal( int, QDate )),SLOT(showDateView( int, QDate )));
  
         connect(mMonthView, SIGNAL(newTodoSignal(QDateTime,bool)),
                 mMainView, SLOT(newTodoDateTime(QDateTime, bool)));
 
 
         connect(mMonthView, SIGNAL(newEventSignal(QDateTime)),
                 mMainView, SLOT(newEvent(QDateTime)));
 
         connect(mMonthView, SIGNAL(showIncidenceSignal(Incidence *)),
                 mMainView, SLOT(showIncidence(Incidence *)));
         connect(mMonthView, SIGNAL(editIncidenceSignal(Incidence *)),
                 mMainView, SLOT(editIncidence(Incidence *)));
         connect(mMonthView, SIGNAL(deleteIncidenceSignal(Incidence *)),
                 mMainView, SLOT(deleteIncidence(Incidence *)));
 
         connect( mMonthView, SIGNAL( incidenceSelected( Incidence * ) ),
                  mMainView, SLOT( processMainViewSelection( Incidence * ) ) );
         connect( mMonthView, SIGNAL( cloneIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( cloneIncidence( Incidence * ) ) );
         connect( mMonthView, SIGNAL( cancelIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( cancelIncidence( Incidence * ) ) );
 
         connect( mMonthView, SIGNAL( moveIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( moveIncidence( Incidence * ) ) );
         connect( mMonthView, SIGNAL( beamIncidenceSignal( Incidence *  ) ),
                  mMainView, SLOT ( beamIncidence( Incidence * ) ) );
         connect( mMonthView, SIGNAL( selectWeekNum( int ) ),
                  mMainView->dateNavigator(), SLOT ( selectWeekFromMonthView( int ) ) );
         connect( mMonthView, SIGNAL( selectMonth() ),
                  mMainView->dateNavigator(), SLOT ( selectMonthFromMonthview() ) );
         connect( mMonthView, SIGNAL( showDaySignal( QDate ) ),
                  mMainView, SLOT ( showDay( QDate ) ) );
         connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig()));
         connect( mMonthView, SIGNAL(nextMonth() ),
                  mMonthView->navigatorBar(), SIGNAL(goNextMonth() ) );
         connect( mMonthView, SIGNAL(prevMonth() ),
                  mMonthView->navigatorBar(), SIGNAL(goPrevMonth() ) );
         connect( mMonthView->navigatorBar(), SIGNAL( goPrevYear() ),
                  mMainView->dateNavigator(), SLOT( selectPreviousYear() ) );
         connect( mMonthView->navigatorBar(), SIGNAL( goNextYear() ),
                  mMainView->dateNavigator(), SLOT( selectNextYear() ) );
         connect( mMonthView->navigatorBar(), SIGNAL( goPrevMonth() ),
                  mMainView->dateNavigator(), SLOT( selectPreviousMonth() ) );
         connect( mMonthView->navigatorBar(), SIGNAL( goNextMonth() ),
                  mMainView->dateNavigator(), SLOT( selectNextMonth() ) );
         connect( mMonthView->navigatorBar(), SIGNAL( goPrevWeek() ),
                  mMainView->dateNavigator(), SLOT( selectPreviousWeek() ) );
         connect( mMonthView->navigatorBar(), SIGNAL( goNextWeek() ),
                  mMainView->dateNavigator(), SLOT( selectNextWeek() ) );
         
         connect( mMainView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
                  mMonthView->navigatorBar(), SLOT( selectDates( const KCal::DateList & ) ) );
         
         
         connect( mMonthView->navigatorBar(), SIGNAL( monthSelected ( int ) ),
                  mMainView->dateNavigator(), SLOT( slotMonthSelect( int ) ) );
 
     }
 }
 void KOViewManager::showMonthViewWeek()
 {
     createMonthView();
+    KOPrefs::instance()->mCurrentDisplayedView =  VIEW_ML_VIEW ;
     globalFlagBlockAgenda = 1;
     bool full = true;
     if ( mCurrentView == mMonthView)
         full = mMainView->leftFrame()->isVisible();
     if ( !KOPrefs::instance()->mMonthViewWeek ) {
         mMonthView->switchView();
         if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() )
             full = false;
         else
             full = true;
     }
     mMainView->dateNavigator()->selectWeek();
     showView(mMonthView, full );
     mMonthView->setKeyBFocus();
     KOPrefs::instance()->mCurrentDisplayedView =  VIEW_ML_VIEW ;
 }
 
 void KOViewManager::showMonth( const QDate & date )
 {
     mMainView->dateNavigator()->blockSignals( true );
     mMainView->dateNavigator()->selectDate( date );
     mMainView->dateNavigator()->blockSignals( false );
     showMonthView();
 }
 void KOViewManager::showMonthView()
  {
     
      createMonthView();
+    KOPrefs::instance()->mCurrentDisplayedView =  VIEW_M_VIEW ;
     globalFlagBlockAgenda = 1;
     //mFlagShowNextxDays = false;
     bool full = true;
     if ( mCurrentView == mMonthView)
         full = mMainView->leftFrame()->isVisible();
     // if(mMonthView == mCurrentView) return; 
     if ( KOPrefs::instance()->mMonthViewWeek ) {
         mMonthView->switchView();
         if ( KOPrefs::instance()->mViewChangeHoldNonFullscreen && mMainView->leftFrame()->isVisible() )
             full = false;
         else
             full = true;
     }
     mMainView->dateNavigator()->selectMonth();
 
     showView(mMonthView, full );
     mMonthView->setKeyBFocus();
     KOPrefs::instance()->mCurrentDisplayedView =  VIEW_M_VIEW ;
    
 }
 
 void KOViewManager::showTodoView()
 {
     //mFlagShowNextxDays = false;
     if ( !mTodoView ) {
         mTodoView = new KOTodoView( mMainView->calendar(), mMainView->viewStack(),
                                     "KOViewManager::TodoView" );
     
         addView( mTodoView ); 
         // QPEApplication::setStylusOperation( mTodoView, QPEApplication::RightOnHold );
   
         // SIGNALS/SLOTS FOR TODO VIEW
         connect( mTodoView, SIGNAL( newTodoSignal() ),
                  mMainView, SLOT( newTodo() ) );
         connect( mTodoView, SIGNAL( newSubTodoSignal( Todo * ) ),
                  mMainView, SLOT( newSubTodo( Todo *) ) );
         connect( mTodoView, SIGNAL( showTodoSignal( Todo *) ),
                  mMainView, SLOT( showTodo( Todo * ) ) );
         connect( mTodoView, SIGNAL( editTodoSignal( Todo * ) ),
                  mMainView, SLOT( editTodo( Todo * ) ) );
         connect( mTodoView, SIGNAL( deleteTodoSignal( Todo * ) ),
                  mMainView, SLOT( deleteTodo( Todo * ) ) );
         connect( mTodoView, SIGNAL( purgeCompletedSignal() ),
                  mMainView, SLOT( purgeCompleted() ) );
 
         connect( mTodoView, SIGNAL( incidenceSelected( Incidence * ) ),
                  mMainView, SLOT( processMainViewSelection( Incidence * ) ) );
 
         connect( mMainView, SIGNAL( configChanged() ), mTodoView,
                  SLOT( updateConfig() ) ); 
         connect( mMainView, SIGNAL( todoModified( Todo *, int )), mTodoView,
                  SLOT( updateTodo( Todo *, int ) ) );
         connect( mTodoView, SIGNAL( todoModifiedSignal( Todo *, int ) ),
                  mMainView, SIGNAL ( todoModified( Todo *, int ) ) );
         connect( mTodoView, SIGNAL( cloneTodoSignal( Incidence *  ) ),
                  mMainView, SLOT ( cloneIncidence( Incidence * ) ) );
         connect( mTodoView, SIGNAL( cancelTodoSignal( Incidence *  ) ),
                  mMainView, SLOT ( cancelIncidence( Incidence * ) ) );
         connect( mTodoView, SIGNAL( unparentTodoSignal( Todo * ) ),
                  mMainView, SLOT ( todo_unsub( Todo * ) ) );
         connect( mTodoView, SIGNAL( reparentTodoSignal( Todo *,Todo * ) ),
                  mMainView, SLOT ( todo_resub( Todo *, Todo *) ) );
         connect( mTodoView, SIGNAL( moveTodoSignal( Incidence *  ) ),
                  mMainView, SLOT ( moveIncidence( Incidence * ) ) );
         connect( mTodoView, SIGNAL( beamTodoSignal( Incidence *  ) ),
                  mMainView, SLOT ( beamIncidence( Incidence * ) ) );
         KConfig *config = KOGlobals::config();
         mTodoView->restoreLayout(config,"Todo View");
         mTodoView->setNavigator( mMainView->dateNavigator() );
     }
 
+    KOPrefs::instance()->mCurrentDisplayedView =  VIEW_T_VIEW ;
     globalFlagBlockAgenda = 1;
     showView( mTodoView, true );
     KOPrefs::instance()->mCurrentDisplayedView =  VIEW_T_VIEW ;
 
 }
 
 void KOViewManager::showJournalView()
 {
     //mFlagShowNextxDays = false;
     if (!mJournalView) {
         mJournalView = new KOJournalView(mMainView->calendar(),mMainView->viewStack(),
                                          "KOViewManager::JournalView"); 
         connect( mMainView, SIGNAL( configChanged() ), mJournalView,
                  SLOT( updateConfig() ) );
         connect(mJournalView, SIGNAL(deleteJournal(Journal *) ), mMainView,SLOT(deleteJournal(Journal *)) );
         addView(mJournalView);
     }
 
+    KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW  ;
     showView(mJournalView);
     mMainView->dateNavigator()->selectDates( 1 );
     KOPrefs::instance()->mCurrentDisplayedView = VIEW_J_VIEW  ;
 }
 
 void KOViewManager::showTimeSpanView()
 {
     //mFlagShowNextxDays = false;
     if (!mTimeSpanView) {
         mTimeSpanView = new KOTimeSpanView(mMainView->calendar(),mMainView->viewStack(),
                                            "KOViewManager::TimeSpanView");
         addView(mTimeSpanView);
 
         mTimeSpanView->readSettings();
     }
 
     showView(mTimeSpanView);
 }
 
 Incidence *KOViewManager::currentSelection()
 {
     if (!mCurrentView) return 0;
     if ( mCurrentView == mListView ) {
         if ( mListView->currentItem() )
             return mListView->currentItem();
     }
     return mCurrentView->selectedIncidences().first();
 }
 
 QDate KOViewManager::currentSelectionDate()
 {
     QDate qd;
     if (mCurrentView) {
         DateList qvl = mCurrentView->selectedDates();
         if (!qvl.isEmpty()) qd = qvl.first();
     }
     return qd;
 }
 
 void KOViewManager::addView(KOrg::BaseView *view)
 {
 #if QT_VERSION >= 0x030000
     mMainView->viewStack()->addWidget( view );
 #else
     mMainView->viewStack()->addWidget( view, 1 );
 #endif
 }
 
 void KOViewManager::setDocumentId( const QString &id )
 {
     if (mTodoView) mTodoView->setDocumentId( id );
 }
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 95bef66..87cef20 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1,1222 +1,1225 @@
 #include <stdlib.h>
 
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qpainter.h>
 #include <qwhatsthis.h>
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qtextcodec.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qapp.h>
 #include <qfileinfo.h>
 #include <qlabel.h>
 #include <qspinbox.h>
 #include <qcheckbox.h>
 #include <qmap.h>
 #include <qwmatrix.h>
 #include <qtextbrowser.h>
 #include <qtextstream.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/global.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 #include <qtopia/alarmserver.h>
 #include <qtopia/qcopenvelope_qws.h>
 #include <unistd.h> // for sleep
 #else
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qapplication.h>
 //#include <resource.h>
 
 #endif
 #include <libkcal/calendarlocal.h>
 #include <libkcal/todo.h>
 #include <libkcal/phoneformat.h>
 #include <libkdepim/ksyncprofile.h>
 #include <libkdepim/phoneaccess.h>
 #include <libkcal/kincidenceformatter.h>
 #include <libkdepim/kpimglobalprefs.h>
 
 #include "calendarview.h"
 #include "koviewmanager.h"
 #include "datenavigator.h"
 #include "koagendaview.h"
 #include "koagenda.h"
 #include "kodialogmanager.h"
 #include "kdialogbase.h"
 #include "kapplication.h"
 #include "kofilterview.h"
 #include "kstandarddirs.h"
 #include "koprefs.h"
 #include "kfiledialog.h"
 #include "koglobals.h"
 #include "kglobal.h"
 #include "ktoolbar.h"
 #include "klocale.h"
 #include "kconfig.h"
 #include "externalapphandler.h"
 
 using namespace KCal;
 #ifndef _WIN32_
 #include <unistd.h>
 #else
 #ifdef _OL_IMPORT_
 #include "koimportoldialog.h"
 #endif
 #endif
 #include "mainwindow.h"
 
 
 class KOex2phonePrefs : public QDialog
 {
   public:
     KOex2phonePrefs( QWidget *parent=0, const char *name=0 ) :
       QDialog( parent, name, true ) 
     {
         setCaption( i18n("Export to phone options") );
         QVBoxLayout* lay = new QVBoxLayout( this );
         lay->setSpacing( 3 );
         lay->setMargin( 3 );
         QLabel *lab;
         lay->addWidget(lab = new QLabel( i18n("Please read Help-Sync Howto\nto know what settings to use."), this ) );  
         lab->setAlignment (AlignHCenter  ); 
         QHBox* temphb;
         temphb = new QHBox( this );
         new QLabel( i18n("I/O device: "), temphb ); 
         mPhoneDevice = new QLineEdit( temphb);
         lay->addWidget( temphb );
         temphb = new QHBox( this );
         new QLabel( i18n("Connection: "), temphb ); 
         mPhoneConnection = new QLineEdit( temphb);
         lay->addWidget( temphb );
         temphb = new QHBox( this );
         new QLabel( i18n("Model(opt.): "), temphb ); 
         mPhoneModel = new QLineEdit( temphb);
         lay->addWidget( temphb );
         mWriteBackFuture= new QCheckBox( i18n("Write back events in future only"), this );
         mWriteBackFuture->setChecked( true );
         lay->addWidget( mWriteBackFuture );
         temphb = new QHBox( this );
         new QLabel( i18n("Max. weeks in future: ") , temphb );
         mWriteBackFutureWeeks= new QSpinBox(1,104, 1, temphb);
         mWriteBackFutureWeeks->setValue( 8 );
         lay->addWidget( temphb );  
         lay->addWidget(lab = new QLabel( i18n("NOTE: This will remove all old\ntodo/calendar data on phone!"), this ) );  
         lab->setAlignment (AlignHCenter  ); 
         QPushButton * ok = new QPushButton( i18n("Export to mobile phone!"), this );
         lay->addWidget( ok );
         QPushButton * cancel = new QPushButton( i18n("Cancel"), this );
         lay->addWidget( cancel );
         connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
         connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
         resize( 220, 240 );
         qApp->processEvents();
         int dw = QApplication::desktop()->width();
         int dh = QApplication::desktop()->height();
         move( (dw-width())/2, (dh - height() )/2 );
     }
    
 public:
     QLineEdit* mPhoneConnection, *mPhoneDevice, *mPhoneModel; 
     QCheckBox* mWriteBackFuture;
     QSpinBox* mWriteBackFutureWeeks;
 };
 
 int globalFlagBlockStartup;
 MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     QMainWindow( parent, name )
 {
 
     mClosed = false;
     //QString confFile = KStandardDirs::appDir() + "config/korganizerrc";
     QString confFile = locateLocal("config","korganizerrc");
     QFileInfo finf ( confFile );
     bool showWarning =  !finf.exists();
     setIcon(SmallIcon( "ko24" )  );
     mBlockAtStartup = true;
     mFlagKeyPressed = false;
     setCaption("KO/Pi");
     KOPrefs *p = KOPrefs::instance();
     KPimGlobalPrefs::instance()->setGlobalConfig();
     p->mCurrentDisplayedView = 0;
     if ( p->mHourSize >  22 )
         p->mHourSize = 22;
     QMainWindow::ToolBarDock tbd;
     if ( p->mToolBarHor ) {
         if ( p->mToolBarUp )
             tbd = Bottom;
         else
             tbd = Top;
     }
     else {
         if ( p->mToolBarUp )
             tbd = Right;
         else
             tbd = Left;
     }
     if ( KOPrefs::instance()->mUseAppColors )
         QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
     globalFlagBlockStartup = 1;
     iconToolBar = new QPEToolBar( this );
     addToolBar (iconToolBar , tbd );
 
 #ifdef DESKTOP_VERSION
     if ( KOPrefs::instance()->mShowIconFilter ) 
 #else
     if ( KOPrefs::instance()->mShowIconFilter || !p->mShowIconOnetoolbar ) 
 #endif
 
 {
         if ( p->mToolBarHorF ) {
             if ( p->mToolBarUpF )
                 tbd = Bottom;
             else
                 tbd = Top;
         }
         else {
             if ( p->mToolBarUpF )
             tbd = Right;
             else
                 tbd = Left;
         }
         filterToolBar = new QPEToolBar ( this );
-        filterMenubar = new QPEMenuBar( filterToolBar );
+        filterMenubar = new QMenuBar( filterToolBar );
         QFontMetrics fm ( filterMenubar->font() );
             
         filterPopupMenu = new QPopupMenu( this );
         filterMenubar->insertItem( i18n("No Filter"), filterPopupMenu,0  );
-        QString addTest = "Ax";  
+        QString addTest = "A";  
+        filterMenubar->setMinimumWidth( fm.width( i18n("No Filter")+addTest ) );
 #ifdef DESKTOP_VERSION
-        addTest = "AAAx"; 
-#endif
-        filterMenubar->setFixedWidth( fm.width( i18n("No Filter")+addTest ) );
+        addTest = "AAABBBCCCx"; 
+#else
+        addTest = "AAx";  
+#endif 
+        filterMenubar->setMaximumWidth( fm.width( i18n("No Filter")+addTest ) );
         addToolBar (filterToolBar , tbd );
         connect ( filterPopupMenu , SIGNAL( activated ( int )  ), this, SLOT (selectFilterPopup( int ) ) );
         connect ( filterPopupMenu , SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenuPopup() ) );
         if ( !KOPrefs::instance()->mShowIconFilter && !p->mShowIconOnetoolbar )
             filterToolBar->hide();
     } else {
         filterToolBar = 0;
         filterMenubar  = 0;
         filterPopupMenu = 0;
     }
     if ( p->mShowIconOnetoolbar ) {
         viewToolBar = iconToolBar ;
         navigatorToolBar = iconToolBar ;
     } else {
 #ifndef DESKTOP_VERSION
         setToolBarsMovable( false );
 #endif
         if ( p->mToolBarHorV ) {
             if ( p->mToolBarUpV )
                 tbd = Bottom;
             else
                 tbd = Top;
         }
         else {
             if ( p->mToolBarUpV )
                 tbd = Right;
             else
                 tbd = Left;
         }
         viewToolBar = new QPEToolBar( this );
         addToolBar (viewToolBar , tbd );
         if ( p->mToolBarHorN ) {
             if ( p->mToolBarUpN )
                 tbd = Bottom;
             else
                 tbd = Top;
         }
         else {
             if ( p->mToolBarUpN )
                 tbd = Right;
             else
                 tbd = Left;
         }
         navigatorToolBar = new QPEToolBar( this );
         addToolBar (navigatorToolBar , tbd );
     }
 
   
 
     mCalendarModifiedFlag = false;
     QLabel* splash  = new QLabel(i18n("KO/Pi is starting ... "), this );
     splash->setAlignment ( AlignCenter );
     setCentralWidget( splash );
 #ifndef DESKTOP_VERSION
     showMaximized();
 #endif
 
     //qDebug("Mainwidget x %d y %d w %d  h %d",  x(), y(), width(), height ());
     setDefaultPreferences();
     mCalendar = new CalendarLocal();
     mView = new CalendarView( mCalendar, this,"mCalendar " );
     mView->hide();
     //mView->resize(splash->size() );
     initActions(); 
     mSyncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)mView, KSyncManager::KOPI, KOPrefs::instance(), syncMenu);
     mSyncManager->setBlockSave(false);
     mView->setSyncManager(mSyncManager);
 #ifndef DESKTOP_VERSION
     iconToolBar->show();
     qApp->processEvents();
 #endif
     //qDebug("Splashwidget x %d y %d w %d  h %d", splash-> x(), splash->y(), splash->width(),splash-> height ());
     int vh = height() ;
     int vw = width();
     //qDebug("Toolbar hei %d ",iconToolBar->height() );
     if ( iconToolBar->orientation () == Qt:: Horizontal ) {
         vh -=  iconToolBar->height();
     } else {
         vw -= iconToolBar->height();
     }
     //mView->setMaximumSize( splash->size() );
     //mView->resize( splash->size() );
     //qDebug("MainView x %d y %d w %d  h %d",  mView->x(),mView-> y(), mView->width(), mView->height ());
     mView->readSettings();
     bool newFile = false;
     if( !QFile::exists( defaultFileName() ) ) {
         QFileInfo finfo ( defaultFileName() );
         QString oldFile = QDir::convertSeparators(  QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics");
         QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n";
         finfo.setFile( oldFile );
         if (finfo.exists() ) {
             KMessageBox::information( this, message);
             mView->openCalendar( oldFile );
             qApp->processEvents();
         } else {
             oldFile = QDir::convertSeparators(  QDir::homeDirPath()+"/korganizer/mycalendar.ics");
             finfo.setFile( oldFile );
             if (finfo.exists() ) {
                 KMessageBox::information( this, message);
                 mView->openCalendar( oldFile );
                 qApp->processEvents();
             }
         }
         mView->saveCalendar( defaultFileName() );
         newFile = true;
     }
 
     QTime neededSaveTime = QDateTime::currentDateTime().time();
     mView->openCalendar( defaultFileName() );
     int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
     qDebug("KO: Calendar loading time: %d ms",msNeeded );
 
     if ( KPimGlobalPrefs::instance()->mPreferredLanguage != KOPrefs::instance()->mOldLoadedLanguage ) {
         KOPrefs::instance()->setAllDefaults();
         int count = mView->addCategories();
     }
     processIncidenceSelection( 0 );
     connect( mView, SIGNAL( incidenceSelected( Incidence * ) ),
              SLOT( processIncidenceSelection( Incidence * ) ) );
     connect( mView, SIGNAL( modifiedChanged( bool ) ),
              SLOT( slotModifiedChanged( bool ) ) );
 
 
     connect( mView, SIGNAL( tempDisableBR(bool) ),
              SLOT( disableBR(bool) ) );
     connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) );
     mView->setModified( false );
     mBlockAtStartup = false;
     mView->setModified( false );
     setCentralWidget( mView );
     globalFlagBlockStartup = 0;
     mView->show();
     delete splash;
     if ( newFile )
         mView->updateConfig();
     // qApp->processEvents();
     //qDebug("MainView x %d y %d w %d  h %d",  mView->x(),mView-> y(), mView->width(), mView->height ());
     //fillSyncMenu();
    
     
     connect(mSyncManager , SIGNAL( save() ), this, SLOT( save() ) );
     connect(mView , SIGNAL( save() ), this, SLOT( save() ) );
     connect(mView , SIGNAL( saveStopTimer() ), this, SLOT( saveStopTimer() ) );
     connect(mSyncManager , SIGNAL( request_file() ), this, SLOT( syncFileRequest() ) );
     connect(mSyncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
     mSyncManager->setDefaultFileName( sentSyncFile()); 
     connect ( syncMenu, SIGNAL( activated ( int )  ), mSyncManager, SLOT (slotSyncMenu( int ) ) );
     mSyncManager->fillSyncMenu();
 
 
 
     mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins  );
     if ( showWarning ) {
         KMessageBox::information( this,
                          "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information");
         qApp->processEvents();
         mView->dialogManager()->showSyncOptions();
     }
 
   //US listen for result adressed from Ka/Pi
 #ifndef DESKTOP_VERSION
   connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
 #endif
 #ifndef DESKTOP_VERSION
     infrared = 0;
 #endif
     updateFilterToolbar();
     updateWeek( mView->startDate() );
     connect( mView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
              SLOT( updateWeekNum( const KCal::DateList & ) ) );
     mBRdisabled = false;
     //toggleBeamReceive();
 }
 MainWindow::~MainWindow()
 {
     //qDebug("MainWindow::~MainWindow() ");
     //save toolbar location
     delete mCalendar;
     delete mSyncManager;
 #ifndef DESKTOP_VERSION
     if ( infrared )
         delete infrared;
 #endif
 
 
 }
 
 void MainWindow::disableBR(bool b)
 {
 #ifndef DESKTOP_VERSION
     if ( b ) {
         if ( infrared ) {
             toggleBeamReceive();
             mBRdisabled = true;
         }
         mBRdisabled = true;
     } else {
         if ( mBRdisabled ) {
             mBRdisabled = false;
             //makes no sense,because other cal ap is probably running
             // toggleBeamReceive(); 
         }
     }
 #endif
 
 }
 bool MainWindow::beamReceiveEnabled()
 {
 #ifndef DESKTOP_VERSION
     return ( infrared != 0 );
 #endif
     return false;
 }
 
 void MainWindow::toggleBeamReceive()
 {
     if ( mBRdisabled  )
         return;
 #ifndef DESKTOP_VERSION
     if ( infrared ) {
         qDebug("KO: Disable BeamReceive ");
         delete infrared;
         infrared = 0;
         brAction->setOn(false);
         return;
     } 
     qDebug("KO: Enable BeamReceive ");
     brAction->setOn(true);
     infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ;   
     QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve(  const QCString&, const QByteArray& )));
 #endif
 }
 void MainWindow::showMaximized () 
 {
 #ifndef DESKTOP_VERSION
     if ( ! globalFlagBlockStartup )
         if ( mClosed )
             mView->goToday();
 #endif
     QWidget::showMaximized () ;
     mClosed = false;
 }
 void MainWindow::closeEvent( QCloseEvent* ce )
 {
 
 
 
     if ( ! KOPrefs::instance()->mAskForQuit ) {
         saveOnClose();
         mClosed = true;
         ce->accept();
         return;
 
     }
 
     switch( QMessageBox::information( this, "KO/Pi",
                                       i18n("Do you really want\nto close KO/Pi?"),
                                       i18n("Close"), i18n("No"),
                                       0, 0 ) ) {
     case 0:
         saveOnClose();
         mClosed = true;
         ce->accept();
         break;
     case 1:
         ce->ignore();
         break;
     case 2:
 
     default:
         break;
     }
 
 
 }
 
 void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
 {
     QDataStream stream( data, IO_ReadOnly );
     // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" );
     //QString datamess;
     //qDebug("message ");
     qDebug("KO: QCOP message received: %s ", cmsg.data()  );
  
     if ( cmsg == "setDocument(QString)" ) {
         QDataStream stream( data, IO_ReadOnly );
         QString fileName;
         stream >> fileName;
         //qDebug("filename %s ", fileName.latin1());
         showMaximized();
         raise();
         KOPrefs::instance()->mLastSyncedLocalFile = fileName ;
         mSyncManager->slotSyncMenu( 1002 );
         return;
     }
 
     if ( cmsg == "-writeFile" ) {
         // I made from the "-writeFile" an "-writeAlarm"
         mView->viewManager()->showWhatsNextView();
         mCalendar->checkAlarmForIncidence( 0, true);
         showMaximized();
         raise();
         return;
 
     }
     if ( cmsg == "-writeFileSilent" ) {
         // I made from the "-writeFile" an "-writeAlarm"
         // mView->viewManager()->showWhatsNextView();
         mCalendar->checkAlarmForIncidence( 0, true);
         //showMaximized();
         //raise();
         hide();
         return;
     }
     if ( cmsg == "-newCountdown" ) {
         qDebug("newCountdown ");
 
     }
     QString msg ;
     QString allmsg = cmsg;
     while ( allmsg.length() > 0 ) {
         int nextC = allmsg.find( "-", 1 );
         if ( nextC == -1 ) {
             msg = allmsg;
             allmsg = "";
         } else{
             msg = allmsg.left( nextC );
             allmsg = allmsg.mid( nextC,  allmsg.length()-nextC );
         }
         //qDebug("msg: %s  all: %s ", msg.latin1(), allmsg.latin1() );
         if ( msg == "-newEvent" ) {
             mView->newEvent();
         }
         if ( msg == "-newTodo" ) {
             mView->newTodo();
 
         }
         if ( msg == "-showWN" ) {
             mView->viewManager()->showWhatsNextView();
         }
         if ( msg == "-showTodo" ) {
             mView->viewManager()->showTodoView();
         }
         if ( msg == "-showList"  ) {
             mView->viewManager()->showListView();
         }
         else if ( msg == "-showDay" ) {
             mView->viewManager()->showDayView();
         }
         else if ( msg == "-showWWeek"  ) {
             mView->viewManager()->showWorkWeekView();
         }
         else if ( msg == "-ringSync"  ) {
             mSyncManager->multiSync( false );
         }
         else if ( msg == "-showWeek" ) {
             mView->viewManager()->showWeekView();
         }
         else if ( msg == "-showTodo" ) {
             mView->viewManager()->showTodoView();
         }
         else if ( msg == "-showJournal"  ) {
             mView->dateNavigator()->selectDates( 1 );
             mView->dateNavigator()->selectToday();
             mView->viewManager()->showJournalView();
         }
         else if ( msg == "-showKO" ) {
             mView->viewManager()->showNextXView();
         }
         else if ( msg == "-showWNext"  ) {
             mView->viewManager()->showWhatsNextView();
         }
         else if ( msg == "nextView()" ) {
             mView->viewManager()->showNextView();
         }
         else if ( msg == "-showNextXView" ) {
             mView->viewManager()->showNextXView();
         }
 
 
     }
 
     showMaximized();
     raise();
 }
 
 QPixmap MainWindow::loadPixmap( QString name )
 {
     return SmallIcon( name );
 
 }
 void MainWindow::initActions()
 {
     //KOPrefs::instance()->mShowFullMenu
     iconToolBar->clear();
     KOPrefs *p = KOPrefs::instance();
     //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
 
     QPopupMenu *viewMenu = new QPopupMenu( this );
     QPopupMenu *actionMenu = new QPopupMenu( this );
     QPopupMenu *importMenu = new QPopupMenu( this );
     QPopupMenu *importMenu_X = new QPopupMenu( this );
     QPopupMenu *exportMenu_X = new QPopupMenu( this );
     QPopupMenu *beamMenu_X = new QPopupMenu( this );
     selectFilterMenu = new QPopupMenu( this );
     selectFilterMenu->setCheckable( true );
     syncMenu = new QPopupMenu( this );
     configureAgendaMenu = new QPopupMenu( this );
     configureToolBarMenu = new QPopupMenu( this );
     QPopupMenu *helpMenu = new QPopupMenu( this );
     QIconSet icon;
     int pixWid = 22, pixHei = 22;
     QString pathString = "";
     if ( !p->mToolBarMiniIcons ) {
         if ( QApplication::desktop()->width() < 480 ) {
             pathString += "icons16/";
             pixWid = 18; pixHei = 16;
         }
     } else {
         pathString += "iconsmini/";
         pixWid = 18; pixHei = 16;
     }
     if ( KOPrefs::instance()->mShowFullMenu ) {
         QMenuBar *menuBar1;
         menuBar1 = menuBar();
         menuBar1->insertItem( i18n("File"), importMenu );
         menuBar1->insertItem( i18n("View"), viewMenu );
         menuBar1->insertItem( i18n("Actions"), actionMenu );
 #ifdef DESKTOP_VERSION
         menuBar1->insertItem( i18n("Synchronize"), syncMenu );
         menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
 #else
         menuBar1->insertItem( i18n("Sync"), syncMenu );
         menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu  );
 #endif
         //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu );
         menuBar1->insertItem( i18n("Filter"),selectFilterMenu  );
         menuBar1->insertItem( i18n("Help"), helpMenu );
     } else {
         QPEMenuBar *menuBar1;
         menuBar1 = new QPEMenuBar( iconToolBar );
         QPopupMenu *menuBar = new QPopupMenu( this );
         icon = loadPixmap( pathString + "z_menu" );
         menuBar1->insertItem( icon.pixmap(), menuBar);
         //menuBar1->insertItem( i18n("ME"), menuBar);
         menuBar->insertItem( i18n("File"), importMenu );
         menuBar->insertItem( i18n("View"), viewMenu );
         menuBar->insertItem( i18n("Actions"), actionMenu );
         menuBar->insertItem( i18n("Synchronize"), syncMenu );
         menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
         menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu );
         menuBar->insertItem( i18n("Filter"),selectFilterMenu  );
         menuBar->insertItem( i18n("Help"), helpMenu );
         //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
         menuBar1->setMaximumSize( menuBar1->sizeHint( ));
     }
     connect ( selectFilterMenu, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
     connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) );
 
    
     mWeekBgColor = iconToolBar->backgroundColor();
     mWeekPixmap.resize( pixWid , pixHei );
     mWeekPixmap.fill( mWeekBgColor );
     icon = mWeekPixmap;
     mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
     if ( p-> mShowIconWeekNum )
         mWeekAction->addTo( iconToolBar );
     mWeekFont = font();
 
     int fontPoint = mWeekFont.pointSize();
     QFontMetrics f( mWeekFont );
     int fontWid =  f.width( "30" );
     while ( fontWid > pixWid ) {
         --fontPoint;
         mWeekFont.setPointSize( fontPoint );
         QFontMetrics f( mWeekFont );
         fontWid =  f.width( "30" );
         //qDebug("dec-- ");
     }
 
     connect( mWeekAction, SIGNAL( activated() ),
              this, SLOT( weekAction() ) );
 
     connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) );
     if ( p->mShowIconFilterview ) {
         icon = loadPixmap( pathString + "filter" );
         actionFilterMenuTB = new QAction( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this );
         connect( actionFilterMenuTB, SIGNAL( activated() ),
                  this, SLOT( fillFilterMenuTB() ) );
         actionFilterMenuTB->addTo( iconToolBar  );
         selectFilterMenuTB = new QPopupMenu( this );
         selectFilterMenuTB->setCheckable( true ); 
         connect ( selectFilterMenuTB, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
     }
 
     //#endif
     // ******************
     QAction *action;
     // QPopupMenu *configureMenu= new QPopupMenu( menuBar );
     configureToolBarMenu->setCheckable( true );
 
    
     configureAgendaMenu->setCheckable( true );
     int iii ;
     for ( iii = 1;iii<= 10 ;++iii ){
         configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 );
     }
     //configureMenu->insertItem( "AgendaSize",configureAgendaMenu  );
 
     connect( configureAgendaMenu, SIGNAL( aboutToShow()),
              this, SLOT( showConfigureAgenda( ) ) );
 
     icon = loadPixmap( pathString + "configure" );
     action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( edit_options() ) );
     actionMenu->insertSeparator();
 
     action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( undo_delete() ) );
     actionMenu->insertSeparator();
 
     icon = loadPixmap( pathString + "newevent" );
     configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
     configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
     configureToolBarMenu->insertSeparator();
     configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 );
     configureToolBarMenu->insertSeparator();
     configureToolBarMenu->insertItem(i18n("Week Number"), 400);
     configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
     QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
     ne_action->addTo( actionMenu );
     connect( ne_action, SIGNAL( activated() ),
              mView, SLOT( newEvent() ) );
     icon = loadPixmap( pathString + "newtodo" );
     configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
     QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
     nt_action->addTo( actionMenu );
     connect( nt_action, SIGNAL( activated() ),
              mView, SLOT( newTodo() ) );
 
     icon = loadPixmap( pathString + "today" );
     QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
     today_action->addTo( viewMenu );
     connect( today_action, SIGNAL( activated() ),
              mView, SLOT( goToday() ) );
     viewMenu->insertSeparator();
 
     // ***********************
     if ( KOPrefs::instance()->mVerticalScreen ) {
          icon = SmallIcon( "1updownarrow" );
     } else {
         icon = SmallIcon("1leftrightarrow" );
     }
     configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 );
     QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this );
     FSaction->addTo( viewMenu );
     connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() ));
 
     icon = loadPixmap( pathString + "navi" );
     configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 );
     action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( toggleDateNavigatorWidget() ) );
     mToggleNav = action ;
     icon = loadPixmap( pathString + "filter" );
     configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 );
     action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( toggleFilter() ) );
     mToggleFilter = action;
     icon = loadPixmap( pathString + "allday" );
     configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 );
     action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( toggleAllDaySize() ) );
     mToggleAllday = action;
 
 
     connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
              mToggleNav, SLOT( setEnabled ( bool ) ) );
     connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
              mToggleFilter, SLOT( setEnabled ( bool ) ) );
     connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
              mToggleAllday, SLOT( setEnabled ( bool ) ) );
 
     viewMenu->insertSeparator();
     icon = loadPixmap( pathString + "picker" );
     action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( showDatePicker() ) );
     action->addTo( iconToolBar  );
     viewMenu->insertSeparator();
 
     if ( p-> mShowIconToggleFull )
         FSaction->addTo( iconToolBar );
     if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar );
    
     //********************
     if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar );
 
 
     icon = loadPixmap( pathString + "whatsnext" );
     configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 );
     QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
     whatsnext_action->addTo( viewMenu );
     connect( whatsnext_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showWhatsNextView() ) );
 
     icon = loadPixmap( pathString + "xdays" );
     configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 );
     QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this );
     xdays_action->addTo( viewMenu );
     connect( xdays_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showNextXView() ) );
    
 
     icon = loadPixmap( pathString + "journal" );
     configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 );
     QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this );
     viewjournal_action->addTo( viewMenu );
     connect( viewjournal_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showJournalView() ) );
 
 
     icon = loadPixmap( pathString + "day" );
     configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 );
     QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this );
     day1_action->addTo( viewMenu );
     //  action->addTo( toolBar );
     connect( day1_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showDayView() ) );
 
     icon = loadPixmap( pathString + "workweek" );
     configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 );
     QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this );
     day5_action->addTo( viewMenu );
     connect( day5_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showWorkWeekView() ) );
 
     icon = loadPixmap( pathString + "week" );
     configureToolBarMenu->insertItem(icon, i18n("Week"), 60 );
     QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this );
     day7_action->addTo( viewMenu );
     connect( day7_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showWeekView() ) );
     
     icon = loadPixmap( pathString + "workweek2" );
     configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 );
     QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this );
     day6_action->addTo( viewMenu );
     connect( day6_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showMonthViewWeek() ) );
 
     icon = loadPixmap( pathString + "month" );
     configureToolBarMenu->insertItem(icon, i18n("Month"), 70 );
     QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this );
     month_action->addTo( viewMenu );
     connect( month_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showMonthView() ) );
 
      icon = loadPixmap( pathString + "list" );
     configureToolBarMenu->insertItem(icon, i18n("List View"), 30 );
     QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this );
     showlist_action->addTo( viewMenu );
     connect( showlist_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showListView() ) );
 
     icon = loadPixmap( pathString + "todo" );
     configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 );
     QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
     todoview_action->addTo( viewMenu );
     connect( todoview_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showTodoView() ) );
 
 
 
 #if 0
     action = new QAction( "view_timespan", "Time Span", 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showTimeSpanView() ) );
 #endif
 
     mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0,
                                      this );
     mNewSubTodoAction->addTo( actionMenu );
     connect( mNewSubTodoAction, SIGNAL( activated() ),
              mView, SLOT( newSubTodo() ) );
 
     actionMenu->insertSeparator();
 
     mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
     mShowAction->addTo( actionMenu );
     connect( mShowAction, SIGNAL( activated() ),
              mView, SLOT( showIncidence() ) );
 
     mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
     mEditAction->addTo( actionMenu );
     connect( mEditAction, SIGNAL( activated() ),
              mView, SLOT( editIncidence() ) );
 
     mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
     mDeleteAction->addTo( actionMenu );
     connect( mDeleteAction, SIGNAL( activated() ),
              mView, SLOT( deleteIncidence() ) );
 
 
     mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
     mCloneAction->addTo( actionMenu );
     connect( mCloneAction, SIGNAL( activated() ),
              mView, SLOT( cloneIncidence() ) );
     mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
     mMoveAction->addTo( actionMenu );
     connect( mMoveAction, SIGNAL( activated() ),
              mView, SLOT( moveIncidence() ) );
     mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
     mBeamAction->addTo( actionMenu );
     connect( mBeamAction, SIGNAL( activated() ),
              mView, SLOT( beamIncidence() ) );
     mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
     mCancelAction->addTo( actionMenu );
     connect( mCancelAction, SIGNAL( activated() ),
              mView, SLOT( toggleCancelIncidence() ) );
 
     actionMenu->insertSeparator();
 
     action = new QAction( "purge_completed", i18n("Purge Completed"), 0,
                           this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) );
 
     icon = loadPixmap( pathString + "search" );
     QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
     configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5);
     search_action->addTo( actionMenu );
     connect( search_action, SIGNAL( activated() ),
              mView->dialogManager(), SLOT( showSearchDialog() ) );
 
     
 
     if ( KOPrefs::instance()->mShowFullMenu ) {
         actionMenu->insertSeparator();
         actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );
 
     }
     // actionMenu->insertSeparator();
     action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
                           this );
     action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( importIcal() ) );
     action = new QAction( "import_quick", i18n("Import last file"), 0,
                           this );
     action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) );
     importMenu_X->insertSeparator();
     action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
                           this );
     action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( importBday() ) );
     //#ifndef DESKTOP_VERSION
     importMenu_X->insertSeparator();
     action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
                           this );
     action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) );
     //#else
 #ifdef _OL_IMPORT_
     importMenu_X->insertSeparator();
     action = new QAction( "import_ol", i18n("Import from OL"), 0,
                           this );
     action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( importOL() ) );
 #endif
     //#endif
 
     //importMenu->insertSeparator();
     action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) );
 
     action = new QAction( "save_cal", i18n("Save Calendar Backup"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) );
     importMenu->insertSeparator();
     importMenu->insertItem( i18n("Import"), importMenu_X );
     //importMenu->insertSeparator();
     action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0,
                           this );
     action->addTo( exportMenu_X );    
     connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) );
 
 
     //LR
     QPopupMenu *ex2phone = new QPopupMenu( this );
     ex2phone->insertItem(i18n("Complete calendar..."), 1 );
     ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
     connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) );
     exportMenu_X->insertItem( i18n("Export to phone"), ex2phone );
 
     importMenu->insertItem( i18n("Export"), exportMenu_X );
 #ifndef DESKTOP_VERSION
     //importMenu->insertSeparator();
     brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0,
                           this );
     brAction->addTo( beamMenu_X ); 
     brAction->setToggleAction (true ) ;
     connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) );
 
     action = new QAction( "beam all", i18n("Beam complete calendar..."), 0,
                           this );
     action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) );
 
     action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0,
                           this );
     action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) );
     importMenu->insertItem( i18n("Beam"), beamMenu_X );
 #else
     //importMenu->insertSeparator();
  icon = loadPixmap( pathString + "print" );
     action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this );
     action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ),
              this, SLOT( printCal() ) );
 
     icon = loadPixmap( pathString + "print" );
     action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
     action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ),
              this, SLOT( printSel() ) );  
     action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this );
     action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( slotprintWNV() ) );
 
     action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this );
     action->addTo( beamMenu_X );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( slotprintSelInc() ) );
 
 
     importMenu->insertItem( i18n("Print"), beamMenu_X );
 #endif
     importMenu->insertSeparator();
     action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
     importMenu->insertSeparator();
     action = new QAction( "beam all", i18n("Save"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), this, SLOT( save() ) );
     action = new QAction( "beam all", i18n("Exit (+save)"), 0,
                           this );
     action->addTo( importMenu );
     connect( action, SIGNAL( activated() ), this, SLOT( close() ) );
 
     //menuBar->insertItem( "Configure",configureMenu );
     //configureMenu->insertItem( "Toolbar",configureToolBarMenu  );
     icon = loadPixmap( "korganizer/korganizer" );
 
     action = new QAction( "Whats New", i18n("What's new?"), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( whatsNew() ) );
     action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( features() ) );
     action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( keyBindings() ) ); 
     action = new QAction( "Storage Howto", i18n("Storage HowTo..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( storagehowto() ) ); 
     action = new QAction( "Timetracking Howto", i18n("Timetracking HowTo..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( timetrackinghowto() ) );
     action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( synchowto() ) );
     action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( kdesynchowto() ) );
     action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( multisynchowto() ) );
     action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( aboutAutoSaving() ) );
     action = new QAction( "Problemd", i18n("Known Problems..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( aboutKnownBugs() ) );
     action = new QAction( "Translate Howto", i18n("User translation..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( usertrans() ) );
     action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( faq() ) );
     action = new QAction( "licence", i18n("Licence..."), 0, this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( licence() ) );
     action = new QAction( "about", i18n("About..."), 0, this );
     action->addTo( helpMenu );
     connect( action, SIGNAL( activated() ),
              SLOT( about() ) );
     //menuBar->insertSeparator();
 
     // ******************************************************
     // menubar icons
 
 
     
     //menuBar->insertItem( iconToolBar );
     //xdays_action
     if (p-> mShowIconNewEvent)
         ne_action->addTo( iconToolBar  );
     if (p->mShowIconNewTodo )
         nt_action->addTo( iconToolBar  );
     if (p-> mShowIconSearch)
         search_action->addTo( iconToolBar  );
     if (p-> mShowIconWhatsThis)
         QWhatsThis::whatsThisButton (  iconToolBar );
     if (p-> mShowIconNext)
         whatsnext_action->addTo( viewToolBar  );
     if (p-> mShowIconNextDays)
         xdays_action->addTo( viewToolBar  );
     if (p-> mShowIconJournal)
         viewjournal_action->addTo( viewToolBar  );
     if (p-> mShowIconDay1)
         day1_action->addTo( viewToolBar  );
     if (p-> mShowIconDay5)
         day5_action->addTo( viewToolBar  );
     if (p-> mShowIconDay7)
         day7_action->addTo( viewToolBar  );
     if (p-> mShowIconDay6)
         day6_action->addTo( viewToolBar  );
     if (p-> mShowIconMonth)
         month_action->addTo( viewToolBar  ); 
     if (p-> mShowIconList)
         showlist_action->addTo( viewToolBar  );
     if (p-> mShowIconTodoview)
         todoview_action->addTo( viewToolBar  );   
    
     icon = loadPixmap( pathString + "2leftarrowB" );
     configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200);
     if (p-> mShowIconBackFast) {
         action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this );
         connect( action, SIGNAL( activated() ),
                  mView, SLOT( goPreviousMonth() ) );
         action->addTo( navigatorToolBar  );
     }
     icon = loadPixmap( pathString + "1leftarrowB" );
     configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210);
     if (p-> mShowIconBack) {
         action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this );
         connect( action, SIGNAL( activated() ),
                  mView, SLOT( goPrevious() ) );
         action->addTo( navigatorToolBar  );
     } 
     icon = loadPixmap( pathString + "today" );
     configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130);
     if (p-> mShowIconToday)
         today_action->addTo( navigatorToolBar  );
     icon = loadPixmap( pathString + "1rightarrowB" );
     configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220);
     if (p-> mShowIconForward) {
         action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this );
         connect( action, SIGNAL( activated() ),
                  mView, SLOT( goNext() ) );
         action->addTo( navigatorToolBar  );
     }
     icon = loadPixmap( pathString + "2rightarrowB" );
     configureToolBarMenu->insertItem(icon, i18n("Next month"), 230);
     if (p-> mShowIconForwardFast) {
         action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this );
         connect( action, SIGNAL( activated() ),
                  mView, SLOT( goNextMonth() ) );
         action->addTo( navigatorToolBar  );
     }
 
 
     configureToolBarMenu->insertItem(i18n("What's This?"), 300, 6);
 
 
     if ( p->mShowIconNavigator ) configureToolBarMenu->setItemChecked( 22 , true);
     if ( p->mShowIconAllday ) configureToolBarMenu->setItemChecked( 24 , true);
     if ( p->mShowIconFilterview ) configureToolBarMenu->setItemChecked( 26 , true);
     if ( p->mShowIconToggleFull ) configureToolBarMenu->setItemChecked( 28 , true);
 
     if (p-> mShowIconNewEvent)
         configureToolBarMenu->setItemChecked( 10, true );
     if (p->mShowIconNewTodo )
         configureToolBarMenu->setItemChecked( 20, true );
     if (p-> mShowIconSearch)
         configureToolBarMenu->setItemChecked( 120, true );
     if (p-> mShowIconList)
         configureToolBarMenu->setItemChecked( 30, true );
     if (p-> mShowIconDay1)
         configureToolBarMenu->setItemChecked( 40, true );
     if (p-> mShowIconDay5)
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index 45ed04d..8fd3d24 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -1,166 +1,166 @@
 #ifndef KORGE_MAINWINDOW_H
 #define KORGE_MAINWINDOW_H
 
 #include <qmainwindow.h>
 #include <qtimer.h>
 #include <qdict.h>
 #include <qfile.h>
 #include <qmenubar.h>
 #include <qtextstream.h>
 #include <qregexp.h>
 
 #include <libkcal/incidence.h>
 #include <ksyncmanager.h>
 #ifndef DESKTOP_VERSION
 #include <qcopchannel_qws.h> 
 #endif
 class QAction;
 class CalendarView;
 class KSyncProfile;
 #ifdef DESKTOP_VERSION
 
 #define QPEToolBar QToolBar
 #define QPEMenuBar QMenuBar
 #endif
 class QPEToolBar;
 class QPEMenuBar;
 
 
 namespace KCal {
 class CalendarLocal;
 }
 
 using namespace KCal;
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
   public:
     MainWindow( QWidget *parent = 0, const char *name = 0, QString command = "");
     ~MainWindow();
     bool beamReceiveEnabled();
     static  QString defaultFileName();
     static  QString syncFileName();
     static QString resourcePath();
  public  slots:  
     void setCaption ( const QString & );
     void updateWeekNum(const KCal::DateList &);
     void updateWeek(QDate);
     void updateFilterToolbar();
     virtual void showMaximized (); 
      void configureAgenda( int );
     void recieve( const QCString& msg, const QByteArray& data );
  protected slots:  
     void setCaptionToDates();
     void weekAction();
     void about(); 
     void licence(); 
     void faq(); 
     void usertrans(); 
     void features(); 
     void synchowto();   
     void storagehowto();   
     void timetrackinghowto();   
     void kdesynchowto();   
     void multisynchowto();   
     void whatsNew();    
     void keyBindings();
     void aboutAutoSaving();;
     void aboutKnownBugs();
 
     void processIncidenceSelection( Incidence * );
 
     void importQtopia();
     void importBday();
     void importOL();
     void importIcal();
     void importFile( QString, bool );
     void quickImportIcal();
     
     void slotModifiedChanged( bool );
     
     void save();
     void saveStopTimer();
     void configureToolBar( int );
     void printSel();
     void printCal();
     void saveCalendar();
     void loadCalendar();
     void exportVCalendar();
     void fillFilterMenu();
     void fillFilterMenuTB();
     void selectFilter( int );
     void fillFilterMenuPopup();
     void selectFilterPopup( int );
     void exportToPhone( int );
     void toggleBeamReceive();
     void disableBR(bool);
  signals:
     void selectWeek ( int ); 
   private slots:
     void showConfigureAgenda();
     void getFile( bool );
     void syncFileRequest();
     
   protected:
     void hideEvent ( QHideEvent * );
     QString sentSyncFile();
     void displayText( QString, QString);
     void enableIncidenceActions( bool );
     
   private:
     bool mBRdisabled;
 #ifndef DESKTOP_VERSION
     QCopChannel* infrared;
 #endif
     QAction* brAction; 
     KSyncManager* mSyncManager;
     bool mClosed;
     void saveOnClose();
     bool  mFlagKeyPressed;
     bool  mBlockAtStartup;
     QPEToolBar *iconToolBar;
     QPEToolBar *viewToolBar;
     QPEToolBar *navigatorToolBar;
     QPEToolBar *filterToolBar;
-    QPEMenuBar *filterMenubar;
+    QMenuBar *filterMenubar;
     QPopupMenu * filterPopupMenu;
     void initActions();
     void setDefaultPreferences(); 
     void resizeEvent( QResizeEvent* e);
     void keyPressEvent ( QKeyEvent * ) ;
     void keyReleaseEvent ( QKeyEvent * ) ;
     QPopupMenu *configureToolBarMenu;
     QPopupMenu *selectFilterMenu;
     QPopupMenu *selectFilterMenuTB;
     QPopupMenu *configureAgendaMenu, *syncMenu;
     CalendarLocal *mCalendar;
     CalendarView *mView;
     QAction *mNewSubTodoAction;
     QAction *mWeekAction;
     QFont mWeekFont;
     QPixmap mWeekPixmap;
     QColor mWeekBgColor;
     
     QAction *mShowAction;
     QAction *mEditAction;
     QAction *mDeleteAction;
     QAction *mCloneAction;
     QAction *mMoveAction;
     QAction *mBeamAction;
     QAction *mCancelAction;
 
     QAction *mToggleNav;
     QAction *mToggleFilter;
     QAction *mToggleAllday;
     QAction *actionFilterMenuTB;
 
     void closeEvent( QCloseEvent* ce );
     QTimer mSaveTimer;
     //bool mBlockSaveFlag;
     bool mCalendarModifiedFlag;
     QPixmap loadPixmap( QString );
 };
 
 
 #endif