5 files changed, 17 insertions, 61 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 814c541..aa4a89a 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,21 +1,21 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.1.14 ************
 
 Added some buttons to the KO/Pi Quick-todo line to make it possible to quickly access some todo view layout settings like display all flat/open/close and hide/show running/done.
 Added a button to add a subtodo quickly.
 
-Added a possibility to search for conflicting events. (In the Action menu. Keyboard shortcut "q" ).
-
+Added a possibility to search for conflicting events. (In the Action menu. Keyboard shortcut "q", shift+q or ctrl +q ).
+Added an option to change the layout of the list week to column mode.
 
 ********** VERSION 2.1.13 ************
 
 Fixed a problem in KA/Pi search.
 Fixed some minor problems in KO/Pi.
 Added calendar selection possibility to the todo view popup and to the event/todo/journal editor.
 
 Fixed memory usage problems in KA/Pi:
 When loading data KA/Pi did load the file data twice.
 Example:
   A 600k file did consume 1200k memory during loading process.
   This is fixed, it does now consume only  600k during loading process.
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 426e8f9..2582931 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -95,24 +95,25 @@
 #ifndef KORG_NOPLUGINS
 #include "kocore.h"
 #endif
 #include "koeventeditor.h"
 #include "kotodoeditor.h"
 #include "koprefs.h"
 #include "koeventviewerdialog.h"
 #include "publishdialog.h"
 #include "kofilterview.h"
 #include "koglobals.h"
 #include "koviewmanager.h"
 #include "koagendaview.h"
+#include "koagenda.h"
 #include "kodialogmanager.h"
 #include "outgoingdialog.h"
 #include "incomingdialog.h"
 #include "datenavigatorcontainer.h"
 #include "statusdialog.h"
 #include "kdatenavigator.h"
 #include "kotodoview.h"
 #include "datenavigator.h"
 #include "resourceview.h"
 #include "navigatorbar.h"
 #include "searchdialog.h"
 #include "mainwindow.h"
@@ -654,25 +655,29 @@ CalendarView::~CalendarView()
     delete mEventViewerDialog;
     //kdDebug() << "~CalendarView() done" << endl;
 }
 void CalendarView::nextConflict( bool all, bool allday )
 {
     
     QPtrList<Event> testlist = mCalendar->events();
     Event * test = testlist.first();
     while ( test ) {
         test->setTagged( false );
         test = testlist.next();
     }
-    QDateTime startDT = QDateTime (mNavigator->selectedDates().first().addDays(1), QTime ( 0,0,0));
+    QTime st ( 0,0,0);
+    if ( mViewManager->currentView() == mViewManager->agendaView()  )
+        st = mViewManager->agendaView()->agenda()->getEndTime();
+    //qDebug("time %s ", st.toString().latin1());
+    QDateTime startDT = QDateTime (mNavigator->selectedDates().first(),st);
     QDateTime conflict;
     QDateTime retVal;
     bool found = false;
     Event * cE = 0;
     Event * cE2 = 0;
     QPtrList<Event> testlist2 = testlist;
     test = testlist.first();
     bool skip = false;
     while ( test ) {
         skip = false;
         if ( !all ) skip = ( allday != test->doesFloat() );
         if ( !skip ) {
@@ -711,81 +716,24 @@ void CalendarView::nextConflict( bool all, bool allday )
         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( cE->summary().left( 20 ) ).arg( cE2->summary().left( 20 ) ) );
         return;
     }
 
     topLevelWidget()->setCaption( i18n("No conflict found") );
     qDebug("No conflict found ");
     return;
-
-
-
-
-
-#if 0
-
-
-    QDate end = start.addDays( 365*2);
-    while ( start < end ) {
-        QPtrList<Event> eventList = calendar()->events( start );
-        Event * ev = eventList.first(); 
-        QPtrList<Event> test =  eventList;
-        while ( ev ) {
-            //qDebug("found %d on %s ", eventList.count(), start.toString().latin1());
-            Event * t_ev =  test.first();
-            QDateTime es =  ev->dtStart();
-            QDateTime ee =  ev->dtEnd();
-            if ( ev->doesFloat() )
-                ee = ee.addDays( 1 );
-            if ( ! all ) {
-                if ( ev->doesFloat() != allday ) 
-                    t_ev = 0;
-            }
-            while ( t_ev ) {
-                bool skip = false;
-                if ( ! all ) {
-                    if ( t_ev->doesFloat() != allday ) 
-                        skip = true;
-                }
-                if ( !skip && ev != t_ev ) {
-                    QDateTime ets =  t_ev->dtStart();
-                    QDateTime ete =  t_ev->dtEnd();
-                    if ( t_ev->doesFloat() )
-                        ete = ete.addDays( 1 );
-                    //qDebug("test %s -- %s -------- %s -- %s ", es.toString().latin1() , ee.toString().latin1(),  ets.toString().latin1() , ete.toString().latin1()  );
-                    if ( es < ete && ets < ee ) {
-                        if ( mViewManager->currentView() != mViewManager->agendaView() || mNavigator->selectedDates().count() > 1 )
-                            mViewManager->showDayView();
-                        mNavigator->slotDaySelect( start );
-                        int hour = es.time().hour();
-                        if ( ets > es )
-                            hour = ets.time().hour();
-                        mViewManager->agendaView()->setStartHour( hour  );
-                        topLevelWidget()->setCaption( i18n("Conflict %1 <-> %2"). arg( ev->summary().left( 20 ) ).arg( t_ev->summary().left( 20 ) ) );
-                        return;
-                    }
-                }
-                t_ev =  test.next(); 
-            }
-            ev = eventList.next();
-        } 
-        start = start.addDays( 1 );
-    }
-    topLevelWidget()->setCaption( i18n("No conflict found within the next two years") );
-    qDebug("No conflict found ");
-#endif
 }
 
 void CalendarView::conflictAll()
 {
     nextConflict ( true, true );
 }
 void CalendarView::conflictAllday()
 {
     nextConflict ( false, true );
 }
 void CalendarView::conflictNotAll()
 {
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index b290020..779f12e 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1624,24 +1624,28 @@ QTime KOAgenda::gyToTime(int gy)
   } else {
     time.setHMS( 23, 59, 59 );
   }
 
   return time;
 }
 
 void KOAgenda::setStartHour(int startHour)
 {
   int startCell = startHour * mRows / 24;
   setContentsPos(0,startCell * gridSpacingY());
 }
