From c88bbac70d8853617c26eb88aa06444191d7e9e5 Mon Sep 17 00:00:00 2001 From: Amith Kumar Mahale Date: Tue, 8 Oct 2013 15:26:15 +0530 Subject: [PATCH] Fix for N_SE-54491 N_SE-54350 N_SE-54219 N_SE-54117 Change-Id: Iaa8ab63b11cd990ab5639896e4c2369a85e5fc84 Signed-off-by: Amith Kumar Mahale --- src/ClEventEditorForm.cpp | 4 +++- src/ClEventListPresentationModel.cpp | 3 ++- src/ClResourceManager.cpp | 2 +- src/ClSettingForm.cpp | 5 +++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/ClEventEditorForm.cpp b/src/ClEventEditorForm.cpp index 9a59b5d..6ffe273 100644 --- a/src/ClEventEditorForm.cpp +++ b/src/ClEventEditorForm.cpp @@ -708,7 +708,9 @@ EventEditorForm::OnSectionTableViewItemStateChanged(SectionTableView& tableView, { pList->Add(new (std::nothrow) Recurrence(*__pPm->GetRecurrence())); } - + // SetFoucs added here to avoid keyboard flicker when the focus is on Description + //and a Invalid repeat is set N_SE-54019 + SetFocus(); SceneManager::GetInstance()->GoForward(ForwardSceneTransition(IDSCN_REPEAT, SCENE_TRANSITION_ANIMATION_TYPE_LEFT), pList); } diff --git a/src/ClEventListPresentationModel.cpp b/src/ClEventListPresentationModel.cpp index 3fc4830..60e2437 100644 --- a/src/ClEventListPresentationModel.cpp +++ b/src/ClEventListPresentationModel.cpp @@ -1338,7 +1338,8 @@ EventListPresentationModel::LoadDeleteEvents(const DateTime& start, const DateTi { CalEventInstance *pInstance = static_cast(pEventsEnum->GetCurrent()); DateTime startDate = pInstance->GetStartTime(); - startDate.SetValue(startDate.GetYear(), startDate.GetMonth(), startDate.GetDay()); + DateTime eventStartWallTime = ResourceManager::ConvertUtcTimeToWallTime(startDate); + startDate.SetValue(eventStartWallTime.GetYear(), eventStartWallTime.GetMonth(), eventStartWallTime.GetDay()); if(__indexedOriginalEvents.GetCount() == 0) { EventInstanceListNode* pListNode = new (std::nothrow) EventInstanceListNode(startDate); diff --git a/src/ClResourceManager.cpp b/src/ClResourceManager.cpp index 0ef0a86..6d7745e 100644 --- a/src/ClResourceManager.cpp +++ b/src/ClResourceManager.cpp @@ -390,7 +390,7 @@ ResourceManager::ParseVcsFileN(const String& filePath) Social::CalEvent *pEvent = static_cast(pEvents->GetAt(0)); if (pEvent && ((pEvent->GetStartTime()).CompareTo(Social::Calendarbook::GetMinDateTime()) > 0 && (pEvent->GetEndTime()).CompareTo(Social::Calendarbook::GetMaxDateTime()) < 0) && - (pEvent->GetEndTime()).CompareTo(pEvent->GetStartTime()) > 0) + ((pEvent->GetEndTime()).CompareTo(pEvent->GetStartTime()) > 0 || (pEvent->GetEndTime()).CompareTo(pEvent->GetStartTime())== 0)) { pResultList->Add(pEvents->GetAt(0)); } diff --git a/src/ClSettingForm.cpp b/src/ClSettingForm.cpp index 8caf7cf..d00a08a 100644 --- a/src/ClSettingForm.cpp +++ b/src/ClSettingForm.cpp @@ -640,6 +640,11 @@ SettingForm::OnSectionTableViewItemStateChanged(SectionTableView& tableView, int { AppLogException("[%s] Failed to launch appcontrol.", GetErrorMessage(r)); } + // Todo: temporary solution for appcontrol. + if (!IsFailed(r)) + { + UiApp::GetInstance()->GetAppFrame()->GetFrame()->SetEnabled(false); + } break; } case IMPORT_EXPORT_ITEM_EXPORT: -- 2.7.4