FCL/sf/app/organizer: comparison calendarui/controller/src/calendeleteui.cpp

equal deleted inserted replaced

-:a5a1242fd2e8
+:b0711afde476
 //
 void CalenDeleteUi::ConstructL()
 {
 OstTraceFunctionEntry0( CALENDELETEUI_CONSTRUCTL_ENTRY );
-iController.RegisterForNotificationsL( this, ECalenNotifyCancelDelete );
+RArray<TCalenNotification> notifications;
+notifications.Append(ECalenNotifyCancelDelete);
+notifications.Append(ECalenNotifyCloseDialogs);
+iController.RegisterForNotificationsL( this, notifications );
+notifications.Close();
 iMoreEntriesToDelete = EFalse;
 iDisplayQuery = EFalse;
 iEntriesToDelete = KEntriesToDelete;
 OstTraceFunctionExit0( CALENDELETEUI_CONSTRUCTL_EXIT );
 MCalenContext& context = iController.context();
 // reset the multiple contexts
 context.resetMultipleContextIds();
 }
+}
+else if (aNotification == ECalenNotifyCloseDialogs )
+{
+	// Emit the signal to close all the dialogs which are already opened
+	emit closeDialogs();
 }
 OstTraceFunctionExit0( CALENDELETEUI_HANDLENOTIFICATION_EXIT );
 }
 	{
 OstTraceFunctionEntry0( CALENDELETEUI_DATEQUERY_ENTRY );
 	// Create a popup with datepicker to select the date.
 	HbDialog *popUp = new HbDialog();
+	popUp->setParent(this);
 	popUp->setDismissPolicy(HbDialog::NoDismiss);
 	popUp->setTimeout(HbDialog::NoTimeout );
 	popUp->setAttribute( Qt::WA_DeleteOnClose, true );
 	popUp->setHeadingWidget(new HbLabel(hbTrId("txt_calendar_title_set_date")));
 	mDeleteAction = new HbAction(
 						hbTrId("txt_common_button_delete"), popUp);
 	popUp->addAction(mDeleteAction);
 	mCancelAction = new HbAction(hbTrId("txt_common_button_cancel"),popUp);
 	popUp->addAction(mCancelAction);
+	// Close the popup once closeDialogs() is received
+	connect(this, SIGNAL(closeDialogs()), popUp, SLOT(close()));
 	// Show the popup
 	popUp->open(this, SLOT(handleDateQuery(HbAction*)));
 	OstTraceFunctionExit0( CALENDELETEUI_DATEQUERY_EXIT );
 	}
 				iController.BroadcastNotification(ECalenNotifyDeleteFailed);
 			}
 		}
 	}else {
 		// User pressed cancel
-		handleDeleteCancel();
+		iController.BroadcastNotification(ECalenNotifyDeleteFailed);
 	}
 	// Reset the member variables
 	mDeleteAction = NULL;
 	mCancelAction = NULL;
 void CalenDeleteUi::showRepeatingEntryDeleteQuery()
 {
 OstTraceFunctionEntry0( CALENDELETEUI_SHOWREPEATINGENTRYDELETEQUERY_ENTRY );
 HbDialog *popUp = new HbDialog();
+popUp->setParent(this);
 popUp->setDismissPolicy(HbDialog::NoDismiss);
 popUp->setTimeout(HbDialog::NoTimeout);
 popUp->setAttribute( Qt::WA_DeleteOnClose, true );
 QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical);
 popUp->setContentWidget(editWidget);
 popUp->setHeadingWidget(new HbLabel(
 						hbTrId("txt_calendar_title_delete_repeated_entry")));
 // Add cancel action
-HbAction *cancelAction = new HbAction(
+mCancelAction = new HbAction(
-							hbTrId("txt_common_button_cancel_singledialog"));
+					hbTrId("txt_common_button_cancel_singledialog"));
-popUp->addAction(cancelAction);
+popUp->addAction(mCancelAction);
 connect(editButtonList, SIGNAL(itemSelected(int)), this,
 										SLOT(handleRepeatedEntryDelete(int)));
 connect(editButtonList, SIGNAL(itemSelected(int)), popUp, SLOT(close()));
