FCL/sf/app/messaging: comparison messagingapp/msgui/unifiedviewer/src/univiewertextitem.cpp

equal deleted inserted replaced

-:35b64624a9e7
+:36f374c67aa8
 //consts
 //regexp
-const QString NUMBER_PATTERN("(\\(|\\+|\\d)((?:\\d{2,})((?:[\\s-/.\\)\\()])*(?:(\\d+|\\))))*)|((\\*#)(?:\\d+(\\*|#)(?:\\d+#)?))");
+const QString NUMBER_PATTERN("(\\(?(\\+|\\d))((?:\\d)((?:[\\s-/.\\)\\(])*(?:(\\d+|\\))))*(?:\\d?|\\)))|((\\*#)(?:\\d+(\\*|#)(?:\\d+#)?))");
 const QString EMAIL_PATTERN("[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?\\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?");
-const QString URL_PATTERN("(((ht|f|rt)(tp|sp)(s?)\\:\\/\\/)|(www|wap)(?:\\.))(([-\\w]*[0-9a-zA-Z])+(:(0-9)*)*(\\/?)([a-zA-Z0-9\\-\\?\\,\'\\/\\\\+&amp;%\\$#_=~]*)(\\.)([-\\w]*[0-9a-zA-Z])+(:(0-9)*)*(\\/?)([a-zA-Z0-9\\-\\?\\,\'\\/\\\\+&amp;%\\$#_=~]*))+");
+const QString URL_PATTERN("(((ht|f|rt)(tp|sp)(s?)\\:\\/\\/)|(www|wap)(?:\\.))(([-\\w]*[0-9a-zA-Z])+(:(0-9)*)*(\\/?)([a-zA-Z0-9\\-\\?\\,\'\\/\\\\+&amp;%\\$#_=~]*)(\\.)([-\\w]*[0-9a-zA-Z])+(:(0-9)*)*(\\/?)([a-zA-Z0-9\\-\\?\\,\'\\/\\\\+&amp;%\\$#_=~]*))+[a-zA-Z0-9/]");
 //rules
 const QString NUMBER_RULE("NUMBER_RULE");
 const QString EMAIL_RULE("EMAIL_RULE");
 const QString URL_RULE("URL_RULE");
 //localization
-#define LOC_OPEN_CONTACT_INFO hbTrId("txt_messaging_menu_open_contact_info")
+#define LOC_CONTACT_INFO hbTrId("txt_messaging_menu_contact_info")
 #define LOC_CALL              hbTrId("txt_common_menu_call_verb")
 #define LOC_SEND_MESSAGE      hbTrId("txt_common_menu_send_message")
 #define LOC_SAVE_TO_CONTACTS  hbTrId("txt_common_menu_save_to_contacts")
 #define LOC_COPY              hbTrId("txt_common_menu_copy")
 #define LOC_CREATE_EMAIL      hbTrId("txt_messaging_menu_create_mail")
 mFindOn(true),
 mCursorPos(-1)
 {
 this->setReadOnly(true);
 this->setScrollable(false);
-this->setSmileysEnabled(true);
 this->setCursorVisibility(Hb::TextCursorHidden);
 this->setFlag(QGraphicsItem::ItemIsFocusable,false);
 this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 this->setBackgroundItem(0);
 QString anchor = this->anchorAt(pos);
 //do short tap action.
 if (!anchor.isEmpty() && !this->textCursor().hasSelection())
 {
-shortTapAction(anchor);
+handleShortTap(anchor,tap->scenePosition());
 }
 }
 break;
 }
 void UniViewerTextItem::addNumberMenu(HbMenu* contextMenu,const QString& data)
 {
 HbAction* action = NULL;
-action = contextMenu->addAction(LOC_OPEN_CONTACT_INFO, this, SLOT(openContactInfo()));
+QString number = data;
-action->setData(data);
+number.remove(NUMBER_RULE);
+int contactId = MsgContactHandler::resolveContactDisplayName(
+number,
+QContactPhoneNumber::DefinitionName,
+QContactPhoneNumber::FieldNumber);
+if(contactId > 0)
+{
+action = contextMenu->addAction(LOC_CONTACT_INFO, this, SLOT(openContactInfo()));
+action->setData(data);
+}
+else
+{
+action = contextMenu->addAction(LOC_SAVE_TO_CONTACTS, this, SLOT(saveToContacts()));
+action->setData(data);
+}
 action = contextMenu->addAction(LOC_CALL, this, SLOT(call()));
 action->setData(data);
 action = contextMenu->addAction(LOC_SEND_MESSAGE, this, SLOT(sendMessage()));
 action->setData(data);
+action = contextMenu->addAction(LOC_COPY, this, SLOT(copyToClipboard()));
+action->setData(data);
+}
+void UniViewerTextItem::addEmailMenu(HbMenu* contextMenu,const QString& data)
+{
+HbAction* action = NULL;
+action = contextMenu->addAction(LOC_CREATE_EMAIL, this, SLOT(createEmail()));
+action->setData(data);
+action = contextMenu->addAction(LOC_CONTACT_INFO, this, SLOT(openContactInfo()));
+action->setData(data);
 action = contextMenu->addAction(LOC_SAVE_TO_CONTACTS, this, SLOT(saveToContacts()));
 action->setData(data);
 action = contextMenu->addAction(LOC_COPY, this, SLOT(copyToClipboard()));
 action->setData(data);
 }
