conflict res fix

author: zautrix <zautrix> 2005-08-24 18:38:31 (UTC)
committer: zautrix <zautrix> 2005-08-24 18:38:31 (UTC)
commit: 2cde25d8061acd536bccd698722952ce8555f5db (patch) (unidiff)
tree: 70f905e5de57b44c3503883b2f98925d9c92ef8b
parent: 645ceb7a95dce4716eb87a1b9191d3f3c1657be3 (diff)
download: kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.zip
kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.tar.gz
kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.tar.bz2
6 files changed, 41 insertions, 5 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index fbd262c..2c0d626 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1358,205 +1358,215 @@
 { "Try again tomorrow","Versuche morgen nochmal" },
 { "Disable backup","Schalte Backup ab" },
 { "<b>Backup directory does not exist: </b>","<b>Backup Verzeichnis existiert nicht: </b>" },
 { "<b>The backup copy command failed!</b>","<b>Das Backup Kopierkommando is fehlgeschlagen!</b>" },
 { "Choose action","Wähle Aktion" },
 { "Comment for todo:","Kommentar zum Todo:" },
 { "Stop+note","Stop+Notiz" },
 { "Agenda view shows completed todos","Agenda Ansicht zeigt erledigte Todos" },
 { "KO/Pi: Missing alarms!","KO/Pi: Verpasste Alarme!" },
 { "You missed the alarms for the following events or todos:","Sie verpassten die Alarme für folgende Termine oder Todos:" },
 { "Print complete list...","Drucke komplette Liste..." },
 { "Hide all selected","Verstecke Ausgewählte" },
 { "Add items","hinzufügen" },
 { "One (or more) selected\ntodo has subtodos!\nDo you want to select\nall subtodos of all\nselected todos as well?","Ein (oder mehrere) ausgewähltes\nTodo hat Untertodos!\nMöchten Sie der Auswahlliste\nalle Untertodos von allen\nausgewählten Todos hinzufügen?" },
 { "Print List View...","Drucke Listenansicht..." },
 { "You can make a printout of the <b>List View</b> and the list view in the <b>Search Dialog</b>! To do this, please go to the <b>List View/Search Dialog</b>. Right click on the list. Select in the popup menu the entry <b>Print complete list</b>. That prints the list as you see it. You can remove items from the list before printing without deleting the corresponding event/todo! Simply select all items you do not want to print out. Then right click on one of the items and choose <b>Hide selected items</b>. After that you can print the list without these items.","Sie können die <b>Listenansicht</b> und die Listenansicht im <b>Suchdialog</b> ausdrucken! Um das zu machen gehen Sie bitte zur <b>Listenansicht</b> oder zum <b>Suchdialog</b>. Rechtsklicken Sie auf die Liste. Wählen Sie im Popupmenu den Eintrag <b>Drucke komplette Liste</b>. Das druckt die Liste so, wie man sie sieht. Sie können Listeneinträge entfernen ohne die korrespondierenden Ereignisse/Todos zu löschen! Selektieren sie einfach alle Einträge, die sie nicht ausdrucken möchten. Dann Rechtsklicken Sie auf einen Eintrag und wählen <b>Verstecke Selektierte</b>. Danach können Sie die Liste ohne diese Einträge ausdrucken." },
 { "Configure KO/Pi...","Konfiguriere KO/Pi..." },
 { "Global Settings...","Globale Einstellungen..." },
 { "<p><b>R</b>: Toggle Resource View |<b>F</b>: Edit filter </p>\n","<p><b>R</b>: Zeige Resource Ansicht | <b>F</b>: Editiere Filter </p>\n" },
 { "(disabled)","(abgeschaltet)" },
 { "New Calendar","Neuer Kalender" },
 { "Calendar","Kalender" },
 { "Filter selector","Filterauswahl" },
 { "Filtermenu","Filtermenu" },
 { "Toggle Fullscreen","Vollbild umschalten" },
 { "Toggle Resource View","Resourcenansicht umschalten" },
 { "Storage HowTo...","Speicherort HowTo..." },
 { "Timetracking HowTo...","Timetracking HowTo..." },
 { "Juni","Juni" },
 { "Juli","Juli" },
 { "ToDo:","ToDo:" },
 { "Set Calendar","Setze Kalender" },
 { "Todo: %1","Todo: %1" },
 { ": (Prio ",": (Prio " },
 { "Todos","Todos" },
 { "Todo Viewer","Todo Anzeige" },
 { "Todo ","Todo " },
 { " Calendar \n Resource "," Kalender \n Resource " },
 { " Color "," Farbe " },
 { "The calendar <b>%1</b> is displaying file <b>%2</b>. Do you want to remove this calendar from KO/Pi? (The file is not removed!)","Der Kalender <b>%1</b> zeigt die Datei <b>%2</b>. Möchten Sie diesen Kalender aus KO/Pi entfernen? (Die Datei wird dabei nicht gelöscht!)" },
 { "The calendar <b>%1</b> is displaying file <b>%2</b>","Der Kalender <b>%1</b> zeigt die Datei <b>%2</b>" },
 { "Add new Calendar","Füge Kalender hinzu" },
 { "<b>Name of new calendar:</b>","<b>Name des Kalenders:</b>" },
 { "Sorry, the calendar name is empty!","Sorry, der Kalendername ist leer!" },
 { "Sorry, the file name is empty!","Sorry, der Dateiname ist leer!" },
 { "Error loading calendar file\n%1.","Fehler beim Laden der Kalenderdatei\n%1." },
 { "The calendar <b>%1</b> is not loaded! Loading of file <b>%2</b> failed! <b>Try again to load the calendar?</b>","Der Kalender <b>%1</b> ist nicht geladen! Das Laden der Datei <b>%2</b> schlug fehl! <b>Soll erneut versucht werden den Kalender zu laden?</b>" },
 { "Global application font for all apps:","Globale Schriftart:" },
 { "Application Font","Applikationsschriftart" },
 { "Kx/Pi","Kx/Pi" },
 { "Backup","Backup" },
 { "KDE-Pim Global Settings","KDE-Pim Globale Einstellungen" },
 { "Sorry, the calendar name \n%1\nalready exists!\nPlease choose another name!","Sorry, der Kalendername \n%1\nist schon in Benutzung!\nBitte wählen Sie einen anderen!" },
 { "Sorry, the file \n%1\nis already loaded!\nPlease choose another file!","Sorry, die Datei \n%1\nist schon geladen!\nBitte wählen Sie eine andere!" },
 { "Choose Color","Wähle Farbe" },
 { " OK "," OK " },
 { " Cancel "," Abbrechen " },
 { "Matching items will be added to list","Passende werden zur Liste hinzugefügt" },
 { "Matching items will be removed from list","Passende werden von der Liste entfernt" },
 { "Search on displayed list only","Suche auf der dargestellten Liste" },
 { "List will be cleared before search","Liste wird vor der Suche gelöscht" },
 { "<center>%1</center> <center>is not running. Do you want to set\nthe state to running?</center>","<center>%1</center> <center>ist nicht am Laufen. Möchten Sie den Zustand auf "laufend" setzen?</center>" },
 { "%1\nis running!","%1\nist am Laufen!" },
 { "Additional Comment:","Zusätzlicher Kommentar:" },
 { "Stop and save","Stopp und Speichern" },
 { "Continue running","Weiter laufen lassen" },
 { "Stop - do not save","Stopp - nicht Speichern" },
 { "Do you really want to set\nthe state to stopped\nwithout saving the data?","Möchten sie den Zustand\nwirklich auf gestoppt setzen\nohne die Daten abzuspeichern?" },
 { "Time mismatch!","Zeiten stimmen nicht!" },
 { "The start time is\nafter the end time!","Die Startzeit ist\nhinter der Endzeit!" },
 { "Yes, stop todo","Ja, stoppe Todo" },
 { "Todo stopped - no data saved because runtime was < 15 sec!","Todo gestoppt - nichts gespeichert da Laufzeit < 15 sec!" },
 { "Todo started! Double click again to stop!","Todo gestartet! Doppelklicke um es zu stoppen!" },
 { "Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.","Bitte wählen Sie den <b>Default-Kalender</b> in dieser Spalte. Neu angelegte oder importierte Einträge werden dem Default-Kalender hinzugefügt." },
 { "Spouse","Ehegatte" },
 { "Notes","Notizen" },
 { "Messanger","Messanger" },
 { "Assistant","Assistent" },
 { "Manager","Manager" },
 { "Secrecy","Sichtbar" },
 { "male","männlich" },
 { "female","weiblich" },
 { "Hide!","Verbergen!" },
 { "Show!","Anzeigen!" },
 { "Details","Details" },
 { "Profession","Beruf" },
 { "Children","Kinder" },
 { "Department","Abteilung" },
 { "Backup cancelled","Backup abgebrochen" },
 { "Backup globally disabled","Backup global abgeschaltet" },
 { "Backup succesfully finished","Backup erfolgreich beendet" },
 { "(Hint: You can enable automatic backup in the global settings!)","(Hinweis: Sie können ein automatisches Backup in den globalen Einstellungen konfigurieren!)" },
 { "This will <b>backup all calendar files</b> to the directory %1 %2","Das schreibt ein <b>Backup aller Kalenderdateien</b> in das Verzeichnis %1 %2" },
 { "Birthdays","Geburtstage" },
 { "KO/Pi import information!","KO/Pi Import Information!" },
 { "Start this todo\nand stop all running","Starte dieses Todo\nund stoppe alle Laufenden" },
 { "Cancel - do not start"," Abbrechen - Todo nicht starten" }, 
 { "The timezone has changed!\nShould the calendar be reloaded\nto shift the time of the events?\nPlease read Menu: Help->FAQ:\n"How do I change the timezone?"\nas well!","Die Zeitzone wurde geändert!\nSollen die Kalender neu geladen\nwerden num die Zeiten\nder Termine zu ändern?\nBitte lesen Sie auch\nMenu: Help->FAQ:\n"How do I change the timezone?"" },
 { "Reload","Neu laden" },
 { "Timezone settings","Zeitzoneneinstellung" },
 { "Title: ","Titel: " },
 { "Journal from: ","Journal vom: " },
 { "Journal: %1 from ","Journal: %1 vom " },
 { "<b>Click here to edit categories: </b>","<b>Klicke hier um Kategorien zu ändern: </b>" },
 { "Selected Item","Ausgewähltes Item" },
 { "Select Date...","Wähle Datum..." },
 { "After importing/loading/syncing there may be new categories in events or todos which are not added automatically to the category list. Please choose what to do <b>now</b>:","Nach dem Importieren/Laden/Syncen kann es neue Kategorien in den Terminen oder Todos geben, die nicht automatisch der Kategorieliste hinzugefügt werden. Bitte wählen Sie, was <b>jetzt</b> passieren soll:" },
 { "Change category list now!","Ändere Kategorieliste jetzt!" },
 { "Edit category list...","Ändere Kategorieliste..." },
 { "Toolbar changes needs a restart!","Neustart benötigt für Toolbaränderungen!" },
 { "Filepath: ","Dateipfad: " },
 { "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" },
 { "<b>WARNING:</b> There is a pending suspended alarm!","<b>WARNUNG:</b> Es gibt einen laufenden Suspendalarm!" },
 { "Pending Suspend Alarm","Laufender Suspend Alarm" },
 { "Error loading calendar %1","Fehler beim Laden von Kalender %1" },
 { "Calendar(s) not loaded:","Nicht geladene(r) Kalender:" },
 { "Loading of calendar(s) failed","Laden von Kalendern fehlgeschlagen" },
 { "Alarm Options","Alarm Einstellungen" },
 { "Delete selected...","Lösche Ausgewählte..." },
 { "None","Nichts" },
 { "Selection","Auswahl" },
 { "Set categories","Setze Kategorien" },
 { "This adds the selected\nitems to the calendar\n%1\nand removes them from\ntheir current calendar!","Das fügt die ausgewählten\nEinträge dem Kalender\n%1\nhinzu und entfernt sie von\nihrem aktuellen Kalender!" },
 { "Reset","Neu setzen" },
 { "Do you want to <b>add</b> categories to the selected items or <b>reset</b> the list (i.e. remove current categories)?","Möchten Sie Kategorien zu den ausgewählten Einträgen <b>hinzufügen</b> oder die Liste <b>neu setzen</b> (d.h. vorhandene Kategorien löschen)?" },
 { "The file\n%1\ndoes not exist!\nShall I create it for you?","Die Datei\n%1\nexistiert nicht!\nSoll sie neu angelegt werden?" },
 { "Sorry, cannot create the file\n%1!\nNo calendar added!","Kann leider die Datei\n%1\nnicht anlegen!\nKein Kalender hinzugefügt!" },
 { "\nNO\n WRITEABLE\n   CALENDAR\n      FOUND!\n\nPlease fix your calendar settings!\n","\nKEIN\n  SCHREIBBARER\n    KALENDER\n      GEFUNDEN!\n\nBitte korrigieren Sie\nihre Kalendereinstellungen!\n" },
 { "\nThe file\n%1\non disk has changed!\nFile size: %2 bytes.\nLast modified: %3\nDo you want to:\n\n - Save and overwrite file?\n - Sync with file, then save?\n - Cancel without saving? \n","\nDie Datei\n%1\nwurde verändert!\nDatei Grösse: %2 Bytes.\nZuletzt geändert: %3\nMöchten Sie:\n\n - Speichern und die Datei überschreiben?\n - Mit Datei Synchronisieren, dann speichern?\n - Abbrechen ohne zu speichern? \n" },
 { "Edit","Edit" },
 { "Last Modified","Zuletzt geändert" },
 { "Journal viewer","Journal Anzeige" },
 { "Configure Calendar Files...","Konfiguriere Kalenderdateien..." },
 { "You can use and display <b>more than one</b> calendar file in KO/Pi. A calendar file is called a <b>resource</b>. To add a calendar or change calendar settings please use menu: <b>View -> Toggle Resource View</b>.","Sie können <b>mehr als eine</b> Kalenderdatei in KO/Pi darstellen und benutzen. Eine Kalenderdatei wird <b>Resource</b> genannt. Um einen Kalender hinzuzufügen oder die Kalendereinstellungen zu ändern benutzen Sie bitte das Menu: <b>Ansicht -> Resourcenansicht umschalten</b>." },
 { "Hide Completed","Verstecke erledigte Todos" },
 { "Show not Running","Zeige nicht Laufende" },
 { "Click to add new Todo","Klick für neues Todo!" },
 { "Show next conflict for","Zeige nächsten Konflikt für" },
 { "All events","Alle Termine" },
 { "Allday events","Ganztagestermine" },
 { "Events with time","Termine mit Zeit" },
 { "No conflict found","Kein Konflikt gefunden" },
 { "Conflict %1 <-> %2","Konflikt %1 <-> %2" },
 { "<p><b>Q</b>: Show next date with conflicting events\n ","<p><b>Q</b>: Zeige nächstes Datum mit Terminen im Konflikt\n " },
 { "Week view mode uses row layout","Wochenansicht Modus nutzt Reihenlayout" },
 { "The event\n%1\nconflicts with event\n%2\nat date\n%3.\n","Der Termin\n%1\nist im Konflikt mit Termin\n%2\nam Datum\n%3.\n" },
 { "KO/Pi Conflict detected","KO/Pi Konflikt erkannt" },
 { "Show date","Zeige Datum" },
 { "No problem!","Null Problemo!" },
 { "Automatically sync with KDE-Desktop\nwhen receiving sync request","Synce automatisch mit KDE-Desktop\nwenn eine Sync-Anforderung kommt" },
 { "Pi-Sync Port Error","Pi-Sync Port Fehler" },
 { "<b>Enabling Pi-Sync failed!</b> Failed to bind or listen to the port %1! Is another instance already listening to that port?","<b>Anschalten von Pi-Sync fehlgeschlagen!</b> Fehler beim Ansprechen des Ports %1! Ist bereits eine andere Anwendung dabei diesen Port zu nutzen?" },
 { "No valid port number:\n%1","Keine gültige Port Nummer:\n%1" },
 { "Port number (Default: %1)\nValid range from 1 to 65535","Port Nummer (Standard: %1)\nGültiger Bereich von 1 bis 65535" },
 { "Pi-Sync Error","Pi-Sync Fehler" },
 { "Got send file request\nwith invalid password","Erhielt "sende Datei" Anfrage\nmit ungültigem Passwort" },
 { "Got receive file request\nwith invalid password","Erhielt "empfange Datei" Anfrage\nmit ungültigem Passwort" },
 { "Wrong password: Receiving remote file failed.","Falsches Passwort: Empfangen von entfernter Datei fehlgeschlagen." },
 { "Please close error dialog on remote.","Bitte schließe Fehler-Dialog am entfernten Rechner" },
 { "Unknown error on remote.","Unbekannter Fehler am entfernten Rechner" },
 { "Pi-Sync: Connected!","Pi-Sync: Verbunden!" },
 { "Receiving file from remote...","Empfange entfernte Datei..." },
 { "Sending back synced file...","Sende synchronisierte Datei zurück..." },
 { "Do you want to\nclear all sync info\nof all profiles?","Möchten Sie wirklich\ndie Sync-Info\nfür alle Profile\nlöschen?" },
 { "Do you want to\nclear the sync\ninfo of profile\n%1?\n","Möchten Sie wirklich\ndie Sync-Info für Profil\n%1?\nlöschen" },
 { "Sorry, no valid port.Syncing cancelled.","Sorry, kein gültiger Port. Syncing abgebrochen." },
 { "Remote port number:\n(May be: 1 - 65535)","Ferne Port Nummer:\n(Darf sein: 1 - 65535)" },
 { "Writing back file ...","Schreibe Datei zurück..." },
 { "Sending back file ...","Sende Datei zurück..." },
 { "Eeek, there I am ticklish!","Hihi, da bin ich kitzlig!" },
 { "Created","Angelegt" },
 { "Last Modified Sub","Zuletzt geändertes Sub" },
 { "Checking conflicts ... please wait","Überprüfe Konflikte ... bitte warten" },
 { "Show times on two lines","Zeige Zeiten auf zwei Zeilen" },
 { "Save using LOCAL storage","Speichere nutze LOCAL Pfad" },
 { "Duration","Dauer" },
 { " day"," Tag" }, 
 { "Click this button to display all todos in a <b>flat</b> hierarchy","Klicke diesen Knopf um alle Todos in einer <b>flachen</b> Hierarchie darzustellen" },
 { "Click this button to display all todos <b>openend</b>","Klicke diesen Knopf um alle Todos <b>geöffnet</b> darzustellen" },
 { "Click this button to display all todos <b>closed</b>","Klicke diesen Knopf um alle Todos <b>geschlossen</b> darzustellen" },
 { "Click this button to toggle show/hide <b>running</b> todos","Klicke diesen Knopf um <b>zeige Laufende</b> umzuschalten" },
 { "Click this button to toggle show/hide <b>completed</b> todos","Klicke diesen Knopf um <b>zeige Erledigte</b> umzuschalten" },
 { "Click this button to add a new subtodo to the currently selected todo","Klicke diesen Knopf um ein Untertodo zu dem gerade selektierten Todo hinzuzufügen" },
 { "In this column you can <b>set a calendar to be visible</b>. If a calendar is not visible its entries are not displayed in the views. You can add items to it and it is loaded/saved as usual.","In dieser Spalte kann man einen  <b>Kalender auf sichtbar schalten</b>. Wenn ein Kalender nicht sichtbar ist werden seine Einträge nicht in den Ansichten angezeigt. Man kann Einträge hinzufügen und laden/speichern wie gewöhnlich." },
 { "In this column you can see the <b>name of the calendar</b>. If you click on the name button you will get an information box about the loaded calendar file. If the file was not loaded at startup you can try to load it here again.","In dieser Spalte wird der <b>Name des Kalenders</b> angezeigt. Wenn Sie auf den Namen klicken wird Information über die Kalenderdatei angezeigt. Wenn die Datei beim Start nicht geladen wurde können Sie hier erneut versuchen sie zu laden." },
 { "In this column you can <b>disable the alarms of a calendar all together</b>. The alarm data in the calendar itself is not changed, the alarms are marked internally as "do not use". Useful if you load a calendar of another person but do not want to get notified about alarms of that person.","In dieser Spalte können die <b>Alarme eines Kalenders alle zusammen abgeschaltet werden</b>. Die Alarmdaten im Kalender selbst werden nicht verändert, es werde die Alarme intern als "nicht beachten" markiert. Nützlich wenn Sie den Kalender einer anderen Person laden aber nicht über dessen Alarme unterrichtet werden wollen." },
 { "In this column you can <b>set a calendar and all entries of the calendar to read only</b>. If a calendar is readonly the entries cannot be edited and no items can be added to the calendar. If you change a setting of a calendar to readonly in this column all data will be saved because the data of a readonly calendar is not saved later.","In dieser Spalte können Sie einen <b>Kalender und alle Einträge auf schreibgeschützt setzen</b>. Einträge eines schreibgeschützten Kalenders können nicht verändert werden und es können keine Einträge zum Kalender hinzugefügt werden. Wenn Sie die Einstellung eines Kalenders in dieser Spalte auf schreibgeschützt setzen werden alle Daten automatisch abgespeichert, da die Daten eines schreibgeschützten Kalenders später nicht mehr gespeichert werden." },
 { "Click this button to <b>add a calendar</b>. You can add an existing calendar file or you can add a new calendar and KO/Pi creates a new empty calendar file for you.","Klicken Sie diesen Knopf <b>um einen Kalender hinzuzufügen</b>. Sie können eine existierende Kalenderdatei hinzufügen oder einen neuen Kalender und KO/Pi legt dann eine neue leere Kalenderdatei für Sie an." },
 { "<b>iCal (*.ics) file on disk:</b><br>(will be created, if not existing)","<b>iCal (*.ics) Datei:</b><br>(Datei wird angelegt, wenn sie nicht existiert)" },
 { "Error saving data","Fehler beim Abspeichern" },
 { "Calendar(s) not saved:","Nicht gespeicherte Kalender:" },
 { "Enable conflict detection","Schalte Konflikterkennung an" },
