1 files changed, 16 insertions, 4 deletions

diff --git a/libopie/orecurrancewidget.cpp b/libopie/orecurrancewidget.cpp
index 53cee65..0484ab9 100644
--- a/libopie/orecurrancewidget.cpp
+++ b/libopie/orecurrancewidget.cpp
@@ -9,154 +9,166 @@
 
 // Global Templates for use in setting up the repeat label...
 const QString strDayTemplate = QObject::tr("Every");
 const QString strYearTemplate = QObject::tr("%1 %2 every ");
 const QString strMonthDateTemplate = QObject::tr("The %1 every ");
 const QString strMonthDayTemplate = QObject::tr("The %1 %1 of every");
 const QString strWeekTemplate = QObject::tr("Every ");
 const QString dayLabel[] = { QObject::tr("Monday"),
                              QObject::tr("Tuesday"),
 			     QObject::tr("Wednesday"),
 			     QObject::tr("Thursday"),
 			     QObject::tr("Friday"),
 			     QObject::tr("Saturday"),
 			     QObject::tr("Sunday") };
 
 
 static QString numberPlacing( int x );	// return the proper word format for
                                         // x (1st, 2nd, etc)
 static int week( const QDate &dt );    // what week in the month is dt?
 
 
 ORecurranceWidget::ORecurranceWidget( bool startOnMonday,
                                       const QDate& newStart,
                                       QWidget* parent,
                                       const char* name,
                                       bool modal,
                                       WFlags fl )
     : ORecurranceBase( parent, name, modal, fl ),
       start( newStart ),
       currInterval( None ),
       startWeekOnMonday( startOnMonday )
 {
     init();
     fraType->setButton( currInterval );
     chkNoEnd->setChecked( TRUE );
     setupNone();
 }
 ORecurranceWidget::ORecurranceWidget( bool startOnMonday,
                                       const ORecur& rp, const QDate& startDate,
                                       QWidget* parent, const char* name,
                                       bool modal, WFlags fl)
     : ORecurranceBase( parent, name, modal, fl ),
       start( startDate ),
       end( rp.endDate() ),
       startWeekOnMonday( startOnMonday )
 {
     // do some stuff with the repeat pattern
     init();
+    setRecurrence( rp );
+}
+
+ORecurranceWidget::~ORecurranceWidget() {
+}
+void ORecurranceWidget::setStartDate( const QDate& date ) {
+    qWarning("ORecurranceWidget::setStartDate");
+    setRecurrence( recurrence(), date );
+}
+void ORecurranceWidget::setRecurrence( const ORecur& rp ) {
+    setRecurrence( rp, start );
+}
+void ORecurranceWidget::setRecurrence( const ORecur& rp, const QDate& date ) {
+    start = date;
+    end = rp.endDate();
     switch ( rp.type() ) {
     default:
     case ORecur::NoRepeat:
         currInterval = None;
         setupNone();
         break;
     case ORecur::Daily:
         currInterval = Day;
         setupDaily();
         break;
     case ORecur::Weekly:
         currInterval = Week;
         setupWeekly();
         int day, buttons;
         for ( day = 0x01, buttons = 0; buttons < 7;
               day = day << 1, buttons++ ) {
             if ( rp.days() & day ) {
                 if ( startWeekOnMonday )
                     fraExtra->setButton( buttons );
                 else {
                     if ( buttons == 7 )
                         fraExtra->setButton( 0 );
                     else
                         fraExtra->setButton( buttons + 1 );
  		    }
 		}
 	    }
         slotWeekLabel();
         break;
     case ORecur::MonthlyDay:
         currInterval = Month;
         setupMonthly();
         fraExtra->setButton( 0 );
         slotMonthLabel( 0 );
         break;
     case ORecur::MonthlyDate:
         currInterval = Month;
         setupMonthly();
         fraExtra->setButton( 1 );
         slotMonthLabel( 1 );
         break;
     case ORecur::Yearly:
         currInterval = Year;
         setupYearly();
         break;
     }
     fraType->setButton( currInterval );
     spinFreq->setValue( rp.frequency() );
     if ( !rp.hasEndDate() ) {
 	cmdEnd->setText( tr("No End Date") );
 	chkNoEnd->setChecked( TRUE );
     } else
 	cmdEnd->setText( TimeString::shortDate( end ) );
 }
-ORecurranceWidget::~ORecurranceWidget() {
-
-}
-ORecur ORecurranceWidget::recurrance()const {
+ORecur ORecurranceWidget::recurrence()const {
     QListIterator<QToolButton> it( listRTypeButtons );
     QListIterator<QToolButton> itExtra( listExtra );
     ORecur rpTmp;
     int i;
     for ( i = 0; *it; ++it, i++ ) {
 	if ( (*it)->isOn() ) {
 	    switch ( i ) {
             case None:
                 rpTmp.setType( ORecur::NoRepeat );
                 break;
             case Day:
                 rpTmp.setType( ORecur::Daily );
                 break;
             case Week:{
                 rpTmp.setType( ORecur::Weekly );
                 int day;
                 int day2 = 0;
                 for ( day = 1; *itExtra; ++itExtra, day = day << 1 ) {
                     if ( (*itExtra)->isOn() ) {
                         if ( startWeekOnMonday )
                             day2 |= day;
                         else {
                             if ( day == 1 )
                                 day2 |= Event::SUN;
                             else
                                 day2 |= day >> 1;
                         }
                     }
                 }
                 rpTmp.setDays( day2 );
             }
                 break;
             case Month:
                 if ( cmdExtra1->isOn() )
                     rpTmp.setType( ORecur::MonthlyDay );
                 else if ( cmdExtra2->isOn() )
                     rpTmp.setType( ORecur::MonthlyDate );
                 // figure out the montly day...
                 rpTmp.setPosition(  week( start ) );
                 break;
             case Year:
                 rpTmp.setType( ORecur::Yearly );
                 break;
 	    }
 	    break;  // no need to keep looking!
 	}
     }
     rpTmp.setFrequency(spinFreq->value() );