FCL/sf/app/contacts: comparison phonebookui/pbkcommonui/src/cntcontactcarddatacontainer.cpp

equal deleted inserted replaced

-:de1630741fbe
+:2a11b5b00470
 #include "cntcontactcarddatacontainer.h"
 #include "cntcontactcarddataitem.h"
 #include <cntmaptileservice.h> //For fetching maptile
 #include <QPainter>
+#include <QList>
 #include <qtcontacts.h>
 #include <hbicon.h>
 #include <cntviewparams.h>
 #include "cntstringmapper.h"
+/*!
+Compare function for CntContactCardDataItem
+*/
+namespace
+{
+bool compareObjects(const CntContactCardDataItem *d1, const CntContactCardDataItem *d2)
+{
+return d1->mPosition < d2->mPosition;
+}
+}
 /*!
 Constructor
 */
 CntContactCardDataContainer::CntContactCardDataContainer(QContact* contact, QObject *parent) : mContact(contact), mSeparatorIndex(-1)
 for (int i = 0; i < details.count(); i++)
 {
 if (availableActions.contains("call", Qt::CaseInsensitive) && supportsDetail("call", details[i]) && details[i].definitionName() == QContactPhoneNumber::DefinitionName)
 {
 QContactPhoneNumber number(details.at(i));
-QString title;
-QString icon;
+QString context = number.contexts().isEmpty() ? QString() : number.contexts().first();
-if (!number.contexts().isEmpty())
+QString subtype = number.subTypes().isEmpty() ? number.definitionName() : number.subTypes().first();
-{
-title = mStringMapper.getContactCardListLocString(number.subTypes().first(), number.contexts().first());
-icon = mStringMapper.getContactCardIconString(number.subTypes().first(), number.contexts().first());
-}
-else
-{
-title = mStringMapper.getContactCardListLocString(number.subTypes().first(), QString());
-icon = mStringMapper.getContactCardIconString(number.subTypes().first(), QString());
-}
-CntContactCardDataItem* dataItem = new CntContactCardDataItem(title, true);
+CntContactCardDataItem* dataItem = new CntContactCardDataItem(mStringMapper.getContactCardListLocString(subtype, context), itemCount(), true);
 dataItem->setAction("call");
 dataItem->setValueText(number.number());
-dataItem->setIcon(HbIcon(icon));
+dataItem->setIcon(HbIcon(mStringMapper.getContactCardIconString(subtype, context)));
 dataItem->setContactDetail(number);
 mDataItemList.insert(itemCount(), dataItem);
 }
 if (availableActions.contains("message", Qt::CaseInsensitive) && supportsDetail("message", details[i]) && details[i].definitionName() == QContactPhoneNumber::DefinitionName)
 {
 QContactPhoneNumber number(details.at(i));
-CntContactCardDataItem* dataItem = new CntContactCardDataItem(hbTrId("txt_phob_dblist_send_message"), true);
+CntContactCardDataItem* dataItem = new CntContactCardDataItem(hbTrId("txt_phob_dblist_send_message"), itemCount(), true);
 dataItem->setAction("message");
 dataItem->setValueText(number.number());
 QString icon;
 if (number.contexts().isEmpty())
 {
 icon = "qtg_large_message";
 }
 dataItem->setIcon(HbIcon(icon));
 dataItem->setContactDetail(number);
 mDataItemList.insert(itemCount(), dataItem);
 }
 }
 //email
 if (availableActions.contains("email", Qt::CaseInsensitive))
 {
 QList<QContactDetail> details = actionDetails("email", *mContact);
 for (int i = 0; i < details.count(); i++)
 {
-if (details[i].definitionName() == QContactEmailAddress::DefinitionName)
+QContactEmailAddress email(details.at(i));
-{
+QString context = email.contexts().isEmpty() ? QString() : email.contexts().first();
-QContactEmailAddress email(details.at(i));
-QString title;
+CntContactCardDataItem* dataItem = new CntContactCardDataItem(mStringMapper.getContactCardListLocString(email.definitionName(), context), itemCount(), true);
-QString icon;
+dataItem->setAction("email");
-if (!email.contexts().isEmpty())
+dataItem->setValueText(email.emailAddress(), Qt::ElideLeft);
-{
+dataItem->setIcon(HbIcon(mStringMapper.getContactCardIconString(email.definitionName(), context)));
-title = mStringMapper.getContactCardListLocString(email.definitionName(), email.contexts().first());
+dataItem->setContactDetail(email);
-icon = mStringMapper.getContactCardIconString(email.definitionName(), email.contexts().first());
+mDataItemList.insert(itemCount(), dataItem);
 }
-else
+}
-{
+//url
-title = mStringMapper.getContactCardListLocString(email.definitionName(), QString());
+QList<QContactUrl> urlDetails = mContact->details<QContactUrl>();
-icon = mStringMapper.getContactCardIconString(email.definitionName(), QString());
+for (int i = 0; i < urlDetails.count(); i++)
-}
+{
+QContactUrl url(urlDetails.at(i));
-CntContactCardDataItem* dataItem = new CntContactCardDataItem(title, true);
+QString context = url.contexts().isEmpty() ? QString() : url.contexts().first();
-dataItem->setAction("email");
-dataItem->setValueText(email.emailAddress(), Qt::ElideLeft);
+CntContactCardDataItem* dataItem = new CntContactCardDataItem(mStringMapper.getContactCardListLocString(url.definitionName(), context), itemCount(), true);
-dataItem->setIcon(HbIcon(icon));
+dataItem->setAction("url");
-dataItem->setContactDetail(email);
+dataItem->setValueText(url.url());
-mDataItemList.insert(itemCount(), dataItem);
+dataItem->setIcon(HbIcon(mStringMapper.getContactCardIconString(url.definitionName(), context)));
-}
+dataItem->setContactDetail(url);
-}
+mDataItemList.insert(itemCount(), dataItem);
 }
 }
 /*!
 Initialize group details which includes actions.
 QContactPhoneNumber confCallNumber = mContact->detail<QContactPhoneNumber>();
 //call
 if (confCallNumber.number() != NULL)
 {
-CntContactCardDataItem* dataItem = new CntContactCardDataItem(hbTrId("txt_phob_dblist_conference_call"), true);
+CntContactCardDataItem* dataItem = new CntContactCardDataItem(hbTrId("txt_phob_dblist_conference_call"), itemCount(), true);
 dataItem->setAction("call");
 dataItem->setValueText(confCallNumber.number());
 dataItem->setIcon(HbIcon("qtg_large_call_group"));
 dataItem->setContactDetail(confCallNumber);
 mDataItemList.insert(itemCount(), dataItem);
 }
 //message
-CntContactCardDataItem* dataMessageItem = new CntContactCardDataItem(hbTrId("txt_phob_dblist_send_val_members"), true);
+CntContactCardDataItem* dataMessageItem = new CntContactCardDataItem(hbTrId("txt_phob_dblist_send_val_members"), itemCount(), true);
 dataMessageItem->setAction("message");
 dataMessageItem->setValueText(confCallNumber.number());
 dataMessageItem->setIcon(HbIcon("qtg_large_message"));
 dataMessageItem->setContactDetail(confCallNumber);
 mDataItemList.insert(itemCount(), dataMessageItem);
 //email
-CntContactCardDataItem* dataEmailItem = new CntContactCardDataItem(hbTrId("txt_phob_dblist_email"), true);
+CntContactCardDataItem* dataEmailItem = new CntContactCardDataItem(hbTrId("txt_phob_dblist_email"), itemCount(), true);
 dataEmailItem->setAction("email");
 dataEmailItem->setValueText(confCallNumber.number());
 dataEmailItem->setIcon(HbIcon("qtg_large_email"));
 dataEmailItem->setContactDetail(confCallNumber);
 mDataItemList.insert(itemCount(), dataEmailItem);
 /*!
 Initialize contact details which not include actions.
 */
 void CntContactCardDataContainer::initializeDetailsData()
 {
+//sip & internet call
+QList<QContactOnlineAccount> onlinedDetails = mContact->details<QContactOnlineAccount>();
+for (int i = 0; i < onlinedDetails.count(); i++)
+{
+QContactOnlineAccount online(onlinedDetails.at(i));
+QString context = online.contexts().isEmpty() ? QString() : online.contexts().first();
+QString subtype = online.subTypes().isEmpty() ? online.definitionName() : online.subTypes().first();
+CntContactCardDataItem* dataItem = new CntContactCardDataItem(mStringMapper.getContactCardListLocString(subtype, context), itemCount(), false);
+dataItem->setValueText(online.accountUri());
+dataItem->setContactDetail(online);
+addSeparator(itemCount());
+mDataItemList.insert(itemCount(), dataItem);
+}
+//address
 QString contextHome(QContactAddress::ContextHome.operator QString());
 QString contextWork(QContactAddress::ContextWork.operator QString());
 CntMapTileService::ContactAddressType sourceAddressType;
 mLocationFeatureEnabled = CntMapTileService::isLocationFeatureEnabled() ;
-//address
 QList<QContactAddress> addressDetails = mContact->details<QContactAddress>();
 for (int i = 0; i < addressDetails.count(); i++)
 {
 sourceAddressType = CntMapTileService::AddressPreference;
 QVariantList addressList;
 {
 sourceAddressType = CntMapTileService::AddressWork;
 title = hbTrId("txt_phob_formlabel_address_work");
 }
 }
-CntContactCardDataItem* dataItem = new CntContactCardDataItem(title, false);
+CntContactCardDataItem* dataItem = new CntContactCardDataItem(title, itemCount(), false);
 QStringList address;
 if (!addressDetails[i].street().isEmpty())
 address.append(addressDetails[i].street());
 if (!addressDetails[i].postcode().isEmpty())
 //Display the maptile image
 HbIcon icon(imageFile);
 QIcon mapTileIcon;
 QPainter painter;
-QPixmap baloon(":/icons/pin.png");
+QPixmap baloon( HbIcon("qtg_small_location").pixmap() );
 QPixmap map(icon.pixmap());
 //Display pin image in the center of maptile image
 painter.begin(&map);
-painter.drawPixmap((map.width()/2),
+painter.drawPixmap( ( map.width()/2 ) - ( baloon.width()/ 2 ),
-((map.height()/2)-(baloon.height())), baloon);
+(( map.height()/2 )-( baloon.height())), baloon );
 painter.end();
 mapTileIcon.addPixmap(map);
 addSeparator(itemCount());
-CntContactCardDataItem* dataItem = new CntContactCardDataItem(QString(), false);
+CntContactCardDataItem* dataItem = new CntContactCardDataItem(QString(), itemCount(), false);
 dataItem->setIcon(HbIcon(mapTileIcon));
 mDataItemList.insert(itemCount(), dataItem);
 		    }
 }
 }
