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
@@ -1544,19 +1544,29 @@
 { "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
@@ -3041,12 +3041,14 @@ void CalendarView::changeEventDisplay(Event *which, int action)
                 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();
@@ -3092,12 +3094,17 @@ void CalendarView::checkConflictForEvent()
         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;
                 }
             } 
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index 057df0d..7076e05 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -455,12 +455,15 @@ void KODayMatrix::updateViewTimed()
     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;
@@ -681,12 +684,15 @@ void KODayMatrix::updateEvents()
       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);
   }
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 571ca11..1b0e5f4 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -229,24 +229,26 @@ KOPrefs::KOPrefs() :
   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);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 576edf9..bac8010 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -191,12 +191,13 @@ class KOPrefs : public KPimPrefs
     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;
@@ -348,12 +349,13 @@ class KOPrefs : public KPimPrefs
     QPtrList<KopiCalendarFile> mCalendars;
     int mNextAvailableCalendar;
     bool mGlobalUpdateDisabled;
 
 
     bool mDetectConflicts;
+    bool mIncludeFree;
     bool mCheckConflictsAllDayAllDay;
     bool mCheckConflictsAllDayNonAD;
     bool mCheckConflictsNonADAllDay;
     bool mCheckConflictsNonADNonAD;
     QString mFilterConflictEditItem;
     QString mFilterConflictAllItem;
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index bbdf508..f1a6c3d 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -575,12 +575,17 @@ void KOPrefsDialog::setupViewsTab()
 
   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
@@ -930,19 +935,23 @@ dummy =
   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"),