fixesss

8 files changed, 175 insertions, 34 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 9a114d0..e766b8f 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2709,30 +2709,100 @@ void CalendarView::changeEventDisplay(Event *which, int action)
 
 
 
     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 ) {
+            mConflictingEvent = which ;
+            QTimer::singleShot( 1000, this, SLOT ( checkConflictForEvent() ) );
+        }
         //    }
     } else {
         mViewManager->currentView()->updateView();
     }
 }
+void CalendarView::checkConflictForEvent()
+{
 
+    if (!KOPrefs::instance()->mConfirm)
+        return;
+    if ( ! mConflictingEvent ) return;
+    if ( mConflictingEvent->doesFloat() )  {
+        mConflictingEvent = 0;
+        return;
+    }
+    bool all = false;
+    bool allday = false;
+    Event * ev = mConflictingEvent; 
+    mConflictingEvent = 0;
+    QDate start = ev->dtStart().date();
+    QDate end = ev->dtEnd().date().addDays(1);
+    while ( start < end ) {
+        QPtrList<Event> test = calendar()->events( start );
+        //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 ) {
+                    QString mess = i18n("The event\n%1\nconflicts with event\n%2\nat date\n%3.\n").arg(KGlobal::formatMessage ( ev->summary(),0 ) ).arg( KGlobal::formatMessage ( t_ev->summary(),0 )).arg(KGlobal::locale()->formatDate(start) ) ;
+                    qApp->processEvents();
+                    int km = KMessageBox::warningContinueCancel(this,mess,
+                                                                i18n("KO/Pi Conflict delected"),i18n("Show date"),i18n("No problem!"));
+                    if ( km != KMessageBox::Continue )
+                        return;
+
+                    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(); 
+        }
+        start = start.addDays( 1 );
+    }
+    qDebug("No conflict found ");
+    
+
+}
 
 void CalendarView::updateTodoViews()
 {
     mTodoList->updateView();
     mViewManager->currentView()->updateView();
  
 }
 
 
 
 void CalendarView::clearAllViews()
 {
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 51eb1d4..706d05d 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -499,24 +499,25 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     void showDay( QDate );
     void undo_delete();
   protected slots:
     void resetFocus();
     void scrollBarValue(int);
     void slotViewerClosed();
     void timerAlarm();
     void suspendAlarm();
     void beamDone( Ir *ir );
     /** Select a view or adapt the current view to display the specified dates. */
     void showDates( const KCal::DateList & );
     void selectWeekNum ( int );
+    void checkConflictForEvent();
   
   public:
     // show a standard warning
     // returns KMsgBox::yesNoCancel()
     int msgCalModified(); 
     virtual bool sync(KSyncManager* manager, QString filename, int mode);
 
     virtual bool syncExternal(KSyncManager* manager, QString resource);
     virtual void removeSyncInfo( QString syncProfile);
     void setSyncManager(KSyncManager* manager);
     void setLoadedFileVersion(QDateTime);
     bool checkFileVersion(QString fn);
@@ -525,24 +526,25 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     Event* getLastSyncEvent();
     /** Adapt navigation units correpsonding to step size of navigation of the
      * current view.
      */
     void adaptNavigationUnits();
     bool synchronizeCalendar( Calendar* local,  Calendar* remote, int mode );
     int  takeEvent( Incidence* local,  Incidence* remote, int mode, bool full = false );
     //Attendee* getYourAttendee(Event *event);
     void setBlockShowDates( bool b ) { mBlockShowDates = b ;}
     void setScrollBarStep(int val );
 
   protected:
+    Event *mConflictingEvent;
     void schedule(Scheduler::Method, Incidence *incidence = 0);
     
     // returns KMsgBox::OKCandel()
     int msgItemDelete(const QString name);
     void showEventEditor();
     void showTodoEditor();
     Todo *selectedTodo();
   private:
 #ifdef DESKTOP_VERSION
     QScrollBar * mDateScrollBar;
 #endif
     QDateTime mNextAlarmDateTime;
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 7783dd4..d25f671 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -508,49 +508,44 @@ void  KOListView::setAlarm()
 {
     KOAlarmPrefs kap( this);
     if ( !kap.exec() )
         return;
     QPtrList<Incidence> delSel = getSelectedIncidences( true, true, false, true ); // no journals, only due todos
     Incidence* inc = delSel.first();
     int count = 0;
     while ( inc ) {
         ++count;
         if (kap.mAlarmButton->isChecked()) {
             if (inc->alarms().count() == 0) 
                 inc->newAlarm();
-            QPtrList<Alarm> alarms = inc->alarms();
-            Alarm *alarm;
-            for (alarm = alarms.first(); alarm; alarm = alarms.next() ) {
+            Alarm *alarm = inc->alarms().first();
                 alarm->setEnabled(true);
                 int j = kap.mAlarmTimeEdit->value()* -60;
                 if (kap.mAlarmIncrCombo->currentItem() == 1)
                     j = j * 60;
                 else if (kap.mAlarmIncrCombo->currentItem() == 2)
                     j = j * (60 * 24);
                 alarm->setStartOffset( j );
 
                 if (!kap.mAlarmProgram.isEmpty() && kap.mAlarmProgramButton->isOn()) {
                     alarm->setProcedureAlarm(kap.mAlarmProgram);
                 }
                 else if (!kap.mAlarmSound.isEmpty() && kap.mAlarmSoundButton->isOn())
                     alarm->setAudioAlarm(kap.mAlarmSound);
                 else
                     alarm->setType(Alarm::Invalid);
-                //alarm->setAudioAlarm("default");
-                // TODO: Deal with multiple alarms
-                break; // For now, stop after the first alarm
-            }
         } else {
-            Alarm* alarm = inc->alarms().first();
-            if ( alarm ) {
+            QPtrList<Alarm> alarms = inc->alarms();
+            Alarm *alarm;
+            for (alarm = alarms.first(); alarm; alarm = alarms.next() ) {
                 alarm->setEnabled(false);
                 alarm->setType(Alarm::Invalid);
             }
         }
         KOListViewItem* item = getItemForEvent(inc);
         if (item) { 
             ListItemVisitor v(item, mStartDate );
             inc->accept(v);
         }
         inc = delSel.next();   
     }
     topLevelWidget()->setCaption( i18n("Changed alarm for %1 items").arg( count )  );
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 2289977..53bbe28 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -1515,25 +1515,26 @@ void KOMonthView::updateConfig()
     QFontMetrics fontmetric(mDayLabels[0]->font());
     mWidthLongDayLabel = 0;
 
     for (int i = 0; i < 7; i++) {
         int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1));
         if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width;
     }
     bool temp = mShowSatSunComp ;
     mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
     if ( !  mShowWeekView ) {
         if ( temp != KOPrefs::instance()->mMonthViewSatSunTog )
             computeLayout();
-    }
+    } else 
+        doComputeLayoutWeek();
     updateDayLabels();
     //qDebug("KOMonthView::updateConfig() %d %d %d ",height(), mDayLabels[0]->sizeHint().height() ,mNumWeeks);
     //int cellHeight = (height() - mDayLabels[0]->sizeHint().height()) /mNumWeeks;
     //resizeEvent( 0 );
     for (uint i = 0; i < mCells.count(); ++i) {
         mCells[i]->updateConfig();
     }
 
     for (uint i = 0; i < mCellsW.count(); ++i) {
         mCellsW[i]->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont);
     }
 #ifdef DESKTOP_VERSION