+//company
+QList<QContactOrganization> organizationDetails = mContact->details<QContactOrganization>();
+for (int i = 0; i < organizationDetails.count(); i++)
+{
+CntContactCardDataItem* dataItem = new CntContactCardDataItem(hbTrId("txt_phob_formlabel_company_details"), itemCount(), false);
+QStringList companyList;
+companyList << organizationDetails[i].title() << organizationDetails[i].name() << organizationDetails[i].department();
+dataItem->setValueText(companyList.join(" ").trimmed());
+dataItem->setContactDetail(organizationDetails[i]);
+addSeparator(itemCount());
+mDataItemList.insert(itemCount(), dataItem);
+}
 //birthday
 QList<QContactBirthday> birthdayDetails = mContact->details<QContactBirthday>();
 for (int i = 0; i < birthdayDetails.count(); i++)
 {
-CntContactCardDataItem* dataItem = new CntContactCardDataItem(hbTrId("txt_phob_formlabel_birthday"), false);
+CntContactCardDataItem* dataItem = new CntContactCardDataItem(hbTrId("txt_phob_formlabel_birthday"), itemCount(), false);
 dataItem->setValueText(birthdayDetails[i].date().toString("dd MMMM yyyy"));
 dataItem->setContactDetail(birthdayDetails[i]);
 addSeparator(itemCount());
 mDataItemList.insert(itemCount(), dataItem);
 }
 //anniversary
 QList<QContactAnniversary> anniversaryDetails = mContact->details<QContactAnniversary>();
 for (int i = 0; i < anniversaryDetails.count(); i++)
 {
-CntContactCardDataItem* dataItem = new CntContactCardDataItem(hbTrId("txt_phob_formlabel_anniversary"), false);
+CntContactCardDataItem* dataItem = new CntContactCardDataItem(hbTrId("txt_phob_formlabel_anniversary"), itemCount(), false);
 dataItem->setValueText(anniversaryDetails[i].originalDate().toString("dd MMMM yyyy"));
 dataItem->setContactDetail(anniversaryDetails[i]);
 addSeparator(itemCount());
 mDataItemList.insert(itemCount(), dataItem);
 }
 QList<QContactRingtone> ringtoneDetails = mContact->details<QContactRingtone>();
 for (int i = 0; i < ringtoneDetails.count(); i++)
 {
 if (!ringtoneDetails.at(i).audioRingtoneUrl().isEmpty())
 {
-CntContactCardDataItem* dataItem = new CntContactCardDataItem(hbTrId("txt_phob_formlabel_ringing_tone"), false);
+CntContactCardDataItem* dataItem = new CntContactCardDataItem(hbTrId("txt_phob_formlabel_ringing_tone"), itemCount(), false);
 dataItem->setValueText(ringtoneDetails[i].audioRingtoneUrl().toString());
 dataItem->setContactDetail(ringtoneDetails[i]);
 addSeparator(itemCount());
 mDataItemList.insert(itemCount(), dataItem);
 break;
 //note
 QList<QContactNote> noteDetails = mContact->details<QContactNote>();
 for (int i = 0; i < noteDetails.count(); i++)
 {
-CntContactCardDataItem* dataItem = new CntContactCardDataItem(hbTrId("txt_phob_formlabel_note"), false);
+CntContactCardDataItem* dataItem = new CntContactCardDataItem(hbTrId("txt_phob_formlabel_note"), itemCount(), false);
 dataItem->setValueText(noteDetails[i].note());
 dataItem->setContactDetail(noteDetails[i]);
 addSeparator(itemCount());
 mDataItemList.insert(itemCount(), dataItem);
 }
 //family details
 QList<QContactFamily> familyDetails = mContact->details<QContactFamily>();
 for (int i = 0; i < familyDetails.count(); i++)
 {
-CntContactCardDataItem* dataSpouseItem = new CntContactCardDataItem(hbTrId("txt_phob_formlabel_spouse"), false);
+CntContactCardDataItem* dataSpouseItem = new CntContactCardDataItem(hbTrId("txt_phob_formlabel_spouse"), itemCount(), false);
 dataSpouseItem->setValueText(familyDetails[i].spouse());
 dataSpouseItem->setContactDetail(familyDetails[i]);
 addSeparator(itemCount());
 mDataItemList.insert(itemCount(), dataSpouseItem);
-CntContactCardDataItem* dataChildrenItem = new CntContactCardDataItem(hbTrId("txt_phob_formlabel_children"), false);
+CntContactCardDataItem* dataChildrenItem = new CntContactCardDataItem(hbTrId("txt_phob_formlabel_children"), itemCount(), false);
 dataChildrenItem->setValueText(familyDetails[i].children().join(", "));
 dataChildrenItem->setContactDetail(familyDetails[i]);
 addSeparator(itemCount());
 mDataItemList.insert(itemCount(), dataChildrenItem);
 }
 Returns true if contactDetails contains spesific action.
 */
 bool CntContactCardDataContainer::supportsDetail(const QString &actionName, const QContactDetail &contactDetail)
 {
 QList<QContactActionDescriptor> actionDescriptors = QContactAction::actionDescriptors(actionName, "symbian");
+if (actionDescriptors.isEmpty())
+{
+return false;
+}
 QContactAction* contactAction = QContactAction::action(actionDescriptors.first());
 bool isSupportDetail = contactAction->isDetailSupported(contactDetail);
 delete contactAction;
 return isSupportDetail;
 Returns the list of details which current action support.
 */
 QList<QContactDetail> CntContactCardDataContainer::actionDetails(const QString &actionName, const QContact &contact)
 {
 QList<QContactActionDescriptor> actionDescriptors = QContactAction::actionDescriptors(actionName, "symbian");
-QContactAction* contactAction = QContactAction::action(actionDescriptors.first());
+if (actionDescriptors.isEmpty())
+{
+return QList<QContactDetail>();
+}
+QContactAction* contactAction = QContactAction::action(actionDescriptors.first());
 QList<QContactDetail> details = contactAction->supportedDetails(contact);
 delete contactAction;
 return details;
 void CntContactCardDataContainer::addSeparator(int index)
 {
 if (mSeparatorIndex == -1)
 {
 mSeparatorIndex = index;
-CntContactCardDataItem* dataItem = new CntContactCardDataItem(hbTrId("txt_phob_subtitle_details"), false);
+CntContactCardDataItem* dataItem = new CntContactCardDataItem(hbTrId("txt_phob_subtitle_details"), itemCount(), false);
 mDataItemList.insert(itemCount(), dataItem);
 }
 }
 /*!
 int CntContactCardDataContainer::itemCount() const
 {
 return mDataItemList.count();
 }
+/*!
+Sort data item list by position number
+*/
+void CntContactCardDataContainer::sortDataItems()
+{
+qStableSort(mDataItemList.begin(), mDataItemList.end(), compareObjects);
+}

changeset 31	2a11b5b00470
parent 27	de1630741fbe
child 37	fd64c38c277d