MCL/sf/mw/classicui: comparison uifw/AvKon/src/AknAppUi.cpp

equal deleted inserted replaced

-:fcdfafb36fe7
+:aecbbf00d063
 /*
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002 - 2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include <akntranseffect.h> // for Transition effect enumerations
 #include <aknlayoutscalable_avkon.cdl.h>
 #include <gfxtranseffect/gfxtranseffect.h>
 #include <aknSDData.h>
-#include <secondarydisplay/AknSecondaryDisplayDefs.h>
+#include <AknNotifyStd.h>
+#include <SecondaryDisplay/AknSecondaryDisplayDefs.h>
 #include <startupdomainpskeys.h>
 #include "transitionmanager.h"
 #include <PtiEngine.h>
 #include <PtiKeyMappings.h>
 #include <akntoolbar.h>
-#include <akntoolbarextension.h>
 #include <eikdialg.h>
 #ifdef RD_SCALABLE_UI_V2
 #include <AknPriv.hrh>
 #include <akntouchpane.h>
 #include <touchfeedbackadaptation.h>
 #include <touchfeedback.h>
 #include <aknpointereventmodifier.h>
-#include <aknitemactionmenuregister.h>
 // UIDS for dialler view
 const TUid KPhoneAppUid = { 0x100058B3 };
 const TUid KAknDiallerViewUid = {0x10282D81};
 const TUid KDiallerVievCommand = {0x1};
 {
 }
 EXPORT_C CAknAppUiBase::~CAknAppUiBase()
 {
-AknItemActionMenuRegister::RemoveConstructingMenuBarOwner( this );
 if (iAppUiBaseExtension)
 {
 MTouchFeedback::DestroyInstance();
 iAppUiBaseExtension->iFeedbackAdaptation = NULL;
 RemoveFromStack( iAppUiBaseExtension->iDiallerLauncher );
 orientationFlags = value;
 }
 delete defaultOrientationCr;
 defaultOrientationCr = NULL;
 }
 iAknFlags.Assign(EOrientationSpecified, orientationFlags&EAppOrientationSpecifiedFlag);
 iAknFlags.Assign(EOrientationLandscape, orientationFlags&EAppOrientationLandscapeFlag);
 iAknFlags.Assign(EOrientationAutomatic, orientationFlags&EAppOrientationAutomaticFlag);
 iAknFlags.Assign(EMSKEnabled, aAppUiFlags&EAknEnableMSKflag);
 iAknFlags.Assign( ESingleClickCompatible,
 if ( aAppUiFlags & EAknTouchCompatibleFlag )
 {
 iAknFlags.Set( ETouchCompatible );
 }
-else if ( aAppUiFlags & EAknSingleClickCompatibleFlag )
-{
-// If application is single click compatible then it needs to
-// be also touch compatible, so set that flag also if application
-// has forgotten.
-iAknFlags.Set( ETouchCompatible );
-}
 else
 {
-// Set the touch compatible flag for all applications that
-// reside on the ROM, since all platform applications should
-// be touch compatible.
 RProcess process;
 TFileName fileName = process.FileName();
-_LIT( KRomDrive, "z:" );
+_LIT(KRomDrive,"z:");
 if ( fileName.FindF( KRomDrive ) == 0 )
 {
 iAknFlags.Set( ETouchCompatible );
 }
 }
-AknItemActionMenuRegister::SetConstructingMenuBarOwnerL( this );
 #ifdef AVKON_RDEBUG_INFO
 RDebug::Print(_L("Entering CEikAppUi::BaseConstructL()"));
 #endif
 if( (aAppUiFlags & EAknDisableHighlightAnimationFlag) != 0 )
 {
 AknsUtils::SetAvkonHighlightAnimationEnabledL( EFalse );
 }
-if (( aAppUiFlags & EAknDisableAnimationBackground ) != 0)
-{
-AknsUtils::SetAnimationBackgroundDisabledL( ETrue );
-}
 #ifdef RD_SCALABLE_UI_V2
 if ( CAknTouchPane* tp = TouchPane() )
 {
 tp->SetObserver( this );
 // Solving the application name asing AppArc.lib
 RApaLsSession apparcSession;
 User::LeaveIfError( apparcSession.Connect() );
 CleanupClosePushL( apparcSession );
 TApaAppInfo appInfo;
+TInt err = apparcSession.GetAppInfo( appInfo, this->Application()->AppDllUid() );
 // +2 for colon and line end
-HBufC* captionBuffer = HBufC::NewLC(KApaMaxAppCaption + KAknBidiExtraSpacePerLine + 2);
+HBufC* captionBuffer =
+HBufC::NewLC( KApaMaxAppCaption + KAknBidiExtraSpacePerLine + 2 );
+//        CleanupStack::PushL( captionBuffer );
 TPtr caption = captionBuffer->Des();
-CEikApplication *application = this->Application();
+if ( err == KErrNone )
-if (NULL != application)
+{
-{
+caption = appInfo.iCaption;
-if (KErrNone == apparcSession.GetAppInfo(appInfo, application->AppDllUid()))
+}
-{
-caption = appInfo.iCaption;
-}
-}
 // Lets remove trailing spaces
 caption.TrimRight();
 // Insert the application name into the beginning of the error string
 if ( caption.Length() != 0 )
 iAvkonEnv->CloseAllIntermediateStates();
 }
 EXPORT_C void CAknAppUi::PrepareToExit()
 {
-//
-// Hide application toolbar extension view (by toolbar extension)
-//
-if ( CurrentFixedToolbar() )
-{
-CAknToolbarExtension* toolbarExt = CurrentFixedToolbar()->ToolbarExtension();
-if ( toolbarExt && toolbarExt->IsShown() )
-{
-toolbarExt->SetShown( EFalse );
-}
-}
 if( IsForeground() && Document() )
 {
 //only if focused, otherwise next app HandleForeground may never come.
 iAvkonEnv->TransitionEvent(AknTransEffect::EApplicationExit, Application()->AppDllUid());
 }
 return;
 }
 // This method call practically adds a shift modifier to hash key + joystick events.
 // This is because of marking in lists and editors when edit there is no edit key in device.
-if (SimulateHashKeyMarkingEventL(aEvent))
+if (SimulateHashKeyMarkingEvent(aEvent))
 {
 return;
 }
 // ---- To turn on key code conversion by default -----
 // This method watches for hash key presses, and adds a shift modifier to all arrow key
 // and ok key events, if hash key is simultaneously down. This is done because of making the
 // edit key optional in the device. Therefore, hash key with joystick (or single hash press,
 // see eiklbx.cpp) can be used for marking in lists and editors.
-TBool CAknAppUi::SimulateHashKeyMarkingEventL(const TWsEvent& aEvent)
+TBool CAknAppUi::SimulateHashKeyMarkingEvent(const TWsEvent& aEvent)
 {
 TInt eventType = aEvent.Type();
 if (iExtension &&
 iExtension->iFlags[CAknAppUiExtension::EHashKeyMarking] &&

branch	RCL_3
changeset 19	aecbbf00d063
parent 18	fcdfafb36fe7
child 20	d48ab3b357f1