-{ "Conflict detection checks an <b>edited event</b> with other <b>existing events</b> for overlapping. You can define which events are checked:","Konflikterkennung prüft einen <b>bearbeiteten Termin</b> auf Überschneidungen mit <b>anderen Terminen</b>. Sie können einstellen welche Termine überprüft werden:" },
 { "Filter for the edited event","Filter für den bearbeiteten Termin" },
-{ "Filter for other existing events","Filter für die anderen Termine" },
+{ "Filter for other events","Filter für die anderen Termine" },
 { "Check Allday with Allday","Prüfe GanzTag mit GanzTag" },
 { "Check Allday with NonAllday","Prüfe GanzTag mit NichtGanzTag" },
 { "Check NonAllday with Allday","Prüfe NichtGanzTag mit GanzTag" },
 { "Check NonAllday with NonAllday","Prüfe NichtGanzTag mit NichtGanzTag" },
 { "Conflict detection","Konflikterkennung" },
 { "Loading calendar files ... please wait","Lade Kalenderdateien ... bitte warten" },
+{ "Show multiday allday ev. in date nav.","Zeige Multi-Ganzt.Term.in Datums Nav." },
+{ "Include events which "show as free"","Inklusive Termine mit "Zeige Zeit als frei"" },
+{ "Conflict detection checks an <b>edited event</b> with <b>other events</b> for overlapping.","Konflikterkennung prüft einen <b>bearbeiteten Termin</b> auf Überschneidungen mit <b>anderen Terminen</b>." },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
 { "","" },
 { "","" },
 { "","" },
 { "","" },
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 9928b48..14094bb 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2855,435 +2855,442 @@ void CalendarView::writeSettings()
    config->sync();
 }
 void CalendarView::readFilterSettings(KConfig *config)
 {
    //  kdDebug() << "CalendarView::readFilterSettings()" << endl;
    mFilters.clear();
    config->setGroup("General");
    QStringList filterList = config->readListEntry("CalendarFilters");
    QStringList::ConstIterator it = filterList.begin();
    QStringList::ConstIterator end = filterList.end();
    while(it != end) {
        //    kdDebug() << "  filter: " << (*it) << endl;
        CalFilter *filter;
        filter = new CalFilter(*it);
        config->setGroup("Filter_" + (*it).utf8());
        //qDebug("readFilterSettings %d ",config->readNumEntry("Criteria",0) );
        filter->setCriteria(config->readNumEntry("Criteria",0));
        filter->setCategoryList(config->readListEntry("CategoryList"));
        mFilters.append(filter);
        ++it;
    }
    if (mFilters.count() == 0) {
        CalFilter *filter = new CalFilter(i18n("Default"));
        mFilters.append(filter);
    }
    mFilterView->updateFilters();
    config->setGroup("FilterView");
    mFilterView->blockSignals(true);
    mFilterView->setFiltersEnabled(config->readBoolEntry("FilterEnabled"));
    mFilterView->setSelectedFilter(config->readEntry("Current Filter"));
    mFilterView->blockSignals(false);
    // We do it manually to avoid it being done twice by the above calls
    updateFilter();
 }
 void CalendarView::writeFilterSettings(KConfig *config)
 {
    //  kdDebug() << "CalendarView::writeFilterSettings()" << endl;
    QStringList filterList;
    CalFilter *filter = mFilters.first();
    while(filter) {
        //    kdDebug() << " fn: " << filter->name() << endl;
        filterList << filter->name();
        config->setGroup("Filter_" + filter->name().utf8());
        config->writeEntry("Criteria",filter->criteria());
        config->writeEntry("CategoryList",filter->categoryList());
        filter = mFilters.next();
    }
    config->setGroup("General");
    config->writeEntry("CalendarFilters",filterList);
    config->setGroup("FilterView");
    config->writeEntry("FilterEnabled",mFilterView->filtersEnabled());
    config->writeEntry("Current Filter",mFilterView->selectedFilter()->name());
 }
 void CalendarView::goToday()
 {
    if ( mViewManager->currentView()->isMonthView() )
        mNavigator->selectTodayMonth();
    else
        mNavigator->selectToday();
 }
 void CalendarView::goNext()
 {
    mNavigator->selectNext();
 }
 void CalendarView::goPrevious()
 {
    mNavigator->selectPrevious();
 }
 void CalendarView::goNextMonth()
 {
    mNavigator->selectNextMonth();
 }
 void CalendarView::goPreviousMonth()
 {
    mNavigator->selectPreviousMonth();
 }
 void CalendarView::updateConfig()
 {
    if ( KOPrefs::instance()->mUseAppColors )
        QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
    emit configChanged();
    mTodoList->updateConfig();
    // mDateNavigator->setFont ( KOPrefs::instance()->mDateNavigatorFont);
    mCalendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
    // To make the "fill window" configurations work
    //mViewManager->raiseCurrentView();
 }
 void CalendarView::eventChanged(Event *event)
 {
    changeEventDisplay(event,KOGlobals::EVENTEDITED);
    //updateUnmanagedViews();
 }
 void CalendarView::eventAdded(Event *event)
 {
    changeEventDisplay(event,KOGlobals::EVENTADDED);
 }
 void CalendarView::eventToBeDeleted(Event *)
 {
    kdDebug() << "CalendarView::eventToBeDeleted(): to be implemented" << endl;
 }
 void CalendarView::eventDeleted()
 {
    changeEventDisplay(0,KOGlobals::EVENTDELETED);
 }
 void CalendarView::changeTodoDisplay(Todo *which, int action)
 {
    changeIncidenceDisplay((Incidence *)which,  action);
    mDateNavigator->updateView(); //LR
    //mDialogManager->updateSearchDialog();
    if (which) {
        mViewManager->updateWNview();
        //mTodoList->updateView();
    }
   
 }
 void CalendarView::changeIncidenceDisplay(Incidence *which, int action)
 {
    updateUnmanagedViews();
    //qDebug(" CalendarView::changeIncidenceDisplay++++++++++++++++++++++++++  %d  %d ",which, action );
    if ( action == KOGlobals::EVENTDELETED ) { //delete
        mCalendar->checkAlarmForIncidence( 0, true );
        if ( mEventViewerDialog )
            mEventViewerDialog->hide();
    } 
    else
        mCalendar->checkAlarmForIncidence( which , false );
 }
 // most of the changeEventDisplays() right now just call the view's
 // total update mode, but they SHOULD be recoded to be more refresh-efficient.
 void CalendarView::changeEventDisplay(Event *which, int action)
 {
    //  kdDebug() << "CalendarView::changeEventDisplay" << endl;
    changeIncidenceDisplay((Incidence *)which,  action);
    static bool clearallviews = false;
    if ( KOPrefs::instance()->mGlobalUpdateDisabled ) {
        if ( clearallviews ) {
            clearAllViews();
            clearallviews = false;
        }
        return;
    }
    clearallviews = true;
    mDateNavigator->updateView();
    //mDialogManager->updateSearchDialog();
    if (which) {
        // If there is an event view visible update the display
        mViewManager->currentView()->changeEventDisplay(which,action);
        // TODO: check, if update needed
        //    if (which->getTodoStatus()) {
        mTodoList->updateView();
        if (  action != KOGlobals::EVENTDELETED && KOPrefs::instance()->mDetectConflicts ) {
            mConflictingEvent = which ;
            int time = 1000;
 #ifdef DESKTOP_VERSION
            time = 500;
 #endif
            bool checkC = false;
            if ( mConflictingEvent->doesFloat() ) {
                checkC = KOPrefs::instance()->mCheckConflictsAllDayAllDay 
                    || KOPrefs::instance()->mCheckConflictsAllDayNonAD;
            } else {
                checkC = KOPrefs::instance()->mCheckConflictsNonADAllDay  
                    || KOPrefs::instance()->mCheckConflictsNonADNonAD;
            }
+            if ( !KOPrefs::instance()->mIncludeFree && mConflictingEvent->transparency() == KCal::Event::Transparent )
+                checkC = false;
            if ( checkC )
                QTimer::singleShot( time, this, SLOT ( checkConflictForEvent() ) );
        }
        //    }
    } else {
        mViewManager->currentView()->updateView();
    }
 }
 void CalendarView::checkConflictForEvent()
 {
    if (!KOPrefs::instance()->mConfirm)
        return;
    if ( ! mConflictingEvent ) return;
    Event * conflictingEvent = mConflictingEvent;
    mConflictingEvent = 0;
    QDateTime current = QDateTime::currentDateTime();
    if ( ! conflictingEvent->matchTime( &current, 0 ) ) {
        return;
    }
    CalFilter *filterIN = 0;
    CalFilter *filterALL = 0;
    CalFilter *filter = mFilters.first();
    while(filter) {
        if ( filter->name() == KOPrefs::instance()->mFilterConflictEditItem)
            filterIN = filter;
        if ( filter->name() == KOPrefs::instance()->mFilterConflictAllItem )
            filterALL = filter;
        filter = mFilters.next();
    }
    if ( filterIN ) {
        if ( !filterIN->filterCalendarItem( conflictingEvent ) ) {
            return;   
        }
    }
    QPtrList<Event> testlist = mCalendar->events();
    Event * test = testlist.first();
    QDateTime conflict;
    QDateTime retVal;
    bool found = false;
    Event * cE = 0;
    bool chAD = KOPrefs::instance()->mCheckConflictsAllDayAllDay;
    bool chNad = KOPrefs::instance()->mCheckConflictsAllDayNonAD;
    if ( !conflictingEvent->doesFloat() ) {
        chAD = KOPrefs::instance()->mCheckConflictsNonADAllDay;
        chNad = KOPrefs::instance()->mCheckConflictsNonADNonAD;
    }
    topLevelWidget()->setCaption( i18n("Checking conflicts ... please wait") );
    while ( test ) {
        qApp->processEvents(); 
        bool skip = ( test->doesFloat() && !chAD ) || ( !test->doesFloat() && !chNad );
+        if ( !skip ) {
+            if ( !KOPrefs::instance()->mIncludeFree && test->transparency() == KCal::Event::Transparent )
+                skip = true;
+        }
        if ( !skip ) {
            if ( filterALL ) {
                if ( !filterALL->filterCalendarItem( test ) ) {
                    skip = true;
                }
            } 
            if ( !skip ) {
                if ( found )
                    skip =  !test->matchTime( &current, &conflict );
                else 
                    skip =  !test->matchTime( &current, 0 ); 
                if ( !skip ) {
                    if ( conflictingEvent->isOverlapping ( test, &retVal, &current ) ) {
                        if ( ! found ) {
                            conflict = retVal; 
                            cE = test;
                        } else {
                            if ( retVal < conflict ) {
                                conflict = retVal; 
                                cE = test;
                            }
                        }
                        found = true;
                    }
                }
            }
        }
        test = testlist.next();
    }
    topLevelWidget()->setCaption( i18n("KO/Pi") );
    if ( found ) {
        QString mess = i18n("The event\n%1\nconflicts with event\n%2\nat date\n%3.\n").arg(KGlobal::formatMessage ( conflictingEvent->summary(),0 ) ).arg( KGlobal::formatMessage ( cE->summary(),0 )).arg(KGlobal::locale()->formatDate(conflict.date()) ) ;
        qApp->processEvents();
        int km = KMessageBox::warningContinueCancel(this,mess,
                                                    i18n("KO/Pi Conflict detected"),i18n("Show date"),i18n("No problem!"));
        if ( km != KMessageBox::Continue ) {
            return;
        }
        if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 )
            mViewManager->showDayView();
        mNavigator->slotDaySelect( conflict.date() );
        int hour = conflict.time().hour();
        mViewManager->agendaView()->setStartHour( hour  );
        topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( conflictingEvent->summary().left( 20 ) ).arg( cE->summary().left( 20 ) ) );
    } else
        topLevelWidget()->setCaption( i18n("No conflict found") );
    return;
   
 }
 void CalendarView::updateTodoViews()
 {
    mTodoList->updateView();
    mViewManager->currentView()->updateView();
 
 }
 void CalendarView::clearAllViews()
 {
    mTodoList->clearList();
    mViewManager->clearAllViews();
    SearchDialog * sd = mDialogManager->getSearchDialog();
    if ( sd ) {
        KOListView* kol = sd->listview();
        if ( kol )
            kol->clearList();
    }
 }
 void CalendarView::updateView()
 {
    static bool clearallviews = false;
    if ( KOPrefs::instance()->mGlobalUpdateDisabled ) {
        if ( clearallviews ) {
            clearAllViews();
            clearallviews = false;
        }
        return;
    }
    clearallviews = true;
    DateList tmpList = mNavigator->selectedDates();
    if ( KOPrefs::instance()->mHideNonStartedTodos ) 
        mTodoList->updateView();
    // We assume that the navigator only selects consecutive days.
    updateView( tmpList.first(), tmpList.last() );
 }
 void CalendarView::updateUnmanagedViews()
 {
    mDateNavigator->updateDayMatrix();
 }
 int CalendarView::msgItemDelete(const QString name)
 {
    return KMessageBox::warningContinueCancel(this,name +"\n\n"+
                                              i18n("This item will be\npermanently deleted."),
                                              i18n("KO/Pi Confirmation"),i18n("Delete"));
 }
 void CalendarView::edit_cut()
 {
    Event *anEvent=0;
    Incidence *incidence = mViewManager->currentView()->selectedIncidences().first();
    if (mViewManager->currentView()->isEventView()) {
        if ( incidence && incidence->typeID() == eventID ) {
            anEvent = static_cast<Event *>(incidence);
        }
    }
    if (!anEvent) {
        KNotifyClient::beep();
        return;
    }
    DndFactory factory( mCalendar );
    factory.cutIncidence(anEvent);
    changeEventDisplay(anEvent, KOGlobals::EVENTDELETED);
 }
 void CalendarView::edit_copy()
 {
    Event *anEvent=0;
    Incidence *incidence = mViewManager->currentView()->selectedIncidences().first();
    if (mViewManager->currentView()->isEventView()) {
        if ( incidence && incidence->typeID() == eventID ) {
            anEvent = static_cast<Event *>(incidence);
        }
    }
    if (!anEvent) {
        KNotifyClient::beep();
        return;
    }
    DndFactory factory( mCalendar );
    factory.copyIncidence(anEvent);
 }
 void CalendarView::edit_paste()
 {
    QDate date = mNavigator->selectedDates().first();
    DndFactory factory( mCalendar );
    Event *pastedEvent = (Event *)factory.pasteIncidence( date );
    changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED );
 }
 void CalendarView::edit_global_options()
 {
    QString tz = KPimGlobalPrefs::instance()->mTimeZoneId;
    emit save();
    emit saveStopTimer();
    mDialogManager->showGlobalOptionsDialog();
    if ( tz != KPimGlobalPrefs::instance()->mTimeZoneId) {
        emit saveStopTimer();
        if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, i18n("The timezone has changed!\nShould the calendar be reloaded\nto shift the time of the events?\nPlease read Menu: Help->FAQ:\n\"How do I change the timezone?\"\nas well!"),
                                                 i18n("Timezone settings"),i18n("Reload"))) {
            qDebug("KO: TZ reload cancelled ");
            mCalendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
            return;
        }
        qDebug("KO: Timezone change ");
        loadCalendars();
        setModified(true);
    }
    else
        qDebug("KO: No tz change ");
 }
 void CalendarView::edit_options()
 {
    mDialogManager->showOptionsDialog();
 }
 void  CalendarView::slotSelectPickerDate( QDate  d)
 {
    mDateFrame->hide();
    if ( mDatePickerMode == 1 ) {
        mNavigator->slotDaySelect( d );
    } else  if ( mDatePickerMode == 2 ) {
        if ( mMoveIncidence->typeID() == todoID ) {
            Todo * to = (Todo *) mMoveIncidence;
            QTime tim;
            int len  = 0;
            if ( to->hasStartDate() &&  to->hasDueDate() )
                len = to->dtStart().secsTo( to->dtDue());
            if ( to->hasDueDate() ) 
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 057df0d..7076e05 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -269,610 +269,616 @@ void KODayMatrix::setCalendar( Calendar *cal )
 }
 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()
 {
 #if QT_VERSION >= 0x030000
 #else
   delete mKODaymatrixWhatsThis;
 #endif 
    //  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 ( 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 ;
        }
    }
    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->doesRecur();
        if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) ||
            (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) {
            continue;
        }