@@ -1806,66 +1807,57 @@ void KOMonthView::setKeyBFocus()
     //qDebug("KOMonthView::setKeyBFocus() ");
     mKBFcounter = 10;
     QTimer::singleShot( 0, this, SLOT ( setKeyBoardFocus() ) );
 }
 void KOMonthView::resizeEvent(QResizeEvent * e)
 {
     //qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
     if ( isVisible() ) {
         //qDebug("KOMonthView::isVisible ");
         slotComputeLayout();
     } else
         mComputeLayoutTimer->start( 100 );
+    if ( e )
     KOEventView::resizeEvent( e );
 }
 
 void KOMonthView::slotComputeLayout()
 {
     mComputeLayoutTimer->stop();
     //qDebug("KOMonthView::Post - resizeEvent %d %d ", width(), height() );
     computeLayout();
     clPending = true;
     setKeyBFocus();
 }
-void KOMonthView::computeLayoutWeek()
+
+void KOMonthView::doComputeLayoutWeek()
 {
-    static int lastWid = 0;
-    static int lastHei = 0;
+
     int daysToShow;
     bool combinedSatSun  = false;
     if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
         daysToShow = 6;
         combinedSatSun  = true;
     }
-    int tWid = topLevelWidget()->size().width();
-    int tHei = topLevelWidget()->size().height();
-
     int wid = width();//e
     int hei = height()-1-mNavigatorBar->height();