-void UniViewerTextItem::addEmailMenu(HbMenu* contextMenu,const QString& data)
+void UniViewerTextItem::addUrlMenu(HbMenu* contextMenu,const QString& data)
 {
 HbAction* action = NULL;
-action = contextMenu->addAction(LOC_CREATE_EMAIL, this, SLOT(createEmail()));
-action->setData(data);
-action = contextMenu->addAction(LOC_OPEN_CONTACT_INFO, this, SLOT(openContactInfo()));
-action->setData(data);
-action = contextMenu->addAction(LOC_SAVE_TO_CONTACTS, this, SLOT(saveToContacts()));
-action->setData(data);
-action = contextMenu->addAction(LOC_COPY, this, SLOT(copyToClipboard()));
-action->setData(data);
-}
-void UniViewerTextItem::addUrlMenu(HbMenu* contextMenu,const QString& data)
-{
-HbAction* action = NULL;
 action = contextMenu->addAction(LOC_OPEN_LINK, this, SLOT(openLink()));
 action->setData(data);
 action = contextMenu->addAction(LOC_ADD_TO_BOOKMARKS, this, SLOT(addToBookmarks()));
 action->setData(data);
 action = contextMenu->addAction(LOC_COPY_LINK, this, SLOT(copyToClipboard()));
 action->setData(data);
 }
-void UniViewerTextItem::shortTapAction(QString anchor)
+void UniViewerTextItem::handleShortTap(QString anchor,const QPointF& pos)
 {
 HbAction action;
 action.setData(anchor);
 if(anchor.contains(NUMBER_RULE))
 {
-//open vcard template.
+QString data = anchor;
-connect(&action,SIGNAL(triggered()),this,SLOT(openContactInfo()));
+data.remove(NUMBER_RULE);
+int contactId = MsgContactHandler::resolveContactDisplayName(
+data,
+QContactPhoneNumber::DefinitionName,
+QContactPhoneNumber::FieldNumber);
+if(contactId > 0 )
+{
+//if resolved conatct open contact card
+connect(&action,SIGNAL(triggered()),this,SLOT(openContactInfo()));
+}
+else
+{
+//unresolved contact show popup.
+highlightText(true);
+HbMenu* contextMenu = new HbMenu();
+contextMenu->setDismissPolicy(HbPopup::TapAnywhere);
+contextMenu->setAttribute(Qt::WA_DeleteOnClose, true);
+contextMenu->setPreferredPos(pos);
+connect(contextMenu,SIGNAL(aboutToClose()),this,SLOT(menuClosed()));
+addNumberMenu(contextMenu,anchor);
+contextMenu->show();
+}
 }
 else if(anchor.contains(EMAIL_RULE))
 {
 //Create email
 connect(&action,SIGNAL(triggered()),this,SLOT(createEmail()));
 }
 void UniViewerTextItem::saveToContacts()
 {
-//handler for save to contacts.
+openContactInfo();
 }
 void UniViewerTextItem::onServiceRequestCompleted()
 {
 //service request is now complete. delete it.

changeset 44	36f374c67aa8
parent 43	35b64624a9e7
child 47	5b14749788d7
child 52	12db4185673b