MCL/sf/mw/classicui: comparison uifw/EikStd/coctlsrc/EIKMENUB.CPP

equal deleted inserted replaced

-:0aa5fbdfbc30
+:3d340a0166ff
 #include <touchfeedback.h>
 #include <aknitemactionmenu.h>
 #include "aknitemactionmenuregister.h"
 #include <AknPriv.hrh>
 #include "akntrace.h"
+#include "aknmarkingmode.h"
 enum { EEikMenuBarTitleArrayGranularity=10 };
 enum { EEikMenuBarPosArrayGranularity=2 };
 const TInt KExtraBaselineOffsetForFirstPaneItem=4;
 ~CEikMenuBarExtension();
 void FadeBehindPopup(TBool aFade);
 /**
-* Sets item specific commands dimmed if highlight is not visible.
+* Dims item specific commands if no highlight in list or dims
+* other than item specific commands if list is in multiple marking
+* state.
 */
-void SetItemCommandsDimmedL();
+void SetItemCommandsStateL();
+/**
+* Returns active marking mode object. Otherwise NULL.
+*
+* @return Active marking mode object.
+*/
+CAknMarkingMode* MarkingModeActive();
 /**
 * Saves current value of iItemActionMenu->CollectionHighlightVisible() to
 * a member variable iCollectionHighlightVisible
 */
 * Not own.
 */
 CAknItemActionMenu* iItemActionMenu;
 /**
+* ETrue if single click has been enabled in application.
+*/
+TBool iSingleClickEnabled;
+/**
 * When menu pane is opened this value is updated to store the value about
 * collection highlight visibility
 */
 TBool iCollectionHighlightVisible;
 };
 }
 _AKNTRACE_FUNC_EXIT;
 }
-void CEikMenuBarExtension::SetItemCommandsDimmedL()
+void CEikMenuBarExtension::SetItemCommandsStateL()
 {
-if ( !iItemActionMenu )
+if ( iSingleClickEnabled && !iItemActionMenu )
 {
 AknItemActionMenuRegister::RegisterMenuBarL( *iBar );
 }
-// hide item-specific commands if highlight not visible
-if ( iBar->GetMenuType() != CEikMenuBar::EMenuContext
+// Hide item-specific commands if highlight not visible
-&& ( ( iItemActionMenu
+// or show only item specific commands if list is in multiple marking
-&& !iItemActionMenu->CollectionHighlightVisible() )
+// state
-|| !iItemActionMenu ) )
+if ( iBar->GetMenuType() != CEikMenuBar::EMenuContext )
 {
-iBar->iMenuPane->SetItemCommandsDimmed();
+if ( iItemActionMenu )
-}
+{
+TBool dimCommands( EFalse );
+TBool changeState( EFalse );
+if ( iItemActionMenu->MarkingMode().MultipleMarkingActive() )
+{
+changeState = ETrue;
+dimCommands = EFalse;
+}
+else if ( !iItemActionMenu->CollectionHighlightVisible() )
+{
+changeState = ETrue;
+dimCommands = ETrue;
+}
+if ( changeState )
+{
+iBar->iMenuPane->SetItemCommandsStateL( dimCommands );
+}
+}
+else if ( iSingleClickEnabled )
+{
+// Dim tagged item action and item specific commands
+// anyway, fixes case where listbox creation is not
+// finished yet when options menu is opened
+iBar->iMenuPane->SetItemCommandsStateL( ETrue );
+}
+}
+}
+CAknMarkingMode* CEikMenuBarExtension::MarkingModeActive()
+{
+CAknMarkingMode* markingMode( NULL );
+if ( iItemActionMenu
+&& iItemActionMenu->MarkingMode().MultipleMarkingActive() )
+{
+markingMode = &iItemActionMenu->MarkingMode();
+}
+return markingMode;
 }
 void CEikMenuBarExtension::StoreCollectionHighlightValue()
 {
 {
 iCollectionHighlightVisible
 = iItemActionMenu->CollectionHighlightVisible();
 }
 }
 CEikMenuBarExtension::CEikMenuBarExtension(CEikMenuBar* aBar)
 :iBar(aBar),
 iDoingMenuCloseTransition(EFalse),
