diff -r 9c5b1510919f -r bf573002ff72 calendarui/settings/settingsui/src/calensetting.cpp --- a/calendarui/settings/settingsui/src/calensetting.cpp Wed Jun 09 09:40:23 2010 +0300 +++ b/calendarui/settings/settingsui/src/calensetting.cpp Mon Jun 21 15:38:59 2010 +0300 @@ -88,6 +88,7 @@ CCalenSetting::CCalenSetting() : iWeekFormat( EMonday ), iWeekTitle( EWeekTitleNumber ), + iWeekNumber( EWeekNumberOff ), iSnoozeTime( KDefaultSnoozeTime ), iToolbar(1) @@ -187,6 +188,18 @@ } // --------------------------------------------------------- +// CCalenSetting::WeekTitle +// Return setting type of week title +// (other items were commented in a header). +// --------------------------------------------------------- +// +EXPORT_C TCalenWeekNumber CCalenSetting::WeekNumberEnable() const + { + TRACE_ENTRY_POINT; + TRACE_EXIT_POINT; + return iWeekNumber; + } +// --------------------------------------------------------- // CCalenSetting::SnoozeTime // Return the snooze time setting. // (other items were commented in a header). @@ -553,6 +566,21 @@ } // --------------------------------------------------------- +// CCalenSetting::SetWeekNumber +// Set week title +// (other items were commented in a header). +// --------------------------------------------------------- +// +EXPORT_C void CCalenSetting::SetWeekNumber( TCalenWeekNumber aNumber ) + { + TRACE_ENTRY_POINT; + + iWeekNumber = aNumber; + + TRACE_EXIT_POINT; + } + +// --------------------------------------------------------- // CCalenSetting::SetSnoozeTime // Return the snooze time setting. // (other items were commented in a header). @@ -649,6 +677,9 @@ // Central Repository data matches. User::LeaveIfError( repository->Get( KCalendarWeekViewTitle, tmp ) ); iWeekTitle = static_cast( tmp ); + + User::LeaveIfError( repository->Get( KCalendarWeekViewNumber, tmp ) ); + iWeekNumber = static_cast( tmp ); User::LeaveIfError( repository->Get( KCalendarSnoozeTime, tmp ) ); iSnoozeTime = tmp; @@ -697,6 +728,9 @@ // Central Repository data matches. tmp = static_cast( iWeekTitle ); User::LeaveIfError( repository->Set( KCalendarWeekViewTitle, tmp ) ); + + tmp = static_cast( iWeekNumber ); + User::LeaveIfError( repository->Set( KCalendarWeekViewNumber, tmp ) ); tmp = iSnoozeTime; User::LeaveIfError( repository->Set( KCalendarSnoozeTime, tmp ) );