+        if ( !KOPrefs::instance()->mLongAllday && event->doesFloat()&& event->isMultiDay() ) {
+            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 ( 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)  {
                int i = day;
                QString holiStr = mHolidays[i];
                pDays.setBit(i);
                if ( !holiStr.isEmpty() )
                    holiStr += "\n";
                holiStr += i18n("Journal: ")+todo->summary().left(25);
                if ( todo->summary().length() > 25 )
                    holiStr +="...";
                bDays.setBit(i);
                mHolidays[i] =holiStr ;
                eDays.setBit(i);
                
            }
        }
    }
 #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 ( !KOPrefs::instance()->mLongAllday && event->doesFloat()&& event->isMultiDay() ) {
+          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;
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 571ca11..1b0e5f4 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -43,396 +43,398 @@
 #include <kemailsettings.h>
 #include <kstaticdeleter.h>
 #include <libkdepim/kpimglobalprefs.h>
 #include "koprefs.h"
 #include "mainwindow.h"
 KOPrefs *KOPrefs::mInstance = 0;
 static KStaticDeleter<KOPrefs> insd;
 KOPrefs::KOPrefs() :
  KPimPrefs("korganizerrc")
 {
    mGlobalUpdateDisabled = false;
  mCategoryColors.setAutoDelete(true);
  fillMailDefaults();
  mDefaultCategoryColor           = QColor(175,210,255);//196,196,196);
  QColor defaultHolidayColor      = QColor(255,0,0);
  QColor defaultHighlightColor    = QColor(129,112,255);//64,64,255);
  QColor defaultAgendaBgColor     = QColor(239,241,169);//128,128,128);
  QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160);
  QColor defaultTodoDueTodayColor = QColor(255,220,100);
  QColor defaultTodoOverdueColor  = QColor(255,153,125);
  QColor defaultTodoRunColor  = QColor(99,194,30);
  KPrefs::setCurrentGroup("General");
  addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
  addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true);
  addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true);
  addItemBool("ShowIconSearch",&mShowIconSearch,true);
  addItemBool("ShowIconList",&mShowIconList,true);
  addItemBool("ShowIconDay1",&mShowIconDay1,true);
  addItemBool("ShowIconDay5",&mShowIconDay5,true);
  addItemBool("ShowIconDay6",&mShowIconDay6,true);
  addItemBool("ShowIconDay7",&mShowIconDay7,true);
  addItemBool("ShowIconMonth",&mShowIconMonth,true);
  addItemBool("ShowIconTodoview",&mShowIconTodoview,true);
  addItemBool("ShowIconBackFast",&mShowIconBackFast,true);
  addItemBool("ShowIconBack",&mShowIconBack,true);
  addItemBool("ShowIconToday",&mShowIconToday,true);
  addItemBool("ShowIconForward",&mShowIconForward,true);
  addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true);
  addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,true);
  addItemBool("ShowIconWeekNum",&mShowIconWeekNum,true);
  addItemBool("ShowIconNextDays",&mShowIconNextDays,true);
  addItemBool("ShowIconNext",&mShowIconNext,true);
  addItemBool("ShowIconJournal",&mShowIconJournal,true); 
  addItemBool("ShowIconStretch",&mShowIconStretch,true); 
  addItemBool("ShowIconFilter",&mShowIconFilter,false); 
  addItemBool("ShowIconOnetoolbar",&mShowIconOnetoolbar,true); 
  bool addIcons = false;
 #ifdef DESKTOP_VERSION
  addIcons = true;
 #endif
  addItemBool("ShowIconNavigator",&mShowIconNavigator,addIcons); 
  addItemBool("ShowIconAllday",&mShowIconAllday,addIcons); 
  addItemBool("ShowIconFilterview",&mShowIconFilterview,addIcons); 
  addItemBool("ShowIconToggleFull",&mShowIconToggleFull,addIcons); 
  addItemInt("LastLoadedLanguage",&mOldLanguage,0);
  addItemBool("AskForQuit",&mAskForQuit,false); 
 #ifndef DESKTOP_VERSION
  addItemBool("ShowFullMenu",&mShowFullMenu,false); 
 #else
  addItemBool("ShowFullMenu",&mShowFullMenu,true); 
 #endif
  addItemBool("ToolBarHor",&mToolBarHor, true );
  addItemBool("ToolBarUp",&mToolBarUp, false );
  addItemBool("ToolBarHorV",&mToolBarHorV, true );
  addItemBool("ToolBarUpV",&mToolBarUpV, false );
  addItemBool("ToolBarHorN",&mToolBarHorN, true );
  addItemBool("ToolBarUpN",&mToolBarUpN, false );
  addItemBool("ToolBarHorF",&mToolBarHorF, true );
  addItemBool("ToolBarUpF",&mToolBarUpF, false );
  addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false );
  addItemBool("WhatsNextTime2Lines",&mWhatsNextTime2Lines, false );
  addItemInt("Whats Next Days",&mWhatsNextDays,3);
  addItemInt("Whats Next Prios",&mWhatsNextPrios,1);
  addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true);
  addItemBool("ShowCompletedTodoInAgenda",&mShowCompletedTodoInAgenda,true);
  addItemBool("ShowTimeInAgenda",&mShowTimeInAgenda,true);
  addItemBool("HideNonStartedTodos",&mHideNonStartedTodos,false);
  addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true);
  addItemInt("AllDay Size",&mAllDaySize,28);
  QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav";
  addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm );
  addItemStringList("LocationDefaults",&mLocationDefaults );
  addItemStringList("EventSummary User",&mEventSummaryUser);
  addItemStringList("TodoSummary User",&mTodoSummaryUser);
  addItemStringList("JournalSummary User",&mJournalSummaryUser);
  addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
  addItemBool("Enable Project View",&mEnableProjectView,false);
  addItemBool("Auto Save",&mAutoSave,false);
  addItemInt("Auto Save Interval",&mAutoSaveInterval,3);
  addItemBool("Confirm Deletes",&mConfirm,true);
  addItemString("Archive File",&mArchiveFile);
  addItemString("Html Export File",&mHtmlExportFile,
      QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html"));
  addItemBool("Html With Save",&mHtmlWithSave,false);
  KPrefs::setCurrentGroup("Personal Settings");
  addItemInt("Mail Client",&mMailClient,MailClientKMail);
  addItemBool("Use Control Center Email",&mEmailControlCenter,false);
  addItemBool("Bcc",&mBcc,false);
  KPrefs::setCurrentGroup("Time & Date");
  addItemInt("Default Start Time",&mStartTime,10);
  addItemInt("Default Duration",&mDefaultDuration,2);
  addItemInt("Default Alarm Time",&mAlarmTime,3);
  KPrefs::setCurrentGroup("AlarmSettings");
  addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20);
  addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7);
  addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5);
  addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3);
  KPrefs::setCurrentGroup("Calendar");
  addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar);
  KPrefs::setCurrentGroup("Fonts");
  // qDebug(" KPrefs::setCurrentGroup(Fonts); ");
  QFont fon = KGlobalSettings::generalFont();
  addItemFont("TimeBar Font",&mTimeBarFont,fon );
  addItemFont("MonthView Font",&mMonthViewFont,fon);
  addItemFont("AgendaView Font",&mAgendaViewFont,fon);
  addItemFont("MarcusBains Font",&mMarcusBainsFont,fon);
  addItemFont("TimeLabels Font",&mTimeLabelsFont,fon);
  addItemFont("TodoView Font",&mTodoViewFont,fon);
  addItemFont("ListView Font",&mListViewFont,fon);
  addItemFont("DateNavigator Font",&mDateNavigatorFont,fon);
  addItemFont("EditBox Font",&mEditBoxFont,fon);
  addItemFont("JournalView Font",&mJornalViewFont,fon);
  addItemFont("WhatsNextView Font",&mWhatsNextFont,fon);
  addItemFont("EventView Font",&mEventViewFont,fon);
  KPrefs::setCurrentGroup("RemoteSyncing");
  addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" );  
  addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" ); 
  addItemBool("ShowSyncEvents",&mShowSyncEvents,false); 
  addItemInt("LastSyncTime",&mLastSyncTime,0); 
 #ifdef _WIN32_
  QString hdp= locateLocal("data","korganizer")+"\\\\";
 #else
  QString hdp= locateLocal("data","korganizer")+"/";
 #endif
  KPrefs::setCurrentGroup("LoadSaveFileNames");
  addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" );
  addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" );
  addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" );
  addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" );
 
  KPrefs::setCurrentGroup("Locale");
  addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 
  KPrefs::setCurrentGroup("Colors");
  addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor);
  addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor);
  addItemColor("Event Color",&mEventColor,mDefaultCategoryColor);
  addItemColor("Todo done Color",&mTodoDoneColor,QColor(111,255,115) );
  addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor);
  addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor);
  addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor);
  addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor);
  addItemColor("Todo running Color",&mTodoRunColor,defaultTodoRunColor);
  addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 ));
  addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 ));
  addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 ));
  addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); 
  addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true);
  addItemBool("MonthViewWeek",&mMonthViewWeek,false);
  addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); 
  addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 ));
  addItemColor("AppColor2",&mAppColor2,QColor(  174,216,255 ));
  addItemBool("UseAppColors",&mUseAppColors,false); 
  
  KPrefs::setCurrentGroup("Conflicts");
  addItemBool("EnableAutoDetect",&mDetectConflicts,true);