-
-    if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) 
-        return;
-     
-    if ( lastWid == width() && lastHei == height() ) {
-        //qDebug("KOListWeekView::No compute layout needed ");
-        return;
-    }
-    lastWid = width();
-    lastHei = height();
-
-
+    if ( !KOPrefs::instance()->mMonthViewWeekRowlayout ) {
+        daysToShow = 2;
+    } else {
     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" );
     wid -= weeklabelwid;
 
     int colWid = wid / daysToShow;
     int dayLabelHei = mDayLabelsW[0]->sizeHint().height();
     int cellHei = (hei - (5- daysToShow )*dayLabelHei) /(5- daysToShow ); 
     int colModulo = wid % daysToShow;
@@ -1877,101 +1869,175 @@ void KOMonthView::computeLayoutWeek()
     y= 0;
     w = colWid;
     h = dayLabelHei ;
     for ( i = 0; i < 7; i++) {
         if ( i && !( i % daysToShow) && i < 6) {
             y += hei/(5-daysToShow);
             x = 0;
             w =  colWid;
         }
         if ( ((i) % daysToShow) >= daysToShow-colModulo ) {
             ++w;
         }
+        int xC,yC,wC,hC;
         if ( i >=  5 ) { 
             int wi = width() -  x - weeklabelwid;
             if ( i == 5 ) { 
-                mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,wi/2+wi%2,h);
+                xC = x+weeklabelwid;
+                yC = y;
+                wC = wi/2+wi%2;
+                hC = h;
             } else {
-                mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,wi,h);
+                xC = x+weeklabelwid;
+                yC = y;
+                wC = wi;
+                hC = h;
             }
             x = x - w +  wi - (wi/2 );
         }
         else {
             int wi = w;  
             if ( !(( i+1) % daysToShow)) {
                 wi = width() -  x - weeklabelwid;
             }
-            mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,wi,h);
+            xC = x+weeklabelwid;
+            yC = y;
+            wC = wi;
+            hC = h;
         }
+        mDayLabelsW[mapWeekLayout(i,landscape)]->setGeometry( xC,yC,wC,hC);
+
+
         x += w;                                   
     }
     x= 0;
     y= dayLabelHei;
     w = colWid;
     h = cellHei;
     int max = 0;
     int w_count = mCellsW.count();
     for ( i = 0; i < w_count; ++i) {
         if ( i > 6 ) {
             mCellsW[i]->hide();
             continue;
         }
         
         w = colWid;
         if ( ((i) % daysToShow) >= daysToShow-colModulo ) {
             ++w;
         }
         if ( i  == (daysToShow-1-rowModulo)*7)
             ++h; 
       
+        int xC,yC,wC,hC;
         if ( i >= 5 ) {
             if ( i ==5 ) {
                 max = h/2;
-                mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,max ); 
+                xC = x+weeklabelwid;
+                yC = y;
+                wC = w;
+                hC = max;
                 x -= w ;y += h/2;
             } else {
                 if ( ((i-1) % daysToShow) >= daysToShow-colModulo ) {
                     ++w;
                 }
                 max = h-h/2;
-                mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,max ); 
+                xC = x+weeklabelwid;
+                yC = y;
+                wC = w;
+                hC = max;
                 y -= h/2;
             }
         } else {
             max = h;
-            mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h ); 
+            xC = x+weeklabelwid;
+            yC = y;
+            wC = w;
+            hC = h;
         }
+        mCellsW[mapWeekLayout(i,landscape)]->setGeometry ( xC,yC,wC,hC ); 
                 
        
         x += w;
         if ( x + w/2 > wid ) {
             x = 0;
             y += h+dayLabelHei ;
         }
         //mCellsW[i]->dateLabel()->setMaximumHeight( max - mCellsW[i]->lineWidth()*2 );
     }
     y= dayLabelHei;
     h = cellHei ;
     mWeekLabelsW[0]->setGeometry( 0,y,weeklabelwid,hei-dayLabelHei);
     mWeekLabelsW[1]->setGeometry( 0,0,weeklabelwid,dayLabelHei);
     // qDebug("RRRRRRRRRRRRR %d %d  old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height());
     //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height());
     mShortDayLabelsW = mDayLabelsW[0]->width()-2 < mWidthLongDayLabel ;
     updateDayLabels();
     //bool forceUpdate = !updatePossible;
     updatePossible = true;
     //mWeekLabels[mNumWeeks]->setText( i18n("M"));
     //if ( forceUpdate )
     //  updateView();
 }
