1 files changed, 74 insertions, 51 deletions

diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index 98356fe..ffc0fac 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -304,16 +304,13 @@ RecurYearly::RecurYearly( QWidget *parent, const char *name ) :
   buttonGroup->setFrameStyle( QFrame::NoFrame );
   topLayout->addWidget( buttonGroup, 1, AlignVCenter );
 
-  QGridLayout *buttonLayout = new QGridLayout( buttonGroup, 3, 2 );
-
-  QString recurInMonthText;
-  if ( !KOPrefs::instance()->mCompactDialogs ) {
-    recurInMonthText = i18n("Recur in the month of");
-  }
-
-  mByMonthRadio = new QRadioButton( recurInMonthText, buttonGroup);
-  buttonLayout->addWidget( mByMonthRadio, 0, 0 );
+  QGridLayout *buttonLayout = new QGridLayout( buttonGroup, 2, 3 );
 
+  mByMonthRadio = new QRadioButton( i18n("On day "), buttonGroup);
+  buttonLayout->addWidget( mByMonthRadio, 0, 0  , Qt::AlignRight);
+  mByDayLabel = new QLabel( i18n(" 1 of "), buttonGroup );
+ 
+  buttonLayout->addWidget( mByDayLabel, 0, 1 ); 
   mByMonthCombo = new QComboBox( buttonGroup );
   mByMonthCombo->insertItem( i18n("January") );
   mByMonthCombo->insertItem( i18n("February") );
@@ -327,32 +324,30 @@ RecurYearly::RecurYearly( QWidget *parent, const char *name ) :
   mByMonthCombo->insertItem( i18n("October") );
   mByMonthCombo->insertItem( i18n("November") );
   mByMonthCombo->insertItem( i18n("December") );
-  buttonLayout->addWidget( mByMonthCombo, 0, 1 );
-
-  mByMonthCombo->setSizeLimit( 6 );
-
-  buttonLayout->setRowStretch( 1, 1 );
-
-  QString recurOnDayText;
-  if ( KOPrefs::instance()->mCompactDialogs ) {
-    recurOnDayText = i18n("This day");
-  } else {
-    recurOnDayText = i18n("Recur on this day");
-  }
-
-  mByDayRadio = new QRadioButton( recurOnDayText, buttonGroup);
-  buttonLayout->addMultiCellWidget( mByDayRadio, 2, 2, 0, 1 );
+  buttonLayout->addWidget( mByMonthCombo, 0, 2,Qt::AlignLeft );
+  if ( QApplication::desktop()->width() <= 640 ) {
+      mByMonthCombo->setSizeLimit( 6 );
+  } 
+
+  mByDayRadio = new QRadioButton( i18n("On day "), buttonGroup);
+  buttonLayout->addWidget( mByDayRadio, 1, 0 , Qt::AlignRight);
+  mDayOfLabel = new QLabel( i18n("1 of the year"), buttonGroup );
+  buttonLayout->addMultiCellWidget( mDayOfLabel, 1, 1, 1,3 );
+ 
 }
 
-void RecurYearly::setByDay()
+void RecurYearly::setByDay( int doy )
 {
   mByDayRadio->setChecked( true );
+  mDayOfLabel->setText(i18n("%1 of the year").arg( doy ) );
 }
 
-void RecurYearly::setByMonth( int month )
+void RecurYearly::setByMonth( int month, int day )
 {
   mByMonthRadio->setChecked( true );
   mByMonthCombo->setCurrentItem( month - 1 );
+  mByDayLabel->setText(i18n("%1 of ").arg( day ) );
+  mDay = day;
 }
 
 bool RecurYearly::byMonth()
@@ -369,6 +364,10 @@ int RecurYearly::month()
 {
   return mByMonthCombo->currentItem() + 1;
 }
+int RecurYearly::day()
+{
+    return mDay;//mByDayCombo->currentItem() + 1;
+}
 
 //////////////////////////// ExceptionsWidget //////////////////////////
 
@@ -844,6 +843,7 @@ void KOEditorRecurrence::setEnabled( bool enabled )
   if ( mRecurrenceRangeButton ) mRecurrenceRangeButton->setEnabled( enabled );
   if ( mExceptionsWidget ) mExceptionsWidget->setEnabled( enabled );
   if ( mExceptionsButton ) mExceptionsButton->setEnabled( enabled );
