uifw/AvKon/src/AknLayoutConfig.cpp
branchRCL_3
changeset 18 0aa5fbdfbc30
parent 0 2f259fa3e83a
child 55 aecbbf00d063
equal deleted inserted replaced
16:71dd06cfe933 18:0aa5fbdfbc30
   339 
   339 
   340 void CAknLayoutConfig::GetScreenMapFromAknPrivL(CResourceFile* aResFile,
   340 void CAknLayoutConfig::GetScreenMapFromAknPrivL(CResourceFile* aResFile,
   341 												RArray<SAknScreenModeInfo>& aScreenInfoArray, 
   341 												RArray<SAknScreenModeInfo>& aScreenInfoArray, 
   342 											    RArray<SHardwareStateInfo>& aHardwareStateArray)
   342 											    RArray<SHardwareStateInfo>& aHardwareStateArray)
   343 	{
   343 	{
       
   344     ::CleanupClosePushL(aScreenInfoArray);
       
   345     ::CleanupClosePushL(aHardwareStateArray);
   344 	// get state screen map
   346 	// get state screen map
   345 #if defined(__WINS__)
   347 #if defined(__WINS__)
   346     TInt screenMapResource = R_AKNPRIV_HARDWARE_STATE_SCREEN_MAP_EMUL;
   348     TInt screenMapResource = R_AKNPRIV_HARDWARE_STATE_SCREEN_MAP_EMUL;
   347 #else
   349 #else
   348     TInt screenMapResource = R_AKNPRIV_HARDWARE_STATE_SCREEN_MAP;
   350     TInt screenMapResource = R_AKNPRIV_HARDWARE_STATE_SCREEN_MAP;
   385 			
   387 			
   386 		aHardwareStateArray.AppendL(hwInfo);
   388 		aHardwareStateArray.AppendL(hwInfo);
   387 		}
   389 		}
   388 
   390 
   389 	CleanupStack::PopAndDestroy(); // reader's HBufC
   391 	CleanupStack::PopAndDestroy(); // reader's HBufC
       
   392 	CleanupStack::Pop(&aHardwareStateArray);
       
   393 	CleanupStack::Pop(&aScreenInfoArray);
   390 	}
   394 	}
   391 	
   395 	
   392 void CAknLayoutConfig::GetKeyMapFromAknPrivL(CResourceFile* aResFile,
   396 void CAknLayoutConfig::GetKeyMapFromAknPrivL(CResourceFile* aResFile,
   393 											 RArray<SHardwareStateInfo>& aHardwareStateArray)
   397 											 RArray<SHardwareStateInfo>& aHardwareStateArray)
   394 	{
   398 	{
       
   399     ::CleanupClosePushL(aHardwareStateArray);
   395 	// get the state key map
   400 	// get the state key map
   396 #if defined(__WINS__)
   401 #if defined(__WINS__)
   397     TInt hwMapResource = R_AKNPRIV_HARDWARE_STATE_KEY_MAP_EMUL;
   402     TInt hwMapResource = R_AKNPRIV_HARDWARE_STATE_KEY_MAP_EMUL;
   398 #else
   403 #else
   399     TInt hwMapResource = R_AKNPRIV_HARDWARE_STATE_KEY_MAP;
   404     TInt hwMapResource = R_AKNPRIV_HARDWARE_STATE_KEY_MAP;
   414 				hwInfo.iKeyCode = key;
   419 				hwInfo.iKeyCode = key;
   415 			}
   420 			}
   416         }
   421         }
   417 
   422 
   418     CleanupStack::PopAndDestroy(); // reader's HBufC
   423     CleanupStack::PopAndDestroy(); // reader's HBufC
       
   424     CleanupStack::Pop(&aHardwareStateArray);
   419 	}
   425 	}
   420 
   426 
   421 TAknPrivSoftkeyLocation CAknLayoutConfig::GetLandscapeSoftkeyLocationFromAknPrivL(CResourceFile* aResFile)
   427 TAknPrivSoftkeyLocation CAknLayoutConfig::GetLandscapeSoftkeyLocationFromAknPrivL(CResourceFile* aResFile)
   422 	{
   428 	{
   423 #if defined(__WINS__)
   429 #if defined(__WINS__)
   442 
   448 
   443 void CAknLayoutConfig::GetScreenModesFromWservL(SAknLayoutConfig& aConfig,
   449 void CAknLayoutConfig::GetScreenModesFromWservL(SAknLayoutConfig& aConfig,
   444 												RArray<SAknScreenModeInfo>& aScreenInfoArray, 
   450 												RArray<SAknScreenModeInfo>& aScreenInfoArray, 
   445 												TAknPrivSoftkeyLocation aLandscapeSoftkeyLocation)
   451 												TAknPrivSoftkeyLocation aLandscapeSoftkeyLocation)
   446 	{
   452 	{
       
   453 	::CleanupClosePushL(aScreenInfoArray);
   447 	CEikonEnv* eikonEnv = CEikonEnv::Static();
   454 	CEikonEnv* eikonEnv = CEikonEnv::Static();
   448 	CWsScreenDevice* dev = eikonEnv->ScreenDevice();
   455 	CWsScreenDevice* dev = eikonEnv->ScreenDevice();
   449 
   456 
   450 	TInt numScreenModes = dev->NumScreenModes();
   457 	TInt numScreenModes = dev->NumScreenModes();
   451 	aConfig.iNumScreenModes = numScreenModes;
   458 	aConfig.iNumScreenModes = numScreenModes;
   473 			screenMode.iSoftkeyLocation = EAknPrivSoftkeyLocationBottom;
   480 			screenMode.iSoftkeyLocation = EAknPrivSoftkeyLocationBottom;
   474 			}
   481 			}
   475     	screenMode.iDisplayMode = dev->GetScreenModeDisplayMode(ii);
   482     	screenMode.iDisplayMode = dev->GetScreenModeDisplayMode(ii);
   476 		aScreenInfoArray.AppendL(screenMode);
   483 		aScreenInfoArray.AppendL(screenMode);
   477 		}
   484 		}
       
   485 	CleanupStack::Pop(&aScreenInfoArray);
   478 	}
   486 	}
   479 
   487 
   480 //
   488 //
   481 // CAknLayoutConfigWsiniParser
   489 // CAknLayoutConfigWsiniParser
   482 //
   490 //