+QTime KOAgenda::getEndTime()
+{
+    return QTime ( (contentsY ()+viewport()->height())*24/contentsHeight ()+1,0,0);
+}
 void KOAgenda::hideUnused()
 {
     // experimental only
     // return;
     KOAgendaItem *item;
     for ( item=mUnusedItems.first(); item != 0; item=mUnusedItems.next() ) {
         item->hide();
     }
 }
 
 
 KOAgendaItem *KOAgenda::getNewItem(Incidence * event,QDate qd, QWidget* view)
diff --git a/korganizer/koagenda.h b/korganizer/koagenda.h
index 0e3aed8..86cf2f4 100644
--- a/korganizer/koagenda.h
+++ b/korganizer/koagenda.h
@@ -118,24 +118,25 @@ class KOAgenda : public QScrollView
     void checkScrollBoundaries();
 
     void setHolidayMask(QMemArray<bool> *);
     void setDateList(const DateList &selectedDates);
     DateList dateList() const;
     void drawContentsToPainter( QPainter* paint = 0, bool backgroundOnly = false);
     void finishUpdate();
     void printSelection();
     void storePosition();
     void restorePosition();
     void setPopup( KOEventPopupMenu * p ) { mAllAgendaPopup = p; }
     void shrinkPixmap();
+    QTime getEndTime();
 
   public slots:
     void slotContentMove(int,int);
     void categoryChanged(Incidence * inc);
     void slotClearSelection();
     void popupMenu();
     void newItem( int );
     void moveChild( QWidget *, int, int );
     void scrollUp();
     void scrollDown();
     void updateTodo( Todo * t, int , bool );
     void popupAlarm();
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 53bbe28..b5a59af 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -1831,27 +1831,30 @@ void KOMonthView::slotComputeLayout()
 
 void KOMonthView::doComputeLayoutWeek()
 {
 
     int daysToShow;
     bool combinedSatSun  = false;
     if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
         daysToShow = 6;
         combinedSatSun  = true;
     }
     int wid = width();//e
     int hei = height()-1-mNavigatorBar->height();
+#ifdef DESKTOP_VERSION
     if ( !KOPrefs::instance()->mMonthViewWeekRowlayout ) {
         daysToShow = 2;
-    } else {
+    } else 
+#endif
+        {
         if ( wid < hei )
             daysToShow = 2;
         else
             daysToShow = 3;
     }
     bool landscape = (daysToShow == 3);
     mShowSatSunComp = true;
     combinedSatSun  = true;
         
     //qDebug("KOMonthView::computeLayout() WWW ------------------------------------ ");
     QFontMetrics fm ( mWeekLabels[0]->font() );
     int weeklabelwid = fm.width( "888" );