diff -r e5618cc85d74 -r 6c158198356e javauis/lcdui_akn/lcdui/src/CMIDDateFieldItem.cpp --- a/javauis/lcdui_akn/lcdui/src/CMIDDateFieldItem.cpp Thu Jul 15 18:31:06 2010 +0300 +++ b/javauis/lcdui_akn/lcdui/src/CMIDDateFieldItem.cpp Thu Aug 19 09:48:13 2010 +0300 @@ -492,6 +492,8 @@ // Show Menu or activate one command else { + TInt numScreenOrHelpCommands = displayable.NumCommandsForScreenOrHelpOptionsMenu(); + // Active Command Show Menu // if ( cntOpt > 1 ) will run menu, else execute ProcessCommandL( CommandOffset ) if (cntOpt > 1) @@ -499,6 +501,13 @@ displayable.MenuHandler()->ShowMenuL(CMIDMenuHandler::EOkMenu); return EKeyWasConsumed; } + else if (cntOpt == 0 && numScreenOrHelpCommands > 1) + { + // If there is more than one screen command on form + // and there is no ok/item commands then show menu + displayable.MenuHandler()->ShowMenuL(CMIDMenuHandler::EOptionsMenu); + return EKeyWasConsumed; + } else if (command && command->CommandType() != MMIDCommand::EBack && command->CommandType() != MMIDCommand::ECancel) { @@ -517,7 +526,8 @@ // // End Enter Key // - if (code == EKeyDownArrow || code == EKeyUpArrow || code == EKeyApplication0) + if (code == EKeyDownArrow || code == EKeyUpArrow || + (code == EKeyApplication0 || aKeyEvent.iScanCode == EStdKeyApplication0)) return EKeyWasNotConsumed; if (!iInitialised && aType == EEventKey && !CMIDUtils::IgnoreKeyEvent(aKeyEvent.iCode)) @@ -954,17 +964,15 @@ void CMIDDateFieldItem::UpdateTextColorsL() { - // Set color for content text according to item highlight - // (logical color constants are defined in lcdui.h) if (iHighlighted) { // Text colour from skin - highlighted - iEditor->SetSkinTextColorL(KHighlightedItemTextColor); + iEditor->SetSkinTextColorL(EAknsCIQsnTextColorsCG8); } else { // Text colour from skin - unfocused - iEditor->SetSkinTextColorL(KNonHighlightedItemTextColor); + iEditor->SetSkinTextColorL(EAknsCIQsnTextColorsCG6); } }