+  addItemBool("CheckConflictsFree",&mIncludeFree,true);
  addItemBool("CheckConflictsAllDayAllDay",&mCheckConflictsAllDayAllDay,false);
  addItemBool("CheckConflictsAllDayNonAD",&mCheckConflictsAllDayNonAD,false);
  addItemBool("CheckConflictsNonADAllDay",&mCheckConflictsNonADAllDay,false);
  addItemBool("CheckConflictsNonADNonAD",&mCheckConflictsNonADNonAD,true);
  addItemString("FilterConflictEditItem", &mFilterConflictEditItem ,"nofilter" );
  addItemString("FilterConflictAllItem", &mFilterConflictAllItem ,"nofilter" );
  
  KPrefs::setCurrentGroup("Views");
  addItemBool("Block Popup Menu",&mBlockPopupMenu,false);
  addItemBool("Show Date Navigator",&mShowDateNavigator,true);
  addItemInt("Hour Size",&mHourSize,8);
  addItemBool("Show Daily Recurrences",&mDailyRecur,true);
+  addItemBool("ShowLongAllday",&mLongAllday,true);
  addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
  addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true);
  addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true);
  addItemBool("ShowShortMonthName",&mMonthShowShort,false);
  addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true);
  addItemBool("ShowTimesInMonthCell",&mMonthShowTimes,true);
 #ifdef DESKTOP_VERION
  addItemBool("Enable ToolTips",&mEnableToolTips,true);
 #else
  addItemBool("Enable ToolTips",&mEnableToolTips,false);
 #endif
  addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false);
  addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false);
  addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true);
  addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true);
  addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,true);
  addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false);
  addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false);
  addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true);
  addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true);
  addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);;
  addItemBool("WNViewShowsPast",&mWNViewShowsPast,true);
  addItemBool("WNViewShowLocation",&mWNViewShowLocation,false);
  addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false);
  addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true);
  addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false);
  addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false);
  addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,true);
  addItemBool("MonthViewUsesBigFont",&mMonthViewUsesBigFont,true);
  addItemBool("MonthViewWeekRowlayout",&mMonthViewWeekRowlayout,false);
  addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
  addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
 #ifdef DESKTOP_VERSION
  addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true);
 #else
  addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false);
 #endif
  addItemInt("Day Begins",&mDayBegins,7);
  addItemInt("Working Hours Start",&mWorkingHoursStart,8);
  addItemInt("Working Hours End",&mWorkingHoursEnd,17);
  addItemBool("Exclude Holidays",&mExcludeHolidays,true);
  addItemBool("Exclude Saturdays",&mExcludeSaturdays,true);
  addItemBool("Month View Uses Category Color",&mMonthViewUsesCategoryColor,false);
  addItemBool("Full View Month",&mFullViewMonth,true);
  addItemBool("Full View Todo",&mFullViewTodo,true);
  addItemBool("Quick Todo",&mEnableQuickTodo,false);
  addItemInt("Next X Days",&mNextXDays,3);
  KPrefs::setCurrentGroup("Printer");
  KPrefs::setCurrentGroup("Layout");
  addItemBool("CompactDialogs",&mCompactDialogs,false);
  addItemBool("VerticalScreen",&mVerticalScreen,true);
  KPrefs::setCurrentGroup("KOrganizer Plugins");
  addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays");
  KPrefs::setCurrentGroup("Group Scheduling");
  addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail);
  addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend);
  addItemStringList("AdditionalMails",&mAdditionalMails,"");
  addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto);
  addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto);
  addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto);
  addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto);
  addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto);
  KPrefs::setCurrentGroup( "Editors" );
  addItemStringList( "EventTemplates", &mEventTemplates );
  addItemStringList( "TodoTemplates", &mTodoTemplates );
  addItemInt("DestinationPolicy",&mDestination,standardDestination);
  KPrefs::setCurrentGroup( "ViewOptions" );
  addItemBool("EVshowDetails",&mEVshowDetails,true);
  addItemBool("EVshowCreated",&mEVshowCreated,true);
  addItemBool("EVshowChanged",&mEVshowChanged,true);
  addItemBool("WTshowDetails",&mWTshowDetails,false);
  addItemBool("WTshowCreated",&mWTshowCreated,false);
  addItemBool("WTshowChanged",&mWTshowChanged,false);
  mCalendars.setAutoDelete( true ); 
 }
 KOPrefs::~KOPrefs()
 {
  if (mInstance == this)
      mInstance = insd.setObject(0); 
  mCalendars.setAutoDelete( true );
  mCalendars.clear();
  //qDebug("KOPrefs::~KOPrefs() ");
 }
 KOPrefs *KOPrefs::instance()
 {
  if (!mInstance) {
      mInstance = insd.setObject(new KOPrefs());
      mInstance->readConfig();
  }
  return mInstance;
 }
 void KOPrefs::usrSetDefaults()
 {
   
 }
 void KOPrefs::fillMailDefaults()
 {
  if (mName.isEmpty()) mName = i18n("Anonymous");
  if (mEmail.isEmpty()) mEmail = i18n("nobody@nowhere");
 }
 void KOPrefs::setTimeZoneIdDefault()
 {
    ;
 }
 void KOPrefs::setAllDefaults()
 {
    setCategoryDefaults();
    mEventSummaryUser  = getDefaultList() ;
    mTodoSummaryUser  = getDefaultList() ;
    mJournalSummaryUser  = getDefaultList() ;
    mLocationDefaults  = getLocationDefaultList();
 }
 void KOPrefs::setCategoryDefaults()
 {
  mCustomCategories.clear();
  mCustomCategories = getDefaultList();
  QStringList::Iterator it;
  for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
    setCategoryColor(*it,mDefaultCategoryColor);
  }
 }
 QStringList KOPrefs::getLocationDefaultList()
 {
 QStringList retval ;
 retval << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach") 
        << i18n("University") << i18n("Restaurant")  << i18n("Bar") << i18n("Conference room") 
        << i18n("Cinema")  << i18n("Lake") << i18n("Kindergarten")
        << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ;
 // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("")
    retval.sort();
    return retval; 
 }
 QStringList KOPrefs::getDefaultList()
 {
    QStringList retval ;
    retval << i18n("Anniversary") << i18n("Appointment") << i18n("Birthday") << i18n("Business")  << i18n("Customer")
           << i18n("Break")
           << i18n("Family")  << i18n("Favorites") << i18n("Fishing") << i18n("Gifts")  
           << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts")  
                     << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner") << i18n("Personal") 
           << i18n("PHB") << i18n("Phone Calls")   << i18n("Shopping")
            << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV") 
           << i18n("Vacation")  ;
    retval.sort();
    //qDebug("cat %s ", retval.join("-").latin1());
    return retval; 
 }
 // << i18n("Business Travel") << i18n("Education") << i18n("Hiking") << i18n("Hunting")  << i18n("Recurring") << i18n("Personal Travel")  << i18n("Speach")   << i18n("Festival") << i18n("Competition")<< i18n("Party")<< i18n("Projects")<< i18n("Kids") << i18n("Special Occasion")<< i18n("Breakfast")<<  i18n("Dinner") << i18n("Lunch")<< i18n("University")<< i18n("School")<< i18n("Flight")<< i18n("Key Customer") << i18n("VIP") << i18n("SyncEvent")  << i18n("Cinema") 
 void KOPrefs::usrReadConfig()
 {
    config()->setGroup("General");
    
    //qDebug("KOPrefs::usrReadConfig() ");
    mCustomCategories = config()->readListEntry("Custom Categories");
    mOldLoadedLanguage = mOldLanguage ;
    mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage;
    if (mLocationDefaults.isEmpty()) {
        mLocationDefaults  = getLocationDefaultList();
    }
       
    if (mEventSummaryUser.isEmpty()) {
        mEventSummaryUser  = getDefaultList() ;
    }
    if (mTodoSummaryUser.isEmpty()) {
        mTodoSummaryUser  = getDefaultList() ;
    }
  
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 576edf9..bac8010 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -5,370 +5,372 @@
    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 KOPREFS_H
 #define KOPREFS_H
 #include <libkdepim/kpimprefs.h>
 #include <qdict.h>
 #include <qdir.h>
 #include <qobject.h>
 class KConfig;
 class QFont;
 class QColor;
 class QStringList;
 #define VIEW_WN_VIEW 1
 #define VIEW_NX_VIEW 2
 #define VIEW_J_VIEW 3
 #define VIEW_A_VIEW 4
 #define VIEW_ML_VIEW 5
 #define VIEW_M_VIEW 6
 #define VIEW_L_VIEW 7
 #define VIEW_T_VIEW 8
 class KopiCalendarFile : public QObject
 {
 public:
    KopiCalendarFile(  ) : QObject( )
        {
            isStandard = false;
            isEnabled = true;
            isAlarmEnabled = true;
            isReadOnly = false;
            mName = "Calendar";
            mFileName = QDir::homeDirPath() + "/icalfile.ics";
            mSavedFileName = "icalfile.ics";
            mCalNumber = 0;
            mDefaultColor = Qt::red;
            mErrorOnLoad = false;
            isRelative = false;
        }
    bool isStandard;
    bool isEnabled;
    bool isAlarmEnabled;
    bool isReadOnly;
    bool mErrorOnLoad;
    QString mName;
    QString mFileName;
    QString mSavedFileName;
    bool isRelative;
    int mCalNumber;
    QColor mDefaultColor;
    QDateTime mLoadDt;
 };
 class KOPrefs : public KPimPrefs
 {
  public:
    enum { FormatVCalendar, FormatICalendar };
    enum { MailClientKMail, MailClientSendmail };
    enum { IMIPDummy, IMIPKMail };
    enum { IMIPOutbox, IMIPdirectsend };
    enum { neverAuto, addressbookAuto, selectedAuto };
    enum { standardDestination, askDestination };
    virtual ~KOPrefs();
    /** Get instance of KOPrefs. It is made sure that there is only one
    instance. */
    static KOPrefs *instance();
    /** Set preferences to default values */
    void usrSetDefaults();
    /** Read preferences from config file */
    void usrReadConfig();
    /** Write preferences to config file */
    void usrWriteConfig();
    void setCategoryDefaults();
    void setAllDefaults();
    KopiCalendarFile * getNewCalendar();
    KopiCalendarFile * getCalendar( int );
    void  deleteCalendar( int );
    QColor defaultColor( int ) const;
    QString calName( int ) const;
    int getCalendarID( const QString & name );
  protected:
    void setTimeZoneIdDefault();
    /** Fill empty mail fields with default values. */
    void fillMailDefaults();
  private:
    /** Constructor disabled for public. Use instance() to create a KOPrefs
    object. */
    KOPrefs();
    static KOPrefs *mInstance;
    QStringList getDefaultList();
    QStringList getLocationDefaultList();
  public:
    // preferences data
    KConfig* getConfig();
    void setFullName(const QString &);
    QString fullName();
    void setEmail(const QString &);
    QString email();
    QString mAdditional;
    bool    mEmailControlCenter;
    bool    mBcc;
    bool    mAutoSave;
    int     mAutoSaveInterval;
    bool    mConfirm;
    bool    mEnableGroupScheduling;
    bool    mEnableProjectView;
    int     mDefaultFormat;
    int     mMailClient;
    int     mStartTime;
    int     mDefaultDuration;
    int     mAlarmTime;
    int     mWorkingHoursStart;
    int     mWorkingHoursEnd;
    bool    mExcludeHolidays;
    bool    mExcludeSaturdays;
    bool    mMarcusBainsShowSeconds;
    QFont   mTimeBarFont;
    QFont   mMonthViewFont;
    QFont   mAgendaViewFont;
    QFont   mMarcusBainsFont;
    QFont   mTimeLabelsFont;
    QFont   mTodoViewFont;
    QFont   mListViewFont;
    QFont   mDateNavigatorFont;
    QFont   mEditBoxFont;
    QFont   mJornalViewFont;
    QFont   mWhatsNextFont;
    QFont   mEventViewFont;
    QColor  mHolidayColor;
    QColor  mHighlightColor;
    QColor  mEventColor;
    QColor  mTodoDoneColor;
    QColor  mAgendaBgColor;
    QColor  mWorkingHoursColor;
    QColor  mTodoDueTodayColor;
    QColor  mTodoOverdueColor;
    QColor  mTodoRunColor;
    QColor  mMonthViewEvenColor;
    QColor  mMonthViewOddColor;
    QColor  mMonthViewHolidayColor;
    bool mMonthViewUsesDayColors;
    bool mMonthViewSatSunTog;
    bool mMonthViewWeek;
    bool mMonthViewWeekRowlayout;
    QColor  mAppColor1;
    QColor  mAppColor2;
    bool mUseAppColors;
    int     mDayBegins;
    int     mHourSize;
    int     mAllDaySize;
    bool    mShowFullMenu;
    bool    mDailyRecur;
    bool    mWeeklyRecur;
+    bool    mLongAllday;
    bool    mMonthDailyRecur;
    bool    mMonthWeeklyRecur;
    bool    mMonthShowIcons;
    bool    mMonthShowTimes;
    bool    mMonthShowShort;
    bool    mEnableToolTips;
    bool    mEnableMonthScroll;
    bool    mFullViewMonth;
    bool    mMonthViewUsesCategoryColor;
    bool    mFullViewTodo;
    bool    mShowCompletedTodo;
    bool    mMarcusBainsEnabled;
    int     mNextXDays;
    int     mWhatsNextDays;
    bool    mWhatsNextTime2Lines;
    int     mWhatsNextPrios;
    bool    mEnableQuickTodo;
    bool    mCompactDialogs;
    bool    mVerticalScreen;
    bool mShowIconNewTodo;
    bool mShowIconNewEvent;
    bool mShowIconSearch;
    bool mShowIconList;
    bool mShowIconDay1;
    bool mShowIconDay5;
    bool mShowIconDay6;
    bool mShowIconDay7;
    bool mShowIconMonth;
    bool mShowIconTodoview;
    bool mShowIconBackFast;
    bool mShowIconBack;
    bool mShowIconToday;
    bool mShowIconForward;
    bool mShowIconForwardFast;
    bool mShowIconWhatsThis;
    bool mShowIconWeekNum;
    bool mShowIconNextDays;
    bool mShowIconNext;
    bool mShowIconJournal;
    bool mShowIconFilter;
    bool mShowIconOnetoolbar;
    bool mShowIconNavigator;
    bool mShowIconAllday;
    bool mShowIconFilterview;
    bool mShowIconToggleFull;
    
    bool mShowIconStretch;
    bool mToolBarHor;
    bool mToolBarUp;
    bool mToolBarHorV;
    bool mToolBarUpV;
    bool mToolBarHorN;
    bool mToolBarUpN;
    bool mToolBarHorF;
    bool mToolBarUpF;
    bool mToolBarMiniIcons;
    bool mAskForQuit;
    bool mUsePassWd;
    bool mShowSyncEvents;
    bool mShowTodoInAgenda;
    bool mShowCompletedTodoInAgenda;
    bool mShowTimeInAgenda;
    bool mHideNonStartedTodos;
    bool mBlockPopupMenu;
    int mLastSyncTime;
    void setCategoryColor(QString cat,const QColor & color);
    QColor *categoryColor(QString cat);
    QString mArchiveFile;
    QString mHtmlExportFile;
    bool    mHtmlWithSave;
    QStringList mSelectedPlugins;
  
    QString mLastImportFile;
    QString mLastVcalFile;
    QString mLastSaveFile;
    QString mLastLoadFile;
    QString mDefaultAlarmFile;
    int mIMIPScheduler;
    int mIMIPSend;
    QStringList mAdditionalMails;
    int mIMIPAutoRefresh;
    int mIMIPAutoInsertReply;
    int mIMIPAutoInsertRequest;
    int mIMIPAutoFreeBusy;
    int mIMIPAutoFreeBusyReply;
    QStringList mTodoTemplates;
    QStringList mEventTemplates;
    int mDestination;
    bool mEditOnDoubleClick;
    bool mViewChangeHoldFullscreen;
    bool mViewChangeHoldNonFullscreen;
    bool mCenterOnCurrentTime;
    bool mSetTimeToDayStartAt;
    bool mHighlightCurrentDay;
    bool mUseHighlightLightColor;
    bool mListViewMonthTimespan;
    bool mWNViewShowsParents;
    bool mWNViewShowsPast;
    bool mWNViewShowLocation;
    bool mTodoViewShowsPercentage;
    bool mTodoViewUsesCatColors;
    bool mMonthViewUsesBigFont;
    bool mTodoViewUsesSmallFont;
    bool mTodoViewUsesForegroundColor;
    bool mMonthViewUsesForegroundColor;
    bool mHightlightDateTimeEdit;
    bool mShortDateInViewer;
    bool mShowDateNavigator;
    QStringList mLocationDefaults;
    QStringList mEventSummaryUser;
    QStringList mTodoSummaryUser;
    QStringList mJournalSummaryUser;
    bool mUseInternalAlarmNotification;
    int mAlarmPlayBeeps;
    int mAlarmSuspendTime;
    int mAlarmSuspendCount;
    int mAlarmBeepInterval;
    int mOldLanguage;
    int mOldLoadedLanguage;
  
    QString mActiveSyncPort;
    QString mActiveSyncIP;
    // settings for eventviewer
    bool mEVshowDetails;
    bool mEVshowCreated;
    bool mEVshowChanged;
    bool mWTshowDetails;
    bool mWTshowCreated;
    bool mWTshowChanged;
    int mCurrentDisplayedView;
    QPtrList<KopiCalendarFile> mCalendars;
    int mNextAvailableCalendar;
    bool mGlobalUpdateDisabled;
    bool mDetectConflicts;
+    bool mIncludeFree;
    bool mCheckConflictsAllDayAllDay;
    bool mCheckConflictsAllDayNonAD;
    bool mCheckConflictsNonADAllDay;
    bool mCheckConflictsNonADNonAD;
    QString mFilterConflictEditItem;
    QString mFilterConflictAllItem;
  private:
    QDict<QColor> mCategoryColors;
    QArray<KopiCalendarFile*> mDefCalColors;
    QColor mDefaultCategoryColor;
    QFont mDefaultTimeBarFont;
    QFont mDefaultViewFont;
    QFont mDefaultMonthViewFont;
    QString mName;
    QString mEmail;
 };
 #endif
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index bbdf508..f1a6c3d 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -389,746 +389,755 @@ void KOPrefsDialog::setupMainTab()
  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);
  int iii = 4;
  if (  QApplication::desktop()->height() <= 240 ) {
      topFrame = addPage(i18n("Time") +" 2",0,0);
      topLayout = new QGridLayout(topFrame,1,2);
      topLayout->setSpacing(2);
      topLayout->setMargin(3);
      iii = 0;
  }
  QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal,
                                               i18n("Working Hours"),
                                               topFrame);
  topLayout->addMultiCellWidget(workingHoursGroup,iii,iii,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);
