MCL/sf/app/organizer: comparison calendarui/controller/src/calenmultipledbui.cpp

equal deleted inserted replaced

-:0f07cd1b5772
+:1984aceb8774
 // Constructor
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 CCalenMultipleDbUi::CCalenMultipleDbUi(CCalenController& aController) :
-iController(aController),
+iController(aController)
-iDialogLaunched(EFalse)
 {
 TRACE_ENTRY_POINT;
 TRACE_EXIT_POINT;
 }
 notificationArray.Append(ECalenNotifyCalendarInfoCreated);
 notificationArray.Append(ECalenNotifyCalendarInfoUpdated);
 notificationArray.Append(ECalenNotifyCalendarFileDeleted);
 iController.RegisterForNotificationsL(this, notificationArray);
+notificationArray.Close();
 iConflictOccured = EFalse;
+TCallBack callBackDeleteQuery(CCalenMultipleDbUi::DoAsyncDeleteTemL, this);
+iAsyncDeletequery = new(ELeave) CAsyncCallBack(callBackDeleteQuery,CActive::EPriorityStandard);
 TRACE_EXIT_POINT;
 }
 // ----------------------------------------------------------------------------
 iNaviContainer->Pop(); // Remove navi pane used by settings view
 iNaviContainer = NULL; // iNaviContainer is not owned
 }
 delete iBgContext;
+iBgContext = NULL;
 iListBox->Reset();
 delete iListBox;
+iListBox = NULL;
 delete iDesArray;
+iDesArray = NULL;
 iColorUidArray.Close();
 iIconIndices.Reset();
 iIconIndices.Close();
 iAsyncExit->Cancel();
 delete iAsyncExit;
+iAsyncExit = NULL;
+iAsyncDeletequery->Cancel();
+delete iAsyncDeletequery;
+iAsyncDeletequery = NULL;
+if(iCalendarInfoNew)
+{
+delete iCalendarInfoNew;
+iCalendarInfoNew = NULL;
+}
+if(iCalendarInfoOriginal)
+{
+delete iCalendarInfoOriginal;
+iCalendarInfoOriginal = NULL;
+}
 TRACE_EXIT_POINT;
 }
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 //
 void CCalenMultipleDbUi::UpdateListboxL()
 {
 TRACE_ENTRY_POINT;
+if(!iListBox)
+return;
 iListBox->View()->SetDisableRedraw( ETrue );
 iDesArray->Reset();
 iColorUidArray.Close();
 SetTitlePaneL();
 iNaviContainer->PushDefaultL();
 // Set title text
 CAknTitlePane* tp = static_cast<CAknTitlePane*>(
 sp->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) );
+HBufC* titleText;
-HBufC* titleText = StringLoader::LoadLC( R_QTN_CALE_TITLE_CALENDARS , iCoeEnv );
+if(iIsDbEditorOpen)
+{
+titleText = StringLoader::LoadLC( R_QTN_CALE_TITLE_CALENDAR , iCoeEnv );
+}
+else
+{
+titleText = StringLoader::LoadLC( R_QTN_CALE_TITLE_CALENDARS , iCoeEnv );
+}
 tp->SetTextL( *titleText );  // r_qtn_cale_title_calendars
 CleanupStack::PopAndDestroy( titleText );
 TRACE_EXIT_POINT;
 }
 // ----------------------------------------------------------------------------
 // CCalenMultipleDbUi::DynInitMenuPaneL
 // Do functionalites before options menu execs
 }
 }
 break;
 case ECalenCmdDelete:
 {
-DeleteItemL();
+iAsyncDeletequery->CallBack();
-}
+		  }
 break;
 case ECalenCmdItemSelect:
+case ECalenCmdShow:
 {
 DoSelectionL(ETrue);
 }
 break;
 case ECalenCmdItemDeselect:
+case ECalenCmdHide:
 {
 DoSelectionL(EFalse);
 }
 break;
 case EAknCmdExit:
 {
 iAsyncExitCmd = EAknSoftkeyExit;
 iAsyncExit->CallBack();
 }
 break;
