photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandleraddtocontainer.cpp
--- a/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandleraddtocontainer.cpp Tue May 25 12:42:31 2010 +0300
+++ b/photosgallery/viewframework/commandhandlers/commoncommandhandlers/src/glxcommandhandleraddtocontainer.cpp Wed Jun 09 09:41:51 2010 +0300
@@ -67,20 +67,6 @@
}
// ---------------------------------------------------------------------------
-// Return add to album command handler for singleclick options menu
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CGlxCommandHandlerAddToContainer*
-CGlxCommandHandlerAddToContainer::NewAddToAlbumSingleClickCommandHandlerL(
- MGlxMediaListProvider* aMediaListProvider, TBool aHasToolbarItem,
- const TDesC& aFileName)
- {
- return CGlxCommandHandlerAddToContainer::NewL(aMediaListProvider,
- EGlxCmdSingleClickAddToAlbum, aHasToolbarItem, aFileName);
- }
-
-
-// ---------------------------------------------------------------------------
// Return add (to) tags command handler
// ---------------------------------------------------------------------------
//
@@ -95,20 +81,6 @@
}
// ---------------------------------------------------------------------------
-// Return add (to) tags command handler for singleclick option menu
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CGlxCommandHandlerAddToContainer*
-CGlxCommandHandlerAddToContainer::NewAddToTagSingleClickCommandHandlerL(
- MGlxMediaListProvider* aMediaListProvider, TBool aHasToolbarItem,
- const TDesC& aFileName)
- {
- return CGlxCommandHandlerAddToContainer::NewL(aMediaListProvider,
- EGlxCmdSingleClickAddTag, aHasToolbarItem, aFileName);
- }
-
-
-// ---------------------------------------------------------------------------
// Return add (to) Favourites command handler
// ---------------------------------------------------------------------------
//
@@ -223,7 +195,6 @@
break;
}
case EGlxCmdAddToAlbum:
- case EGlxCmdSingleClickAddToAlbum:
{
enablePopup = ETrue;
targetCollection->AppendL(KGlxCollectionPluginAlbumsImplementationUid);
@@ -232,7 +203,6 @@
break;
}
case EGlxCmdAddTag:
- case EGlxCmdSingleClickAddTag:
{
enableMultipleSelection = ETrue;
enablePopup = ETrue;
@@ -291,8 +261,7 @@
HBufC* CGlxCommandHandlerAddToContainer::CompletionTextL() const
{
TRACER("CGlxCommandHandlerAddToContainer::CompletionTextL()");
- if (iCommandId == EGlxCmdAddToAlbum ||
- iCommandId == EGlxCmdSingleClickAddToAlbum )
+ if (iCommandId == EGlxCmdAddToAlbum)
{
if (iSelectionCount > 1)
{
@@ -300,8 +269,7 @@
}
return StringLoader::LoadL(R_GLX_COMPLETION_ADD_TO_CONTAINER_ONE_ITEM_ALBUM);
}
- else if (iCommandId == EGlxCmdAddTag ||
- iCommandId == EGlxCmdSingleClickAddTag)
+ else if (iCommandId == EGlxCmdAddTag)
{
if (iSelectionCount > 1)
{
@@ -369,17 +337,10 @@
MGlxMediaList& aList) const
{
TRACER("CGlxCommandHandlerAddToContainer::DoIsDisabled");
- if ( (EGlxCmdSingleClickAddToAlbum==aCommandId ||
- EGlxCmdSingleClickAddTag == aCommandId) &&
- aList.SelectionCount() > 0 )
- {
- return EFalse;
- }
- else if (EGlxCmdAddToAlbum==aCommandId || EGlxCmdAddTag == aCommandId)
+ if (EGlxCmdAddToAlbum==aCommandId || EGlxCmdAddTag == aCommandId)
{
return EFalse;
}
-
return ETrue;
}
-
+// End of File