+  weeklyRecur =
+    addWidBool(i18n("Show multiday allday ev. in date nav."),
+               &(KOPrefs::instance()->mLongAllday),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);
 dummy =
    addWidBool(i18n("Allday Agenda view shows todos"),
               &(KOPrefs::instance()->mShowTodoInAgenda),topFrame);
  topLayout->addWidget(dummy->checkBox(),ii++,0);
 dummy =
    addWidBool(i18n("Agenda view shows completed todos"),
               &(KOPrefs::instance()->mShowCompletedTodoInAgenda),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("Week view mode uses row layout"),
               &(KOPrefs::instance()->mMonthViewWeekRowlayout),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("Category colors are applied to text"),
               &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame);
  topLayout->addWidget(dummy->checkBox(),ii++,0);
  if (  QApplication::desktop()->height() <= 240 ) {
      topFrame = addPage(i18n("Month View") +" 2",0,0);
      topLayout = new QGridLayout(topFrame,4,1);
      topLayout->setSpacing(2);
      topLayout->setMargin(1);
      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 times on two lines"),
                 &(KOPrefs::instance()->mWhatsNextTime2Lines),topFrame);
  topLayout->addWidget(passwdk->checkBox(), ii++,0);
  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("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);
   topFrame = addPage(i18n("View Options"),0,0);
  topLayout = new QGridLayout(topFrame,4,1);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
  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("Conflict detection"),0,0);
  topLayout = new QGridLayout(topFrame,2,1);
  topLayout->setSpacing(mSpacingHint);
  topLayout->setMargin(mMarginHint);
  ii = 0;  
   dummy  = addWidBool(i18n("Enable conflict detection"),
                       &(KOPrefs::instance()->mDetectConflicts),topFrame);
  topLayout->addWidget(dummy->checkBox(), ii++,0);
  topFrame = new QFrame( topFrame );
  topLayout->addWidget(topFrame ,ii++,0);