-case ECalenCmdShow:
-{
-DoSelectionL( ETrue );
-}
-break;
-case ECalenCmdHide:
-{
-DoSelectionL( EFalse );
-}
-break;
 default:
 break;
 }
 TRACE_EXIT_POINT;
 }
 // ----------------------------------------------------------------------------
 //
 TInt CCalenMultipleDbUi::AddItemL()
 {
 TRACE_ENTRY_POINT
-TInt retValue = KErrNotFound;
+TInt retValue = 0;
-CCalCalendarInfo* calendarInfo = CCalCalendarInfo::NewL();
+if(iCalendarInfoNew)
-calendarInfo->SetNameL(KNullDesC16);
+{
-calendarInfo->SetColor(255);
+delete iCalendarInfoNew;
-calendarInfo->SetEnabled(ETrue);
+iCalendarInfoNew = NULL;
-iDbEditor = CCalenMultiDBEditor::NewL( *calendarInfo, iController, EFalse );
+}
+iCalendarInfoNew = CCalCalendarInfo::NewL();
+iCalendarInfoNew->SetNameL(KNullDesC16);
+iCalendarInfoNew->SetColor(255);
+iCalendarInfoNew->SetEnabled(ETrue);
+iDbEditor = CCalenMultiDBEditor::NewL(*this,*iCalendarInfoNew, iController, EFalse );
-iDialogLaunched = ETrue;
+//Async dialog
 retValue = iDbEditor->ExecuteLD();
 iDbEditor = NULL;
-iDialogLaunched = EFalse;
 if(EAknCmdExit == retValue )
 {
 iController.BroadcastNotification(ECalenNotifyRealExit);
 }
-HBufC* calendarName = calendarInfo->NameL().AllocLC();
+TRACE_EXIT_POINT
-calendarName->Des().Trim();
+return retValue;
-if(calendarName->Length() > 0)
+}
-{
+// ----------------------------------------------------------------------------
+// CCalenMultipleDbUi::UpdateAddOrEditL
+// ----------------------------------------------------------------------------
+//
+void CCalenMultipleDbUi::UpdateOnAddOrEditL(TBool aItemAdded)
+{
+TRACE_ENTRY_POINT
+if(aItemAdded)
+{
 // Set calendar properties for new calendar being created.
-SetCalendarAddPropertiesL(*calendarInfo);
+SetCalendarAddPropertiesL(*iCalendarInfoNew);
-iController.AddCalendarL(calendarInfo);
+iController.AddCalendarL(iCalendarInfoNew);
+iCalendarInfoNew = NULL;
-UpdateListboxL();
 //Highlight the newly created list item
 iListBox->ScrollToMakeItemVisible(iListBox->BottomItemIndex());
 iListBox->SetCurrentItemIndexAndDraw(iDesArray->Count()-1);
 }
 else
 {
-delete calendarInfo;
+//Before checking for changes , check if any conflict occured i.e calendar updated / deleted.
-}
+//if there is conflict iConflictOccured = true then skip below condition.
+if (!iConflictOccured && iCalendarInfoOriginal &&
-CleanupStack::PopAndDestroy(calendarName);
+CheckForChangesL(*iCalendarInfoOriginal,
+*iCalendarInfoEdited))
+{
+// update the calendar properties such as modification time, sync status.
+SetCalendarUpdatePropertiesL(*iCalendarInfoEdited);
+iController.UpdateCalendarL(iCalendarInfoEdited);
+}
+iConflictOccured = EFalse;
+delete iCalendarInfoOriginal,iCalendarInfoOriginal = NULL;
+}
+iIsDbEditorOpen = EFalse ; //iIsDbEditorOpen should be set before calling UpdateListboxL()
+UpdateListboxL();
 TRACE_EXIT_POINT
-return retValue;
+}
+// ----------------------------------------------------------------------------
+// CCalenMultipleDbUi::ExitDialogL
+// Edit item from listbox
+// ----------------------------------------------------------------------------
+//
+void CCalenMultipleDbUi::ExitDialogL()
+{
+TRACE_ENTRY_POINT
+iAsyncExitCmd = EAknSoftkeyExit;
+iAsyncExit->CallBack();
+TRACE_EXIT_POINT
 }
 // ----------------------------------------------------------------------------
 // CCalenMultipleDbUi::EditItemL
 // Edit item from listbox
 TInt CCalenMultipleDbUi::EditItemL()
 {
 TRACE_ENTRY_POINT
 TInt retValue = KErrNotFound;
 TInt currentIndex = iListBox->CurrentItemIndex();
-TInt listCount = iListBox->Model()->ItemTextArray()->MdcaCount();
 RPointerArray<CCalCalendarInfo> calendarInfoList;
 iController.GetAllCalendarInfoL(calendarInfoList);
 CleanupClosePushL(calendarInfoList);
-CCalCalendarInfo* calendarInfoedited = calendarInfoList[currentIndex];
+iCalendarInfoEdited = calendarInfoList[currentIndex];
+CleanupStack::PopAndDestroy(&calendarInfoList);
 //Take a copy of original before editing
-CCalCalendarInfo* calendarInfoOriginal = CCalCalendarInfo::NewL();
+if(iCalendarInfoOriginal)
-CleanupStack::PushL(calendarInfoOriginal);
+{
-calendarInfoOriginal->SetNameL(calendarInfoedited->NameL());
+delete iCalendarInfoOriginal;
-calendarInfoOriginal->SetColor(calendarInfoedited->Color());
+iCalendarInfoOriginal = NULL;
-calendarInfoOriginal->SetEnabled(calendarInfoedited->Enabled());
+}
+iCalendarInfoOriginal = CCalCalendarInfo::NewL();
+iCalendarInfoOriginal->SetNameL(iCalendarInfoEdited->NameL());
+iCalendarInfoOriginal->SetColor(iCalendarInfoEdited->Color());
+iCalendarInfoOriginal->SetEnabled(iCalendarInfoEdited->Enabled());
 TBuf8<KBuffLength> keyBuff;
 TBool syncstatus = EFalse;
 keyBuff.Zero();
 keyBuff.AppendNum( ESyncStatus );
 TPckgC<TBool> pckgSyncStatusValue(syncstatus);
-pckgSyncStatusValue.Set(calendarInfoedited->PropertyValueL( keyBuff ));
+pckgSyncStatusValue.Set(iCalendarInfoEdited->PropertyValueL( keyBuff ));
-calendarInfoOriginal->SetPropertyL( keyBuff, pckgSyncStatusValue );
+iCalendarInfoOriginal->SetPropertyL( keyBuff, pckgSyncStatusValue );
-iDbEditor = CCalenMultiDBEditor::NewL(*calendarInfoedited, iController,
+iDbEditor = CCalenMultiDBEditor::NewL(*this,*iCalendarInfoEdited, iController,
 ETrue);
-iDialogLaunched = ETrue;
+//Async dialog
 retValue = iDbEditor->ExecuteLD();
 iDbEditor = NULL;
-iDialogLaunched = EFalse;
-//Before checking for changes , check if any conflict occured i.e calendar updated / deleted.
-//if there is conflict iConflictOccured = true then skip below condition.
-if (!iConflictOccured && CheckForChangesL(*calendarInfoOriginal,
-*calendarInfoedited))
-{
-// update the calendar properties such as modification time, sync status.
-SetCalendarUpdatePropertiesL(*calendarInfoedited);
-iController.UpdateCalendarL(calendarInfoedited);
-}
-iConflictOccured = EFalse;
-UpdateListboxL();
-//If conflict occured i.e calendar deleted check for list count before and after
-//and update focus accordingly
-if (listCount != iListBox->Model()->ItemTextArray()->MdcaCount())
-{
-ReAdjustListItemFocusL(currentIndex);
-}
-CleanupStack::PopAndDestroy(calendarInfoOriginal);
-CleanupStack::PopAndDestroy(&calendarInfoList);
 return retValue;
 TRACE_EXIT_POINT
 }
 // ----------------------------------------------------------------------------
 TKeyResponse exitCode(EKeyWasNotConsumed);
 if(aType == EEventKey )
 {
 if( aKeyEvent.iCode == EKeyEscape )
 {
-TryExitL( EKeyNo );
+TryExitL( EKeyEscape );
 return exitCode; // Chain this one up to the main app so it closes calendar app.
 }
 else if(aType == EEventKey && TChar(aKeyEvent.iCode).IsPrint() )
 {
 ProcessCommandL(ECalenCmdAdd);
 {
 ProcessCommandL(ECalenCmdEdit);
 }
 break;
 case EAknSoftkeyBack:
+case EKeyEscape:
 {
 iController.BroadcastNotification(ECalenNotifyDeleteInstanceView);
-okExit = ETrue;
-}
-break;
-	   case EKeyEscape:
-{
 okExit = ETrue;
 }
 break;
 default:
 {
 CCalenMultipleDbUi* self = static_cast<CCalenMultipleDbUi*>(aPtr);
 self->TryExitL(self->iAsyncExitCmd);
 TRACE_EXIT_POINT
 return 0;
 }
+// ----------------------------------------------------------------------------
+// CCalenMultipleDbUi::CallBackForDeleteItemL
+// (other items were commented in a header).
+// ----------------------------------------------------------------------------
+//
+TInt CCalenMultipleDbUi::DoAsyncDeleteTemL(TAny* aPtr)
+{
+TRACE_ENTRY_POINT
+CCalenMultipleDbUi* self = static_cast<CCalenMultipleDbUi*>(aPtr);
+self->DeleteItemL();
+TRACE_EXIT_POINT
+return 0;
+}
 // ----------------------------------------------------------------------------
 // CCalenMultipleDbUi::CreateButtonL
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 const TInt index(iListBox->CurrentItemIndex());
 if ( index != KErrNotFound && !iIsDbEditorOpen )
 {
 iIsDbEditorOpen = ETrue ;
 ProcessCommandL( ECalenCmdEdit );
-iIsDbEditorOpen = EFalse ;
 }
 }
 }
 TRACE_EXIT_POINT;
 }

branch	RCL_3
changeset 13	1984aceb8774
parent 11	0f07cd1b5772
child 14	21239b3bcd78