--- a/email/alwaysonlineemailplugin/src/AlwaysOnlineEmailPluginData.rss Thu Dec 17 08:44:11 2009 +0200
+++ b/email/alwaysonlineemailplugin/src/AlwaysOnlineEmailPluginData.rss Thu Jan 07 12:45:05 2010 +0200
@@ -17,8 +17,8 @@
*/
#include <eikon.rh>
-#include <Messaging.loc>
-#include <AlwaysOnlineEmailPlugin.loc>
+#include <messaging.loc>
+#include <alwaysonlineemailplugin.loc>
NAME AOEM
RESOURCE RSS_SIGNATURE {}
--- a/email/imum/Mtms/Data/IMAP4Registry.rss Thu Dec 17 08:44:11 2009 +0200
+++ b/email/imum/Mtms/Data/IMAP4Registry.rss Thu Jan 07 12:45:05 2010 +0200
@@ -22,7 +22,7 @@
#include <mtmconfig.rh>
#include <e32capability.h>
-#include <Imum.loc>
+#include <imum.loc>
// CONSTANTS
// MACROS
--- a/email/imum/Mtms/Data/POP3Registry.rss Thu Dec 17 08:44:11 2009 +0200
+++ b/email/imum/Mtms/Data/POP3Registry.rss Thu Jan 07 12:45:05 2010 +0200
@@ -22,7 +22,7 @@
#include <mtmconfig.rh>
#include <e32capability.h>
-#include <Imum.loc>
+#include <imum.loc>
// CONSTANTS
// MACROS
--- a/email/imum/Mtms/Data/SMTPRegistry.rss Thu Dec 17 08:44:11 2009 +0200
+++ b/email/imum/Mtms/Data/SMTPRegistry.rss Thu Jan 07 12:45:05 2010 +0200
@@ -22,7 +22,7 @@
#include <mtmconfig.rh>
#include <e32capability.h>
-#include <Imum.loc>
+#include <imum.loc>
// CONSTANTS
// MACROS
--- a/email/imum/Mtms/Data/imum.rss Thu Dec 17 08:44:11 2009 +0200
+++ b/email/imum/Mtms/Data/imum.rss Thu Jan 07 12:45:05 2010 +0200
@@ -27,7 +27,7 @@
#include <mtud.rh>
#include <mtud.hrh>
-#include <Imum.loc> // Localisable text
+#include <imum.loc> // Localisable text
#include "../Inc/Imas.hrh"
NAME IMUM
--- a/email/imum/Utils/Data/ImumMailSettings.ra Thu Dec 17 08:44:11 2009 +0200
+++ b/email/imum/Utils/Data/ImumMailSettings.ra Thu Jan 07 12:45:05 2010 +0200
@@ -19,7 +19,7 @@
// INCLUDES
-#include "Imum.loc"
+#include "imum.loc"
// CONSTANTS
#define ImasEdwinNumberMinValue 1
--- a/email/imum/Utils/Data/ImumMailWizard.ra Thu Dec 17 08:44:11 2009 +0200
+++ b/email/imum/Utils/Data/ImumMailWizard.ra Thu Jan 07 12:45:05 2010 +0200
@@ -18,7 +18,7 @@
*/
// INCLUDES
-#include "Imum.loc"
+#include "imum.loc"
#include <AiwCommon.rh>
// CONSTANTS
--- a/email/imum/Utils/Data/ImumUtils.rss Thu Dec 17 08:44:11 2009 +0200
+++ b/email/imum/Utils/Data/ImumUtils.rss Thu Jan 07 12:45:05 2010 +0200
@@ -29,10 +29,10 @@
#include <muiusettingsarray.hrh>
#include "MuiuDynamicSettingsArray.hrh"
#include "MuiuDynamicSettingsItemBase.rh"
-#include <Messaging.loc>
+#include <messaging.loc>
#include <mce.loc>
-#include <Imum.loc> // Localisable text
+#include <imum.loc> // Localisable text
#include "../Inc/IMASPageIds.hrh"
--- a/email/imum/Utils/Src/ImumMboxManager.cpp Thu Dec 17 08:44:11 2009 +0200
+++ b/email/imum/Utils/Src/ImumMboxManager.cpp Thu Jan 07 12:45:05 2010 +0200
@@ -365,7 +365,10 @@
{
IMUM_CONTEXT( CImumMboxManager::LoadAccountFillIapL, 0, KLogData );
IMUM_IN();
-
+
+ //check IAP number
+ if ( aSettings.iIncomingIapPref->NumberOfIAPs() > 0 )
+ {
// Set internet access point (incoming IAP)
TImIAPChoice incomingIapChoice =
aSettings.iIncomingIapPref->IAPPreference( 0 );
@@ -375,7 +378,20 @@
TImIAPChoice outgoingIapChoice =
aSettings.iOutgoingIapPref->IAPPreference( 0 );
aSettings.iOutgoingIap = outgoingIapChoice.iIAP;
-
+ }
+
+ //check SNAP define
+ else if( aSettings.iIncomingIapPref->SNAPDefined() )
+ {
+ aSettings.iIncomingIap = aSettings.iIncomingIapPref->SNAPPreference();
+ aSettings.iOutgoingIap = aSettings.iOutgoingIapPref->SNAPPreference();
+ }
+ else
+ {
+ aSettings.iIncomingIap = 0;
+ aSettings.iOutgoingIap = 0;
+ }
+
IMUM_OUT();
}
--- a/email/mail/PluginSrc/MailPlainView/MailPlainView.rss Thu Dec 17 08:44:11 2009 +0200
+++ b/email/mail/PluginSrc/MailPlainView/MailPlainView.rss Thu Jan 07 12:45:05 2010 +0200
@@ -21,7 +21,7 @@
NAME MPVW
// INCLUDES
-#include <MsgMailEditor.loc>
+#include <msgmaileditor.loc>
#include <eikon.rh>
RESOURCE RSS_SIGNATURE { }
--- a/email/mail/group/MsgMailEditor.rss Thu Dec 17 08:44:11 2009 +0200
+++ b/email/mail/group/MsgMailEditor.rss Thu Jan 07 12:45:05 2010 +0200
@@ -27,19 +27,19 @@
#include <data_caging_paths_strings.hrh>
#include <AvkonIcons.hrh> // Avkon icon files
#include "msgmaileditor.hrh"
-#include <MsgMailEditor.loc>
+#include <msgmaileditor.loc>
#include <avkon.rsg>
#include <avkon.rh>
#include <avkon.mbg>
#include <avkon.loc>
-#include <DRMCommon.loc>
-#include <Messaging.loc>
+#include <drmcommon.loc>
+#include <messaging.loc>
#include <muiu.mbg>
#include <MsgEditor.rh>
#include <MsgEditorAppUi.hrh>
#include <MsgEditor.hrh>
-#include <Messaging.loc>
+#include <messaging.loc>
// RESOURCE DEFINITIONS
--- a/email/mail/group/MsgMailUtils.rss Thu Dec 17 08:44:11 2009 +0200
+++ b/email/mail/group/MsgMailUtils.rss Thu Jan 07 12:45:05 2010 +0200
@@ -26,7 +26,7 @@
#include <eikon.rh>
#include <avkon.rh>
#include <avkon.rsg>
-#include <MsgMailEditor.loc>
+#include <msgmaileditor.loc>
// RESOURCE DEFINITIONS
--- a/email/mail/group/MsgMailViewer.rss Thu Dec 17 08:44:11 2009 +0200
+++ b/email/mail/group/MsgMailViewer.rss Thu Jan 07 12:45:05 2010 +0200
@@ -21,14 +21,14 @@
// INCLUDES
#include <appinfo.rh>
-#include <DRMCommon.loc>
-#include <Messaging.loc>
+#include <drmcommon.loc>
+#include <messaging.loc>
#include <data_caging_paths_strings.hrh>
#include <eikon.rh>
#include <eikon.hrh>
#include "msgmailviewer.hrh"
-#include <MsgMailEditor.loc>
-#include <MsgMailViewer.loc>
+#include <msgmaileditor.loc>
+#include <msgmailviewer.loc>
#include "eikon.rsg"
#include <avkon.loc>
#include <avkon.rsg>
--- a/messagingappbase/mce/inc/MceMainViewListContainer.h Thu Dec 17 08:44:11 2009 +0200
+++ b/messagingappbase/mce/inc/MceMainViewListContainer.h Thu Jan 07 12:45:05 2010 +0200
@@ -52,8 +52,6 @@
*/
static CMceMainViewListContainer* NewL(
const TRect& aRect,
- CMsvSessionPtr aSession,
- CMceBitmapResolver& aBitmapResolver,
TMsvId aFolderId,
TMceListType aListType = EMceListTypeMainView );
@@ -61,6 +59,13 @@
* Destructor.
*/
virtual ~CMceMainViewListContainer();
+
+ /**
+ * Creates list items.
+ */
+ void CreateListItemsL(
+ CMsvSessionPtr aSession,
+ CMceBitmapResolver& aBitmapResolver );
/**
* From CoeControl
@@ -146,9 +151,7 @@
* Symbian OS constructor.
*/
void ConstructL(
- const TRect& aRect,
- CMsvSessionPtr aSession,
- CMceBitmapResolver& aBitmapResolver );
+ const TRect& aRect );
private: // Data
CAknDoubleLargeStyleListBox* iListBox;
--- a/messagingappbase/mce/src/MceDeliveryReportControlContainer.cpp Thu Dec 17 08:44:11 2009 +0200
+++ b/messagingappbase/mce/src/MceDeliveryReportControlContainer.cpp Thu Jan 07 12:45:05 2010 +0200
@@ -101,7 +101,7 @@
iListBox = new( ELeave ) CAknDoubleGraphicStyleListBox;
iListBox->SetContainerWindowL( *this );
- iListBox->ConstructL( this, EAknListBoxSelectionList );
+ iListBox->ConstructL( this, EAknListBoxSelectionList|EAknListBoxItemSpecificMenuDisabled );
CMceDeliveryReportAdapter* adapter = CMceDeliveryReportAdapter::NewL(
iMceDeliveryReportView->MceAppUi()->LogEngine(), iListBox );
--- a/messagingappbase/mce/src/MceDeliveryReportView.cpp Thu Dec 17 08:44:11 2009 +0200
+++ b/messagingappbase/mce/src/MceDeliveryReportView.cpp Thu Jan 07 12:45:05 2010 +0200
@@ -180,7 +180,10 @@
if( ! MceAppUi()->LogEngine()->
IsNumberAvailable( iContainer->ListBox()->CurrentItemIndex() ) )
{
- aMenuPane->DeleteMenuItem( EMceCmdCall );
+ if ( aMenuPane->MenuItemExists( EMceCmdCall, aPosition ) )
+ {
+ aMenuPane->DeleteMenuItem( EMceCmdCall );
+ }
}
if ( iContainer->ListBox()->Model()->NumberOfItems() == 0 )
--- a/messagingappbase/mce/src/MceMainViewListContainer.cpp Thu Dec 17 08:44:11 2009 +0200
+++ b/messagingappbase/mce/src/MceMainViewListContainer.cpp Thu Jan 07 12:45:05 2010 +0200
@@ -41,6 +41,8 @@
CMceMainViewListContainer::CMceMainViewListContainer()
+ : iListBox( NULL ),
+ iListItems( NULL )
{
}
@@ -52,8 +54,6 @@
CMceMainViewListContainer* CMceMainViewListContainer::NewL(
const TRect& aRect,
- CMsvSessionPtr aSession,
- CMceBitmapResolver& aBitmapResolver,
//TODO:
TMsvId /*aFolderId*/,
//TODO
@@ -62,11 +62,27 @@
CMceMainViewListContainer* self = new (ELeave)
CMceMainViewListContainer();
CleanupStack::PushL(self);
- self->ConstructL( aRect, aSession, aBitmapResolver );
+ self->ConstructL( aRect );
CleanupStack::Pop(); // self
return self;
}
+// ----------------------------------------------------
+// CMceMainViewListContainer::CreateListItemsL
+// ----------------------------------------------------
+void CMceMainViewListContainer::CreateListItemsL(
+ CMsvSessionPtr aSession,
+ CMceBitmapResolver& aBitmapResolver )
+ {
+ if ( iListBox && !iListItems )
+ {
+ iListItems = CMceMainViewListItemArray::NewL(
+ aSession, KMsvRootIndexEntryId,
+ EMceListTypeMainView, aBitmapResolver );
+ iListBox->Model()->SetItemTextArray( iListItems );
+ iListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
+ }
+ }
// ----------------------------------------------------
@@ -81,9 +97,7 @@
}
void CMceMainViewListContainer::ConstructL(
- const TRect& aRect,
- CMsvSessionPtr aSession,
- CMceBitmapResolver& aBitmapResolver )
+ const TRect& aRect )
{
CreateWindowL();
SetRect( aRect );
@@ -91,12 +105,7 @@
iListBox = new (ELeave) CAknDoubleLargeStyleListBox ;
// CEikTextListBox* listBox = new (ELeave) CAknSingleLargeStyleListBox;
iListBox->ConstructL( this, EAknListBoxSelectionList );
-
- iListItems = CMceMainViewListItemArray::NewL(
- aSession, KMsvRootIndexEntryId, EMceListTypeMainView, aBitmapResolver );
-
- iListBox->Model()->SetItemTextArray( iListItems );
- iListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
+
//iSelectedEntries = new (ELeave) CMsvEntrySelection;
}
--- a/messagingappbase/mce/src/MceMainViewListView.cpp Thu Dec 17 08:44:11 2009 +0200
+++ b/messagingappbase/mce/src/MceMainViewListView.cpp Thu Jan 07 12:45:05 2010 +0200
@@ -188,6 +188,11 @@
BaseConstructL( R_MCE_MAIN_VIEW );
// CMceMainViewListView::ConstructL( EMceListTypeMainView );
+ iMsgListContainer = CMceMainViewListContainer::NewL(
+ ClientRect(),
+ KMsvRootIndexEntryIdValue,
+ EMceListTypeMainView );
+ iMsgListContainer->SetMopParent( this );
}
// ----------------------------------------------------
@@ -318,15 +323,9 @@
void CMceMainViewListView::CreateContainerAndActivateL()
{
MCELOGGER_ENTERFN("CreateContainerAndActivateL()");
- if ( !iMsgListContainer )
+ if ( iMsgListContainer )
{
- iMsgListContainer = CMceMainViewListContainer::NewL(
- ClientRect(),
- iSession,
- iBitmapResolver,
- KMsvRootIndexEntryIdValue,
- EMceListTypeMainView );
- iMsgListContainer->SetMopParent( this );
+ iMsgListContainer->CreateListItemsL( iSession, iBitmapResolver );
iMsgListContainer->ListItems()->SetListItemArrayObserver( this );
ResetBitmapsL();
iMsgListContainer->SetMskL();
--- a/messagingappbase/mce/src/MceMessageListContainer.cpp Thu Dec 17 08:44:11 2009 +0200
+++ b/messagingappbase/mce/src/MceMessageListContainer.cpp Thu Jan 07 12:45:05 2010 +0200
@@ -123,7 +123,11 @@
SetRect( aRect );
iListBox = new (ELeave) CMceMessageListBox( *this );
- iListBox->ConstructL( this, EAknListBoxStylusMarkableList );
+ if(aFolderId == KMsvGlobalOutBoxIndexEntryIdValue)
+ iListBox->ConstructL( this, EAknListBoxStylusMarkableList|EAknListBoxItemSpecificMenuDisabled );
+ else
+ iListBox->ConstructL( this, EAknListBoxStylusMarkableList );
+
iListBox->ItemDrawer()->SetItemMarkReverse( ETrue );
iListBox->EnableMSKObserver( EFalse );
--- a/messagingappbase/mce/src/MceMessageListView.cpp Thu Dec 17 08:44:11 2009 +0200
+++ b/messagingappbase/mce/src/MceMessageListView.cpp Thu Jan 07 12:45:05 2010 +0200
@@ -1061,7 +1061,9 @@
iAiwServiceHandler->InitializeMenuPaneL( *aMenuPane, aResourceId,
EMceCmdFirstMessageReaderAiwCommand,
- inList );
+ inList,
+ EFalse,
+ ETrue);
HandleContainerOptionsMenuL( aMenuPane );
}
--- a/messagingappbase/mce/src/MceOneRowMessageListContainer.cpp Thu Dec 17 08:44:11 2009 +0200
+++ b/messagingappbase/mce/src/MceOneRowMessageListContainer.cpp Thu Jan 07 12:45:05 2010 +0200
@@ -2050,7 +2050,7 @@
iTreeListBox->SetTextL(
treeItemId,
bufferC3,
- 1,
+ 3,
EFalse );
}
else
--- a/messagingappbase/sendui/genericmtmplugin/src/genericmtmplugin.cpp Thu Dec 17 08:44:11 2009 +0200
+++ b/messagingappbase/sendui/genericmtmplugin/src/genericmtmplugin.cpp Thu Jan 07 12:45:05 2010 +0200
@@ -79,6 +79,7 @@
const TUint KSendUiFeatureSelectableEmail = 0x8;
const TUint KSeconds = 1000000;
+const TUid KMailTechnologyTypeUid = { 0x10001671 };
// ======== LOCAL FUNCTIONS ========
@@ -1304,7 +1305,10 @@
CleanupStack::PushL( note );
HBufC* text = NULL;
- text = StringLoader::LoadLC( R_SENDUI_SETTINGS_NOT_OK, &iCoeEnv );
+ if( iSingleton.ClientMtmRegistryL().TechnologyTypeUid( aMtmUid ) == KMailTechnologyTypeUid )
+ text = StringLoader::LoadLC( R_SENDUI_SETTINGS_EMAIL_NOT_OK, &iCoeEnv );
+ else
+ text = StringLoader::LoadLC( R_SENDUI_SETTINGS_NOT_OK, &iCoeEnv );
note->ShowNoteL( EAknGlobalErrorNote, *text );
CleanupStack::PopAndDestroy( 2, note ); // note, stringLoader
aContinue = EFalse;
--- a/mmsengine/mmshttptransport/inc/mmssession.h Thu Dec 17 08:44:11 2009 +0200
+++ b/mmsengine/mmshttptransport/inc/mmssession.h Thu Jan 07 12:45:05 2010 +0200
@@ -24,8 +24,8 @@
// INCLUDES
#include <e32base.h>
#include <http/rhttpsession.h>
-#include <mhttpsessioneventcallback.h>
-#include <rhttpheaders.h>
+#include <http/mhttpsessioneventcallback.h>
+#include <http/rhttpheaders.h>
// CONSTANTS
_LIT8( KProtocolHTTP, "HTTP/TCP" );
--- a/mmsengine/mmshttptransport/inc/mmstransaction.h Thu Dec 17 08:44:11 2009 +0200
+++ b/mmsengine/mmshttptransport/inc/mmstransaction.h Thu Jan 07 12:45:05 2010 +0200
@@ -28,9 +28,9 @@
#include <e32base.h>
#include <mentact.h> // CMsgActive
-#include <thttpevent.h>
-#include <mhttptransactioncallback.h>
-#include <mhttpdatasupplier.h>
+#include <http/thttpevent.h>
+#include <http/mhttptransactioncallback.h>
+#include <http/mhttpdatasupplier.h>
// CONSTANTS
--- a/mmsengine/mmspushhandler/inc/CMmsPushHandler.h Thu Dec 17 08:44:11 2009 +0200
+++ b/mmsengine/mmspushhandler/inc/CMmsPushHandler.h Thu Jan 07 12:45:05 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDES
#include <msvapi.h>
-#include <cpushhandlerbase.h>
+#include <push/cpushhandlerbase.h>
#ifdef _DEBUG
#include <flogger.h>
--- a/mmsengine/mmspushhandler/src/CMmsPushHandler.cpp Thu Dec 17 08:44:11 2009 +0200
+++ b/mmsengine/mmspushhandler/src/CMmsPushHandler.cpp Thu Jan 07 12:45:05 2010 +0200
@@ -25,11 +25,11 @@
#include <e32math.h>
#include <apparc.h>
-#include <cpushhandlerbase.h>
-#include <implementationproxy.h>
-#include <pluginkiller.h>
-#include <pushmessage.h>
-#include <pushlog.h>
+#include <push/cpushhandlerbase.h>
+#include <ecom/implementationproxy.h>
+#include <push/pluginkiller.h>
+#include <push/pushmessage.h>
+#include <push/pushlog.h>
#include "mmsconst.h"
#include "mmscmds.h"
--- a/mobilemessaging/audiomsg/data/audiomessage.rss Thu Dec 17 08:44:11 2009 +0200
+++ b/mobilemessaging/audiomsg/data/audiomessage.rss Thu Jan 07 12:45:05 2010 +0200
@@ -38,6 +38,7 @@
#include <muiu.mbg>
#include <aknsconstants.hrh>
#include <audiomessage.loc>
+#include <VoiceRecorder.loc>
RESOURCE RSS_SIGNATURE { }
RESOURCE TBUF { buf = ""; }
@@ -100,6 +101,8 @@
// Title
RESOURCE TBUF r_audiomessage_title { buf = qtn_title_audio_message; }
+RESOURCE TBUF r_vr_video_call_infonote_label { buf = qtn_vorec_info_video_call_ongoing; }
+RESOURCE TBUF r_vr_internet_call_infonote_label { buf = qtn_vorec_info_internet_call_ongoing; }
// ======== main view ========
--- a/mobilemessaging/audiomsg/inc/audiomessageappui.h Thu Dec 17 08:44:11 2009 +0200
+++ b/mobilemessaging/audiomsg/inc/audiomessageappui.h Thu Jan 07 12:45:05 2010 +0200
@@ -746,7 +746,12 @@
void UpdateIndicatorIcons( TMmsMessagePriority aPriority );
TBool UnsupportedCallTypeOngoing( /*TBool aShowNote*/ );
-
+ /**
+ * This method is called if video or VOIP call is ongoing and
+ * information note needs to be shown
+ * @param aResourceId
+ */
+ static void ShowUnsupportedCallTypeNoteL( TInt aResourceId );
TBool CheckIncomingCall( );
TBool DoEnterKeyL();
--- a/mobilemessaging/audiomsg/src/audiomessageappui.cpp Thu Dec 17 08:44:11 2009 +0200
+++ b/mobilemessaging/audiomsg/src/audiomessageappui.cpp Thu Jan 07 12:45:05 2010 +0200
@@ -4356,12 +4356,14 @@
case EPSCTsyCallTypeH324Multimedia:
{
unsupported = ETrue;
+ ShowUnsupportedCallTypeNoteL( R_VR_VIDEO_CALL_INFONOTE_LABEL );
break;
}
// Voip call ongoing
case EPSCTsyCallTypeVoIP:
{
unsupported = ETrue;
+ ShowUnsupportedCallTypeNoteL( R_VR_INTERNET_CALL_INFONOTE_LABEL );
break;
}
}
@@ -4369,6 +4371,30 @@
return unsupported;
}
+// ---------------------------------------------------------------------------
+// CAudioMessageAppUi::ShowUnsupportedCallTypeNoteL
+//
+// ---------------------------------------------------------------------------
+//
+void CAudioMessageAppUi::ShowUnsupportedCallTypeNoteL( TInt aResourceId )
+ {
+ CAknInformationNote* infoNote;
+ HBufC* noteText;
+
+ noteText = CEikonEnv::Static()->
+ AllocReadResourceLC( aResourceId );
+
+ infoNote = new( ELeave ) CAknInformationNote( ETrue );
+ infoNote->ExecuteLD( *noteText );
+
+ CleanupStack::PopAndDestroy( noteText );
+ }
+
+// ---------------------------------------------------------------------------
+// CAudioMessageAppUi::CheckIncomingCall
+//
+// ---------------------------------------------------------------------------
+//
TBool CAudioMessageAppUi::CheckIncomingCall( )
{
TInt value( 0 );
--- a/mobilemessaging/mmsui/viewer/MmsViewer.rss Thu Dec 17 08:44:11 2009 +0200
+++ b/mobilemessaging/mmsui/viewer/MmsViewer.rss Thu Jan 07 12:45:05 2010 +0200
@@ -384,13 +384,7 @@
{
items =
{
- MENU_ITEM { command = EMmsViewerViewImage; txt = qtn_mms_om_view_image; },
- MENU_ITEM { command = EMmsViewerPlayAudio; txt = qtn_mms_om_play_audio; },
- MENU_ITEM { command = EMmsViewerPlayVideo; txt = qtn_mms_om_play_video; },
- MENU_ITEM { command = EMmsViewerShowPresentation; txt = qtn_mms_om_show_presentation; },
-#ifdef RD_SVGT_IN_MESSAGING
- MENU_ITEM { command = EMmsViewerPlaySvg; txt = qtn_mms_om_show_presentation; },
-#endif
+
MENU_ITEM { command = EMmsViewerReplyMenu; txt = qtn_mms_om_reply;
cascade = r_mmsviewer_reply_submenu; },
MENU_ITEM { command = EMmsViewerUpload; txt = qtn_options_send_via; },
--- a/mobilemessaging/mmsui/viewersrc/UniMmsViewerAppUi.cpp Thu Dec 17 08:44:11 2009 +0200
+++ b/mobilemessaging/mmsui/viewersrc/UniMmsViewerAppUi.cpp Thu Jan 07 12:45:05 2010 +0200
@@ -1174,34 +1174,7 @@
aMenuPane->SetItemDimmed( EMmsViewerForward, ETrue );
}
- if ( ! ( Document( )->SmilType( ) == EMmsSmil
- && focusedControl == EMsgComponentIdImage
- && iImage
- && MediaInitializedL( iImage ) ) )
- {
- aMenuPane->SetItemDimmed( EMmsViewerViewImage, ETrue );
- }
- if ( ! ( focusedControl == EMsgComponentIdAudio
- && iAudio
- && MediaInitializedL( iAudio ) ) )
- {
- aMenuPane->SetItemDimmed( EMmsViewerPlayAudio, ETrue );
- }
- if ( ! ( focusedControl == EMsgComponentIdVideo
- && iVideo
- && MediaInitializedL( iVideo ) ) )
- {
- aMenuPane->SetItemDimmed( EMmsViewerPlayVideo, ETrue );
- }
-#ifdef RD_SVGT_IN_MESSAGING
- if ( ! ( Document( )->SmilType( ) == EMmsSmil
- && focusedControl == EMsgComponentIdSvg
- && iSvgt
- && MediaInitializedL( iSvgt ) ) )
- {
- aMenuPane->SetItemDimmed( EMmsViewerPlaySvg, ETrue );
- }
-#endif
+
if ( ! ( Document( )->SmilType( ) == EMmsSmil
&& ( focusedControl == EMsgComponentIdBody
|| focusedControl == EMsgComponentIdImage
@@ -1228,7 +1201,7 @@
if ( !Document( )->SmilList( )->Count( ) )
{
aMenuPane->SetItemDimmed( EMmsViewerShowMessage, ETrue );
- aMenuPane->SetItemDimmed( EMmsViewerShowPresentation, ETrue );
+
}
else
{
@@ -1236,12 +1209,7 @@
{
aMenuPane->SetItemDimmed( EMmsViewerShowMessage, ETrue );
}
- if ( Document( )->SmilType( ) == EMmsSmil
- || ( Document( )->SmilType( ) != EMmsSmil
- && focusedControl != EMsgComponentIdImage ) )
- {
- aMenuPane->SetItemDimmed( EMmsViewerShowPresentation, ETrue );
- }
+
}
if ( !ShowReplyMenu( ) )
--- a/mobilemessaging/smilui/mediasrc/SmilVideoRenderer.cpp Thu Dec 17 08:44:11 2009 +0200
+++ b/mobilemessaging/smilui/mediasrc/SmilVideoRenderer.cpp Thu Jan 07 12:45:05 2010 +0200
@@ -28,7 +28,7 @@
#include <aknlayoutscalable_avkon.cdl.h>
#include <AknStatuspaneUtils.h>
#include <mmf/common/mmcaf.h>
-#include <mmferrors.h>
+#include <mmf/common/mmferrors.h>
#include <AudioPreference.h>
#include <smilpresentation.h>
--- a/mobilemessaging/smsmtm/servermtm/inc/SMSSERV.H Thu Dec 17 08:44:11 2009 +0200
+++ b/mobilemessaging/smsmtm/servermtm/inc/SMSSERV.H Thu Jan 07 12:45:05 2010 +0200
@@ -16,6 +16,7 @@
#ifndef SMSSERV_H_
#define SMSSERV_H_
+#include <etelmm.h>
#include <smuthdr.h>
#include <schedulebaseservermtm.h>
#include <smutset.h>
--- a/mobilemessaging/unieditor/application/data/UniEditor.rss Thu Dec 17 08:44:11 2009 +0200
+++ b/mobilemessaging/unieditor/application/data/UniEditor.rss Thu Jan 07 12:45:05 2010 +0200
@@ -707,16 +707,6 @@
,
MENU_ITEM { command = EUniCmdSendMMS; txt = qtn_msg_om_send_mms; }
,
- MENU_ITEM { command = EUniCmdViewImage; txt = qtn_mms_om_view_image; }
- ,
- MENU_ITEM { command = EUniCmdPlayAudio; txt = qtn_mms_om_play_audio; }
- ,
- MENU_ITEM { command = EUniCmdPlayVideo; txt = qtn_mms_om_play_video; }
- ,
- MENU_ITEM { command = EUniCmdPlayPres; txt = qtn_mms_om_play_presentation; }
- ,
- MENU_ITEM { command = EUniCmdPlaySvg; txt = qtn_mms_om_play_presentation; }
- ,
MENU_ITEM { command = EUniCmdPlayPreview; txt = qtn_drm_options_play_preview; }
,
MENU_ITEM { command = EUniCmdAddRecipient; txt = qtn_msg_om_add_recipient; }
--- a/mobilemessaging/unieditor/application/src/UniEditorAppUi.cpp Thu Dec 17 08:44:11 2009 +0200
+++ b/mobilemessaging/unieditor/application/src/UniEditorAppUi.cpp Thu Jan 07 12:45:05 2010 +0200
@@ -2452,11 +2452,7 @@
if ( IsHardcodedSms() )
{
// Dim these items always in locked SMS mode
- aMenuPane->SetItemDimmed( EUniCmdViewImage, ETrue );
- aMenuPane->SetItemDimmed( EUniCmdPlayAudio, ETrue );
- aMenuPane->SetItemDimmed( EUniCmdPlayVideo, ETrue );
- aMenuPane->SetItemDimmed( EUniCmdPlayPres, ETrue );
- aMenuPane->SetItemDimmed( EUniCmdPlaySvg, ETrue );
+
aMenuPane->SetItemDimmed( EUniCmdPlayPreview, ETrue );
aMenuPane->SetItemDimmed( EUniCmdSendMMS, ETrue );
aMenuPane->SetItemDimmed( EUniCmdInsertMedia, ETrue );
@@ -2522,11 +2518,7 @@
if ( Document()->UniState() == EUniSms )
{
// It's currently a SMS message
- aMenuPane->SetItemDimmed( EUniCmdViewImage, ETrue );
- aMenuPane->SetItemDimmed( EUniCmdPlayAudio, ETrue );
- aMenuPane->SetItemDimmed( EUniCmdPlayVideo, ETrue );
- aMenuPane->SetItemDimmed( EUniCmdPlayPres, ETrue );
- aMenuPane->SetItemDimmed( EUniCmdPlaySvg, ETrue );
+
aMenuPane->SetItemDimmed( EUniCmdPlayPreview, ETrue );
aMenuPane->SetItemDimmed( EUniCmdSendMMS, ETrue );
aMenuPane->SetItemDimmed( EUniCmdPlaceTextFirst, ETrue );
@@ -2694,59 +2686,9 @@
void CUniEditorAppUi::DynInitFocusedMediaBasedOptionsL( CEikMenuPane* aMenuPane )
{
// Lets dim all the context sensitive options first
- aMenuPane->SetItemDimmed( EUniCmdViewImage, ETrue );
- aMenuPane->SetItemDimmed( EUniCmdPlayAudio, ETrue );
- aMenuPane->SetItemDimmed( EUniCmdPlayVideo, ETrue );
- aMenuPane->SetItemDimmed( EUniCmdPlayPres, ETrue );
+
aMenuPane->SetItemDimmed( EUniCmdPlayPreview, ETrue );
aMenuPane->SetItemDimmed( EUniCmdSendSMS, ETrue );
- aMenuPane->SetItemDimmed( EUniCmdPlaySvg, ETrue );
-
- if ( iView && iView->FocusedControl() )
- {
- // And then dim one of them if necessary
- switch ( iView->FocusedControl()->ControlId() )
- {
- case EMsgComponentIdImage:
- {
- if ( Document()->DataModel()->SmilType() == E3GPPSmil )
- {
- // Non-editable pres
- aMenuPane->SetItemDimmed( EUniCmdPlayPres, EFalse );
- }
- else if( Document()->DataModel()->SmilType() == ETemplateSmil )
- {
- // Editable press
- aMenuPane->SetItemDimmed( EUniCmdPlayPres, EFalse );
- }
- else
- {
- // Real image
- aMenuPane->SetItemDimmed( EUniCmdViewImage, EFalse );
- }
- break;
- }
- case EMsgComponentIdAudio:
- {
- aMenuPane->SetItemDimmed( EUniCmdPlayAudio, EFalse );
- break;
- }
- case EMsgComponentIdVideo:
- {
- aMenuPane->SetItemDimmed( EUniCmdPlayVideo, EFalse );
- break;
- }
- case EMsgComponentIdSvg:
- {
- aMenuPane->SetItemDimmed( EUniCmdPlaySvg, EFalse );
- break;
- }
- default:
- {
- break;
- }
- }
- }
if ( Document()->DataModel()->SmilType() != EMmsSmil )
{
@@ -4608,6 +4550,10 @@
fetchFile = ETrue;
}
}
+ else if(Err == KLeaveExit)
+ {
+ User::Leave( Err );
+ }
else
{
iEditorFlags &= ~EMsgEditInProgress;
@@ -4672,6 +4618,10 @@
fetchFile = ETrue;
}
}
+ else if(Err == KLeaveExit)
+ {
+ User::Leave( Err );
+ }
else
{
iEditorFlags &= ~EMsgEditInProgress;
@@ -4735,6 +4685,10 @@
fetchFile = ETrue;
}
}
+ else if(Err == KLeaveExit)
+ {
+ User::Leave( Err );
+ }
else
{
iEditorFlags &= ~EMsgEditInProgress;
@@ -9357,7 +9311,7 @@
//
void CUniEditorAppUi::UpdateToolbarL()
{
- if ( iFixedToolbar )
+ if ( iFixedToolbar && !iFixedToolbar->IsDimmed() )
{
iFixedToolbar->SetItemDimmed( EUniCmdFixedToolbarSend, EFalse, EFalse );
--- a/mobilemessaging/unieditor/utils/src/UniSlideLoader.cpp Thu Dec 17 08:44:11 2009 +0200
+++ b/mobilemessaging/unieditor/utils/src/UniSlideLoader.cpp Thu Jan 07 12:45:05 2010 +0200
@@ -643,7 +643,12 @@
{
aObject->SetDrmRightsWhenLoaded( drmRightsValid );
}
- if ( aObject && drmRightsValid )
+ if ( ( aObject && drmRightsValid )
+#ifdef RD_SVGT_IN_MESSAGING
+ || ( ( aObject && aObject->MediaType() == EMsgMediaSvg )
+ && !drmRightsValid )
+#endif
+ )
{
RFile file = CUniDataUtils::GetAttachmentFileL( iDataModel.Mtm(), aObject->AttachmentId() );
CleanupClosePushL( file );