+void KOMonthView::computeLayoutWeek()
+{
+    static int lastWid = 0;
+    static int lastHei = 0;
+    int tWid = topLevelWidget()->size().width();
+    int tHei = topLevelWidget()->size().height();
+    int wid = width();//e
+    int hei = height()-1-mNavigatorBar->height();
+    if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) 
+        return;
+
+    if ( lastWid == width() && lastHei == height() ) {
+        //qDebug("KOListWeekView::No compute layout needed ");
+        return;
+    }
+    lastWid = width();
+    lastHei = height();
+    doComputeLayoutWeek();
+}
+int KOMonthView::mapWeekLayout( int  index, bool landscape )
+{
+    if ( KOPrefs::instance()->mMonthViewWeekRowlayout )
+        return index;
+    int diff = 0;
+    if ( !landscape ) diff = 1;
+     switch( index ) {
+     case 0: 
+     case 5: 
+     case 6: 
+         return index;
+         break;
+     case 1: 
+         return 2+diff;
+         break;
+     case 2: 
+         return 4-(3*diff);
+         break;
+     case 3: 
+         return 1+(3*diff);
+         break;
+     case 4:
+         return 3-diff; 
+         break;
+     default:
+         qDebug("KO: Error in mapping week layout ");
+         return index;
+         break;
+     }
+     return index;
+}
 void KOMonthView::computeLayout()
 {
   
 
     static int lastWid = 0;
     static int lastHei = 0;
 
     if ( mShowWeekView ){
             computeLayoutWeek();
             return;
     }
     int daysToShow = 7;
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index 4d62e9b..61a141a 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -293,43 +293,45 @@ class KOMonthView: public KOEventView
  signals:
     void nextMonth();
     void prevMonth();
     void selectWeekNum ( int );
     void selectMonth ();
     void showDaySignal( QDate );
     void newTodoSignal( QDateTime, bool );
     void showJournalSignal( int,QDate );
   protected:
     void resizeEvent(QResizeEvent *);
     void viewChanged();
     void updateDayLabels();
+    int mapWeekLayout( int, bool );
 
   private:
     int mKBFcounter;
     QTimer* mComputeLayoutTimer;
     NavigatorBar* mNavigatorBar;
     int currentWeek();
     bool clPending;
     QWidgetStack * mWidStack;
     QWidget* mMonthView;
     QWidget* mWeekView;
     bool mShowWeekView;
     bool updatePossible;
     int mDaysPerWeek;
     int mNumWeeks;
     int mNumCells;
     //bool mWeekStartsMonday;
     bool mShowSatSunComp;
     void computeLayout();
     void computeLayoutWeek();
+    void doComputeLayoutWeek();
 
     QPtrVector<MonthViewCell> mCells;
     QPtrVector<QLabel> mDayLabels;
     QPtrVector<KOWeekButton> mWeekLabels;
     QPtrVector<MonthViewCell> mCellsW;
     QPtrVector<QLabel> mDayLabelsW;
     QPtrVector<KOWeekButton> mWeekLabelsW;
 
     bool mShortDayLabelsM;
     bool mShortDayLabelsW;
     int mWidthLongDayLabel;
 
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index a63297e..9e7f18c 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -255,24 +255,25 @@ KOPrefs::KOPrefs() :
   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,true);
   addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
   addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
 #ifdef DESKTOP_VERSION
   addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true);
 #else
   addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false);
 #endif
   addItemInt("Day Begins",&mDayBegins,7);
   addItemInt("Working Hours Start",&mWorkingHoursStart,8);
   addItemInt("Working Hours End",&mWorkingHoursEnd,17);
   addItemBool("Exclude Holidays",&mExcludeHolidays,true);
   addItemBool("Exclude Saturdays",&mExcludeSaturdays,true);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 392360d..2ff03fa 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -174,24 +174,25 @@ class KOPrefs : public KPimPrefs
     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    mMonthDailyRecur;
     bool    mMonthWeeklyRecur;
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index ebcff33..05bd73f 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -694,24 +694,28 @@ void KOPrefsDialog::setupViewsTab()
   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);