FCL/sf/app/messaging: comparison messagingapp/msgui/conversationview/src/msgconversationview.cpp

equal deleted inserted replaced

-:8ba0afbb4637
+:a15d9966050f
 */
 #include "msgconversationview.h"
 // SYSTEM INCLUDES
+#include <hbapplication.h>
 #include <HbMenu>
 #include <HbAction>
 #include <HbListView>
 #include <HbMessageBox>
 #include <HbNotificationDialog>
 #include <HbFrameBackground>
-#include <xqservicerequest.h>
 #include <HbStaticVkbHost>
 #include <HbStyleLoader>
 #include <xqaiwrequest.h>
 #include <xqappmgr.h>
 #include <HbMainWindow>
+#include <QInputContext>
 #include <QDir>
 #include <QDateTime>
 #include <QGraphicsLinearLayout>
 #include <QStandardItemModel>
 #include "unidatamodelloader.h"
 #include "unidatamodelplugininterface.h"
 #include "ringbc.h"
 #include "mmsconformancecheck.h"
 #include "msgsettingsview.h"
-#include "msgaudiofetcherview.h"
 #include "unieditorpluginloader.h"
 #include "unieditorplugininterface.h"
+#include "msgaudiofetcherdialog.h"
 //Item specific menu.
 #define LOC_COMMON_OPEN hbTrId("txt_common_menu_open")
 #define LOC_COMMON_DELETE hbTrId("txt_common_menu_delete")
 mMessageModel(NULL),
 mEditorWidget(NULL),
 mContactCardWidget(contactCardWidget),
 mSendUtil(NULL),
 mVkbHost(NULL),
+mDialog(NULL),
 mVisibleIndex(),
 mModelPopulated(false),
 mViewReady(false)
 {
 //create send utils
 // MsgConversationView::~MsgConversationView
 // @see header file
 //---------------------------------------------------------------
 MsgConversationView::~MsgConversationView()
 {
+//delete the popup dialog
+delete mDialog;
 }
 //---------------------------------------------------------------
 // MsgConversationView::setupView
 // @see header file
 //---------------------------------------------------------------
 {
 mEditorWidget->clear();
 }
 }
 deactivateInputBlocker();
+// make sure virtual keyboard is closed
+QInputContext *ic = qApp->inputContext();
+if (ic) {
+QEvent *closeEvent = new QEvent(QEvent::CloseSoftwareInputPanel);
+ic->filterEvent(closeEvent);
+delete closeEvent;
+}
 if( sendResult == KErrNotFound)
 {
 HbMessageBox::question(LOC_DIALOG_SMS_SETTINGS_INCOMPLETE, this,
 SLOT(onDialogSettingsLaunch(HbAction*)),
 HbMessageBox::Ok | HbMessageBox::Cancel);
 HbAction* action = qobject_cast<HbAction*>(sender());
 if(!action)
 return;
-QList<QVariant> args;
+QString service("phonebookservices");
-QString serviceName("com.nokia.services.phonebookservices");
+QString interface("com.nokia.symbian.IContactsFetch");
-QString operation("fetch(QString,QString,QString)");
+QString operation("multiFetch(QString,QString)");
 XQAiwRequest* request;
 XQApplicationManager appManager;
-request = appManager.create(serviceName, "Fetch", operation, true); //embedded
+request = appManager.create(service, interface, operation, true); //embedded
 if ( request == NULL )
 {
 return;
 }
 this, SLOT(contactsFetched(const QVariant&)));
 }
 connect (request, SIGNAL(requestError(int,const QString&)),
 this, SLOT(serviceRequestError(int,const QString&)));
+QList<QVariant> args;
 args << QString(tr("Phonebook"));
 args << KCntActionAll;
 args << KCntFilterDisplayAll;
 request->setArguments(args);
 QString interface("com.nokia.symbian.IImageFetch");
 QString operation("fetch()");
 XQAiwRequest* request = NULL;
 XQApplicationManager appManager;
 request = appManager.create(service,interface, operation, true); // embedded
-request->setSynchronous(true); // synchronous
 if(!request)
 {
 QDEBUG_WRITE("AIW-ERROR: NULL request");
 return;
 }
