--- a/commonuis/CommonUi/src/FindItemMenu.cpp Thu Jul 15 18:56:19 2010 +0300
+++ b/commonuis/CommonUi/src/FindItemMenu.cpp Thu Aug 19 10:11:06 2010 +0300
@@ -623,19 +623,17 @@
tempBuf);
index = EFindItemCmdGoToUrl;
- if ( !iIsContextMenu )
- {
- // Add bookmark
- iCoeEnv->ReadResourceL(
- tempBuf, R_FINDITEMMENU_ADD_BOOKMARK );
- AddMenuItemL(
- *iMenuPane,
- EFindItemCmdAddToBookmark,
- index,
- 0,
- tempBuf );
- index = EFindItemCmdAddToBookmark;
- }
+ // Add bookmark
+ iCoeEnv->ReadResourceL(
+ tempBuf, R_FINDITEMMENU_ADD_BOOKMARK );
+ AddMenuItemL(
+ *iMenuPane,
+ EFindItemCmdAddToBookmark,
+ index,
+ 0,
+ tempBuf );
+ index = EFindItemCmdAddToBookmark;
+
}
else
{
@@ -647,18 +645,16 @@
tempBuf );
index = EFindItemCmdGoToRstp;
- if ( !iIsContextMenu )
- {
- iCoeEnv->ReadResourceL(
- tempBuf, R_FINDITEMMENU_ADD_TO_GALLERY );
- AddMenuItemL(
- *iMenuPane,
- EFindItemCmdAddToGallery,
- index,
- 0,
- tempBuf );
- index = EFindItemCmdAddToGallery;
- }
+ iCoeEnv->ReadResourceL(
+ tempBuf, R_FINDITEMMENU_ADD_TO_GALLERY );
+ AddMenuItemL(
+ *iMenuPane,
+ EFindItemCmdAddToGallery,
+ index,
+ 0,
+ tempBuf );
+ index = EFindItemCmdAddToGallery;
+
}
break;
}
@@ -842,8 +838,6 @@
// Add to contacts
if ( ( itemType != CItemFinder::EUriScheme ) &&
- !( itemType == CItemFinder::EUrlAddress &&
- iIsContextMenu ) &&
( ( ( ( !iIsSenderKnown &&
iSenderDescriptor->Length() ) ||
iCallbackNumber ) &&
@@ -893,7 +887,8 @@
if ( ( !iHideCallMenu ||
( iFindItemVoIPExtension->IsVoIPSupported() &&
iFindItemVoIPExtension->VoIPProfilesExistL() ) ) &&
- iMenuPane->MenuItemExists( EFindItemCmdCall, dummy ) )
+ iMenuPane->MenuItemExists( EFindItemCmdCall, dummy ) &&
+ !iHideCallSubMenu )
{
iMenuPane->SetItemDimmed( EFindItemCmdCall, ETrue );
iMenuPane->AddMenuItemsL(
@@ -902,6 +897,18 @@
}
}
+
+// -----------------------------------------------------------------------------
+// CFindItemMenu::SetCallSubMenuVisibility
+// Sets AIW submenu visibility
+// -----------------------------------------------------------------------------
+//
+EXPORT_C void CFindItemMenu::SetCallSubMenuVisibility( TBool aVisible )
+ {
+ iHideCallSubMenu = !aVisible;
+ }
+
+
EXPORT_C void CFindItemMenu::HandleItemFinderCommandL( TInt aCommand )
{
switch ( aCommand )