-iItemActionMenu( NULL )
+iItemActionMenu( NULL ),
+iSingleClickEnabled(
+static_cast<CAknAppUi*>(
+aBar->ControlEnv()->AppUi() )->IsSingleClickCompatible() )
 {
 }
 void CEikMenuBarExtension::ConstructL()
 {
 fepMenuObserver->DynInitMenuBarL(iMenuTitleResourceId, this);
 }
 TInt titles = iTitleArray->Count() - 1;
+CAknMarkingMode* marking( NULL );
+if ( iExt )
+{
+marking = iExt->MarkingModeActive();
+}
 if ( titles < 0 )
 {
 delete iMenuCba;
 iMenuCba = NULL;
 iTitleArray->ResetAndDestroy();
 iMenuPane->Close();
 return;
 }
-// Create the menu pane using the last pane in the menu bar
+TBool markedItems( EFalse );
-iMenuObserver->RestoreMenuL(iMenuPane,(*iTitleArray)[titles]->iData.iMenuPaneResourceId,MEikMenuObserver::EMenuPane);
+if ( marking )
-if (fepMenuObserver)
+{
-fepMenuObserver->DynInitMenuPaneL((*iTitleArray)[titles]->iData.iMenuPaneResourceId,iMenuPane);
+markedItems = marking->MarkedItems();
-if (iActiveEditMenuObserver)
+}
-iActiveEditMenuObserver->DynInitMenuPaneL((*iTitleArray)[titles]->iData.iMenuPaneResourceId,iMenuPane);
+// In marking mode do not add commands if no marked items in list
+if ( !marking || markedItems )
-titles = iTitleArray->Count() - 2;
+{
-iMenuPane->FilterDimmedItems();
+// Create the menu pane using the last pane in the menu bar
+iMenuObserver->RestoreMenuL(
-// Add the remaining menu panes from right to left at the end of the current pane
+iMenuPane,
-while (titles >= 0)
+( *iTitleArray )[ titles ]->iData.iMenuPaneResourceId,
-{
+MEikMenuObserver::EMenuPane );
-TInt resource = (*iTitleArray)[titles]->iData.iMenuPaneResourceId;
+if ( fepMenuObserver )
-iMenuPane->AddMenuItemsL(resource, 0, ETrue);
+fepMenuObserver->DynInitMenuPaneL(
-iMenuObserver->DynInitMenuPaneL(resource,iMenuPane);
+( *iTitleArray )[ titles ]->iData.iMenuPaneResourceId,
-if (fepMenuObserver)
+iMenuPane );
-fepMenuObserver->DynInitMenuPaneL(resource,iMenuPane);
+if ( iActiveEditMenuObserver )
-if (iActiveEditMenuObserver)
+iActiveEditMenuObserver->DynInitMenuPaneL(
-iActiveEditMenuObserver->DynInitMenuPaneL(resource,iMenuPane);
+( *iTitleArray )[ titles ]->iData.iMenuPaneResourceId,
-iExt->SetItemCommandsDimmedL();
+iMenuPane );
+titles = iTitleArray->Count() - 2;
 iMenuPane->FilterDimmedItems();
-titles--;
-}
+// Add the remaining menu panes from right to left
+// at the end of the current pane
+while ( titles >= 0 )
+{
+TInt resource =
+( *iTitleArray )[ titles ]->iData.iMenuPaneResourceId;
+iMenuPane->AddMenuItemsL( resource, 0, ETrue );
+iMenuObserver->DynInitMenuPaneL( resource, iMenuPane );
+if ( fepMenuObserver )
+fepMenuObserver->DynInitMenuPaneL( resource, iMenuPane );
+if ( iActiveEditMenuObserver )
+iActiveEditMenuObserver->DynInitMenuPaneL(
+resource,iMenuPane );
+if ( resource == R_AVKON_MENUPANE_MARK_MULTIPLE )
+{
+iMenuPane->SetItemDimmed( EAknCmdMarkingModeMarkOne, ETrue );
+}
+titles--;
+}
+iExt->SetItemCommandsStateL();
+iMenuPane->FilterDimmedItems();
+}
+// Multiple marking mode active
+if ( marking )
+{
+iMenuPane->AddMenuItemsL( R_AVKON_MENUPANE_MARK_MULTIPLE, 0, ETrue );
+if ( !marking->CollectionEmpty() )
+{
+iMenuPane->SetItemDimmed( EAknCmdMarkingModeMarkAll, EFalse );
+}
+if ( markedItems )
+{
+iMenuPane->SetItemDimmed( EAknCmdMarkingModeUnmarkAll, EFalse );
+}
+iMenuPane->SetItemDimmed( EAknCmdMarkingModeMarkOne, ETrue );
+iMenuPane->SetItemDimmed( EAknCmdMarkingModeEnter, ETrue );
+iMenuPane->FilterDimmedItems();
+}
 iMenuObserver->SetEmphasis(this,ETrue);
 	iMenuCba = CEikButtonGroupContainer::NewL(CEikButtonGroupContainer::ECba,
 	    CEikButtonGroupContainer::EHorizontal,
 	    this, softkeyResourceId, *iMenuPane,
 	    CEikButtonGroupContainer::EIsEmbedded |
 CEikCba* cba = static_cast<CEikCba*>( iMenuCba->ButtonGroup() );
 if ( cba )
 {
 iMenuPane->SetEmbeddedCba( cba );
 }
+MTouchFeedback* feedback = NULL;
-MTouchFeedback* feedback = MTouchFeedback::Instance();
+if( AknLayoutUtils::PenEnabled() )
+{
+feedback = MTouchFeedback::Instance();
+}
 if ( feedback )
 {
 feedback->FlushRegistryUpdates();
 }
 TInt taskSwapper ( ETaskSwapper );
 RProperty::Get(
 KPSUidAvkonInternal,
 KAknMenuOptionNoTaskSwapper,
 taskSwapper);
-if ( iMenuPane->NumberOfItemsInPane() != 0 && iExt->iMenuType == EMenuOptions && taskSwapper == ETaskSwapper )
+if ( iMenuPane->NumberOfItemsInPane() != 0
+&& iExt->iMenuType == EMenuOptions
+&& taskSwapper == ETaskSwapper
+&& !marking )
 {
 // 'Active Applications' menu item is added at the first item of the
 // options menu after other menu items are added.
 iMenuPane->AddMenuItemsL(R_AVKON_MENUPANE_TASK_SWAPPER);
 }
 if(AknLayoutUtils::PenEnabled())
 {
 // menu pane captures all pointer events, and forwards them to CBA if neccessary
 iMenuPane->SetGloballyCapturing(ETrue);
 iMenuPane->SetPointerCapture(ETrue);
-MTouchFeedback* feedback = MTouchFeedback::Instance();
-if ( feedback )
-{
-TTouchLogicalFeedback fbLogicalType = ETouchFeedbackPopUp;
-if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) )
-{
-fbLogicalType = ETouchFeedbackOptionsMenuOpened;
-}
-feedback->InstantFeedback(
-this,
-fbLogicalType,
-ETouchFeedbackVibra,
-TPointerEvent() );
-}
 }
 iMenuPane->MakeVisible( EFalse );
 // options menu launch animation
 TBool optMenuFg = iAvkonAppUi->IsForeground();
 if( optMenuFg )
 {
 GfxTransEffect::Begin( iMenuPane, KGfxControlAppearAction );
+if( feedback && CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ))
+{
+TTouchLogicalFeedback fbLogicalType = ETouchFeedbackOptionsMenuOpened;
+if( iExt->iMenuType == EMenuContext || iExt->iMenuType == EMenuEdit )
+{
+fbLogicalType = ETouchFeedbackIncreasingPopUp;
+}
+feedback->InstantFeedback( this, fbLogicalType,
+ETouchFeedbackVibra, TPointerEvent() );
+}
 }
 iMenuPane->StartDisplayingMenuPane(NULL, menuPosition, NULL, screenSize.iWidth, EPopupTargetBottomLeft);
 iMenuCba->ActivateL();
 TRect demarcation;
 CAknTransitionUtils::GetDemarcation( CAknTransitionUtils::EOptionsMenu,
 demarcation );
 GfxTransEffect::SetDemarcation( iMenuPane, demarcation );
 GfxTransEffect::End( iMenuPane );
