diff -r 5b238bc8ffb6 -r 01504893d9cb photosgallery/viewframework/dataprovider/src/glxmulmodelproviderbase.cpp --- a/photosgallery/viewframework/dataprovider/src/glxmulmodelproviderbase.cpp Wed Sep 15 12:13:06 2010 +0300 +++ b/photosgallery/viewframework/dataprovider/src/glxmulmodelproviderbase.cpp Wed Oct 13 14:32:09 2010 +0300 @@ -20,16 +20,19 @@ #include "glxmulmodelproviderbase.h" +#include #include #include #include #include +//#include #include #include #include -#include // An interface for Multimedia coverflow Widget #include //Logging #include +#include "glxbinding.h" +#include "glxcommandbindingutility.h" #include #include @@ -39,9 +42,8 @@ #include #include #include +#include // An interface for Multimedia coverflow Widget #include "glxdrmgiftexturecreator.h" -#include "glxbinding.h" -#include "glxcommandbindingutility.h" using namespace Alf; @@ -49,6 +51,9 @@ static const char* const KGridWidget = "GridWidget"; static const char* const KCoverFlowWidget = "CoverflowWidget"; +//@todo to be uncommented when using command binding +//#include "glxboundcommand.h" + // ---------------------------------------------------------------------------- // BaseConstructL // ---------------------------------------------------------------------------- @@ -184,7 +189,6 @@ AlfEventStatus response = EEventNotHandled; if ( aEvent.IsCustomEvent() ) { - GLX_LOG_INFO1("CGlxMulModelProviderBase::offerEvent() aEvent.CustomParameter(%d)", aEvent.CustomParameter()); switch ( aEvent.CustomParameter() ) { case KAlfActionIdDeviceLayoutChanged: @@ -202,29 +206,9 @@ response = EEventHandled; } break; - case Alf::ETypeItemRemoved: - { - GLX_LOG_INFO("CGlxMulModelProviderBase::offerEvent - ETypeItemRemoved!"); - CGlxUiUtility* uiUtility = CGlxUiUtility::UtilityL(); - CleanupClosePushL(*uiUtility); - if (iModel->Count() == 0 && UString(KCoverFlowWidget) - == UString(iWidget.widgetName()) - && iNavigationalState->ViewingMode() - == NGlxNavigationalState::EView - && uiUtility->GetForegroundStatus()) - { - uiUtility->SetViewNavigationDirection( - EGlxNavigationBackwards); - - iNavigationalState->ActivatePreviousViewL(); - response = EEventHandled; - } - CleanupStack::PopAndDestroy(uiUtility); - } - break; - default: - break; - } + default: + break; + } } return response; } @@ -460,7 +444,6 @@ { TRACER("CGlxMulModelProviderBase::RemoveItems"); // RemoveItems does not throw according to model documentation - GLX_LOG_INFO2("CGlxMulModelProviderBase::RemoveItems() aIndex(%d), aCount(%d)", aIndex, aCount); iModel->Remove( aIndex, aCount ); }