+  mRuleBox->setEnabled( enabled );
 }
 
 void KOEditorRecurrence::showCurrentRule( int current )
@@ -895,17 +895,19 @@ void KOEditorRecurrence::setDefaults( QDateTime from, QDateTime to, bool )
   mWeekly->setFrequency( 1 );
   QBitArray days( 7 );
   days.fill( 0 );
+  days.setBit( from.date().dayOfWeek()- 1);
   mWeekly->setDays( days );
-
   mMonthly->setFrequency( 1 );
+  mMonthly->setByPos((from.date().day()/7), from.date().dayOfWeek()-1 );
   mMonthly->setByDay( from.date().day()-1 );
-
   mYearly->setFrequency( 1 );
-  mYearly->setByDay();
+  mYearly->setByDay( from.date().dayOfYear() );
+  mYearly->setByMonth( from.date().month(), from.date().day() );
 }
 
 void KOEditorRecurrence::readEvent(Event *event)
 {
+    setDefaults( event->dtStart(), event->dtEnd(), true );
   QBitArray rDays( 7 );
   QPtrList<Recurrence::rMonthPos> rmp;
   QPtrList<int> rmd;
@@ -966,19 +968,37 @@ void KOEditorRecurrence::readEvent(Event *event)
 
       break;
     case Recurrence::rYearlyMonth:
-    case Recurrence::rYearlyDay:
-      recurrenceType = RecurrenceChooser::Yearly;
-
-      rmd = r->yearNums();
-      month = *rmd.first();
-      if ( month == event->dtStart().date().month() ) {
-        mYearly->setByDay();
-      } else {
-        mYearly->setByMonth( month );
-      }
+        {
+        recurrenceType = RecurrenceChooser::Yearly;
+            qDebug("Recurrence::rYearlyMonth: ");
+            day = event->dtStart().date().day(); 
+            rmd = r->yearNums();
+            if ( rmd.count() > 0 )
+                month = *rmd.first();
+            else
+                month = event->dtStart().date().month() ;
+            mYearly->setByMonth( month, day );
+#if 0
+            qDebug("2day = %d ",day );
+            QPtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions();
+            int month;
+            if ( !monthlist.isEmpty() ) {
+                month =  monthlist.first()->rPos ;
+            } else {
+                month = event->dtStart().date().month() ;
+            }
+            mYearly->setByMonth( day, month );
+#endif
+            mYearly->setFrequency( f );
+        }
 
-      mYearly->setFrequency( f );
       break;
+    case Recurrence::rYearlyDay:
+        qDebug("Recurrence::rYearlyDay: ");
+        recurrenceType = RecurrenceChooser::Yearly;
+        mYearly->setByDay( event->dtStart().date().dayOfYear() );
+        mYearly->setFrequency( f );
+        break;
     default:
         setDefaults( event->dtStart(), event->dtEnd(), true );
       break;
@@ -1062,21 +1082,24 @@ void KOEditorRecurrence::writeEvent( Event *event )
         r->addMonthlyDay( day );
       }
     } else if ( recurrenceType == RecurrenceChooser::Yearly ) {
+        qDebug("RecurrenceChooser::Yearly ");
       int freq = mYearly->frequency();
-
-      int month;
-      if ( mYearly->byMonth() ) {
-        month = mYearly->month();
-      } else {
-        month = event->dtStart().date().month();
-      }
-      if ( duration != 0 ) {
-        r->setYearly( Recurrence::rYearlyMonth, freq, duration );
+      if ( mYearly->byDay() ) {
+          if ( duration != 0 ) {
+              r->setYearly( Recurrence::rYearlyDay, freq, duration );
+          } else {
+              r->setYearly( Recurrence::rYearlyDay, freq, endDate );
+          }
+          r->addYearlyNum( event->dtStart().date().dayOfYear() );
       } else {
-        r->setYearly( Recurrence::rYearlyMonth, freq, endDate );
+          if ( duration != 0 ) {
+              r->setYearly( Recurrence::rYearlyMonth, freq, duration );
+          } else {
+              r->setYearly( Recurrence::rYearlyMonth, freq, endDate );
+          }
+          r->addYearlyNum( mYearly->month() ); 
       }
 
-      r->addYearlyNum( month );
     }
 
     event->setExDates( mExceptions->dates() );