-connect(cancelAction, SIGNAL(triggered()), this,
+// Close the popup once closeDialogs() is received
-										SLOT(handleDeleteCancel()));
+connect(this, SIGNAL(closeDialogs()), popUp, SLOT(close()));
 // Show the popup
-popUp->open();
+popUp->open(this, SLOT(handleCancelAndClose(HbAction*)));
 OstTraceFunctionExit0( CALENDELETEUI_SHOWREPEATINGENTRYDELETEQUERY_EXIT );
 }
 // ----------------------------------------------------------------------------
-// CalenDeleteUi::handleDeleteCancel
+// CalenDeleteUi::handleCancelAndClose
-// Handles the cancel action
+// Handles the cancel action and the close of the popup
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
-void CalenDeleteUi::handleDeleteCancel()
+void CalenDeleteUi::handleCancelAndClose(HbAction* action)
 {
-OstTraceFunctionEntry0( CALENDELETEUI_HANDLEDELETECANCEL_ENTRY );
+	OstTraceFunctionEntry0( CALENDELETEUI_HANDLECANCELANDCLOSE_ENTRY );
+	if(action == mCancelAction || !action) {
-	iController.BroadcastNotification(ECalenNotifyDeleteFailed);
+		// If the user presses cancel button broadcast ECalenNotifyDeleteFailed
+		// Action will be null if the popup is closed by itself
-	OstTraceFunctionExit0( CALENDELETEUI_HANDLEDELETECANCEL_EXIT );
+		// without pressing any buttons. So in this case also notification
+		// has to be broadcasted as ECalenNotifyDeleteFailed
+		iController.BroadcastNotification(ECalenNotifyDeleteFailed);
+	}
+	mCancelAction = NULL;
+	OstTraceFunctionExit0( CALENDELETEUI_HANDLECANCELANDCLOSE_EXIT );
 }
 void CalenDeleteUi::handleRepeatedEntryDelete(int index)
 {
 OstTraceFunctionEntry0( CALENDELETEUI_HANDLEREPEATEDENTRYDELETE_ENTRY );
 const int count)
 {
 OstTraceFunctionEntry0( CALENDELETEUI_SHOWDELETEQUERY_ENTRY );
 HbMessageBox *popup = new HbMessageBox(HbMessageBox::MessageTypeQuestion);
+popup->setParent(this);
 popup->setDismissPolicy(HbDialog::NoDismiss);
 popup->setTimeout(HbDialog::NoTimeout);
 popup->setAttribute( Qt::WA_DeleteOnClose, true );
 QString text = 0;
 mDeleteAction = new HbAction(
 						hbTrId("txt_common_button_delete"), popup);
 popup->addAction(mDeleteAction);
 mCancelAction = new HbAction(hbTrId("txt_common_button_cancel"), popup);
 popup->addAction(mCancelAction);
+// Close the popup once closeDialogs() is received
+connect(this, SIGNAL(closeDialogs()), popup, SLOT(close()));
+// Show the popup
 popup->open(this, SLOT(handleDeletion(HbAction*)));
 OstTraceFunctionExit0( CALENDELETEUI_SHOWDELETEQUERY_EXIT );
 }
 			default:
 				break;
 		}
-	} else {
+	} else if(!action || action == mCancelAction ) {
-		// If the user presses cancel button the notification will be
+		// Action will be null if the popup is closed by itself
-		// ECalenNotifyDeleteFailed as default.
+		// without pressing any buttons. So in this case also notification
+		// has to be broadcasted as ECalenNotifyDeleteFailed
+		// If the user presses cancel button also the same has to happen
 		// Notify the status
 		iController.BroadcastNotification(notification);
 	}
 	// Reset the member variables

changeset 77	b0711afde476
parent 58	ef813d54df51
child 80	fa7c359294fa