FCL/sf/app/commonemail: comparison emailuis/nmailuiwidgets/src/nmrecipientlineedit.cpp

equal deleted inserted replaced

-:139d4b7b2938
+:99bcbff212ad
 */
 NmRecipientLineEdit::NmRecipientLineEdit(QGraphicsItem *parent)
 : NmHtmlLineEdit(parent),
 mNeedToGenerateEmailAddressList(true)
 {
+NM_FUNCTION;
 connect(this, SIGNAL(textChanged(QString)), this, SLOT(handleTextChanged(QString)));
 }
 /*!
 Destructor
 */
 NmRecipientLineEdit::~NmRecipientLineEdit()
 {
+NM_FUNCTION;
 }
 /*!
 Get the emailaddress list generated from the content of the lineedit.
 */
 QList<NmAddress> NmRecipientLineEdit::emailAddressList()
 {
+NM_FUNCTION;
 if (mNeedToGenerateEmailAddressList) {
 // Empty mEmailAddressList.
 mEmailAddressList.clear();
 // Generate mEmailAddressList from the lineedit content.
 generateEmailAddressList();
 #ifdef Q_OS_SYMBIAN
 /*!
 This Slot inserts the selected contacts from Contacts-picker into the lineedit cursor position.
-"You shouldn't be able to convert the parameter selectedContacts into a QStringlist or QString,
-you need to convert selectedContacts into a CntServicesContactList." -- Comments from
-Contacts-picker author Erkinheimo Joonas (Nokia-D/Espoo)
-Contacts-Picker should be working in TB 10.1 MCL wk16 release,
-Custom metatypes problem will be fixed in wk16 by QtHighway.
 */
 void NmRecipientLineEdit::insertSelectedContacts(const QVariant &selectedContacts)
 {
+NM_FUNCTION;
 if (!selectedContacts.isNull()) {
 CntServicesContactList contactList;
 contactList = qVariantValue<CntServicesContactList>(selectedContacts);
 // Loop through all the selected contacts.
 		                              Qt::NoModifier, contactEmailAddress);
 // Forward this contactEmailAddressKeyEvent to base class to handle.
 NmHtmlLineEdit::keyPressEvent(&contactEmailAddressKeyEvent);
 }
 else {
-// Handle a rare case: there's another contact has same name but has different emailaddress.
+// Handle a rare case: there are contacts has same name but different emailaddress.
-for (int i = 0; i != mContactsSelectedFromPhoneBook.count(); ++i) {
+for (int i = 0; i != mRecipientsAddedFromContacts.count(); ++i) {
-if (mContactsSelectedFromPhoneBook.at(i).displayName() == contactName &&
+if (mRecipientsAddedFromContacts.at(i).displayName() == contactName &&
-	    mContactsSelectedFromPhoneBook.at(i).address() != contactEmailAddress) {
+	    mRecipientsAddedFromContacts.at(i).address() != contactEmailAddress) {
-// Differentiate this contact's name by adding a * mark
+// Differentiate this contact by supplying it's emailaddress
-contactName.append("*");
+contactName.append("<");
+contactName.append(contactEmailAddress);
+contactName.append(">");
 }
 }
 // Generate custom keyevent for this contact's name.
 QKeyEvent contactNameKeyEvent(QEvent::KeyPress, Qt::Key_unknown,
 // Form the contact into Qmail NmAddress format.
 NmAddress contact;
 contact.setAddress(contactEmailAddress);
 contact.setDisplayName(contactName);
-// Add this NmAddress formated contact into mContactsSelectedFromPhoneBook.
+// Add this NmAddress formated contact into mRecipientsAddedFromContacts.
-mContactsSelectedFromPhoneBook.append(contact);
+mRecipientsAddedFromContacts.append(contact);
 }
 }
 else {
 //Request returned NULL
-NMLOG("ContactsPicker request returned NULL.");
+NM_COMMENT("ContactsPicker request returned NULL.");
 }
 }
 Q_IMPLEMENT_USER_METATYPE(CntServicesContact)
 P.S. keyPressEvent can only catch QKeyEvent "," or ";" typed from physical keyboard,
 inputMethodEvent method handles user inputs "," or ";" from virtual keyboard.
 */
 void NmRecipientLineEdit::keyPressEvent(QKeyEvent *keyEvent)
 {
+NM_FUNCTION;
 	bool eventHandled = false;
 if (keyEvent) {
 switch (keyEvent->key()) {
 case Qt::Key_Comma:
 inputMethodEvent handles replacing user inputs "," or ";" from virtual keyboard with "; ".
 P.S. keyPressEvent can only catch QKeyEvent "," or ";" typed from physical keyboard
 */
 void NmRecipientLineEdit::inputMethodEvent(QInputMethodEvent *event)
 {
+NM_FUNCTION;
 	bool eventHandled = false;
 if (event) {
 QString eventText = event->commitString();
 }
 }
 /*!
-Generate emailaddress list from the content of the lineedit.
+Generate a list of all the email addresses from the content of the lineedit.
 */
 void NmRecipientLineEdit::generateEmailAddressList()
 {
+NM_FUNCTION;
 // Remove whitespace from the start and the end of the lineedit content.
 QString contentOfLineedit = (this->text()).trimmed();
-// Split the lineedit content into individual items wherever a Semicolon(";") occurs,
+// Split the lineedit content by semicolon(";").
-// empty entries don't appear in the result.
 QStringList itemsOfLineeditContent = contentOfLineedit.split(Semicolon, QString::SkipEmptyParts);
-// Loop through all the items in the itemsOfLineeditContent list.
+// Loop through all the items of the lineedit content.
 for (int i = 0; i != itemsOfLineeditContent.count(); ++i) {
 // Remove whitespace from the start and the end of the item.
 QString itemInLineedit = itemsOfLineeditContent.at(i).trimmed();
-if (mContactsSelectedFromPhoneBook.count() > 0) {
+// Get the count of the recipients added from Contacts.
-// Loop through all the elements in the mContactsSelectedFromPhoneBook list.
+int countOfRecipientsAddedFromContacts = mRecipientsAddedFromContacts.count();
-for (int j = 0; j != mContactsSelectedFromPhoneBook.count(); ++j) {
-NmAddress contact = mContactsSelectedFromPhoneBook.at(j);
+// If there is recipient added from Contacts.
-// If the item matches either the name or the emailaddress of this contact.
+if (countOfRecipientsAddedFromContacts > 0) {
-if (itemInLineedit == contact.displayName() || itemInLineedit == contact.address()) {
+QStringList listOfAddedContactsName;
-// Add the contact into mEmailAddressList.
+QStringList listOfAddedContactsAddress;
-mEmailAddressList.append(contact);
-}
+// Loop through all the recipients added from Contacts.
-else {
+for (int j = 0; j != countOfRecipientsAddedFromContacts; ++j) {
-// Form the item into Qmail NmAddress format.
+NmAddress contact = mRecipientsAddedFromContacts.at(j);
-NmAddress recipient;
+listOfAddedContactsName.append(contact.displayName());
-recipient.setAddress(itemInLineedit);
+listOfAddedContactsAddress.append(contact.address());
-// no display name info available, so don't us it
+}
-recipient.setDisplayName(QString());
-// Add this NmAddress formated lineedit item into mEmailAddressList.
+int indexInAddedContactsName = listOfAddedContactsName.indexOf(itemInLineedit);
-mEmailAddressList.append(recipient);
+int indexInAddedContactsAddress = listOfAddedContactsAddress.indexOf(itemInLineedit);
-}
-}
+// If this itemInLineedit matches the name of one added contact.
-}
+if (indexInAddedContactsName >= 0) {
-else {
+// Add the recipient into mEmailAddressList.
-// Form the item into Qmail NmAddress format.
+mEmailAddressList.append(mRecipientsAddedFromContacts.at(indexInAddedContactsName));
+}
+// If this itemInLineedit matches the emailaddress of one added contact.
+else if (indexInAddedContactsAddress >= 0) {
+// Add the recipient into mEmailAddressList.
+mEmailAddressList.append(mRecipientsAddedFromContacts.at(indexInAddedContactsAddress));
+}
+// This itemInLineedit is not added from Contacts
+else {
+// Form the item into NmAddress format.
+NmAddress recipient;
+recipient.setAddress(itemInLineedit);
+// There is no display name info available, so leave display name empty.
+recipient.setDisplayName(QString());
+// Add this NmAddress formated lineedit item into mEmailAddressList.
+mEmailAddressList.append(recipient);
+}
+}
+else { // There is no recipient is added from Contacts
+// Form the item into NmAddress format.
 NmAddress recipient;
 recipient.setAddress(itemInLineedit);
-// no display name info available, so don't us it
+// There is no display name info available, so leave display name emapty.
 recipient.setDisplayName(QString());
 // Add this NmAddress formated lineedit item into mEmailAddressList.
 mEmailAddressList.append(recipient);
 }
 }
 /*!
 This Slot is called when the lineedit text changes.
 */
 void NmRecipientLineEdit::handleTextChanged(const QString &text)
 {
+NM_FUNCTION;
 Q_UNUSED(text);
 mNeedToGenerateEmailAddressList = true;
 }

changeset 43	99bcbff212ad
parent 23	2dc6caa42ec3
child 47	f83bd4ae1fe3
child 54	997a02608b3a