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

equal deleted inserted replaced

-:a32b19fb291e
+:5b14749788d7
 #include "univiewertextitem.h"
 #include "msgcontacthandler.h"
 #include <QRegExp>
-#include <QGraphicsSceneMouseEvent>
 #include <QApplication>
 #include <QClipboard>
 #include <QTextBlock>
+#include <QUrl>
+#include <QDesktopServices>
+#include <HbTapGesture>
 #include <HbMenu>
 #include <HbAction>
-#include <HbFrameItem>
 #include <cntservicescontact.h>
-#include <XQServiceRequest.h>
+#include <xqservicerequest.h>
 #include <xqaiwrequest.h>
 #include <xqappmgr.h>
 //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")
 mCursorPos(-1)
 {
 this->setReadOnly(true);
 this->setScrollable(false);
 this->setCursorVisibility(Hb::TextCursorHidden);
+this->setFlag(QGraphicsItem::ItemIsFocusable,false);
 this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-HbFrameItem *noBackground = new HbFrameItem(this);
+this->setBackgroundItem(0);
-this->setBackgroundItem(noBackground);
 //inserting rules and patterns to map.
 mRules.insert(NUMBER_RULE,NUMBER_PATTERN);
 mRules.insert(EMAIL_RULE,EMAIL_PATTERN);
 mRules.insert(URL_RULE,URL_PATTERN);
 for (i = mRules.constBegin(); i != mRules.constEnd(); ++i)
 {
 QString ruleName = i.key();
 QString rule = i.value();
 QRegExp ruleExp(rule);
+ruleExp.setCaseSensitivity(Qt::CaseInsensitive);
 QTextCursor cursor = this->document()->find(ruleExp);
 while(cursor.hasSelection())
 {
 connect(contextMenu,SIGNAL(aboutToClose()),this,SLOT(menuClosed()));
 }
+void UniViewerTextItem::gestureEvent(QGestureEvent* event)
-void UniViewerTextItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
-{
+//handle gesture to highlight and dehighlight find item.
-HbTextEdit::mouseReleaseEvent(event);
+if(HbTapGesture *tap = qobject_cast<HbTapGesture*>(event->gesture(Qt::TapGesture)))
-highlightText(false);
+{
+//capturing gesture position, and map to local co-ordinates.
-QString anchor = this->anchorAt(event->pos());
+QPointF pos = mapFromScene(tap->scenePosition());
-if(!anchor.isEmpty() && !this->textCursor().hasSelection())
+switch (tap->state())
 {
-shortTapAction(anchor);
+case Qt::GestureStarted:
-}
+{
-}
+//highlight find item.
+QTextDocument* doc = this->document();
-void UniViewerTextItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+mCursorPos = doc->documentLayout()->hitTest(pos, Qt::ExactHit);
-{
+highlightText(true);
-HbTextEdit::mousePressEvent(event);
+break;
+}
-QTextDocument* doc = this->document();
+case Qt::GestureFinished:
-mCursorPos = doc->documentLayout()->hitTest(event->pos(), Qt::ExactHit);
+{
+if (HbTapGesture::Tap == tap->tapStyleHint())
-highlightText(true);
+{
+//gesture is finshed dehighlight text.
+highlightText(false);
+QString anchor = this->anchorAt(pos);
+//do short tap action.
+if (!anchor.isEmpty() && !this->textCursor().hasSelection())
+{
+handleShortTap(anchor,tap->scenePosition());
+}
+}
+break;
+}
+case Qt::GestureCanceled:
+{
+//gesture is canceled due to pan or swipe, dehighlight text.
+if (HbTapGesture::Tap == tap->tapStyleHint())
+{
+highlightText(false);
+break;
+}
+}
+default:
+break;
+}
+event->accept();
+}
+else
+{
+event->ignore();
+}
+//passing gesture event to base class.
+HbTextEdit::gestureEvent(event);
 }
 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()));
 {
 QString phoneNumber = action->data().toString();
 phoneNumber.remove(NUMBER_RULE);
 //invoke dialer service and pass phoneNumber.
-QString serviceName("com.nokia.services.telephony");
+QString serviceName("com.nokia.symbian.ICallDial");
 QString operation("dial(QString)");
 XQServiceRequest* serviceRequest = new XQServiceRequest(serviceName,operation,false);
 connect(serviceRequest, SIGNAL(requestCompleted(QVariant)),
 {
 QString emailId = action->data().toString();
 emailId.remove(EMAIL_RULE);
 // Launch email editor
-QString serviceName("com.nokia.services.commonemail");
+QString interfaceName("com.nokia.symbian.IEmailMessageSend");
-QString interfaceName("imessage.send");
 QString operation("send(QVariant)");
 XQApplicationManager appManager;
-XQAiwRequest* request = appManager.create(serviceName, interfaceName,
+XQAiwRequest* request = appManager.create(interfaceName,
 			operation, true);
 if ( request == NULL )
 {
 return;
 }
 if(action)
 {
 QString url = action->data().toString();
 url.remove(URL_RULE);
 //invoke browser service  & pass url.
+QUrl uri(url);
+QDesktopServices::openUrl(uri);
 }
 }
 void UniViewerTextItem::addToBookmarks()
 {
 }
 void UniViewerTextItem::saveToContacts()
 {
-//handler for save to contacts.
+openContactInfo();
 }
 void UniViewerTextItem::onServiceRequestCompleted()
 {
 //service request is now complete. delete it.

branch	GCC_SURGE
changeset 47	5b14749788d7
parent 27	e4592d119491
parent 44	36f374c67aa8