+}
+if( feedback )
+{
+feedback->InstantFeedback( this, ETouchFeedbackPopUp,
+ETouchFeedbackVibra, TPointerEvent() );
 }
 _AKNTRACE_FUNC_EXIT;
 }
 {
 MTouchFeedback* feedback = MTouchFeedback::Instance();
 if ( feedback )
 {
 TTouchLogicalFeedback fbLogicalType = ETouchFeedbackPopUp;
-if ( CAknTransitionUtils::TransitionsEnabled( AknTransEffect::EComponentTransitionsOff ) )
+if ( CAknTransitionUtils::TransitionsEnabled(
+AknTransEffect::EComponentTransitionsOff ) )
 {
-fbLogicalType = ETouchFeedbackOptionsMenuClosed;
+if ( iExt->iMenuType == EMenuContext ||
+iExt->iMenuType == EMenuEdit )
+{
+fbLogicalType = ETouchFeedbackDecreasingPopUp;
+}
+else
+{
+fbLogicalType = ETouchFeedbackOptionsMenuClosed;
+}
 }
 feedback->InstantFeedback(
 this,
 fbLogicalType,
 ETouchFeedbackVibra,
 TPointerEvent() );
 }
 }
 break;
 // AKNLAF end
+case EAknCmdMarkingModeEnter:
+{
+if ( iExt->iItemActionMenu )
+{
+iExt->iItemActionMenu->MarkingMode(
+).SetCollectionMultipleMarkingState( ETrue );
+}
+break;
+case EAknCmdMarkingModeMarkOne:
+{
+if ( iExt->iItemActionMenu )
+{
+iExt->iItemActionMenu->MarkingMode().MarkCurrentItemL();
+}
+}
+break;
+case EAknCmdMarkingModeMarkAll:
+{
+if ( iExt->iItemActionMenu )
+{
+iExt->iItemActionMenu->MarkingMode().MarkAllL();
+}
+}
+break;
+case EAknCmdMarkingModeUnmarkAll:
+{
+if ( iExt->iItemActionMenu )
+{
+iExt->iItemActionMenu->MarkingMode().UnmarkAll();
+}
+}
+break;
+}
 default:
+if ( iExt->iItemActionMenu )
+{
+iExt->iItemActionMenu->MarkingMode().TryExitMarkingMode();
+}
 break;
 }
 }
 if ( iCoeEnv->IsResourceAvailableL( resource ) )
 {
 menuPane->AddMenuItemsL( resource, 0 );
 iMenuObserver->DynInitMenuPaneL( resource, menuPane );
+if ( resource == R_AVKON_MENUPANE_MARK_MULTIPLE )
+{
+if ( iExt->iItemActionMenu->MarkingMode().MultipleMarkingActive() ||
+!iExt->iItemActionMenu->MarkingMode().CurrentItemMarkable() )
+{
+menuPane->SetItemDimmed( EAknCmdMarkingModeMarkOne, ETrue );
+}
+}
 }
 titles--;
 }
 menuPane->AddMenuItemsToItemActionMenuL(
 iExt->iItemActionMenu->MenuData() );

branch	RCL_3
changeset 10	3d340a0166ff
parent 8	71dd06cfe933
child 12	941195f2d488