diff -r 5b238bc8ffb6 -r 01504893d9cb photosgallery/viewframework/dataprovider/src/glxdetailsboundcommand.cpp --- a/photosgallery/viewframework/dataprovider/src/glxdetailsboundcommand.cpp Wed Sep 15 12:13:06 2010 +0300 +++ b/photosgallery/viewframework/dataprovider/src/glxdetailsboundcommand.cpp Wed Oct 13 14:32:09 2010 +0300 @@ -17,14 +17,11 @@ -#include "glxdetailsboundcommand.hrh" -#include "glxdetailsboundcommand.h" // Handles user commands -#include "glxuiutility.h" -/** Error Id EMPY-7MKDHP **/ -#include "mglxmetadatadialogobserver.h" //for call back to dailog #include // Base class for all classes to be instantiated on the heap #include //For CExifModify +#include "glxdetailsboundcommand.hrh" +#include "glxdetailsboundcommand.h" // Handles user commands #include #include #include @@ -40,11 +37,16 @@ #include // Logging #include #include -#include -#include // for CGlxResourceUtilities -#include // for KMaxMediaPopupTextLength +#include "glxuiutility.h" +#include +#include // for CGlxResourceUtilities +/** Error Id EMPY-7MKDHP **/ +#include "mglxmetadatadialogobserver.h" //for call back to dailog +//CONSTANTS +const TInt KMaxMediaPopupTitleLength = 0x100; + // ---------------------------------------------------------------------------- // CGlxTitleBoundCommand::NewL // ---------------------------------------------------------------------------- @@ -89,11 +91,11 @@ { ///@todo - remove popup when editable template is avaliable //Popup for testing - HBufC* textBuf = HBufC::NewLC( KMaxMediaPopupTextLength ); + HBufC* textBuf = HBufC::NewLC( KMaxMediaPopupTitleLength ); (textBuf->Des()).Copy((media->ValueText(KMPXMediaGeneralTitle))); TPtr textPtr = textBuf->Des(); /// bug fix - EMPY-7MCKD6 - TBuf titleText(*textBuf); + TBuf titleText(*textBuf); /// bug fix - EMPY-7MCKD6 ///@todo - remove literal for popup title when resource string is avaliable HBufC *buf = StringLoader::LoadLC(R_GLX_METADATA_VIEW_TITLE_NSERIES); @@ -384,11 +386,11 @@ { ///@todo - remove popup when editable template is avaliable //Popup for testing - HBufC* textBuf = HBufC::NewLC( KMaxMediaPopupTextLength ); + HBufC* textBuf = HBufC::NewLC( KMaxMediaPopupTitleLength ); (textBuf->Des()).Copy((media->ValueText(KMPXMediaGeneralComment))); TPtr textPtr = textBuf->Des(); /// bug fix - EMPY-7MCKD6 - TBuf descText(*textBuf); + TBuf descText(*textBuf); /// bug fix - EMPY-7MCKD6 ///@todo - remove literal for popup title when resource string is avaliable @@ -1020,6 +1022,7 @@ void CGlxUsageRightsBoundCommand::InitMenuL( CEikMenuPane& aMenu ) const { TRACER("CGlxUsageRightsBoundCommand::InitMenuL"); + aMenu.SetItemTextL( KGlxViewBoundMenuCommandId, R_GLX_METADATA_VIEW_OPTIONS_VIEW ); aMenu.SetItemDimmed( KGlxViewBoundMenuCommandId, EFalse ); }