--- a/menufw/menufwui/matrixmenu/src/mmappui.cpp Thu Dec 17 08:40:49 2009 +0200
+++ b/menufw/menufwui/matrixmenu/src/mmappui.cpp Thu Jan 07 12:39:41 2010 +0200
@@ -12,8 +12,8 @@
* Contributors:
*
* Description: Application UI class
-* Version : %version: MM_176.1.28.1.52 % << Don't touch! Updated by Synergy at check-out.
-* Version : %version: MM_176.1.28.1.52 % << Don't touch! Updated by Synergy at check-out.
+* Version : %version: MM_176.1.28.1.54 % << Don't touch! Updated by Synergy at check-out.
+* Version : %version: MM_176.1.28.1.54 % << Don't touch! Updated by Synergy at check-out.
*
*/
@@ -42,7 +42,6 @@
#include <matrixmenu.rsg>
#include <akntabgrp.h>
#include <apgcli.h>
-#include <hwrmdomainpskeys.h> //flip status enums
#include <AknDef.hrh>
#include <AknDlgShut.h>
#include <mmenuinternalPSkeys.h>
@@ -66,7 +65,6 @@
#include "mmwidgetcontainer.h"
#include "mmtemplatelibrary.h"
#include "mmextensionmanager.h"
-#include "mmpropertysubscriber.h"
#include "hnitemsorder.h"
#include "mmnomemory.h"
@@ -124,10 +122,6 @@
iMmExtManager = CMMExtensionManager::NewL( *this );
- iKeyboardFlipStatus = EPSHWRMFlipStatusUninitialized;
- iSliderEventSubscriber = CMmPropertySubscriber::NewL(KPSUidHWRM,
- KHWRMFlipStatus, *this);
-
iScreenOn = ETrue;
iSkinChangeNeeded = EFalse;
iSkinChangeInProgress = EFalse;
@@ -190,7 +184,6 @@
delete iHNInterface;
FeatureManager::UnInitializeLib();
delete iMmExtManager;
- delete iSliderEventSubscriber;
delete iTemplateLibrary;
delete iDummyTemplateLib;
delete iAppkeyHandler;
@@ -315,9 +308,9 @@
CAknAppUi::ProcessCommandL( aCommand );
}
- if (iCurrentContainer && iCurrentContainer == TopFocusedControl() )
+ if ( iCurrentContainer )
{
- iCurrentContainer->HandleTopFocusL();
+ iCurrentContainer->EndLongTapL();
}
}
@@ -728,7 +721,8 @@
TBool idByContainer = iCurrentContainer->IsHighlightVisible() &&
iCurrentContainer->GetSuiteModelL()->GetItemModelsCount() > 1;
TInt current = idByContainer ?
- iCurrentContainer->GetHighlight() : KErrNotFound;
+ iCurrentContainer->GetHighlight():
+ iCurrentContainer->GetSuiteModelL()->GetSuiteHighlight();
ForwardEventToHNL( aEvent, current );
}
@@ -763,15 +757,6 @@
case EStopEditMode:
SetEditModeL( EFalse );
break;
- case EZoomLarge:
- SetZoom( EAknUiZoomLarge );
- break;
- case EZoomSmall:
- SetZoom( EAknUiZoomSmall );
- break;
- case EZoomNormal:
- SetZoom( EAknUiZoomNormal );
- break;
case EForegroundGain:
{
DEBUG(("_MM_:CMmAppUi::NotifyUiRefreshL Foreground"));
@@ -1333,10 +1318,9 @@
MMPERF(("CMmAppUi::DynInitMenuPaneL - STOP"));
}
- if ( !popupMenuDisplayed && iCurrentContainer
- && iCurrentContainer == TopFocusedControl() )
+ if ( !popupMenuDisplayed && iCurrentContainer )
{
- iCurrentContainer->HandleTopFocusL( EFalse );
+ iCurrentContainer->EndLongTapL( EFalse );
HandleHighlightItemSingleClickedL(
iCurrentContainer->Widget()->CurrentItemIndex() );
}
@@ -1356,10 +1340,6 @@
{
ForwardEventToHNL( KKeyIdSelect, aIndex );
}
- else if ( iCurrentSuiteModel->WidgetType() == EGridWidget && FlipOpen() )
- {
- ForwardEventToHNL( KKeyIdSelect, aIndex );
- }
else if ( iCurrentSuiteModel->WidgetType() == EGridWidget
&& IsEditMode() && iCurrentContainer->GetPreviousHighlight() == aIndex
&& !iCurrentContainer->IsDraggable())
@@ -1761,8 +1741,6 @@
iCurrentContainer->Widget()->View()->SetDisableRedraw(ETrue);
iDummyContainer->MakeVisible( ETrue );
RefreshCbaL();
- iCurrentContainer->SetZoom( iZoom );
- iCurrentContainer->SetFlipOpenL( FlipOpen() );
iCurrentContainer->SetEditModeL( IsEditMode() );
iCurrentContainer->SetSuiteModelL( iCurrentSuiteModel );
iCurrentContainer->HandleResourceChange( KAknsMessageSkinChange );
@@ -1796,8 +1774,6 @@
if ( iCurrentSuiteModel )
{
iCurrentContainer->Widget()->View()->SetDisableRedraw(ETrue);
- iCurrentContainer->SetZoom( iZoom );
- iCurrentContainer->SetFlipOpenL( FlipOpen() );
iCurrentContainer->SetEditModeL( IsEditMode() );
iCurrentContainer->SetSuiteModelL( iCurrentSuiteModel );
iCurrentContainer->SetEmptyTextL( iCurrentSuiteModel->EmptyText() );
@@ -2344,8 +2320,6 @@
iHNInterface = NULL;
delete iMmExtManager;
iMmExtManager = NULL;
- delete iSliderEventSubscriber;
- iSliderEventSubscriber = NULL;
delete iTemplateLibrary;
iTemplateLibrary = NULL;
@@ -2367,8 +2341,6 @@
iMmExtManager = CMMExtensionManager::NewL( *this );
- iKeyboardFlipStatus = EPSHWRMFlipStatusUninitialized;
-
iScreenOn = ETrue;
iSkinChangeNeeded = EFalse;
iSkinChangeInProgress = EFalse;
@@ -2433,7 +2405,6 @@
if( created )
{
containerToLoad->Widget()->View()->SetDisableRedraw( ETrue );
- containerToLoad->SetFlipOpenL( FlipOpen() );
containerToLoad->SetEditModeL( IsEditMode() );
containerToLoad->SetSuiteModelL( aModel );
containerToLoad->SetEmptyTextL( aModel->EmptyText() );
@@ -2776,57 +2747,6 @@
//
// ---------------------------------------------------------------------------
//
-void CMmAppUi::PropertyChangedL(TInt aValue)
- {
- iKeyboardFlipStatus = (EPSHWRMFlipStatus)aValue;
-
- if ( iCurrentContainer )
- {
- if( iKeyboardFlipStatus == EPSHWRMFlipOpen )
- {
- TBool wasHighlightVisible = iCurrentContainer->IsHighlightVisible();
- iCurrentContainer->SetFlipOpenL( ETrue );
- if ( IsForeground() && !IsEditMode() && !wasHighlightVisible )
- {
- iCurrentContainer->SetDefaultHighlightL( ETrue );
- }
- }
- else if( iKeyboardFlipStatus == EPSHWRMFlipClosed )
- {
- iCurrentContainer->SetFlipOpenL( EFalse );
- }
- }
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-TBool CMmAppUi::FlipOpen()
- {
- return iKeyboardFlipStatus == EPSHWRMFlipOpen;
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
-void CMmAppUi::SetZoom( TAknUiZoom aZoom )
- {
- if ( iZoom != aZoom)
- {
- if ( iCurrentContainer )
- {
- iCurrentContainer->HandleZoomChanged( aZoom );
- }
- }
- iZoom = aZoom;
- }
-
-// ---------------------------------------------------------------------------
-//
-// ---------------------------------------------------------------------------
-//
TBool CMmAppUi::ResetToRootL()
{
TBool resetConsumed( EFalse );
@@ -2842,7 +2762,6 @@
if( iCurrentContainer )
{
iCurrentContainer->ResetWidgetPosition();
- iCurrentContainer->SetZoom( iZoom );
AddToStackL( iCurrentContainer );
}
RefreshUiPanesL( ETrue );
@@ -3029,8 +2948,7 @@
//should be reset to normal then.
if( AknLayoutUtils::PenEnabled() )
{
- if( iCurrentContainer->WidgetType() == EGridWidget
- && !FlipOpen() && !IsEditMode() )
+ if( iCurrentContainer->WidgetType() == EGridWidget && !IsEditMode() )
{
iCurrentContainer->Widget()->View()->ItemDrawer()->
SetFlags( CListItemDrawer::EDisableHighlight );