FCL/sf/app/messaging: comparison messagingapp/msgui/unifiededitor/src/msgunieditorbody.cpp

equal deleted inserted replaced

-:35b64624a9e7
+:36f374c67aa8
 #include <HbTextItem>
 #include <HbFrameItem>
 #include <HbFrameDrawer>
 #include <HbIconItem>
 #include <HbAction>
-#include <hbinputeditorinterface.h>
 #include <HbMainWindow>
 #include <HbDeviceProfile>
 #include <QImageReader>
 #include <QFileInfo>
 #include <MsgMediaResolver.h>
 #include "msgunieditorpixmapwidget.h"
 #include "msgunieditoraudiowidget.h"
 // Constants
 const QString BACKGROUND_FRAME("qtg_fr_btn_normal");
-const QString SEND_ICON("qtg_mono_send");
 const int KShowCounterLimit = 10;
 const int BYTES_TO_KBYTES_FACTOR = 1024;
 //Localized Constants for item specific menu
 mVideoSize(0),
 mProcessImageOperation(0),
 mMediaResolver(0),
 mImageInfo(0),
 mProcessingWidget(0),
-mDraftMessage(false)
+mDraftMessage(false),
+mIsImageResizing(false)
 {
 mTextEdit = new HbTextEdit(this);
-mTextEdit->setSmileysEnabled(true);
 mTextEdit->setPlaceholderText(LOC_HINT_TEXT);
 HbStyle::setItemName(mTextEdit,"textEdit");
 connect(mTextEdit, SIGNAL(contentsChanged()), this, SLOT(onTextChanged()));
-// add "Send" action in VKB
-HbEditorInterface editorInterface(mTextEdit);
-HbAction *sendAction = new HbAction(HbIcon(SEND_ICON), QString(),this);
-connect(sendAction, SIGNAL(triggered()),this, SIGNAL(sendMessage()));
-editorInterface.addAction(sendAction);
 mMmsConformanceCheck = new MmsConformanceCheck;
 mCharCounter = new HbTextItem(this);
 HbStyle::setItemName(mCharCounter, "charCounter");
 QString MsgUnifiedEditorBody::text()
 {
 return mTextEdit->toPlainText();
 }
-void MsgUnifiedEditorBody::setImage(QString& imagefile , bool draftMessage)
+void MsgUnifiedEditorBody::setImage(QString& imagefile, bool draftMessage)
 {
+// do nothing if filepath is empty
+if (imagefile.isEmpty())
+{
+return;
+}
 mDraftMessage = draftMessage;
 if (!mImageInfo)
 {
 setImage(true);
 mImageFile = imagefile;
 if (mPixmapItem)
 {
 mPixmapItem->setParent(NULL);
 delete mPixmapItem;
 mPixmapItem = NULL;
 mImageSize = 0;
 }
 int error = KErrNone;
+if (!mDraftMessage)
-if( !mProcessImageOperation )
+{
-{
+// if image is in draft, no need to resize it because it is resized already
-TRAP(error,mProcessImageOperation =
+if (!mProcessImageOperation)
-CUniEditorProcessImageOperation::NewL(*this));
+{
-}
+TRAP(error,mProcessImageOperation =
-if( !mMediaResolver && error == KErrNone )
+CUniEditorProcessImageOperation::NewL(*this));
-{
+}
-TRAP(error,mMediaResolver = CMsgMediaResolver::NewL());
+if (!mMediaResolver && error == KErrNone)
-}
+{
+TRAP(error,mMediaResolver = CMsgMediaResolver::NewL());
-if( error == KErrNone)
+}
-{
-mMediaResolver->SetCharacterSetRecognition(EFalse);
+if (error == KErrNone)
-HBufC *name = XQConversions::qStringToS60Desc(imagefile);
+{
-RFile file;
+mMediaResolver->SetCharacterSetRecognition(EFalse);
-TRAP(error, file = mMediaResolver->FileHandleL(*name));
+HBufC *name = XQConversions::qStringToS60Desc(imagefile);
-if(error == KErrNone)
+RFile file;
-{
+TRAP(error, file = mMediaResolver->FileHandleL(*name));
-TRAP(error,mImageInfo = static_cast<CMsgImageInfo*>
-(mMediaResolver->CreateMediaInfoL(file)));
 if (error == KErrNone)
 {
-TRAP(error, mMediaResolver->ParseInfoDetailsL(
+TRAP(error,mImageInfo = static_cast<CMsgImageInfo*>
-mImageInfo, file));
+(mMediaResolver->CreateMediaInfoL(file)));
+if (error == KErrNone)
+{
+TRAP(error, mMediaResolver->ParseInfoDetailsL(
+mImageInfo, file));
+}
+file.Close();
+}
+delete name;
 }
-file.Close();
+}
-}
+if (error == KErrNone && !mDraftMessage)
-delete name;
+{
-}
-if (error == KErrNone)
-{
 mSavedImageFile = imagefile;
 startResizeAnimation();
+mIsImageResizing = true;
 mProcessImageOperation->Process(mImageInfo);
 }
 else
 {
-delete mImageInfo;
+if (mImageInfo)
-mImageInfo = NULL;
+{
+delete mImageInfo;
+mImageInfo = NULL;
+}
 mSavedImageFile.clear();
 handleSetImage();
 }
-}
 }
+}
 void MsgUnifiedEditorBody::handleSetImage()
 {
 //check for insert conformance
 if(EInsertSuccess != mMmsConformanceCheck->checkModeForInsert(mImageFile))
 // repolish the body widget
 this->repolish();
 // emit signal to indicate addition of image
-if(!mDraftMessage)
+emit contentChanged();
-{
-emit contentChanged();
-}
 }
 void MsgUnifiedEditorBody::setAudio(QString& audiofile)
 {
+// do nothing if filepath is empty
+if(audiofile.isEmpty())
+{
+return;
+}
 //check for insert conformance
 if(EInsertSuccess != mMmsConformanceCheck->checkModeForInsert(audiofile))
 return;
 setAudio(true);
 emit contentChanged();
 }
 void MsgUnifiedEditorBody::setText(QString& text)
 {
-	mTextEdit->setPlainText(text);
+if(!text.isEmpty())
+{
+mTextEdit->setPlainText(text);
+}
 }
 const QStringList MsgUnifiedEditorBody::mediaContent()
 {
 QStringList mediaFiles;
 QPointF currPos = mPixmapItem->pos();
 currPos.setX(leftMargin+((maxWidth-imageSize.width())/2));
 mPixmapItem->setPos(currPos);
 }
 mPixmapItem->show();
-emit enableSendButton(true);
 }
 if(mProcessingWidget)
 {
 imageSize.setHeight(mProcessingWidget->preferredHeight());
 }
 void MsgUnifiedEditorBody::EditorOperationEvent(
 TUniEditorProcessImageOperationEvent aEvent, TFileName aFileName)
 {
-stopResizeAnimation();
 delete mImageInfo;
 mImageInfo = NULL;
 if (aEvent == EUniEditorProcessImageOperationComplete &&
 aFileName.Length() > 0)
 else
 {
 mImageFile = mSavedImageFile;
 }
 mSavedImageFile.clear();
+// image resize is complete. reset the image resize flag
+mIsImageResizing = false;
 //handle the processed image from ProcessImage Operation
 handleSetImage();
+stopResizeAnimation();
 }
 void MsgUnifiedEditorBody::startResizeAnimation()
 {
 // emit signal to indicate disable the send tool button.
 HbTextItem* processingText = new HbTextItem(LOC_PROCESSING,mProcessingWidget);
 processingText->setAlignment(Qt::AlignCenter);
 processingLayout->addItem(processingText);
 HbIconItem* animationItem = new HbIconItem(ANIMATION_ICON,mProcessingWidget);
+animationItem->setAlignment(Qt::AlignHCenter);
 processingLayout->addItem(animationItem);
 HbIconAnimator& iconAnimator = animationItem->animator();
 HbIconAnimationManager* iconAnimationManager = HbIconAnimationManager::global();
 iconAnimationManager->addDefinitionFile(ANIMATION_FILE);

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