From 1da05155cf0484a227029d53d64640c4d8295d46 Mon Sep 17 00:00:00 2001 From: Gaurav Bhatt Date: Wed, 26 Jun 2013 12:59:12 +0530 Subject: [PATCH] Fix for N_SE-43133,N_SE-24332 Change-Id: I1d048a5a903a1b3a705f1015cc377db6f21ab05c Signed-off-by: Gaurav Bhatt --- src/ClEventDeleterForm.cpp | 21 ++++++++++----------- src/ClTypes.cpp | 16 ++++++++-------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/ClEventDeleterForm.cpp b/src/ClEventDeleterForm.cpp index f7220a4..d446ee2 100644 --- a/src/ClEventDeleterForm.cpp +++ b/src/ClEventDeleterForm.cpp @@ -583,6 +583,16 @@ EventDeleterForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, i } } + const CalEventInstance* pEventInst = __pPm->GetEventWithWholeIndex(actualGroupIndex, itemIndex); + RecordId id; + if (pEventInst != null) + { + id = pEventInst->GetOriginalEventId(); + } + + AutoCheckSameEvents(id, status); + SetAllSelectedEvents(listView, groupIndex, itemIndex, status); + if (__pGroupedListViewDeleteList->IsItemChecked(groupIndex, itemIndex) == true) { __pSelectAll->SetSelected(IsSelectedAllEvent()); @@ -599,15 +609,6 @@ EventDeleterForm::OnGroupedListViewItemStateChanged(GroupedListView& listView, i } Invalidate(true); } - - const CalEventInstance* pEventInst = __pPm->GetEventWithWholeIndex(actualGroupIndex, itemIndex); - RecordId id; - if (pEventInst != null) - { - id = pEventInst->GetOriginalEventId(); - } - AutoCheckSameEvents(id,status); - SetAllSelectedEvents(listView, groupIndex, itemIndex, status); UpdateSelectedLabel(); } @@ -867,8 +868,6 @@ EventDeleterForm::AutoCheckSameEvents(RecordId id_original, ListItemStatus statu } } } - - } void EventDeleterForm::OnCalendarEventChanged(void) diff --git a/src/ClTypes.cpp b/src/ClTypes.cpp index 1bf4b20..351a652 100644 --- a/src/ClTypes.cpp +++ b/src/ClTypes.cpp @@ -161,14 +161,14 @@ const wchar_t* IDS_REMINDER_WEEK_BEFORE = L"IDS_REMINDER_WEEK_BEFORE"; const wchar_t* IDS_REMINDER_DAY_BEFORE = L"IDS_REMINDER_DAY_BEFORE"; const wchar_t* IDS_REMINDER_HOUR_BEFORE = L"IDS_REMINDER_HOUR_BEFORE"; const wchar_t* IDS_REMINDER_MINUTE_BEFORE = L"IDS_REMINDER_MINUTE_BEFORE"; -const wchar_t* IDS_REPEAT_EVERY_DAY = L"IDS_REPEAT_EVERY_DAY"; -const wchar_t* IDS_REPEAT_EVERY_WEEK = L"IDS_REPEAT_EVERY_WEEK"; -const wchar_t* IDS_REPEAT_EVERY_MONTH = L"IDS_REPEAT_EVERY_MONTH"; -const wchar_t* IDS_REPEAT_EVERY_YEAR = L"IDS_REPEAT_EVERY_YEAR"; -const wchar_t* IDS_REPEAT_EVERY_N_DAYS = L"IDS_REPEAT_EVERY_N_DAYS"; -const wchar_t* IDS_REPEAT_EVERY_N_WEEKS = L"IDS_REPEAT_EVERY_N_WEEKS"; -const wchar_t* IDS_REPEAT_EVERY_N_MONTHS = L"IDS_REPEAT_EVERY_N_MONTHS"; -const wchar_t* IDS_REPEAT_EVERY_N_YEARS = L"IDS_REPEAT_EVERY_N_YEARS"; +const wchar_t* IDS_REPEAT_EVERY_DAY = L"IDS_CLD_BODY_EVERY_DAY_ATNT"; +const wchar_t* IDS_REPEAT_EVERY_WEEK = L"IDS_CLD_BODY_EVERY_WEEK"; +const wchar_t* IDS_REPEAT_EVERY_MONTH = L"IDS_CLD_BODY_EVERY_MONTH"; +const wchar_t* IDS_REPEAT_EVERY_YEAR = L"IDS_CLD_BODY_EVERY_YEAR"; +const wchar_t* IDS_REPEAT_EVERY_N_DAYS = L"IDS_CLD_BODY_EVERY_PD_DAYS"; +const wchar_t* IDS_REPEAT_EVERY_N_WEEKS = L"IDS_CLD_BODY_EVERY_PD_WEEKS"; +const wchar_t* IDS_REPEAT_EVERY_N_MONTHS = L"IDS_CLD_BODY_EVERY_PD_MONTHS"; +const wchar_t* IDS_REPEAT_EVERY_N_YEARS = L"IDS_CLD_BODY_EVERY_PD_YEARS"; const wchar_t* IDS_TASK_PRIORITY_MIDDLE = L"IDS_TASK_PRIORITY_MIDDLE"; const wchar_t* IDS_POPUP_DELETE_MULTIPLE_REPEATED_EVENT = L"IDS_COACH_POP_IF_DELETE_REPEATED_EVENT"; const wchar_t* IDS_POPUP_EDIT_EVENT_QUESTION = L"IDS_POPUP_EDIT_EVENT_QUESTION"; -- 2.7.4