FCL/sf/app/organizer: comparison calendarui/editors/src/CalenEditorDataHandler.cpp

equal deleted inserted replaced

-:356f28cd5ca0
+:ed599363c2d7
 #include <eikenv.h>
 #include <CalenInterimUtils2.h>
 #include <calencontext.h>
 #include <caleninstanceid.h>            // TCalenInstanceId
 #include <calenservices.h>
-#include <featmgr.h>
 // User includes
 #include "CalenEditorDataHandler.h"
 #include "CalendarPrivateCRKeys.h"
 #include "CalenDefaultEditors.hrh"
 #include "calenattachmentutils.h"
 #include "calenattachmentinfo.h"
 #include "calenattachmentmodel.h"
 #include "calenunifiededitor.h"
 #include "calendarui_debug.h"
-#include "koreanlunardateutil.h"
 // Constants
 #define KNoOfDaysInWeek  7
 // ======== LOCAL FUNCTIONS ========
 else
 {
 iInstanceId = iServices.Context().InstanceId();
 }
-// Sets up TLS, must be done before FeatureManager is used.
-FeatureManager::InitializeLibL();
-// Used in destructor.
-iFeatMgrInitialized = ETrue;
 TRACE_EXIT_POINT;
 }
 // ---------------------------------------------------------------------------
 // CCalenEditorDataHandler::NewL
 {
 TRACE_ENTRY_POINT;
 delete iOriginal;
 delete iEdited;
-	// Do not call UnInitializeLib() if InitalizeLib() leaves.
-if ( iFeatMgrInitialized )
-{
-// Frees the TLS. Must be done after FeatureManager is used.
-FeatureManager::UnInitializeLib();
-}
 TRACE_EXIT_POINT;
 }
 // ---------------------------------------------------------------------------
 // CCalenEditorDataHandler::Edited
 IsRepeatRuleEdited()    ||
 IsPriorityEdited()      ||
 IsCalendarEditedL()     ||
 IsAttachmentExists()    ||
 IsEventTypeEdited()     ||