+request->setSynchronous(true); // synchronous
 connect(request, SIGNAL(requestOk(const QVariant&)),
 this, SLOT(imagesFetched(const QVariant&)));
 connect(request, SIGNAL(requestError(int,const QString&)),
 this, SLOT(serviceRequestError(int,const QString&)));
 // MsgConversationView::fetchAudio
 // @see header file
 //---------------------------------------------------------------
 void MsgConversationView::fetchAudio()
 {
-// Launch Audio fetcher view
+// Launch Audio fetcher dialog
-QVariantList params;
+if (!mDialog)
-QByteArray dataArray;
+{
-QDataStream messageStream
+mDialog = new MsgAudioFetcherDialog();
-(&dataArray, QIODevice::WriteOnly | QIODevice::Append);
+bool b = connect(mDialog,
+SIGNAL(audioSelected(QString&)),
-ConvergedMessage message;
+this,
-message.setBodyText(mEditorWidget->content());
+SLOT(onAudioSelected(QString&)));
-// add address from contact-card to to-field
+}
-ConvergedMessageAddress address;
-address.setAlias(mContactCardWidget->address().at(0)->alias());
+//show the dialog
-address.setAddress(mContactCardWidget->address().at(0)->address());
+mDialog->show();
-message.addToRecipient(address);
-message.serialize(messageStream);
-params << MsgBaseView::AUDIOFETCHER; // target view
-params << MsgBaseView::CV; // source view
-params << dataArray;
-emit switchView(params);
 }
 //---------------------------------------------------------------
 // MsgConversationView::contactsFetched
 // @see header file
 return;
 }
 args << QVariant(messageId);
 request->setSynchronous(true);
+request->setEmbedded(true);
 request->setArguments(args);
 request->send();
 delete request;
 }
 int sendingState = index.data(SendingState).toInt();
 // For suspended message both short tap and long tap needs to show the same
 // context menu.....
 if(direction == ConvergedMessage::Outgoing
-	&&sendingState == ConvergedMessage::Suspended )
+	&& ((sendingState == ConvergedMessage::Suspended) || (sendingState == ConvergedMessage::Failed)))
 {
 handleShortTap();
 return;
 }
 params << dataArray;
 params << editorOperation;
 if(!data2.isNull())
 params << data2;
-clearEditors();
 emit switchView(params);
 }
 //---------------------------------------------------------------
 // MsgConversationView::populateConversationsView
 delete pluginLoader;
 return shared;
 }
+//---------------------------------------------------------------
+// MsgConversationView::onAudioSelected
+// @see header file
+//---------------------------------------------------------------
+void MsgConversationView::onAudioSelected(QString& filePath)
+{
+QVariantList params;
+QByteArray dataArray;
+QDataStream messageStream
+(&dataArray, QIODevice::WriteOnly | QIODevice::Append);
+ConvergedMessage message;
+message.setBodyText(mEditorWidget->content());
+// add address from contact-card to to-field
+ConvergedMessageAddress address;
+address.setAlias(mContactCardWidget->address().at(0)->alias());
+address.setAddress(mContactCardWidget->address().at(0)->address());
+message.addToRecipient(address);
+//add the attachment as selected from audio picker
+ConvergedMessageAttachment* attachment =
+new ConvergedMessageAttachment(filePath);
+ConvergedMessageAttachmentList attachmentList;
+attachmentList.append(attachment);
+message.addAttachments(attachmentList);
+message.serialize(messageStream);
+params << MsgBaseView::UNIEDITOR; // target view
+params << MsgBaseView::CV; // source view
+params << dataArray;
+params << MsgBaseView::ADD_AUDIO;
+emit switchView(params);
+}
+//---------------------------------------------------------------
+// MsgConversationView::handleKeyEvent
+// @see header file
+//---------------------------------------------------------------
+bool MsgConversationView::handleKeyEvent(int key)
+{
+bool eventHandled = false;
+if (Qt::Key_Yes == key) {
+//getting address of last sent/received msg.
+const int rowCount = mMessageModel->rowCount();
+QModelIndex index = mMessageModel->index(rowCount - 1, 0);
+QString address = index.data(ConversationAddress).toString();
+if (!address.isEmpty()) {
+call(address);
+eventHandled = true;
+}
+}
+return eventHandled;
+}
+//---------------------------------------------------------------
+// MsgConversationView::call
+// @see header
+//---------------------------------------------------------------
+void MsgConversationView::call(const QString& address)
+{
+QString service("phoneui");
+QString interface("com.nokia.symbian.ICallDial");
+QString operation("dial(QString)");
+XQApplicationManager appManager;
+QScopedPointer<XQAiwRequest> request(appManager.create(service, interface, operation, false));
+if (request) {
+QList<QVariant> args;
+args << address;
+request->setArguments(args);
+request->send();
+}
+}
 // EOF

changeset 70	a15d9966050f
parent 52	12db4185673b
child 72	6f657153cbc5