-  topLayout = new QGridLayout(topFrame,4,1);
+  topLayout = new QGridLayout(topFrame,4,1); 
  connect ( dummy->checkBox(), SIGNAL( toggled( bool ) ), topFrame, SLOT ( setEnabled( bool ) ) );
-  topLayout->addWidget( new QLabel ( i18n("Conflict detection checks an <b>edited event</b> with other <b>existing events</b> for overlapping. You can define which events are checked:"), topFrame ) , ii++,0); 
+  dummy = addWidBool(i18n("Include events which \"show as free\""),
+                           &(KOPrefs::instance()->mIncludeFree),topFrame);
+  topLayout->addWidget(dummy->checkBox(), ii++,0);
+  topLayout->addWidget( new QLabel ( i18n("Conflict detection checks an <b>edited event</b> with <b>other events</b> for overlapping."), topFrame ) , ii++,0); 
+ 
  topLayout->addWidget( new QLabel ( i18n("Filter for the edited event"), topFrame ) , ii++,0);
  mFilterEditItem = new QComboBox(  topFrame );
  topLayout->addWidget(mFilterEditItem,ii++,0);
-  topLayout->addWidget( new QLabel ( i18n("Filter for other existing events"), topFrame ) , ii++,0);
+  topLayout->addWidget( new QLabel ( i18n("Filter for other events"), topFrame ) , ii++,0);
  mFilterAllItem = new QComboBox( topFrame );
  topLayout->addWidget(mFilterAllItem,ii++,0);
  dummy = addWidBool(i18n("Check Allday with Allday"),
                           &(KOPrefs::instance()->mCheckConflictsAllDayAllDay),topFrame);
  topLayout->addWidget(dummy->checkBox(), ii++,0);
  dummy = addWidBool(i18n("Check Allday with NonAllday"),
                           &(KOPrefs::instance()->mCheckConflictsAllDayNonAD),topFrame);
  topLayout->addWidget(dummy->checkBox(), ii++,0);
  dummy = addWidBool(i18n("Check NonAllday with Allday"),
                           &(KOPrefs::instance()->mCheckConflictsNonADAllDay),topFrame);
  topLayout->addWidget(dummy->checkBox(), ii++,0);
  dummy = addWidBool(i18n("Check NonAllday with NonAllday"),
                           &(KOPrefs::instance()->mCheckConflictsNonADNonAD),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);
  if (  QApplication::desktop()->height() > 240 ) {
      
      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);
author	zautrix <zautrix>	2005-08-24 18:38:31 (UTC)
committer	zautrix <zautrix>	2005-08-24 18:38:31 (UTC)
commit	2cde25d8061acd536bccd698722952ce8555f5db (patch) (unidiff)
tree	70f905e5de57b44c3503883b2f98925d9c92ef8b
parent	645ceb7a95dce4716eb87a1b9191d3f3c1657be3 (diff)
download	kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.zip kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.tar.gz kdepimpi-2cde25d8061acd536bccd698722952ce8555f5db.tar.bz2