-AllDayFieldEdited()     ||
+AllDayFieldEdited() );
-LunarFieldEdited() );
 }
 // ---------------------------------------------------------------------------
 // CCalenEditorDataHandler::TextFieldsEdited
 // Returns ETrue if any of the text fields (e.g. summary) of the entry
 }
 // Repeat rule has to be modified in both cases
 if ( isNew || IsStartDateTimeEdited() || IsRepeatRuleEdited() )
 {
-if ( FeatureManager::FeatureSupported( KFeatureIdKorean ) &&
-Edited().EntryType() == CCalEntry::EAnniv &&
+if ( aRepeatTarget == CalCommon::EThisOnly)
-( Edited().CalendarType() == ELunar || Edited().CalendarType() == ELunarLeap) )
+{
-{ /* Lunar entries need special repeating dates */
-CKoreanLunarDateUtil* dateUtil = CKoreanLunarDateUtil::NewLC(&iServices);
-RArray<TCalTime> repeatDateList;
-CleanupClosePushL( repeatDateList );
-/* Clear previous repeat rules */
 iEntry.ClearRepeatingPropertiesL();
-TRAPD( err, dateUtil->GetLunarYearlyRepeatsL( repeatDateList, Edited().StartDateTime().DateTime(), UseFloatingTimeL() ) );
+}
+else if ( Edited().IsRepeating() )
-if( err == KErrNone )
+{
-{
+// If we're an RDate (with repeat type ERepeatOther), don't try to set an RRule,
-iEntry.SetRDatesL( repeatDateList );
+// but don't clear the repeat properties either.
-}
+if( Edited().RepeatType() != ERepeatOther )
+{
-/* Pop and destroy repeatDateList and dateUtil */
+TCalRRule rrule;
-CleanupStack::PopAndDestroy(2);
-}
+CalculateRepeatRuleL( Edited().StartDateTime(),
-else
+Edited().RepeatType(),
-{
+Edited().RepeatUntilDateTime(),
-if ( aRepeatTarget == CalCommon::EThisOnly)
+rrule );
-{
-iEntry.ClearRepeatingPropertiesL();
+iEntry.SetRRuleL( rrule );
-}
-else if ( Edited().IsRepeating() )
+// As there should not be any rdates, remove any that are
-{
+// still present
-// If we're an RDate (with repeat type ERepeatOther), don't try to set an RRule,
+RArray<TCalTime> emptyList;
-// but don't clear the repeat properties either.
+CleanupClosePushL( emptyList );
-if( Edited().RepeatType() != ERepeatOther )
+iEntry.SetRDatesL( emptyList );
+CleanupStack::PopAndDestroy(); // emptyList
+}
+else
+{
+// The repeat type is ERepeatOther, therefore as
+// it is impossible to create an entry of type
+// ERepeat other using the editor either the repeat until
+// date or the start date must have been changed
+// The start date/time has changed, in order for the
+// series to maintain its pattern, any rDates and if
+// present rRule are moved by the same offset
+// The repeat type is ERepeatOther, so check if we have any rdates
+RArray<TCalTime> rDateList;
+CleanupClosePushL( rDateList );
+iEntry.GetRDatesL( rDateList );
+TInt count = rDateList.Count();
+if ( count == 0 )
 {
+// There are no rdates so the new until and start date can be applied
+// directly.
 TCalRRule rrule;
 CalculateRepeatRuleL( Edited().StartDateTime(),
 Edited().RepeatType(),
 Edited().RepeatUntilDateTime(),
 rrule );
 iEntry.SetRRuleL( rrule );
-// As there should not be any rdates, remove any that are
-// still present
-RArray<TCalTime> emptyList;
-CleanupClosePushL( emptyList );
-iEntry.SetRDatesL( emptyList );
-CleanupStack::PopAndDestroy(); // emptyList
 }
 else
 {
-// The repeat type is ERepeatOther, therefore as
+// There are rDates which need to be checked.
-// it is impossible to create an entry of type
+if ( IsStartDateTimeEdited() )
-// ERepeat other using the editor either the repeat until
+{
-// date or the start date must have been changed
+// Need to shift any rdates
+TTime editedStart = iEdited->StartDateTime();
+TTime origStart = iOriginal->StartDateTime();
+TTimeIntervalMicroSeconds offSet = editedStart.MicroSecondsFrom( origStart );
+for ( TInt index = 0; index < count; index++ )
+{
+TCalTime& rDateTime = rDateList[ index ];
+TTime shiftedTime = rDateTime.TimeUtcL();
+TDateTime before = shiftedTime.DateTime();
+shiftedTime += offSet;
+TDateTime after = shiftedTime.DateTime();
+rDateTime.SetTimeUtcL( shiftedTime );
+}
+}
+//  Check and fix the rDates and rRules match the
+//  repeat until date and time.
+TTime untilTime = Edited().RepeatUntilDateTime();
-// The start date/time has changed, in order for the
+// Remove any rdates that are after the the repeat until date
-// series to maintain its pattern, any rDates and if
-// present rRule are moved by the same offset
-// The repeat type is ERepeatOther, so check if we have any rdates
-RArray<TCalTime> rDateList;
-CleanupClosePushL( rDateList );
-iEntry.GetRDatesL( rDateList );
 TInt count = rDateList.Count();
+if ( count > 0 )
+{
+TInt index = count - 1;
+do
+{
+TTime lastRDate = CalenDateUtils::BeginningOfDay( rDateList[ index ].TimeLocalL() );
+TDateTime before = lastRDate.DateTime();
+if ( lastRDate > untilTime )
+{
+rDateList.Remove( index-- );
+}
+else
+{
+index = KErrNotFound;
+}
+} while ( index != KErrNotFound );
+}
-if ( count == 0 )
+// Need to check if the end date of the
+// rrule needs adjusting if it exists.
+TCalRRule rRule;
+if ( iEntry.GetRRuleL( rRule ) )
 {
-// There are no rdates so the new until and start date can be applied
+count = rDateList.Count();
-// directly.
-TCalRRule rrule;
-CalculateRepeatRuleL( Edited().StartDateTime(),
-Edited().RepeatType(),
-Edited().RepeatUntilDateTime(),
-rrule );
-iEntry.SetRRuleL( rrule );
-}
-else
-{
-// There are rDates which need to be checked.
-if ( IsStartDateTimeEdited() )
-{
-// Need to shift any rdates
-TTime editedStart = iEdited->StartDateTime();
-TTime origStart = iOriginal->StartDateTime();
-TTimeIntervalMicroSeconds offSet = editedStart.MicroSecondsFrom( origStart );
-for ( TInt index = 0; index < count; index++ )
-{
-TCalTime& rDateTime = rDateList[ index ];
-TTime shiftedTime = rDateTime.TimeUtcL();
-TDateTime before = shiftedTime.DateTime();
-shiftedTime += offSet;
-TDateTime after = shiftedTime.DateTime();
-rDateTime.SetTimeUtcL( shiftedTime );
-}
-}
-//  Check and fix the rDates and rRules match the
-//  repeat until date and time.
-TTime untilTime = Edited().RepeatUntilDateTime();
-// Remove any rdates that are after the the repeat until date
-TInt count = rDateList.Count();
 if ( count > 0 )
 {
-TInt index = count - 1;
+// There still exists some rdates, so only need to trim
-do
+// the rrule if it exists
-{
+TTime lastRDate = CalenDateUtils::BeginningOfDay( rDateList[ count - 1 ].TimeLocalL() );
-TTime lastRDate = CalenDateUtils::BeginningOfDay( rDateList[ index ].TimeLocalL() );
+const TTime& origUntilDate = Original().RepeatUntilDateTime();
-TDateTime before = lastRDate.DateTime();
+TTime startDT = rRule.DtStart().TimeLocalL();
-if ( lastRDate > untilTime )
+if ( lastRDate <= origUntilDate && startDT > lastRDate )
+{
+if ( startDT < untilTime)
 {
-rDateList.Remove( index-- );
+if( origUntilDate != untilTime)
+	{
+										ApplyUntilDateToRRuleL( rRule, untilTime);
+	iEntry.SetRRuleL( rRule );
+	}
 }
 else
 {
-index = KErrNotFound;
+// The repeat start is after the until date
-}
+// so remove any repeat information.
-} while ( index != KErrNotFound );
+iEntry.ClearRepeatingPropertiesL();
-}
+// If the entry date has been moved past the until
-// Need to check if the end date of the
+// date, need to swap the an rDate for the entry.
-// rrule needs adjusting if it exists.
+TTime startTime = iEntry.StartTimeL().TimeLocalL();
-TCalRRule rRule;
-if ( iEntry.GetRRuleL( rRule ) )
+if ( startTime > untilTime )
-{
-count = rDateList.Count();
-if ( count > 0 )
-{
-// There still exists some rdates, so only need to trim
-// the rrule if it exists
-TTime lastRDate = CalenDateUtils::BeginningOfDay( rDateList[ count - 1 ].TimeLocalL() );
-const TTime& origUntilDate = Original().RepeatUntilDateTime();
-TTime startDT = rRule.DtStart().TimeLocalL();
-if ( lastRDate <= origUntilDate && startDT > lastRDate )
-{
-if ( startDT < untilTime)
 {
-if( origUntilDate != untilTime)
+// Find the duration of the entry
+TTime endTime = iEntry.EndTimeL().TimeLocalL();
+TTimeIntervalMinutes duration;
+//startTime.MinutesFrom( endTime, duration );// for bug: CMCA-745CZ4
+endTime.MinutesFrom( startTime, duration );
+// Choose the first rDate as the new start time
+TCalTime newStartTime = rDateList[ 0 ];
+endTime = newStartTime.TimeLocalL() + duration;
+// FIXME.
+// If there is only one rDate left, the agenda model
+// will crash if it is deleted.
+if ( count != 0 )
 {
-ApplyUntilDateToRRuleL( rRule, untilTime);
+rDateList.Remove( 0 );
-iEntry.SetRRuleL( rRule );
 }
-}
-else
+TCalTime newEndTime;
-{
+if ( UseFloatingTimeL() )
-// The repeat start is after the until date
-// so remove any repeat information.
-iEntry.ClearRepeatingPropertiesL();
-// If the entry date has been moved past the until
-// date, need to swap the an rDate for the entry.
-TTime startTime = iEntry.StartTimeL().TimeLocalL();
-if ( startTime > untilTime )
 {
-// Find the duration of the entry
+newEndTime.SetTimeLocalFloatingL( endTime );
-TTime endTime = iEntry.EndTimeL().TimeLocalL();
+}
-TTimeIntervalMinutes duration;
+else
-//startTime.MinutesFrom( endTime, duration );// for bug: CMCA-745CZ4
+{
-endTime.MinutesFrom( startTime, duration );
+newEndTime.SetTimeLocalL( endTime );
+}
-// Choose the first rDate as the new start time
-TCalTime newStartTime = rDateList[ 0 ];
+iEntry.SetStartAndEndTimeL( newStartTime, newEndTime );
-endTime = newStartTime.TimeLocalL() + duration;
+}
-// FIXME.
-// If there is only one rDate left, the agenda model
-// will crash if it is deleted.
-if ( count != 0 )
-{
-rDateList.Remove( 0 );
-}
-TCalTime newEndTime;
-if ( UseFloatingTimeL() )
-{
-newEndTime.SetTimeLocalFloatingL( endTime );
-}
-else
-{
-newEndTime.SetTimeLocalL( endTime );
-}
-iEntry.SetStartAndEndTimeL( newStartTime, newEndTime );
-}
-}
 }
 }
 }
-iEntry.SetRDatesL( rDateList );
 }
-CleanupStack::PopAndDestroy(); // rDateList
+iEntry.SetRDatesL( rDateList );
 }
-}
-else
+CleanupStack::PopAndDestroy(); // rDateList
-{
+}
-iEntry.ClearRepeatingPropertiesL();
+}
+else
-// FIXME  As the entry is supposedly not repeating
+{
-// any rDates should be removed. Unforunately this
+iEntry.ClearRepeatingPropertiesL();
-// is not possible at the moment because removing the
-// rdates will cause the agenda model to panic
+// FIXME  As the entry is supposedly not repeating
-//
+// any rDates should be removed. Unforunately this
-// RArray<TCalTime> emptyList;
+// is not possible at the moment because removing the
-// CleanupClosePushL( emptyList );
+// rdates will cause the agenda model to panic
-// iEntry.SetRDatesL( emptyList );
+//
-// CleanupStack::PopAndDestroy(); // emptyList
+// RArray<TCalTime> emptyList;
-}
+// CleanupClosePushL( emptyList );
+// iEntry.SetRDatesL( emptyList );
+// CleanupStack::PopAndDestroy(); // emptyList
 }
 }
 if ( isNew || IsAlarmEditedL() && ( iEntry.StatusL() != CCalEntry::ETodoCompleted ) )
 {
 TCalRRule ignore;
 TBool isRepeating = iEntry.GetRRuleL( ignore );
 // If edit alarm of repeating entry, we have to nudge start
 // time to instance date
+if ( isRepeating &&  aRepeatTarget == CalCommon::EThisAndAll )
-if ( isRepeating &&  aRepeatTarget == CalCommon::EThisAndAll
-			    || Edited().EntryType() == CCalEntry::EAnniv && Edited().CalendarType() != ESolar )
-				  // this is lunar anniv
 {
 // nudge to instance date;
 TTime instanceDate = iInstanceDateTime.TimeLocalL();
 if ( IsStartDateTimeEdited() )
 {
 break;
 }
 iEntry.SetPriorityL( priority );
 }
-if (FeatureManager::FeatureSupported( KFeatureIdKorean ))
-	{
-	iEntry.SetUserInt32L( (TUint32)Edited().CalendarType() );
-	}
 if ( isNew )
 {
 CCalEntry::TReplicationStatus status = CCalEntry::EOpen;
 switch ( Edited().SynchType() )
 {
 ASSERT( EFalse );
 break;
 }
 iEntry.SetReplicationStatusL( status );
 }
 /**
 * S60 settings for new entries
 */
 if ( IsCreatingNew() )
 {
+if ( Edited().EntryType() == CCalEntry::EAnniv )
-if ( Edited().EntryType() == CCalEntry::EAnniv && Edited().CalendarType() == ESolar)
+{
-{ /* Lunar entries have different repeating */
 TCalRRule rrule( TCalRRule::EYearly );
 rrule.SetDtStart( iEntry.StartTimeL() );
 rrule.SetInterval( 1 );
 rrule.SetCount( 0 );
 iEntry.SetRRuleL( rrule );
 CCalenEditorDataHandler::TError CCalenEditorDataHandler::CheckAlarmFieldsForErrorsL(TBool aSeries)
 {
 TRACE_ENTRY_POINT;
 TError error = EFormErrNone;
-	if (FeatureManager::FeatureSupported( KFeatureIdKorean ))
-		{
-	if( Edited().CalendarType() == ELunar ||
-	    Edited().CalendarType() == ELunarLeap )
-	    { /* Lunar entries have alarm as offset
-	         and can't thus be erroneous */
-	    return error;
-	    }
-		}
 // If alarm not active, no check
 if ( Edited().IsAlarmActivated() )
 {
 TTime alarm     = Edited().AlarmDateTime();
 TTime startTime = Edited().StartDateTime();
 }
 TRACE_EXIT_POINT;
 return fieldModified;
 }
-TBool CCalenEditorDataHandler::LunarFieldEdited()
-{
-TRACE_ENTRY_POINT;
-	TBool fieldModified = EFalse;
-if (FeatureManager::FeatureSupported( KFeatureIdKorean ))
-	{
-	if( iOriginal->CalendarType() != iEdited->CalendarType() )
-	    {
-	    fieldModified = ETrue;
-	    }
-	}
-TRACE_EXIT_POINT;
-return fieldModified;
-}
 // -----------------------------------------------------------------------------
 // CCalenEditorDataHandler::SetDefaultAlarmDateTimeL
 // Sets the alarm to the default value. This function is called after the user
 // forces an exit, e.g. when pressing the power off button.

branch	RCL_3
changeset 86	ed599363c2d7
parent 74	97232defd20e