Diffstat (limited to 'korganizer/koeditorrecurrence.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | korganizer/koeditorrecurrence.cpp | 95 |
1 files changed, 59 insertions, 36 deletions
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp index 98356fe..ffc0fac 100644 --- a/korganizer/koeditorrecurrence.cpp +++ b/korganizer/koeditorrecurrence.cpp | |||
@@ -283,113 +283,112 @@ int RecurMonthly::weekday() | |||
283 | /////////////////////////// RecurYearly /////////////////////////////// | 283 | /////////////////////////// RecurYearly /////////////////////////////// |
284 | 284 | ||
285 | RecurYearly::RecurYearly( QWidget *parent, const char *name ) : | 285 | RecurYearly::RecurYearly( QWidget *parent, const char *name ) : |
286 | RecurBase( parent, name ) | 286 | RecurBase( parent, name ) |
287 | { | 287 | { |
288 | QBoxLayout *topLayout = new QVBoxLayout( this ); | 288 | QBoxLayout *topLayout = new QVBoxLayout( this ); |
289 | topLayout->setSpacing( KDialog::spacingHint() ); | 289 | topLayout->setSpacing( KDialog::spacingHint() ); |
290 | 290 | ||
291 | 291 | ||
292 | QBoxLayout *freqLayout = new QHBoxLayout( topLayout ); | 292 | QBoxLayout *freqLayout = new QHBoxLayout( topLayout ); |
293 | 293 | ||
294 | QLabel *preLabel = new QLabel( i18n("every"), this ); | 294 | QLabel *preLabel = new QLabel( i18n("every"), this ); |
295 | freqLayout->addWidget( preLabel ); | 295 | freqLayout->addWidget( preLabel ); |
296 | 296 | ||
297 | freqLayout->addWidget( frequencyEdit() ); | 297 | freqLayout->addWidget( frequencyEdit() ); |
298 | 298 | ||
299 | QLabel *postLabel = new QLabel( i18n("year(s)"), this ); | 299 | QLabel *postLabel = new QLabel( i18n("year(s)"), this ); |
300 | freqLayout->addWidget( postLabel ); | 300 | freqLayout->addWidget( postLabel ); |
301 | 301 | ||
302 | 302 | ||
303 | QButtonGroup *buttonGroup = new QButtonGroup( this ); | 303 | QButtonGroup *buttonGroup = new QButtonGroup( this ); |
304 | buttonGroup->setFrameStyle( QFrame::NoFrame ); | 304 | buttonGroup->setFrameStyle( QFrame::NoFrame ); |
305 | topLayout->addWidget( buttonGroup, 1, AlignVCenter ); | 305 | topLayout->addWidget( buttonGroup, 1, AlignVCenter ); |
306 | 306 | ||
307 | QGridLayout *buttonLayout = new QGridLayout( buttonGroup, 3, 2 ); | 307 | QGridLayout *buttonLayout = new QGridLayout( buttonGroup, 2, 3 ); |
308 | 308 | ||
309 | QString recurInMonthText; | 309 | mByMonthRadio = new QRadioButton( i18n("On day "), buttonGroup); |
310 | if ( !KOPrefs::instance()->mCompactDialogs ) { | 310 | buttonLayout->addWidget( mByMonthRadio, 0, 0 , Qt::AlignRight); |
311 | recurInMonthText = i18n("Recur in the month of"); | 311 | mByDayLabel = new QLabel( i18n(" 1 of "), buttonGroup ); |
312 | } | ||
313 | |||
314 | mByMonthRadio = new QRadioButton( recurInMonthText, buttonGroup); | ||
315 | buttonLayout->addWidget( mByMonthRadio, 0, 0 ); | ||
316 | 312 | ||
313 | buttonLayout->addWidget( mByDayLabel, 0, 1 ); | ||
317 | mByMonthCombo = new QComboBox( buttonGroup ); | 314 | mByMonthCombo = new QComboBox( buttonGroup ); |
318 | mByMonthCombo->insertItem( i18n("January") ); | 315 | mByMonthCombo->insertItem( i18n("January") ); |
319 | mByMonthCombo->insertItem( i18n("February") ); | 316 | mByMonthCombo->insertItem( i18n("February") ); |
320 | mByMonthCombo->insertItem( i18n("March") ); | 317 | mByMonthCombo->insertItem( i18n("March") ); |
321 | mByMonthCombo->insertItem( i18n("April") ); | 318 | mByMonthCombo->insertItem( i18n("April") ); |
322 | mByMonthCombo->insertItem( i18n("May") ); | 319 | mByMonthCombo->insertItem( i18n("May") ); |
323 | mByMonthCombo->insertItem( i18n("June") ); | 320 | mByMonthCombo->insertItem( i18n("June") ); |
324 | mByMonthCombo->insertItem( i18n("July") ); | 321 | mByMonthCombo->insertItem( i18n("July") ); |
325 | mByMonthCombo->insertItem( i18n("August") ); | 322 | mByMonthCombo->insertItem( i18n("August") ); |
326 | mByMonthCombo->insertItem( i18n("September") ); | 323 | mByMonthCombo->insertItem( i18n("September") ); |
327 | mByMonthCombo->insertItem( i18n("October") ); | 324 | mByMonthCombo->insertItem( i18n("October") ); |
328 | mByMonthCombo->insertItem( i18n("November") ); | 325 | mByMonthCombo->insertItem( i18n("November") ); |
329 | mByMonthCombo->insertItem( i18n("December") ); | 326 | mByMonthCombo->insertItem( i18n("December") ); |
330 | buttonLayout->addWidget( mByMonthCombo, 0, 1 ); | 327 | buttonLayout->addWidget( mByMonthCombo, 0, 2,Qt::AlignLeft ); |
331 | 328 | if ( QApplication::desktop()->width() <= 640 ) { | |
332 | mByMonthCombo->setSizeLimit( 6 ); | 329 | mByMonthCombo->setSizeLimit( 6 ); |
333 | |||
334 | buttonLayout->setRowStretch( 1, 1 ); | ||
335 | |||
336 | QString recurOnDayText; | ||
337 | if ( KOPrefs::instance()->mCompactDialogs ) { | ||
338 | recurOnDayText = i18n("This day"); | ||
339 | } else { | ||
340 | recurOnDayText = i18n("Recur on this day"); | ||
341 | } | 330 | } |
342 | 331 | ||
343 | mByDayRadio = new QRadioButton( recurOnDayText, buttonGroup); | 332 | mByDayRadio = new QRadioButton( i18n("On day "), buttonGroup); |
344 | buttonLayout->addMultiCellWidget( mByDayRadio, 2, 2, 0, 1 ); | 333 | buttonLayout->addWidget( mByDayRadio, 1, 0 , Qt::AlignRight); |
334 | mDayOfLabel = new QLabel( i18n("1 of the year"), buttonGroup ); | ||
335 | buttonLayout->addMultiCellWidget( mDayOfLabel, 1, 1, 1,3 ); | ||
336 | |||
345 | } | 337 | } |
346 | 338 | ||
347 | void RecurYearly::setByDay() | 339 | void RecurYearly::setByDay( int doy ) |
348 | { | 340 | { |
349 | mByDayRadio->setChecked( true ); | 341 | mByDayRadio->setChecked( true ); |
342 | mDayOfLabel->setText(i18n("%1 of the year").arg( doy ) ); | ||
350 | } | 343 | } |
351 | 344 | ||
352 | void RecurYearly::setByMonth( int month ) | 345 | void RecurYearly::setByMonth( int month, int day ) |
353 | { | 346 | { |
354 | mByMonthRadio->setChecked( true ); | 347 | mByMonthRadio->setChecked( true ); |
355 | mByMonthCombo->setCurrentItem( month - 1 ); | 348 | mByMonthCombo->setCurrentItem( month - 1 ); |
349 | mByDayLabel->setText(i18n("%1 of ").arg( day ) ); | ||
350 | mDay = day; | ||
356 | } | 351 | } |
357 | 352 | ||
358 | bool RecurYearly::byMonth() | 353 | bool RecurYearly::byMonth() |
359 | { | 354 | { |
360 | return mByMonthRadio->isChecked(); | 355 | return mByMonthRadio->isChecked(); |
361 | } | 356 | } |
362 | 357 | ||
363 | bool RecurYearly::byDay() | 358 | bool RecurYearly::byDay() |
364 | { | 359 | { |
365 | return mByDayRadio->isChecked(); | 360 | return mByDayRadio->isChecked(); |
366 | } | 361 | } |
367 | 362 | ||
368 | int RecurYearly::month() | 363 | int RecurYearly::month() |
369 | { | 364 | { |
370 | return mByMonthCombo->currentItem() + 1; | 365 | return mByMonthCombo->currentItem() + 1; |
371 | } | 366 | } |
367 | int RecurYearly::day() | ||
368 | { | ||
369 | return mDay;//mByDayCombo->currentItem() + 1; | ||
370 | } | ||
372 | 371 | ||
373 | //////////////////////////// ExceptionsWidget ////////////////////////// | 372 | //////////////////////////// ExceptionsWidget ////////////////////////// |
374 | 373 | ||
375 | ExceptionsWidget::ExceptionsWidget( QWidget *parent, const char *name ) : | 374 | ExceptionsWidget::ExceptionsWidget( QWidget *parent, const char *name ) : |
376 | QWidget( parent, name ) | 375 | QWidget( parent, name ) |
377 | { | 376 | { |
378 | QBoxLayout *topLayout = new QVBoxLayout( this ); | 377 | QBoxLayout *topLayout = new QVBoxLayout( this ); |
379 | 378 | ||
380 | QGroupBox *groupBox = new QGroupBox( 1, Horizontal, i18n("Exceptions"), | 379 | QGroupBox *groupBox = new QGroupBox( 1, Horizontal, i18n("Exceptions"), |
381 | this ); | 380 | this ); |
382 | topLayout->addWidget( groupBox ); | 381 | topLayout->addWidget( groupBox ); |
383 | 382 | ||
384 | QWidget *box = new QWidget( groupBox ); | 383 | QWidget *box = new QWidget( groupBox ); |
385 | 384 | ||
386 | QGridLayout *boxLayout = new QGridLayout( box ); | 385 | QGridLayout *boxLayout = new QGridLayout( box ); |
387 | 386 | ||
388 | mExceptionDateEdit = new KDateEdit( box ); | 387 | mExceptionDateEdit = new KDateEdit( box ); |
389 | boxLayout->addWidget( mExceptionDateEdit, 0, 0 ); | 388 | boxLayout->addWidget( mExceptionDateEdit, 0, 0 ); |
390 | 389 | ||
391 | QPushButton *addExceptionButton = new QPushButton( i18n("Add"), box ); | 390 | QPushButton *addExceptionButton = new QPushButton( i18n("Add"), box ); |
392 | boxLayout->addWidget( addExceptionButton, 1, 0 ); | 391 | boxLayout->addWidget( addExceptionButton, 1, 0 ); |
393 | QPushButton *changeExceptionButton = new QPushButton( i18n("Change"), box ); | 392 | QPushButton *changeExceptionButton = new QPushButton( i18n("Change"), box ); |
394 | boxLayout->addWidget( changeExceptionButton, 2, 0 ); | 393 | boxLayout->addWidget( changeExceptionButton, 2, 0 ); |
395 | QPushButton *deleteExceptionButton = new QPushButton( i18n("Delete"), box ); | 394 | QPushButton *deleteExceptionButton = new QPushButton( i18n("Delete"), box ); |
@@ -823,48 +822,49 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) : | |||
823 | mRecurrenceRangeButton = 0; | 822 | mRecurrenceRangeButton = 0; |
824 | topLayout->addWidget( mRecurrenceRangeWidget, 3, 0 ); | 823 | topLayout->addWidget( mRecurrenceRangeWidget, 3, 0 ); |
825 | 824 | ||
826 | mExceptionsWidget = new ExceptionsWidget( this ); | 825 | mExceptionsWidget = new ExceptionsWidget( this ); |
827 | mExceptionsDialog = 0; | 826 | mExceptionsDialog = 0; |
828 | mExceptions = mExceptionsWidget; | 827 | mExceptions = mExceptionsWidget; |
829 | mExceptionsButton = 0; | 828 | mExceptionsButton = 0; |
830 | topLayout->addWidget( mExceptionsWidget, 3, 1 ); | 829 | topLayout->addWidget( mExceptionsWidget, 3, 1 ); |
831 | } | 830 | } |
832 | } | 831 | } |
833 | 832 | ||
834 | KOEditorRecurrence::~KOEditorRecurrence() | 833 | KOEditorRecurrence::~KOEditorRecurrence() |
835 | { | 834 | { |
836 | } | 835 | } |
837 | 836 | ||
838 | void KOEditorRecurrence::setEnabled( bool enabled ) | 837 | void KOEditorRecurrence::setEnabled( bool enabled ) |
839 | { | 838 | { |
840 | // kdDebug() << "KOEditorRecurrence::setEnabled(): " << (enabled ? "on" : "off") << endl; | 839 | // kdDebug() << "KOEditorRecurrence::setEnabled(): " << (enabled ? "on" : "off") << endl; |
841 | 840 | ||
842 | mTimeGroupBox->setEnabled( enabled ); | 841 | mTimeGroupBox->setEnabled( enabled ); |
843 | if ( mRecurrenceRangeWidget ) mRecurrenceRangeWidget->setEnabled( enabled ); | 842 | if ( mRecurrenceRangeWidget ) mRecurrenceRangeWidget->setEnabled( enabled ); |
844 | if ( mRecurrenceRangeButton ) mRecurrenceRangeButton->setEnabled( enabled ); | 843 | if ( mRecurrenceRangeButton ) mRecurrenceRangeButton->setEnabled( enabled ); |
845 | if ( mExceptionsWidget ) mExceptionsWidget->setEnabled( enabled ); | 844 | if ( mExceptionsWidget ) mExceptionsWidget->setEnabled( enabled ); |
846 | if ( mExceptionsButton ) mExceptionsButton->setEnabled( enabled ); | 845 | if ( mExceptionsButton ) mExceptionsButton->setEnabled( enabled ); |
846 | mRuleBox->setEnabled( enabled ); | ||
847 | } | 847 | } |
848 | 848 | ||
849 | void KOEditorRecurrence::showCurrentRule( int current ) | 849 | void KOEditorRecurrence::showCurrentRule( int current ) |
850 | { | 850 | { |
851 | switch ( current ) { | 851 | switch ( current ) { |
852 | case Daily: | 852 | case Daily: |
853 | mRuleStack->raiseWidget( mDaily ); | 853 | mRuleStack->raiseWidget( mDaily ); |
854 | break; | 854 | break; |
855 | case Weekly: | 855 | case Weekly: |
856 | mRuleStack->raiseWidget( mWeekly ); | 856 | mRuleStack->raiseWidget( mWeekly ); |
857 | break; | 857 | break; |
858 | case Monthly: | 858 | case Monthly: |
859 | mRuleStack->raiseWidget( mMonthly ); | 859 | mRuleStack->raiseWidget( mMonthly ); |
860 | break; | 860 | break; |
861 | default: | 861 | default: |
862 | case Yearly: | 862 | case Yearly: |
863 | mRuleStack->raiseWidget( mYearly ); | 863 | mRuleStack->raiseWidget( mYearly ); |
864 | break; | 864 | break; |
865 | } | 865 | } |
866 | } | 866 | } |
867 | 867 | ||
868 | void KOEditorRecurrence::setDateTimes( QDateTime start, QDateTime end ) | 868 | void KOEditorRecurrence::setDateTimes( QDateTime start, QDateTime end ) |
869 | { | 869 | { |
870 | // kdDebug() << "KOEditorRecurrence::setDateTimes" << endl; | 870 | // kdDebug() << "KOEditorRecurrence::setDateTimes" << endl; |
@@ -874,59 +874,61 @@ void KOEditorRecurrence::setDateTimes( QDateTime start, QDateTime end ) | |||
874 | 874 | ||
875 | } | 875 | } |
876 | 876 | ||
877 | void KOEditorRecurrence::setDefaults( QDateTime from, QDateTime to, bool ) | 877 | void KOEditorRecurrence::setDefaults( QDateTime from, QDateTime to, bool ) |
878 | { | 878 | { |
879 | 879 | ||
880 | // qDebug("KOEditorRecurrence::setDefaults %s %s ",from.toString().latin1(),to.toString().latin1() ); | 880 | // qDebug("KOEditorRecurrence::setDefaults %s %s ",from.toString().latin1(),to.toString().latin1() ); |
881 | setDateTimes( from, to ); | 881 | setDateTimes( from, to ); |
882 | 882 | ||
883 | bool enabled = false; | 883 | bool enabled = false; |
884 | mEnabledCheck->setChecked( enabled ); | 884 | mEnabledCheck->setChecked( enabled ); |
885 | setEnabled( enabled ); | 885 | setEnabled( enabled ); |
886 | 886 | ||
887 | mExceptions->setDefaults( to ); | 887 | mExceptions->setDefaults( to ); |
888 | mRecurrenceRange->setDefaults( to ); | 888 | mRecurrenceRange->setDefaults( to ); |
889 | 889 | ||
890 | mRecurrenceChooser->setType( RecurrenceChooser::Weekly ); | 890 | mRecurrenceChooser->setType( RecurrenceChooser::Weekly ); |
891 | showCurrentRule( mRecurrenceChooser->type() ); | 891 | showCurrentRule( mRecurrenceChooser->type() ); |
892 | 892 | ||
893 | mDaily->setFrequency( 1 ); | 893 | mDaily->setFrequency( 1 ); |
894 | 894 | ||
895 | mWeekly->setFrequency( 1 ); | 895 | mWeekly->setFrequency( 1 ); |
896 | QBitArray days( 7 ); | 896 | QBitArray days( 7 ); |
897 | days.fill( 0 ); | 897 | days.fill( 0 ); |
898 | days.setBit( from.date().dayOfWeek()- 1); | ||
898 | mWeekly->setDays( days ); | 899 | mWeekly->setDays( days ); |
899 | |||
900 | mMonthly->setFrequency( 1 ); | 900 | mMonthly->setFrequency( 1 ); |
901 | mMonthly->setByPos((from.date().day()/7), from.date().dayOfWeek()-1 ); | ||
901 | mMonthly->setByDay( from.date().day()-1 ); | 902 | mMonthly->setByDay( from.date().day()-1 ); |
902 | |||
903 | mYearly->setFrequency( 1 ); | 903 | mYearly->setFrequency( 1 ); |
904 | mYearly->setByDay(); | 904 | mYearly->setByDay( from.date().dayOfYear() ); |
905 | mYearly->setByMonth( from.date().month(), from.date().day() ); | ||
905 | } | 906 | } |
906 | 907 | ||
907 | void KOEditorRecurrence::readEvent(Event *event) | 908 | void KOEditorRecurrence::readEvent(Event *event) |
908 | { | 909 | { |
910 | setDefaults( event->dtStart(), event->dtEnd(), true ); | ||
909 | QBitArray rDays( 7 ); | 911 | QBitArray rDays( 7 ); |
910 | QPtrList<Recurrence::rMonthPos> rmp; | 912 | QPtrList<Recurrence::rMonthPos> rmp; |
911 | QPtrList<int> rmd; | 913 | QPtrList<int> rmd; |
912 | int day = 0; | 914 | int day = 0; |
913 | int count = 0; | 915 | int count = 0; |
914 | int month = 0; | 916 | int month = 0; |
915 | setDateTimes( event->dtStart(), event->dtEnd() ); | 917 | setDateTimes( event->dtStart(), event->dtEnd() ); |
916 | 918 | ||
917 | Recurrence *r = event->recurrence(); | 919 | Recurrence *r = event->recurrence(); |
918 | int f = r->frequency(); | 920 | int f = r->frequency(); |
919 | 921 | ||
920 | int recurs = r->doesRecur(); | 922 | int recurs = r->doesRecur(); |
921 | 923 | ||
922 | mEnabledCheck->setChecked( recurs ); | 924 | mEnabledCheck->setChecked( recurs ); |
923 | setEnabled( recurs ); | 925 | setEnabled( recurs ); |
924 | 926 | ||
925 | int recurrenceType = RecurrenceChooser::Weekly; | 927 | int recurrenceType = RecurrenceChooser::Weekly; |
926 | 928 | ||
927 | switch ( recurs ) { | 929 | switch ( recurs ) { |
928 | case Recurrence::rNone: | 930 | case Recurrence::rNone: |
929 | setDefaults( event->dtStart(), event->dtEnd(), true ); | 931 | setDefaults( event->dtStart(), event->dtEnd(), true ); |
930 | break; | 932 | break; |
931 | case Recurrence::rDaily: | 933 | case Recurrence::rDaily: |
932 | recurrenceType = RecurrenceChooser::Daily; | 934 | recurrenceType = RecurrenceChooser::Daily; |
@@ -945,59 +947,77 @@ void KOEditorRecurrence::readEvent(Event *event) | |||
945 | 947 | ||
946 | rmp = r->monthPositions(); | 948 | rmp = r->monthPositions(); |
947 | if ( rmp.first()->negative ) | 949 | if ( rmp.first()->negative ) |
948 | count = 5 - rmp.first()->rPos - 1; | 950 | count = 5 - rmp.first()->rPos - 1; |
949 | else | 951 | else |
950 | count = rmp.first()->rPos - 1; | 952 | count = rmp.first()->rPos - 1; |
951 | day = 0; | 953 | day = 0; |
952 | while ( !rmp.first()->rDays.testBit( day ) ) ++day; | 954 | while ( !rmp.first()->rDays.testBit( day ) ) ++day; |
953 | mMonthly->setByPos( count, day ); | 955 | mMonthly->setByPos( count, day ); |
954 | 956 | ||
955 | mMonthly->setFrequency( f ); | 957 | mMonthly->setFrequency( f ); |
956 | 958 | ||
957 | break; | 959 | break; |
958 | case Recurrence::rMonthlyDay: | 960 | case Recurrence::rMonthlyDay: |
959 | recurrenceType = RecurrenceChooser::Monthly; | 961 | recurrenceType = RecurrenceChooser::Monthly; |
960 | 962 | ||
961 | rmd = r->monthDays(); | 963 | rmd = r->monthDays(); |
962 | day = *rmd.first() - 1; | 964 | day = *rmd.first() - 1; |
963 | mMonthly->setByDay( day ); | 965 | mMonthly->setByDay( day ); |
964 | 966 | ||
965 | mMonthly->setFrequency( f ); | 967 | mMonthly->setFrequency( f ); |
966 | 968 | ||
967 | break; | 969 | break; |
968 | case Recurrence::rYearlyMonth: | 970 | case Recurrence::rYearlyMonth: |
969 | case Recurrence::rYearlyDay: | 971 | { |
970 | recurrenceType = RecurrenceChooser::Yearly; | 972 | recurrenceType = RecurrenceChooser::Yearly; |
971 | 973 | qDebug("Recurrence::rYearlyMonth: "); | |
974 | day = event->dtStart().date().day(); | ||
972 | rmd = r->yearNums(); | 975 | rmd = r->yearNums(); |
976 | if ( rmd.count() > 0 ) | ||
973 | month = *rmd.first(); | 977 | month = *rmd.first(); |
974 | if ( month == event->dtStart().date().month() ) { | 978 | else |
975 | mYearly->setByDay(); | 979 | month = event->dtStart().date().month() ; |
980 | mYearly->setByMonth( month, day ); | ||
981 | #if 0 | ||
982 | qDebug("2day = %d ",day ); | ||
983 | QPtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions(); | ||
984 | int month; | ||
985 | if ( !monthlist.isEmpty() ) { | ||
986 | month = monthlist.first()->rPos ; | ||
976 | } else { | 987 | } else { |
977 | mYearly->setByMonth( month ); | 988 | month = event->dtStart().date().month() ; |
989 | } | ||
990 | mYearly->setByMonth( day, month ); | ||
991 | #endif | ||
992 | mYearly->setFrequency( f ); | ||
978 | } | 993 | } |
979 | 994 | ||
995 | break; | ||
996 | case Recurrence::rYearlyDay: | ||
997 | qDebug("Recurrence::rYearlyDay: "); | ||
998 | recurrenceType = RecurrenceChooser::Yearly; | ||
999 | mYearly->setByDay( event->dtStart().date().dayOfYear() ); | ||
980 | mYearly->setFrequency( f ); | 1000 | mYearly->setFrequency( f ); |
981 | break; | 1001 | break; |
982 | default: | 1002 | default: |
983 | setDefaults( event->dtStart(), event->dtEnd(), true ); | 1003 | setDefaults( event->dtStart(), event->dtEnd(), true ); |
984 | break; | 1004 | break; |
985 | } | 1005 | } |
986 | 1006 | ||
987 | mRecurrenceChooser->setType( recurrenceType ); | 1007 | mRecurrenceChooser->setType( recurrenceType ); |
988 | showCurrentRule( recurrenceType ); | 1008 | showCurrentRule( recurrenceType ); |
989 | 1009 | ||
990 | mRecurrenceRange->setDateTimes( event->dtStart() ); | 1010 | mRecurrenceRange->setDateTimes( event->dtStart() ); |
991 | 1011 | ||
992 | if ( r->doesRecur() ) { | 1012 | if ( r->doesRecur() ) { |
993 | mRecurrenceRange->setDuration( r->duration() ); | 1013 | mRecurrenceRange->setDuration( r->duration() ); |
994 | if ( r->duration() == 0 ) | 1014 | if ( r->duration() == 0 ) |
995 | { | 1015 | { |
996 | if ( r->endDate() < event->dtStart().date() ) | 1016 | if ( r->endDate() < event->dtStart().date() ) |
997 | mRecurrenceRange->setEndDate( event->dtStart().date() ); | 1017 | mRecurrenceRange->setEndDate( event->dtStart().date() ); |
998 | else | 1018 | else |
999 | mRecurrenceRange->setEndDate( r->endDate() ); | 1019 | mRecurrenceRange->setEndDate( r->endDate() ); |
1000 | } else | 1020 | } else |
1001 | mRecurrenceRange->setEndDate( event->dtStart().date() ); | 1021 | mRecurrenceRange->setEndDate( event->dtStart().date() ); |
1002 | } | 1022 | } |
1003 | 1023 | ||
@@ -1041,63 +1061,66 @@ void KOEditorRecurrence::writeEvent( Event *event ) | |||
1041 | if ( mMonthly->byPos() ) { | 1061 | if ( mMonthly->byPos() ) { |
1042 | int pos = mMonthly->count(); | 1062 | int pos = mMonthly->count(); |
1043 | 1063 | ||
1044 | QBitArray days( 7 ); | 1064 | QBitArray days( 7 ); |
1045 | days.fill( false ); | 1065 | days.fill( false ); |
1046 | 1066 | ||
1047 | days.setBit( mMonthly->weekday() ); | 1067 | days.setBit( mMonthly->weekday() ); |
1048 | if ( duration != 0 ) | 1068 | if ( duration != 0 ) |
1049 | r->setMonthly( Recurrence::rMonthlyPos, freq, duration ); | 1069 | r->setMonthly( Recurrence::rMonthlyPos, freq, duration ); |
1050 | else | 1070 | else |
1051 | r->setMonthly( Recurrence::rMonthlyPos, freq, endDate ); | 1071 | r->setMonthly( Recurrence::rMonthlyPos, freq, endDate ); |
1052 | r->addMonthlyPos( pos, days ); | 1072 | r->addMonthlyPos( pos, days ); |
1053 | } else { | 1073 | } else { |
1054 | // it's by day | 1074 | // it's by day |
1055 | int day = mMonthly->day(); | 1075 | int day = mMonthly->day(); |
1056 | 1076 | ||
1057 | if ( duration != 0 ) { | 1077 | if ( duration != 0 ) { |
1058 | r->setMonthly( Recurrence::rMonthlyDay, freq, duration ); | 1078 | r->setMonthly( Recurrence::rMonthlyDay, freq, duration ); |
1059 | } else { | 1079 | } else { |
1060 | r->setMonthly( Recurrence::rMonthlyDay, freq, endDate ); | 1080 | r->setMonthly( Recurrence::rMonthlyDay, freq, endDate ); |
1061 | } | 1081 | } |
1062 | r->addMonthlyDay( day ); | 1082 | r->addMonthlyDay( day ); |
1063 | } | 1083 | } |
1064 | } else if ( recurrenceType == RecurrenceChooser::Yearly ) { | 1084 | } else if ( recurrenceType == RecurrenceChooser::Yearly ) { |
1085 | qDebug("RecurrenceChooser::Yearly "); | ||
1065 | int freq = mYearly->frequency(); | 1086 | int freq = mYearly->frequency(); |
1066 | 1087 | if ( mYearly->byDay() ) { | |
1067 | int month; | 1088 | if ( duration != 0 ) { |
1068 | if ( mYearly->byMonth() ) { | 1089 | r->setYearly( Recurrence::rYearlyDay, freq, duration ); |
1069 | month = mYearly->month(); | ||
1070 | } else { | 1090 | } else { |
1071 | month = event->dtStart().date().month(); | 1091 | r->setYearly( Recurrence::rYearlyDay, freq, endDate ); |
1072 | } | 1092 | } |
1093 | r->addYearlyNum( event->dtStart().date().dayOfYear() ); | ||
1094 | } else { | ||
1073 | if ( duration != 0 ) { | 1095 | if ( duration != 0 ) { |
1074 | r->setYearly( Recurrence::rYearlyMonth, freq, duration ); | 1096 | r->setYearly( Recurrence::rYearlyMonth, freq, duration ); |
1075 | } else { | 1097 | } else { |
1076 | r->setYearly( Recurrence::rYearlyMonth, freq, endDate ); | 1098 | r->setYearly( Recurrence::rYearlyMonth, freq, endDate ); |
1077 | } | 1099 | } |
1100 | r->addYearlyNum( mYearly->month() ); | ||
1101 | } | ||
1078 | 1102 | ||
1079 | r->addYearlyNum( month ); | ||
1080 | } | 1103 | } |
1081 | 1104 | ||
1082 | event->setExDates( mExceptions->dates() ); | 1105 | event->setExDates( mExceptions->dates() ); |
1083 | } | 1106 | } |
1084 | } | 1107 | } |
1085 | 1108 | ||
1086 | void KOEditorRecurrence::setDateTimeStr( const QString &str ) | 1109 | void KOEditorRecurrence::setDateTimeStr( const QString &str ) |
1087 | { | 1110 | { |
1088 | mDateTimeLabel->setText( str ); | 1111 | mDateTimeLabel->setText( str ); |
1089 | } | 1112 | } |
1090 | 1113 | ||
1091 | bool KOEditorRecurrence::validateInput() | 1114 | bool KOEditorRecurrence::validateInput() |
1092 | { | 1115 | { |
1093 | // Check input here | 1116 | // Check input here |
1094 | 1117 | ||
1095 | return true; | 1118 | return true; |
1096 | } | 1119 | } |
1097 | 1120 | ||
1098 | void KOEditorRecurrence::showExceptionsDialog() | 1121 | void KOEditorRecurrence::showExceptionsDialog() |
1099 | { | 1122 | { |
1100 | DateList dates = mExceptions->dates(); | 1123 | DateList dates = mExceptions->dates(); |
1101 | int result = mExceptionsDialog->exec(); | 1124 | int result = mExceptionsDialog->exec(); |
1102 | if ( result == QDialog::Rejected ) mExceptions->setDates( dates ); | 1125 | if ( result == QDialog::Rejected ) mExceptions->setDates( dates ); |
1103 | } | 1126 | } |