# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1286970615 -10800 # Node ID a5e7a4f63858961057641b36e95bf551aaf297ca # Parent 85902f042028f281e6d7a272bbcc83dab04e6704 Revision: 201039 Kit: 201041 diff -r 85902f042028 -r a5e7a4f63858 applicationinterworkingfw/ServiceHandler/group/ServiceHandler.mmp --- a/applicationinterworkingfw/ServiceHandler/group/ServiceHandler.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/applicationinterworkingfw/ServiceHandler/group/ServiceHandler.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -71,7 +71,6 @@ LIBRARY efsrv.lib LIBRARY estor.lib LIBRARY eikcore.lib -LIBRARY aknnotify.lib START WINS END diff -r 85902f042028 -r a5e7a4f63858 applicationinterworkingfw/ServiceHandler/src/AiwServiceHandlerImpl.cpp --- a/applicationinterworkingfw/ServiceHandler/src/AiwServiceHandlerImpl.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/applicationinterworkingfw/ServiceHandler/src/AiwServiceHandlerImpl.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -31,7 +31,6 @@ #include "AiwEcomMonitor.h" #include "AiwTlsData.h" #include "data_caging_path_literals.hrh" -#include "../../../uifw/inc/akntrace.h" // CONSTANTS // Max number of empty menu resource slots. @@ -67,14 +66,10 @@ CAiwServiceHandlerImpl* CAiwServiceHandlerImpl::NewL() { - _AKNTRACE_FUNC_ENTER; - CAiwServiceHandlerImpl* handler = new (ELeave) CAiwServiceHandlerImpl(); CleanupStack::PushL( handler ); handler->ConstructL(); CleanupStack::Pop(); // handler - - _AKNTRACE_FUNC_EXIT; return handler; } @@ -124,8 +119,6 @@ CAiwServiceHandlerImpl::~CAiwServiceHandlerImpl() { - _AKNTRACE_FUNC_ENTER; - if (iResourceOffset && iCoeEnv) { iCoeEnv->DeleteResourceFile(iResourceOffset); @@ -140,18 +133,12 @@ data->RemoveMenuLaunchObserver( this ); CAiwTlsData::Close(); } - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::Reset() { - _AKNTRACE_FUNC_ENTER; - - RProcess pro; - AknTracePrint(_L("process name:%S"),&(pro.FileName())); - iInterestList.ResetAndDestroy(); iMenuBindings.ResetAndDestroy(); iBaseBindings.ResetAndDestroy(); @@ -165,8 +152,6 @@ iInParams = NULL; delete iOutParams; iOutParams = NULL; - - _AKNTRACE_FUNC_EXIT; } @@ -174,8 +159,6 @@ void CAiwServiceHandlerImpl::ListProvidersForCriteriaL(RArray& aResult, CAiwCriteriaItem& aItem) { - _AKNTRACE_FUNC_ENTER; - TInt i; for (i = 0; i < iProviders.Count(); i++) @@ -185,16 +168,12 @@ User::LeaveIfError(aResult.Append(iProviders[i]->ImplementationUid().iUid)); } } - - _AKNTRACE_FUNC_EXIT; } TInt CAiwServiceHandlerImpl::NbrOfProviders(const CAiwCriteriaItem* aCriteria) { - _AKNTRACE_FUNC_ENTER; - if(!aCriteria) { return 0; @@ -224,7 +203,6 @@ } } - _AKNTRACE_FUNC_EXIT; return 0; } @@ -232,8 +210,6 @@ void CAiwServiceHandlerImpl::AttachL(TInt aInterestResourceId) { - _AKNTRACE_FUNC_ENTER; - _AKNTRACE("aInterestResourceId:%x",aInterestResourceId); // CCoeEnv/CEikonEnv needs to be accessible. if(!iCoeEnv) { @@ -258,16 +234,12 @@ CleanupStack::Pop(); // filtered CleanupStack::Pop(); // interest - - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::AttachL(const RCriteriaArray& aInterest) { - _AKNTRACE_FUNC_ENTER; - RCriteriaArray interest, filtered; CleanupStack::PushL( TCleanupItem( InterestCleanup, &interest ) ); @@ -285,12 +257,6 @@ item->SetDefaultProvider( (aInterest[i]->DefaultProvider()).iUid ); item->SetMaxProviders( aInterest[i]->MaxProviders() ); - _AKNTRACE("aInterest[i]->Id():%x",aInterest[i]->Id()); - _AKNTRACE("aInterest[i]->ServiceCmd():%x",aInterest[i]->ServiceCmd()); - _AKNTRACE("aInterest[i]->ServiceClass():%x",aInterest[i]->ServiceClass()); - _AKNTRACE("(aInterest[i]->DefaultProvider()).iUid:%x",(aInterest[i]->DefaultProvider()).iUid); - _AKNTRACE("aInterest[i]->MaxProviders():%x",aInterest[i]->MaxProviders()); - User::LeaveIfError(interest.Append(item)); CleanupStack::Pop(item); } @@ -303,18 +269,12 @@ CleanupStack::Pop(); // filtered CleanupStack::Pop(); // interest - - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::DoAttachL(const RCriteriaArray& aInterest) { - _AKNTRACE_FUNC_ENTER; - - RProcess pro; - AknTracePrint(_L("process name:%S"),&(pro.FileName())); CAiwBinding* bind; for (TInt i = 0; i < aInterest.Count(); i++) { @@ -345,15 +305,11 @@ CleanupStack::PopAndDestroy(); // bind } } - - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::GetInterest(RCriteriaArray& aInterest) { - _AKNTRACE_FUNC_ENTER; - for (TInt i = 0; i < iInterestList.Count(); i++) { if (aInterest.Append(iInterestList[i]) != KErrNone) @@ -361,16 +317,12 @@ return; } } - - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::DetachL(const RCriteriaArray& aInterest) { - _AKNTRACE_FUNC_ENTER; - // First, remove relevant criteria items from relevat base bindings. for (TInt i = 0; i < aInterest.Count(); i++) { @@ -399,18 +351,13 @@ RemoveObsoleteCriteriaItems(); // Finally check if there were left obselete providers and remove them. - RemoveObsoleteProviders(); - - _AKNTRACE_FUNC_EXIT; + RemoveObsoleteProviders(); } void CAiwServiceHandlerImpl::DetachL(TInt aInterestResourceId) { - _AKNTRACE_FUNC_ENTER; - _AKNTRACE("aInterestResourceId:%x",aInterestResourceId); - // CCoeEnv/CEikonEnv needs to be accessible. if(!iCoeEnv) { @@ -430,14 +377,11 @@ interest.ResetAndDestroy(); CleanupStack::Pop(); // interest - - _AKNTRACE_FUNC_EXIT; } const CAiwCriteriaItem* CAiwServiceHandlerImpl::GetCriteria(TInt aId) { - _AKNTRACE_FUNC_ENTER; for (TInt i = 0; i < iInterestList.Count(); i++) { if (iInterestList[i]->Id() == aId) @@ -445,15 +389,12 @@ return iInterestList[i]; } } - - _AKNTRACE_FUNC_EXIT; + return NULL; } TInt CAiwServiceHandlerImpl::NumAlreadyInitializedPaneIdsL() const { - _AKNTRACE_FUNC_ENTER; - TInt ret = 0; TInt paneIds[KMaxPaneIds] = {0}; TBool found = EFalse; @@ -485,8 +426,6 @@ ret++; } } - - _AKNTRACE_FUNC_EXIT; return ret; } @@ -496,12 +435,8 @@ TInt aBaseMenuCmdId, const CAiwGenericParamList& aInParamList) { - _AKNTRACE_FUNC_ENTER; - InitializeMenuPaneL(aMenuPane, aMenuResourceId, aBaseMenuCmdId, aInParamList, EFalse, EFalse); - - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::InitializeMenuPaneL( @@ -511,11 +446,7 @@ const CAiwGenericParamList& aInParamList, TBool aUseSubmenuTextsIfAvailable) { - _AKNTRACE_FUNC_ENTER; - InitializeMenuPaneL(aMenuPane, aMenuResourceId, aBaseMenuCmdId, aInParamList, aUseSubmenuTextsIfAvailable, EFalse); - - _AKNTRACE_FUNC_EXIT; } @@ -527,20 +458,6 @@ TBool aUseSubmenuTextsIfAvailable, TBool aSetAsItemSpecific) { - _AKNTRACE_FUNC_ENTER; - _AKNTRACE("aMenuPane:%x",&aMenuPane); - _AKNTRACE("aMenuResourceId:%x",aMenuResourceId); - _AKNTRACE("aBaseMenuCmdId:%x",aBaseMenuCmdId); - _AKNTRACE("aUseSubmenuTextsIfAvailable:%x",aUseSubmenuTextsIfAvailable); - _AKNTRACE("aSetAsItemSpecific:%x",aSetAsItemSpecific); - - TInt count = aInParamList.Count(); - for(TInt i=0;iMenuPane())) && @@ -694,8 +606,6 @@ } } - _AKNTRACE_FUNC_EXIT; - return 0; } @@ -708,27 +618,6 @@ TUint aCmdOptions, MAiwNotifyCallback* aCallback) { - _AKNTRACE_FUNC_ENTER; - _AKNTRACE("aMenuCmdId:%x",aMenuCmdId); - - RProcess pro; - AknTracePrint(_L("process name:%S"),&(pro.FileName())); - - TInt count = aInParamList.Count(); - for (TInt i = 0; i < count; i++) - { - _AKNTRACE("i:%d, InParamList[i].SemanticId():%x",i,aInParamList[i].SemanticId()); - AknTracePrint(_L("i:%d, InParamList[i].Value():%S"),i,&(aInParamList[i].Value().AsDes())); - - } - - count = iProviders.Count(); - for (TInt i = 0; i < count; i++) - { - AknTracePrint(_L("i:%d, iProviders[i]->ImplementationUid():%x"),i,iProviders[i]->ImplementationUid().iUid); - AknTracePrint(_L("i:%d, iProviders[i]:%x"),i,iProviders[i]); - } - // CCoeEnv/CEikonEnv needs to be accessible. if(!iCoeEnv) { @@ -764,17 +653,12 @@ } } } - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::AttachMenuL(TInt aMenuResourceId, TInt aInterestResourceId) { - _AKNTRACE_FUNC_ENTER; - _AKNTRACE("aMenuResourceId:%x",aMenuResourceId); - _AKNTRACE("aInterestResourceId:%x",aInterestResourceId); - // CCoeEnv/CEikonEnv needs to be accessible. if(!iCoeEnv) { @@ -797,17 +681,12 @@ CleanupStack::PopAndDestroy(); // reader CleanupStack::Pop(); // filtered CleanupStack::Pop(); // interest - - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::AttachMenuL(TInt aMenuResourceId, TResourceReader& aReader) { - _AKNTRACE_FUNC_ENTER; - _AKNTRACE("aMenuResourceId:%x",aMenuResourceId); - // CCoeEnv/CEikonEnv needs to be accessible. if(!iCoeEnv) { @@ -828,16 +707,11 @@ CleanupStack::PopAndDestroy(); // reader CleanupStack::Pop(); // filtered CleanupStack::Pop(); // interest - - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::AttachMenuL(TInt aMenuResourceId, const RCriteriaArray& aInterest) { - _AKNTRACE_FUNC_ENTER; - _AKNTRACE("aMenuResourceId:%x",aMenuResourceId); - // CCoeEnv/CEikonEnv needs to be accessible. if(!iCoeEnv) { @@ -862,12 +736,6 @@ item->SetDefaultProvider( (aInterest[i]->DefaultProvider()).iUid ); item->SetMaxProviders( aInterest[i]->MaxProviders() ); - _AKNTRACE("aInterest[i]->Id():%x",aInterest[i]->Id()); - _AKNTRACE("aInterest[i]->ServiceCmd():%x",aInterest[i]->ServiceCmd()); - _AKNTRACE("aInterest[i]->ServiceClass():%x",aInterest[i]->ServiceClass()); - _AKNTRACE("(aInterest[i]->DefaultProvider()).iUid:%x",(aInterest[i]->DefaultProvider()).iUid); - _AKNTRACE("aInterest[i]->MaxProviders():%x",aInterest[i]->MaxProviders()); - User::LeaveIfError(interest.Append(item)); CleanupStack::Pop(item); } @@ -880,19 +748,12 @@ CleanupStack::PopAndDestroy(); // reader CleanupStack::Pop(); // filtered CleanupStack::Pop(); // interest - - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::DoAttachMenuL(TResourceReader& aReader, TInt aMenuId, RCriteriaArray& aInterest) { - _AKNTRACE_FUNC_ENTER; - - RProcess pro; - AknTracePrint(_L("process name:%S"),&(pro.FileName())); - TInt menuCmd; TInt count = aReader.ReadInt16(); TBool bound; @@ -972,8 +833,6 @@ } SkipMenuFields(aReader); // Jump to next menu item } - - _AKNTRACE_FUNC_EXIT; } @@ -990,10 +849,6 @@ void CAiwServiceHandlerImpl::DetachMenu(TInt aMenuResourceId, TInt aInterestResourceId) { - _AKNTRACE_FUNC_ENTER; - _AKNTRACE("aMenuResourceId:%x",aMenuResourceId); - _AKNTRACE("aInterestResourceId:%x",aInterestResourceId); - // If interest resource id is null, then detach all items in the given menu. if (!aInterestResourceId) { @@ -1019,16 +874,11 @@ interest.ResetAndDestroy(); } - - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::DoDetachMenu(TInt aMenuResourceId) { - _AKNTRACE_FUNC_ENTER; - _AKNTRACE("aMenuResourceId:%x",aMenuResourceId); - // First, delete the relevant menu bindings. for (TInt i = 0; i < iMenuBindings.Count(); i++) { @@ -1045,16 +895,11 @@ // Finally check if there were left obselete providers and remove them. RemoveObsoleteProviders(); - - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::DoDetachMenu(TInt aMenuResourceId, RCriteriaArray& aInterest) { - _AKNTRACE_FUNC_ENTER; - _AKNTRACE("aMenuResourceId:%x",aMenuResourceId); - // First, remove relevant criteria items from relevant menu bindings. for (TInt i = 0; i < iMenuBindings.Count(); i++) { @@ -1086,16 +931,12 @@ RemoveObsoleteCriteriaItems(); // Finally check if there were left obselete providers and remove them. - RemoveObsoleteProviders(); - - _AKNTRACE_FUNC_EXIT; + RemoveObsoleteProviders(); } void CAiwServiceHandlerImpl::RemoveObsoleteCriteriaItems() { - _AKNTRACE_FUNC_ENTER; - for (TInt i = 0; i < iInterestList.Count(); i++) { CAiwCriteriaItem* criteria = iInterestList[i]; @@ -1132,15 +973,11 @@ i--; } } - - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::RemoveObsoleteProviders() { - _AKNTRACE_FUNC_ENTER; - for (TInt i = 0; i < iProviders.Count(); i++) { CAiwServiceIfBase* provider = iProviders[i]; @@ -1177,33 +1014,24 @@ i--; } } - _AKNTRACE_FUNC_EXIT; } TBool CAiwServiceHandlerImpl::IsSubMenuEmpty(TInt aSubMenuId) { - _AKNTRACE_FUNC_ENTER; - _AKNTRACE("aSubMenuId:%d",aSubMenuId); - for (TInt i = 0; i < iMenuBindings.Count(); i++) { if (iMenuBindings[i]->MenuId() == aSubMenuId) { if (iMenuBindings[i]->NumberOfProviders() > 0) { - _AKNTRACE("return false"); - _AKNTRACE_FUNC_EXIT; return EFalse; } - _AKNTRACE("return true"); - _AKNTRACE_FUNC_EXIT; return ETrue; } } - - _AKNTRACE_FUNC_EXIT; + return EFalse; } @@ -1213,21 +1041,16 @@ CAiwMenuBinding* CAiwServiceHandlerImpl::AlreadyBound(TInt aMenuId, TInt aMenuCmd, TInt aMenuItemIndex) const { - _AKNTRACE_FUNC_ENTER; - for (TInt i = 0; i < iMenuBindings.Count(); i++) { if ((iMenuBindings[i]->MenuId() == aMenuId) && (iMenuBindings[i]->MenuCmd() == aMenuCmd) && (iMenuBindings[i]->MenuItemIndex() == aMenuItemIndex)) { - _AKNTRACE("iMenuBindings[i]:%x",iMenuBindings[i]); - _AKNTRACE_FUNC_EXIT; return iMenuBindings[i]; } } - _AKNTRACE_FUNC_EXIT; return NULL; } @@ -1239,21 +1062,6 @@ TUint aCmdOptions, MAiwNotifyCallback* aCallback) { - _AKNTRACE_FUNC_ENTER; - _AKNTRACE("aCmdId:%x",aCmdId); - _AKNTRACE("aCmdOptions:%x",aCmdOptions); - - RProcess pro; - AknTracePrint(_L("process name:%S"),&(pro.FileName())); - - TInt count = aInParamList.Count(); - for (TInt i = 0; i < count; i++) - { - _AKNTRACE("i:%d, InParamList[i].SemanticId():%x",i,aInParamList[i].SemanticId()); - AknTracePrint(_L("i:%d, InParamList[i].Value():%S"),i,&(aInParamList[i].Value().AsDes())); - - } - for (TInt i = 0; i < iBaseBindings.Count(); i++) { if(iBaseBindings[i]->HasServiceCmd(aCmdId)) @@ -1269,8 +1077,6 @@ } } } - - _AKNTRACE_FUNC_EXIT; } @@ -1278,8 +1084,6 @@ void CAiwServiceHandlerImpl::ReadInterestListL(TResourceReader& aReader, RPointerArray& aResult) { - _AKNTRACE_FUNC_ENTER; - const TInt count = aReader.ReadInt16(); for (TInt ii = 0; ii < count; ++ii) { @@ -1288,15 +1092,11 @@ User::LeaveIfError(aResult.Append(item)); CleanupStack::Pop(); // item } - - _AKNTRACE_FUNC_EXIT; } TInt CAiwServiceHandlerImpl::ResolveProvidersL(CAiwBinding* aBinding, CAiwCriteriaItem* aItem) { - _AKNTRACE_FUNC_ENTER; - RImplInfoPtrArray infoArray; TInt result = 0; @@ -1357,8 +1157,6 @@ CleanupStack::PopAndDestroy(); // infoArray - _AKNTRACE_FUNC_EXIT; - return result; } @@ -1366,8 +1164,6 @@ void CAiwServiceHandlerImpl::FilterInfoArray(RImplInfoPtrArray& aArray, CAiwCriteriaItem* aItem) { - _AKNTRACE_FUNC_ENTER; - if (aItem->MaxProviders() <= 0) { aArray.ResetAndDestroy(); @@ -1389,8 +1185,6 @@ } } } - - _AKNTRACE_FUNC_EXIT; } @@ -1427,7 +1221,6 @@ TBool CAiwServiceHandlerImpl::IsInLastInitialized(CAiwMenuPane* aiwPane) const { - _AKNTRACE_FUNC_ENTER; if (aiwPane) { if (iSubmenu == aiwPane) @@ -1444,7 +1237,6 @@ } } - _AKNTRACE_FUNC_EXIT; return EFalse; } @@ -1477,8 +1269,6 @@ CAiwMenuPane* CAiwServiceHandlerImpl::CreateEmptyAiwMenuPaneL(TInt aBaseMenuCmdId, TInt aResourceId) { - _AKNTRACE_FUNC_ENTER; - CAiwMenuPane* result = NULL; TResourceReader reader; @@ -1511,16 +1301,12 @@ result->SetResourceSlotId( id ); - _AKNTRACE_FUNC_EXIT; - return result; } void CAiwServiceHandlerImpl::DeleteAiwMenuPane(CAiwMenuPane* aAiwPane) { - _AKNTRACE_FUNC_ENTER; - delete aAiwPane->iMenuPane; aAiwPane->iMenuPane = NULL; @@ -1553,8 +1339,6 @@ delete aAiwPane; aAiwPane = NULL; - - _AKNTRACE_FUNC_EXIT; } const TInt resourceSlotIds[KMaxMenuResources] = @@ -1580,14 +1364,11 @@ TInt CAiwServiceHandlerImpl::ResourceIdForNextFreeSlot() { - _AKNTRACE_FUNC_ENTER; - if (iNextFreeSlot < KMaxMenuResources) { return resourceSlotIds[iNextFreeSlot++]; } - _AKNTRACE_FUNC_EXIT; return -1; } @@ -1604,60 +1385,42 @@ void Cleanup( TAny* aAny ) { - _AKNTRACE_FUNC_ENTER; - RImplInfoPtrArray* implArray = reinterpret_cast< RImplInfoPtrArray*> ( aAny ); implArray->ResetAndDestroy(); implArray->Close(); - - _AKNTRACE_FUNC_EXIT; } void InterestCleanup( TAny* aAny ) { - _AKNTRACE_FUNC_ENTER; - RPointerArray* interestArray = reinterpret_cast*> ( aAny ); - interestArray->ResetAndDestroy(); - - _AKNTRACE_FUNC_EXIT; + interestArray->ResetAndDestroy(); } void FilteredCleanup( TAny* aAny ) { - _AKNTRACE_FUNC_ENTER; - RPointerArray* filteredArray = reinterpret_cast*> ( aAny ); - filteredArray->Reset(); - - _AKNTRACE_FUNC_EXIT; + filteredArray->Reset(); } void IntArrayCleanup(TAny* aAny) { - _AKNTRACE_FUNC_ENTER; - RArray* intArray = reinterpret_cast*> ( aAny ); intArray->Close(); - - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::CopyMenuItemsL(CAiwMenuPane* aSource, CEikMenuPane& aDest, TInt aStartIndex, TBool aIsSubmenu, TBool aSetAsItemSpecific) { - _AKNTRACE_FUNC_ENTER; - TInt cmdId; TInt inPos = aStartIndex; @@ -1688,16 +1451,12 @@ aDest.InsertMenuItemL(itemData, inPos++); } } - - _AKNTRACE_FUNC_EXIT; } TInt CAiwServiceHandlerImpl::SlotItemCmd(CEikMenuPane& aPane) { - _AKNTRACE_FUNC_ENTER; - TInt index; for (TInt i = 0; i < KMaxMenuResources; i++) @@ -1708,7 +1467,6 @@ } } - _AKNTRACE_FUNC_EXIT; return -1; } @@ -1716,8 +1474,6 @@ CAiwMenuPane* CAiwServiceHandlerImpl::MenuPaneForSlotCmd(TInt aCmdId) { - _AKNTRACE_FUNC_ENTER; - TInt index = aCmdId - EAiwMenuSlotBase; if (index < KMaxMenuResources) @@ -1732,8 +1488,6 @@ } } - _AKNTRACE_FUNC_EXIT; - return NULL; } @@ -1742,11 +1496,8 @@ CAiwServiceHandlerImpl::TAiwPlaceholderType CAiwServiceHandlerImpl::PlaceholderType( CEikMenuPane& aPane, TInt aCmd, TBool& aTitleLocked) { - _AKNTRACE_FUNC_ENTER; - CEikMenuPaneItem::SData& itemData = aPane.ItemData(aCmd); - _AKNTRACE("itemData.iCascadeId:%x",itemData.iCascadeId); - + aTitleLocked = EFalse; if ((itemData.iCascadeId & AIW_CASCADE_ID) == AIW_CASCADE_ID) @@ -1766,7 +1517,6 @@ return EAiwPlaceholderIntelligentCascade; } - _AKNTRACE_FUNC_EXIT; return EAiwPlaceholderNormal; } @@ -1774,8 +1524,6 @@ void CAiwServiceHandlerImpl::ConvertPlaceholderL(CEikMenuPane& aPane, TInt aCmd, CAiwMenuPane& aAiwPane, const TDesC& aTitle, TBool aSetAsItemSpecific) { - _AKNTRACE_FUNC_ENTER; - CEikMenuPaneItem::SData itemData = aPane.ItemData(aCmd); TInt index; @@ -1803,16 +1551,12 @@ // Insert cascade item. aPane.InsertMenuItemL(itemData, index); - - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::UnCascadeL(CEikMenuPane& aPane, TInt aCmd, CAiwMenuPane& aAiwPane, TBool aSetAsItemSpecific) { - _AKNTRACE_FUNC_ENTER; - CEikMenuPaneItem::SData itemData = aAiwPane.MenuPane().ItemData(aAiwPane.FindCmdId(0)); TInt index; @@ -1832,16 +1576,12 @@ // Insert cascade item. aPane.InsertMenuItemL(itemData, index); - - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::SkipMenuFields(TResourceReader& aReader) { - _AKNTRACE_FUNC_ENTER; - aReader.ReadInt32(); // Skip cascade id aReader.ReadInt32(); // Skip flags aReader.ReadTPtrC(); // Skip text @@ -1850,15 +1590,11 @@ aReader.ReadInt16(); // Skip bmpid. aReader.ReadInt16(); // Skip bmpmask. aReader.ReadInt32(); // Skip extension. - - _AKNTRACE_FUNC_EXIT; } TBool CAiwServiceHandlerImpl::IsAiwMenu(TInt aMenuResourceId) { - _AKNTRACE_FUNC_ENTER; - TInt i; // First check if this is aiw submenu id @@ -1879,8 +1615,6 @@ } } - _AKNTRACE_FUNC_EXIT; - return EFalse; } @@ -1888,7 +1622,6 @@ TBool CAiwServiceHandlerImpl::HandleSubmenuL(CEikMenuPane& aPane) { - _AKNTRACE_FUNC_ENTER; TInt slotcmd = SlotItemCmd(aPane); if (slotcmd >= 0) { @@ -1904,7 +1637,6 @@ } } - _AKNTRACE_FUNC_EXIT; return EFalse; } @@ -1912,8 +1644,6 @@ TBool CAiwServiceHandlerImpl::GetSubmenuTitle(CEikMenuPane& aPane, TDes& aResult) { - _AKNTRACE_FUNC_ENTER; - TInt index; aResult.Zero(); @@ -1927,8 +1657,7 @@ aPane.DeleteMenuItem(AIW_SUBMENU_TITLE); return ETrue; } - - _AKNTRACE_FUNC_EXIT; + return EFalse; } @@ -1958,8 +1687,6 @@ void CAiwServiceHandlerImpl::FilterInterestListL(RPointerArray& aOriginal, RPointerArray& aFiltered) { - _AKNTRACE_FUNC_ENTER; - CAiwCriteriaItem* item; while (aOriginal.Count() > 0) @@ -1970,16 +1697,12 @@ User::LeaveIfError(aFiltered.Append(item)); } aOriginal.Reset(); - - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::RemoveProvider(TInt aImplUid) { - _AKNTRACE_FUNC_ENTER; - TInt i; // First go through bindings and remove all the @@ -2004,16 +1727,11 @@ i--; } } - - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::AddProviderL(TUid aImplUid, CAiwCriteriaItem* aItem) { - _AKNTRACE_FUNC_ENTER; - _AKNTRACE("aImplUid:%x",aImplUid.iUid); - TInt i; CAiwServiceIfBase* iface = iEcomMonitor->CreateImplementationL(aImplUid); @@ -2042,22 +1760,14 @@ } } } - - _AKNTRACE_FUNC_EXIT; } TInt CAiwServiceHandlerImpl::SynchronizeCallBack(TAny* aImpl) { - _AKNTRACE_FUNC_ENTER; - _AKNTRACE("aImpl:%x",aImpl); - CAiwServiceHandlerImpl* impl = reinterpret_cast(aImpl); TRAPD(err, impl->SynchronizeDbL()); - - _AKNTRACE_FUNC_EXIT; - return err; } @@ -2065,8 +1775,6 @@ void CAiwServiceHandlerImpl::SynchronizeDbL() { - _AKNTRACE_FUNC_ENTER; - TInt i; RArray providers; RImplInfoPtrArray infoArray; @@ -2090,16 +1798,12 @@ } CleanupStack::PopAndDestroy(2); // providers, infoArray - - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::HandleRemovedProviders(RArray& aInMemory, RImplInfoPtrArray& aInSystem) { - _AKNTRACE_FUNC_ENTER; - TInt i, j; for (i = 0; i < aInMemory.Count(); i++) @@ -2116,16 +1820,12 @@ RemoveProvider(aInMemory[i]); } } - - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::HandleNewProvidersL(RArray& aInMemory, RImplInfoPtrArray& aInSystem, CAiwCriteriaItem* aItem) { - _AKNTRACE_FUNC_ENTER; - TInt i; for (i = 0; i < aInSystem.Count(); i++) @@ -2135,14 +1835,10 @@ AddProviderL(aInSystem[i]->ImplementationUid(), aItem); } } - - _AKNTRACE_FUNC_EXIT; } void CAiwServiceHandlerImpl::MenuLaunched() { - _AKNTRACE_FUNC_ENTER; - ClearMenuPaneArray(); iNextFreeSlot = 0; iLastInitialized.Reset(); @@ -2152,8 +1848,6 @@ { iMenuBindings[i]->SetMenuPane(NULL); } - - _AKNTRACE_FUNC_EXIT; } // End of file diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/aiw_provider_utility_api/tsrc/group/testdomaiwpro.mmp --- a/classicui_plat/aiw_provider_utility_api/tsrc/group/testdomaiwpro.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/aiw_provider_utility_api/tsrc/group/testdomaiwpro.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -65,7 +65,7 @@ LIBRARY euser.lib LIBRARY cone.lib LIBRARY avkon.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY servicehandler.lib LIBRARY eikcoctl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/aiw_service_interface_base_api/tsrc/group/testdomserviceib.mmp --- a/classicui_plat/aiw_service_interface_base_api/tsrc/group/testdomserviceib.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/aiw_service_interface_base_api/tsrc/group/testdomserviceib.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -52,9 +52,9 @@ LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib -LIBRARY servicehandler.lib +LIBRARY ServiceHandler.lib LANG SC diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/aiw_service_interface_menu_api/tsrc/group/testdomserviceim.mmp --- a/classicui_plat/aiw_service_interface_menu_api/tsrc/group/testdomserviceim.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/aiw_service_interface_menu_api/tsrc/group/testdomserviceim.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -51,8 +51,8 @@ SOURCE testserviceifmenuprotected.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib -LIBRARY servicehandler.lib +LIBRARY ServiceHandler.lib LANG SC diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/alarm_api/tsrc/group/testdomalarm.mmp --- a/classicui_plat/alarm_api/tsrc/group/testdomalarm.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/alarm_api/tsrc/group/testdomalarm.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,10 +49,10 @@ SOURCE testdomalarmblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eiksrv.lib -LIBRARY Eikalert.lib +LIBRARY eikalert.lib LANG SC diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/application_switching_api/tsrc/group/testdomapplicationswitching.mmp --- a/classicui_plat/application_switching_api/tsrc/group/testdomapplicationswitching.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/application_switching_api/tsrc/group/testdomapplicationswitching.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -38,7 +38,7 @@ SOURCE testdomserappuiderive.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eiksrv.lib LIBRARY eiksrvui.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/avkon_fonts_api/tsrc/group/testdomakfonts.mmp --- a/classicui_plat/avkon_fonts_api/tsrc/group/testdomakfonts.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/avkon_fonts_api/tsrc/group/testdomakfonts.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -51,11 +51,11 @@ SOURCE testdomakfontsblockslayoutfont.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY uiklaf.lib LIBRARY avkon.lib -LIBRARY fontutils.lib +LIBRARY fontutils.lib LIBRARY gdi.lib LIBRARY eikcore.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/avkon_localised_texts_api/loc/avkon.loc --- a/classicui_plat/avkon_localised_texts_api/loc/avkon.loc Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/avkon_localised_texts_api/loc/avkon.loc Wed Oct 13 14:50:15 2010 +0300 @@ -4317,14 +4317,5 @@ // #define qtn_navi_pane_marking_mode "Marking mode" -//d: handwriting setting menu items. -//l: list_single_pane_t1_cp2/opt3 -//r: TB9.2 -#define qtn_handwriting_input_options "Handwriting input settings" - - -//d: Text in editor when the editor is empty, it is used to indicate user to tap and input -//r: 9.2 -#define qtn_editors_tap_to_write "Tap to write" // End of File diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/avkon_secondary_display_support_api/tsrc/group/testdomasds.mmp --- a/classicui_plat/avkon_secondary_display_support_api/tsrc/group/testdomasds.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/avkon_secondary_display_support_api/tsrc/group/testdomasds.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -51,7 +51,7 @@ SOURCE testdomasdsblocksdata.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikdlg.lib LIBRARY estor.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/avkon_settings_api/inc/AvkonInternalCRKeys.h --- a/classicui_plat/avkon_settings_api/inc/AvkonInternalCRKeys.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/avkon_settings_api/inc/AvkonInternalCRKeys.h Wed Oct 13 14:50:15 2010 +0300 @@ -310,16 +310,6 @@ * */ const TUint32 KAknATTSignalIconEnable = 0x00000019; -/** - * Value indicates the feature "tap to write" - * - * Possible values are: - * - * 0: The "tap to write" feature isn't supported - * 1: The "tap to write" feature is supported - * - */ -const TUint32 KAknEdwinTapToWrite = 0x0000001A; const TUid KCRUidLeaveAppsInMemory = { 0x102858F2 }; diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/avkon_testability_api/tsrc/group/testplattestability.mmp --- a/classicui_plat/avkon_testability_api/tsrc/group/testplattestability.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/avkon_testability_api/tsrc/group/testplattestability.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -38,7 +38,7 @@ SOURCE testplattestabilityblocksakntashook.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/avkon_ui_server_api/tsrc/group/testdomuiserver.mmp --- a/classicui_plat/avkon_ui_server_api/tsrc/group/testdomuiserver.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/avkon_ui_server_api/tsrc/group/testdomuiserver.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -51,7 +51,7 @@ SOURCE testdomuiserverblocksakncapserverclient.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY apparc.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/battery_pane_api/tsrc/group/testdombatterypane.mmp --- a/classicui_plat/battery_pane_api/tsrc/group/testdombatterypane.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/battery_pane_api/tsrc/group/testdombatterypane.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -58,7 +58,7 @@ SOURCE testdombpprotectedclass.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group/testdomcfdfilterfactory.mmp --- a/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group/testdomcfdfilterfactory.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group/testdomcfdfilterfactory.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -66,11 +66,11 @@ SOURCE testdomcfdfilterfactoryblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY bafl.lib LIBRARY cone.lib -LIBRARY commondialogs.lib +LIBRARY CommonDialogs.lib LANG SC diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/custom_cursors_api/tsrc/group/testdomcustomcursors.mmp --- a/classicui_plat/custom_cursors_api/tsrc/group/testdomcustomcursors.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/custom_cursors_api/tsrc/group/testdomcustomcursors.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testdomcustomcursorsblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY gdi.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/eikon_server_extension_client_api/tsrc/group/testdomesec.mmp --- a/classicui_plat/eikon_server_extension_client_api/tsrc/group/testdomesec.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/eikon_server_extension_client_api/tsrc/group/testdomesec.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testdomesecblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/emergency_call_support_api/tsrc/group/testdomemergencycallsupport.mmp --- a/classicui_plat/emergency_call_support_api/tsrc/group/testdomemergencycallsupport.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/emergency_call_support_api/tsrc/group/testdomemergencycallsupport.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -50,7 +50,7 @@ SOURCE testdomecsprotectedclass.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_aiw_criteria_api/tsrc/group/testdomextaiwcriteria.mmp --- a/classicui_plat/extended_aiw_criteria_api/tsrc/group/testdomextaiwcriteria.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_aiw_criteria_api/tsrc/group/testdomextaiwcriteria.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -44,11 +44,11 @@ LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY cone.lib -LIBRARY VPbkEng.lib -LIBRARY pbkeng.lib +LIBRARY vpbkeng.lib +LIBRARY PbkEng.lib LANG SC diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_animation_api/tsrc/group/testdomextanimation.mmp --- a/classicui_plat/extended_animation_api/tsrc/group/testdomextanimation.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_animation_api/tsrc/group/testdomextanimation.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ SOURCE testdomextanimationcontainer.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_buttons_api/tsrc/group/testdomextbuttons.mmp --- a/classicui_plat/extended_buttons_api/tsrc/group/testdomextbuttons.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_buttons_api/tsrc/group/testdomextbuttons.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -52,7 +52,7 @@ SOURCE testaknview.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikcoctl.lib LIBRARY aknicon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_editors_api/inc/AknPhoneNumberEditor.h --- a/classicui_plat/extended_editors_api/inc/AknPhoneNumberEditor.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_editors_api/inc/AknPhoneNumberEditor.h Wed Oct 13 14:50:15 2010 +0300 @@ -158,9 +158,6 @@ IMPORT_C TInt GetEditorMode() const; IMPORT_C void ResetEditorToDefaultValues(); - IMPORT_C void SetQwertyAllowed( TBool aQwertyAllowed ); - IMPORT_C void SetHybridModeAllowed( TBool aHybridModeAllowed ); - public: // from CCoeControl /** @@ -283,7 +280,7 @@ * Report event to pen input method. * @param aStateEvent, MAknEdStateObserver::EAknEdwinStateEvent */ - void ReportAknEdStateEvent( + void ReportAknEdStateEventL( MAknEdStateObserver::EAknEdwinStateEvent aStateEvent ); /** * close VKB . diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_editors_api/tsrc/group/testdomeditor.mmp --- a/classicui_plat/extended_editors_api/tsrc/group/testdomeditor.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_editors_api/tsrc/group/testdomeditor.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -68,7 +68,7 @@ SOURCE testdomeditorcontainer.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY eikcoctl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_grids_api/tsrc/group/testdomgrids.mmp --- a/classicui_plat/extended_grids_api/tsrc/group/testdomgrids.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_grids_api/tsrc/group/testdomgrids.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -50,7 +50,7 @@ SOURCE testdomgridscontainer.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_indicators_api/tsrc/group/testdomindicator.mmp --- a/classicui_plat/extended_indicators_api/tsrc/group/testdomindicator.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_indicators_api/tsrc/group/testdomindicator.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -50,7 +50,7 @@ SOURCE testdomindicatorcontainer.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_initialization_api/tsrc/group/testdomextinit.mmp --- a/classicui_plat/extended_initialization_api/tsrc/group/testdomextinit.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_initialization_api/tsrc/group/testdomextinit.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,9 +49,9 @@ SOURCE testdomextinitblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib -LIBRARY avkon.lib +LIBRARY avkon.LIB LANG SC diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_input_capabilities_api/tsrc/group/testdominputcap.mmp --- a/classicui_plat/extended_input_capabilities_api/tsrc/group/testdominputcap.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_input_capabilities_api/tsrc/group/testdominputcap.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -50,7 +50,7 @@ SOURCE testdominputcapext.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikctl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_lists_api/tsrc/group/testdomlists.mmp --- a/classicui_plat/extended_lists_api/tsrc/group/testdomlists.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_lists_api/tsrc/group/testdomlists.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -68,7 +68,7 @@ SOURCE testdomlistsext.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_notes_api/tsrc/group/testdomextnotes.mmp --- a/classicui_plat/extended_notes_api/tsrc/group/testdomextnotes.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_notes_api/tsrc/group/testdomextnotes.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testdomextnotesblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY eikcdlg.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_notifiers_api/inc/AknSignalNotify.h --- a/classicui_plat/extended_notifiers_api/inc/AknSignalNotify.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_notifiers_api/inc/AknSignalNotify.h Wed Oct 13 14:50:15 2010 +0300 @@ -209,24 +209,6 @@ * Reserved for future use. */ IMPORT_C void CAknNotifyBase_Reserved(); - -public: - - /** - * Set UMA indicator state. Available states from avkon.hrh: - * - * EAknSignalUmaIndicatorOff = 0x600, - * EAknSignalUmaIndicatorAvailable, - * EAknSignalUmaIndicatorAttached, - * EAknSignalUmaIndicatorEstablishingContext, - * EAknSignalUmaIndicatorContext, - * EAknSignalUmaIndicatorSuspended, - * EAknSignalUmaIndicatorMultipdp - * - * @param aUmaState UMA indicator state. - */ - IMPORT_C void SetUmaStateL(TInt aUmaState); - }; #endif // __AKNSIGNALNOTIFY_H__ diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_notifiers_api/tsrc/group/testdomextnotifiers.mmp --- a/classicui_plat/extended_notifiers_api/tsrc/group/testdomextnotifiers.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_notifiers_api/tsrc/group/testdomextnotifiers.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -8,7 +8,7 @@ * * Initial Contributors: * Nokia Corporation - initial contribution. -* Version: %version: be1nfmx1#2.1.4 % +* Version: %version: 2.1.2 % * * Contributors: * @@ -53,7 +53,7 @@ LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY aknnotifyplugin.lib LIBRARY akndynamicsoftnote.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_options_menu_api/inc/aknitemactionmenu.h --- a/classicui_plat/extended_options_menu_api/inc/aknitemactionmenu.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_options_menu_api/inc/aknitemactionmenu.h Wed Oct 13 14:50:15 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009 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" @@ -150,13 +150,6 @@ IMPORT_C void CollectionChanged( MAknCollection& aCollection ); /** - * Provides marking mode handler. - * - * @return Marking mode handler. - */ - IMPORT_C CAknMarkingMode& MarkingMode(); - - /** * Sets menu bar to item action menu. * * @internal @@ -231,19 +224,20 @@ MObjectProvider* Owner() const; /** + * Provides marking mode handler. + * + * @internal + * @return Marking mode handler. + */ + CAknMarkingMode& MarkingMode(); + + /** * Returns ETrue if collection has marked items. * * @internal * @return ETrue if collection has marked items. */ TBool CollectionHasMarkedItems(); - - /** - * Hides this item action menu. - * - * @internal - */ - void HideMenu(); private: diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_options_menu_api/tsrc/group/testdomoptionsmenu.mmp --- a/classicui_plat/extended_options_menu_api/tsrc/group/testdomoptionsmenu.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_options_menu_api/tsrc/group/testdomoptionsmenu.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -42,7 +42,7 @@ //RESOURCE resource_file2 LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikcoctl.lib LIBRARY avkon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_setting_pages_api/tsrc/group/testdomsetpage.mmp --- a/classicui_plat/extended_setting_pages_api/tsrc/group/testdomsetpage.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_setting_pages_api/tsrc/group/testdomsetpage.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ SOURCE testdomsetpageext.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY cone.lib LIBRARY bafl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_sounds_api/tsrc/group/testplatextsound.mmp --- a/classicui_plat/extended_sounds_api/tsrc/group/testplatextsound.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_sounds_api/tsrc/group/testplatextsound.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -38,9 +38,9 @@ SOURCE testplatextsoundblocksataudioeventapi.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib -LIBRARY atsoundserverclient.lib +LIBRARY ATSoundServerClient.lib LANG SC diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_status_pane_api/inc/aknsgcc.h --- a/classicui_plat/extended_status_pane_api/inc/aknsgcc.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_status_pane_api/inc/aknsgcc.h Wed Oct 13 14:50:15 2010 +0300 @@ -98,33 +98,8 @@ IMPORT_C static void MoveApp(TInt aAppWindowGroupId, TSgcMoveAppToWhere aWhere); IMPORT_C static void SetImpl(CAknSgcImpl* aImpl); - /** - * Relinquishes priority for the foreground application during layout - * switches and skin change events. During these events the process - * priorities are adjusted so that the priorities of the processes at the - * background are lowered so that the foreground process gets more CPU - * time in order to be able to quickly process the events. - * - * @internal Used internally by the UI Framework. - * - * @param aIsForeground @c ETrue if the application is currently on - * foreground, @c EFalse otherwise. - */ - static void RelinquishPriorityToForegroundAppLC( TBool aIsForeground ); - - /** - * Enables or disables the foreground process priority maintaining - * during priority relinquishment. With this enabled the application can - * be set to the foreground process priority even if it's actually - * on the background, to handle the events where priority relinquishment - * is used faster. - * - * @internal Used internally by the UI Framework. - * - * @param aUseForeground @c ETrue to maintain the foreground priority, - * @c EFalse otherwise. - */ - static void UseForegroundPriorityDuringRelinquish( TBool aUseForeground ); + // internal + static void RelinquishPriorityToForegroundAppLC(TBool aIsForeground); protected: CAknSgcClient(); diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_status_pane_api/tsrc/group/testdomstatuspane.mmp --- a/classicui_plat/extended_status_pane_api/tsrc/group/testdomstatuspane.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_status_pane_api/tsrc/group/testdomstatuspane.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -53,7 +53,7 @@ SOURCE testdomstatuspaneblockssyncdraw.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/extended_utilities_api/tsrc/group/testdomextendedutlts.mmp --- a/classicui_plat/extended_utilities_api/tsrc/group/testdomextendedutlts.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/extended_utilities_api/tsrc/group/testdomextendedutlts.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testdomextendedutltsblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY eikcoctl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/find_item_ui_api/inc/finditemdialog.h --- a/classicui_plat/find_item_ui_api/inc/finditemdialog.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/find_item_ui_api/inc/finditemdialog.h Wed Oct 13 14:50:15 2010 +0300 @@ -196,15 +196,6 @@ */ void HandlePointerEventL ( const TPointerEvent& aPointerEvent ); - /** - * Sets AIW submenu item visibility - * Must be called before displaying the dialog - * - * @since S60 5.2 - * @param aVisible AIW submenu item visibility - */ - IMPORT_C void SetCallSubMenuVisibility( TBool aVisible ); - protected: // Functions from base classes /** @@ -550,9 +541,6 @@ // Tactile Feedback interface MTouchFeedback* iFeedback; - - // Hide AIW submenu - TBool iHideCallSubMenu; public: // new methods void DeleteMeL(); diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/find_item_ui_api/inc/finditemmenu.h --- a/classicui_plat/find_item_ui_api/inc/finditemmenu.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/find_item_ui_api/inc/finditemmenu.h Wed Oct 13 14:50:15 2010 +0300 @@ -309,15 +309,6 @@ IMPORT_C void SetMenuItemVisibility( CFindItemMenu::TMenuItem aItem, TBool aVisible ); - - /** - * Sets AIW submenu item visibility - * Must be called before displaying the menu - * - * @since S60 5.2 - * @param aVisible AIW submenu item visibility - */ - IMPORT_C void SetCallSubMenuVisibility( TBool aVisible ); private: @@ -488,9 +479,6 @@ */ TInt iMenuItemFlags; MPBAiwNotify iCallback; - - // Hide AIW submenu - TBool iHideCallSubMenu; }; #endif // FINDITEMMENU_H diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/find_item_ui_api/tsrc/group/testdomfinditem.mmp --- a/classicui_plat/find_item_ui_api/tsrc/group/testdomfinditem.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/find_item_ui_api/tsrc/group/testdomfinditem.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -66,7 +66,7 @@ SOURCE testdomfinditemcontainer.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY cone.lib LIBRARY commonui.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/ganes_api/inc/ganes/HgScroller.h --- a/classicui_plat/ganes_api/inc/ganes/HgScroller.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/ganes_api/inc/ganes/HgScroller.h Wed Oct 13 14:50:15 2010 +0300 @@ -506,7 +506,6 @@ TBool iResetViewPosition; // ETrue on the first time run, and when iViewPosition must be reset. TBool iPointerDown; - TBool iEnterKeyHandled; CPeriodic* iHighlightTimer; // Higlight timer, own. TBool iSelectionToFocusedItem; // Is focused item clicked diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/ganes_api/inc/ganes/HgVgMediaWall.h --- a/classicui_plat/ganes_api/inc/ganes/HgVgMediaWall.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/ganes_api/inc/ganes/HgVgMediaWall.h Wed Oct 13 14:50:15 2010 +0300 @@ -808,8 +808,6 @@ TBool iObserverNotified; TRect iOpenedItemRect; - - TBool iRotatedDraw; }; diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/ganes_api/tsrc/group/testplatgane.mmp --- a/classicui_plat/ganes_api/tsrc/group/testplatgane.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/ganes_api/tsrc/group/testplatgane.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -50,7 +50,7 @@ SOURCE testplatganeblockshgsingletextlistwithicon.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY ganes.lib LIBRARY ws32.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/generic_parameter_api/tsrc/group/testdomgenparam.mmp --- a/classicui_plat/generic_parameter_api/tsrc/group/testdomgenparam.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/generic_parameter_api/tsrc/group/testdomgenparam.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -50,7 +50,7 @@ SOURCE testdomgenparamext.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY commonui.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/global_popup_priority_controller_api/tsrc/group/testdomgppc.mmp --- a/classicui_plat/global_popup_priority_controller_api/tsrc/group/testdomgppc.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/global_popup_priority_controller_api/tsrc/group/testdomgppc.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testdomgppcblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/indicator_plugin_api/tsrc/group/testdomindiplugin.mmp --- a/classicui_plat/indicator_plugin_api/tsrc/group/testdomindiplugin.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/indicator_plugin_api/tsrc/group/testdomindiplugin.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -54,7 +54,7 @@ SOURCE testdomindipluginext.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/input_block_api/tsrc/group/testdominputblk.mmp --- a/classicui_plat/input_block_api/tsrc/group/testdominputblk.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/input_block_api/tsrc/group/testdominputblk.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -52,9 +52,9 @@ LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib -LIBRARY avkon.lib +LIBRARY Avkon.lib LANG SC diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/item_finder_api/tsrc/group/testdomitemfinder.mmp --- a/classicui_plat/item_finder_api/tsrc/group/testdomitemfinder.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/item_finder_api/tsrc/group/testdomitemfinder.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testdomitemfinderblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY commonui.lib LIBRARY egul.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/japanese_reading_api/tsrc/group/testdomjapanesereading.mmp --- a/classicui_plat/japanese_reading_api/tsrc/group/testdomjapanesereading.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/japanese_reading_api/tsrc/group/testdomjapanesereading.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -52,9 +52,9 @@ LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib -LIBRARY ptiengine.lib +LIBRARY ptiengine.lib LIBRARY aknjapanesereading.lib LANG SC diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/key_rotator_api/tsrc/group/testdomkeyrotator.mmp --- a/classicui_plat/key_rotator_api/tsrc/group/testdomkeyrotator.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/key_rotator_api/tsrc/group/testdomkeyrotator.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,9 +49,9 @@ SOURCE testdomkeyrotatorblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib -LIBRARY AknKeyRotator.lib +LIBRARY aknkeyrotator.lib LANG SC diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/layout_configuration_api/tsrc/group/testdomlayoutcfg.mmp --- a/classicui_plat/layout_configuration_api/tsrc/group/testdomlayoutcfg.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/layout_configuration_api/tsrc/group/testdomlayoutcfg.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testdomlayoutcfgblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/list_effects_api/tsrc/group/testdomlisteffects.mmp --- a/classicui_plat/list_effects_api/tsrc/group/testdomlisteffects.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/list_effects_api/tsrc/group/testdomlisteffects.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -50,7 +50,7 @@ SOURCE testdomlisteffectscontainer.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY cone.lib LIBRARY aknlistloadertfx.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/long_tap_animation_api/tsrc/group/testdomlongtap.mmp --- a/classicui_plat/long_tap_animation_api/tsrc/group/testdomlongtap.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/long_tap_animation_api/tsrc/group/testdomlongtap.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testdomlongtapblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/media_shared_document_api/tsrc/group/testdommediashareddoc.mmp --- a/classicui_plat/media_shared_document_api/tsrc/group/testdommediashareddoc.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/media_shared_document_api/tsrc/group/testdommediashareddoc.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testdommediashareddocblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikcore.lib LIBRARY apparc.lib @@ -57,7 +57,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/memory_card_ui_api/tsrc/group/testdommemorycard.mmp --- a/classicui_plat/memory_card_ui_api/tsrc/group/testdommemorycard.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/memory_card_ui_api/tsrc/group/testdommemorycard.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testdommemorycardblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY aknmemorycardui.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/number_grouping_api/tsrc/group/testdomnumbergrouping.mmp --- a/classicui_plat/number_grouping_api/tsrc/group/testdomnumbergrouping.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/number_grouping_api/tsrc/group/testdomnumbergrouping.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -52,10 +52,10 @@ SOURCE testdomnumbergroupingblocksnumgrping.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib -LIBRARY avkon.lib -LIBRARY numbergrouping.lib +LIBRARY AVKON.LIB +LIBRARY NumberGrouping.lib LANG SC diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/personalisation_framework_api/tsrc/group/testdompslnframework.mmp --- a/classicui_plat/personalisation_framework_api/tsrc/group/testdompslnframework.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/personalisation_framework_api/tsrc/group/testdompslnframework.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -77,7 +77,7 @@ SOURCE testdompslnfwbv.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY pslnframework.lib LIBRARY cone.lib @@ -87,7 +87,7 @@ LIBRARY eiksrv.lib LIBRARY avkon.lib LIBRARY egul.lib -LIBRARY CommonEngine.lib +LIBRARY commonengine.lib LIBRARY ecom.lib LANG SC diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/phone_number_text_utilities_api/tsrc/group/testdomphonecontentutil.mmp --- a/classicui_plat/phone_number_text_utilities_api/tsrc/group/testdomphonecontentutil.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/phone_number_text_utilities_api/tsrc/group/testdomphonecontentutil.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testdomphonecontentutilblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/physics_api/tsrc/group/testplatphysics.mmp --- a/classicui_plat/physics_api/tsrc/group/testplatphysics.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/physics_api/tsrc/group/testplatphysics.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -40,7 +40,7 @@ SOURCE testplatphysicscontrol.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY aknphysics.lib LIBRARY eikcoctl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/pointer_event_modifier_api/tsrc/group/testdompoieventmod.mmp --- a/classicui_plat/pointer_event_modifier_api/tsrc/group/testdompoieventmod.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/pointer_event_modifier_api/tsrc/group/testdompoieventmod.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -50,7 +50,7 @@ SOURCE testdompoieventmodcontainer.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY cone.lib LIBRARY avkon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/popup_form_api/tsrc/group/testdompopupform.mmp --- a/classicui_plat/popup_form_api/tsrc/group/testdompopupform.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/popup_form_api/tsrc/group/testdompopupform.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -65,7 +65,7 @@ LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/server_application_services_api/tsrc/group/testdomserverappservice.mmp --- a/classicui_plat/server_application_services_api/tsrc/group/testdomserverappservice.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/server_application_services_api/tsrc/group/testdomserverappservice.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testdomserverappserviceblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY servicehandler.lib LIBRARY avkon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/signal_pane_api/inc/aknsignal.h --- a/classicui_plat/signal_pane_api/inc/aknsignal.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/signal_pane_api/inc/aknsignal.h Wed Oct 13 14:50:15 2010 +0300 @@ -225,21 +225,6 @@ private: // From CCoeControl IMPORT_C virtual void Draw(const TRect& aRect) const; -public: - /** - * Set UMA state. Available UMA states are (avkon.hrh): - * EAknSignalUmaIndicatorOff = 0x600, - * EAknSignalUmaIndicatorAvailable, - * EAknSignalUmaIndicatorAttached, - * EAknSignalUmaIndicatorEstablishingContext, - * EAknSignalUmaIndicatorContext, - * EAknSignalUmaIndicatorSuspended, - * EAknSignalUmaIndicatorMultipdp - * - * @param aUmaIconState UMA state. - */ - IMPORT_C void ShowUmaIconL(TInt aUmaIconState); - private: static TInt TickerCallback(TAny* aThis); TInt DoTick(); diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/signal_pane_api/tsrc/group/testdomsignalpane.mmp --- a/classicui_plat/signal_pane_api/tsrc/group/testdomsignalpane.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/signal_pane_api/tsrc/group/testdomsignalpane.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ SOURCE testdomsignalprotected.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/skinnable_clock_api/tsrc/group/testdomskinnableclock.mmp --- a/classicui_plat/skinnable_clock_api/tsrc/group/testdomskinnableclock.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/skinnable_clock_api/tsrc/group/testdomskinnableclock.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -50,14 +50,14 @@ SOURCE testdomclockcontainer.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikcore.lib -LIBRARY commonui.lib +LIBRARY commonui.lib LIBRARY cone.lib -LIBRARY aknskins.lib -LIBRARY aknskinsrv.lib -LIBRARY aknswallpaperutils.lib +LIBRARY aknskins.lib +LIBRARY aknskinsrv.lib +LIBRARY aknswallpaperutils.lib LIBRARY apparc.lib LIBRARY eikcoctl.lib LIBRARY avkon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/special_character_table_api/inc/AknCharMap.h --- a/classicui_plat/special_character_table_api/inc/AknCharMap.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/special_character_table_api/inc/AknCharMap.h Wed Oct 13 14:50:15 2010 +0300 @@ -412,7 +412,6 @@ TInt Category(); TBool IsSupportCategoryButtonUi() const; TBool IsJapaneseSctUi() const; - TBool IsKoreanSctUi() const; const TDesC* TitleWithSelectingSpecialChar(); private: diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/special_character_table_api/inc/AknSctDialog.h --- a/classicui_plat/special_character_table_api/inc/AknSctDialog.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/special_character_table_api/inc/AknSctDialog.h Wed Oct 13 14:50:15 2010 +0300 @@ -153,14 +153,6 @@ * Handles pointer events */ IMPORT_C void HandlePointerEventL(const TPointerEvent& aPointerEvent); - - /** - * Return the initialized character case - * @since Timebox 92 - * - */ - TInt CharacterCase(); - private: // helpers void DoLayout(); private: diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/special_character_table_api/inc/AknSmileyUtils.h --- a/classicui_plat/special_character_table_api/inc/AknSmileyUtils.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/special_character_table_api/inc/AknSmileyUtils.h Wed Oct 13 14:50:15 2010 +0300 @@ -60,11 +60,6 @@ class CAknSmileyManager : public CBase { public: - static const TText KPlaceHolder = 0xfff0; - static const TText KCompensateChar = 'i'; - static const TUint KSmileyCodeMin = 0xf880; - static const TUint KSmileyCodeMax = 0xf8e4; - IMPORT_C static CAknSmileyManager* NewL(MAknSmileyObserver* aObserver); IMPORT_C ~CAknSmileyManager(); diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/special_character_table_api/tsrc/group/testdomspecialchartab.mmp --- a/classicui_plat/special_character_table_api/tsrc/group/testdomspecialchartab.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/special_character_table_api/tsrc/group/testdomspecialchartab.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -50,7 +50,7 @@ SOURCE testdomcharmap.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/stylus_activated_popup_api/tsrc/group/testdomstylusactivepopup.mmp --- a/classicui_plat/stylus_activated_popup_api/tsrc/group/testdomstylusactivepopup.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/stylus_activated_popup_api/tsrc/group/testdomstylusactivepopup.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -62,7 +62,7 @@ SOURCE testdomstylusactivepopupcontainer.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikcore.lib LIBRARY bafl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/task_list_api/tsrc/group/testdomtasklist.mmp --- a/classicui_plat/task_list_api/tsrc/group/testdomtasklist.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/task_list_api/tsrc/group/testdomtasklist.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testdomtasklistblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY cone.lib LIBRARY avkon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/text_scroller_api/tsrc/group/testdomtextscroller.mmp --- a/classicui_plat/text_scroller_api/tsrc/group/testdomtextscroller.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/text_scroller_api/tsrc/group/testdomtextscroller.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -50,12 +50,12 @@ SOURCE testdomtextscrollercontainer.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY eikcore.lib LIBRARY cone.lib -LIBRARY AknLayout2Scalable.lib +LIBRARY AKNLAYOUT2SCALABLE.LIB LANG SC diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/touch_gesture_framework_api/tsrc/group/akntouchgesturefwtest.mmp --- a/classicui_plat/touch_gesture_framework_api/tsrc/group/akntouchgesturefwtest.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/touch_gesture_framework_api/tsrc/group/akntouchgesturefwtest.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -40,7 +40,7 @@ SOURCE akntouchgesturefwtestsubscribercontrol.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY akntouchgesturefw.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/touch_pane_api/tsrc/group/testsdktouchpane.mmp --- a/classicui_plat/touch_pane_api/tsrc/group/testsdktouchpane.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/touch_pane_api/tsrc/group/testsdktouchpane.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ SOURCE testsdktptouchpanefeppen.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikcoctl.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/transition_effect_parameters_api/tsrc/group/testdomtransitioneffectpara.mmp --- a/classicui_plat/transition_effect_parameters_api/tsrc/group/testdomtransitioneffectpara.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/transition_effect_parameters_api/tsrc/group/testdomtransitioneffectpara.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testdomtransitioneffectparablocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LANG SC diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/transition_effect_utilities_api/tsrc/group/testdomtransitioneffectutilities.mmp --- a/classicui_plat/transition_effect_utilities_api/tsrc/group/testdomtransitioneffectutilities.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/transition_effect_utilities_api/tsrc/group/testdomtransitioneffectutilities.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -53,7 +53,7 @@ SOURCE testdomutilitiescontainer.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY apparc.lib LIBRARY cone.lib @@ -64,8 +64,8 @@ LIBRARY eikdlg.lib LIBRARY eiksrvui.lib LIBRARY commonui.lib -LIBRARY CommonEngine.lib -LIBRARY SortUtil.lib +LIBRARY commonengine.lib +LIBRARY sortutil.lib LANG SC diff -r 85902f042028 -r a5e7a4f63858 classicui_plat/volume_popup_api/tsrc/group/testdomvolumepopup.mmp --- a/classicui_plat/volume_popup_api/tsrc/group/testdomvolumepopup.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_plat/volume_popup_api/tsrc/group/testdomvolumepopup.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -50,7 +50,7 @@ SOURCE testdomvolumepopupcontainer.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/aiw_criteria_api/tsrc/group/testsdkaiwcri.mmp --- a/classicui_pub/aiw_criteria_api/tsrc/group/testsdkaiwcri.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/aiw_criteria_api/tsrc/group/testsdkaiwcri.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -66,7 +66,7 @@ LIBRARY cone.lib LIBRARY avkon.lib LIBRARY eikcore.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY servicehandler.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/aiw_generic_parameter_api/inc/AiwGenericParam.hrh --- a/classicui_pub/aiw_generic_parameter_api/inc/AiwGenericParam.hrh Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/aiw_generic_parameter_api/inc/AiwGenericParam.hrh Wed Oct 13 14:50:15 2010 +0300 @@ -192,12 +192,6 @@ EGenericParamLastName = 1921, EGenericParamNickname = 1922 // BRANCH_END 08-28-08: gronoff - - , - EGenericParamHideCallSubmenu = 1950, - EGenericParamVoiceCall = 1951, - EGenericParamVideoCall = 1952, - EGenericParamVoIPCall = 1953 }; diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/aiw_generic_parameter_api/tsrc/group/testsdkaiwgp.mmp --- a/classicui_pub/aiw_generic_parameter_api/tsrc/group/testsdkaiwgp.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/aiw_generic_parameter_api/tsrc/group/testsdkaiwgp.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,9 +49,9 @@ LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib -LIBRARY servicehandler.lib +LIBRARY ServiceHandler.lib LIBRARY estor.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/aiw_service_handler_api/tsrc/group/testsdkaiwservicehandler.mmp --- a/classicui_pub/aiw_service_handler_api/tsrc/group/testsdkaiwservicehandler.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/aiw_service_handler_api/tsrc/group/testsdkaiwservicehandler.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -54,7 +54,7 @@ SOURCE testsdkaiwservicehandlerblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY servicehandler.lib LIBRARY eikcore.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/animation_api/tsrc/group/testsdkanimation.mmp --- a/classicui_pub/animation_api/tsrc/group/testsdkanimation.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/animation_api/tsrc/group/testsdkanimation.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -68,7 +68,7 @@ SOURCE testsdkacontrol.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY ws32.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/application_framework_api/inc/AknViewAppUi.h --- a/classicui_pub/application_framework_api/inc/AknViewAppUi.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/application_framework_api/inc/AknViewAppUi.h Wed Oct 13 14:50:15 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002 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" @@ -228,10 +228,7 @@ * Enables/disables local screen clearer. * Local screen clearer is used in the view based applications * to clear the application window if/when the view itself fails - * to do this. By default, the clearer is used except when launching - * the application as embedded. If the clearer needs to be used - * in an application that is launched as embedded, then this - * function must be explicitly called. + * to do this. By default, the clearer is used. * This function must be called before the BaseConstructL() to * prevent the screen clearer on application start up. * diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/application_framework_api/tsrc/group/testsdkappfw.mmp --- a/classicui_pub/application_framework_api/tsrc/group/testsdkappfw.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/application_framework_api/tsrc/group/testsdkappfw.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -71,7 +71,7 @@ SOURCE testsdkappfwviewappui.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY eikcore.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/base_controls_api/tsrc/group/testsdkbasecontrols.mmp --- a/classicui_pub/base_controls_api/tsrc/group/testsdkbasecontrols.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/base_controls_api/tsrc/group/testsdkbasecontrols.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -47,7 +47,7 @@ SOURCE testsdkbasecontrolsblockseikalign.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikcoctl.lib LIBRARY avkon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/buttons_api/tsrc/group/testsdkbuttons.mmp --- a/classicui_pub/buttons_api/tsrc/group/testsdkbuttons.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/buttons_api/tsrc/group/testsdkbuttons.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -52,7 +52,7 @@ SOURCE testsdkbuttonscontainer.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY bafl.lib LIBRARY eikcoctl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/choice_list_api/tsrc/group/testsdkchoicelist.mmp --- a/classicui_pub/choice_list_api/tsrc/group/testsdkchoicelist.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/choice_list_api/tsrc/group/testsdkchoicelist.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,12 +64,12 @@ SOURCE testsdkchoicelistcontrol.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY bafl.lib -LIBRARY avkon.lib +LIBRARY AVKON.LIB LIBRARY cone.lib -LIBRARY eikcoctl.lib +LIBRARY EIKCOCTL.LIB LIBRARY eikcore.lib LANG SC diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/common_file_dialogs_api/tsrc/group/testsdkcfd.mmp --- a/classicui_pub/common_file_dialogs_api/tsrc/group/testsdkcfd.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/common_file_dialogs_api/tsrc/group/testsdkcfd.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -87,7 +87,7 @@ LIBRARY cone.lib LIBRARY avkon.lib LIBRARY eikcore.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY commondialogs.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/context_pane_api/tsrc/group/testsdkcontextpane.mmp --- a/classicui_pub/context_pane_api/tsrc/group/testsdkcontextpane.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/context_pane_api/tsrc/group/testsdkcontextpane.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ SOURCE testsdkcpcontextpane.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/dialog_shutter_api/tsrc/group/testsdkdialogshutter.mmp --- a/classicui_pub/dialog_shutter_api/tsrc/group/testsdkdialogshutter.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/dialog_shutter_api/tsrc/group/testsdkdialogshutter.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ SOURCE testsdkdialogshutterblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY eikdlg.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/dialogs_api/tsrc/group/testsdkdialogs.mmp --- a/classicui_pub/dialogs_api/tsrc/group/testsdkdialogs.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/dialogs_api/tsrc/group/testsdkdialogs.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -67,7 +67,7 @@ SOURCE testsdkdialogscontrol.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikdlg.lib LIBRARY avkon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/document_handler_api/tsrc/group/testsdkdocumenthandler.mmp --- a/classicui_pub/document_handler_api/tsrc/group/testsdkdocumenthandler.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/document_handler_api/tsrc/group/testsdkdocumenthandler.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -40,7 +40,7 @@ SOURCE testsdkdocumenthandlerobserver.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY commonui.lib LIBRARY eikcore.lib @@ -48,8 +48,8 @@ LIBRARY efsrv.lib LIBRARY apmime.lib LIBRARY avkon.lib -LIBRARY apparc.lib -LIBRARY platformenv.lib +LIBRARY APPARC.LIB +LIBRARY PlatformEnv.lib LANG SC diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/editors_api/inc/EIKEDWIN.H --- a/classicui_pub/editors_api/inc/EIKEDWIN.H Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/editors_api/inc/EIKEDWIN.H Wed Oct 13 14:50:15 2010 +0300 @@ -385,9 +385,6 @@ CRepository* iCenRep; // Owned CCenRepNotifyHandler* iCenRepNotifyHandler; // Owned TInt iClearDirection; // Value of ClearDirection - // For listening the status of qwerty key board - CRepository* iCenRepForQwerty; // Owned - CCenRepNotifyHandler* iCenRepNotifyHandlerForQwerty; // Owned public: TInt iSkinIdForText; @@ -503,29 +500,6 @@ * Record if text view has been actually hidden. */ TBool iTextViewHidden; - /** - * Record the buff of "Tap To write" in current language. - * - * Own. - */ - HBufC* iT2WBuf; - enum TT2WFlag - { - ESplitInputEnabled = 0x00000001, - EFocusOn = 0x00000002, - ERecordCursor = 0x00000004, - ECursorVisible = 0x00000008 - }; - /** - * Record internal status of of "tap to write". - */ - TInt iT2WState; - - /** - * Used to record if qwerty key board is opened. - * - */ - TInt iQwertyStatus; }; public: @@ -2411,15 +2385,12 @@ TBool AdjustCursorPosByMovementL( TCursorPosition::TMovementType aMovement, TBool aSelect ); void HandleSelectionForSmiley( TCursorSelection aSelect ); - + /** - * 1,If the editor is read only or it is display only "tap to write" is disabled - * 2,If iEdwinExtension->iT2WBuf is NULL, "tap to write" is disabled. - * 3,If Qwerty key borad is opened, "tap to write" is disabled - * 4,If focus off, "tap to write" is disabled - * 5,If split input is enabled, "tap to write" is disabled - */ - TBool IsT2WEnabled() const; + * Get range of inline text in current document. + */ + TCursorSelection InlineTextRange() const; + protected: /** @@ -2812,12 +2783,6 @@ TRect AdjustedViewRect() const; void SetVKBStatus(); void ScrollViewToCursorLineL(); - - /** - * Scrolls view so that cursor is visible. - */ - void MoveViewToCursorLineL(); - void PerformRecordedOperationL(); void ScrollIfAtTopOrBottomL(); void SetSelectionVisibilityL( TBool aIsVisable ); @@ -2845,41 +2810,6 @@ private: void DrawFirstLineTextL() const; - - /** - * Draws "Tap to write" text to help user to navigate to virtual input - * This text is drawn when the text length of the editor field is zero - * - * @param none - * @return none - */ - void DrawT2WTextL() const; - - /** - * Draws "Tap to write" text if text length is zero - * - * @param aClean. When aClean is set to ETrue and the codition of "tap to write" is False, - * The editor will be redraw and "tap to write" will be clean. - * @return none - */ - void TryToDrawT2W( TBool aClean = EFalse ); - - /** - * Get the align of the first line text - * - * @param none - * @return text align for first line text - */ - CGraphicsContext::TTextAlign AlignForFirstLineText( const TPtr & aReorderedTextPtr ) const; - - /** - * Get the rect of the first line text - * - * @param none - * @return rect of the first line - */ - TRect RectForFirstLineText() const; - CAknEdwinDrawingModifier* AknEdwinDrawingModifier(); TBool EditorSupportsNeutralProtection() const; @@ -3164,28 +3094,6 @@ */ TBool ContentFitsToViewRect() const; - /** - * Set the "Tap To Write" enable or not - * There are two ways to use this API. The first way is: after construct a editor you can - * call EnableT2WL( ETrue ) to enable the feature, then editor will display or hide - * "tap to write" by the internal status of editor. It means that "tap to write" will - * display and hide automatically as internal logical of editor. - * Enable the feature: - * CEikEdwin *editor = new (ELeave) CEikEdwin; - * editor->ConstructL(); - * editor->EnableT2WL( ETrue ); - * - * The second way is application can call EnableT2WL( ETrue/EFalse ) - * to display or hide "tap to write" immediately according to its own logic. - * Display: - * editor->EnableT2WL( ETrue ); - * Hide: - * editor->EnableT2WL( EFalse ); - * - * @param ETure for enable EFalse for not disable. - * @return none. - */ - IMPORT_C void EnableT2WL( TBool aEnable ); protected: /** diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/editors_api/tsrc/group/testsdkeditors.mmp --- a/classicui_pub/editors_api/tsrc/group/testsdkeditors.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/editors_api/tsrc/group/testsdkeditors.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -92,7 +92,7 @@ SOURCE testedwindialog.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY eikcdlg.lib @@ -107,15 +107,15 @@ LIBRARY form.lib LIBRARY uiklaf.lib LIBRARY eikcore.lib -LIBRARY lbs.lib +LIBRARY Lbs.lib LIBRARY insock.lib LIBRARY fepbase.lib LIBRARY etext.lib LIBRARY field.lib LIBRARY efsrv.lib LIBRARY gdi.lib -LIBRARY aknskins.lib -LIBRARY aknskinsrv.lib +LIBRARY aknskins.lib +LIBRARY aknskinsrv.lib LIBRARY aknswallpaperutils.lib LIBRARY fbscli.lib LIBRARY print.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/error_ui_api/tsrc/group/testsdkerrui.mmp --- a/classicui_pub/error_ui_api/tsrc/group/testsdkerrui.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/error_ui_api/tsrc/group/testsdkerrui.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testsdkerruiblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY cone.lib LIBRARY commonui.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/fonts_api/tsrc/group/testsdkfonts.mmp --- a/classicui_pub/fonts_api/tsrc/group/testsdkfonts.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/fonts_api/tsrc/group/testsdkfonts.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,13 +57,13 @@ LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY eikcore.lib LIBRARY cone.lib LIBRARY eikcoctl.lib -LIBRARY fontutils.lib +LIBRARY fontutils.lib LIBRARY uiklaf.lib LIBRARY gdi.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/form_api/tsrc/group/testsdkform.mmp --- a/classicui_pub/form_api/tsrc/group/testsdkform.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/form_api/tsrc/group/testsdkform.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ SOURCE testsdkformcontrol.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/generic_button_api/inc/AknButton.h --- a/classicui_pub/generic_button_api/inc/AknButton.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/generic_button_api/inc/AknButton.h Wed Oct 13 14:50:15 2010 +0300 @@ -1485,24 +1485,9 @@ /** * Converts text to visual and clips it. This is called when there - * are possible changes in visual text or text area changed. - * Notice that if the text area size is changed, clipped visual text - * should be regenerated. - * - * @param aRect new text area. - * + * are possible changes in visual text. */ - void ConvertTextToVisualAndClip( const TRect& aRect ) const; - - /* - * Get rect for icon and text of the current button state . - * - * @param aIconRect the rectangle for icon. If no icon used in current state, - * this will be EUninitialized. - * @param aTextRect the rectangle for text. If no text in current state, - * this will be EUninitialized. - */ - void GetCurrentStateTextAndIconRect( TRect& aIconRect, TRect& aTextRect ) const; + void ConvertTextToVisualAndClip() const; protected: // Data diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/generic_button_api/tsrc/group/testsdkgenericbutton.mmp --- a/classicui_pub/generic_button_api/tsrc/group/testsdkgenericbutton.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/generic_button_api/tsrc/group/testsdkgenericbutton.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -68,16 +68,16 @@ SOURCE animatorcallback.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib -LIBRARY eikcoctl.lib +LIBRARY EIKCOCTL.LIB LIBRARY bafl.lib LIBRARY egul.lib LIBRARY aknskins.lib LIBRARY aknskinsrv.lib LIBRARY aknswallpaperutils.lib LIBRARY fbscli.lib -LIBRARY aknicon.lib +LIBRARY aknicon.lib LIBRARY cone.lib LIBRARY bitgdi.lib LIBRARY avkon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/grids_api/tsrc/group/testsdkgrids.mmp --- a/classicui_pub/grids_api/tsrc/group/testsdkgrids.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/grids_api/tsrc/group/testsdkgrids.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -75,10 +75,10 @@ SOURCE stifgridview.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib -LIBRARY CommonEngine.lib +LIBRARY commonengine.lib LIBRARY grid.lib LIBRARY cone.lib LIBRARY ws32.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/hierarchical_lists_api/inc/akntreelist.h --- a/classicui_pub/hierarchical_lists_api/inc/akntreelist.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/hierarchical_lists_api/inc/akntreelist.h Wed Oct 13 14:50:15 2010 +0300 @@ -931,16 +931,6 @@ */ IMPORT_C void SetMarkingModeObserver( MAknMarkingModeObserver* aObserver ); - /** - * Turns the marking mode on / off. - * - * @since S60 5.2 - * - * @param aEnable @c ETrue to turn marking mode on - * @c EFalse to turn marking mode off - */ - IMPORT_C void SetMarkingMode( TBool aEnable ); - // From base class CCoeControl /** diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/hierarchical_lists_api/tsrc/group/testsdkhierarchicallists.mmp --- a/classicui_pub/hierarchical_lists_api/tsrc/group/testsdkhierarchicallists.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/hierarchical_lists_api/tsrc/group/testsdkhierarchicallists.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -55,7 +55,7 @@ SOURCE testsdkhierarchicallistsordering.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY apparc.lib LIBRARY cone.lib @@ -63,13 +63,13 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY efsrv.lib LIBRARY aknhlist.lib LIBRARY aknicon.lib -LIBRARY aknskins.lib -LIBRARY aknskinsrv.lib +LIBRARY aknskins.lib +LIBRARY aknskinsrv.lib LIBRARY aknswallpaperutils.lib LANG SC diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/hotkeys_api/tsrc/group/testsdkeikhkeyt.mmp --- a/classicui_pub/hotkeys_api/tsrc/group/testsdkeikhkeyt.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/hotkeys_api/tsrc/group/testsdkeikhkeyt.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ SOURCE testsdkeikhkeytblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikcoctl.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/images_api/tsrc/group/testsdkimages.mmp --- a/classicui_pub/images_api/tsrc/group/testsdkimages.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/images_api/tsrc/group/testsdkimages.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ SOURCE testsdkimagesblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikcoctl.lib LIBRARY fbscli.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/indicators_api/tsrc/group/testsdkindicators.mmp --- a/classicui_pub/indicators_api/tsrc/group/testsdkindicators.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/indicators_api/tsrc/group/testsdkindicators.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ SOURCE testsdkindicatorsindicators.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY bafl.lib LIBRARY avkon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/info_popup_note_api/tsrc/group/testsdkinfopopupnote.mmp --- a/classicui_pub/info_popup_note_api/tsrc/group/testsdkinfopopupnote.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/info_popup_note_api/tsrc/group/testsdkinfopopupnote.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testsdkinfopopupnoteblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY bafl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/information_preview_popup_api/inc/AknPreviewPopUpController.h --- a/classicui_pub/information_preview_popup_api/inc/AknPreviewPopUpController.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/information_preview_popup_api/inc/AknPreviewPopUpController.h Wed Oct 13 14:50:15 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-2010 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" diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/information_preview_popup_api/tsrc/group/testsdkinformationpreviewpopup.mmp --- a/classicui_pub/information_preview_popup_api/tsrc/group/testsdkinformationpreviewpopup.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/information_preview_popup_api/tsrc/group/testsdkinformationpreviewpopup.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testsdkinformationpreviewpopupblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikcoctl.lib LIBRARY avkon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/initialization_api/tsrc/group/testsdkinitialization.mmp --- a/classicui_pub/initialization_api/tsrc/group/testsdkinitialization.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/initialization_api/tsrc/group/testsdkinitialization.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -51,7 +51,7 @@ SOURCE testsdkinitializationblocksco.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikcoctl.lib LIBRARY eikctl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/input_frame_api/tsrc/group/testsdkif.mmp --- a/classicui_pub/input_frame_api/tsrc/group/testsdkif.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/input_frame_api/tsrc/group/testsdkif.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -58,9 +58,9 @@ SOURCE testsdkifcontainer.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib -LIBRARY aknicon.lib +LIBRARY aknicon.lib LIBRARY avkon.lib LIBRARY eikcoctl.lib LIBRARY eikctl.lib @@ -70,8 +70,8 @@ LIBRARY egul.lib LIBRARY cone.lib LIBRARY bafl.lib -LIBRARY aknskins.lib -LIBRARY aknskinsrv.lib +LIBRARY aknskins.lib +LIBRARY aknskinsrv.lib LIBRARY aknswallpaperutils.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/keylock_api/tsrc/group/testsdkkeylock.mmp --- a/classicui_pub/keylock_api/tsrc/group/testsdkkeylock.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/keylock_api/tsrc/group/testsdkkeylock.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testsdkkeylockblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/labels_api/tsrc/group/testsdklabels.mmp --- a/classicui_pub/labels_api/tsrc/group/testsdklabels.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/labels_api/tsrc/group/testsdklabels.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -72,7 +72,7 @@ LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikcoctl.lib LIBRARY gdi.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/lists_api/inc/EIKLBO.H --- a/classicui_pub/lists_api/inc/EIKLBO.H Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/lists_api/inc/EIKLBO.H Wed Oct 13 14:50:15 2010 +0300 @@ -72,9 +72,7 @@ /** An empty listbox was clicked */ EEventEmptyListClicked, /** An empty area of non-empty listbox was clicked */ - EEventEmptyAreaClicked, - /** Item is long tapped in single click enabled list*/ - EEventItemLongTapped + EEventEmptyAreaClicked }; public: diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/lists_api/inc/EIKLBV.H --- a/classicui_pub/lists_api/inc/EIKLBV.H Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/lists_api/inc/EIKLBV.H Wed Oct 13 14:50:15 2010 +0300 @@ -858,20 +858,6 @@ * this class. */ void ClearSelection( TBool aDrawItems ); - - /** - * Sets all items selected. - * - * @param aDrawItems Whether or not to draw the items which are - * selected. - * - * @panic EEikPanicListBoxNoSelIndexArray Panics if selection indexes have - * not been defined for this class. - * - * @panic EEikPanicListBoxNoModel Panics if listbox model not existing. - * - */ - void SelectAllL( TBool aDrawItems ); protected: diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/lists_api/inc/EIKLBX.H --- a/classicui_pub/lists_api/inc/EIKLBX.H Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/lists_api/inc/EIKLBX.H Wed Oct 13 14:50:15 2010 +0300 @@ -1540,17 +1540,12 @@ IMPORT_C TBool IsHighlightEnabled(); /** - * Turns the marking mode on / off. - * States of navipane and softkeys are updated. + * Turns the marking mode on / off. * * @since S60 5.2 * - * @param aEnable @c ETrue to turn marking mode on, - * "marking mode" is shown in navipane, - * "Cancel" is shown in right softkey. - * @c EFalse to turn marking mode off, - * "marking mode" is not shown in navipane, - * "Back" or "exit" is shown in right softkey. + * @param aEnable @c ETrue to turn marking mode on + * @c EFalse to turn marking mode off */ IMPORT_C void SetMarkingMode( TBool aEnable ); diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/lists_api/tsrc/group/testsdklists.mmp --- a/classicui_pub/lists_api/tsrc/group/testsdklists.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/lists_api/tsrc/group/testsdklists.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -98,7 +98,7 @@ SOURCE testsdklistsblocksaknlists.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY eikctl.lib @@ -114,7 +114,7 @@ LIBRARY gdi.lib LIBRARY CommonEngine.lib LIBRARY bitgdi.lib -LIBRARY AknLayout2Scalable.lib +LIBRARY aknlayout2scalable.lib LIBRARY aknskins.lib LIBRARY aknskinsrv.lib LIBRARY aknswallpaperutils.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/misc_controls_api/tsrc/group/testsdkmisccontrols.mmp --- a/classicui_pub/misc_controls_api/tsrc/group/testsdkmisccontrols.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/misc_controls_api/tsrc/group/testsdkmisccontrols.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -73,7 +73,7 @@ SOURCE testsdkcapcsubprotectedclass.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY cone.lib LIBRARY eikcoctl.lib @@ -82,10 +82,10 @@ LIBRARY gdi.lib LIBRARY eikcore.lib LIBRARY avkon.lib -LIBRARY aknskins.lib -LIBRARY aknskinsrv.lib -LIBRARY aknswallpaperutils.lib -LIBRARY aknicon.lib +LIBRARY aknskins.lib +LIBRARY aknskinsrv.lib +LIBRARY aknswallpaperutils.lib +LIBRARY aknicon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/navigation_pane_api/tsrc/group/testsdknavipane.mmp --- a/classicui_pub/navigation_pane_api/tsrc/group/testsdknavipane.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/navigation_pane_api/tsrc/group/testsdknavipane.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -78,7 +78,7 @@ LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY bafl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/notes_api/inc/aknnotecontrol.h --- a/classicui_pub/notes_api/inc/aknnotecontrol.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/notes_api/inc/aknnotecontrol.h Wed Oct 13 14:50:15 2010 +0300 @@ -369,7 +369,7 @@ * @return Left index into table "Note With Image Popup Window * Texts Line 1". */ - TInt NWIPWindowTextsLine1Left(TInt aLineNum) const; + TInt NWIPWindowTextsLine1L(TInt aLineNum) const; /** * Return Right index into table "Note With Image Popup Window @@ -385,7 +385,7 @@ * @return Right index into table "Note With Image Popup Window * Texts Line 1". */ - TInt NWIPWindowTextsLine1Right(TInt aLineNum) const; + TInt NWIPWindowTextsLine1R(TInt aLineNum) const; /** * Return Bottom index into table "Note With Image Popup Window diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/notes_api/tsrc/group/testsdknotes.mmp --- a/classicui_pub/notes_api/tsrc/group/testsdknotes.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/notes_api/tsrc/group/testsdknotes.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -83,7 +83,7 @@ LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY eikcdlg.lib @@ -98,15 +98,15 @@ LIBRARY form.lib LIBRARY uiklaf.lib LIBRARY eikcore.lib -LIBRARY lbs.lib +LIBRARY Lbs.lib LIBRARY insock.lib LIBRARY fepbase.lib LIBRARY etext.lib LIBRARY field.lib LIBRARY efsrv.lib LIBRARY gdi.lib -LIBRARY aknskins.lib -LIBRARY aknskinsrv.lib +LIBRARY aknskins.lib +LIBRARY aknskinsrv.lib LIBRARY aknswallpaperutils.lib LIBRARY fbscli.lib LIBRARY print.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/notifiers_api/tsrc/group/testsdknotifiers.mmp --- a/classicui_pub/notifiers_api/tsrc/group/testsdknotifiers.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/notifiers_api/tsrc/group/testsdknotifiers.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -48,7 +48,7 @@ SOURCE activeexample.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eiksrv.lib LIBRARY aknnotify.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/options_menu_api/tsrc/group/testsdkoptionsmenu.mmp --- a/classicui_pub/options_menu_api/tsrc/group/testsdkoptionsmenu.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/options_menu_api/tsrc/group/testsdkoptionsmenu.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -66,17 +66,17 @@ SOURCE testoptionsmenu.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikcoctl.lib LIBRARY eikcore.lib LIBRARY egul.lib -LIBRARY aknicon.lib +LIBRARY aknicon.lib LIBRARY cone.lib LIBRARY avkon.lib LIBRARY apparc.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY efsrv.lib LIBRARY bafl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/popups_api/tsrc/group/testsdkpopups.mmp --- a/classicui_pub/popups_api/tsrc/group/testsdkpopups.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/popups_api/tsrc/group/testsdkpopups.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -78,7 +78,7 @@ SOURCE testsdkpopupsspsp.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY eikcoctl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/private_ui_framework_api/inc/EIKDPAGE.H --- a/classicui_pub/private_ui_framework_api/inc/EIKDPAGE.H Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/private_ui_framework_api/inc/EIKDPAGE.H Wed Oct 13 14:50:15 2010 +0300 @@ -408,7 +408,7 @@ public: TBool HitRegionContains( const TPoint& aPoint, const CCoeControl& aControl ) const; public: - void SetPageFormSized(const TRect& aRect); + void SetPageFormSized(); protected: // from CCoeControl virtual void SizeChanged(); virtual TInt CountComponentControls() const; diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/private_ui_framework_api/tsrc/group/testsdkprivateuiframework.mmp --- a/classicui_pub/private_ui_framework_api/tsrc/group/testsdkprivateuiframework.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/private_ui_framework_api/tsrc/group/testsdkprivateuiframework.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -50,7 +50,7 @@ LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikcoctl.lib LIBRARY eikcore.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/queries_api/tsrc/group/testsdkqueries.mmp --- a/classicui_pub/queries_api/tsrc/group/testsdkqueries.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/queries_api/tsrc/group/testsdkqueries.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -65,7 +65,7 @@ SOURCE testsdkaknquerydialogprotected.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY eikcoctl.lib @@ -75,7 +75,7 @@ LIBRARY bafl.lib LIBRARY aknicon.lib LIBRARY egul.lib -LIBRARY lbs.lib +LIBRARY Lbs.lib LIBRARY insock.lib LANG SC diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/screen_clearer_api/tsrc/group/testsdkscreenclearer.mmp --- a/classicui_pub/screen_clearer_api/tsrc/group/testsdkscreenclearer.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/screen_clearer_api/tsrc/group/testsdkscreenclearer.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -59,7 +59,7 @@ SOURCE testsdkscscreenclearerbase.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikctl.lib LIBRARY eikcoctl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/screen_mode_api/tsrc/group/testsdkscreenmode.mmp --- a/classicui_pub/screen_mode_api/tsrc/group/testsdkscreenmode.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/screen_mode_api/tsrc/group/testsdkscreenmode.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testsdkscreenmodeblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/screen_saver_api/tsrc/group/testsdkscreensaver.mmp --- a/classicui_pub/screen_saver_api/tsrc/group/testsdkscreensaver.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/screen_saver_api/tsrc/group/testsdkscreensaver.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -37,7 +37,7 @@ SOURCE testsdkscreensaverblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY ecom.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/scroller_api/tsrc/group/testsdkscroller.mmp --- a/classicui_pub/scroller_api/tsrc/group/testsdkscroller.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/scroller_api/tsrc/group/testsdkscroller.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -55,7 +55,7 @@ SOURCE testsdkscrollereikscrlb.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikcoctl.lib LIBRARY avkon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/searchfield_api/tsrc/group/testsdksearchfield.mmp --- a/classicui_pub/searchfield_api/tsrc/group/testsdksearchfield.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/searchfield_api/tsrc/group/testsdksearchfield.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -52,10 +52,10 @@ SOURCE testsdksfastobserver.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib -LIBRARY CommonEngine.lib +LIBRARY commonengine.lib LIBRARY cone.lib LIBRARY ws32.lib LIBRARY eikcore.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/server_application_api/tsrc/group/testsdkserverapplication.mmp --- a/classicui_pub/server_application_api/tsrc/group/testsdkserverapplication.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/server_application_api/tsrc/group/testsdkserverapplication.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -41,7 +41,7 @@ LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY apparc.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/setting_pages_api/tsrc/group/testsdksettingpages.mmp --- a/classicui_pub/setting_pages_api/tsrc/group/testsdksettingpages.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/setting_pages_api/tsrc/group/testsdksettingpages.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -86,7 +86,7 @@ SOURCE testaknradiobuttonsettingpageprotected.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY bafl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/slider_api/tsrc/group/testsdkslider.mmp --- a/classicui_pub/slider_api/tsrc/group/testsdkslider.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/slider_api/tsrc/group/testsdkslider.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ SOURCE testsdksliderview.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY bafl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/sounds_api/tsrc/group/testsdksounds.mmp --- a/classicui_pub/sounds_api/tsrc/group/testsdksounds.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/sounds_api/tsrc/group/testsdksounds.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -62,7 +62,7 @@ SOURCE testsdksoundsblocksaknsoundsystem.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY estor.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/status_pane_api/tsrc/group/testsdkstatuspane.mmp --- a/classicui_pub/status_pane_api/tsrc/group/testsdkstatuspane.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/status_pane_api/tsrc/group/testsdkstatuspane.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -55,7 +55,7 @@ SOURCE testsdkstatuspanevisitor.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikcoctl.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/stylus_popup_menu_api/inc/aknstyluspopupmenu.h --- a/classicui_pub/stylus_popup_menu_api/inc/aknstyluspopupmenu.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/stylus_popup_menu_api/inc/aknstyluspopupmenu.h Wed Oct 13 14:50:15 2010 +0300 @@ -178,14 +178,6 @@ * @since s60 v5.2 */ void Clear(); - - /** - * Hides the stylus popup menu. - * - * @internal - * @since S60 v5.2 - */ - void HideMenu(); // from base class CCoeControl @@ -252,12 +244,6 @@ */ static void CleanLocalRef( TAny* aParam ); - - /** - * Hide Preview Popups - */ - void HidePreviewPopup(); - private: // data /** diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/stylus_popup_menu_api/tsrc/group/testsdkstyluspopupmenu.mmp --- a/classicui_pub/stylus_popup_menu_api/tsrc/group/testsdkstyluspopupmenu.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/stylus_popup_menu_api/tsrc/group/testsdkstyluspopupmenu.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ SOURCE testsdkmenuobserver.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY eikcore.lib LIBRARY eikcoctl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tabs_api/inc/akntabgrp.h --- a/classicui_pub/tabs_api/inc/akntabgrp.h Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tabs_api/inc/akntabgrp.h Wed Oct 13 14:50:15 2010 +0300 @@ -355,16 +355,7 @@ void SizeChangedInNormalLayout(); void SizeChangedInFlatLayout(); void SizeChangedInNarrowLayout(); - - /** - * Sets the flag to indicate the highlight status - * - * @param aHighlight highlight status - * default is EFalse - */ - void SetHighlight(TBool aHighlight); - - + private: CEikLabel* iLabel; @@ -872,18 +863,6 @@ void SetNaviArrowsVisible( TBool aVisible ); private: - /** - * Resets the highlight status for tabs - */ - void ResetHighlightStatus(); - - /** - * Enable/Disable highlight effect - */ - void EnableHighlight( TBool aEnable, TInt aNewTab = -1 , TInt aPointX = -1 ); - - -private: CArrayPtr* iTabArray; TInt iActiveTab; TRect iSpareRect; diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tabs_api/tsrc/group/testsdktabgrp.mmp --- a/classicui_pub/tabs_api/tsrc/group/testsdktabgrp.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tabs_api/tsrc/group/testsdktabgrp.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -65,7 +65,7 @@ SOURCE testsdktabgrpcontrol.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY cone.lib LIBRARY avkon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/title_pane_api/tsrc/group/testsdktitlepane.mmp --- a/classicui_pub/title_pane_api/tsrc/group/testsdktitlepane.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/title_pane_api/tsrc/group/testsdktitlepane.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -68,7 +68,7 @@ LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY bafl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/toolbar_api/tsrc/group/testsdktoolbar.mmp --- a/classicui_pub/toolbar_api/tsrc/group/testsdktoolbar.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/toolbar_api/tsrc/group/testsdktoolbar.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -68,7 +68,7 @@ LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY eikcoctl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/touch_ui_utilities_api/tsrc/group/testsdktouchuiutil.mmp --- a/classicui_pub/touch_ui_utilities_api/tsrc/group/testsdktouchuiutil.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/touch_ui_utilities_api/tsrc/group/testsdktouchuiutil.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -52,7 +52,7 @@ LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestaknsound/group/bctestaknsound.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestaknsound/group/bctestaknsound.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestaknsound/group/bctestaknsound.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestappfrm/group/bctestappfrm.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestappfrm/group/bctestappfrm.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestappfrm/group/bctestappfrm.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -72,7 +72,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestbuttons/group/bctestbuttons.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestbuttons/group/bctestbuttons.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestbuttons/group/bctestbuttons.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestcmdlg/group/bctestcmdlg.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestcmdlg/group/bctestcmdlg.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestcmdlg/group/bctestcmdlg.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -69,7 +69,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestdocandinit/group/bctestDocAndInit.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestdocandinit/group/bctestDocAndInit.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestdocandinit/group/bctestDocAndInit.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,13 +63,13 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib LIBRARY commonui.lib LIBRARY apmime.lib -LIBRARY platformenv.lib +LIBRARY PlatformEnv.lib LIBRARY eikctl.lib LIBRARY sysutil.lib LIBRARY bafl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteditor/group/bctesteditor.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteditor/group/bctesteditor.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteditor/group/bctesteditor.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteh/group/bctesteh.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteh/group/bctesteh.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteh/group/bctesteh.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,12 +63,12 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib -LIBRARY commonui.lib -LIBRARY CommonEngine.lib +LIBRARY commonui.lib +LIBRARY commonengine.lib START RESOURCE ../group/bctesteh_reg.rss DEPENDS bctesteh.rsg diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteikbctrl/group/bctesteikbctrl.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteikbctrl/group/bctesteikbctrl.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteikbctrl/group/bctesteikbctrl.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ LIBRARY cone.lib LIBRARY eikcore.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteikfrm/group/bctesteikfrm.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteikfrm/group/bctesteikfrm.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteikfrm/group/bctesteikfrm.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -66,7 +66,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestfontinput/group/bctestfontinput.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestfontinput/group/bctestfontinput.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestfontinput/group/bctestfontinput.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,13 +64,13 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib LIBRARY fbscli.lib LIBRARY akninputlanguage.lib -LIBRARY fontutils.lib +LIBRARY fontutils.lib LIBRARY uiklaf.lib LIBRARY gdi.lib LIBRARY egul.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestform/group/bctestForm.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestform/group/bctestForm.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestform/group/bctestForm.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,11 +64,11 @@ LIBRARY aknnotify.lib LIBRARY bafl.lib LIBRARY bctestutil.lib -LIBRARY CommonEngine.lib -LIBRARY aknskins.lib +LIBRARY commonengine.lib +LIBRARY AknSkins.lib LIBRARY egul.lib -LIBRARY aknicon.lib -LIBRARY centralrepository.lib +LIBRARY AknIcon.lib +LIBRARY CentralRepository.lib // Changes for Scalable UI: // New registration resource defined. diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestgrids/group/bctestgrids.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestgrids/group/bctestgrids.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestgrids/group/bctestgrids.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -66,7 +66,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestimage/group/bctestimage.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestimage/group/bctestimage.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestimage/group/bctestimage.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestkeylock/group/bctestkeylock.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestkeylock/group/bctestkeylock.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestkeylock/group/bctestkeylock.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestlabelinfoindicators/group/bctestlabelinfoindicators.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestlabelinfoindicators/group/bctestlabelinfoindicators.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestlabelinfoindicators/group/bctestlabelinfoindicators.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,8 +57,8 @@ SYSTEMINCLUDE . /epoc32/include -LIBRARY aknicon.lib -LIBRARY aknskins.lib +LIBRARY AknIcon.lib +LIBRARY AknSkins.lib LIBRARY avkon.lib LIBRARY apparc.lib LIBRARY aknnotify.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestlist/group/bctestlist.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestlist/group/bctestlist.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestlist/group/bctestlist.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -75,8 +75,8 @@ LIBRARY eikctl.lib LIBRARY bafl.lib LIBRARY eikdlg.lib -LIBRARY aknskins.lib -LIBRARY aknicon.lib +LIBRARY AknSkins.lib +LIBRARY AknIcon.lib LIBRARY egul.lib LIBRARY gdi.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestmenu/group/bctestmenu.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestmenu/group/bctestmenu.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestmenu/group/bctestmenu.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestmisccontrol/group/bctestmisccontrol.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestmisccontrol/group/bctestmisccontrol.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestmisccontrol/group/bctestmisccontrol.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,8 +63,8 @@ SYSTEMINCLUDE . /epoc32/include -LIBRARY aknicon.lib -LIBRARY aknskins.lib +LIBRARY AknIcon.lib +LIBRARY AknSkins.lib LIBRARY avkon.lib LIBRARY apparc.lib LIBRARY aknnotify.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestnote/group/bctestnote.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestnote/group/bctestnote.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestnote/group/bctestnote.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -69,8 +69,8 @@ SYSTEMINCLUDE . /epoc32/include -LIBRARY aknicon.lib -LIBRARY aknskins.lib +LIBRARY AknIcon.lib +LIBRARY AknSkins.lib LIBRARY avkon.lib LIBRARY apparc.lib LIBRARY aknnotify.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestnotifier/group/bctestnotifier.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestnotifier/group/bctestnotifier.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestnotifier/group/bctestnotifier.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -66,12 +66,12 @@ LIBRARY insock.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib LIBRARY estor.lib -LIBRARY aknnotify.lib +LIBRARY AknNotify.lib LIBRARY bafl.lib // Changes for Scalable UI: diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestpane/group/bctestpane.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestpane/group/bctestpane.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestpane/group/bctestpane.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestpopups/group/bctestpopups.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestpopups/group/bctestpopups.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestpopups/group/bctestpopups.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,8 +63,8 @@ SYSTEMINCLUDE . /epoc32/include -LIBRARY aknicon.lib -LIBRARY aknskins.lib +LIBRARY AknIcon.lib +LIBRARY AknSkins.lib LIBRARY avkon.lib LIBRARY apparc.lib LIBRARY aknnotify.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestprivateuifrm/group/bctestprivateuifrm.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestprivateuifrm/group/bctestprivateuifrm.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestprivateuifrm/group/bctestprivateuifrm.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestptieng/group/bctestptieng.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestptieng/group/bctestptieng.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestptieng/group/bctestptieng.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -68,7 +68,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestquery/group/bctestquery.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestquery/group/bctestquery.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestquery/group/bctestquery.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -67,8 +67,8 @@ LIBRARY eikctl.lib LIBRARY bafl.lib LIBRARY eikdlg.lib -LIBRARY aknskins.lib -LIBRARY aknicon.lib +LIBRARY AknSkins.lib +LIBRARY AknIcon.lib LIBRARY egul.lib LIBRARY gdi.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestscreenclearer/group/bctestscreenclearer.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestscreenclearer/group/bctestscreenclearer.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestscreenclearer/group/bctestscreenclearer.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestscrollerbar/group/bctestscroller.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestscrollerbar/group/bctestscroller.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestscrollerbar/group/bctestscroller.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ LIBRARY avkon.lib LIBRARY eikcoctl.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsearchfield/group/bctestsearchfield.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsearchfield/group/bctestsearchfield.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsearchfield/group/bctestsearchfield.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestserverapp/group/bctestserverapp.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestserverapp/group/bctestserverapp.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestserverapp/group/bctestserverapp.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,11 +63,11 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib -LIBRARY aknskinsrv.lib +LIBRARY AknSkinSrv.lib START RESOURCE ../group/bctestserverapp_reg.rss DEPENDS bctestserverapp.rsg diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsettingpage/group/bctestsettingpage.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsettingpage/group/bctestsettingpage.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsettingpage/group/bctestsettingpage.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -74,7 +74,7 @@ LIBRARY insock.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestskins/group/bctestskins.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestskins/group/bctestskins.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestskins/group/bctestskins.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -67,7 +67,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsliderandicons/group/bctestsliderandicons.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsliderandicons/group/bctestsliderandicons.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsliderandicons/group/bctestsliderandicons.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestutilities/group/bctestutilities.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestutilities/group/bctestutilities.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestutilities/group/bctestutilities.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestvolume/group/bctestvolume.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestvolume/group/bctestvolume.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestvolume/group/bctestvolume.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -66,7 +66,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestlocation/group/bctestlocation.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestlocation/group/bctestlocation.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestlocation/group/bctestlocation.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,12 +63,12 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib LIBRARY eikctl.lib -LIBRARY lbs.lib +LIBRARY Lbs.lib START RESOURCE ../group/BCTestLocation_reg.rss DEPENDS bctestlocation.rsg diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestmisc/group/bctestmisc.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestmisc/group/bctestmisc.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestmisc/group/bctestmisc.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestocr/group/bctestocr.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestocr/group/bctestocr.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestocr/group/bctestocr.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -58,8 +58,8 @@ SYSTEMINCLUDE . /epoc32/include -LIBRARY aknicon.lib -LIBRARY aknskins.lib +LIBRARY AknIcon.lib +LIBRARY AknSkins.lib LIBRARY avkon.lib LIBRARY apparc.lib LIBRARY bafl.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestlocalizer/group/bctestlocalizer.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestlocalizer/group/bctestlocalizer.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestlocalizer/group/bctestlocalizer.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestmisc32/group/bctestmisc32.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestmisc32/group/bctestmisc32.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestmisc32/group/bctestmisc32.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestpreviewpopup/group/bctestpreviewpopup.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestpreviewpopup/group/bctestpreviewpopup.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestpreviewpopup/group/bctestpreviewpopup.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestservicehandler/group/bctestservicehandler.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestservicehandler/group/bctestservicehandler.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestservicehandler/group/bctestservicehandler.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -65,7 +65,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestuniteditor/group/bctestuniteditor.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestuniteditor/group/bctestuniteditor.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestuniteditor/group/bctestuniteditor.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestbutton/group/bctestbutton.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestbutton/group/bctestbutton.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestbutton/group/bctestbutton.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestchoicelist/group/bctestchoicelist.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestchoicelist/group/bctestchoicelist.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestchoicelist/group/bctestchoicelist.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestpane/group/bctestpane.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestpane/group/bctestpane.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestpane/group/bctestpane.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttoolbar/group/bctesttoolbar.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttoolbar/group/bctesttoolbar.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttoolbar/group/bctesttoolbar.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -65,7 +65,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttouchpane/group/bctesttouchpane.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttouchpane/group/bctesttouchpane.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttouchpane/group/bctesttouchpane.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttreelist/group/bctesttreelist.mmp --- a/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttreelist/group/bctesttreelist.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttreelist/group/bctesttreelist.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/bctestlauncher/group/bctestlauncher.mmp --- a/classicui_pub/tsrc/bc/apps/bctestlauncher/group/bctestlauncher.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/bctestlauncher/group/bctestlauncher.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,17 +64,17 @@ -LIBRARY euser.lib -LIBRARY ws32.lib -LIBRARY cone.lib -LIBRARY eikcore.lib -LIBRARY avkon.lib -LIBRARY apparc.lib +LIBRARY EUSER.LIB +LIBRARY WS32.LIB +LIBRARY CONE.LIB +LIBRARY EIKCORE.LIB +LIBRARY AVKON.LIB +LIBRARY APPARC.LIB LIBRARY eikcoctl.lib LIBRARY efsrv.lib LIBRARY apgrfx.lib -LIBRARY CommonEngine.lib -LIBRARY centralrepository.lib +LIBRARY commonengine.lib +LIBRARY CentralRepository.lib LIBRARY bafl.lib LIBRARY sysutil.lib LIBRARY estor.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/bctesttemplate/group/bctesttemplate.mmp --- a/classicui_pub/tsrc/bc/apps/bctesttemplate/group/bctesttemplate.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/bctesttemplate/group/bctesttemplate.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/tsrc/bc/apps/bctestutil/group/bctestutil.mmp --- a/classicui_pub/tsrc/bc/apps/bctestutil/group/bctestutil.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/tsrc/bc/apps/bctestutil/group/bctestutil.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,9 +49,9 @@ LIBRARY cone.lib LIBRARY eikcore.lib LIBRARY aknnotify.lib -LIBRARY CommonEngine.lib +LIBRARY commonengine.lib LIBRARY avkon.lib -LIBRARY centralrepository.lib +LIBRARY CentralRepository.lib LIBRARY sysutil.lib LIBRARY estor.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/ui_framework_definitions_api/inc/EIKON.HRH --- a/classicui_pub/ui_framework_definitions_api/inc/EIKON.HRH Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/ui_framework_definitions_api/inc/EIKON.HRH Wed Oct 13 14:50:15 2010 +0300 @@ -60,11 +60,9 @@ #define EEikCbaFlagSemiTransparent 0x100 /** - * Button group app msk icon flag,also support msk label. - * This flag can be set with CBA resource - * or by using CEikCba::SetButtonGroupFlags(TInt) method. - * CBA using control_pane_g4(0) to draw the window rect. - * Use the CEikCba::UpdateIconL() to set the msk icon or show the msk label. + * Button group app msk icon flag. This flag can be set with CBA resource + * or by using CEikCba::SetButtonGroupFlags(TInt) method. CBA using + * control_pane_g4(0) to draw the window rect */ #define EEikCbaFlagAppMskIcon 0x200 // EIKBUTB.HRH @@ -224,10 +222,6 @@ #define EAknEditorFlagHideTextView 0x800000 #define EAknEditorFlagCursorLedingEdge 0x1000000 #define EAknEditorFlagNeedWholeTextData 0x2000000 -// Avkon secret editor and web secret editor has different behavior, this flag -// is used to distinguish them for FEP -#define EAknEditorFlagAvkonSecretEditor 0x4000000 - // NOTICE! Flag value 0x80000000 is reserved for internal use by FEP. // EIKLABEL.HRH diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/ui_framework_definitions_api/inc/avkon.hrh --- a/classicui_pub/ui_framework_definitions_api/inc/avkon.hrh Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/ui_framework_definitions_api/inc/avkon.hrh Wed Oct 13 14:50:15 2010 +0300 @@ -400,12 +400,6 @@ EPeninputCmdLandscapeEditor, /** - * Command id for find pane to hide adaptive search grid - * - */ - EAknCmdHideASGrid, - - /** * @deprecated * Do not use. */ @@ -1312,16 +1306,7 @@ EAknSignalHsdpaIndicatorEstablishingContext, EAknSignalHsdpaIndicatorContext, EAknSignalHsdpaIndicatorSuspended, - EAknSignalHsdpaIndicatorMultipdp, - - // UMA indicator states - EAknSignalUmaIndicatorOff = 0x600, - EAknSignalUmaIndicatorAvailable, - EAknSignalUmaIndicatorAttached, - EAknSignalUmaIndicatorEstablishingContext, - EAknSignalUmaIndicatorContext, - EAknSignalUmaIndicatorSuspended, - EAknSignalUmaIndicatorMultipdp + EAknSignalHsdpaIndicatorMultipdp }; #define KAknSignalOffLineMode 0x00010000 diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/ui_framework_definitions_api/tsrc/group/testsdkuiframedefinitions.mmp --- a/classicui_pub/ui_framework_definitions_api/tsrc/group/testsdkuiframedefinitions.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/ui_framework_definitions_api/tsrc/group/testsdkuiframedefinitions.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testsdkuiframedefinitionsblocks.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/ui_framework_utilities_api/tsrc/group/testsdkuifwutil.mmp --- a/classicui_pub/ui_framework_utilities_api/tsrc/group/testsdkuifwutil.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/ui_framework_utilities_api/tsrc/group/testsdkuifwutil.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ SOURCE testsdkuifwutilview.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY cone.lib LIBRARY avkon.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/uikon_core_controls/tsrc/group/testsdkuikoncc.mmp --- a/classicui_pub/uikon_core_controls/tsrc/group/testsdkuikoncc.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/uikon_core_controls/tsrc/group/testsdkuikoncc.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -62,7 +62,7 @@ SOURCE testsdkuikonccobserver.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY eikcore.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/volume_control_api/tsrc/group/testsdkvolumecontrol.mmp --- a/classicui_pub/volume_control_api/tsrc/group/testsdkvolumecontrol.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/volume_control_api/tsrc/group/testsdkvolumecontrol.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ SOURCE testsdkvolumecontainer.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 classicui_pub/window_server_event_observer_api/tsrc/group/testsdkwinsereventobserver.mmp --- a/classicui_pub/window_server_event_observer_api/tsrc/group/testsdkwinsereventobserver.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/classicui_pub/window_server_event_observer_api/tsrc/group/testsdkwinsereventobserver.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -50,7 +50,7 @@ SOURCE testsdkeventobserver.cpp LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY bafl.lib diff -r 85902f042028 -r a5e7a4f63858 commonuis/CommonDialogs/group/CommonDialogs.mmp --- a/commonuis/CommonDialogs/group/CommonDialogs.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/commonuis/CommonDialogs/group/CommonDialogs.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -91,18 +91,18 @@ LIBRARY eikcore.lib LIBRARY eikdlg.lib LIBRARY avkon.lib -LIBRARY CommonEngine.lib // StringLoader +LIBRARY commonengine.lib // StringLoader LIBRARY apparc.lib LIBRARY directorylocalizer.lib // Build this first! LIBRARY featmgr.lib // Feature manager -LIBRARY aknskins.lib // Skins +LIBRARY AknSkins.lib // Skins LIBRARY egul.lib // CGulIcon LIBRARY apgrfx.lib // CApaMaskedBitmap,RApaLsSession LIBRARY apmime.lib // TDataType LIBRARY fbscli.lib // CFbsBitmap LIBRARY aknmemorycardui.lib LIBRARY platformenv.lib // PathInfo -LIBRARY aknicon.lib +LIBRARY AknIcon.lib LIBRARY rsfwmountman.lib //#include "CommonDialogsMbm.inc" diff -r 85902f042028 -r a5e7a4f63858 commonuis/CommonDialogs/group_test/CommonDialogs.mmp --- a/commonuis/CommonDialogs/group_test/CommonDialogs.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/commonuis/CommonDialogs/group_test/CommonDialogs.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -87,18 +87,18 @@ LIBRARY eikcore.lib LIBRARY eikdlg.lib LIBRARY avkon.lib -LIBRARY CommonEngine.lib // StringLoader +LIBRARY commonengine.lib // StringLoader LIBRARY apparc.lib LIBRARY directorylocalizer.lib // Build this first! LIBRARY featmgr.lib // Feature manager -LIBRARY aknskins.lib // Skins +LIBRARY AknSkins.lib // Skins LIBRARY egul.lib // CGulIcon LIBRARY apgrfx.lib // CApaMaskedBitmap,RApaLsSession LIBRARY apmime.lib // TDataType LIBRARY fbscli.lib // CFbsBitmap LIBRARY aknmemorycardui.lib LIBRARY platformenv.lib // PathInfo -LIBRARY aknicon.lib +LIBRARY AknIcon.lib //#include "CommonDialogsMbm.inc" diff -r 85902f042028 -r a5e7a4f63858 commonuis/CommonDialogs/src/AknCFDUtility.cpp --- a/commonuis/CommonDialogs/src/AknCFDUtility.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/commonuis/CommonDialogs/src/AknCFDUtility.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -795,21 +795,24 @@ if (( aFreeSpace >= KHundredNum ) && ( aFreeSpace < KMegaNum )) { - tempNum /= TReal64( KThousandNum ); // Divide to kilobytes + tempNum /= KThousandNum; // Divide to kilobytes + tempNum = TReal32( TInt( tempNum * 10 ) ) / 10; unitBuf = StringLoader::LoadLC( R_CFD_QTN_MEMC_UNITS_KILOBYTE, CCoeEnv::Static()); } else if (( aFreeSpace >= KMegaNum ) && ( aFreeSpace < KGigaNum )) { - tempNum /= TReal64( KMegaNum ); // Divide to Megabytes + tempNum /= KMegaNum; // Divide to Megabytes + tempNum = TReal32( TInt( tempNum * 10 ) ) / 10; unitBuf = StringLoader::LoadLC( R_CFD_QTN_MEMC_UNITS_MEGABYTE, CCoeEnv::Static()); } else if (aFreeSpace >= KGigaNum ) { - tempNum /= TReal64( KGigaNum ); // Divide to Gigabytes + tempNum /= KGigaNum; // Divide to Gigabytes + tempNum = TReal32( TInt( tempNum * 10 ) ) / 10; unitBuf = StringLoader::LoadLC( R_CFD_QTN_MEMC_UNITS_GIGABYTE, CCoeEnv::Static()); diff -r 85902f042028 -r a5e7a4f63858 commonuis/CommonUi/CenRep/keys_commonui.xls Binary file commonuis/CommonUi/CenRep/keys_commonui.xls has changed diff -r 85902f042028 -r a5e7a4f63858 commonuis/CommonUi/EABI/CommonUIU.DEF --- a/commonuis/CommonUi/EABI/CommonUIU.DEF Wed Sep 15 12:29:17 2010 +0300 +++ b/commonuis/CommonUi/EABI/CommonUIU.DEF Wed Oct 13 14:50:15 2010 +0300 @@ -121,6 +121,4 @@ _ZN12MPBAiwNotify13HandleNotifyLEiiR20CAiwGenericParamListRKS0_ @ 120 NONAME _ZN11CItemFinder22SetItemFinderObserverLEP22MAknItemFinderObserver @ 121 NONAME _ZN15CFindItemDialog17EnableSingleClickEi @ 122 NONAME - _ZN13CFindItemMenu24SetCallSubMenuVisibilityEi @ 123 NONAME - _ZN15CFindItemDialog24SetCallSubMenuVisibilityEi @ 124 NONAME diff -r 85902f042028 -r a5e7a4f63858 commonuis/CommonUi/bwins/CommonUIU.def --- a/commonuis/CommonUi/bwins/CommonUIU.def Wed Sep 15 12:29:17 2010 +0300 +++ b/commonuis/CommonUi/bwins/CommonUIU.def Wed Oct 13 14:50:15 2010 +0300 @@ -91,6 +91,4 @@ ?HandleNotifyL@MPBAiwNotify@@UAEHHHAAVCAiwGenericParamList@@ABV2@@Z @ 90 NONAME ; int MPBAiwNotify::HandleNotifyL(int, int, class CAiwGenericParamList &, class CAiwGenericParamList const &) ?SetItemFinderObserverL@CItemFinder@@QAEXPAVMAknItemFinderObserver@@@Z @ 91 NONAME ; void CItemFinder::SetItemFinderObserverL(class MAknItemFinderObserver *) ?EnableSingleClick@CFindItemDialog@@QAEXH@Z @ 92 NONAME ; void CFindItemDialog::EnableSingleClick(int) - ?SetCallSubMenuVisibility@CFindItemMenu@@QAEXH@Z @ 93 NONAME ; void CFindItemMenu::SetCallSubMenuVisibility(int) - ?SetCallSubMenuVisibility@CFindItemDialog@@QAEXH@Z @ 94 NONAME ; void CFindItemDialog::SetCallSubMenuVisibility(int) diff -r 85902f042028 -r a5e7a4f63858 commonuis/CommonUi/group/CommonUI.mmp --- a/commonuis/CommonUi/group/CommonUI.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/commonuis/CommonUi/group/CommonUI.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -96,31 +96,31 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY eikdlg.lib -LIBRARY servicehandler.lib -LIBRARY CdlEngine.lib +LIBRARY ServiceHandler.lib +LIBRARY cdlengine.lib LIBRARY ecom.lib LIBRARY CommonEngine.lib // For class Stringloader, etc. LIBRARY apgrfx.lib // For class RApaLsSession, class TApaTask -LIBRARY featmgr.lib // For class FeatureManager +LIBRARY FeatMgr.lib // For class FeatureManager #ifdef __SERIES60_MMC -LIBRARY commondialogs.lib +LIBRARY CommonDialogs.lib #endif // FindUI LIBRARY etext.lib // For class CPlainText, class TCharFormat LIBRARY form.lib // For class CTextLayout LIBRARY eikctl.lib // For class CRichText -LIBRARY favouritesengine.lib // For class CFavouritesItem, etc. +LIBRARY FavouritesEngine.lib // For class CFavouritesItem, etc. LIBRARY sendui.lib // For class CSendUi, class CMessageData #ifndef RD_VIRTUAL_PHONEBOOK -LIBRARY pbkview.lib // For class RPbkViewResourceFile, class CPbkDataSaveAppUi -LIBRARY pbkeng.lib // For class CPbkContactEngine, class CPbkFieldInfo +LIBRARY PbkView.lib // For class RPbkViewResourceFile, class CPbkDataSaveAppUi +LIBRARY PbkEng.lib // For class CPbkContactEngine, class CPbkFieldInfo #endif // !RD_VIRTUAL_PHONEBOOK -LIBRARY centralrepository.lib // For class CRepository -LIBRARY cenrepnotifhandler.lib // For CRepository things +LIBRARY CentralRepository.lib // For class CRepository +LIBRARY CenRepNotifHandler.lib // For CRepository things #ifdef __VOIP #ifndef RD_VOIP_REL_2_2 -LIBRARY rcse.lib +LIBRARY RCSE.lib #else // RD_VOIP_REL_2_2 LIBRARY serviceprovidersettings.lib #endif // !RD_VOIP_REL_2_2 @@ -131,14 +131,14 @@ LIBRARY efsrv.lib // For file handling operations LIBRARY apparc.lib // For Application lauching LIBRARY apmime.lib // For mime type handling (class TDataType) -LIBRARY sysutil.lib // For checking the filesystem space +LIBRARY SysUtil.lib // For checking the filesystem space LIBRARY estor.lib // For class RDesReadStream in GameHandler -LIBRARY platformenv.lib // For finding correct paths for files (class PathInfo) +LIBRARY PlatformEnv.lib // For finding correct paths for files (class PathInfo) #ifdef RD_CONTENTNOTIFICATION LIBRARY contentnotification.lib // For notifying Media Gallery about new content. #endif -LIBRARY swinstcli.lib // For Application installer launching -LIBRARY charconv.lib // For class CCnvCharacterSetConverter +LIBRARY SWInstCli.lib // For Application installer launching +LIBRARY CharConv.lib // For class CCnvCharacterSetConverter #ifdef __DRM LIBRARY DRMCommon.lib LIBRARY DcfRep.lib @@ -150,7 +150,7 @@ LIBRARY aknnotify.lib // For Global note (class CAknGlobalNote) LIBRARY aknskins.lib // Skins support -LIBRARY egul.lib +LIBRARY EGUL.LIB #ifdef __KEEP_DRM_CONTENT_ON_PHONE LIBRARY distributablechecker.lib // generic API for determining if content is protected diff -r 85902f042028 -r a5e7a4f63858 commonuis/CommonUi/src/FindItemDialog.cpp --- a/commonuis/CommonUi/src/FindItemDialog.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/commonuis/CommonUi/src/FindItemDialog.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -991,42 +991,10 @@ } // Phone number cmds case EFindItemCmdCall: - { - if ( !iHideCallSubMenu ) - { // bit awkward but correct functionality provided. - TKeyEvent keyEvent; - keyEvent.iCode = EKeyPhoneSend; - OfferKeyEventL( keyEvent, EEventKey ); - } - else - { - if ( !iDialData ) - { - break; - } - FormatDialDataL( aCommandId ); - - CAiwGenericParamList& paramList = - iServiceHandler->InParamListL(); - - if ( iFindItemVoIPExtension->VoIPProfilesExistL() && - ( iSearchCase == - CFindItemEngine::EFindItemSearchMailAddressBin || - iSearchCase == KSearchTelInternetNumber ) ) - { - //voip - iDialData->SetCallType( CAiwDialData::EAIWVoiP ); - } - - iDialData->FillInParamListL( paramList ); - - iServiceHandler->ExecuteServiceCmdL( - KAiwCmdCall, - paramList, - iServiceHandler->OutParamListL(), - 0, // No options used. - NULL ); // Dial results are not wanted. - } + { // bit awkward but correct functionality provided. + TKeyEvent keyEvent; + keyEvent.iCode = EKeyPhoneSend; + OfferKeyEventL( keyEvent, EEventKey ); break; } // fix for FAMZ-7JVQ4Y @@ -1309,7 +1277,7 @@ } else if ( iSearchCase & CFindItemEngine::EFindItemSearchPhoneNumberBin && - !iHideCallMenu && !iHideCallSubMenu ) + !iHideCallMenu ) { aMenuPane->SetItemDimmed( EFindItemCmdCall, ETrue ); aMenuPane->AddMenuItemsL( @@ -1373,18 +1341,6 @@ } } - -// ----------------------------------------------------------------------------- -// CFindItemDialog::SetCallSubMenuVisibility -// Sets AIW submenu visibility -// ----------------------------------------------------------------------------- -// -EXPORT_C void CFindItemDialog::SetCallSubMenuVisibility( TBool aVisible ) - { - iHideCallSubMenu = !aVisible; - } - - // ----------------------------------------------------------------------------- // CFindItemDialog::OfferKeyEventL // Handles key events diff -r 85902f042028 -r a5e7a4f63858 commonuis/CommonUi/src/FindItemMenu.cpp --- a/commonuis/CommonUi/src/FindItemMenu.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/commonuis/CommonUi/src/FindItemMenu.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -623,6 +623,7 @@ tempBuf); index = EFindItemCmdGoToUrl; + // Add bookmark iCoeEnv->ReadResourceL( tempBuf, R_FINDITEMMENU_ADD_BOOKMARK ); @@ -633,7 +634,7 @@ 0, tempBuf ); index = EFindItemCmdAddToBookmark; - + } else { @@ -645,6 +646,7 @@ tempBuf ); index = EFindItemCmdGoToRstp; + iCoeEnv->ReadResourceL( tempBuf, R_FINDITEMMENU_ADD_TO_GALLERY ); AddMenuItemL( @@ -654,7 +656,7 @@ 0, tempBuf ); index = EFindItemCmdAddToGallery; - + } break; } @@ -882,69 +884,20 @@ // Replace cmd call with AIW menu if more than one option available in AIW // menu // Note: count of VoIP profiles is not static. If phone contains VoIP - // profiles there must be Internet call command in call submenu. - // No context sensitive menu now. And new requirement is to show - // call menu for normal item and voip menu for sip address if voip is enabled. + // profiles there must be Internet call command in call submenu. TInt dummy = 0; - if ( itemType == CItemFinder::EEmailAddress && - iFindItemVoIPExtension->IsVoIPSupported() && - iFindItemVoIPExtension->VoIPProfilesExistL() && - iMenuPane->MenuItemExists( EFindItemCmdCall, dummy ) && - !( iMenuItemFlags & CFindItemMenu::ECallItem ) - ) - { - // CMyMenuPane is used only to get the aiw menu item - // for sip address, as it is an argument of the InitializeMenuPaneL - CMyMenuPane* aiwVoipMenu = - new ( ELeave ) CMyMenuPane( ( MEikMenuObserver* )this ); // not used really - CleanupStack::PushL( aiwVoipMenu ); - TResourceReader callUiReader; - iCoeEnv->CreateResourceReaderLC( - callUiReader, R_FINDMENU_CALLUI_AIW_SUBMENU ); - aiwVoipMenu->ConstructFromResourceL( callUiReader ); - CleanupStack::PopAndDestroy(); // callUiReader - - CAiwGenericParamList* inList = CAiwGenericParamList::NewLC(); - - // For SIP Address, use sip parameters - TAiwGenericParam param( EGenericParamSIPAddress ); - - // get the aiw menu item for sip address - inList->AppendL( param ); - iServiceHandler->InitializeMenuPaneL( - *( CEikMenuPane* )aiwVoipMenu, - R_FINDMENU_CALLUI_AIW_SUBMENU, - EFindMenuPlaceHolderCallUI, - *inList ); - - // Add all the menus for aiw to context main menu now. - for ( TInt i = 0; i < aiwVoipMenu->NumberOfItemsInPane(); i++ ) - { - iMenuPane->AddMenuItemL( aiwVoipMenu->ItemDataByIndexL( i ), EFindItemCmdCall ); - } - - // Now options of VOIP call and voice call are exclusive. - // For email( sip ) address, voip is used. So set the call - // menu to dimmed. + if ( ( !iHideCallMenu || + ( iFindItemVoIPExtension->IsVoIPSupported() && + iFindItemVoIPExtension->VoIPProfilesExistL() ) ) && + iMenuPane->MenuItemExists( EFindItemCmdCall, dummy ) ) + { iMenuPane->SetItemDimmed( EFindItemCmdCall, ETrue ); - - CleanupStack::PopAndDestroy( inList ); - CleanupStack::PopAndDestroy( aiwVoipMenu ); + iMenuPane->AddMenuItemsL( + R_FINDMENU_CALLUI_AIW_ITEM, + EFindItemCmdCall ); } } - -// ----------------------------------------------------------------------------- -// CFindItemMenu::SetCallSubMenuVisibility -// Sets AIW submenu visibility -// ----------------------------------------------------------------------------- -// -EXPORT_C void CFindItemMenu::SetCallSubMenuVisibility( TBool aVisible ) - { - iHideCallSubMenu = !aVisible; - } - - EXPORT_C void CFindItemMenu::HandleItemFinderCommandL( TInt aCommand ) { switch ( aCommand ) @@ -968,7 +921,7 @@ #ifndef RD_UNIFIED_EDITOR if ( !iEmailOverSmsFeatureSupported ) { - mtmFilter->AppendL(KSenduiMtmSmsUid); + mtmFilter->AppendL(KSenduiMtmSmsUid); } // Hide MMS if not supported if (!iMMSFeatureSupported) @@ -980,7 +933,7 @@ // Hide E-Mail if nosupported or phonenumber if ( !iEmailUiFeatureSupported || itemType == CItemFinder::EPhoneNumber ) { - mtmFilter->AppendL(KSenduiMtmSmtpUid); + mtmFilter->AppendL(KSenduiMtmSmtpUid); mtmFilter->AppendL(KSenduiMtmImap4Uid); mtmFilter->AppendL(KSenduiMtmPop3Uid); mtmFilter->AppendL(KSenduiMtmSyncMLEmailUid); @@ -988,7 +941,7 @@ // Hide Audio if not supported or E-mail address if( !iAudioMessagingFeatureSupported || itemType == CItemFinder::EEmailAddress) { - mtmFilter->AppendL(KSenduiMtmAudioMessageUid); + mtmFilter->AppendL(KSenduiMtmAudioMessageUid); } TUid uid = iSendUi->ShowTypedQueryL( CSendUi::EWriteMenu, NULL, sendingCapabilities, mtmFilter ); @@ -1338,7 +1291,7 @@ else if ( itemType == CItemFinder::EEmailAddress && ( fieldInfo->FieldId() == EPbkFieldIdEmailAddress || #ifdef __VOIP - iFindItemVoIPExtension->IsVoIPSupported() && + iFindItemVoIPExtension->IsVoIPSupported() && #else iVoIPFeatureSupported && #endif @@ -1597,18 +1550,6 @@ // sets call type for VoIP iDialData->SetCallType( CAiwDialData::EAIWVoiP ); } - else - { - // sets call type for call, as now only voice call - // exists in menu now. - iDialData->SetCallType( CAiwDialData::EAIWVoice ); - } - } - else - { - // sets call type for call, as now only voice call - // exists in menu now. - iDialData->SetCallType( CAiwDialData::EAIWVoice ); } #endif // RD_VOIP_REL_2_2 iDialData->SetPhoneNumberL( numberPtr ); diff -r 85902f042028 -r a5e7a4f63858 commonuis/CommonUi/src/ItemFinder.cpp --- a/commonuis/CommonUi/src/ItemFinder.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/commonuis/CommonUi/src/ItemFinder.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -38,7 +38,6 @@ #include #include -#include // CONSTANTS const TInt KMINTAGLENGTH(5); @@ -144,38 +143,7 @@ void CItemFinderAsyncParser::RunL() { TInt fullLength = Min( iEditor->TextLength(), 0xffff ); - if ( fullLength <= 0 ) - { - return; - } - // If editor enables smiley feature, then smiley string shouldn't be included - // in the search string. Normally a smiley string comprises 3 parts: a smiley code, - // a smiley compensating character to expand smiley icon area, and several invisible - // smiley placeholder characters if the length of the smiley string is longer than 2 - // characters. Since smiley codes are in reserved Unicode range and smiley placeholder - // is 0xfff0, they won't be counted in search string, but the compensating character - // is a valid english character so it needs to be replaced with smiley placeholder - // otherwise it will mess the search string. - HBufC* textBuf( iEditor->Text()->Read( 0, fullLength ).Alloc() ); - if( !textBuf ) - { - return; - } - CleanupStack::PushL( textBuf ); - TPtr text( textBuf->Des() ); - for ( TInt i( 0 ); i < fullLength; i++ ) - { - // Check if current character is a smiley code, if so, the character - // following the code is a smiley compensating character and it needs to - // be replaced. - if ( text[i] >= CAknSmileyManager::KSmileyCodeMin && - text[i] <= CAknSmileyManager::KSmileyCodeMax && - ( i + 1 < fullLength ) ) - { - i++; - text[i] = CAknSmileyManager::KPlaceHolder; - } - } + const TDesC& text = iEditor->Text()->Read( 0, fullLength ); TInt searchAll = CFindItemEngine::EFindItemSearchURLBin |CFindItemEngine::EFindItemSearchMailAddressBin |CFindItemEngine::EFindItemSearchPhoneNumberBin @@ -188,7 +156,6 @@ { iFIE->DoNewSearchL( text, (CFindItemEngine::TFindItemSearchCase)searchAll, iMinDigitsToFind ); } - CleanupStack::PopAndDestroy( textBuf ); delete iMarkedItems; iMarkedItems = 0; iMarkedItems = new ( ELeave ) CArrayPtrFlat( 10 ); diff -r 85902f042028 -r a5e7a4f63858 commonuisupport/uikon/group/BLD.INF --- a/commonuisupport/uikon/group/BLD.INF Wed Sep 15 12:29:17 2010 +0300 +++ b/commonuisupport/uikon/group/BLD.INF Wed Oct 13 14:50:15 2010 +0300 @@ -20,7 +20,7 @@ */ // include test code -#include "../test/group/bld.inf" +#include "../test/group/BLD.INF" PRJ_EXPORTS // specify the source file followed by its destination here diff -r 85902f042028 -r a5e7a4f63858 psln/Group/Psln.mmp --- a/psln/Group/Psln.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/psln/Group/Psln.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -99,13 +99,13 @@ LIBRARY mgfetch.lib LIBRARY aknskinsrv.lib LIBRARY aknskins.lib -LIBRARY CommonEngine.lib +LIBRARY commonengine.lib LIBRARY aknnotify.lib LIBRARY hlplch.lib -LIBRARY DrmHelper.lib +LIBRARY drmhelper.lib LIBRARY pslnengine.lib LIBRARY pslnframework.lib -LIBRARY CdlEngine.lib +LIBRARY cdlengine.lib LIBRARY aknicon.lib LIBRARY ecom.lib LIBRARY centralrepository.lib diff -r 85902f042028 -r a5e7a4f63858 psln/Inc/PslnScreenSaverView.h --- a/psln/Inc/PslnScreenSaverView.h Wed Sep 15 12:29:17 2010 +0300 +++ b/psln/Inc/PslnScreenSaverView.h Wed Oct 13 14:50:15 2010 +0300 @@ -294,11 +294,6 @@ */ CCenRepNotifyHandler* iScreenSaverNotifier; CPsmClient *iPsmClient; - - /** - * Ture if screensaver is being previewed. - */ - TBool iScreenSaverPreviewing; }; diff -r 85902f042028 -r a5e7a4f63858 psln/PslnFramework/PslnFramework.mmp --- a/psln/PslnFramework/PslnFramework.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/psln/PslnFramework/PslnFramework.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ LIBRARY apparc.lib LIBRARY avkon.lib LIBRARY bafl.lib -LIBRARY CommonEngine.lib // for RConeResourceLoader +LIBRARY commonengine.lib // for RConeResourceLoader LIBRARY cone.lib LIBRARY ecom.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 psln/PslnGSPlugin/group/PslnGSPlugin.mmp --- a/psln/PslnGSPlugin/group/PslnGSPlugin.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/psln/PslnGSPlugin/group/PslnGSPlugin.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -56,15 +56,15 @@ LIBRARY apparc.lib LIBRARY avkon.lib LIBRARY bafl.lib -LIBRARY CommonEngine.lib +LIBRARY commonengine.lib LIBRARY cone.lib LIBRARY ecom.lib LIBRARY efsrv.lib LIBRARY eikcoctl.lib LIBRARY eikcore.lib LIBRARY euser.lib -LIBRARY gsecomplugin.lib -LIBRARY gsframework.lib +LIBRARY GSEcomPlugin.lib +LIBRARY GSFramework.lib LIBRARY ws32.lib // End of File diff -r 85902f042028 -r a5e7a4f63858 psln/PslnLibraryLoaders/group/pslnprofilesettingsloader.mmp --- a/psln/PslnLibraryLoaders/group/pslnprofilesettingsloader.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/psln/PslnLibraryLoaders/group/pslnprofilesettingsloader.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -38,9 +38,9 @@ APP_LAYER_SYSTEMINCLUDE LIBRARY euser.lib -LIBRARY ProfileEngine.lib -LIBRARY profileeng.lib -LIBRARY DrmHelper.lib +LIBRARY profileengine.lib +LIBRARY profileEng.lib +LIBRARY drmhelper.lib #ifdef RD_CONTENTNOTIFICATION LIBRARY contentnotification.lib #endif //RD_CONTENTNOTIFICATION diff -r 85902f042028 -r a5e7a4f63858 psln/Src/PslnScreenSaverContainer.cpp --- a/psln/Src/PslnScreenSaverContainer.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/psln/Src/PslnScreenSaverContainer.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -123,7 +123,6 @@ delete itemBuf; } } - iListBox->HandleItemAdditionL(); // Create pre- and post-text icons. CPslnFWIconHelper* iconHelper = CPslnFWIconHelper::NewL(); diff -r 85902f042028 -r a5e7a4f63858 psln/Src/PslnScreenSaverView.cpp --- a/psln/Src/PslnScreenSaverView.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/psln/Src/PslnScreenSaverView.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -279,7 +279,6 @@ self->iModel->ActivateScreenSaver( KErrNotFound, EPslnScreenSaverPreviewDeactivation ); - self->iScreenSaverPreviewing = EFalse; if ( self->iContainer ) { @@ -564,12 +563,6 @@ // void CPslnScreenSaverView::HandleScreenSaverActivationL( TInt aCurrentItem ) { - // Protect screensaver type during preview. - if ( iScreenSaverPreviewing ) - { - return; - } - TInt PsmMode = 0; iPsmClient->PsmSettings().GetCurrentMode( PsmMode ); if ( PsmMode == EPsmsrvModePowerSave ) // PSM on, setting is protected @@ -617,12 +610,6 @@ // void CPslnScreenSaverView::HandleScreenSaverPreviewL( TInt aCurrentItem ) { - // Stop responding to preview again if screensaver is being previewed. - if ( iScreenSaverPreviewing ) - { - return; - } - TRAPD( err, DoInvokeScreenSaverFunctionL( aCurrentItem, EScpCapsPreviewNotification ) ); @@ -632,8 +619,7 @@ // Start listening for screensaver preview mode key changes. CreatePreviewModeSubscriberL(); CreatePreviewStateSubscriberL(); - - iScreenSaverPreviewing = ETrue; + User::LeaveIfError( iModel->ActivateScreenSaver( aCurrentItem, diff -r 85902f042028 -r a5e7a4f63858 psln/help/data/xhtml.zip Binary file psln/help/data/xhtml.zip has changed diff -r 85902f042028 -r a5e7a4f63858 psln/pslnengine/group/PslnEngine.mmp --- a/psln/pslnengine/group/PslnEngine.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/psln/pslnengine/group/PslnEngine.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -52,10 +52,10 @@ LIBRARY efsrv.lib LIBRARY apparc.lib LIBRARY featmgr.lib -LIBRARY CommonEngine.lib +LIBRARY commonengine.lib LIBRARY centralrepository.lib LIBRARY aknskinsrv.lib -LIBRARY DrmHelper.lib +LIBRARY drmhelper.lib LIBRARY platformenv.lib LIBRARY gfxtrans.lib LIBRARY caf.lib diff -r 85902f042028 -r a5e7a4f63858 psln/pslnengine/src/PslnModel.cpp --- a/psln/pslnengine/src/PslnModel.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/psln/pslnengine/src/PslnModel.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -1839,13 +1839,19 @@ { iScreenSaverInfo = CPslnScreenSaverInfo::NewL(); } - iScreenSaverInfo->iFileName->Des().Zero(); //backup current screensaver settings error = iScreenSaverRepository->Get( KScreenSaverObject, iScreenSaverInfo->iScreenSaverType ); + if ( iScreenSaverInfo->iScreenSaverType == KPslnSsObject ) + { + TPtr ptr = iScreenSaverInfo->iFileName->Des(); + error = iScreenSaverRepository->Get( + KScreenSaverPluginName, + ptr ); + } if ( previewSsType == KPslnSsText ) { TPtr ptr = iScreenSaverInfo->iScreenSaverTxt->Des(); @@ -1853,13 +1859,6 @@ KScreenSaverText, ptr ); } - else if ( previewSsType == KPslnSsObject ) - { - TPtr ptr = iScreenSaverInfo->iFileName->Des(); - error = iScreenSaverRepository->Get( - KScreenSaverPluginName, - ptr ); - } //set values to screen saver needed to preview if ( previewSsType == KPslnSsText ) @@ -1909,13 +1908,13 @@ previewSsType ); //restore the screen saver settings. - if ( iScreenSaverInfo->iFileName->Des().Compare( KNullDesC ) ) + if ( iScreenSaverInfo->iScreenSaverType == KPslnSsObject ) { error = iScreenSaverRepository->Set( KScreenSaverPluginName, iScreenSaverInfo->iFileName->Des() ); } - else if ( previewSsType == KPslnSsText ) + if ( previewSsType == KPslnSsText ) { error = iScreenSaverRepository->Set( KScreenSaverText, diff -r 85902f042028 -r a5e7a4f63858 psln/pslnslidesetdialog/group/pslnslidesetdialog.mmp --- a/psln/pslnslidesetdialog/group/pslnslidesetdialog.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/psln/pslnslidesetdialog/group/pslnslidesetdialog.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,10 +64,10 @@ LIBRARY featmgr.lib LIBRARY cone.lib LIBRARY efsrv.lib -LIBRARY CommonEngine.lib -LIBRARY CdlEngine.lib +LIBRARY commonengine.lib +LIBRARY cdlengine.lib LIBRARY centralrepository.lib -LIBRARY DrmHelper.lib +LIBRARY drmhelper.lib LIBRARY hlplch.lib LIBRARY mgfetch.lib LIBRARY aknskinsrv.lib diff -r 85902f042028 -r a5e7a4f63858 psln/pslnslidesetdialog/src/pslnslidesetdrmverifier.cpp --- a/psln/pslnslidesetdialog/src/pslnslidesetdrmverifier.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/psln/pslnslidesetdialog/src/pslnslidesetdrmverifier.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -121,23 +121,21 @@ res = iDRMHelper->CanSetAutomated( aSelectedFiles->MdcaPoint( index ), canBeAutomated ); - if ( res == KErrNone && !canBeAutomated ) + if ( !res && !canBeAutomated ) { ShowErrorNoteL( R_PSLN_SLIDE_SET_DRM_ERROR ); - return EFalse; } - else if ( res != KErrNone ) + else if( res == KErrUnderflow ) { - if ( res == KErrUnderflow ) + ShowErrorNoteL( R_PSLN_SLIDE_SET_IMAGE_CORRUPTED ); + } + else if ( ( res != KErrNone ) || !canBeAutomated ) + { + if ( iDRMHelper ) { - // Do not show error note for corrupted image and let it pass. - canBeAutomated = ETrue; - } - else - { - iDRMHelper->HandleErrorL( res, + iDRMHelper->HandleErrorL( + res, aSelectedFiles->MdcaPoint( index ) ); - return EFalse; } } else diff -r 85902f042028 -r a5e7a4f63858 uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp --- a/uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -76,20 +76,20 @@ LIBRARY eikcore.lib LIBRARY eikcoctl.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY aknskins.lib LIBRARY apfile.lib LIBRARY apgrfx.lib LIBRARY avkon.lib LIBRARY aknnotifierwrapper.lib -LIBRARY CommonEngine.lib -LIBRARY aknicon.lib +LIBRARY commonengine.lib +LIBRARY aknicon.lib LIBRARY egul.lib LIBRARY fbscli.lib LIBRARY eiksrvc.lib LIBRARY efsrv.lib LIBRARY bafl.lib -LIBRARY CdlEngine.lib -LIBRARY AknLayout2Scalable.lib +LIBRARY cdlengine.lib +LIBRARY aknlayout2scalable.lib LIBRARY eikdlg.lib LIBRARY eiksrv.lib LIBRARY ecom.lib @@ -102,11 +102,11 @@ LIBRARY syslangutil.lib LIBRARY centralrepository.lib LIBRARY akntransitionutils.lib -LIBRARY WidgetRegistryClient.lib -LIBRARY AknDynamicSoftNoteEventManager.lib -LIBRARY EComPluginNotifier.lib +LIBRARY widgetregistryclient.lib +LIBRARY akndynamicsoftnoteeventmanager.lib +LIBRARY ecompluginnotifier.lib LIBRARY touchfeedback.lib -LIBRARY aknnotify.lib +LIBRARY AknNotify.lib #ifdef RD_UI_TRANSITION_EFFECTS_LIST LIBRARY aknlistloadertfx.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AknGlobalUI/OldStyleNotif/Src/AknNotifyPlugin.cpp --- a/uifw/AknGlobalUI/OldStyleNotif/Src/AknNotifyPlugin.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AknGlobalUI/OldStyleNotif/Src/AknNotifyPlugin.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -275,7 +275,7 @@ } if ( sParams.iGprsState != EAknSignalGprsIndicatorBgTypeWipe && - sParams.iGprsState != EAknSignalGprsIndicatorBgTypeSolid && + sParams.iGprsState != EAknNaviPaneBackgroundTypeSolid && sParams.iGprsState >= 0 ) { publisher->SetSignalIcon( sParams.iGprsState ); diff -r 85902f042028 -r a5e7a4f63858 uifw/AknGlobalUI/OldStyleNotif/group/AknOldStyleNotif.mmp --- a/uifw/AknGlobalUI/OldStyleNotif/group/AknOldStyleNotif.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AknGlobalUI/OldStyleNotif/group/AknOldStyleNotif.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -69,19 +69,19 @@ LIBRARY eikcore.lib LIBRARY eiksrv.lib LIBRARY avkon.lib -LIBRARY CommonEngine.lib +LIBRARY commonengine.lib LIBRARY apgrfx.lib LIBRARY eiksrvui.lib LIBRARY eikctl.lib -LIBRARY CdlEngine.lib +LIBRARY cdlengine.lib LIBRARY featmgr.lib LIBRARY aknskins.lib LIBRARY aknnotifyplugin.lib LIBRARY aknnotifierwrapper.lib LIBRARY gdi.lib LIBRARY aknlayout2.lib -LIBRARY AknLayout2Scalable.lib -LIBRARY aknnotify.lib +LIBRARY aknlayout2scalable.lib +LIBRARY aknnotify.lib LIBRARY mediatorclient.lib LIBRARY apparc.lib LIBRARY centralrepository.lib @@ -89,7 +89,7 @@ LIBRARY fbscli.lib LIBRARY aknicon.lib LIBRARY svgengine.lib -LIBRARY AknDynamicSoftNoteEventManager.lib +LIBRARY akndynamicsoftnoteeventmanager.lib LIBRARY gfxtrans.lib LIBRARY akntransitionutils.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/EABI/AVKONU.DEF --- a/uifw/AvKon/EABI/AVKONU.DEF Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/EABI/AVKONU.DEF Wed Oct 13 14:50:15 2010 +0300 @@ -4603,7 +4603,4 @@ _ZN26CAknRadioButtonSettingPage15ProcessCommandLEi @ 4602 NONAME _ZThn84_N20CAknPopupSettingPage15ProcessCommandLEi @ 4603 NONAME _ZThn84_N26CAknRadioButtonSettingPage15ProcessCommandLEi @ 4604 NONAME - _ZN14CAknSignalPane12ShowUmaIconLEi @ 4605 NONAME - _ZN21CAknPhoneNumberEditor16SetQwertyAllowedEi @ 4606 NONAME - _ZN21CAknPhoneNumberEditor20SetHybridModeAllowedEi @ 4607 NONAME diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/EABI/AknNotifyU.DEF --- a/uifw/AvKon/EABI/AknNotifyU.DEF Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/EABI/AknNotifyU.DEF Wed Oct 13 14:50:15 2010 +0300 @@ -150,5 +150,3 @@ _ZN22CAknGlobalListMsgQueryD2Ev @ 149 NONAME _Z13AknTracePrint11TRefByValueIK7TDesC16Ez @ 150 NONAME _Z13AknTracePrintPKcz @ 151 NONAME - _ZN16CAknSignalNotify12SetUmaStateLEi @ 152 NONAME - diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/akncompamode/group/akncompamode.mmp --- a/uifw/AvKon/akncompamode/group/akncompamode.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/akncompamode/group/akncompamode.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -69,10 +69,10 @@ LIBRARY bafl.lib LIBRARY egul.lib LIBRARY aknskins.lib -LIBRARY CdlEngine.lib +LIBRARY cdlengine.lib LIBRARY touchfeedback.lib LIBRARY AknLayout2Scalable.lib LIBRARY ecom.lib LIBRARY centralrepository.lib -LIBRARY aknlayout2.lib +LIBRARY AknLayout2.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/akncompamode/gs/group/akncompags.mmp --- a/uifw/AvKon/akncompamode/gs/group/akncompags.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/akncompamode/gs/group/akncompags.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -58,14 +58,14 @@ LIBRARY eikcore.lib LIBRARY egul.lib LIBRARY eikdlg.lib // eikon dialogs -LIBRARY centralrepository.lib +LIBRARY CentralRepository.lib LIBRARY CommonEngine.lib // For RConeResourceLoader LIBRARY aknskinsrv.lib // for enhanced skinning LIBRARY aknskins.lib // for enhanced skinning LIBRARY hlplch.lib // for "Help" options menu -LIBRARY gsframework.lib // For base classes -LIBRARY gslistbox.lib // For CGSListBoxItemTextArray -LIBRARY gsecomplugin.lib +LIBRARY GSFramework.lib // For base classes +LIBRARY GSListBox.lib // For CGSListBoxItemTextArray +LIBRARY GSEcomPlugin.lib // End of File diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/akncompamode/src/akncompakb.cpp --- a/uifw/AvKon/akncompamode/src/akncompakb.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/akncompamode/src/akncompakb.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -270,13 +270,11 @@ // disabled whenever screen mode changes to compa-mode by AknCapServer. if (iFlags.iInAknCapSrv && iFlags.iEffectsDisa != aDisable) { - TInt err = KErrNone; if (iCompaSrvSession.Handle() == KNullHandle) { - err = iCompaSrvSession.Connect(); + User::LeaveIfError( iCompaSrvSession.Connect() ); } - - if (err == KErrNone && iCompaSrvSession.Handle() != KNullHandle) + if (iCompaSrvSession.Handle() != KNullHandle) { if (aDisable) { diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/aknconf/group/aknconf.mmp --- a/uifw/AvKon/aknconf/group/aknconf.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/aknconf/group/aknconf.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -73,7 +73,7 @@ LIBRARY cone.lib LIBRARY eikcore.lib LIBRARY avkon.lib -LIBRARY CommonEngine.lib +LIBRARY commonengine.lib LIBRARY efsrv.lib LIBRARY estor.lib LIBRARY aknnotify.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/aknhlist/BWINS/aknhlistU.def --- a/uifw/AvKon/aknhlist/BWINS/aknhlistU.def Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/aknhlist/BWINS/aknhlistU.def Wed Oct 13 14:50:15 2010 +0300 @@ -74,5 +74,4 @@ ?SetEmptyTextL@CAknTreeList@@QAEXABVTDesC16@@@Z @ 73 NONAME ; void CAknTreeList::SetEmptyTextL(class TDesC16 const &) ?VisibleItemIndex@CAknTreeList@@QBEHH@Z @ 74 NONAME ; int CAknTreeList::VisibleItemIndex(int) const ?SetMarkingModeObserver@CAknTreeList@@QAEXPAVMAknMarkingModeObserver@@@Z @ 75 NONAME ; void CAknTreeList::SetMarkingModeObserver(class MAknMarkingModeObserver *) - ?SetMarkingMode@CAknTreeList@@QAEXH@Z @ 76 NONAME ; void CAknTreeList::SetMarkingMode(int) diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/aknhlist/EABI/aknhlistU.def --- a/uifw/AvKon/aknhlist/EABI/aknhlistU.def Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/aknhlist/EABI/aknhlistU.def Wed Oct 13 14:50:15 2010 +0300 @@ -74,5 +74,4 @@ _ZN12CAknTreeList13SetEmptyTextLERK7TDesC16 @ 73 NONAME _ZNK12CAknTreeList16VisibleItemIndexEi @ 74 NONAME _ZN12CAknTreeList22SetMarkingModeObserverEP23MAknMarkingModeObserver @ 75 NONAME - _ZN12CAknTreeList14SetMarkingModeEi @ 76 NONAME diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/aknhlist/group/aknhlist.mmp --- a/uifw/AvKon/aknhlist/group/aknhlist.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/aknhlist/group/aknhlist.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -41,8 +41,6 @@ MW_LAYER_SYSTEMINCLUDE OS_LAYER_LIBC_SYSTEMINCLUDE -SYSTEMINCLUDE ../../../EikStd/coctlinc - SOURCEPATH ../src SOURCE aknhlistlib.cpp SOURCE akntreelist.cpp @@ -73,8 +71,8 @@ LIBRARY avkon.lib LIBRARY eikcoctl.lib LIBRARY cone.lib -LIBRARY AknLayout2Scalable.lib -LIBRARY CdlEngine.lib +LIBRARY aknlayout2scalable.lib +LIBRARY cdlengine.lib LIBRARY aknskins.lib LIBRARY ws32.lib LIBRARY egul.lib @@ -85,7 +83,7 @@ LIBRARY aknphysics.lib library touchfeedback.lib -LIBRARY aknnotify.lib // akntrace +LIBRARY AknNotify.lib // akntrace #ifdef RD_UI_TRANSITION_EFFECTS_LIST LIBRARY aknlistloadertfx.lib #endif //RD_UI_TRANSITION_EFFECTS_LIST diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/aknhlist/inc/akntreelistview.h --- a/uifw/AvKon/aknhlist/inc/akntreelistview.h Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/aknhlist/inc/akntreelistview.h Wed Oct 13 14:50:15 2010 +0300 @@ -930,14 +930,6 @@ */ TBool HasMarkedItemsL() const; - /** - * Turns the marking mode on / off. - * - * @param aEnable @c ETrue to turn marking mode on - * @c EFalse to turn marking mode off - */ - void SetMarkingMode( TBool aEnable ); - // From MAknCollection /** * Returns the collection state. The state is combination of diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/aknhlist/src/akntreelist.cpp --- a/uifw/AvKon/aknhlist/src/akntreelist.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/aknhlist/src/akntreelist.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -675,16 +675,6 @@ // --------------------------------------------------------------------------- -// CAknTreeList::SetMarkingMode -// --------------------------------------------------------------------------- -// -EXPORT_C void CAknTreeList::SetMarkingMode( TBool aEnable ) - { - View().SetMarkingMode( aEnable ); - } - - -// --------------------------------------------------------------------------- // Handles key events by mediating them to the view. // --------------------------------------------------------------------------- // diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/aknhlist/src/akntreelistphysicshandler.cpp --- a/uifw/AvKon/aknhlist/src/akntreelistphysicshandler.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/aknhlist/src/akntreelistphysicshandler.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -1054,7 +1054,7 @@ if ( handler->iTreeListView->SingleClickEnabled() && !handler->iEnableEvents ) { - handler->iTreeListView->EnableHighlight( ETrue, ETrue ); + handler->iTreeListView->EnableHighlight(ETrue); } // Pressed down highlight if item still pressed down if ( !handler->iFlags.IsSet( EFlagButtonUpReceived ) diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/aknhlist/src/akntreelistview.cpp --- a/uifw/AvKon/aknhlist/src/akntreelistview.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/aknhlist/src/akntreelistview.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -30,7 +30,6 @@ #include #include #include -#include #include "akntreelistview.h" #include "akntree.h" #include "akntreelist.h" @@ -2972,8 +2971,6 @@ const TInt itemCount = iItems.Count(); for ( TInt ii = 0; ii < itemCount; ++ii ) { - TBool itemIsMarkable = ( iItems[ii].Item() && - iItems[ii].Item()->IsMarkable() ); TRect drawRect( iItems[ii].Rect() ); if ( iFlags.IsSet( EFlagMarkingMode ) ) @@ -3090,7 +3087,7 @@ if ( iFlags.IsSet( EFlagMarkingMode ) && iMarkingIconArray && iMarkingIconArray->Count() == - KMarkingModeIconArraySize && itemIsMarkable ) + KMarkingModeIconArraySize ) { // Rect for the marking icon TRect iconRect = RectFromLayout( drawRect, @@ -3607,18 +3604,6 @@ return ( count > 0 ); } -// --------------------------------------------------------------------------- -// CAknTreeListView::SetMarkingMode -// --------------------------------------------------------------------------- -// -void CAknTreeListView::SetMarkingMode( TBool aEnable ) - { - if ( ( iFlags.IsSet( EFlagMarkingMode ) != aEnable ) && iItemActionMenu ) - { - iItemActionMenu->MarkingMode().SetCollectionMultipleMarkingState( - aEnable ); - } - } #ifdef RD_UI_TRANSITION_EFFECTS_LIST // --------------------------------------------------------------------------- diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/aknphysics/group/bld.inf --- a/uifw/AvKon/aknphysics/group/bld.inf Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/aknphysics/group/bld.inf Wed Oct 13 14:50:15 2010 +0300 @@ -26,7 +26,7 @@ // Generic configuration interface for component cenrep settings ../cenrep/20021192.txt /epoc32/winscw/c/private/10202be9/20021192.txt -../cenrep/20021192.txt /epoc32/data/z/private/10202BE9/20021192.txt +../cenrep/20021192.txt /epoc32/data/Z/private/10202BE9/20021192.txt ../conf/s60/aknphysics.confml APP_LAYER_CONFML(aknphysics.confml) ../conf/s60/aknphysics_20021192.crml APP_LAYER_CRML(aknphysics_20021192.crml) diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/aknphysics/src/aknphysicsengine.cpp --- a/uifw/AvKon/aknphysics/src/aknphysicsengine.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/aknphysics/src/aknphysicsengine.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -60,11 +60,7 @@ CAknPhysicsEngine::~CAknPhysicsEngine() { DeletePhysics(); - if ( iAlfClient ) - { - iAlfClient->Close(); - delete iAlfClient; - } + delete iAlfClient; } diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/animdllsrc/AknAnimDll.mmp --- a/uifw/AvKon/animdllsrc/AknAnimDll.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/animdllsrc/AknAnimDll.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -45,7 +45,7 @@ LIBRARY euser.lib LIBRARY centralrepository.lib LIBRARY featmgr.lib -LIBRARY hwrmlightclient.lib +LIBRARY HWRMLightClient.lib LIBRARY tactileclickplugin.lib EXPORTUNFROZEN diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/bwins/AKNNOTIFYU.DEF --- a/uifw/AvKon/bwins/AKNNOTIFYU.DEF Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/bwins/AKNNOTIFYU.DEF Wed Oct 13 14:50:15 2010 +0300 @@ -124,5 +124,3 @@ ?ShowListMsgQueryL@CAknGlobalListMsgQuery@@QAEXPBVMDesC16Array@@AAVTRequestStatus@@ABVTDesC16@@2HHHH2HHW4TTone@CAknQueryDialog@@@Z @ 123 NONAME ; void CAknGlobalListMsgQuery::ShowListMsgQueryL(class MDesC16Array const *, class TRequestStatus &, class TDesC16 const &, class TDesC16 const &, int, int, int, int, class TDesC16 const &, int, int, enum CAknQueryDialog::TTone) ?AknTracePrint@@YAXPBDZZ @ 124 NONAME ; void AknTracePrint(const char* aFmt, ...) ?AknTracePrint@@YAXV?$TRefByValue@$$CBVTDesC16@@@@ZZ @ 125 NONAME ; void AknTracePrint(TRefByValue aFmt, ...) - ?SetUmaStateL@CAknSignalNotify@@QAEXH@Z @ 126 NONAME ; void CAknSignalNotify::SetUmaStateL(int) - diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/bwins/AVKONU.def --- a/uifw/AvKon/bwins/AVKONU.def Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/bwins/AVKONU.def Wed Oct 13 14:50:15 2010 +0300 @@ -3469,7 +3469,4 @@ ?IsSmiley@CAknSmileyManager@@QBEHVTChar@@@Z @ 3468 NONAME ; int CAknSmileyManager::IsSmiley(class TChar) const ?ProcessCommandL@CAknRadioButtonSettingPage@@MAEXH@Z @ 3469 NONAME ; void CAknRadioButtonSettingPage::ProcessCommandL(int) ?ProcessCommandL@CAknPopupSettingPage@@MAEXH@Z @ 3470 NONAME ; void CAknPopupSettingPage::ProcessCommandL(int) - ?ShowUmaIconL@CAknSignalPane@@QAEXH@Z @ 3471 NONAME ; void CAknSignalPane::ShowUmaIconL(int) - ?SetQwertyAllowed@CAknPhoneNumberEditor@@QAEXH@Z @ 3472 NONAME ; void CAknPhoneNumberEditor::SetQwertyAllowed(int) - ?SetHybridModeAllowed@CAknPhoneNumberEditor@@QAEXH@Z @ 3473 NONAME ; void CAknPhoneNumberEditor::SetHybridModeAllowed(int) diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/conf/s60/avkon.confml Binary file uifw/AvKon/conf/s60/avkon.confml has changed diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/conf/s60/avkon_101F876E.crml Binary file uifw/AvKon/conf/s60/avkon_101F876E.crml has changed diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/group/Iconlist.txt --- a/uifw/AvKon/group/Iconlist.txt Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/group/Iconlist.txt Wed Oct 13 14:50:15 2010 +0300 @@ -838,29 +838,3 @@ /1,8 qgn_stat_hdmi_connect.svg /1,8 qgn_stat_joint_im_uni.svg - -/c8,8 qgn_indi_signal_uma_attach.svg -/c8,8 qgn_indi_signal_uma_context.svg -/c8,8 qgn_indi_signal_uma_icon.svg -/c8,8 qgn_indi_signal_uma_multipdp.svg -/c8,8 qgn_indi_signal_uma_noservice.svg -/c8,8 qgn_indi_signal_uma_suspended.svg - -/1,8 qgn_indi_signal_gprs_tdscdma_attach.svg -/1,8 qgn_indi_signal_gprs_tdscdma_context.svg -/1,8 qgn_indi_signal_gprs_tdscdma_icon.svg -/1,8 qgn_indi_signal_gprs_tdscdma_multipdp.svg -/1,8 qgn_indi_signal_gprs_tdscdma_suspended.svg - -/1,8 qgn_indi_signal_hsdpa_tdscdma_attach.svg -/1,8 qgn_indi_signal_hsdpa_tdscdma_context.svg -/1,8 qgn_indi_signal_hsdpa_tdscdma_icon.svg -/1,8 qgn_indi_signal_hsdpa_tdscdma_multipdp.svg -/1,8 qgn_indi_signal_hsdpa_tdscdma_suspended.svg - -/1,8 qgn_indi_signal_tdscdma_attach.svg -/1,8 qgn_indi_signal_tdscdma_context.svg -/1,8 qgn_indi_signal_tdscdma_icon.svg -/1,8 qgn_indi_signal_tdscdma_multipdp.svg -/1,8 qgn_indi_signal_tdscdma_suspended.svg - diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/group/avkon.mmp --- a/uifw/AvKon/group/avkon.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/group/avkon.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -286,10 +286,10 @@ SOURCE akncombinedpane.cpp LIBRARY FontProvider.lib -LIBRARY fontutils.lib +LIBRARY FontUtils.lib -LIBRARY euser.lib -LIBRARY eikcore.lib +LIBRARY EUSER.LIB +LIBRARY EIKCORE.LIB LIBRARY cone.lib LIBRARY eikcoctl.lib LIBRARY eikctl.lib @@ -297,12 +297,12 @@ LIBRARY bafl.lib LIBRARY gdi.lib LIBRARY fbscli.lib -LIBRARY apgrfx.lib +LIBRARY APGRFX.LIB LIBRARY ws32.lib LIBRARY eikdlg.lib LIBRARY bitgdi.lib LIBRARY etext.lib -LIBRARY bmpanim.lib +LIBRARY BMPANIM.LIB LIBRARY fepbase.lib LIBRARY form.lib LIBRARY estor.lib @@ -310,28 +310,28 @@ LIBRARY phoneclient.lib LIBRARY apparc.lib LIBRARY aknnotify.lib // Global Note -LIBRARY insock.lib // For IP address copying in CAknIpFieldSettingPage +LIBRARY INSOCK.LIB // For IP address copying in CAknIpFieldSettingPage LIBRARY efsrv.lib LIBRARY eiksrvc.lib -LIBRARY aknskins.lib // Skins support +LIBRARY AknSkins.lib // Skins support LIBRARY linebreak.lib -LIBRARY featmgr.lib -LIBRARY numberconversion.lib -LIBRARY FindUtil.lib +LIBRARY FeatMgr.lib +LIBRARY NumberConversion.lib +LIBRARY findutil.lib LIBRARY aknpictograph.lib LIBRARY CdlEngine.lib -LIBRARY aknicon.lib -LIBRARY ecom.lib +LIBRARY AknIcon.lib +LIBRARY ECom.lib LIBRARY oommonitor.lib LIBRARY akncapserverclient.lib -LIBRARY apmime.lib +LIBRARY Apmime.lib LIBRARY servicehandler.lib LIBRARY numbergrouping.lib -LIBRARY aknlayout2.lib +LIBRARY AknLayout2.lib LIBRARY AknLayout2Scalable.lib LIBRARY centralrepository.lib LIBRARY cenrepnotifhandler.lib -LIBRARY ptiengine.lib +LIBRARY PtiEngine.lib #ifdef RD_UI_TRANSITION_EFFECTS_LIST LIBRARY aknlistloadertfx.lib #endif //RD_UI_TRANSITION_EFFECTS_LIST @@ -344,7 +344,7 @@ LIBRARY tacticon.lib LIBRARY viewcli.lib LIBRARY aknphysics.lib -LIBRARY hwrmlightclient.lib +LIBRARY HWRMLightClient.lib LIBRARY aiwdialdata.lib DEFFILE AVKON.def diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/group/bld.inf --- a/uifw/AvKon/group/bld.inf Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/group/bld.inf Wed Oct 13 14:50:15 2010 +0300 @@ -56,7 +56,7 @@ smiley.mif /epoc32/data/z/resource/apps/smiley.mif smiley.mif /epoc32/release/winscw/udeb/z/resource/apps/smiley.mif smiley.mif /epoc32/release/winscw/urel/z/resource/apps/smiley.mif -smiley.mif /epoc32/release/armv5/udeb/z/resource/apps/smiley.mif +smiley.mif /epoc32/release/armv5/udeb/Z/resource/apps/smiley.mif smiley.mif /epoc32/release/armv5/urel/z/resource/apps/smiley.mif ../srcdata/AvkonSystemSounds/volume_min.wav /epoc32/data/z/resource/avkonsystemsounds/volume_min.wav @@ -137,7 +137,7 @@ OPTION TARGETFILE avkon2mifheader_inst.cpp OPTION GENPATH ../Avkon2MifHeader OPTION MIFFILE avkon2.mif -// OPTION MIFDIR armv5 uses $(EPOCROOT)epoc32/data/z/resource/apps and for winscw uses $(EPOCROOT)epoc32/release/winscw/$(CFG)/z/resource/apps +// OPTION MIFDIR armv5 uses $(EPOCROOT)epoc32/data/Z/resource/apps and for winscw uses $(EPOCROOT)epoc32/release/winscw/$(CFG)/z/resource/apps OPTION DLLNAME Avkon2MifHeader OPTION DLLUID 0x102827CF END diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/inc/AknSignalIcon.h --- a/uifw/AvKon/inc/AknSignalIcon.h Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/inc/AknSignalIcon.h Wed Oct 13 14:50:15 2010 +0300 @@ -188,16 +188,6 @@ */ void LoadATTIconL( TInt aIconState, TInt aIconColorIndex ); - - /** - * Loads the signal icon for TD phone to be displayed. - * - * @param aIconState ID of the signal state, @see signal indicator - * states in @c avkon.hrh. - * @param aIconColorIndex Color index of the icon. - */ - void LoadTDIconL(TInt aIconState, TInt aIconColorIndex); - private: /** @@ -229,9 +219,6 @@ /** Flag defining whether or not the ATT is enable. */ TInt iATTEnable; - - /** Flag defining whether or not the TD is enable. */ - TBool iTDEnable; }; #endif // AKNSIGNALICON_H diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/inc/AknSmileyModel.h --- a/uifw/AvKon/inc/AknSmileyModel.h Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/inc/AknSmileyModel.h Wed Oct 13 14:50:15 2010 +0300 @@ -177,15 +177,8 @@ TChar SmileyCode(TInt aIndex, TInt aVariant=0) const; TChar SmileyCode(const CAknSmileyIcon* aSmileyIcon) const; - void LoadStillImagesL(const TDesC& aText); - void PlayAnimationL(const TDesC& aText, TInt aRepeat=0, TInt aDelay=0); - void StopAnimation(const TDesC& aText); - -private: void LoadStillImageL(TChar aChar); - void PlayAnimationL(TChar aChar, TInt aRepeat=0, TInt aDelay=0); - void StopAnimation(TChar aChar); private: const TDesC& Text(TInt aIndex, TInt aVariant=0) const; diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/inc/AknTabGrpGraphics.h --- a/uifw/AvKon/inc/AknTabGrpGraphics.h Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/inc/AknTabGrpGraphics.h Wed Oct 13 14:50:15 2010 +0300 @@ -115,6 +115,21 @@ */ void SetTabGroupBackgroundParent( TRect aParent ); +#if 0 // not used + /** + * This method draws the tab background bitmap using SVG graphics. + * The tab combination is given as bitmap id which refers to old style + * tab bitmaps. + * + * @param aAvkonBitmapId Bitmap index (@see avkon.mbg). + * + * @return Struct which contains both the bitmap and the mask. + * Ownership is transferred to the caller. + */ + CAknTabGroupGraphics::SAknTabGroupBackground CreateTabGroupBackgroundL( + TInt aAvkonBitmapId ); + +#endif /** * Draw modes of the tab background graphics. */ @@ -172,7 +187,7 @@ * @param aTabsHidden Specifies where hidden tabs are drawn. * @param aAnimation Specifies the used animation. */ - void DrawTabGroupBackground( + void DrawTabGroupBackgroundL( TTabDrawMode aTabDrawMode, TBool aLongTabs, TInt aNumberOfTabs, @@ -180,8 +195,7 @@ CBitmapContext* aGc, SAknTabGroupBackgroundLayout& aLayout, TTabsHidden aTabsHidden, - TTabAnimationType aAnimation = ENoAnimation, - TInt aHighlightTab = 0 ) const; + TTabAnimationType aAnimation = ENoAnimation ) const; /** * Draws narrow tab background from given parameters. @@ -199,7 +213,7 @@ * @c EFalse, then the layout is calculated * to the @c aLayout. */ - void DrawTabGroupNarrowBackground( + void DrawTabGroupNarrowBackgroundL( TTabDrawMode aTabDrawMode, TBool aLongTabs, TInt aNumberOfTabs, @@ -323,6 +337,70 @@ CAknTabGroupGraphics::SAknTabGroupBackgroundLayout ThreeLongTabNarrowBackground( TInt aActiveTab ) const; + /** + * Methods to draw normal tab backgrounds. + */ + void DrawTwoTabBackground( TTabDrawMode aDrawMode, + TInt aActiveTab, + CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout ) const; + + void DrawThreeTabBackground( TTabDrawMode aDrawMode, + TInt aActiveTab, + CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout, + TTabsHidden aTabsHidden, + TTabAnimationType aAnimation = ENoAnimation ) const; + + void DrawFourTabBackground( TTabDrawMode aDrawMode, + TInt aActiveTab, + CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout ) const; + + void DrawTwoLongTabBackground( + TTabDrawMode aDrawMode, + TInt aActiveTab, + CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout ) const; + + void DrawThreeLongTabBackground( + TTabDrawMode aDrawMode, + TInt aActiveTab, + CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout ) const; + + /** + * Methods to draw narrow tab backgrounds. + */ + void DrawTwoTabNarrowBackground( + TTabDrawMode aDrawMode, + TInt aActiveTab, + CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout ) const; + + void DrawThreeTabNarrowBackground( + TTabDrawMode aDrawMode, + TInt aActiveTab, + CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout ) const; + + void DrawFourTabNarrowBackground( + TTabDrawMode aDrawMode, + TInt aActiveTab, + CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout ) const; + + void DrawTwoLongTabNarrowBackground( + TTabDrawMode aDrawMode, + TInt aActiveTab, + CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout ) const; + + void DrawThreeLongTabNarrowBackground( + TTabDrawMode aDrawMode, + TInt aActiveTab, + CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout ) const; /** * Draws single tab graphics for an active tab. @@ -357,21 +435,6 @@ TBool aFaded = EFalse ) const; /** - * Draws single tab graphics for a Highlight tab. - * - * @param aDrawMode Mode with which the background is drawn. - * @param aLeft Rectangle of the left part of the tab. - * @param aMiddle Rectangle of the middle part of the tab. - * @param aRight Rectangle of the right part of the tab. - * @param aGc Graphics context used in drawing. - */ - void DrawHighlightTabL( TTabDrawMode aDrawMode, - TRect aLeft, - TRect aMiddle, - TRect aRight, - CBitmapContext* aGc ) const; - - /** * Draws single tab part graphics for a passive tab. * Used in drawing the hidden tab bits. * @@ -395,73 +458,6 @@ * Helper method to get the narrow tab container rect. */ TRect NarrowParentRect() const; - - /** - * Sets the layout for tab background according to specified parameters. - * Used in DrawTabGroupBackground/DrawTabGroupNarrowBackground - * - * @param aLayout[in,out] Tab group background layout used in drawing. - * If the @c aLayout's @c iUse parameter is - * @c EFalse, then the layout is calculated - * to the @c aLayout. - * @param aNumberOfTabs Number of tabs visible in the tab group (not - * the total number of tabs in the tab group). - * @param aLongTabs Active tab number in relation to the first tab - * shown. This value can be from one to - * @c aNumberOfTabs. - * @param aLongTabs Specifies whether or not long tabs are used. - * @param aIsNarrow Specifies whether or not narrow tabs are used. - * @param aAnimation Specifies the used animation. - */ - void CAknTabGroupGraphics::ReviseLayoutForTabBackground( - SAknTabGroupBackgroundLayout& aLayout, - TInt aNumberOfTabs, - TBool aLongTabs, - TInt aActiveTab, - TBool aIsNarrow, - TTabAnimationType aAnimation - ) const; - - /** - * Sets active tab flag for the layout. - * Used in DrawTabGroupBackground/DrawTabGroupNarrowBackground - * - * @param aLayout[in,out] Tab group background layout used in drawing. - * If the @c aLayout's @c iUse parameter is - * @c EFalse, then the layout is calculated - * to the @c aLayout. - * @param aActiveTab Active tab number in relation to the first tab - * shown. This value can be from one to - * @c aNumberOfTabs. - */ - void ReviseLayoutUseFlag( - SAknTabGroupBackgroundLayout& aLayout, - TInt aActiveTab - ) const; - - /** - * Processes the instructions and draw the tab background according to instructions. - * Instructions are created according to drawing sequence. - * Used in DrawTabGroupBackground/DrawTabGroupNarrowBackground - * - * @param aInstructions The instructions for drawing tabs. - * @param aNumOfIns The number of instructions. - * @param aTabDrawMode Mode with which the background is drawn. - * @param aLayout[in,out] Tab group background layout used in drawing. - * If the @c aLayout's @c iUse parameter is - * @c EFalse, then the layout is calculated - * to the @c aLayout. - * @param aGc Graphics context used in drawing the background. - * - */ - void ProcessDrawTabInstructions( - struct TTabInstruction *aInstructions, - TInt aNumOfIns, - TTabDrawMode aTabDrawMode, - SAknTabGroupBackgroundLayout& aLayout, - CBitmapContext* aGc - ) const; - private: // Member data. diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/inc/aknindicatorpopupcontent.h --- a/uifw/AvKon/inc/aknindicatorpopupcontent.h Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/inc/aknindicatorpopupcontent.h Wed Oct 13 14:50:15 2010 +0300 @@ -335,11 +335,6 @@ * Current rect of press down effect */ TRect iPressedDownRect; - - /** - * Ordinal upon button down - */ - TInt iOrdinal; }; #endif // C_AKNINDICATORPOPUPCONTENT_H diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/memorycardui/group/AknMemoryCardUi.mmp --- a/uifw/AvKon/memorycardui/group/AknMemoryCardUi.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/memorycardui/group/AknMemoryCardUi.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -48,7 +48,7 @@ LIBRARY centralrepository.lib LIBRARY aknnotify.lib -LIBRARY CommonEngine.lib +LIBRARY commonengine.lib LIBRARY platformenv.lib // PathInfo LIBRARY efsrv.lib // TDriveUnit diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/notifsrc/AknSignalNotify.cpp --- a/uifw/AvKon/notifsrc/AknSignalNotify.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/notifsrc/AknSignalNotify.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -215,17 +215,4 @@ StartOrUpdateL( pckg, resp ); } -// --------------------------------------------------------------------------- -// CAknSignalNotify::SetUmaStateL -// Sets an UMA icon to the signal pane. -// --------------------------------------------------------------------------- -// -EXPORT_C void CAknSignalNotify::SetUmaStateL(TInt aUmaState) - { - if (( aUmaState >= EAknSignalUmaIndicatorOff ) && - ( aUmaState <= EAknSignalUmaIndicatorMultipdp )) - { - SetStateL( aUmaState ); - } - } // End of File diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknAdaptiveSearch.cpp --- a/uifw/AvKon/src/AknAdaptiveSearch.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknAdaptiveSearch.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -245,10 +245,9 @@ { //hide grid HideAdaptiveSearchGridL(); - if( iSearchField->IsVisible() ) - { - iSearchField->SetFocus( ETrue ); - } + iSearchField->MakeVisible( ETrue ); + iSearchField->SetFocus( ETrue ); + } else if( aCommand == CAknAdaptiveSearchGrid::EDeleteLastCharPressed ) { diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknBitmapAnimation.cpp --- a/uifw/AvKon/src/AknBitmapAnimation.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknBitmapAnimation.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -557,7 +557,7 @@ LOCAL_C TInt WaitForUiEffect(TAny* aArg) { CAknBitmapAnimation* self = (CAknBitmapAnimation*)aArg; - TRAP_IGNORE(self->StartAnimationL()); + self->StartAnimationL(); return EFalse; } #endif diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknCharMap.cpp --- a/uifw/AvKon/src/AknCharMap.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknCharMap.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -396,9 +396,7 @@ void SwitchEmotionVisibilityL(); TBool NeedEmotionSwitchIcon() const; HBufC* ReadEmotionHBufCL(); - void LoadEmotionTumbnails(const TDesC& aText); - void PlayAnimationL(const TDesC& aText); - void StopAnimation(const TDesC& aText); + void LoadEmotionTumbnails(const TDesC& aChars); void SetEmotionSize(const TSize& aSize); TBool IsEmotionChar(TChar aChar); TChar SwitchToSctChar(); @@ -440,9 +438,6 @@ // Indicates whether menu sct is highlighted or not. TBool iMenuSctHighlighted; - // flag for focus status of char map dialog - TBool iCharMapFocusGained; - public: // for Emotion HBufC* iCharsSmiley; CSmileyModel* iSmileyModel; @@ -1501,24 +1496,11 @@ return charsSmiley; } -void CAknCharMapExtension::LoadEmotionTumbnails(const TDesC& aText) +void CAknCharMapExtension::LoadEmotionTumbnails(const TDesC& aChars) { //If emotion tumbbails can't be load, // no emotion tumbnail will be dispalyed. - TRAP_IGNORE( iSmileyModel->LoadStillImagesL(aText) ); - } - -const TInt KAnimationRepeat = 30; -const TInt KAnimationDelay = 150*1000; - -void CAknCharMapExtension::PlayAnimationL(const TDesC& aText) - { - iSmileyModel->PlayAnimationL(aText, KAnimationRepeat, KAnimationDelay); - } - -void CAknCharMapExtension::StopAnimation(const TDesC& aText) - { - iSmileyModel->StopAnimation(aText); + TRAP_IGNORE( iSmileyModel->LoadStillImagesL(aChars) ); } void CAknCharMapExtension::SetEmotionSize(const TSize& aSize) @@ -2192,7 +2174,9 @@ UpdateScrollIndicatorL(); } - Extension()->LoadEmotionTumbnails(*iChars); + iExtension->LoadEmotionTumbnails(*iChars); + + SetSmileyAnimationActivityInCurrentPageL(ETrue); } @@ -2887,13 +2871,11 @@ else if(aType == KEikMessageFadeAllWindows) // focus gained // KEikMessageWindowsFadeChange { - Extension()->iCharMapFocusGained = ETrue; SetSmileyAnimationActivityInCurrentPageL(ETrue); } else if(aType == KAknMessageFocusLost) // focus lost { - Extension()->iCharMapFocusGained = EFalse; SetSmileyAnimationActivityInCurrentPageL(EFalse); if ( iExtension->iHighlightVisible ) @@ -3470,13 +3452,14 @@ TPoint pos = iGridTopLeft; TSize size(iGridItemWidth*iMaxColumns+1, iGridItemHeight); - - // eliminate the overlap area between menu sct and the first menu item. + + // eliminate the overlap area between menu sct and the first menu item. if ( Extension()->iMenuSct ) { // provide a dirty fix for Menu SCT, since Layout data is not suitable for this size = TSize( Rect().Width()- 1, iGridItemHeight - 1 ); } + if(iIsMirrored) { pos.iX += iGridItemWidth - size.iWidth; @@ -4882,16 +4865,17 @@ TAknLayoutRect rightCellLayRect; rightCellLayRect.LayoutRect(gridRect, AknLayoutScalable_Avkon::cell_graphic_popup_pane_cp2(0,1,0)); + TRect firstCellRect; - - // Cell width. + + // Cell width. iGridItemWidth = rightCellLayRect.Rect().iTl.iX - firstCellLayRect.Rect().iTl.iX; if (iGridItemWidth < 0) { iGridItemWidth = -iGridItemWidth; } - + if ( Extension()->iMenuSct ) { firstCellRect = TRect( TPoint(0, 0), @@ -4902,7 +4886,6 @@ firstCellRect = firstCellLayRect.Rect(); } - TInt firstVisibleIndex = iFirstVisibleRow * iMaxColumns; // Max columns. iMaxColumns = gridRect.Width() / firstCellRect.Width(); @@ -5682,11 +5665,6 @@ { resourceId = R_AVKON_MENU_SCT_ROW_DEFAULT_CONTENTS_CHINESE; } - else if (FeatureManager::FeatureSupported(KFeatureIdKorean)) - { - // Added korea character support - resourceId = R_AVKON_MENU_SCT_ROW_DEFAULT_CONTENTS_KOREAN; - } CCoeEnv::Static()->CreateResourceReaderLC( reader, resourceId ); ConstructFromResourceL( reader ); @@ -5887,7 +5865,7 @@ } CAknCharMapHistory::THistoryFilter historyFilter; - if(Extension()->IsEmotionEnabled()) + if(iExtension->IsEmotionEnabled()) { historyFilter = CAknCharMapHistory::EHistoryFilterMixed; } @@ -6002,10 +5980,7 @@ iExtension->iFlags |= EAknCharMapCharsAllocated; // mark that iChars points to HBufC } - Extension()->LoadEmotionTumbnails(*iChars); - - // control will never get focus event while it is in EditMenu mode - Extension()->iCharMapFocusGained = ETrue; + iExtension->LoadEmotionTumbnails(*iChars); // The "PlayAnimationL" in "SetSmileyAnimationActivityInCurrentPageL" // will leave. If we ignore it, just no animation is played. @@ -6262,17 +6237,9 @@ TBool CAknCharMap::IsJapaneseSctUi() const { - //Japanese feature for SCT will not be supported since TB9.2 PS2, - //so it always return EFalse. return EFalse; } -TBool CAknCharMap::IsKoreanSctUi() const - { - // Korean feature dropped half-screen SCT in 9.2, it has the same - // behavior with others, so return false here - return EFalse; - } // ----------------------------------------------------------------------------- // CAknCharMap::TitleWithSelectingSpecialChar() // Return the title string with the selecting special characters @@ -6764,22 +6731,37 @@ } } +const TInt KAnimationRepeat = 30; +const TInt KAnimationDelay = 1000*1000; + void CAknCharMap::SetSmileyAnimationActivityInCurrentPageL(TBool aIsActive) { - TInt pos = iFirstVisibleRow * iMaxColumns; - TInt maxLength = iChars->Length() - pos; - TInt length = iExtension->iMaxVisibleRows * iMaxColumns; - if(length > maxLength) length = maxLength; - - const TPtrC textInCurrentPage = iChars->Mid(pos, length); - - if(Extension()->iCharMapFocusGained && aIsActive) - { - Extension()->PlayAnimationL(textInCurrentPage); - } - else - { - Extension()->StopAnimation(textInCurrentPage); + TInt begin = iFirstVisibleRow * iMaxColumns; + TInt end = iExtension->iMaxVisibleRows * iMaxColumns + begin; + if( end > iChars->Length() ) + { + end = iChars->Length(); + } + + for( TInt i(begin); iEmotionIcon(code); + if( !icon ) + { + continue; + } + + if( ( aIsActive ) && + ( Extension()->IsShowingEmotion() || Extension()->iMenuSctHighlighted) + ) + { + icon->PlayAnimationL( KAnimationRepeat, KAnimationDelay ); + } + else + { + icon->StopAnimation(); + } } } diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknLayoutUtilsHelpers.cpp --- a/uifw/AvKon/src/AknLayoutUtilsHelpers.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknLayoutUtilsHelpers.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -28,12 +28,16 @@ #include #include #include +#include // CGlobalText +#include // CAknExtendedInputCapabilities +const TInt KAlignFlagsOfferset( 3 ); +const TInt KNeedFormat( 2000 ); // If text length < 2000 then format it. LOCAL_C TBool IsEmpty(TInt aValue) - { - return aValue == ELayoutEmpty; - } - + { + return aValue == ELayoutEmpty; + } + // ================= MEMBER FUNCTIONS ======================= @@ -52,10 +56,10 @@ const CAknLayoutFont *font = AknLayoutUtils::LayoutFontFromId(aFontId); TInt descent = font->BaselineToTextPaneBottom(); - // calculate distance down from top of parent to bottom of maximal glyph + // calculate distance down from top of parent to bottom of maximal glyph TInt top2bog = aParentHeight - b; - // distance down to baseline is distance down to bottom of glyph minus descent + // distance down to baseline is distance down to bottom of glyph minus descent // A further 1 is subtracted to account for the definition of baseline in the // Series 60 pre-2.8 layout specifications. B = top2bog - descent - 1; @@ -92,7 +96,7 @@ return EdwinHeightFromLines( font->TextPaneHeight(), decorationMetrics, - aBaselineSeparationOverRide, aNumberOfLinesToShowOverRide); + aBaselineSeparationOverRide, aNumberOfLinesToShowOverRide); } TInt AknLayoutUtilsHelpers::EdwinHeightFromLines ( @@ -218,7 +222,7 @@ { aMaxHeight = aFont->AscentInPixels(); aMaxDepth = aFont->DescentInPixels(); - } + } } @@ -260,17 +264,17 @@ paraFormat.iLineSpacingInTwips = baselineDelta; paraFormatMask.SetAttrib(EAttLineSpacing); - CAknSettingCache& cache = CAknEnv::Static()->SettingCache(); + CAknSettingCache& cache = CAknEnv::Static()->SettingCache(); paraFormat.iLanguage = cache.InputLanguage(); // Default paragraph language (in case there is no text yet) - paraFormatMask.SetAttrib(EAttParaLanguage); + paraFormatMask.SetAttrib(EAttParaLanguage); TCharFormat charFormat; TCharFormatMask charFormatMask; charFormat.iFontSpec = aFont->FontSpecInTwips(); charFormatMask.SetAttrib(EAttFontTypeface); charFormatMask.SetAttrib(EAttFontHeight); - charFormatMask.SetAttrib(EAttFontStrokeWeight); - charFormatMask.SetAttrib(EAttFontPosture); + charFormatMask.SetAttrib(EAttFontStrokeWeight); + charFormatMask.SetAttrib(EAttFontPosture); charFormat.iFontPresentation.iTextColor = AKN_LAF_COLOR_STATIC(aColor); charFormatMask.SetAttrib(EAttColor); @@ -297,6 +301,7 @@ CParaFormatLayer* paraFormatLayer = NULL; CCharFormatLayer* charFormatLayer = NULL; + TBool needFormat = EFalse; TRAPD( error, { @@ -315,13 +320,61 @@ } else { + // Get paragraph format of current editor + CGlobalText* globleText = static_cast( aEdwin->Text() ); + if ( globleText ) + { + TCursorSelection selection = aEdwin->Selection(); + TInt selectionLength = selection.Length(); + CParaFormat oldParaFormat; + TParaFormatMask oldParaMask; + TRAPD( error, globleText->GetParaFormatL( &oldParaFormat, + paraFormatMask, + selection.LowerPos(), + selectionLength ) ); + if ( error == KErrNone ) + { + // Get char format of current editor + TCharFormat oldCharFormat; + TCharFormatMask oldCharMask; + TCharFormatMask charUndeterminedMask; + globleText->GetCharFormat( oldCharFormat, + charFormatMask, + selection.LowerPos(), + selectionLength); + + // If paragraph format and char format are not changed no need to do global format. + needFormat = !( oldParaFormat.IsEqual( paraFormat, paraFormatMask ) && + oldCharFormat.IsEqual( charFormat, charFormatMask ) ); + } + } aEdwin->SetParaFormatLayer(paraFormatLayer); aEdwin->SetCharFormatLayer(charFormatLayer); } - aEdwin->SetSuppressFormatting(ETrue); - // Setting editor alignment must be done after - // other editor paragraph formatting - aEdwin->SetAlignment(aJustification); + aEdwin->SetSuppressFormatting( ETrue ); + // Setting editor alignment must be done after + // other editor paragraph formatting + if ( !needFormat ) + { + CAknExtendedInputCapabilities* extendedInputCapabilities = + aEdwin->MopGetObject( extendedInputCapabilities ); + if ( extendedInputCapabilities ) + { + /* + * We need to map LayoutAlign to InputEditorAlign, then check if the alignment + * is changed. The algorithm is follow: + * ELayoutAlignCenter = 1 -> EInputEditorAlignCenter = 0x00000010 + * ELayoutAlignLeft = 2 -> EInputEditorAlignLeft = 0x00000020 + * ELayoutAlignRight = 3 -> EInputEditorAlignRight = 0x00000040 + * ELayoutAlignBidi = 4 -> EInputEditorAlignBidi = 0x00000080 + */ + TUint capabilities = extendedInputCapabilities->Capabilities(); + capabilities &= CAknExtendedInputCapabilities::KAknEditorAlignMask; + capabilities >>= ( KAlignFlagsOfferset + aJustification ); + needFormat = ( capabilities != 1 ); + } + } + aEdwin->SetAlignment(aJustification); aEdwin->SetSuppressFormatting(EFalse); aEdwin->SetBorder(ENone); @@ -480,13 +533,20 @@ } // The order of SetRect(), AlterViewRect and NotifyNewFormat is important. - aEdwin->SetSuppressFormatting(ETrue); + aEdwin->SetSuppressFormatting( ETrue ); + // If width is changed or text length is more then 2000 we will format + // it by calling aEdwin->NotifyNewFormatL() at the end of this function. + needFormat = ( needFormat || + ( aEdwin->Rect().Width() != edwinRect.Width() ) || + aEdwin->TextLength() < KNeedFormat ); aEdwin->SetRect(edwinRect); aEdwin->SetSuppressFormatting(EFalse); - aEdwin->SetSuppressNotifyDraw( ETrue ); - TRAP_IGNORE(aEdwin->NotifyNewFormatL()); - aEdwin->SetSuppressNotifyDraw( EFalse ); + aEdwin->SetSuppressNotifyDraw( ETrue ); + aEdwin->SetSuppressFormatting( !needFormat ); + TRAP_IGNORE( aEdwin->NotifyNewFormatL() ); + aEdwin->SetSuppressFormatting( EFalse ); + aEdwin->SetSuppressNotifyDraw( EFalse ); } void AknLayoutUtilsHelpers::LayoutEdwinScalable(CEikEdwin *aEdwin, @@ -506,7 +566,7 @@ { __ASSERT_DEBUG(aEdwin,Panic(EAknPanicNullPointer)); __ASSERT_DEBUG(!(aEdwin->MaximumHeightInLines())||aNumberOfLinesShown<=aEdwin->MaximumHeightInLines(),Panic(EAknPanicOutOfRange)); - + const CAknLayoutFont *font = AknLayoutUtils::LayoutFontFromId(aFontId, aCustomFont); aBaseline = CorrectBaseline( aEdwinParent.Height(), aBaseline, aFontId); @@ -515,7 +575,7 @@ // thin imaginary line underneath the glyphs' baseline pixels: aBaseline += 1; - if (aSecondLineBaseline != 0) + if (aSecondLineBaseline != 0) { aSecondLineBaseline = CorrectBaseline( aEdwinParent.Height(),aSecondLineBaseline, aFontId); aSecondLineBaseline += 1; // This puts baseline into a more natural definition @@ -525,9 +585,9 @@ if (IsParentRelative(aRightMargin)) { aRightMargin = aEdwinParent.Width() - ELayoutP + aRightMargin; } if (IsParentRelative(aWidth)) { aWidth = aEdwinParent.Width() - ELayoutP + aWidth; } - if (IsEmpty(aLeftMargin)) { aLeftMargin = aEdwinParent.Width() - aRightMargin - aWidth; } - if (IsEmpty(aRightMargin)) { aRightMargin = aEdwinParent.Width() - aLeftMargin - aWidth; } - if (IsEmpty(aWidth)) { aWidth = aEdwinParent.Width() - aLeftMargin - aRightMargin; } + if (IsEmpty(aLeftMargin)) { aLeftMargin = aEdwinParent.Width() - aRightMargin - aWidth; } + if (IsEmpty(aRightMargin)) { aRightMargin = aEdwinParent.Width() - aLeftMargin - aWidth; } + if (IsEmpty(aWidth)) { aWidth = aEdwinParent.Width() - aLeftMargin - aRightMargin; } TAknTextDecorationMetrics metrics( aFontId ); LayoutEdwinScalableWithCorrectedParametersAndDecorationMetrics( diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknListBoxSettingPage.cpp --- a/uifw/AvKon/src/AknListBoxSettingPage.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknListBoxSettingPage.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -183,17 +183,15 @@ { TKeyEvent event; event.iCode = EKeyOK; + // restore highlight with simulated key event + TKeyResponse response = + ListBoxControl()->OfferKeyEventL( event, EEventKey ); - // restore highlight with simulated key event - TRAP_IGNORE - ( - TKeyResponse response = ListBoxControl()->OfferKeyEventL( event, EEventKey ); - if ( response == EKeyWasConsumed ) - { - highLightEnabled = ETrue; - } - ); - } + if ( response == EKeyWasConsumed ) + { + highLightEnabled = ETrue; + } + } return highLightEnabled; } diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknPhoneNumberEditor.cpp --- a/uifw/AvKon/src/AknPhoneNumberEditor.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknPhoneNumberEditor.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -32,10 +32,6 @@ #include #include -#include -#include // for checking qwerty availability - - static const TInt KPlainTextPos = 0; typedef CArrayFixFlat CFormatArray; @@ -56,8 +52,6 @@ TInt iPointPos; CAknCcpuSupport* iCcpuSupport; HBufC* iPasteText; - TBool iQwertyAllowed; - TBool iHybridModeAllowed; }; CAknPhoneNumberEditorExtension::CAknPhoneNumberEditorExtension() @@ -381,7 +375,7 @@ } if ( cousorChanged ) { - ReportAknEdStateEvent( MAknEdStateObserver::EAknCursorPositionChanged ); + ReportAknEdStateEventL( MAknEdStateObserver::EAknCursorPositionChanged ); } // see if we want to remember the old cursor X position if ( targetPosUsed ) @@ -427,7 +421,7 @@ } if ( ! IsFocused() ) { - ReportAknEdStateEvent( MAknEdStateObserver::EAknSyncEdwinState ); + TRAP_IGNORE( ReportAknEdStateEventL( MAknEdStateObserver::EAknSyncEdwinState ) ); } if ( aDrawNow ) DrawNow(); @@ -441,29 +435,16 @@ EXPORT_C TCoeInputCapabilities CAknPhoneNumberEditor::InputCapabilities() const { - if ( iExtension->iQwertyAllowed ) + if ( FeatureManager::FeatureSupported( KFeatureIdCommonVoip ) ) { TCoeInputCapabilities inputCaps( TCoeInputCapabilities::EWesternAlphabetic | TCoeInputCapabilities::ENavigation, const_cast( this ), NULL ); - //iExtension->iExtendedInputCapabilities->SetEditorType( - // CAknExtendedInputCapabilities::EPhoneNumberEditor ); - TInt qwertyActive = 0; - RProperty::Get( KCRUidAvkon, KAknQwertyInputModeActive, qwertyActive ); - if ( qwertyActive && iExtension->iHybridModeAllowed ) - { - iExtension->iExtendedInputCapabilities->SetEditorType( - CAknExtendedInputCapabilities::EHybridAlphaNumericEditor ); - } - else - { - iExtension->iExtendedInputCapabilities->SetEditorType( - CAknExtendedInputCapabilities::EPhoneNumberEditor ); - } - // Voip-enabled phone editor wants to use edit-key style hash key mode selection. + iExtension->iExtendedInputCapabilities->SetEditorType( + CAknExtendedInputCapabilities::EPhoneNumberEditor ); iExtension->iExtendedInputCapabilities->SetCapabilities( CAknExtendedInputCapabilities::EForceHashKeySelectionStatusFlagOff | CAknExtendedInputCapabilities::EForceEditSubmenuStatusFlagOff ); @@ -519,7 +500,7 @@ { iModel->SetRealCursorPosition(aCursorPos); iModel->SetAnchorPosition( aAnchorPos ); - ReportAknEdStateEvent( + ReportAknEdStateEventL( MAknEdStateObserver::EAknCursorPositionChanged ); } @@ -529,7 +510,7 @@ iModel->SetRealCursorPosition( aCursorPos ); if ( aSelect ) iModel->SetAnchorPosition( anchor ); - ReportAknEdStateEvent( + ReportAknEdStateEventL( MAknEdStateObserver::EAknCursorPositionChanged ); } @@ -663,7 +644,7 @@ iModel->SetRealCursorPosition( iModel->Uncompensate( aCursorSelection.iCursorPos ) ); iModel->SetAnchorPosition( iModel->Uncompensate( aCursorSelection.iAnchorPos ) ); - ReportAknEdStateEvent( + ReportAknEdStateEventL( MAknEdStateObserver::EAknCursorPositionChanged ); DrawNow(); } @@ -791,7 +772,7 @@ { TInt value( EAknEditorNumericInputMode ); // Return value. - if ( iExtension->iQwertyAllowed ) + if ( FeatureManager::FeatureSupported( KFeatureIdCommonVoip ) ) { CAknEdwinState* fepState = ( CAknEdwinState* )iFepState; @@ -895,32 +876,9 @@ fepState->SetSpecialCharacterTableResourceId( 0 ); fepState->SetNumericKeymap( EAknEditorStandardNumberModeKeymap ); - iExtension->iQwertyAllowed = EFalse; - iExtension->iHybridModeAllowed = EFalse; - DrawChanges(); } - -// -------------------------------------------------------------------------- -// CAknPhoneNumberEditor::SetQwertyAllowed -// -------------------------------------------------------------------------- -// -EXPORT_C void CAknPhoneNumberEditor::SetQwertyAllowed( TBool aQwertyAllowed ) - { - iExtension->iQwertyAllowed = aQwertyAllowed; - } - -// -------------------------------------------------------------------------- -// CAknPhoneNumberEditor::SetHybridModeAllowed -// -------------------------------------------------------------------------- -// -EXPORT_C void CAknPhoneNumberEditor::SetHybridModeAllowed( TBool aHybridModeAllowed ) - { - iExtension->iHybridModeAllowed = aHybridModeAllowed; - } - - // -------------------------------------------------------------------------- // CAknPhoneNumberEditor::HandlePointerEventL // -------------------------------------------------------------------------- @@ -1168,19 +1126,6 @@ // EXPORT_C void CAknPhoneNumberEditor::CcpuPasteL() { - // When we paste the buffer to phone number editor, we must get the buffer from clipboard first - // and then insert buffer to phone number editor. As the main job of CcpuCanPaste() is getting and - // checking the buffer in clipboard, so we must call CcpuCanPaste() first. - // If iExtension->iPasteText is not NULL, it means CcpuCanPaste() has been called before and the - // buffer in clipboard is valid. No need to call it once again. - if ( !iExtension->iPasteText ) - { - // If the return value of CcpuCanPaste is EFalse, iExtension->iPasteText must be NULL, - // else if the return value of CcpuCanPaste is ETure, iExtension->iPasteText must not be NULL. - // So we don't need to check if the return value is ETure or EFalse, - // we will check iExtension->iPasteText instead of that. - CcpuCanPaste(); - } if ( iExtension->iPasteText ) { iModel->Paste( iExtension->iPasteText->Des() ); @@ -1308,8 +1253,8 @@ TUint cap = iExtension->iExtendedInputCapabilities->Capabilities(); cap &= ~CAknExtendedInputCapabilities::EInputEditorDisableVKB; iExtension->iExtendedInputCapabilities->SetCapabilities( cap ); - ReportAknEdStateEvent( - MAknEdStateObserver::EAknActivatePenInputRequest ); + TRAP_IGNORE( ReportAknEdStateEventL( + MAknEdStateObserver::EAknActivatePenInputRequest ) ); } // -------------------------------------------------------------------------- @@ -1321,14 +1266,14 @@ TUint cap = iExtension->iExtendedInputCapabilities->Capabilities(); cap |= CAknExtendedInputCapabilities::EInputEditorDisableVKB; iExtension->iExtendedInputCapabilities->SetCapabilities( cap ); - ReportAknEdStateEvent( MAknEdStateObserver::EAknClosePenInputRequest ); + ReportAknEdStateEventL( MAknEdStateObserver::EAknClosePenInputRequest ); } // -------------------------------------------------------------------------- // CAknPhoneNumberEditor::ReportAknEdStateEventL // -------------------------------------------------------------------------- // -void CAknPhoneNumberEditor::ReportAknEdStateEvent( +void CAknPhoneNumberEditor::ReportAknEdStateEventL( MAknEdStateObserver::EAknEdwinStateEvent aStateEvent ) { CAknEdwinState* edwinState = STATIC_CAST( CAknEdwinState*,State(KNullUid) ); diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknPopupField.cpp --- a/uifw/AvKon/src/AknPopupField.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknPopupField.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -932,7 +932,7 @@ && iExtension && iExtension->iSingleClickEnabled ) { // Edit mode to view while popup is open -> first cancel popup - TRAP_IGNORE(AttemptExitL( EFalse )); + AttemptExitL( EFalse ); } else { diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknPreviewPopUp.cpp --- a/uifw/AvKon/src/AknPreviewPopUp.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknPreviewPopUp.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-2010 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" @@ -360,7 +360,7 @@ TRAP_IGNORE( CreateClosingIconL() ); } break; - + case KEikDynamicLayoutVariantSwitch: if ( iFlags & CAknPreviewPopUpController::EFixedMode ) { diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknPreviewPopUpController.cpp --- a/uifw/AvKon/src/AknPreviewPopUpController.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknPreviewPopUpController.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -131,15 +131,6 @@ // CAknPreviewPopUpController::~CAknPreviewPopUpController() { - // If transition effect is on, when the deleting is caused by pressing red key - // (the font for CONE is already destroyed), the preview popup's hide operation - // will call its draw operation which will use the deleted font, thus panic happens; - // we hide the popup here in advance to prevent transation effect from drawing. - if( iPopUp->IsVisible() ) - { - iPopUp->MakeVisible( EFalse ); - } - Cancel(); delete iPopUp; iObservers.Reset(); diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknProgressDialog.cpp --- a/uifw/AvKon/src/AknProgressDialog.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknProgressDialog.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -77,7 +77,7 @@ key.iCode=EKeyEscape; key.iModifiers=0; key.iScanCode = EStdKeyNull; - TRAP_IGNORE(iAknProgressDialog->OfferKeyEventL(key, EEventKey)); + iAknProgressDialog->OfferKeyEventL(key, EEventKey); } CAknProgressDialog::CCancelWhileHidden::CCancelWhileHidden(CAknProgressDialog* aAknProgressDialog) @@ -226,7 +226,7 @@ MakeVisible(ETrue); CCoeControl* cba = ButtonGroupContainer().ButtonGroup()->AsControl(); iEikonEnv->RemoveFromStack(cba); - TRAP_IGNORE(iEikonEnv->EikAppUi()->AddToStackL(cba, ECoeStackPriorityCba, ECoeStackFlagRefusesFocus)); // Won't fail since we just removed it (and array will not reallocate) + __ASSERT_DEBUG_NO_LEAVE(iEikonEnv->EikAppUi()->AddToStackL(cba, ECoeStackPriorityCba, ECoeStackFlagRefusesFocus)); // Won't fail since we just removed it (and array will not reallocate) cba->DrawableWindow()->SetOrdinalPosition(0); cba->MakeVisible(ETrue); ReportUserActivity(); diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknQueryControl.cpp --- a/uifw/AvKon/src/AknQueryControl.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknQueryControl.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -79,7 +79,7 @@ #include "akntrace.h" const TInt KPinCodeTacticonInterval = 30000000; // 30s -const TInt KPinCodeMaxTacticons = 5; +const TInt KPinCodeMaxTacticons = 10; /******* * CAknQueryControlExtension */ @@ -3072,11 +3072,8 @@ DeactivateGc(); // Draw the label after the background. - TRAPD(err, iPrompt->Line( i )->ActivateL()); // Never leaves - if (err == KErrNone) - { - iPrompt->Line( i )->DrawNow(); - } + iPrompt->Line( i )->ActivateL(); // Never leaves + iPrompt->Line( i )->DrawNow(); iPrompt->SetLineModified( i, EFalse ); } } @@ -4079,11 +4076,8 @@ DeactivateGc(); // Draw the label after the background. - TRAPD(err, iPrompt->Line( i )->ActivateL()); // Never leaves - if (err == KErrNone) - { - iPrompt->Line( i )->DrawNow(); - } + iPrompt->Line( i )->ActivateL(); // Never leaves + iPrompt->Line( i )->DrawNow(); iPrompt->SetLineModified( i, EFalse ); } } diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknQueryDialog.cpp --- a/uifw/AvKon/src/AknQueryDialog.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknQueryDialog.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -428,10 +428,13 @@ CAknsFrameBackgroundControlContext* cc = (CAknsFrameBackgroundControlContext*)AknsDrawUtils::ControlContext( this ); cc->SetCenter(KAknsIIDQsnFrPopupCenterQuery); - - // Check Query is wait of not. - TBool isWaitDialog( ( DialogFlags() & EEikDialogFlagWait ) != 0 ); - + + TBool isWaitDialog(EFalse); + + if ( DialogFlags() & EEikDialogFlagWait ) + { + isWaitDialog = ETrue; + } SetGloballyCapturing(ETrue); TInt ret = CAknDialog::RunLD(); _AKNTRACE( "[%s][%s] ret: %d", "CAknQueryDialog", __FUNCTION__, ret ); @@ -439,7 +442,7 @@ { soundSystem->PopContext(); } - // If wait QueryDialog, instance will be deleted right after RunLD via CBA + if ( !isWaitDialog ) { SetGloballyCapturing(EFalse); @@ -2121,10 +2124,6 @@ CEikCaptionedControl *ctrl2 = GetLineByLineAndPageIndex(line2, 0); TryChangeFocusToL(ctrl2->iId); HandleOrientationSwitch(); - // In landscape mode, the first and second lines are at the same position, - // so set the height of first line¡¯s control to 0 to prevent it from being - // selected by touch event. - ctrl1->SetSize( TSize( ctrl1->Size().iWidth, 0 ) ); UpdateLeftSoftKeyL(); _AKNTRACE( "[%s][%s] return EFalse", "CAknMultiLineDataQueryDialog", __FUNCTION__); diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknRadioButtonSettingPage.cpp --- a/uifw/AvKon/src/AknRadioButtonSettingPage.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknRadioButtonSettingPage.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -92,10 +92,9 @@ CAknRadioButtonSettingPageExtension::CAknRadioButtonSettingPageExtension( CCoeControl& aOwner ) : - iOldFocusedItemIndex( -1 ), - iIsDragged( EFalse ), - iPenDownOnItem ( KErrNotFound ), - iIsValidSelection( ETrue ) + iOldFocusedItemIndex(-1), iIsDragged( EFalse ), + iIsValidSelection( ETrue ), + iPenDownOnItem ( KErrNotFound ) { if ( static_cast( aOwner.ControlEnv()->AppUi() )->IsSingleClickCompatible() ) @@ -181,7 +180,7 @@ { iExtension = new (ELeave) CAknRadioButtonSettingPageExtension( *this ); } - iExtension->iIsValidSelection = ( iCurrentSelectionIndex != -1 ); + // Range should be within the valid indices, or -1: // So valid range is >= -1 and also < Count. __ASSERT_ALWAYS( iCurrentSelectionIndex >= -1, Panic( EAknPanicRadioButtonSettingPageIndexOutOfRange) ); @@ -315,8 +314,7 @@ { iCurrentSelectionIndex = ListBoxControl()->CurrentItemIndex(); } - else if( iCurrentSelectionIndex >= 0 && - iCurrentSelectionIndex < ListBoxControl()->Model()->NumberOfItems() ) + else { ListBoxControl()->SetCurrentItemIndex ( iCurrentSelectionIndex ); } @@ -526,16 +524,10 @@ EXPORT_C void CAknRadioButtonSettingPage::HandleResourceChange(TInt aType) { if( aType == KAknsMessageSkinChange ) - { - TRAP_IGNORE( InitialiseRadioButtonBitmapsL() ); - } - else if( aType == KEikMessageFadeAllWindows ) - { - if ( iExtension ) - { - iExtension->iIsValidSelection = EFalse; - } - } + { + TRAP_IGNORE( InitialiseRadioButtonBitmapsL() ); + } + CAknListBoxSettingPage::HandleResourceChange(aType); } diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknSctDialog.cpp --- a/uifw/AvKon/src/AknSctDialog.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknSctDialog.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -56,7 +56,6 @@ #include "aknsctfocushandler.h" #include -#include // // class CAknCharMapDialog @@ -92,9 +91,6 @@ private: CAknCharMapDialogExtension(CAknCharMapDialog* aCaller); void ConstructL(); - -public: // New method - void SetCharacterCaseIfRequiredL(); public: TInt iFlags; @@ -105,8 +101,7 @@ TInt iShowAnotherTableCharCase; TAknCharMapPictoMode iPictoMode; TAknCharMapEmotionMode iEmotionMode; - TBool iFirstOrientation; - TBool iSimKeyDown; + }; // ----------------------------------------------------------------------------- @@ -117,8 +112,7 @@ // CAknCharMapDialogExtension::CAknCharMapDialogExtension(CAknCharMapDialog* aCaller) : iFlags(0), iQwertyMode(EFalse), iCaller(aCaller), -iShowAnotherTableCharCase(-1), iPictoMode(EAknCharMapPictoNoUse), iEmotionMode(EAknCharMapEmotionNoUse), -iSimKeyDown( EFalse ) +iShowAnotherTableCharCase(-1), iPictoMode(EAknCharMapPictoNoUse), iEmotionMode(EAknCharMapEmotionNoUse) { } @@ -155,45 +149,6 @@ // void CAknCharMapDialogExtension::ConstructL() { - iFirstOrientation = Layout_Meta_Data::IsLandscapeOrientation(); - } - -// ----------------------------------------------------------------------------- -// CAknCharMapDialogExtension::SetCharacterCaseIfRequiredL -// -// change the character case, when orientation changed if any. -// ----------------------------------------------------------------------------- -// -void CAknCharMapDialogExtension::SetCharacterCaseIfRequiredL() - { - TBool landscape = Layout_Meta_Data::IsLandscapeOrientation(); - TInt charCase = EAknSCTLowerCase; - CAknCharMap* charmapControl = - STATIC_CAST( CAknCharMap*, iCaller->Control( EAknSCTQueryContentId ) ); - - // Set character case logic changed from Timebox 92 PS2, if Orientation is Landscape - // the case will be QWERTY, otherwise it will be LOWER. However, it is possible for - // Landscape launches LOWER case, or Poratrait does QWERTY at the first time launched, - // in this case, we need to store the first SCT launched case. - if ( landscape ) - { - iFlags |= ECharMapDialogItemLockNumericKeys; - charCase = EAknSCTQwerty; - } - else - { - iFlags &= ( ~ECharMapDialogItemLockNumericKeys ); - charCase = EAknSCTLowerCase; - } - - if ( landscape == iFirstOrientation ) - { - // Note, it should be equal to first char case once it return - // to the first orientation - charCase = iCaller->CharacterCase(); - } - charmapControl->SetCharacterCaseL( charCase ); - } // CAknCharMapDialog @@ -224,12 +179,6 @@ { CAknCharMap* charmapControl = static_cast( Control( EAknSCTQueryContentId ) ); - if (aType==KEikDynamicLayoutVariantSwitch) - { - TRAP_IGNORE(iExtension->SetCharacterCaseIfRequiredL()); - //DoLayout(); - } - CAknDialog::HandleResourceChange(aType); if (aType==KEikDynamicLayoutVariantSwitch) @@ -299,7 +248,20 @@ // to select multiple characters before. if (aButtonId == EAknSoftkeyOk || aButtonId == EAknSoftkeySelect || aButtonId == EAknSoftkeyExit) { + // In Japanese UI, SCT isn't closed by pressing "Select" softkey, + // but SCT is closed by pressing "Back"(button id is EAknSoftkeyClose). MAknSctFocusHandler* handler = charmapControl->FocusHandler(); + if (charmapControl->IsJapaneseSctUi() && + aButtonId != EAknSoftkeyExit && + handler->FocusedControl() == charmapControl) + { + TKeyEvent key; + key.iCode=EKeySpace; + key.iModifiers=0; + handler->FocusedControl()->OfferKeyEventL(key, EEventKey); + return(EFalse); + } + // else TKeyEvent key; key.iCode=EKeyOK; key.iModifiers=0; @@ -386,12 +348,7 @@ DrawableWindow()->SetOrdinalPosition(0,ECoeWinPriorityAlwaysAtFront); // ButtonGroupContainer().ButtonGroup()->AsControl()->DrawableWindow()->SetOrdinalPosition(0,ECoeWinPriorityAlwaysAtFront); - // Boost its priority in GlobalPopupPriorityController queue, because its window priority is higher than zero, - // otherwise, GlobalPopupPriorityController will dim it wrongly. - // This code only effects for aknnfysrv.exe, since input server doesn't have GlobalPopupPriorityController instance. - AknGlobalPopupPriorityController::SetPopupPriorityL(*this, 1); - - CEikDialog::Extension()->SetPriority(CActive::EPriorityStandard); + CEikDialog::Extension()->SetPriority(CActive::EPriorityStandard); } EXPORT_C void CAknCharMapDialog::SetSizeAndPosition( const TSize& aSize ) @@ -481,35 +438,20 @@ break; } } - else if ( aModifiers == EEventKeyDown ) + else if (aModifiers == EEventKeyUp) { - switch ( aKeyEvent.iScanCode ) + switch (aKeyEvent.iScanCode) { case EStdKeyLeftFunc: case EStdKeyRightFunc: { - iExtension->iSimKeyDown = ETrue; - } - break; - default: - break; - } - } - else if ( aModifiers == EEventKeyUp ) - { - switch ( aKeyEvent.iScanCode ) - { - case EStdKeyLeftFunc: - case EStdKeyRightFunc: - { - if ( !aKeyEvent.iRepeats && iExtension->iSimKeyDown ) // switch another table when repeat count is 0 only. + if (!aKeyEvent.iRepeats) // switch another table when repeat count is 0 only. { if (!isLockNumericKeys) // Check whether current input mode is Qwerty. { SwitchTablesOrPagesL(); } } - iExtension->iSimKeyDown = EFalse; } break; default: @@ -995,8 +937,5 @@ } } -TInt CAknCharMapDialog::CharacterCase() - { - return iCharCase & KCharMapCaseMask; - } + // End of File diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknServerApp.cpp --- a/uifw/AvKon/src/AknServerApp.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknServerApp.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -21,7 +21,6 @@ #include #include -#include #include "AknOpenFileServiceImpl.h" #include "AknNullServiceImpl.h" #include "AknLaunchAppServiceImpl.h" @@ -39,7 +38,6 @@ #endif CEikonEnv* eikEnv = CEikonEnv::Static(); RWindowGroup& wg = eikEnv->RootWin(); - CAknSgcClient::UseForegroundPriorityDuringRelinquish( ETrue ); ConnectNewChildAppL(aAppUid, wg); } @@ -52,7 +50,6 @@ #ifdef AVKON_RDEBUG_INFO RDebug::Print(_L("RAknAppServiceBase::Close")); #endif - CAknSgcClient::UseForegroundPriorityDuringRelinquish( EFalse ); REikAppServiceBase::Close(); } diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknSettingItemList.cpp --- a/uifw/AvKon/src/AknSettingItemList.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknSettingItemList.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -111,7 +111,7 @@ // ------------------------------- // -NONSHARABLE_CLASS( CAknSettingItemExtension ) : public CBase +NONSHARABLE_CLASS( CAknSettingItemExtension ) : CBase { public: diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknSettingPage.cpp --- a/uifw/AvKon/src/AknSettingPage.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknSettingPage.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -592,7 +592,7 @@ iEikonEnv->EikAppUi()->RemoveFromStack(this); - TRAP_IGNORE(AknItemActionMenuRegister::SetOverridingMenuBarOwnerL( NULL )); + AknItemActionMenuRegister::SetOverridingMenuBarOwnerL( NULL ); if (iMenuBar) { diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknSignalIcon.cpp --- a/uifw/AvKon/src/AknSignalIcon.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknSignalIcon.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -22,7 +22,6 @@ #include #include #include -#include #include #include @@ -253,274 +252,6 @@ iIconState = aIconState; iColorIndex = aIconColorIndex; } - -void CAknSignalIcon::LoadTDIconL(TInt aIconState, TInt aIconColorIndex) - { - - MAknsSkinInstance* skin = AknsUtils::SkinInstance(); - CFbsBitmap* bitmap = NULL; - CFbsBitmap* mask = NULL; - - switch (aIconState) - { - // Old legacy GPRS icons. - case EAknSignalGprsIndicatorOff: - case EAknSignalGprsIndicatorAvailable: // fallthrough - AknsUtils::CreateColorIconL(skin, KAknsIIDQgnPropSignalIcon, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_gprs_tdscdma_icon, - EMbmAvkonQgn_indi_signal_gprs_tdscdma_icon_mask, KRgbGray ); - break; - case EAknSignalGprsIndicatorAttached: - case EAknSignalGprsIndicatorEstablishingContext: // fallthrough - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalGprsContext, KAknsIIDQsnIconColors, - aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_gprs_tdscdma_attach, - EMbmAvkonQgn_indi_signal_gprs_tdscdma_attach_mask, KRgbGray ); - break; - case EAknSignalGprsIndicatorContext: - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalGprsContext, KAknsIIDQsnIconColors, - aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_gprs_tdscdma_context, - EMbmAvkonQgn_indi_signal_gprs_tdscdma_context_mask, KRgbGray ); - break; - case EAknSignalGprsIndicatorSuspended: - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalGprsSuspended, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_gprs_tdscdma_suspended, - EMbmAvkonQgn_indi_signal_gprs_tdscdma_suspended_mask, KRgbGray ); - break; - case EAknSignalGprsIndicatorMultipdp: - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalGprsMultipdp, KAknsIIDQsnIconColors, - aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_gprs_tdscdma_multipdp, - EMbmAvkonQgn_indi_signal_gprs_tdscdma_multipdp_mask, KRgbGray ); - break; - - // Create common packet data indicator bitmaps. - case EAknSignalCommonPacketDataIndicatorOff: - case EAknSignalCommonPacketDataIndicatorAvailable: // fallthrough - AknsUtils::CreateColorIconL(skin, KAknsIIDQgnPropSignalIcon, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_gprs_tdscdma_icon, - EMbmAvkonQgn_indi_signal_gprs_tdscdma_icon_mask, KRgbGray ); - break; - case EAknSignalCommonPacketDataIndicatorAttached: - case EAknSignalCommonPacketDataIndicatorEstablishingContext: // fallthrough - AknsUtils::CreateColorIconL(skin, KAknsIIDQgnIndiSignalPdAttach, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_gprs_tdscdma_attach, - EMbmAvkonQgn_indi_signal_gprs_tdscdma_attach_mask, KRgbGray ); - break; - case EAknSignalCommonPacketDataIndicatorContext: - AknsUtils::CreateColorIconL(skin, KAknsIIDQgnIndiSignalPdContext, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_gprs_tdscdma_context, - EMbmAvkonQgn_indi_signal_gprs_tdscdma_context_mask, KRgbGray ); - break; - case EAknSignalCommonPacketDataIndicatorSuspended: - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalPdSuspended, KAknsIIDQsnIconColors, - aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_gprs_tdscdma_suspended, - EMbmAvkonQgn_indi_signal_gprs_tdscdma_suspended_mask, KRgbGray ); - break; - case EAknSignalCommonPacketDataIndicatorMultipdp: - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalPdMultipdp, KAknsIIDQsnIconColors, - aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_gprs_tdscdma_multipdp, - EMbmAvkonQgn_indi_signal_gprs_tdscdma_multipdp_mask, KRgbGray ); - break; - - // Create EDGE packet data indicator bitmaps. - case EAknSignalEdgeIndicatorOff: - AknsUtils::CreateColorIconL(skin, KAknsIIDQgnPropSignalIcon, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_egprs_icon, - EMbmAvkonQgn_indi_signal_egprs_icon_mask, KRgbGray ); - break; - case EAknSignalEdgeIndicatorAvailable: - AknsUtils::CreateColorIconL(skin, KAknsIIDQgnPropSignalIcon, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_egprs_icon, - EMbmAvkonQgn_indi_signal_egprs_icon_mask, KRgbGray ); - break; - case EAknSignalEdgeIndicatorAttached: - case EAknSignalEdgeIndicatorEstablishingContext: // fallthrough - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalEgprsAttach, KAknsIIDQsnIconColors, - aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_egprs_attach, - EMbmAvkonQgn_indi_signal_egprs_attach_mask, KRgbGray ); - break; - case EAknSignalEdgeIndicatorContext: - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalEgprsContext, KAknsIIDQsnIconColors, - aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_egprs_context, - EMbmAvkonQgn_indi_signal_egprs_context_mask, KRgbGray ); - break; - case EAknSignalEdgeIndicatorSuspended: - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalEgprsSuspended, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_egprs_suspended, - EMbmAvkonQgn_indi_signal_egprs_suspended_mask, KRgbGray ); - break; - case EAknSignalEdgeIndicatorMultipdp: - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalEgprsMultipdp, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_egprs_multipdp, - EMbmAvkonQgn_indi_signal_egprs_multipdp_mask, KRgbGray ); - break; - - // Create WCDMA indicator bitmaps. - case EAknSignalWcdmaIndicatorOff: - AknsUtils::CreateColorIconL(skin, KAknsIIDQgnPropSignalIcon, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_tdscdma_icon, - EMbmAvkonQgn_indi_signal_tdscdma_icon_mask, KRgbGray ); - break; - case EAknSignalWcdmaIndicatorAvailable: - AknsUtils::CreateColorIconL(skin, KAknsIIDQgnIndiSignalWcdmaIcon, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_tdscdma_icon, - EMbmAvkonQgn_indi_signal_tdscdma_icon_mask, KRgbGray ); - break; - case EAknSignalWcdmaIndicatorAttached: - case EAknSignalWcdmaIndicatorEstablishingContext: // fallthrough - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalWcdmaAttach, KAknsIIDQsnIconColors, - aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_tdscdma_attach, - EMbmAvkonQgn_indi_signal_tdscdma_attach_mask, KRgbGray ); - break; - case EAknSignalWcdmaIndicatorContext: - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalWcdmaContext, KAknsIIDQsnIconColors, - aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_tdscdma_context, - EMbmAvkonQgn_indi_signal_tdscdma_context_mask, KRgbGray ); - break; - case EAknSignalWcdmaIndicatorMultipdp: - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalWcdmaMultipdp, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_tdscdma_multipdp, - EMbmAvkonQgn_indi_signal_tdscdma_multipdp_mask, KRgbGray ); - break; - case EAknSignalWcdmaIndicatorSuspended: - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalWcdmaSuspended, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_tdscdma_suspended, - EMbmAvkonQgn_indi_signal_tdscdma_suspended_mask, KRgbGray ); - break; - - // Create HSDPA indicator bitmaps. - case EAknSignalHsdpaIndicatorOff: - AknsUtils::CreateColorIconL(skin, KAknsIIDQgnPropSignalIcon, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_hsdpa_tdscdma_icon, - EMbmAvkonQgn_indi_signal_hsdpa_tdscdma_icon_mask, KRgbGray ); - break; - case EAknSignalHsdpaIndicatorAvailable: - AknsUtils::CreateColorIconL(skin, KAknsIIDQgnIndiSignalHsdpaIcon, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_hsdpa_tdscdma_icon, - EMbmAvkonQgn_indi_signal_hsdpa_tdscdma_icon_mask, KRgbGray ); - break; - case EAknSignalHsdpaIndicatorAttached: - case EAknSignalHsdpaIndicatorEstablishingContext: // fallthrough - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalHsdpaAttach, KAknsIIDQsnIconColors, - aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_hsdpa_tdscdma_attach, - EMbmAvkonQgn_indi_signal_hsdpa_tdscdma_attach_mask, KRgbGray ); - break; - case EAknSignalHsdpaIndicatorContext: - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalHsdpaContext, KAknsIIDQsnIconColors, - aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_hsdpa_tdscdma_context, - EMbmAvkonQgn_indi_signal_hsdpa_tdscdma_context_mask, KRgbGray ); - break; - case EAknSignalHsdpaIndicatorSuspended: - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalHsdpaSuspended, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_hsdpa_tdscdma_suspended, - EMbmAvkonQgn_indi_signal_hsdpa_tdscdma_suspended_mask, KRgbGray ); - break; - case EAknSignalHsdpaIndicatorMultipdp: - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalHsdpaMultipdp, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_hsdpa_tdscdma_multipdp, - EMbmAvkonQgn_indi_signal_hsdpa_tdscdma_multipdp_mask, KRgbGray ); - break; - - // Default in all situations - default: - AknsUtils::CreateColorIconL(skin, KAknsIIDQgnPropSignalIcon, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_prop_signal_icon, - EMbmAvkonQgn_prop_signal_icon_mask, KRgbGray ); - } - - -if ( bitmap ) - { - delete iSignalIcon; - iSignalIcon = bitmap; - AknIconUtils::SetSize( iSignalIcon, Size() ); - } - -if ( mask ) - { - delete iSignalIconMask; - iSignalIconMask = mask; - } - -iIconState = aIconState; -iColorIndex = aIconColorIndex; -} - // --------------------------------------------------------------------------- // CAknSignalIcon::LoadIconL // --------------------------------------------------------------------------- @@ -566,11 +297,6 @@ LoadATTIconL( aIconState, aIconColorIndex ); return; } - if ( iTDEnable ) - { - LoadTDIconL( aIconState, aIconColorIndex ); - return; - } switch( aIconState ) { // Old legacy GPRS icons. @@ -926,62 +652,6 @@ KRgbGray ); break; - case EAknSignalUmaIndicatorOff: - // default icon - AknsUtils::CreateColorIconL(skin, KAknsIIDQgnPropSignalIcon, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_prop_signal_icon, - EMbmAvkonQgn_prop_signal_icon_mask, KRgbGray ); - break; - - case EAknSignalUmaIndicatorAvailable: - AknsUtils::CreateColorIconL( skin, - KAknsIIDQgnIndiSignalUmaIcon, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_uma_icon, - EMbmAvkonQgn_indi_signal_uma_icon_mask, - KRgbGray ); - break; - - case EAknSignalUmaIndicatorAttached: - case EAknSignalUmaIndicatorEstablishingContext: - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalUmaAttach, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_uma_attach, - EMbmAvkonQgn_indi_signal_uma_attach_mask, KRgbGray ); - break; - - case EAknSignalUmaIndicatorContext: - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalUmaContext, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_uma_context, - EMbmAvkonQgn_indi_signal_uma_context_mask, KRgbGray ); - break; - - case EAknSignalUmaIndicatorSuspended: - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalUmaSuspended, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_uma_suspended, - EMbmAvkonQgn_indi_signal_uma_suspended_mask, KRgbGray ); - break; - - case EAknSignalUmaIndicatorMultipdp: - AknsUtils::CreateColorIconL(skin, - KAknsIIDQgnIndiSignalUmaMultipdp, - KAknsIIDQsnIconColors, aIconColorIndex, bitmap, mask, - AknIconUtils::AvkonIconFileName(), - EMbmAvkonQgn_indi_signal_uma_multipdp, - EMbmAvkonQgn_indi_signal_uma_multipdp_mask, KRgbGray ); - break; - // Default in all situations default: AknsUtils::CreateColorIconL( skin, @@ -1116,8 +786,6 @@ } delete repo; repo = NULL; - - iTDEnable = FeatureManager::FeatureSupported( KFeatureIdFfTdScdma ); } // End of File diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknSkinnableClock.cpp --- a/uifw/AvKon/src/AknSkinnableClock.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknSkinnableClock.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -417,7 +417,7 @@ homeTime.HomeTime(); if (iFace) { - TRAP_IGNORE(iFace->DrawTimeToBitmapL(rect, gc, homeTime)); + iFace->DrawTimeToBitmapL(rect, gc, homeTime); } } diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknSkinnableClockFace.cpp --- a/uifw/AvKon/src/AknSkinnableClockFace.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknSkinnableClockFace.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -90,6 +90,11 @@ locale.Refresh(); TDigitType digitType( locale.DigitType() ); + if ( uiLanguage == ELangUrdu ) + { + return EFalse; + } + return ( AknTextUtils::DigitModeQuery() && digitType != EDigitTypeDevanagari ); } diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknSmileyImage.cpp --- a/uifw/AvKon/src/AknSmileyImage.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknSmileyImage.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -234,15 +234,15 @@ if(iImageSkinItemId.iMinor > 0) { MAknsSkinInstance* skin = AknsUtils::SkinInstance(); - TRAP_IGNORE(AknsUtils::CreateColorIconL(skin, iImageSkinItemId, - KAknsIIDQsnTextColors,EAknsCIQsnTextColorsCG19, - iFrame,iFrameMask, - smileyMifName, iImageMifPkgItemId,iImageMifPkgItemId, - AKN_LAF_COLOR(215))); + TRAPD(err, AknsUtils::CreateColorIconL(skin, iImageSkinItemId, + KAknsIIDQsnTextColors,EAknsCIQsnTextColorsCG19, + iFrame,iFrameMask, + smileyMifName, iImageMifPkgItemId,iImageMifPkgItemId, + AKN_LAF_COLOR(215))); } else { - TRAP_IGNORE(AknIconUtils::CreateIconL(iFrame,iFrameMask,smileyMifName,iImageMifPkgItemId,iImageMifPkgItemId)); + TRAPD(err, AknIconUtils::CreateIconL(iFrame,iFrameMask,smileyMifName,iImageMifPkgItemId,iImageMifPkgItemId)); } if(iIsAnimation) // the first frame of animation svg is blank without correct content diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknSmileyModel.cpp --- a/uifw/AvKon/src/AknSmileyModel.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknSmileyModel.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -1025,40 +1025,12 @@ } } -void CSmileyModel::PlayAnimationL(const TDesC& aText, TInt aRepeat, TInt aDelay) - { - for(TInt i(0); i(Smiley(aChar)); iSmileyLoader.AddTaskL(icon); } -void CSmileyModel::PlayAnimationL(TChar aChar, TInt aRepeat, TInt aDelay) - { - CSmileyIcon* icon = static_cast(Smiley(aChar)); - if(icon) icon->PlayAnimationL(aRepeat, aDelay); - } - -void CSmileyModel::StopAnimation(TChar aChar) - { - CSmileyIcon* icon = static_cast(Smiley(aChar)); - if(icon) icon->StopAnimation(); - } - const TDesC& CSmileyModel::Text(TInt aIndex, TInt aVariant) const { CSmileyIcon* icon = static_cast((*this)[aIndex]); diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknSmileyUtils.cpp --- a/uifw/AvKon/src/AknSmileyUtils.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknSmileyUtils.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -50,10 +50,9 @@ return FALSE; } -const TSize KSize; const TSize& CAknSmileyIcon::Size() const { - return KSize; + return TSize(); } void CAknSmileyIcon::PlayAnimationL(TInt /*aRepeat*/, TInt /*aDelay*/) diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknTabGrpGraphics.cpp --- a/uifw/AvKon/src/AknTabGrpGraphics.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknTabGrpGraphics.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -49,76 +49,6 @@ //const TUint8 KHiddenFadeBlackMap( 20 ); //const TUint8 KHiddenFadeWhiteMap( 255 ); - -/****************************** New functions for refactoring tab drawing logic ******************************/ -/** - * Specifies the structure of each drawing instruction - */ -struct TTabInstruction - { - // 1 - Active tab, 2 - Passive tab, 3 - HighLight tab, 4 - Bit tab right, 5 - Bit tab left. - TInt iTabStyle; - - // 1 - iFirstTab, 2 - iSecondTab, 3 - iThirdTab, 4 - iFourthTab, 5 - iHiddenTabLeft, 6 - iHiddenTabRight. - TInt iLayoutIdx; - - // Rect for DrawPassiveTabBit. - TRect iBitTabRect; - - // Fade for DrawPassiveTab. - TBool iPassiveFade; - }; - -/******************** Three help functions for setting struct TTabInstruction. *******************/ -/** - * Composes the instructions used for drawing passive bit tab. - * - */ -void AssemblyPassiveTabBitInstruction( - TTabInstruction& instruction, - TInt aTabStyle, - TRect &aRect ) - { - instruction.iTabStyle = aTabStyle; - instruction.iBitTabRect = aRect; - } - -/** - * Composes the instructions used for drawing passive or highlight tab. - * - */ -void AssemblyPassiveOrHighlightTabInstruction( - TTabInstruction& instruction, - TInt aHighlightTab, - TInt aLayoutIdx, - TBool aFade ) - { - if (aHighlightTab != 0 && aHighlightTab == aLayoutIdx) - { - //Highlight tab - instruction.iTabStyle = 3; - } - else - { - instruction.iTabStyle = 2; - } - instruction.iLayoutIdx = aLayoutIdx; - instruction.iPassiveFade = aFade; - } - -/** - * Composes the instructions for drawing active tab. - * - */ -void AssemblyActiveTabInstruction( - TTabInstruction& instruction, - TInt aLayoutIdx ) - { - instruction.iTabStyle = 1; - instruction.iLayoutIdx = aLayoutIdx; - } - - // ============================ MEMBER FUNCTIONS =============================== // ----------------------------------------------------------------------------- @@ -187,11 +117,217 @@ iTabGroupBackgroundParent = aParent; } +#if 0 + +CAknTabGroupGraphics::SAknTabGroupBackground CAknTabGroupGraphics::CreateTabGroupBackgroundL( TInt aAvkonBitmapId) + { + CAknTabGroupGraphics::SAknTabGroupBackground emptyTabGroupBackGround; + + if ( !TabGroupBackgroundAvailable() ) + { + return emptyTabGroupBackGround; + } + + TBool longTabs = EFalse; + TInt numberOfTabs = 0; + TInt activeTab = 0; + + switch ( aAvkonBitmapId ) + { + case EMbmAvkonQgn_graf_tab_21: + { + longTabs = EFalse; + numberOfTabs = 2; + activeTab = 1; + break; + } + case EMbmAvkonQgn_graf_tab_22: + { + longTabs = EFalse; + numberOfTabs = 2; + activeTab = 2; + break; + } + case EMbmAvkonQgn_graf_tab_31: + { + longTabs = EFalse; + numberOfTabs = 3; + activeTab = 1; + break; + } + case EMbmAvkonQgn_graf_tab_32: + { + longTabs = EFalse; + numberOfTabs = 3; + activeTab = 2; + break; + } + case EMbmAvkonQgn_graf_tab_33: + { + longTabs = EFalse; + numberOfTabs = 3; + activeTab = 3; + break; + } + case EMbmAvkonQgn_graf_tab_41: + { + longTabs = EFalse; + numberOfTabs = 4; + activeTab = 1; + break; + } + case EMbmAvkonQgn_graf_tab_42: + { + longTabs = EFalse; + numberOfTabs = 4; + activeTab = 2; + break; + } + case EMbmAvkonQgn_graf_tab_43: + { + longTabs = EFalse; + numberOfTabs = 4; + activeTab = 3; + break; + } + case EMbmAvkonQgn_graf_tab_44: + { + longTabs = EFalse; + numberOfTabs = 4; + activeTab = 4; + break; + } + case EMbmAvkonQgn_graf_tab_long_21: + { + longTabs = ETrue; + numberOfTabs = 2; + activeTab = 1; + break; + } + case EMbmAvkonQgn_graf_tab_long_22: + { + longTabs = ETrue; + numberOfTabs = 2; + activeTab = 2; + break; + } + case EMbmAvkonQgn_graf_tab_long_31: + { + longTabs = ETrue; + numberOfTabs = 3; + activeTab = 1; + break; + } + case EMbmAvkonQgn_graf_tab_long_32: + { + longTabs = ETrue; + numberOfTabs = 3; + activeTab = 2; + break; + } + case EMbmAvkonQgn_graf_tab_long_33: + { + longTabs = ETrue; + numberOfTabs = 3; + activeTab = 3; + break; + } + default: + { + break; + } + } + + return CreateTabGroupBackgroundL( longTabs, numberOfTabs, activeTab ); + } + +CAknTabGroupGraphics::SAknTabGroupBackground CAknTabGroupGraphics::CreateTabGroupBackgroundL( + TBool aLongTabs, TInt aNumberOfTabs, TInt aActiveTab ) + { + CAknTabGroupGraphics::SAknTabGroupBackground tabGroupBackGround; + CAknTabGroupGraphics::SAknTabGroupBackgroundLayout tabGroupBackGroundLayout; + + AknIconConfig::TPreferredDisplayMode mode; + AknIconConfig::PreferredDisplayMode( mode, + AknIconConfig::EImageTypeOffscreen ); + + TDisplayMode bitmapDisplayMode = mode.iBitmapMode; + TDisplayMode maskDisplayMode = EGray256; + TSize size( iTabGroupBackgroundParent.Size() ); + + // BITMAP + tabGroupBackGround.iBitmap = new (ELeave) CFbsBitmap(); + CleanupStack::PushL( tabGroupBackGround.iBitmap ); + User::LeaveIfError( tabGroupBackGround.iBitmap->Create( size, bitmapDisplayMode ) ); + CFbsBitmapDevice* bitmapDevice = CFbsBitmapDevice::NewL( tabGroupBackGround.iBitmap ); + CleanupStack::PushL( bitmapDevice ); + CFbsBitGc* bitmapGc; + User::LeaveIfError( bitmapDevice->CreateContext( bitmapGc ) ); + + // Clear background first... + bitmapGc->SetBrushColor( KRgbBlack ); + bitmapGc->SetBrushStyle( CGraphicsContext::ESolidBrush ); + bitmapGc->DrawRect( iTabGroupBackgroundParent ); + + bitmapGc->SetBrushStyle( CGraphicsContext::ENullBrush ); + DrawTabGroupBackgroundL( CAknTabGroupGraphics::ENormal, + aLongTabs, + aNumberOfTabs, + aActiveTab, + bitmapGc, + tabGroupBackGroundLayout, + ENone ); + delete bitmapGc; + + CleanupStack::Pop( 2, tabGroupBackGround.iBitmap ); + delete bitmapDevice; + bitmapGc = NULL; + bitmapDevice = NULL; + + // MASK + tabGroupBackGround.iMask = new (ELeave) CFbsBitmap(); + CleanupStack::PushL( tabGroupBackGround.iMask ); + User::LeaveIfError( tabGroupBackGround.iMask->Create( size, maskDisplayMode ) ); + bitmapDevice = CFbsBitmapDevice::NewL( tabGroupBackGround.iMask ); + CleanupStack::PushL( bitmapDevice ); + User::LeaveIfError( bitmapDevice->CreateContext( bitmapGc ) ); + + // Clear background first... + bitmapGc->SetBrushStyle( CGraphicsContext::ESolidBrush ); + if ( maskDisplayMode == EGray256 ) + { + bitmapGc->SetBrushColor( KRgbBlack ); + } + else + { + bitmapGc->SetBrushColor( KRgbWhite ); + } + bitmapGc->DrawRect( iTabGroupBackgroundParent ); + + bitmapGc->SetBrushStyle( CGraphicsContext::ENullBrush ); + DrawTabGroupBackgroundL( CAknTabGroupGraphics::EMaskOnly, + aLongTabs, + aNumberOfTabs, + aActiveTab, + bitmapGc, + tabGroupBackGroundLayout, + ENone); + delete bitmapGc; + + CleanupStack::Pop( 2, tabGroupBackGround.iMask ); + delete bitmapDevice; + + return tabGroupBackGround; + } + +#endif + + // --------------------------------------------------------------------------- // Draws normal tab background from given parameters. // --------------------------------------------------------------------------- // -void CAknTabGroupGraphics::DrawTabGroupBackground( +void CAknTabGroupGraphics::DrawTabGroupBackgroundL( TTabDrawMode aTabDrawMode, TBool aLongTabs, TInt aNumberOfTabs, @@ -199,210 +335,91 @@ CBitmapContext* aGc, SAknTabGroupBackgroundLayout& aLayout, TTabsHidden aTabsHidden, - TTabAnimationType aAnimation, - TInt aHighlightTab ) const + TTabAnimationType aAnimation ) const { - //Set the layout for tab background; - ReviseLayoutForTabBackground(aLayout, aNumberOfTabs, aLongTabs, aActiveTab, EFalse, aAnimation); - - TInt insCnt = 0; - TTabInstruction instruction[8]; - - switch (aNumberOfTabs) + switch ( aNumberOfTabs ) { case 2: { - if (aActiveTab == 1) + if ( aLongTabs ) { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 1); + DrawTwoLongTabBackground( aTabDrawMode, + aActiveTab, + aGc, + aLayout ); } else { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 1, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 2); + DrawTwoTabBackground( aTabDrawMode, + aActiveTab, + aGc, + aLayout ); } + break; } - break; case 3: { if ( aLongTabs ) { - if (aActiveTab == 1) - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 3, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 1); - } - else if ( aActiveTab == 2) - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 1, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 3, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 2); - } - else if ( aActiveTab == 3) - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 1, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 3); - } + DrawThreeLongTabBackground( aTabDrawMode, + aActiveTab, + aGc, + aLayout ); } else { - TInt xOffset(aLayout.iFirstTab.iRight.iBr.iX - aLayout.iSecondTab.iLeft.iTl.iX); - - if (aActiveTab == 1) - { - if (aTabsHidden == EOnRightSide) - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 6, ETrue); - } - - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 3, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 1); - } - else if (aActiveTab == 2) - { - switch (aTabsHidden) - { - case EOnLeftSide: - { - TRect bitRect(aLayout.iHiddenTabLeft.iLeft); - bitRect.Resize(xOffset, 0); - AssemblyPassiveTabBitInstruction(instruction[insCnt++], 5, bitRect); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 5, - aAnimation != ECycleToLeft ? ETrue : EFalse); - } - break; - case EOnRightSide: - { - TRect bitRect(aLayout.iHiddenTabRight.iRight); - bitRect.Move(-xOffset, 0); - bitRect.Resize(xOffset, 0); - AssemblyPassiveTabBitInstruction(instruction[insCnt++], 4, bitRect); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 6, - aAnimation != ECycleToRight ? ETrue : EFalse); - } - break; - case EOnBothSides: - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 5, - aAnimation != ECycleToLeft ? ETrue : EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 6, - aAnimation != ECycleToRight ? ETrue : EFalse); - } - break; - case ETwoOnBothSides: - { - TRect bitRect(aLayout.iHiddenTabLeft.iLeft); - bitRect.Resize(xOffset, 0); - AssemblyPassiveTabBitInstruction(instruction[insCnt++], 5, bitRect); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 5, - aAnimation != ECycleToLeft ? ETrue : EFalse); - - bitRect = aLayout.iHiddenTabRight.iRight; - bitRect.Move(-xOffset, 0); - bitRect.Resize(xOffset, 0); - AssemblyPassiveTabBitInstruction(instruction[insCnt++], 4, bitRect); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 6, - aAnimation != ECycleToRight ? ETrue : EFalse); - } - break; - case ENone: - default: - break; - } - - if (aAnimation == ECycleToLeft) - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 3, ETrue); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 1); - } - else if ( aAnimation == ECycleToRight ) - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 1, ETrue); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 3); - } - else - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 1, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 3, EFalse); - - if (aAnimation) - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse); - } - else - { - AssemblyActiveTabInstruction(instruction[insCnt++], 2); - } - } - } - else if (aActiveTab == 3) - { - if (aTabsHidden == EOnLeftSide) - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 5, ETrue); - } - - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 1, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 3); - } + DrawThreeTabBackground( aTabDrawMode, + aActiveTab, + aGc, + aLayout, + aTabsHidden, + aAnimation ); } + break; } - break; case 4: { - if (aActiveTab == 1) - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 4, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 3, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 1); - } - else if ( aActiveTab == 2 ) - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 4, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 3, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 1, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 2); - } - else if ( aActiveTab == 3 ) - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 1, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 4, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 3); - } - else if ( aActiveTab == 4 ) - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 1, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 2, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], aHighlightTab, 3, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 4); - } + DrawFourTabBackground( aTabDrawMode, + aActiveTab, + aGc, + aLayout ); + break; } - break; default: { #ifdef AVKON_RDEBUG_ERROR - RDebug::Print( _L("CAknTabGroupGraphics: Unknown tab group background !") ); + RDebug::Print( _L("CAknTabGroupGraphics: Unknown tab layout !") ); #endif - break; } } - - //Draw tab background according to instructions - ProcessDrawTabInstructions(instruction, insCnt, aTabDrawMode, aLayout, aGc); - - ReviseLayoutUseFlag(aLayout, aActiveTab); + + if ( !aLayout.iUse ) + { + aLayout.iFirstTab.iActive = EFalse; + aLayout.iSecondTab.iActive = EFalse; + aLayout.iThirdTab.iActive = EFalse; + aLayout.iFourthTab.iActive = EFalse; + + if ( aActiveTab == 1 ) + { + aLayout.iFirstTab.iActive = ETrue; + } + else if ( aActiveTab == 2 ) + { + aLayout.iSecondTab.iActive = ETrue; + } + else if ( aActiveTab == 3 ) + { + aLayout.iThirdTab.iActive = ETrue; + } + else if ( aActiveTab == 4 ) + { + aLayout.iFourthTab.iActive = ETrue; + } + } } -void CAknTabGroupGraphics::DrawTabGroupNarrowBackground( +void CAknTabGroupGraphics::DrawTabGroupNarrowBackgroundL( TTabDrawMode aTabDrawMode, TBool aLongTabs, TInt aNumberOfTabs, @@ -410,98 +427,111 @@ CBitmapContext* aGc, SAknTabGroupBackgroundLayout& aLayout ) const { - //Set the layout for tab background; - ReviseLayoutForTabBackground(aLayout, aNumberOfTabs, aLongTabs, aActiveTab, ETrue, ENoAnimation); - - TInt insCnt = 0; - TTabInstruction instruction[6]; - switch ( aNumberOfTabs ) { case 2: { - if (aActiveTab == 1) + if ( aLongTabs ) + { + if ( !aLayout.iUse ) + { + aLayout = TwoLongTabNarrowBackground( aActiveTab ); + } + aLayout.iUse = ETrue; + DrawTwoLongTabNarrowBackground( aTabDrawMode, + aActiveTab, + aGc, + aLayout ); + } + else { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 2, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 1); + if ( !aLayout.iUse ) + { + aLayout = TwoTabNarrowBackground( aActiveTab ); + } + aLayout.iUse = ETrue; + DrawTwoTabNarrowBackground( aTabDrawMode, + aActiveTab, + aGc, + aLayout ); + } + break; + } + case 3: + { + if ( aLongTabs ) + { + if ( !aLayout.iUse ) + { + aLayout = ThreeLongTabNarrowBackground( aActiveTab ); + } + aLayout.iUse = ETrue; + DrawThreeLongTabNarrowBackground( aTabDrawMode, + aActiveTab, + aGc, + aLayout ); } else { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 1, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 2); - } - } - break; - case 3: - { - if (aActiveTab == 1) - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 3, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 2, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 1); + if ( !aLayout.iUse ) + { + aLayout = ThreeTabNarrowBackground( aActiveTab ); + } + aLayout.iUse = ETrue; + DrawThreeTabNarrowBackground( aTabDrawMode, + aActiveTab, + aGc, + aLayout ); } - else if (aActiveTab == 2) - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 1, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 3, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 2); - } - else if (aActiveTab == 3) - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 1, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 2, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 3); - } + break; } - break; case 4: { - if (aActiveTab == 1) + if ( !aLayout.iUse ) { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 4, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 3, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 2, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 1); - } - else if (aActiveTab == 2) - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 4, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 3, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 1, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 2); + aLayout = FourTabNarrowBackground( aActiveTab ); } - else if (aActiveTab == 3) - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 1, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 2, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 4, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 3); - } - else if (aActiveTab == 4) - { - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 1, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 2, EFalse); - AssemblyPassiveOrHighlightTabInstruction(instruction[insCnt++], 0, 3, EFalse); - AssemblyActiveTabInstruction(instruction[insCnt++], 4); - } + aLayout.iUse = ETrue; + DrawFourTabNarrowBackground( aTabDrawMode, + aActiveTab, + aGc, + aLayout ); + break; } - break; default: { #ifdef AVKON_RDEBUG_ERROR - RDebug::Print( _L("CAknTabGroupGraphics: Unknown tab narrow background !") ); + RDebug::Print( _L("CAknTabGroupGraphics: Unknown tab layout !") ); #endif - break; } } - - //Draw tab background according to instructions - ProcessDrawTabInstructions(instruction, insCnt, aTabDrawMode, aLayout, aGc); - - ReviseLayoutUseFlag(aLayout, aActiveTab); + + if ( !aLayout.iUse ) + { + aLayout.iFirstTab.iActive = EFalse; + aLayout.iSecondTab.iActive = EFalse; + aLayout.iThirdTab.iActive = EFalse; + aLayout.iFourthTab.iActive = EFalse; + + if ( aActiveTab == 1 ) + { + aLayout.iFirstTab.iActive = ETrue; + } + else if ( aActiveTab == 2 ) + { + aLayout.iSecondTab.iActive = ETrue; + } + else if ( aActiveTab == 3 ) + { + aLayout.iThirdTab.iActive = ETrue; + } + else if ( aActiveTab == 4 ) + { + aLayout.iFourthTab.iActive = ETrue; + } + } } - TBool CAknTabGroupGraphics::TabClickedL( TInt aTabComponent, const TRect& aTabRect, const TPoint& aPoint, @@ -813,6 +843,91 @@ return aLayout; } +void CAknTabGroupGraphics::DrawTwoTabBackground( + TTabDrawMode aTabDrawMode, + TInt aActiveTab, + CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout ) const + { + // If not given layout, then get the default layout + if ( !aLayout.iUse ) + { + aLayout = TwoTabBackground( aActiveTab ); + } + + if ( aActiveTab == 1 ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + } + else + { + DrawPassiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + } + } + +void CAknTabGroupGraphics::DrawTwoTabNarrowBackground( + TTabDrawMode aTabDrawMode, + TInt aActiveTab, + CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout ) const + { + // If not given layout, then get the default layout + if ( !aLayout.iUse ) + { + aLayout = TwoTabBackground( aActiveTab ); + } + + if ( aActiveTab == 1 ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + } + else + { + DrawPassiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + } + } + + // --------------------------------------------------------------------------- // Extracts tab group background layout from layout data for three tab layout. // --------------------------------------------------------------------------- @@ -1218,6 +1333,339 @@ return aLayout; } + +// --------------------------------------------------------------------------- +// Draws the tab group background in three tab layout. +// --------------------------------------------------------------------------- +// +void CAknTabGroupGraphics::DrawThreeTabBackground( + TTabDrawMode aTabDrawMode, + TInt aActiveTab, + CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout, + TTabsHidden aTabsHidden, + TTabAnimationType aAnimation ) const + { + TInt animActiveTab( aActiveTab ); + if ( aAnimation && aActiveTab == 2 ) + { + // Move the tab highlight already during the animation. + animActiveTab = aAnimation == ECycleToLeft ? aActiveTab - 1 : + aActiveTab + 1; + } + + // If not given layout, then get the default layout. + if ( !aLayout.iUse ) + { + aLayout = ThreeTabBackground( animActiveTab ); + } + + TInt xOffset( aLayout.iFirstTab.iRight.iBr.iX - + aLayout.iSecondTab.iLeft.iTl.iX ); + + if ( aActiveTab == 1 ) + { + if ( aTabsHidden == EOnRightSide ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iHiddenTabRight.iLeft, + aLayout.iHiddenTabRight.iMiddle, + aLayout.iHiddenTabRight.iRight, + aGc, + ETrue ); + } + + DrawPassiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + } + else if ( aActiveTab == 2 ) + { + switch ( aTabsHidden ) + { + case EOnLeftSide: + { + TRect bitRect( aLayout.iHiddenTabLeft.iLeft ); + bitRect.Resize( xOffset, 0 ); + DrawPassiveTabBit( aTabDrawMode, + ERight, + bitRect, + aGc ); + DrawPassiveTab( aTabDrawMode, + aLayout.iHiddenTabLeft.iLeft, + aLayout.iHiddenTabLeft.iMiddle, + aLayout.iHiddenTabLeft.iRight, + aGc, + aAnimation != ECycleToLeft ? ETrue : EFalse ); + break; + } + case EOnRightSide: + { + TRect bitRect( aLayout.iHiddenTabRight.iRight ); + bitRect.Move( -xOffset, 0 ); + bitRect.Resize( xOffset, 0 ); + DrawPassiveTabBit( aTabDrawMode, + ELeft, + bitRect, + aGc ); + DrawPassiveTab( aTabDrawMode, + aLayout.iHiddenTabRight.iLeft, + aLayout.iHiddenTabRight.iMiddle, + aLayout.iHiddenTabRight.iRight, + aGc, + aAnimation != ECycleToRight ? ETrue : EFalse ); + break; + } + case EOnBothSides: + { + DrawPassiveTab( aTabDrawMode, + aLayout.iHiddenTabLeft.iLeft, + aLayout.iHiddenTabLeft.iMiddle, + aLayout.iHiddenTabLeft.iRight, + aGc, + aAnimation != ECycleToLeft ? ETrue : EFalse ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iHiddenTabRight.iLeft, + aLayout.iHiddenTabRight.iMiddle, + aLayout.iHiddenTabRight.iRight, + aGc, + aAnimation != ECycleToRight ? ETrue : EFalse ); + break; + } + case ETwoOnBothSides: + { + TRect bitRect( aLayout.iHiddenTabLeft.iLeft ); + bitRect.Resize( xOffset, 0 ); + DrawPassiveTabBit( aTabDrawMode, + ERight, + bitRect, + aGc ); + DrawPassiveTab( aTabDrawMode, + aLayout.iHiddenTabLeft.iLeft, + aLayout.iHiddenTabLeft.iMiddle, + aLayout.iHiddenTabLeft.iRight, + aGc, + aAnimation != ECycleToLeft ? ETrue : EFalse ); + + bitRect = aLayout.iHiddenTabRight.iRight; + bitRect.Move( -xOffset, 0 ); + bitRect.Resize( xOffset, 0 ); + DrawPassiveTabBit( aTabDrawMode, + ELeft, + bitRect, + aGc ); + DrawPassiveTab( aTabDrawMode, + aLayout.iHiddenTabRight.iLeft, + aLayout.iHiddenTabRight.iMiddle, + aLayout.iHiddenTabRight.iRight, + aGc, + aAnimation != ECycleToRight ? ETrue : EFalse); + break; + } + case ENone: + default: + { + break; + } + } + + if ( aAnimation == ECycleToLeft ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc, + ETrue ); + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + DrawActiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + } + else if ( aAnimation == ECycleToRight ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc, + ETrue ); + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + DrawActiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + } + else + { + DrawPassiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + + if ( aAnimation ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + } + else + { + DrawActiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + } + } + } + else if ( aActiveTab == 3 ) + { + if ( aTabsHidden == EOnLeftSide ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iHiddenTabLeft.iLeft, + aLayout.iHiddenTabLeft.iMiddle, + aLayout.iHiddenTabLeft.iRight, + aGc, + ETrue ); + } + + DrawPassiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + } + } + + +// --------------------------------------------------------------------------- +// Draws the tab group background in three tab narrow layout. +// --------------------------------------------------------------------------- +// +void CAknTabGroupGraphics::DrawThreeTabNarrowBackground( + TTabDrawMode aTabDrawMode, + TInt aActiveTab, + CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout ) const + { + // If not given layout, then get the default layout + if ( !aLayout.iUse ) + { + aLayout = ThreeTabBackground( aActiveTab ); + } + + if ( aActiveTab == 1 ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + } + else if ( aActiveTab == 2 ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + } + else if ( aActiveTab == 3 ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + } + } + + CAknTabGroupGraphics::SAknTabGroupBackgroundLayout CAknTabGroupGraphics::FourTabBackground( TInt aActiveTab ) const { @@ -1692,6 +2140,242 @@ return aLayout; } +void CAknTabGroupGraphics::DrawFourTabBackground( TTabDrawMode aTabDrawMode, + TInt aActiveTab, + CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout ) const + { + // If not given layout, then get the default layout + if ( !aLayout.iUse ) + { + aLayout = FourTabBackground( aActiveTab ); + } + + if ( aActiveTab == 1 ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iFourthTab.iLeft, + aLayout.iFourthTab.iMiddle, + aLayout.iFourthTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + } + else if ( aActiveTab == 2 ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iFourthTab.iLeft, + aLayout.iFourthTab.iMiddle, + aLayout.iFourthTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + } + else if ( aActiveTab == 3 ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iFourthTab.iLeft, + aLayout.iFourthTab.iMiddle, + aLayout.iFourthTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + } + else if ( aActiveTab == 4 ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iFourthTab.iLeft, + aLayout.iFourthTab.iMiddle, + aLayout.iFourthTab.iRight, + aGc ); + } + } + +void CAknTabGroupGraphics::DrawFourTabNarrowBackground( TTabDrawMode aTabDrawMode, + TInt aActiveTab, + CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout ) const + { + // If not given layout, then get the default layout + if ( !aLayout.iUse ) + { + aLayout = FourTabBackground( aActiveTab ); + } + + if ( aActiveTab == 1 ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iFourthTab.iLeft, + aLayout.iFourthTab.iMiddle, + aLayout.iFourthTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + } + else if ( aActiveTab == 2 ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iFourthTab.iLeft, + aLayout.iFourthTab.iMiddle, + aLayout.iFourthTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + } + else if ( aActiveTab == 3 ) + { + // Note the drawing order of passive tabs + DrawPassiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iFourthTab.iLeft, + aLayout.iFourthTab.iMiddle, + aLayout.iFourthTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + } + else if ( aActiveTab == 4 ) + { + // Note the drawing order of passive tabs + DrawPassiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + + DrawPassiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iFourthTab.iLeft, + aLayout.iFourthTab.iMiddle, + aLayout.iFourthTab.iRight, + aGc ); + } + } + CAknTabGroupGraphics::SAknTabGroupBackgroundLayout CAknTabGroupGraphics::TwoLongTabBackground(TInt aActiveTab) const { SAknTabGroupBackgroundLayout aLayout; @@ -1904,6 +2588,90 @@ return aLayout; } +void CAknTabGroupGraphics::DrawTwoLongTabBackground( + TTabDrawMode aTabDrawMode, + TInt aActiveTab, + CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout ) const + { + // If not given layout, then get the default layout + if ( !aLayout.iUse ) + { + aLayout = TwoLongTabBackground( aActiveTab ); + } + + if ( aActiveTab == 1 ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + } + else + { + DrawPassiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + } + } + +void CAknTabGroupGraphics::DrawTwoLongTabNarrowBackground( + TTabDrawMode aTabDrawMode, + TInt aActiveTab, + CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout ) const + { + // If not given layout, then get the default layout + if ( !aLayout.iUse ) + { + aLayout = TwoLongTabBackground( aActiveTab ); + } + + if ( aActiveTab == 1 ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + } + else + { + DrawPassiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + + DrawActiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + } + } + CAknTabGroupGraphics::SAknTabGroupBackgroundLayout CAknTabGroupGraphics::ThreeLongTabBackground(TInt aActiveTab) const { SAknTabGroupBackgroundLayout aLayout; @@ -2272,6 +3040,140 @@ return aLayout; } +void CAknTabGroupGraphics::DrawThreeLongTabBackground( TTabDrawMode aTabDrawMode, + TInt aActiveTab, CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout ) const + { + // If not given layout, then get the default layout + if ( !aLayout.iUse ) + { + aLayout = ThreeLongTabBackground( aActiveTab ); + } + + if ( aActiveTab == 1 ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + DrawActiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + } + else if ( aActiveTab == 2) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + DrawPassiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + DrawActiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + } + else if ( aActiveTab == 3) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + DrawActiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + } + } + +void CAknTabGroupGraphics::DrawThreeLongTabNarrowBackground( TTabDrawMode aTabDrawMode, + TInt aActiveTab, + CBitmapContext* aGc, + SAknTabGroupBackgroundLayout& aLayout ) const + { + // If not given layout, then get the default layout + if ( !aLayout.iUse ) + { + aLayout = ThreeLongTabBackground( aActiveTab ); + } + + if ( aActiveTab == 1 ) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + DrawActiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + } + else if ( aActiveTab == 2) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + DrawPassiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + DrawActiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + } + else if ( aActiveTab == 3) + { + DrawPassiveTab( aTabDrawMode, + aLayout.iFirstTab.iLeft, + aLayout.iFirstTab.iMiddle, + aLayout.iFirstTab.iRight, + aGc ); + DrawPassiveTab( aTabDrawMode, + aLayout.iSecondTab.iLeft, + aLayout.iSecondTab.iMiddle, + aLayout.iSecondTab.iRight, + aGc ); + DrawActiveTab( aTabDrawMode, + aLayout.iThirdTab.iLeft, + aLayout.iThirdTab.iMiddle, + aLayout.iThirdTab.iRight, + aGc ); + } + } + + // --------------------------------------------------------------------------- // Draws single tab graphics for an active tab. // --------------------------------------------------------------------------- @@ -2726,300 +3628,4 @@ return iTabGroupBackgroundAvailable; // 3 } -void CAknTabGroupGraphics::DrawHighlightTabL(TTabDrawMode aDrawMode, - TRect aLeft, TRect aMiddle, TRect aRight, CBitmapContext* aGc) const - { - if ( aDrawMode == CAknTabGroupGraphics::ENoDraw ) - { - return; - } - - TRect rect( aLeft ); - CFbsBitmap* activeColorBitmap = new (ELeave) CFbsBitmap(); - CleanupStack::PushL( activeColorBitmap ); - - TDisplayMode screenDisplayMode( iPassiveTabLeft->DisplayMode() ); - activeColorBitmap->Create( rect.Size(), screenDisplayMode ); - - TRgb color; - AknsUtils::GetCachedColor( AknsUtils::SkinInstance(), color, - KAknsIIDQsnOtherColors, EAknsCIQsnOtherColorsCG25 ); - - CFbsBitmapDevice* destinationDevice = CFbsBitmapDevice::NewL( activeColorBitmap ); - CleanupStack::PushL( destinationDevice ); - CFbsBitGc* destinationGc; - User::LeaveIfError( destinationDevice->CreateContext( destinationGc ) ); - destinationGc->SetPenColor( color ); - destinationGc->SetPenStyle( CGraphicsContext::ESolidPen ); - destinationGc->SetBrushColor( color ); - destinationGc->SetBrushStyle( CGraphicsContext::ESolidBrush ); - destinationGc->DrawRect( TRect( activeColorBitmap->SizeInPixels() ) ); - - delete destinationGc; - CleanupStack::PopAndDestroy( destinationDevice ); - - aGc->BitBltMasked( rect.iTl, activeColorBitmap, - TRect( 0, 0, rect.Width(), rect.Height() ), - iPassiveTabLeftMask, ETrue ); - - CleanupStack::PopAndDestroy( activeColorBitmap ); - - /*********************************************************************/ - - rect = aMiddle; - - CFbsBitmap* activeColorBitmapM = new (ELeave) CFbsBitmap(); - CleanupStack::PushL( activeColorBitmapM ); - - activeColorBitmapM->Create( rect.Size(), screenDisplayMode ); - - destinationDevice = CFbsBitmapDevice::NewL( activeColorBitmapM ); - CleanupStack::PushL( destinationDevice ); - User::LeaveIfError( destinationDevice->CreateContext( destinationGc ) ); - destinationGc->SetPenColor( color ); - destinationGc->SetPenStyle( CGraphicsContext::ESolidPen ); - destinationGc->SetBrushColor( color ); - destinationGc->SetBrushStyle( CGraphicsContext::ESolidBrush ); - destinationGc->DrawRect( TRect( activeColorBitmapM->SizeInPixels() ) ); - - delete destinationGc; - CleanupStack::PopAndDestroy( destinationDevice ); - - aGc->BitBltMasked(rect.iTl, activeColorBitmapM, - TRect(0, 0, rect.Width(), rect.Height() ), - iPassiveTabMiddleMask, ETrue ); - CleanupStack::PopAndDestroy( activeColorBitmapM ); - - /*********************************************************************/ - - rect = aRight; - - CFbsBitmap* activeColorBitmapR = new (ELeave) CFbsBitmap(); - CleanupStack::PushL( activeColorBitmapR ); - - activeColorBitmapR->Create( rect.Size(), screenDisplayMode ); - - destinationDevice = CFbsBitmapDevice::NewL( activeColorBitmapR ); - CleanupStack::PushL( destinationDevice ); - User::LeaveIfError( destinationDevice->CreateContext( destinationGc ) ); - destinationGc->SetPenColor( color ); - destinationGc->SetPenStyle( CGraphicsContext::ESolidPen ); - destinationGc->SetBrushColor( color ); - destinationGc->SetBrushStyle( CGraphicsContext::ESolidBrush ); - destinationGc->DrawRect( TRect( activeColorBitmapR->SizeInPixels() ) ); - - delete destinationGc; - CleanupStack::PopAndDestroy( destinationDevice ); - aGc->BitBltMasked( rect.iTl, activeColorBitmapR, - TRect(0, 0, rect.Width(), rect.Height() ), - iPassiveTabRightMask, ETrue ); - - CleanupStack::PopAndDestroy( activeColorBitmapM ); - } - -void CAknTabGroupGraphics::ReviseLayoutForTabBackground( - SAknTabGroupBackgroundLayout& aLayout, - TInt aNumberOfTabs, - TBool aLongTabs, - TInt aActiveTab, - TBool aIsNarrow, - TTabAnimationType aAnimation) const - { - if (aLayout.iUse) - { - // aLayout has been set, return directly. - return; - } - - if (aIsNarrow) - { - switch (aNumberOfTabs) - { - case 2: - { - aLayout = aLongTabs ? TwoLongTabNarrowBackground(aActiveTab) : TwoTabNarrowBackground(aActiveTab); - break; - } - case 3: - { - aLayout = aLongTabs ? ThreeLongTabNarrowBackground(aActiveTab) : ThreeTabNarrowBackground(aActiveTab); - break; - } - case 4: - { - aLayout = FourTabNarrowBackground(aActiveTab); - break; - } - default: - { -#ifdef AVKON_RDEBUG_ERROR - RDebug::Print(_L("CAknTabGroupGraphics: Unknown narrow tab layout !")); -#endif - } - } - aLayout.iUse = ETrue; - } - else - { - switch (aNumberOfTabs) - { - case 2: - { - aLayout = aLongTabs ? TwoLongTabBackground(aActiveTab) : TwoTabBackground(aActiveTab); - break; - } - case 3: - { - if (aLongTabs) - { - aLayout = ThreeLongTabBackground(aActiveTab); - } - else - { - TInt animActiveTab = aActiveTab; - if (aAnimation && aActiveTab == 2) - { - // Move the tab highlight already during the animation. - animActiveTab = - aAnimation == ECycleToLeft ? aActiveTab - 1 : aActiveTab + 1; - } - aLayout = ThreeTabBackground(animActiveTab); - } - break; - } - case 4: - { - aLayout = FourTabBackground(aActiveTab); - break; - } - default: - { -#ifdef AVKON_RDEBUG_ERROR - RDebug::Print( _L("CAknTabGroupGraphics: Unknown tab layout !") ); -#endif - } - } - } - } - -void CAknTabGroupGraphics::ReviseLayoutUseFlag( - SAknTabGroupBackgroundLayout& aLayout, - TInt aActiveTab) const - { - if (!aLayout.iUse) - { - aLayout.iFirstTab.iActive = EFalse; - aLayout.iSecondTab.iActive = EFalse; - aLayout.iThirdTab.iActive = EFalse; - aLayout.iFourthTab.iActive = EFalse; - - if (aActiveTab == 1) - { - aLayout.iFirstTab.iActive = ETrue; - } - else if (aActiveTab == 2) - { - aLayout.iSecondTab.iActive = ETrue; - } - else if (aActiveTab == 3) - { - aLayout.iThirdTab.iActive = ETrue; - } - else if (aActiveTab == 4) - { - aLayout.iFourthTab.iActive = ETrue; - } - } - } - - -#define GET_TABLAYOUT_RECT(idx) do{ \ - left = aLayout.idx.iLeft; \ - middle = aLayout.idx.iMiddle; \ - right = aLayout.idx.iRight; \ -}while (0) - -void CAknTabGroupGraphics::ProcessDrawTabInstructions( - TTabInstruction *aInstructions, - TInt aNumOfIns, - TTabDrawMode aTabDrawMode, - SAknTabGroupBackgroundLayout& aLayout, - CBitmapContext* aGc) const - { - if (aInstructions == NULL || aNumOfIns <= 0 || aGc == NULL) - { - return; - } - - for ( TInt i = 0; i < aNumOfIns; i++ ) - { - if ( aInstructions[i].iTabStyle == 5 || aInstructions[i].iTabStyle == 6 ) - { - // Draw passive tab bit. - DrawPassiveTabBit(aTabDrawMode, - aInstructions[i].iTabStyle == 5 ? ELeft : ERight, - aInstructions[i].iBitTabRect, - aGc); - } - else - { - TBool layoutValid = ETrue; - TRect left, middle, right; - switch (aInstructions[i].iLayoutIdx) - { - case 1: - { - GET_TABLAYOUT_RECT(iFirstTab); - break; - } - case 2: - { - GET_TABLAYOUT_RECT(iSecondTab); - break; - } - case 3: - { - GET_TABLAYOUT_RECT(iThirdTab); - break; - } - case 4: - { - GET_TABLAYOUT_RECT(iFourthTab); - break; - } - case 5: - { - GET_TABLAYOUT_RECT(iHiddenTabLeft); - break; - } - case 6: - { - GET_TABLAYOUT_RECT(iHiddenTabRight); - break; - } - default: - { - layoutValid = EFalse; - } - } - - if (layoutValid) - { - if (aInstructions[i].iTabStyle == 1) - { - DrawActiveTab(aTabDrawMode, left, middle, right, aGc); - } - else if (aInstructions[i].iTabStyle == 2) - { - DrawPassiveTab(aTabDrawMode, left, middle, right, aGc, aInstructions[i].iPassiveFade); - } - else if (aInstructions[i].iTabStyle == 3) - { - TRAP_IGNORE( DrawHighlightTabL(aTabDrawMode, left, middle, right, aGc) ); - } - } - } - } - } - // End of file diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknViewAppUi.cpp --- a/uifw/AvKon/src/AknViewAppUi.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknViewAppUi.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -99,13 +99,6 @@ TInt iFlags; #endif // RD_SPLIT_VIEW TBool iUseDefaultScreenClearer; - - /** - * Used to control whether or not the default screen clearer - * is used when launching the application as embedded. By default the - * clearer isn't used for embedded applications. - */ - TBool iUseDefaultScreenClearerInEmbeddedLaunch; }; // ============================ MEMBER FUNCTIONS =============================== @@ -246,12 +239,8 @@ if ( iEikonEnv->RootWin().OrdinalPosition() == 0 && iExtension->iUseDefaultScreenClearer ) { - if ( !iEikonEnv->StartedAsServerApp() || - iExtension->iUseDefaultScreenClearerInEmbeddedLaunch ) + if ( !iEikonEnv->StartedAsServerApp() ) { - // Use transparent screen clearer for embedded applications, - // except for when application wants to use the normal - // screen clearer. iClearer = CAknLocalScreenClearer::NewL( ETrue ); } else @@ -280,10 +269,10 @@ CAknAppUi::CurrentFixedToolbar()->SetToolbarVisibility( EFalse ); } - delete iClearer; - delete iShutter; - delete iActivationTick; - + delete iClearer; + delete iShutter; + delete iActivationTick; + if ( iActivationQueue ) { iActivationQueue->ResetAndDestroy(); @@ -1025,16 +1014,18 @@ TRAP_IGNORE( iExtension = CAknViewAppUiExtension::NewL() ); } - // Update the flags + // Update flag if ( iExtension ) { iExtension->iUseDefaultScreenClearer = aEnable; - iExtension->iUseDefaultScreenClearerInEmbeddedLaunch = aEnable; } - // Delete the clearer if it already exists but isn't required anymore. - // The clearer is created when needed on BaseConstructL. - if ( !aEnable && iClearer ) + // Create/delete iClearer if required + if ( aEnable && !iClearer ) + { + TRAP_IGNORE( iClearer = CAknLocalScreenClearer::NewL( EFalse ) ); + } + else if ( !aEnable && iClearer ) { delete iClearer; iClearer = NULL; diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/AknVolumePopup.cpp --- a/uifw/AvKon/src/AknVolumePopup.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/AknVolumePopup.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -1449,7 +1449,7 @@ if ( iVisible ) { - TRAP_IGNORE(SetVisibilityL( ETrue )); + SetVisibilityL( ETrue ); DrawDeferred(); } } @@ -1719,7 +1719,7 @@ EXPORT_C void CAknVolumePopup::UseMutedIcon( TBool aFlag ) { iExt->iUseMutedIcon = aFlag; - TRAP_IGNORE(CreateSpeakerL()); + CreateSpeakerL(); } // --------------------------------------------------------------------------- diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/aknchoicelist.cpp --- a/uifw/AvKon/src/aknchoicelist.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/aknchoicelist.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -295,6 +295,9 @@ { TRAP_IGNORE( iList->ScrollBarFrame()->SetScrollBarVisibilityL( CEikScrollBarFrame::EOff, CEikScrollBarFrame::EOff) ); + + // Enable scrolling + iList->DisableScrolling( EFalse ); } layoutRect.LayoutRect( rectParent, @@ -528,6 +531,13 @@ if ( AknLayoutUtils::PenEnabled() ) { + + // Make sure that scrolling is enabled for choicelist + if ( iList->ScrollingDisabled() ) + { + iList->DisableScrolling( EFalse ); + } + TRect ctrlArea = iList->Rect(); if ( aPointerEvent.iType == TPointerEvent::EButton1Down ) diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/akncolourselectiongrid.cpp --- a/uifw/AvKon/src/akncolourselectiongrid.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/akncolourselectiongrid.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -89,7 +89,7 @@ } TRect mainPane; - AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EScreen, mainPane ); + AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EPopupParent, mainPane ); TAknLayoutRect colourPopupWindow; colourPopupWindow.LayoutRect(mainPane, AknLayoutScalable_Avkon::popup_large_graphic_colour_window(colourPopupVariety)); diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/akngrid.cpp --- a/uifw/AvKon/src/akngrid.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/akngrid.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-2009 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" @@ -109,12 +109,11 @@ public: // data TInt iFlags; - - // This is used to prevent MopSupplyObject being invoked - // from CEikListBox::MopGetObject(). + // EMMA-7A8B9F.Ugly hack. Prevent MopSupplyObject being invoked + // from CEikListBox::MopGetObject() TBool iIsFromBaseClass; - TPoint iLastPoint; + TBool iKineticScrolling; TBool iSingleClickEnabled; }; @@ -123,6 +122,7 @@ iFlags(0), iIsFromBaseClass( EFalse ), iLastPoint( 0, 0 ), + iKineticScrolling( CAknPhysics::FeatureEnabled() ), iSingleClickEnabled( iAvkonAppUi->IsSingleClickCompatible() ) { } @@ -1873,6 +1873,7 @@ // EHXA-7AQ8N4. Only set it to 0 can make scrollbar empty. vSbarModel.iScrollSpan = GridModel()->NumberOfItems() >0 ? gridSize.iHeight : 0; + vSbarModel.iThumbSpan = gridView->NumberOfRowsInView(); vSbarModel.iScrollSpan = GridModel()->NumberOfItems() >0 ? gridSize.iHeight*iView->ItemHeight() : 0; vSbarModel.iThumbSpan = rect.Height(); diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/aknindicatorpopupcontent.cpp --- a/uifw/AvKon/src/aknindicatorpopupcontent.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/aknindicatorpopupcontent.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -605,7 +605,6 @@ switch ( aPointerEvent.iType ) { case TPointerEvent::EButton1Down: - iOrdinal = DrawableWindow()->OrdinalPosition(); // Set flag that down was inside the popup. iFlags |= EAknIndicatorPopupContentButton1Down; iPreviousPressedDownItem = NULL; @@ -677,12 +676,6 @@ iFlags &= ( ~EAknIndicatorPopupContentButton1Down ); iEnablePressedDownState = EFalse; - if ( iOrdinal != DrawableWindow()->OrdinalPosition() ) - { - Window().Invalidate( iPressedDownRect ); - break; - } - if ( iBatteryPlugin && iBatteryArea.Contains( aPointerEvent.iPosition ) ) { diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/akninfrm.cpp --- a/uifw/AvKon/src/akninfrm.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/akninfrm.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -353,18 +353,11 @@ // we need to provide own context if one does not exist // because old style drawing did kind of work even // without calling SetInputContext( ... ) - TRAP_IGNORE - ( - iInputContext = CAknsFrameBackgroundControlContext::NewL( - KAknsIIDQsnFrInput, TRect(0,0,0,0), TRect(0,0,0,0), EFalse); - - if (iInputContext) - { - iFlags = iFlags | EOwnsInputContext; - // also need to provide skin for the editor in this case - static_cast( iField )->SetSkinBackgroundControlContextL( iInputContext ); - } - ); + iInputContext = CAknsFrameBackgroundControlContext::NewL( + KAknsIIDQsnFrInput, TRect(0,0,0,0), TRect(0,0,0,0), EFalse ); + iFlags = iFlags | EOwnsInputContext; + // also need to provide skin for the editor in this case + static_cast( iField )->SetSkinBackgroundControlContextL( iInputContext ); } if ( iInputContext ) @@ -516,7 +509,7 @@ { case KAknsMessageSkinChange: case KEikDynamicLayoutVariantSwitch: - TRAP_IGNORE(CreateIconL()); + CreateIconL(); break; default: diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/aknmessagequerycontrol.cpp --- a/uifw/AvKon/src/aknmessagequerycontrol.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/aknmessagequerycontrol.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -208,7 +208,9 @@ **/ AknLayoutUtils::LayoutEdwin( iEdwin, listPopupInfoPane.Rect(), TAknTextComponentLayout::Multiline(textComponentLayoutArray), EAknsCIQsnTextColorsCG19 ); + iEdwin->SetSuppressFormatting(ETrue); iEdwin->SetRect( listPopupInfoPane.Rect() ); + iEdwin->SetSuppressFormatting(EFalse); textComponentLayoutArray.Close(); } @@ -896,8 +898,7 @@ TAknMultiLineTextLayout multilineLayout = TAknTextComponentLayout::Multiline(textComponentLayoutArray); AknLayoutUtils::LayoutEdwin( iEdwin, listPopupInfoPane.Rect(), multilineLayout, EAknsCIQsnTextColorsCG19 ); - // Use list_popup_info_pane as editor's rect - iEdwin->SetRect( listPopupInfoPane.Rect() ); + //iEdwin->SetRect( listPopupInfoPane.Rect() ); textComponentLayoutArray.Close(); iEdwin->SetBorder( TGulBorder::ENone ); diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/aknnavi.cpp --- a/uifw/AvKon/src/aknnavi.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/aknnavi.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -32,8 +32,6 @@ #include #include -#include - // USER INCLUDE FILES #include "aknenv.h" #include "AknDef.h" @@ -2010,47 +2008,26 @@ // void CAknNavigationControlContainer::HandleLosingForeground() { - // Get the top control on navi pane. + // If volume popup is shown when the navi pane loses foreground, + // then the popup needs to be closed if shown, and the volume control + // told that it's not the topmost control. CAknNavigationDecorator* topControl = Top(); if ( topControl ) { - switch( topControl->ControlType() ) + if ( topControl && + topControl->ControlType() == CAknNavigationDecorator::ENaviVolume ) { - case CAknNavigationDecorator::ENaviVolume: - { - // If volume popup is shown when the navi pane loses foreground, - // then the popup needs to be closed if shown, and the volume control - // told that it's not the topmost control. - CAknVolumePopup* volumePopup = - static_cast ( - topControl->iDecoratedControl ); + CAknVolumePopup* volumePopup = + static_cast ( + topControl->iDecoratedControl ); - if ( volumePopup ) - { - volumePopup->CloseVolumePopup(); - static_cast( - topControl->DecoratedControl() )->HandleNaviStackChange( EFalse ); - } - break; - } - case CAknNavigationDecorator::ETabGroup: + if ( volumePopup ) { - // If tabgroup is shown when navi pane loses foreground, forward - // KAknMessageFocusLost event to tabgroup. Tab panes will stop highlighting - // the pressed tab. - CAknTabGroup* tabGroup = - static_cast ( - topControl->iDecoratedControl ); - - if ( tabGroup ) - { - tabGroup->HandleResourceChange(KAknMessageFocusLost); - } - break; + volumePopup->CloseVolumePopup(); + static_cast( + topControl->DecoratedControl() )->HandleNaviStackChange( EFalse ); } - default: - break; } } } diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/aknnoteattributes.cpp --- a/uifw/AvKon/src/aknnoteattributes.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/aknnoteattributes.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -1029,11 +1029,8 @@ iNoteControl->DeactivateGc(); // Redraw the label after the background - TRAPD(err, iNoteText->Line( i )->ActivateL()); // Never leaves - if (err == KErrNone) - { - iNoteText->Line( i )->DrawNow(); - } + iNoteText->Line( i )->ActivateL(); // Never leaves + iNoteText->Line( i )->DrawNow(); iNoteText->SetLineModified( i, EFalse ); } } diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/aknnotecontrol.cpp --- a/uifw/AvKon/src/aknnotecontrol.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/aknnotecontrol.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -671,7 +671,7 @@ AknLayoutUtils::LayoutLabel(TextControl()->Line(i),LayoutRect(), AKN_LAYOUT_TEXT_Note_with_an_image_pop_up_window_texts_Line_1( - lafIndex.NWIPWindowTextsLine1Left(i),lafIndex.NWIPWindowTextsLine1Right(i), + lafIndex.NWIPWindowTextsLine1L(i),lafIndex.NWIPWindowTextsLine1R(i), lafIndex.NWIPWindowTextsLine1B(i),lafIndex.NWIPWindowTextsLine1W(i))); if (!error) @@ -916,7 +916,7 @@ for (TInt i=0; i < KINMaxNumLines; i++) { TAknTextLineLayout lay = AKN_LAYOUT_TEXT_Note_with_an_image_pop_up_window_texts_Line_1( - lafIndex.NWIPWindowTextsLine1Left(i),lafIndex.NWIPWindowTextsLine1Right(i), + lafIndex.NWIPWindowTextsLine1L(i),lafIndex.NWIPWindowTextsLine1R(i), lafIndex.NWIPWindowTextsLine1B(i),lafIndex.NWIPWindowTextsLine1W(i)); text.LayoutText(LayoutRect(), lay); TInt width = text.TextRect().Width(); @@ -1161,7 +1161,7 @@ EXPORT_C void CAknNoteControl::ResetText() { // This can not Leave so no need to use TRAP - TRAP_IGNORE(Attributes()->SetTextL(KNullDesC)); + Attributes()->SetTextL(KNullDesC); Layout(); } @@ -1479,16 +1479,16 @@ * number type indication (NTI). See table in *.lay and * LAF specs for working out indexes. */ -TInt CAknNoteControl::TIndex::NWIPWindowTextsLine1Left(TInt aLineNum) const +TInt CAknNoteControl::TIndex::NWIPWindowTextsLine1L(TInt aLineNum) const { SelfTest(); - static const TInt KNWIPWindowTextsLine1IndexLeft[2][3] = + static const TInt KNWIPWindowTextsLine1IndexL[2][3] = { {0, 0, 0}, //NO NTI {0, 0, 2} //NTI }; - return KNWIPWindowTextsLine1IndexLeft[HasNtiIndex()][aLineNum]; + return KNWIPWindowTextsLine1IndexL[HasNtiIndex()][aLineNum]; } /** @@ -1501,18 +1501,18 @@ * - Dimension 2 is the image width * - Dimension 3 is the image height */ -TInt CAknNoteControl::TIndex::NWIPWindowTextsLine1Right(TInt aLineNum) const +TInt CAknNoteControl::TIndex::NWIPWindowTextsLine1R(TInt aLineNum) const { SelfTest(); - static const TInt KNWIPWindowTextsLine1IndexRight[3][5][5] = + static const TInt KNWIPWindowTextsLine1IndexR[3][5][5] = { {{0, 0, 0, 0, 0}, {0, 3, 3, 3, 3}, {0, 5, 5, 5, 5}, {0, 7, 7, 7, 7}, {0, 9, 9, 9, 9} }, //FIRST LINE {{0, 0, 0, 0, 0}, {0, 3, 3, 3, 3}, {0, 5, 5, 5, 5}, {0, 7, 7, 7, 7}, {0, 9, 9, 9, 9} }, //SECOND LINE {{0, 0, 0, 0, 0}, {0, 0, 0, 3, 3}, {0, 0, 0, 5, 5}, {0, 0, 0, 7, 7}, {0, 0, 0, 9, 9} } //THIRD LINE }; - return KNWIPWindowTextsLine1IndexRight[aLineNum][ImageWidthIndex()][ImageHeightIndex()]; + return KNWIPWindowTextsLine1IndexR[aLineNum][ImageWidthIndex()][ImageHeightIndex()]; } diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/aknqueryeditorindicator.cpp --- a/uifw/AvKon/src/aknqueryeditorindicator.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/aknqueryeditorindicator.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -82,7 +82,7 @@ iState = aState; if (Observer()) { - TRAP_IGNORE(Observer()->HandleControlEventL( this, MCoeControlObserver::EEventStateChanged )); + Observer()->HandleControlEventL( this, MCoeControlObserver::EEventStateChanged ); } if ( iFlags.IsSet(CAknQueryControl::EEditorIndicatorOff) ) diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/aknsfld.cpp --- a/uifw/AvKon/src/aknsfld.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/aknsfld.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -799,10 +799,6 @@ } iListBox->DrawNow(); } - } - else if( aCommandId == EAknCmdHideASGrid && iAdaptiveSearch ) - { - iAdaptiveSearch->HideAdaptiveSearchGridL(); } } @@ -900,11 +896,7 @@ { iEditor->SetFocus( aVisible ); } - } - if( iAdaptiveSearch && !aVisible ) - { - TRAP_IGNORE( iAdaptiveSearch->HideAdaptiveSearchGridL() ); - } + } _AKNTRACE_FUNC_EXIT; } diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/aknsgcc.cpp --- a/uifw/AvKon/src/aknsgcc.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/aknsgcc.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -46,8 +46,7 @@ EHandlingChange, EInAknSrv, ESystemFaded, - ENeverRelinquish, - EUseForegroundPriority + ENeverRelinquish }; @@ -80,12 +79,8 @@ inline CAknSgcClient* CAknSgcClient::Static() - { - if (CCoeEnv::Static()) - return static_cast(CCoeEnv::Static(KAknSgcClientStaticId)); - else - return NULL; - } + { return static_cast(CCoeEnv::Static(KAknSgcClientStaticId)); } + NONSHARABLE_CLASS(TSgcClientStatusPaneRedrawCoordinator) : public MAknSgcStatusPaneRedrawCoordinator @@ -623,11 +618,11 @@ RThread myThread; TProcessPriority priority = myThread.ProcessPriority(); - if ( IsSystemFaded() || iFlags[EUseForegroundPriority] ) + if( IsSystemFaded() ) { + // Solution for EKKG-7RQ9U8: // If the system is faded we have a popup on screen. - // Get the process behind the foreground process, the - // EUseForegroundPriority should also affect only that process. + // Get the process behind the foreground process. TApaTask task = TApaTaskList(iEikonEnv->WsSession()).FindByPos(1); // Check if this application is next behind the foreground app. @@ -662,23 +657,6 @@ } } -void CAknSgcClient::UseForegroundPriorityDuringRelinquish( - TBool aUseForeground ) - { - CAknSgcClient* self = Static(); - if ( self ) - { - if ( aUseForeground ) - { - self->iFlags.Set( EUseForegroundPriority ); - } - else - { - self->iFlags.Clear( EUseForegroundPriority ); - } - } - } - EXPORT_C CAknLayoutConfig& CAknSgcClient::LayoutConfig() { CAknSgcClient* self = Static(); diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/aknsignal.cpp --- a/uifw/AvKon/src/aknsignal.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/aknsignal.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -858,34 +858,6 @@ } } -// --------------------------------------------------------------------------- -// CAknSignalPane::ShowUmaIcon -// Displays an Uma state icon. -// --------------------------------------------------------------------------- -// -EXPORT_C void CAknSignalPane::ShowUmaIconL(TInt aUmaIconState) - { - // State is not changed if illegal value was given. - if (( aUmaIconState >= EAknSignalUmaIndicatorOff ) && - ( aUmaIconState <= EAknSignalUmaIndicatorMultipdp )) - { - LoadSignalIconL( aUmaIconState, iSignalIconControl->ColorIndex() ); - - iSignalIconControl->SetDrawBlank( EFalse ); - - if ( aUmaIconState != EAknSignalUmaIndicatorEstablishingContext ) - { - StopTicker(); - } - else if ( aUmaIconState == EAknSignalUmaIndicatorEstablishingContext ) - { - StartTickerL( KAknIndicatorAnimationDelay, - KAknIndicatorAnimationInterval ); - } - } - - - } // --------------------------------------------------------------------------- // CAknSignalPane::ShowCdmaIcon diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/aknsignaldataobserver.cpp --- a/uifw/AvKon/src/aknsignaldataobserver.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/aknsignaldataobserver.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -133,13 +133,7 @@ { // HSPDA iSignalPane->ShowHsdpaIcon(state.iIconState); - } - else if (state.iIconState >= EAknSignalUmaIndicatorOff - && state.iIconState <= EAknSignalUmaIndicatorMultipdp) - { - // UMA - iSignalPane->ShowUmaIconL(state.iIconState); - } + } } if (!updateAnimation) diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/akntabgrp.cpp --- a/uifw/AvKon/src/akntabgrp.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/akntabgrp.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -38,7 +38,6 @@ #include #include -#include // USER INCLUDE FILES #include "aknappui.h" @@ -105,9 +104,6 @@ /** Indicates whether or not the tab is shown in long tab group layout. */ TBool iLongTab; - - /** Indicates the hilight status of the tab*/ - TBool iHighlight; }; CAknTabExtension* CAknTabExtension::NewL() @@ -299,8 +295,6 @@ if ( !iExtension ) { iExtension = CAknTabExtension::NewL(); - //set the default highlight status of the tab - iExtension->iHighlight = EFalse; } iLabel = new (ELeave) CEikLabel; @@ -813,14 +807,7 @@ } -// --------------------------------------------------------------------------- -// sets the highlight status of a tab -// --------------------------------------------------------------------------- -// -void CAknTab::SetHighlight(TBool aHighlight) - { - iExtension->iHighlight = aHighlight; - } + // --------------------------------------------------------------------------- // Handles size change events in flat status pane layouts. // --------------------------------------------------------------------------- @@ -1046,7 +1033,7 @@ } else { - if (iActive || iExtension->iHighlight) + if ( iActive ) { TInt error = AknsUtils::GetCachedColor( skin, color, KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG3 ); @@ -1084,7 +1071,7 @@ iColorBitmaps->At(KTabColorBitmapActiveColorIndex) && iColorBitmaps->At(KTabColorBitmapPassiveColorIndex) ) { - if (iActive || iExtension->iHighlight) + if( iActive ) { colorBitmap = iColorBitmaps->At(KTabColorBitmapActiveColorIndex); } @@ -1275,8 +1262,8 @@ if ( !iColorBitmaps ) { - TRAP_IGNORE(LoadColorBitmapL()); - } + LoadColorBitmapL(); + } } void CAknTab::SetNarrowTabLayout( TBool aNarrow ) @@ -1412,9 +1399,6 @@ /** This is the tab width that is set by the application. */ TInt iRequestedTabWidth; - - /** Indicates whether highlight tab is being drawn or not*/ - TBool iHighlight; }; @@ -1422,8 +1406,6 @@ { iPointerDownTab = -1; iPointerDownXPosition = -1; - //Highlight is disabled by default. - iHighlight = EFalse; } @@ -1889,7 +1871,7 @@ { iExtension->iTabBackgroundLayout.iUse = EFalse; - iExtension->iTabSvgGraphics->DrawTabGroupBackground( + iExtension->iTabSvgGraphics->DrawTabGroupBackgroundL( CAknTabGroupGraphics::ENoDraw, iLongTabs, iNumberOfTabsShown, @@ -2635,13 +2617,11 @@ if (iExtension->iNarrowTabLayout) { - iExtension->iTabSvgGraphics->DrawTabGroupNarrowBackground( - CAknTabGroupGraphics::ENormal, - iLongTabs, - iNumberOfTabsShown, - positionActive + 1, - &gc, - iExtension->iTabBackgroundLayout); + iExtension->iTabSvgGraphics->DrawTabGroupNarrowBackgroundL( + CAknTabGroupGraphics::ENormal, iLongTabs, + iNumberOfTabsShown, positionActive + 1, &gc, + iExtension->iTabBackgroundLayout); + } else { @@ -2651,36 +2631,18 @@ if ( animationOngoing ) { - animation = iExtension->iTabCycleAnimationDirection == ELeft ? - CAknTabGroupGraphics::ECycleToLeft : CAknTabGroupGraphics::ECycleToRight; + animation + = iExtension->iTabCycleAnimationDirection == ELeft + ? CAknTabGroupGraphics::ECycleToLeft + : CAknTabGroupGraphics::ECycleToRight; } - - if (!iExtension->iHighlight) - { - // if highlight is not active - iExtension->iTabSvgGraphics->DrawTabGroupBackground( - CAknTabGroupGraphics::ENormal, - iLongTabs, - iNumberOfTabsShown, - positionActive + 1, - &gc, - animationOngoing ? iExtension->iNextTabBackgroundLayout : iExtension->iTabBackgroundLayout, - iExtension->iTabsHidden, - animation); - } - else - { - // Highlight is active - TInt highlightTab = iExtension->iPointerDownTab - iFirstShownTab + 1; //pointer down tab index w.r.t shown tabs - iExtension->iTabSvgGraphics->DrawTabGroupBackground( - CAknTabGroupGraphics::ENormal, - iLongTabs, - iNumberOfTabsShown, - positionActive + 1, - &gc, - animationOngoing ? iExtension->iNextTabBackgroundLayout : iExtension->iTabBackgroundLayout, - iExtension->iTabsHidden, animation, highlightTab ); - } + iExtension->iTabSvgGraphics->DrawTabGroupBackgroundL( + CAknTabGroupGraphics::ENormal, iLongTabs, + iNumberOfTabsShown, positionActive + 1, &gc, + animationOngoing ? iExtension->iNextTabBackgroundLayout + : iExtension->iTabBackgroundLayout, + iExtension->iTabsHidden, animation); + } } else @@ -2917,10 +2879,8 @@ // pointer position. newTab = iActiveTab; } - - //Activates highlight drawing for pressed tab. - EnableHighlight( ETrue, newTab, aPointerEvent.iPosition.iX ); - + iExtension->iPointerDownTab = newTab; + iExtension->iPointerDownXPosition = aPointerEvent.iPosition.iX; return; } else if ( aPointerEvent.iType == TPointerEvent::EButton1Up ) @@ -2950,8 +2910,9 @@ // if the button up event occurs ouside tabgroup, ignore it. if ( !Rect().Contains( aPointerEvent.iPosition ) || iExtension->iPointerDownTab != newTab ) { - EnableHighlight( EFalse ); - return; + iExtension->iPointerDownTab = -1; + iExtension->iPointerDownXPosition = -1; + return ; } if ( newTab != iActiveTab && @@ -3057,7 +3018,8 @@ } } - EnableHighlight( EFalse ); + iExtension->iPointerDownTab = -1; + iExtension->iPointerDownXPosition = -1; } } } @@ -3411,12 +3373,6 @@ TRAP_IGNORE( InitTabGroupGraphicsL() ); TRAP_IGNORE( LoadTabBitmapsL( iNumberOfTabsShown, iLongTabs ) ); } - - // Stop highlighting the pressed tab when receives KAknMessageFocusLost event. - if( aType == KAknMessageFocusLost ) - { - EnableHighlight(EFalse); - } if ( aType == KEikDynamicLayoutVariantSwitch ) { @@ -3432,14 +3388,14 @@ ParentRect( iExtension->iNaviArrowsUsed ) ); iExtension->iTabBackgroundLayout.iUse = EFalse; - iExtension->iTabSvgGraphics->DrawTabGroupBackground( + TRAP_IGNORE( iExtension->iTabSvgGraphics->DrawTabGroupBackgroundL( CAknTabGroupGraphics::ENoDraw, iLongTabs, iNumberOfTabsShown, 1, NULL, iExtension->iTabBackgroundLayout, - CAknTabGroupGraphics::ENone ); + CAknTabGroupGraphics::ENone ) ); iExtension->iTabBackgroundLayout.iUse = ETrue; SetDecoratorLayout( EFalse ); } @@ -3447,7 +3403,6 @@ if ( iExtension ) { iExtension->iNarrowTabLayout = EFalse; - EnableHighlight(EFalse); } if ( !COMPARE_BOOLS( iMirrored, AknLayoutUtils::LayoutMirrored() ) ) @@ -4088,7 +4043,7 @@ if ( aNarrow ) { iExtension->iNextTabBackgroundLayout.iUse = EFalse; - iExtension->iTabSvgGraphics->DrawTabGroupNarrowBackground( + iExtension->iTabSvgGraphics->DrawTabGroupNarrowBackgroundL( CAknTabGroupGraphics::ENoDraw, iLongTabs, iNumberOfTabsShown, @@ -4100,7 +4055,7 @@ if ( !aUseAnimation ) { iExtension->iTabBackgroundLayout.iUse = EFalse; - iExtension->iTabSvgGraphics->DrawTabGroupNarrowBackground( + iExtension->iTabSvgGraphics->DrawTabGroupNarrowBackgroundL( CAknTabGroupGraphics::ENoDraw, iLongTabs, iNumberOfTabsShown, @@ -4113,7 +4068,7 @@ else { iExtension->iNextTabBackgroundLayout.iUse = EFalse; - iExtension->iTabSvgGraphics->DrawTabGroupBackground( + iExtension->iTabSvgGraphics->DrawTabGroupBackgroundL( CAknTabGroupGraphics::ENoDraw, iLongTabs, iNumberOfTabsShown, @@ -4124,7 +4079,7 @@ iExtension->iNextTabBackgroundLayout.iUse = ETrue; iExtension->iTabBackgroundLayout.iUse = EFalse; - iExtension->iTabSvgGraphics->DrawTabGroupBackground( + iExtension->iTabSvgGraphics->DrawTabGroupBackgroundL( CAknTabGroupGraphics::ENoDraw, iLongTabs, iNumberOfTabsShown, @@ -4489,42 +4444,4 @@ CancelTabAnimationEventTimer(); } -void CAknTabGroup::ResetHighlightStatus() - { - // Resets highlight status to EFalse - for( TInt i = 0; i < iTabArray->Count(); i++ ) - { - iTabArray->At(i)->SetHighlight( EFalse ); - } - } - -void CAknTabGroup::EnableHighlight( TBool aEnable, TInt aNewTab , TInt aPointX ) - { - iExtension->iPointerDownTab = aNewTab; - iExtension->iPointerDownXPosition = aPointX; - if( aEnable ) - { - //Activates highlight drawing for pressed tab. - if (!iExtension->iHighlight) - { - iExtension->iHighlight = ETrue; - - // Set the pressed tab to highlight - if ( iExtension->iPointerDownTab >= 0 ) - { - iTabArray->At( iExtension->iPointerDownTab )->SetHighlight( ETrue ); - } - DrawDeferred(); - } - } - else - { - if (iExtension->iHighlight) - { - iExtension->iHighlight = EFalse; - ResetHighlightStatus(); - DrawDeferred(); - } - } - } // End of File diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/aknutils.cpp --- a/uifw/AvKon/src/aknutils.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/aknutils.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -3574,16 +3574,6 @@ aRect = rect.Rect(); return ETrue; } - //add below code for vga_touch - else if ( screenRect.iBr.iX == 640 && screenRect.iBr.iY == 480 ) - { - TInt variety = 13; - - rect.LayoutRect( screenRect, - AknLayoutScalable_Avkon::main_pane( variety ) ); - aRect = rect.Rect(); - return ETrue; - } else { return LayoutMetricsRect( EMainPane, aRect ); @@ -5310,21 +5300,8 @@ CleanupStack::PopAndDestroy(); // wrapWidthArray } ); // TRAP end - if ( error == KErrNone ) - { - n = 0; - for ( i = 0; i < buffer.Length(); i++ ) - { - if ( buffer[i] == '\n' ) - { - n++; - } - } - } - - // There is no layout for empty popuplist - // The second layout that 2 lines with big font is used for two lines text. - if ( n < 3 || error != KErrNone || popupList ) + // there is no layout for empty popuplist + if ( error != KErrNone || popupList ) { DrawEmptyListImpl_real_DrawUpToTwoLines( aGc, aText, line1, line2, line1length, line2length, diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/src/eikfrlbd.cpp --- a/uifw/AvKon/src/eikfrlbd.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/src/eikfrlbd.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -2862,8 +2862,12 @@ & CListItemDrawer::EMarkingModeEnabled && !aProperties.IsSelectionHidden() && iExtension->iMarkingIconArray +#ifdef RD_TOUCH2_MARKING && iExtension->iMarkingIconArray->Count() - == KMarkingModeIconArraySize ) + == KMarkingModeIconArraySize ) +#else + && iExtension->iMarkingIconArray->Count() == 2 ) +#endif // RD_TOUCH2_MARKING { if ( AknLayoutUtils::LayoutMirrored() ) { diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/srcdata/avkon.rss --- a/uifw/AvKon/srcdata/avkon.rss Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/srcdata/avkon.rss Wed Oct 13 14:50:15 2010 +0300 @@ -10307,77 +10307,5 @@ }; } -RESOURCE DIALOG r_avkon_special_character_table_dialog_korean - { - flags = EGeneralQueryFlags | EEikDialogFlagNoBorder | EEikDialogFlagNoShadow; - buttons = r_avkon_softkeys_select_cancel__select; - items= - { - DLG_LINE - { - type = EAknCtPopupHeadingPane; - id = EAknSCTQueryHeadingId; - control = AVKON_HEADING - { - label = qtn_pop_up_select_character; - headinglayout = r_avkon_sct_list_heading_pane; - }; - }, - DLG_LINE - { - type = EAknCtSpecialCharacterMap; - id = EAknSCTQueryContentId; - control = SPECIAL_CHAR_TABLE - { - contents = - { - SCT_CHAR_SET - { - id = EAknSCTUpperCase; - chars = qtn_sct_kor_special_characters; - }, - SCT_CHAR_SET - { - id = EAknSCTLowerCase; - chars = qtn_sct_kor_special_characters; - }, - SCT_CHAR_SET - { - id = EAknSCTQwerty; - chars = qtn_sct_kor_special_characters; - } - }; - }; - } - }; - } - -RESOURCE SPECIAL_CHAR_TABLE r_avkon_menu_sct_row_default_contents_korean - { - contents = - { - SCT_CHAR_SET - { - id = EAknSCTUpperCase; - chars = qtn_sct_kor_special_characters; - }, - SCT_CHAR_SET - { - id = EAknSCTLowerCase; - chars = qtn_sct_kor_special_characters; - }, - SCT_CHAR_SET - { - id = EAknSCTQwerty; - chars = qtn_sct_kor_special_characters; - } - }; - } - -// the buffer of "tap to write" -RESOURCE TBUF r_avkon_tap_to_write - { - buf = qtn_editors_tap_to_write; - } // End of File diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestaknsound/group/bctestaknsound.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestaknsound/group/bctestaknsound.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestaknsound/group/bctestaknsound.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -58,7 +58,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestappfrm/group/bctestappfrm.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestappfrm/group/bctestappfrm.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestappfrm/group/bctestappfrm.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -67,7 +67,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestbuttons/group/bctestbuttons.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestbuttons/group/bctestbuttons.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestbuttons/group/bctestbuttons.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -58,7 +58,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestcmdlg/group/bctestcmdlg.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestcmdlg/group/bctestcmdlg.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestcmdlg/group/bctestcmdlg.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,7 +63,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestdocandinit/group/bctestDocAndInit.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestdocandinit/group/bctestDocAndInit.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestdocandinit/group/bctestDocAndInit.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,13 +57,13 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib LIBRARY commonui.lib LIBRARY apmime.lib -LIBRARY platformenv.lib +LIBRARY PlatformEnv.lib LIBRARY eikctl.lib LIBRARY sysutil.lib LIBRARY bafl.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteditor/group/bctesteditor.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteditor/group/bctesteditor.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteditor/group/bctesteditor.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,7 +57,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteh/group/bctesteh.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteh/group/bctesteh.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteh/group/bctesteh.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,12 +57,12 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib -LIBRARY commonui.lib -LIBRARY CommonEngine.lib +LIBRARY commonui.lib +LIBRARY commonengine.lib START RESOURCE ../group/bctesteh_reg.rss DEPENDS bctesteh.rsg diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteikbctrl/group/bctesteikbctrl.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteikbctrl/group/bctesteikbctrl.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteikbctrl/group/bctesteikbctrl.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -58,7 +58,7 @@ LIBRARY cone.lib LIBRARY eikcore.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteikfrm/group/bctesteikfrm.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteikfrm/group/bctesteikfrm.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteikfrm/group/bctesteikfrm.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -60,7 +60,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestfontinput/group/bctestfontinput.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestfontinput/group/bctestfontinput.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestfontinput/group/bctestfontinput.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -58,13 +58,13 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib LIBRARY fbscli.lib LIBRARY akninputlanguage.lib -LIBRARY fontutils.lib +LIBRARY fontutils.lib LIBRARY uiklaf.lib LIBRARY gdi.lib LIBRARY egul.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestform/group/bctestForm.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestform/group/bctestForm.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestform/group/bctestForm.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -59,11 +59,11 @@ LIBRARY aknnotify.lib LIBRARY bafl.lib LIBRARY bctestutil.lib -LIBRARY CommonEngine.lib -LIBRARY aknskins.lib +LIBRARY commonengine.lib +LIBRARY AknSkins.lib LIBRARY egul.lib -LIBRARY aknicon.lib -LIBRARY centralrepository.lib +LIBRARY AknIcon.lib +LIBRARY CentralRepository.lib // Changes for Scalable UI: // New registration resource defined. diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestgrids/group/bctestgrids.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestgrids/group/bctestgrids.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestgrids/group/bctestgrids.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -61,7 +61,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestimage/group/bctestimage.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestimage/group/bctestimage.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestimage/group/bctestimage.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -58,7 +58,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestkeylock/group/bctestkeylock.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestkeylock/group/bctestkeylock.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestkeylock/group/bctestkeylock.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,7 +57,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestlabelinfoindicators/group/bctestlabelinfoindicators.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestlabelinfoindicators/group/bctestlabelinfoindicators.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestlabelinfoindicators/group/bctestlabelinfoindicators.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -51,8 +51,8 @@ APP_LAYER_SYSTEMINCLUDE -LIBRARY aknicon.lib -LIBRARY aknskins.lib +LIBRARY AknIcon.lib +LIBRARY AknSkins.lib LIBRARY avkon.lib LIBRARY apparc.lib LIBRARY aknnotify.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestlist/group/bctestlist.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestlist/group/bctestlist.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestlist/group/bctestlist.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -69,8 +69,8 @@ LIBRARY eikctl.lib LIBRARY bafl.lib LIBRARY eikdlg.lib -LIBRARY aknskins.lib -LIBRARY aknicon.lib +LIBRARY AknSkins.lib +LIBRARY AknIcon.lib LIBRARY egul.lib LIBRARY gdi.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestmenu/group/bctestmenu.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestmenu/group/bctestmenu.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestmenu/group/bctestmenu.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,7 +57,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestmisccontrol/group/bctestmisccontrol.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestmisccontrol/group/bctestmisccontrol.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestmisccontrol/group/bctestmisccontrol.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,8 +57,8 @@ APP_LAYER_SYSTEMINCLUDE -LIBRARY aknicon.lib -LIBRARY aknskins.lib +LIBRARY AknIcon.lib +LIBRARY AknSkins.lib LIBRARY avkon.lib LIBRARY apparc.lib LIBRARY aknnotify.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestnote/group/bctestnote.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestnote/group/bctestnote.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestnote/group/bctestnote.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -63,8 +63,8 @@ APP_LAYER_SYSTEMINCLUDE -LIBRARY aknicon.lib -LIBRARY aknskins.lib +LIBRARY AknIcon.lib +LIBRARY AknSkins.lib LIBRARY avkon.lib LIBRARY apparc.lib LIBRARY aknnotify.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestnotifier/group/bctestnotifier.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestnotifier/group/bctestnotifier.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestnotifier/group/bctestnotifier.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -60,12 +60,12 @@ LIBRARY insock.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib LIBRARY estor.lib -LIBRARY aknnotify.lib +LIBRARY AknNotify.lib LIBRARY bafl.lib // Changes for Scalable UI: diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestpane/group/bctestpane.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestpane/group/bctestpane.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestpane/group/bctestpane.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,7 +57,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestpopups/group/bctestpopups.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestpopups/group/bctestpopups.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestpopups/group/bctestpopups.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,8 +57,8 @@ APP_LAYER_SYSTEMINCLUDE -LIBRARY aknicon.lib -LIBRARY aknskins.lib +LIBRARY AknIcon.lib +LIBRARY AknSkins.lib LIBRARY avkon.lib LIBRARY apparc.lib LIBRARY aknnotify.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestprivateuifrm/group/bctestprivateuifrm.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestprivateuifrm/group/bctestprivateuifrm.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestprivateuifrm/group/bctestprivateuifrm.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,7 +57,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestptieng/group/bctestptieng.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestptieng/group/bctestptieng.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestptieng/group/bctestptieng.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -62,7 +62,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestquery/group/bctestquery.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestquery/group/bctestquery.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestquery/group/bctestquery.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -61,8 +61,8 @@ LIBRARY eikctl.lib LIBRARY bafl.lib LIBRARY eikdlg.lib -LIBRARY aknskins.lib -LIBRARY aknicon.lib +LIBRARY AknSkins.lib +LIBRARY AknIcon.lib LIBRARY egul.lib LIBRARY gdi.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestscreenclearer/group/bctestscreenclearer.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestscreenclearer/group/bctestscreenclearer.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestscreenclearer/group/bctestscreenclearer.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -58,7 +58,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestscrollerbar/group/bctestscroller.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestscrollerbar/group/bctestscroller.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestscrollerbar/group/bctestscroller.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -58,7 +58,7 @@ LIBRARY avkon.lib LIBRARY eikcoctl.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsearchfield/group/bctestsearchfield.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsearchfield/group/bctestsearchfield.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsearchfield/group/bctestsearchfield.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,7 +57,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestserverapp/group/bctestserverapp.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestserverapp/group/bctestserverapp.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestserverapp/group/bctestserverapp.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,11 +57,11 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib -LIBRARY aknskinsrv.lib +LIBRARY AknSkinSrv.lib START RESOURCE ../group/bctestserverapp_reg.rss DEPENDS bctestserverapp.rsg diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsettingpage/group/bctestsettingpage.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsettingpage/group/bctestsettingpage.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsettingpage/group/bctestsettingpage.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -68,7 +68,7 @@ LIBRARY insock.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestskins/group/bctestskins.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestskins/group/bctestskins.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestskins/group/bctestskins.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -61,7 +61,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsliderandicons/group/bctestsliderandicons.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsliderandicons/group/bctestsliderandicons.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsliderandicons/group/bctestsliderandicons.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -58,7 +58,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestutilities/group/bctestutilities.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestutilities/group/bctestutilities.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestutilities/group/bctestutilities.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,7 +57,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestvolume/group/bctestvolume.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestvolume/group/bctestvolume.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestvolume/group/bctestvolume.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -60,7 +60,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestlocation/group/bctestlocation.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestlocation/group/bctestlocation.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestlocation/group/bctestlocation.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,12 +57,12 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib LIBRARY eikctl.lib -LIBRARY lbs.lib +LIBRARY Lbs.lib START RESOURCE ../group/BCTestLocation_reg.rss DEPENDS bctestlocation.rsg diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestmisc/group/bctestmisc.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestmisc/group/bctestmisc.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestmisc/group/bctestmisc.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,7 +57,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestocr/group/bctestocr.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestocr/group/bctestocr.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestocr/group/bctestocr.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -52,8 +52,8 @@ APP_LAYER_SYSTEMINCLUDE -LIBRARY aknicon.lib -LIBRARY aknskins.lib +LIBRARY AknIcon.lib +LIBRARY AknSkins.lib LIBRARY avkon.lib LIBRARY apparc.lib LIBRARY bafl.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.2/bcextendedfontapi/group/BCExtendedFontApi.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bcextendedfontapi/group/BCExtendedFontApi.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bcextendedfontapi/group/BCExtendedFontApi.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib -LIBRARY FontProvider.lib +LIBRARY fontprovider.lib LIBRARY fontutils.lib LIBRARY gdi.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestbutton/group/bctestbutton.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestbutton/group/bctestbutton.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestbutton/group/bctestbutton.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -58,7 +58,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestchoicelist/group/bctestchoicelist.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestchoicelist/group/bctestchoicelist.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestchoicelist/group/bctestchoicelist.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,7 +57,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestlocalizer/group/bctestlocalizer.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestlocalizer/group/bctestlocalizer.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestlocalizer/group/bctestlocalizer.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,7 +57,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestmisc32/group/bctestmisc32.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestmisc32/group/bctestmisc32.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestmisc32/group/bctestmisc32.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -58,7 +58,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestservicehandler/group/bctestservicehandler.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestservicehandler/group/bctestservicehandler.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestservicehandler/group/bctestservicehandler.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -59,7 +59,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.2/bctesttouchpane/group/bctesttouchpane.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctesttouchpane/group/bctesttouchpane.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctesttouchpane/group/bctesttouchpane.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,7 +57,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestuniteditor/group/bctestuniteditor.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestuniteditor/group/bctestuniteditor.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestuniteditor/group/bctestuniteditor.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,7 +57,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestutilities/group/bctestutilities.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestutilities/group/bctestutilities.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestutilities/group/bctestutilities.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,7 +57,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctestpreviewpopup/group/bctestpreviewpopup.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctestpreviewpopup/group/bctestpreviewpopup.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctestpreviewpopup/group/bctestpreviewpopup.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,7 +57,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctesttoolbar/group/bctesttoolbar.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctesttoolbar/group/bctesttoolbar.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctesttoolbar/group/bctesttoolbar.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -59,7 +59,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctesttreelist/group/bctesttreelist.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctesttreelist/group/bctesttreelist.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctesttreelist/group/bctesttreelist.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -57,7 +57,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK5.0/bcmultidriver/group/bctestmultidriver.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bcmultidriver/group/bctestmultidriver.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bcmultidriver/group/bctestmultidriver.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -58,7 +58,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestappfrm/group/bctestappfrm.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestappfrm/group/bctestappfrm.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestappfrm/group/bctestappfrm.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -67,7 +67,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestdocandinit/group/bctestDocAndInit.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestdocandinit/group/bctestDocAndInit.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestdocandinit/group/bctestDocAndInit.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -58,13 +58,13 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib LIBRARY commonui.lib LIBRARY apmime.lib -LIBRARY platformenv.lib +LIBRARY PlatformEnv.lib LIBRARY eikctl.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestfontinput/group/BCTestFontInput.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestfontinput/group/BCTestFontInput.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestfontinput/group/BCTestFontInput.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib -LIBRARY fontutils.lib +LIBRARY fontutils.lib START RESOURCE ../group/BCTestFontInput_reg.rss DEPENDS bctestfontinput.rsg diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestmix50/group/bctestmix50.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestmix50/group/bctestmix50.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestmix50/group/bctestmix50.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -56,7 +56,7 @@ APP_LAYER_SYSTEMINCLUDE LIBRARY aknhlist.lib -LIBRARY aknicon.lib +LIBRARY aknicon.lib LIBRARY akninputlanguage.lib LIBRARY aknnotify.lib LIBRARY aknskins.lib @@ -84,7 +84,7 @@ LIBRARY touchfeedback.lib LIBRARY ws32.lib LIBRARY hwrmhapticsclient.lib -LIBRARY aknskinsrv.lib +LIBRARY AknSkinSrv.lib START RESOURCE ../group/bctestmix50_reg.rss DEPENDS bctestmix50.rsg diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestsettingpage/group/bctestsettingpage.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestsettingpage/group/bctestsettingpage.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestsettingpage/group/bctestsettingpage.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -70,7 +70,7 @@ LIBRARY insock.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestsliderandicons/group/bctestsliderandicons.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestsliderandicons/group/bctestsliderandicons.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestsliderandicons/group/bctestsliderandicons.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -59,7 +59,7 @@ LIBRARY eikcoctl.lib LIBRARY avkon.lib LIBRARY ws32.lib -LIBRARY aknskins.lib +LIBRARY AknSkins.lib LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDKMCL/bctestmixmcl/group/bctestmixmcl.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDKMCL/bctestmixmcl/group/bctestmixmcl.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDKMCL/bctestmixmcl/group/bctestmixmcl.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -51,7 +51,7 @@ APP_LAYER_SYSTEMINCLUDE LIBRARY aknhlist.lib -LIBRARY aknicon.lib +LIBRARY aknicon.lib LIBRARY akninputlanguage.lib LIBRARY aknnotify.lib LIBRARY aknskins.lib @@ -79,7 +79,7 @@ LIBRARY touchfeedback.lib LIBRARY ws32.lib LIBRARY hwrmhapticsclient.lib -LIBRARY aknskinsrv.lib +LIBRARY AknSkinSrv.lib LIBRARY aknphysics.lib LIBRARY bitgdi.lib LIBRARY eikcoctl.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/S60_SDKMCL/bctestsingleclick/group/bctestsingleclick.mmp --- a/uifw/AvKon/tsrc/bc/S60_SDKMCL/bctestsingleclick/group/bctestsingleclick.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/S60_SDKMCL/bctestsingleclick/group/bctestsingleclick.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -64,7 +64,7 @@ LIBRARY bctestutil.lib LIBRARY efsrv.lib LIBRARY akncapserverclient.lib -LIBRARY CommonEngine.lib +LIBRARY commonengine.lib LIBRARY bafl.lib START RESOURCE ../group/bctestsingleclick_reg.rss diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomaiwakn/group/bctestdomaiwakn.mmp --- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomaiwakn/group/bctestdomaiwakn.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomaiwakn/group/bctestdomaiwakn.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -82,20 +82,20 @@ LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib -LIBRARY servicehandler.lib +LIBRARY servicehandler.lib LIBRARY bafl.lib -LIBRARY AknKeyRotator.lib -LIBRARY ptiengine.lib +LIBRARY aknkeyrotator.lib +LIBRARY ptiengine.lib LIBRARY aknjapanesereading.lib LIBRARY commondialogs.lib -LIBRARY aknnotify.lib +LIBRARY aknnotify.lib LIBRARY gdi.lib LIBRARY eikctl.lib LIBRARY fbscli.lib LIBRARY akncapserverclient.lib LIBRARY eiksrvc.lib LIBRARY ecom.lib -LIBRARY platformenv.lib +LIBRARY platformEnv.lib START RESOURCE ../group/bctestdomaiwakn_reg.rss DEPENDS bctestdomaiwakn.rsg diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomavkonpsln/group/bctestdomavkonpsln.mmp --- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomavkonpsln/group/bctestdomavkonpsln.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomavkonpsln/group/bctestdomavkonpsln.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -71,14 +71,14 @@ LIBRARY bafl.lib LIBRARY fbscli.lib LIBRARY aknnotify.lib -LIBRARY Eikalert.lib +LIBRARY eikalert.lib LIBRARY aknnotifyplugin.lib LIBRARY akntransitionutils.lib LIBRARY eikdlg.lib LIBRARY eiksrvui.lib LIBRARY commonui.lib -LIBRARY FindUtil.lib -LIBRARY aknicon.lib +LIBRARY findutil.lib +LIBRARY aknicon.lib LIBRARY eikctl.lib LIBRARY form.lib LIBRARY uiklaf.lib @@ -88,12 +88,12 @@ LIBRARY numbergrouping.lib LIBRARY pslnframework.lib LIBRARY estor.lib -LIBRARY CommonEngine.lib +LIBRARY commonengine.lib LIBRARY xnodt.lib LIBRARY ecom.lib LIBRARY eiksrvc.lib LIBRARY servicehandler.lib -LIBRARY SortUtil.lib +LIBRARY sortutil.lib START RESOURCE ../group/bctestdomavkonpsln_reg.rss DEPENDS bctestdomavkonpsln.rsg diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomcdl/group/bctestdomcdl.mmp --- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomcdl/group/bctestdomcdl.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomcdl/group/bctestdomcdl.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -59,8 +59,8 @@ LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib -LIBRARY CdlEngine.lib -LIBRARY CommonEngine.lib +LIBRARY cdlengine.lib +LIBRARY commonengine.lib START RESOURCE ../group/bctestdomcdl_reg.rss DEPENDS bctestdomcdl.rsg diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomcoreui/group/bctestdomcoreui.mmp --- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomcoreui/group/bctestdomcoreui.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomcoreui/group/bctestdomcoreui.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -59,9 +59,9 @@ LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib -LIBRARY MenuInterface.lib +LIBRARY menuinterface.lib LIBRARY voiceuinamedialer.lib -LIBRARY pbkeng.lib +LIBRARY pbkeng.lib LIBRARY eikdlg.lib LIBRARY eikctl.lib LIBRARY eikcdlg.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomfntlay/group/bctestdomfntlay.mmp --- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomfntlay/group/bctestdomfntlay.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomfntlay/group/bctestdomfntlay.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -66,18 +66,18 @@ LIBRARY efsrv.lib LIBRARY fontutils.lib LIBRARY uiklaf.lib -LIBRARY FontProvider.lib +LIBRARY fontprovider.lib LIBRARY gdi.lib LIBRARY bitgdi.lib -LIBRARY aknskinsrv.lib +LIBRARY aknskinsrv.lib LIBRARY fbscli.lib LIBRARY bafl.lib LIBRARY aknlayout2.lib -LIBRARY AknLayout2Adaptation.lib +LIBRARY aknlayout2adaptation.lib LIBRARY aknLayout2hierarchy.lib -LIBRARY AknLayout2Scalable.lib +LIBRARY aknlayout2scalable.lib LIBRARY aknicon.lib -LIBRARY CdlEngine.lib +LIBRARY cdlengine.lib // New registration resource defined. START RESOURCE ../group/bctestdomfntlay_reg.rss diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomnotifier/group/bctestdomnotifier.mmp --- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomnotifier/group/bctestdomnotifier.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomnotifier/group/bctestdomnotifier.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -71,13 +71,13 @@ LIBRARY aknnotifierwrapper.lib LIBRARY akncapserverclient.lib LIBRARY aknlistloadertfx.lib -LIBRARY aknjapanesereading.lib +LIBRARY AknJapaneseReading.lib -LIBRARY aknmemorycardui.lib +LIBRARY AknMemoryCardUi.lib LIBRARY aknlayout2.lib -LIBRARY AknLayout2Adaptation.lib +LIBRARY aknlayout2adaptation.lib LIBRARY aknLayout2hierarchy.lib -LIBRARY AknLayout2Scalable.lib +LIBRARY aknlayout2scalable.lib LIBRARY pslnengine.lib START RESOURCE ../group/bctestdomnotifier_reg.rss diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdompopup/group/bctestdompopup.mmp --- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdompopup/group/bctestdompopup.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdompopup/group/bctestdompopup.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -65,7 +65,7 @@ LIBRARY bctestutil.lib LIBRARY efsrv.lib LIBRARY egul.lib -LIBRARY aknnotify.lib +LIBRARY AknNotify.lib START RESOURCE ../group/bctestdompopup_reg.rss DEPENDS bctestdompopup.rsg diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomaiwakn/group/bctestdomaiwakn.mmp --- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomaiwakn/group/bctestdomaiwakn.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomaiwakn/group/bctestdomaiwakn.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -83,20 +83,20 @@ LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib -LIBRARY servicehandler.lib +LIBRARY servicehandler.lib LIBRARY bafl.lib -LIBRARY AknKeyRotator.lib -LIBRARY ptiengine.lib +LIBRARY aknkeyrotator.lib +LIBRARY ptiengine.lib LIBRARY aknjapanesereading.lib LIBRARY commondialogs.lib -LIBRARY aknnotify.lib +LIBRARY aknnotify.lib LIBRARY gdi.lib LIBRARY eikctl.lib LIBRARY fbscli.lib LIBRARY akncapserverclient.lib LIBRARY eiksrvc.lib LIBRARY ecom.lib -LIBRARY platformenv.lib +LIBRARY platformEnv.lib START RESOURCE ../group/bctestdomaiwakn_reg.rss DEPENDS bctestdomaiwakn.rsg diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomavkonpsln/group/bctestdomavkonpsln.mmp --- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomavkonpsln/group/bctestdomavkonpsln.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomavkonpsln/group/bctestdomavkonpsln.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -67,14 +67,14 @@ LIBRARY bafl.lib LIBRARY fbscli.lib LIBRARY aknnotify.lib -LIBRARY Eikalert.lib +LIBRARY eikalert.lib LIBRARY aknnotifyplugin.lib LIBRARY akntransitionutils.lib LIBRARY eikdlg.lib LIBRARY eiksrvui.lib LIBRARY commonui.lib -LIBRARY FindUtil.lib -LIBRARY aknicon.lib +LIBRARY findutil.lib +LIBRARY aknicon.lib LIBRARY eikctl.lib LIBRARY form.lib LIBRARY uiklaf.lib @@ -84,12 +84,12 @@ LIBRARY numbergrouping.lib LIBRARY pslnframework.lib LIBRARY estor.lib -LIBRARY CommonEngine.lib +LIBRARY commonengine.lib LIBRARY xnodt.lib LIBRARY ecom.lib LIBRARY eiksrvc.lib LIBRARY servicehandler.lib -LIBRARY SortUtil.lib +LIBRARY sortutil.lib START RESOURCE ../group/bctestdomavkonpsln_reg.rss DEPENDS bctestdomavkonpsln.rsg diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomcdl/group/bctestdomcdl.mmp --- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomcdl/group/bctestdomcdl.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomcdl/group/bctestdomcdl.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -58,8 +58,8 @@ LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib -LIBRARY CdlEngine.lib -LIBRARY CommonEngine.lib +LIBRARY cdlengine.lib +LIBRARY commonengine.lib START RESOURCE ../group/bctestdomcdl_reg.rss DEPENDS bctestdomcdl.rsg diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomcoreui/group/bctestdomcoreui.mmp --- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomcoreui/group/bctestdomcoreui.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomcoreui/group/bctestdomcoreui.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -61,8 +61,8 @@ LIBRARY apgrfx.lib LIBRARY bctestutil.lib LIBRARY efsrv.lib -LIBRARY MenuInterface.lib -LIBRARY pbkeng.lib +LIBRARY menuinterface.lib +LIBRARY pbkeng.lib LIBRARY eikdlg.lib LIBRARY eikctl.lib LIBRARY eikcdlg.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomfntlay/group/bctestdomfntlay.mmp --- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomfntlay/group/bctestdomfntlay.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomfntlay/group/bctestdomfntlay.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -68,18 +68,18 @@ LIBRARY efsrv.lib LIBRARY fontutils.lib LIBRARY uiklaf.lib -LIBRARY FontProvider.lib +LIBRARY fontprovider.lib LIBRARY gdi.lib LIBRARY bitgdi.lib -LIBRARY aknskinsrv.lib +LIBRARY aknskinsrv.lib LIBRARY fbscli.lib LIBRARY bafl.lib LIBRARY aknlayout2.lib -LIBRARY AknLayout2Adaptation.lib +LIBRARY aknlayout2adaptation.lib LIBRARY aknLayout2hierarchy.lib -LIBRARY AknLayout2Scalable.lib +LIBRARY aknlayout2scalable.lib LIBRARY aknicon.lib -LIBRARY CdlEngine.lib +LIBRARY cdlengine.lib // New registration resource defined. START RESOURCE ../group/bctestdomfntlay_reg.rss diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomnotifier/group/bctestdomnotifier.mmp --- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomnotifier/group/bctestdomnotifier.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomnotifier/group/bctestdomnotifier.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -75,13 +75,13 @@ LIBRARY aknnotifierwrapper.lib LIBRARY akncapserverclient.lib LIBRARY aknlistloadertfx.lib -LIBRARY aknjapanesereading.lib +LIBRARY AknJapaneseReading.lib -LIBRARY aknmemorycardui.lib +LIBRARY AknMemoryCardUi.lib LIBRARY aknlayout2.lib -LIBRARY AknLayout2Adaptation.lib +LIBRARY aknlayout2adaptation.lib LIBRARY aknLayout2hierarchy.lib -LIBRARY AknLayout2Scalable.lib +LIBRARY aknlayout2scalable.lib LIBRARY pslnengine.lib START RESOURCE ../group/bctestdomnotifier_reg.rss diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdompopup/group/bctestdompopup.mmp --- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdompopup/group/bctestdompopup.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdompopup/group/bctestdompopup.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -67,7 +67,7 @@ LIBRARY bctestutil.lib LIBRARY efsrv.lib LIBRARY egul.lib -LIBRARY aknnotify.lib +LIBRARY AknNotify.lib START RESOURCE ../group/bctestdompopup_reg.rss DEPENDS bctestdompopup.rsg diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/bctestlauncher/group/bctestlauncher.mmp --- a/uifw/AvKon/tsrc/bc/bctestlauncher/group/bctestlauncher.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/bctestlauncher/group/bctestlauncher.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -56,17 +56,17 @@ APP_LAYER_SYSTEMINCLUDE -LIBRARY euser.lib -LIBRARY ws32.lib -LIBRARY cone.lib -LIBRARY eikcore.lib -LIBRARY avkon.lib -LIBRARY apparc.lib +LIBRARY EUSER.LIB +LIBRARY WS32.LIB +LIBRARY CONE.LIB +LIBRARY EIKCORE.LIB +LIBRARY AVKON.LIB +LIBRARY APPARC.LIB LIBRARY eikcoctl.lib LIBRARY efsrv.lib LIBRARY apgrfx.lib -LIBRARY CommonEngine.lib -LIBRARY centralrepository.lib +LIBRARY commonengine.lib +LIBRARY CentralRepository.lib LIBRARY bafl.lib LIBRARY sysutil.lib LIBRARY estor.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/AvKon/tsrc/bc/bctestutil/group/bctestutil.mmp --- a/uifw/AvKon/tsrc/bc/bctestutil/group/bctestutil.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/AvKon/tsrc/bc/bctestutil/group/bctestutil.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -44,9 +44,9 @@ LIBRARY cone.lib LIBRARY eikcore.lib LIBRARY aknnotify.lib -LIBRARY CommonEngine.lib +LIBRARY commonengine.lib LIBRARY avkon.lib -LIBRARY centralrepository.lib +LIBRARY CentralRepository.lib LIBRARY sysutil.lib #if defined(WINS) && !defined(WINSB) diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/EABI/EIKCOCTLU.DEF --- a/uifw/EikStd/EABI/EIKCOCTLU.DEF Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/EABI/EIKCOCTLU.DEF Wed Oct 13 14:50:15 2010 +0300 @@ -2017,7 +2017,4 @@ _ZN10CAknButton14EnableFeedbackEi @ 2016 NONAME _ZN22CAknLocalScreenClearer4NewLEii @ 2017 NONAME _ZN22CAknLocalScreenClearer5NewLCEii @ 2018 NONAME - _ZN9CEikEdwin10EnableT2WLEi @ 2019 NONAME - _ZN15CAknMarkingMode33SetCollectionMultipleMarkingStateEi @ 2020 NONAME - _ZN18CAknItemActionMenu11MarkingModeEv @ 2021 NONAME diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/bwins/EIKCOCTLU.DEF --- a/uifw/EikStd/bwins/EIKCOCTLU.DEF Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/bwins/EIKCOCTLU.DEF Wed Oct 13 14:50:15 2010 +0300 @@ -1628,7 +1628,3 @@ ?EnableFeedback@CAknButton@@QAEXH@Z @ 1627 NONAME ; void CAknButton::EnableFeedback(int) ?NewLC@CAknLocalScreenClearer@@SAPAV1@HH@Z @ 1628 NONAME ; class CAknLocalScreenClearer * CAknLocalScreenClearer::NewLC(int, int) ?NewL@CAknLocalScreenClearer@@SAPAV1@HH@Z @ 1629 NONAME ; class CAknLocalScreenClearer * CAknLocalScreenClearer::NewL(int, int) - ?EnableT2WL@CEikEdwin@@QAEXH@Z @ 1630 NONAME ; void CEikEdwin::EnableT2WL(int) - ?MarkingMode@CAknItemActionMenu@@QAEAAVCAknMarkingMode@@XZ @ 1631 NONAME ; class CAknMarkingMode & CAknItemActionMenu::MarkingMode(void) - ?SetCollectionMultipleMarkingState@CAknMarkingMode@@QAEXH@Z @ 1632 NONAME ; void CAknMarkingMode::SetCollectionMultipleMarkingState(int) - diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlinc/aknmarkingmode.h --- a/uifw/EikStd/coctlinc/aknmarkingmode.h Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlinc/aknmarkingmode.h Wed Oct 13 14:50:15 2010 +0300 @@ -56,7 +56,7 @@ * @internal * @param aActive ETrue if multiple marking should be active. */ - IMPORT_C void SetCollectionMultipleMarkingState( TBool aActive ); + void SetCollectionMultipleMarkingState( TBool aActive ); /** * Ends marking mode if collection allows it diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlinc/smileymanager.h --- a/uifw/EikStd/coctlinc/smileymanager.h Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlinc/smileymanager.h Wed Oct 13 14:50:15 2010 +0300 @@ -41,9 +41,13 @@ NONSHARABLE_CLASS( CSmileyManager ) : public CBase { public: + static const TText KPlaceHolder = 0xfff0; static const TInt KMaxLength = 100; static const TInt KMinLength = 2; - static const TText KZeroCode = 0; + static const TText KZeroCode = 0; + static const TText KCompensateChar = 'i'; + static const TUint KSmileyCodeMin = 0xf880; + static const TUint KSmileyCodeMax = 0xf8e4; enum TOperationType { diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/AknButton.cpp --- a/uifw/EikStd/coctlsrc/AknButton.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/AknButton.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -170,16 +170,16 @@ { CGulIcon* newIcon = CGulIcon::NewLC(); CFbsBitmap* newPic = new ( ELeave ) CFbsBitmap; + CleanupStack::PushL( newPic ); newPic->Duplicate( aIcon->Bitmap()->Handle() ); - //newPic ownership is transferred to newIcon - newIcon->SetBitmap( newPic ); + newIcon->SetBitmap( newPic ); CFbsBitmap* newMask = new ( ELeave ) CFbsBitmap; - CleanupStack::PushL( newMask ); User::LeaveIfError( newMask->Create( newIcon->Bitmap()->SizeInPixels(), EGray256 ) ); + CleanupStack::PushL( newMask ); CFbsBitmapDevice* bitmapDevice = CFbsBitmapDevice::NewL( newMask ); CleanupStack::PushL( bitmapDevice ); @@ -212,7 +212,7 @@ ReplaceIconStatic( aDimmedIcon, newIcon, aScaleMode ); CleanupStack::PopAndDestroy( 2 ); // bitmapDevice, bitGc - CleanupStack::Pop( 2 ); // newIcon, newMask + CleanupStack::Pop( 3 ); // newIcon, newPic, newMask } } } @@ -264,9 +264,6 @@ // Sets bitmaps to resource provider (if one exists) void SetProviderPressedBmpsL(); - - //Verify new rectagle size equals to the original - TBool TextRectSizeChanged( TRect aNewRect ); private: // Data @@ -296,7 +293,6 @@ TBool iFeedbackEnabled; TAknsItemID iBackgroundSkinIID; TRect iBgFrameRect; - TRect iTextRect; }; // ============================ MEMBER FUNCTIONS =============================== @@ -331,7 +327,6 @@ iIconSize = layoutRect.Rect().Size(); iFlags.Set( EUseDefaultIconSize ); iFlags.Set( EUseDefaultMargins ); - iTextRect = TRect::EUninitialized; } // ----------------------------------------------------------------------------- @@ -522,20 +517,6 @@ } } -//Verify new rectangle size equals to the original -TBool CAknButtonExtension::TextRectSizeChanged( TRect aNewRect ) - { - TBool result( ETrue ); - if ( !iTextRect.IsEmpty() && !aNewRect.IsEmpty() ) - { - if ( iTextRect.Width() == aNewRect.Width() - && iTextRect.Height() == aNewRect.Height() ) - { - result = EFalse; - } - } - return result; - } // @@ -1701,6 +1682,7 @@ } iExtension->HandleFeedbackAreaChange(); SetFrameIDs(); + ConvertTextToVisualAndClip(); } // ----------------------------------------------------------------------------- @@ -2275,6 +2257,7 @@ TRAP_IGNORE( CreatePressedDownFrameL() ); } SetFrameRects(); + ConvertTextToVisualAndClip(); iExtension->HandleFeedbackAreaChange(); } @@ -2307,11 +2290,11 @@ { return; } - //Using HitAreaContainsL() to verify whether pointer event locates in valid area - //when KAknButtonHitTest is defined. - if ( iFlags & KAknButtonHitTest ) + + if ( ( iFlags & KAknButtonHitTest ) && + !HitAreaContainsL( aPointerEvent.iPosition, EFalse ) ) { - TRAP_IGNORE( buttonEvent = HitAreaContainsL( aPointerEvent.iPosition, EFalse )) + buttonEvent = EFalse; } TBool redrawNeeded(EFalse); @@ -2846,12 +2829,19 @@ // ----------------------------------------------------------------------------- // EXPORT_C void CAknButton::SetButtonFlags( const TInt aFlags ) - { + { if ( !( iFlags & KAknButtonNoFrame ) ) { if ( aFlags & KAknButtonNoFrame ) { - iExtension->iMargins.SetAllValuesTo( 0 ); + iExtension->iMargins.SetAllValuesTo( 0 ); + ConvertTextToVisualAndClip(); + } + // aFlags does not include KAknButtonNoFrame + else if ( iFlags & KAknButtonTextInsideFrame != + aFlags & KAknButtonTextInsideFrame ) + { + ConvertTextToVisualAndClip(); } } if ( aFlags & KAknButtonHitTest ) @@ -2863,6 +2853,14 @@ { TRAP_IGNORE ( CreatePressedDownFrameL() ); } + if ( iFlags & KAknButtonNoFrame && !( aFlags & KAknButtonNoFrame ) ) + { + SetFrameIDs(); + if ( aFlags & KAknButtonTextInsideFrame ) + { + ConvertTextToVisualAndClip(); + } + } iFlags = aFlags; } @@ -2959,7 +2957,7 @@ EXPORT_C void CAknButton::SetTextFont( const CFont* aFont ) { iFont = aFont; - ConvertTextToVisualAndClip( iExtension->iTextRect ); + ConvertTextToVisualAndClip(); } // ----------------------------------------------------------------------------- @@ -3524,15 +3522,25 @@ // void CAknButton::DrawTextButton( CWindowGc& aGc ) const { - TRect textRect; - - TRect iconRect; //this is no use - GetCurrentStateTextAndIconRect( iconRect, textRect ); - CAknButtonState* state = State(); - if ( state->TextChanged() || iExtension->TextRectSizeChanged( textRect ) ) + if ( !state || !state->HasText() ) + return; + + if ( state->TextChanged() ) { - ConvertTextToVisualAndClip( textRect ); + ConvertTextToVisualAndClip(); + } + + TRect textRect = iExtension->iMargins.InnerRect( Rect() ); + + if ( !( iFlags & KAknButtonNoFrame ) && + ( iFlags & KAknButtonTextInsideFrame ) ) + { + TAknLayoutRect center; + center.LayoutRect( Rect(), + AknLayoutScalable_Avkon::toolbar_button_pane_g1().LayoutLine() ); + + textRect = center.Rect(); } DrawText( aGc, textRect ); } @@ -3600,13 +3608,13 @@ // void CAknButton::DrawIconButton( CWindowGc& aGc ) const { - TRect iconRect; - TRect textRect; - GetCurrentStateTextAndIconRect( iconRect, textRect ); + TRect iconRect( iExtension->iMargins.InnerRect( Rect() ) ); aGc.SetBrushStyle( CGraphicsContext::ENullBrush ); const CGulIcon* icon = GetCurrentIcon(); + if ( !icon ) + return; CFbsBitmap* buttonBmp = icon->Bitmap(); CFbsBitmap* buttonMask = icon->Mask(); @@ -3688,24 +3696,102 @@ if ( !state || !state->HasText() ) { return; - } + } + if ( state->TextChanged() ) + { + ConvertTextToVisualAndClip(); + } const CGulIcon* icon = GetCurrentIcon(); - - + if ( !icon ) + { + return; + } + + TRect rect = iExtension->iMargins.InnerRect( Rect() ); TRect iconRect; TRect textRect; - GetCurrentStateTextAndIconRect( iconRect, textRect ); + if ( !( iFlags & KAknButtonNoFrame ) && + ( iFlags & KAknButtonTextInsideFrame )) + { + TAknLayoutRect centerLayout; + centerLayout.LayoutRect( rect, + AknLayoutScalable_Avkon::toolbar_button_pane_g1().LayoutLine() ); + rect = centerLayout.Rect(); + } + CFbsBitmap* buttonBmp = icon->Bitmap(); CFbsBitmap* buttonMask = icon->Mask(); TSize iconSize ( buttonBmp->SizeInPixels()); - - if ( state->TextChanged() || iExtension->TextRectSizeChanged( textRect ) ) + // Set rects for icon and text according to their positioning + // First icon rect according to icon size - rest is for text + + switch ( iExtension->iTextAndIconAlignment ) { - ConvertTextToVisualAndClip( textRect ); + case EIconBeforeText: + if ( AknLayoutUtils::LayoutMirrored() ) + { + textRect.SetRect( rect.iTl.iX, rect.iTl.iY, + rect.iBr.iX - iconSize.iWidth, rect.iBr.iY); + iconRect.SetRect( rect.iTl.iX + + rect.Width() -iconSize.iWidth, + rect.iTl.iY, rect.iBr.iX, rect.iBr.iY ); + } + else + { + iconRect.SetRect( rect.iTl.iX, rect.iTl.iY, + rect.iTl.iX + iconSize.iWidth, rect.iBr.iY); + textRect.SetRect( rect.iTl.iX + iconSize.iWidth, + rect.iTl.iY, rect.iBr.iX, rect.iBr.iY ); + } + + break; + + case EIconAfterText: + if ( AknLayoutUtils::LayoutMirrored() ) + { + iconRect.SetRect( rect.iTl.iX, rect.iTl.iY, + rect.iTl.iX + iconSize.iWidth, rect.iBr.iY); + textRect.SetRect( rect.iTl.iX + iconSize.iWidth, + rect.iTl.iY, rect.iBr.iX, rect.iBr.iY ); + } + else + { + textRect.SetRect( rect.iTl.iX, rect.iTl.iY, + rect.iBr.iX - iconSize.iWidth, rect.iBr.iY); + iconRect.SetRect( rect.iTl.iX + + rect.Width() -iconSize.iWidth, + rect.iTl.iY, rect.iBr.iX, rect.iBr.iY ); + } + break; + + case EIconOverText: + iconRect.SetRect( rect.iTl.iX, rect.iTl.iY, + rect.iBr.iX, rect.iTl.iY + iconSize.iHeight ); + textRect.SetRect( rect.iTl.iX, rect.iTl.iY + iconSize.iHeight, + rect.iBr.iX, rect.iBr.iY ); + break; + + case EIconUnderText: + textRect.SetRect( rect.iTl.iX, rect.iTl.iY, + rect.iBr.iX, rect.iBr.iY - iconSize.iHeight ); + iconRect.SetRect( rect.iTl.iX, rect.iBr.iY - iconSize.iHeight, + rect.iBr.iX, rect.iBr.iY ); + break; + + case EOverlay: + { + textRect = rect; + iconRect = rect; + } + break; + + default: + return; } + // Draw icon TPoint iconPoint; switch ( iExtension->iHorizontalIconAlignment ) @@ -4455,13 +4541,6 @@ iHelpNote->SetTimeDelayBeforeShow( iHelpNoteWaitInterval ); iHelpNote->SetTimePopupInView( iHelpNoteInViewInterval ); iHelpNote->SetTooltipModeL( ETrue ); - - //When state changed, empty rect to enable recalculate the - //visual text if text exists in current state. - if ( !(iExtension->iTextRect.IsEmpty()) ) - { - iExtension->iTextRect = TRect::EUninitialized; - } } } @@ -4546,7 +4625,7 @@ // CAknButton::ConvertTextToVisualAndClip // ----------------------------------------------------------------------------- // -void CAknButton::ConvertTextToVisualAndClip( const TRect& aRect ) const +void CAknButton::ConvertTextToVisualAndClip() const { CAknButtonState* state = State(); if ( !state || !state->HasText() ) @@ -4558,22 +4637,18 @@ return; } - TRect textRect( aRect ); - //Using given rect to calculate the visual text if it's not empty. - if ( !textRect.IsEmpty() ) + TRect textRect = iExtension->iMargins.InnerRect( Rect() ); + + if ( !( iFlags & KAknButtonNoFrame ) && + ( iFlags & KAknButtonTextInsideFrame ) ) { - iExtension->iTextRect = textRect; + TAknLayoutRect center; + center.LayoutRect( Rect(), + AknLayoutScalable_Avkon::toolbar_button_pane_g1().LayoutLine() ); + + textRect = center.Rect(); } - //Calculate text area. - //This branch means that it's the first calling after the state changed - //or client using new font before this is shown. - else - { - TRect iconRect; - GetCurrentStateTextAndIconRect( iconRect, textRect ); - iExtension->iTextRect = textRect; - } - + TInt clipWidth = textRect.Width(); const CFont* font = iFont; @@ -4590,135 +4665,6 @@ clipWidth, clipWidth ); } - -// ----------------------------------------------------------------------------- -// CAknButton::GetCurrentStateTextAndIconRect() -// Get rect for icon and text of the current button state . -// ----------------------------------------------------------------------------- -// -void CAknButton::GetCurrentStateTextAndIconRect( TRect& aIconRect, - TRect& aTextRect ) const - { - TRect iconRect( TRect::EUninitialized ) ; - TRect textRect( TRect::EUninitialized ); - - CAknButtonState* state = State(); - - //Return directly if no state - if ( !state ) - { - aIconRect = iconRect; - aTextRect = textRect; - return; - } - - TBool hasText( state->HasText() ); - TBool hasIcon( EFalse ); - - const CGulIcon* icon = GetCurrentIcon(); - if ( icon ) - { - hasIcon = ETrue; - } - - TRect rect = iExtension->iMargins.InnerRect( Rect() ); - - //Icon area is not effected by the frame flags. - if ( hasIcon ) - { - iconRect = rect; - } - - if ( !( iFlags & KAknButtonNoFrame ) && - ( iFlags & KAknButtonTextInsideFrame )) - { - TAknLayoutRect centerLayout; - centerLayout.LayoutRect( rect, - AknLayoutScalable_Avkon::toolbar_button_pane_g1().LayoutLine() ); - rect = centerLayout.Rect(); - } - - if ( hasText ) - { - textRect = rect; - } - - - if ( hasText && hasIcon ) - { - CFbsBitmap* buttonBmp = icon->Bitmap(); - CFbsBitmap* buttonMask = icon->Mask(); - TSize iconSize ( buttonBmp->SizeInPixels()); - - // Set rects for icon and text according to their positioning - // First icon rect according to icon size - rest is for text - - switch ( iExtension->iTextAndIconAlignment ) - { - case CAknButton::EIconBeforeText: - if ( AknLayoutUtils::LayoutMirrored() ) - { - textRect.SetRect( rect.iTl.iX, rect.iTl.iY, - rect.iBr.iX - iconSize.iWidth, rect.iBr.iY); - iconRect.SetRect( rect.iTl.iX + - rect.Width() -iconSize.iWidth, - rect.iTl.iY, rect.iBr.iX, rect.iBr.iY ); - } - else - { - iconRect.SetRect( rect.iTl.iX, rect.iTl.iY, - rect.iTl.iX + iconSize.iWidth, rect.iBr.iY); - textRect.SetRect( rect.iTl.iX + iconSize.iWidth, - rect.iTl.iY, rect.iBr.iX, rect.iBr.iY ); - } - - break; - - case CAknButton::EIconAfterText: - if ( AknLayoutUtils::LayoutMirrored() ) - { - iconRect.SetRect( rect.iTl.iX, rect.iTl.iY, - rect.iTl.iX + iconSize.iWidth, rect.iBr.iY); - textRect.SetRect( rect.iTl.iX + iconSize.iWidth, - rect.iTl.iY, rect.iBr.iX, rect.iBr.iY ); - } - else - { - textRect.SetRect( rect.iTl.iX, rect.iTl.iY, - rect.iBr.iX - iconSize.iWidth, rect.iBr.iY); - iconRect.SetRect( rect.iTl.iX + - rect.Width() -iconSize.iWidth, - rect.iTl.iY, rect.iBr.iX, rect.iBr.iY ); - } - break; - - case CAknButton::EIconOverText: - iconRect.SetRect( rect.iTl.iX, rect.iTl.iY, - rect.iBr.iX, rect.iTl.iY + iconSize.iHeight ); - textRect.SetRect( rect.iTl.iX, rect.iTl.iY + iconSize.iHeight, - rect.iBr.iX, rect.iBr.iY ); - break; - - case CAknButton::EIconUnderText: - textRect.SetRect( rect.iTl.iX, rect.iTl.iY, - rect.iBr.iX, rect.iBr.iY - iconSize.iHeight ); - iconRect.SetRect( rect.iTl.iX, rect.iBr.iY - iconSize.iHeight, - rect.iBr.iX, rect.iBr.iY ); - break; - - case CAknButton::EOverlay: - { - textRect = rect; - iconRect = rect; - } - break; - default: - break; //Do nothing. - } - } - aTextRect = textRect; - aIconRect = iconRect; - } // ----------------------------------------------------------------------------- // CAknButton::TouchArea // Returns the button touchable area. diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/AknDoubleSpanScrollIndicator.cpp --- a/uifw/EikStd/coctlsrc/AknDoubleSpanScrollIndicator.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/AknDoubleSpanScrollIndicator.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -258,7 +258,7 @@ if ( roomForMovementInSpan > 0 && roomForMovementInPixels > 0 ) { focusPositionInPixels = - (TInt64)checkedFocusPosition * roomForMovementInPixels / + checkedFocusPosition * roomForMovementInPixels / roomForMovementInSpan; } diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/EIKCOCTL.MMP --- a/uifw/EikStd/coctlsrc/EIKCOCTL.MMP Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/EIKCOCTL.MMP Wed Oct 13 14:50:15 2010 +0300 @@ -155,18 +155,18 @@ LIBRARY avkon.lib LIBRARY tagma.lib LIBRARY aknpictograph.lib -LIBRARY CdlEngine.lib +LIBRARY cdlengine.lib LIBRARY aknskins.lib LIBRARY bitgdi.lib LIBRARY featmgr.lib LIBRARY aknicon.lib LIBRARY jplangutil.lib -LIBRARY numbergrouping.lib +LIBRARY NumberGrouping.lib LIBRARY CommonEngine.lib LIBRARY AknLayout2Scalable.lib LIBRARY FontProvider.lib LIBRARY EikCoCtlLaf.lib -LIBRARY akncapserverclient.lib +LIBRARY AknCapServerClient.lib LIBRARY servicehandler.lib LIBRARY hlplch.lib LIBRARY centralrepository.lib @@ -182,14 +182,14 @@ #ifdef RD_UI_TRANSITION_EFFECTS_LIST LIBRARY aknlistloadertfx.lib #endif //RD_UI_TRANSITION_EFFECTS_LIST -LIBRARY aknlayout2.lib +LIBRARY AknLayout2.lib LIBRARY eikdlg.lib LIBRARY akntransitionutils.lib DEFFILE EIKCOCTL.DEF -LIBRARY fontutils.lib +LIBRARY fontutils.lib LIBRARY aknphysics.lib -LIBRARY aknnotify.lib +LIBRARY AknNotify.lib START WINS BASEADDRESS 0x40B00000 END diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/EIKCOLIB.CPP --- a/uifw/EikStd/coctlsrc/EIKCOLIB.CPP Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/EIKCOLIB.CPP Wed Oct 13 14:50:15 2010 +0300 @@ -558,16 +558,6 @@ } TRect wndRc( splitwnd.Rect() ); - - if ( !Layout_Meta_Data::IsLandscapeOrientation() ) - { - // include indicator pane height - TAknWindowLineLayout indiPane = AknLayoutScalable_Avkon::icf_edit_indi_pane( 2 ).LayoutLine(); - TAknLayoutRect indiRect; - indiRect.LayoutRect(splitwnd.Rect(), indiPane); - wndRc.iTl.iY -= indiRect.Rect().Height(); - } - inputTop = wndRc.iTl.iY; rect.iBr.iY = rect.iBr.iY > inputTop ? inputTop : rect.iBr.iY; rect.iTl.iY = 0; diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/EIKCTGRP.CPP --- a/uifw/EikStd/coctlsrc/EIKCTGRP.CPP Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/EIKCTGRP.CPP Wed Oct 13 14:50:15 2010 +0300 @@ -348,11 +348,23 @@ { TInt count = iControlArray->Count(); - // count == 4 means MSK is on, but when it is disabled by EDisableMSKDrawing, - // we should decrease the count to avoid drawing it. - if ( count == 4 && ( iLayout & EDisableMSKDrawing ) ) - { - count--; + // This prevents MSK from drawing in landscape layouts. + // Also MSK doesn't even need to be activated in landscape modes. + if ( count == 4 ) + { + // Exception is made for idle flat status pane layouts, + // in which the MSK is used also in landscape. + TBool mskSupportedLscLayoutActive( + AVKONENV->StatusPaneResIdForCurrentLayout( + AknStatuspaneUtils::CurrentStatusPaneLayoutResId() ) == + R_AVKON_WIDESCREEN_PANE_LAYOUT_IDLE_FLAT_NO_SOFTKEYS ); + + if ( iLayout & EDisableMSKDrawing || + ( Layout_Meta_Data::IsLandscapeOrientation() && + !mskSupportedLscLayoutActive ) ) + { + count--; + } } return count; diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/EIKEDWIN.CPP --- a/uifw/EikStd/coctlsrc/EIKEDWIN.CPP Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/EIKEDWIN.CPP Wed Oct 13 14:50:15 2010 +0300 @@ -97,18 +97,11 @@ #include #include #include -#include + #include "smileymanager.h" #include "smileycustomwrap.h" #include -// for supporting TapToWrite -#include -#include -#include -#include -#include // KAknQwertyInputModeActive - // declare function void ReadSpecialCharFromSCTL( TPtr& ptr, TInt sctResourceId ); void ReadSCTHeadPane( TResourceReader& aReader ); @@ -164,10 +157,6 @@ const TInt KTInt16Length( sizeof( TInt16 ) ); const TInt KTInt32Length( sizeof( TInt32 ) ); const TInt KTUint32Length( sizeof( TUint32 ) ); -const TInt KBlackMap( 179 ); -const TInt KWhiteMap( 76 ); -_LIT( KParagraphSeparator, "\x2029" ); -TRgb FadeRgb( TRgb aColor, TUint8 aBlackMap, TUint8 aWhiteMap ); // // class CEikEdwin::CUndoBuffer @@ -517,9 +506,6 @@ } iEdwin.iTextView->HandleInsertDeleteL( select, aNumberOfCharactersSuccessfullyDeleted, aParagraphContainingStartPositionOfInlineTextHasChangedFormat ); - // try to draw "tap to write" - iEdwin.TryToDrawT2W(); - User::LeaveIfError(aError); iEdwin.SetScrollBarsL(); iEdwin.DoReportEventL(MCoeControlObserver::EEventStateChanged); @@ -812,7 +798,7 @@ TInt smileyEndPos( 0 ); for ( TInt i( 0 ); i < length; i++ ) { - if ( aEditorContent[i] == CAknSmileyManager::KCompensateChar ) + if ( aEditorContent[i] == CSmileyManager::KCompensateChar ) { // when 'i' is the first character, it is unkonwn whether it is // part of a smiley code string or not, so we have to use another @@ -820,7 +806,7 @@ if ( ( i > 0 && i < smileyEndPos ) || ( i == 0 && smiley->SmileyCodeByPos( aDocumentPosition ) > 0 ) ) { - aEditorContent[i] = CAknSmileyManager::KPlaceHolder; + aEditorContent[i] = CSmileyManager::KPlaceHolder; } } else if ( smiley->IsSmileyCode( aEditorContent[i] ) ) @@ -1077,14 +1063,6 @@ } delete iCenRepNotifyHandler; delete iCenRep; - - // Stop listening CenRep for qwerty key board. - if ( iCenRepNotifyHandlerForQwerty ) - { - iCenRepNotifyHandlerForQwerty->StopListening(); - } - delete iCenRepNotifyHandlerForQwerty; - delete iCenRepForQwerty; delete iFormAccessor; delete iFormCursorModifier; @@ -1098,7 +1076,6 @@ *iDestroyedPtr = ETrue; iDestroyedPtr = NULL; } - delete iT2WBuf; delete iSmiley; delete iSmileyWrap; } @@ -1236,19 +1213,6 @@ iCenRepNotifyHandler->StartListeningL(); iCenRep->Get(KAknFepClearDirection, iClearDirection); } - // Start listening a CenRep key indicating whether qwerty input mode is active. - TRAPD( error, iCenRepForQwerty = CRepository::NewL( KCRUidAvkon ) ); - if ( error == KErrNone ) - { - iCenRepNotifyHandlerForQwerty = CCenRepNotifyHandler::NewL( *this, - *iCenRepForQwerty, - CCenRepNotifyHandler::EIntKey, - KAknQwertyInputModeActive ); - - iCenRepNotifyHandlerForQwerty->StartListeningL(); - iCenRepForQwerty->Get( KAknQwertyInputModeActive, iQwertyStatus ); - } - iSmileyWrap = new ( ELeave ) CSmileyCustomWrap; iSkinInstance = AknsUtils::SkinInstance(); } @@ -1338,12 +1302,6 @@ { iClearDirection = (TBool)aNewValue; } - //If qwerty key board is opened clean the "tap to write", if qwerty key board is closed display the "tap to write" - else if ( aId == KAknQwertyInputModeActive ) - { - iQwertyStatus = ( TBool )aNewValue; - iEdwin->TryToDrawT2W( iQwertyStatus ); - } } // --------------------------------------------------------------------------- @@ -2328,8 +2286,6 @@ const TCursorSelection sel(lower,lower); iTextView->SetPendingSelection(sel); iTextView->HandleInsertDeleteL(sel,toDelete.Length(),formatHasChanged); - // try to draw "tap to write" - TryToDrawT2W(); cursorPos = lower; reportChange=ETrue; } @@ -2389,7 +2345,6 @@ if (!isPicture) ClearUndo(); iTextView->HandleCharEditL(charEditType,formatHasChanged); - TryToDrawT2W(); reportChange=ETrue; formatChange=formatHasChanged; } @@ -2441,11 +2396,6 @@ break; // prevent eg Ctrl-I inserting a tab goto InChar; default: - // If ctrl + key is not hotkey return not consume. - if ( magnify ) - { - return EKeyWasNotConsumed; - } if (code>=ENonCharacterKeyBase || !TChar(code).IsPrint() || (!IsValidChar(code))) { ret=EKeyWasNotConsumed; @@ -2472,8 +2422,6 @@ selection=pending; --selection.iAnchorPos; iTextView->HandleInsertDeleteL(selection,selectionLength,formatHasChanged); - // try to draw "tap to write" - TryToDrawT2W(); User::LeaveIfError(err); reportChange=ETrue; formatChange=formatHasChanged; @@ -2491,7 +2439,6 @@ ETrue ); } iTextView->HandleCharEditL(charEditType); - TryToDrawT2W(); reportChange=ETrue; } else @@ -2598,8 +2545,6 @@ @return The number of pixels scrolled horizontally and vertically. ( Ignored ) */ (void)iTextView->HandleInsertDeleteL( selection, deletedChars, aFormatHasChanged); - // try to draw "tap to write" - TryToDrawT2W(); User::LeaveIfError(err); } @@ -2658,6 +2603,32 @@ { params.iDocPos = iTextView->XyPosToDocPosL( pos ); } + + // To check if user taps on inline editing text in partial screen mode, + // if so, the event has to be passed to FEP handler so FEP can display + // candidate words list. + TInt checkedFlags( EAknEditorFlagEnablePartialScreen | + EAknEditorFlagTouchInputModeOpened ); + if ( ( AknEditorFlags() & checkedFlags ) == checkedFlags ) + { + TCursorSelection inlineRange( InlineTextRange() ); + if ( params.iDocPos >= inlineRange.LowerPos() && + params.iDocPos < inlineRange.HigherPos() ) + { + // Only pass EButton1up event to FEP handler to improve performance. + // Ignore other events on inline text, otherwise they will cancel + // inline editing status. + if ( aPointerEvent.iType == TPointerEvent::EButton1Up && + iEdwinFepSupport && iEdwinFepSupport->iPointerEventHandlerDuringInlineEdit ) + { + iEdwinFepSupport->iPointerEventHandlerDuringInlineEdit-> + HandlePointerEventInInlineTextL( TPointerEvent::EButton1Up, + aPointerEvent.iModifiers, + params.iDocPos - inlineRange.LowerPos() ); + } + return; + } + } /** The local @c destroyed variable keeps track of the object destroyed state. */ TBool destroyed = EFalse; @@ -3179,23 +3150,6 @@ return; const TBool focused=IsFocused(); TRAP_IGNORE(SetCursorVisibilityL(focused)); - if ( iEdwinExtension ) - { - if ( focused ) - { - iEdwinExtension->iT2WState |= CEikEdwinExtension::EFocusOn; - TryToDrawT2W(); - } - else - { - TBool change = ( TextLength() == 0 && IsT2WEnabled() ); - iEdwinExtension->iT2WState &= ~CEikEdwinExtension::EFocusOn; - if ( change ) - { - TryToDrawT2W( ETrue ); - } - } - } if (!focused && iEdwinUserFlags&EAlwaysShowSelection) ; else @@ -3476,16 +3430,22 @@ { displayRect.iBr.iY = displayRect.iTl.iY + displayRectHeight; } - - - iTextView->SetViewRect(displayRect); - iLayout->SetWrapWidth(LayoutWidth()); + // Check if the width of view rect is changed, if it is not changed no need to global reformat. + const TBool differentWidth = ( iTextView->ViewRect().Width() != displayRect.Width() ); + iTextView->SetViewRect( displayRect ); + if ( differentWidth ) + { + iLayout->SetWrapWidth( LayoutWidth() ); + } TViewYPosQualifier yPosQualifier; yPosQualifier.SetFillScreen(); yPosQualifier.SetMakeLineFullyVisible(); SetAmountToFormatL( EFalse, EFalse ); // Not a new doc; Do not reformat - if (!(iEdwinInternalFlags & ESuppressFormatting)) - iTextView->HandleGlobalChangeNoRedrawL(yPosQualifier); // This does the reformat + if ( !( iEdwinInternalFlags & ESuppressFormatting ) && + ( differentWidth || iLayout->DocumentLength() < KFullFormattingUpperThreshold ) ) + { + iTextView->HandleGlobalChangeNoRedrawL( yPosQualifier ); // This does the reformat + } CalculateLineMetricsForBandFormattingL(); SetScrollBarsL(); UpdateScrollBarsL(); @@ -4060,12 +4020,6 @@ } TrappedDraw(viewRect); - - // try to draw "tap to write" - if ( TextLength() == 0 && IsT2WEnabled() ) - { - TRAP_IGNORE( DrawT2WTextL() ); - } #ifdef RD_UI_TRANSITION_EFFECTS_POPUPS // Workaround for clipping rect problem in multiline queries with text @@ -4086,68 +4040,33 @@ CEikonEnv::Static()->ScreenDevice()->ReleaseFont(*fontPtr); } -void CEikEdwin::DrawT2WTextL() const - { - if ( iEdwinExtension && iEdwinExtension->iT2WBuf ) - { - // rect - TRect edwinRect = RectForFirstLineText(); - - // font - TAknTextLineLayout textLayout = - AknLayoutScalable_Avkon::data_form_wide_pane_t1(0).LayoutLine(); - const CAknLayoutFont* font = AknLayoutUtils::LayoutFontFromId( - textLayout.FontId()); - TFontSpec fontSpec = CursorFontSpec(); - fontSpec.iFontStyle.SetStrokeWeight( EStrokeWeightNormal ); - - CGraphicsDevice* screenDevice = iEikonEnv->ScreenDevice(); - CFbsFont* customFont( NULL ); - TInt err = screenDevice->GetNearestFontInTwips((CFont*&) customFont, - fontSpec); - - //color - TRgb textColor = iEikonEnv->ControlColor(EColorControlText, *this); - MAknsSkinInstance* skin = AknsUtils::SkinInstance(); - if ( skin && SkinColorId() != KErrNotFound ) - { - AknsUtils::GetCachedColor( skin, textColor, KAknsIIDQsnTextColors, - SkinColorId() ); - } - - // reorder the buffer - TPtrC clipbufPtr = iEdwinExtension->iT2WBuf->Des(); - AknBidiTextUtils::PrepareRunInfoArray( clipbufPtr ); - HBufC* reorderedText = HBufC::NewLC( clipbufPtr.Length() + TBidiLogicalToVisual::KMinCharAvailable); - TPtr reorderedTextPtr = reorderedText->Des(); - TInt width = edwinRect.Size().iWidth; - AknBidiTextUtils::ConvertToVisualAndClip( clipbufPtr, reorderedTextPtr, *font, width, width ); - - CWindowGc& gc = SystemGc(); - gc.SetBrushStyle(CGraphicsContext::ENullBrush); - gc.SetPenStyle(CGraphicsContext::ESolidPen); - gc.SetPenColor( FadeRgb( textColor, KBlackMap , KWhiteMap ) ); - gc.UseFont( customFont ); - gc.DrawText( reorderedTextPtr, edwinRect, font->TextPaneTopToBaseline(), - AlignForFirstLineText( reorderedTextPtr ) ); - gc.DiscardFont(); - screenDevice->ReleaseFont( customFont ); - CleanupStack::PopAndDestroy( reorderedText ); - } - } - -TRect CEikEdwin::RectForFirstLineText() const - { +void CEikEdwin::DrawFirstLineTextL() const + { + + HBufC* clipbuf = GetTextInHBufL(); + CleanupStack::PushL(clipbuf); + + TPtrC clipbufPtr = clipbuf->Des(); TMargins8 margins = Margins(); const TRect rect(Rect()); TInt cursorWidth = CursorWidth(); // need to add cursor width to right hand margin - TRect edwinRect = AknLayoutUtils::RectFromCoords(rect, margins.iLeft, margins.iTop, margins.iRight+cursorWidth, - margins.iBottom, ELayoutEmpty, ELayoutEmpty); - return edwinRect; - } - -CGraphicsContext::TTextAlign CEikEdwin::AlignForFirstLineText( const TPtr & aReorderedTextPtr ) const - { + TRect edwinRect = AknLayoutUtils::RectFromCoords(rect, margins.iLeft, margins.iTop, margins.iRight+cursorWidth, margins.iBottom, ELayoutEmpty, ELayoutEmpty); + + TAknTextLineLayout textLayout = AknLayoutScalable_Avkon::data_form_wide_pane_t1(0).LayoutLine(); + const CAknLayoutFont* font = AknLayoutUtils::LayoutFontFromId( textLayout.FontId()); + + // reorder the text + AknBidiTextUtils::PrepareRunInfoArray(clipbufPtr); + + HBufC* reorderedText = HBufC::NewLC(clipbufPtr.Length() + TBidiLogicalToVisual::KMinCharAvailable); + TPtr reorderedTextPtr = reorderedText->Des(); + TInt width = edwinRect.Size().iWidth; + AknBidiTextUtils::ConvertToVisualAndClip(clipbufPtr, reorderedTextPtr, *font, width, width); + AknTextUtils::ReplaceCharacters( reorderedTextPtr, _L("\x2029"), TChar(' ') ); + CleanupStack::Pop(reorderedText); + CleanupStack::PopAndDestroy(clipbuf); + CleanupStack::PushL(reorderedText); + CGraphicsContext::TTextAlign alignment = CGraphicsContext::ELeft; switch(CurrentAlignment()) { @@ -4164,45 +4083,33 @@ case EAknEditorAlignBidi: // drop through to default default: { - if ( TBidiText::TextDirectionality( aReorderedTextPtr ) == TBidiText::ELeftToRight ) + if (TBidiText::TextDirectionality(reorderedTextPtr) == TBidiText::ELeftToRight) alignment = CGraphicsContext::ELeft; else alignment = CGraphicsContext::ERight; } break; } - return alignment; - } -void CEikEdwin::DrawFirstLineTextL() const - { - // rect - TRect edwinRect = RectForFirstLineText(); - // font - TAknTextLineLayout textLayout = AknLayoutScalable_Avkon::data_form_wide_pane_t1(0).LayoutLine(); - const CAknLayoutFont* font = AknLayoutUtils::LayoutFontFromId( textLayout.FontId()); - // reorder the text - HBufC* clipbuf = GetTextInHBufL(); - CleanupStack::PushL(clipbuf); - TPtrC clipbufPtr = clipbuf->Des(); - AknBidiTextUtils::PrepareRunInfoArray( clipbufPtr ); - HBufC* reorderedText = HBufC::NewLC( clipbufPtr.Length() + TBidiLogicalToVisual::KMinCharAvailable ); - TPtr reorderedTextPtr = reorderedText->Des(); - TInt width = edwinRect.Size().iWidth; - AknBidiTextUtils::ConvertToVisualAndClip( clipbufPtr, reorderedTextPtr, *font, width, width ); - AknTextUtils::ReplaceCharacters( reorderedTextPtr, KParagraphSeparator, TChar(' ') ); - CleanupStack::Pop( reorderedText ); - CleanupStack::PopAndDestroy( clipbuf ); - CleanupStack::PushL( reorderedText ); CWindowGc& gc=SystemGc(); - gc.UseFont( font ); - gc.SetBrushStyle( CGraphicsContext::ENullBrush ); - gc.SetPenStyle( CGraphicsContext::ESolidPen ); - gc.SetPenColor( iEikonEnv->ControlColor( EColorControlText, *this ) ); // Text color - gc.DrawText( reorderedTextPtr, edwinRect, font->TextPaneTopToBaseline(), - AlignForFirstLineText( reorderedTextPtr ) ); - CleanupStack::PopAndDestroy(reorderedText); - gc.DiscardFont(); + gc.UseFont(font); + + // Following patching up of the GC are now necessary after calling LafCustomDrawerfor background + gc.SetBrushStyle(CGraphicsContext::ENullBrush); + gc.SetPenStyle(CGraphicsContext::ESolidPen); + TRgb textColor=iEikonEnv->ControlColor(EColorControlText,*this); + + gc.SetPenColor(textColor); // Text color + + // Edwin is assumed to be laid out already with LayoutEdwin. In that case + // the textpane top is the top of the edwin + TInt ascent = font->TextPaneTopToBaseline(); + + gc.DrawText(reorderedTextPtr, edwinRect, ascent, alignment); + + CleanupStack::PopAndDestroy(reorderedText); + + gc.DiscardFont(); // So the GC will not try to use the font. } EXPORT_C void CEikEdwin::TrappedDraw(const TRect& aViewRect) const @@ -4511,22 +4418,6 @@ return(iText->DocumentLength()); } -TBool CEikEdwin::IsT2WEnabled() const - { - /** - * 1,If the editor is read only or it is display only "tap to write" is disabled - * 2,If iEdwinExtension->iT2WBuf is NULL, "tap to write" is disabled. - * 3,If Qwerty key borad is opened, "tap to write" is disabled - * 4,If focus off, "tap to write" is disabled - * 5,If split input is enabled, "tap to write" is disabled - */ - return iEdwinExtension && !( iEdwinUserFlags & EReadOnly ) && - !( iEdwinUserFlags & EDisplayOnly ) && iEdwinExtension->iT2WBuf && - ( iEdwinExtension->iT2WState & CEikEdwinExtension::EFocusOn ) && - !( iEdwinExtension->iT2WState & CEikEdwinExtension::ESplitInputEnabled ) && - !( iEdwinExtension->iQwertyStatus ); - } - void CEikEdwin::SetCursorVisibilityL(TBool aEmphasis) { TCursor::TVisibility textCursor=(aEmphasis? TCursor::EFCursorFlashing : TCursor::EFCursorInvisible); @@ -4538,22 +4429,6 @@ lineCursor = TCursor::EFCursorInvisible; } - if ( iEdwinExtension && ( iEdwinExtension->iT2WState & CEikEdwinExtension::ERecordCursor ) ) - { - if ( aEmphasis ) - { - iEdwinExtension->iT2WState |= CEikEdwinExtension::ECursorVisible; - } - else - { - iEdwinExtension->iT2WState &= ~CEikEdwinExtension::ECursorVisible; - } - } - - if ( TextLength() == 0 && IsT2WEnabled() ) - { - textCursor = TCursor::EFCursorInvisible; - } iTextView->SetCursorVisibilityL(lineCursor,textCursor); CAknEdwinState*edwinState = EditorState(); if( !edwinState ) @@ -5015,8 +4890,6 @@ ConvertTextForSmileyL( TCursorSelection( lower, undoneLength ), ETrue ); } TRAPD(err2,iTextView->HandleInsertDeleteL(TCursorSelection(lower,lower+undoneLength),newText.Length(),changed)); - // try to draw "tap to write" - TryToDrawT2W(); ClearUndo(); if (NeedToChangeFormattingModeL()) SetAmountToFormatL(); @@ -5099,15 +4972,9 @@ const TInt newCursorPos=cursorPos+newLength-oldLength; iTextView->SetPendingSelection(TCursorSelection(newCursorPos,newCursorPos)); if (NeedToChangeFormattingModeL()) - { SetAmountToFormatL(); - } else - { iTextView->HandleInsertDeleteL(TCursorSelection(newCursorPos,cursorPos),0,ETrue); - // try to draw "tap to write" - TryToDrawT2W(); - } DrawContents(); UpdateScrollBarsL(); ReportEdwinEventL( MEikEdwinObserver::EEventTextUpdate ); @@ -5188,8 +5055,6 @@ selection.iAnchorPos=lower; selection.iCursorPos=lower; iTextView->HandleInsertDeleteL(selection,selLength,formatHasChanged); - // try to draw "tap to write" - TryToDrawT2W(); reportChange=ETrue; } CAknNoteDialog* dlg = new (ELeave) CAknNoteDialog(); @@ -5338,11 +5203,7 @@ DrawContents(); } else - { iTextView->HandleInsertDeleteL(selection,selLength,formatHasChanged); - // try to draw "tap to write" - TryToDrawT2W(); - } iEikonEnv->BusyMsgCancel(); User::LeaveIfError(err); } @@ -6689,8 +6550,6 @@ const TCursorSelection pending(selection.iCursorPos,selection.iCursorPos); iTextView->SetPendingSelection(pending); iTextView->HandleInsertDeleteL(selection,aModel->iText.Length(),formatHasChanged); - // try to draw "tap to write" - TryToDrawT2W(); if ( NeedToChangeFormattingModeL()) SetAmountToFormatL(); ReportEdwinEventL( MEikEdwinObserver::EEventTextUpdate ); @@ -6998,8 +6857,6 @@ if (iUndoStore) iUndoStore->SetNewText(selection); iTextView->HandleInsertDeleteL(selection,selectionLength,formatHasChanged); - // try to draw "tap to write" - TryToDrawT2W(); ReportEdwinEventL( MEikEdwinObserver::EEventTextUpdate ); DoReportEventL( MCoeControlObserver::EEventStateChanged ); User::LeaveIfError(err); @@ -7103,7 +6960,6 @@ yPosQ.SetFillScreen(); TRAP_IGNORE( iTextView->SetViewL( docPos, yPos, yPosQ ) ); } - TRAP_IGNORE( MoveViewToCursorLineL() ); } break; case KEikMessageVirtualCursorStateChange: @@ -7145,28 +7001,6 @@ DoAlignment(); } break; - case KAknSplitInputEnabled: - { - if ( iEdwinExtension ) - { - TBool change = ( TextLength() == 0 && IsT2WEnabled() ); - iEdwinExtension->iT2WState |= CEikEdwinExtension::ESplitInputEnabled; - if ( change ) - { - TryToDrawT2W( ETrue ); - } - } - } - break; - case KAknSplitInputDisabled: - { - if ( iEdwinExtension ) - { - iEdwinExtension->iT2WState &= ~CEikEdwinExtension::ESplitInputEnabled; - TryToDrawT2W(); - } - } - break; default: break; } @@ -7380,8 +7214,6 @@ aInsertPos + aText.Length() ), ETrue ); } iTextView->HandleInsertDeleteL(TCursorSelection(aInsertPos,aInsertPos+aText.Length()),length,formatChanged); - // try to draw "tap to write" - TryToDrawT2W(); } EXPORT_C void CEikEdwin::SetNonPrintingCharsVisibility(TNonPrintingCharVisibility aVisibility) @@ -8103,11 +7935,19 @@ return TTypeUid::Null(); } -EXPORT_C void CEikEdwin::SetAlignment(TInt aAlignment) - { - if (iEdwinExtension) - iEdwinExtension->SetAlignment(aAlignment); - DoAlignment(); +EXPORT_C void CEikEdwin::SetAlignment( TInt aAlignment ) + { + TBool alignmentChange( ETrue ); + if ( iEdwinExtension ) + { + alignmentChange = ( iEdwinExtension->CurrentAlignment() != aAlignment ); + iEdwinExtension->SetAlignment( aAlignment ); + } + // If alignment is not changed, no need to reformat. + if ( alignmentChange ) + { + DoAlignment(); + } } void CEikEdwin::NewParagraphL() @@ -8169,7 +8009,10 @@ SetParaFormatLayer(paraFormatLayer); if (iTextView) { - NotifyNewFormatL(); + if ( ( iEdwinInternalFlags & ESuppressFormatting ) == 0 ) + { + NotifyNewFormatL(); + } } else { @@ -8637,40 +8480,6 @@ UpdateScrollBarsL(); } } - -// --------------------------------------------------------------------------- -// CEikEdwin::MoveViewToCursorLineL -// --------------------------------------------------------------------------- -// -void CEikEdwin::MoveViewToCursorLineL() - { - if ( !iTextView ) - { - return; - } - - const TInt cursorPos ( CursorPos() ); - const TRect viewRect( AdjustedViewRect() ); - - const TPoint startPoint ( viewRect.iTl ); - const TPoint endPoint ( viewRect.iBr ); - - TPoint cursorPoint; - iTextView->DocPosToXyPosL( cursorPos, cursorPoint ); - - if ( cursorPoint.iY > endPoint.iY ) - { - TBool exceed ( EFalse ) ; - TInt rest ( 0 ); - ScrollView ( endPoint.iY - cursorPoint.iY, exceed, rest ); - } - else if ( cursorPoint.iY < startPoint.iY ) - { - TBool exceed ( EFalse ) ; - TInt rest ( 0 ); - ScrollView ( startPoint.iY - cursorPoint.iY, exceed, rest ); - } - } EXPORT_C void CEikEdwin::SetCursorVisible(TBool aVisible) { @@ -8777,10 +8586,10 @@ TBool partialScreenDisabled( !( aNewFlags & EAknEditorFlagEnablePartialScreen ) && ( aOldFlags & EAknEditorFlagEnablePartialScreen ) ); - - if ( IsActivated() && - ( ( textViewHideEnabled && !( aNewFlags & EAknEditorFlagEnablePartialScreen ) ) || - ( partialScreenDisabled && ( aNewFlags & EAknEditorFlagHideTextView ) ) ) + + if (IsActivated() && + ( (textViewHideEnabled && !(aNewFlags & EAknEditorFlagEnablePartialScreen)) || + (partialScreenDisabled && (aNewFlags & EAknEditorFlagHideTextView)) ) ) { iTextView->MakeVisible( EFalse ); @@ -9171,7 +8980,13 @@ for (TInt i = 0; i < text.Length(); i++) { TChar character(text[i]); - if ( character.IsPrint() ) + if (text[i] == ' ') + return ETrue; + + TChar::TCategory category = character.GetCategory(); + + if ( !( ( ( category & TChar::ESeparatorGroup ) == TChar::ESeparatorGroup ) || + ( text[i] >= 0x200B && text[i] <= 0xFFFC ) ) ) { ret = ETrue; break; @@ -9476,6 +9291,32 @@ return EFalse; } +// --------------------------------------------------------------------------- +// CEikEdwin::InlineTextRange +// --------------------------------------------------------------------------- +// +TCursorSelection CEikEdwin::InlineTextRange() const + { + TInt startPosOfInline( 0 ); + TInt endPosOfInline( 0 ); + if ( iEdwinFepSupport ) + { + startPosOfInline = iEdwinFepSupport->iPositionOfInlineTextInDocument; + endPosOfInline = iEdwinFepSupport->iPositionOfInlineTextInDocument + + iEdwinFepSupport->iLengthOfInlineText; + if ( iEdwinFepSupport->iLengthOfInlineText <= 0 ) + { + CAknEdwinState* state( EditorState() ); + if ( state && state->CurrentInlineEditSpan().Length() > 0 ) + { + startPosOfInline = state->CurrentInlineEditSpan().LowerPos(); + endPosOfInline = state->CurrentInlineEditSpan().HigherPos(); + } + } + } + return TCursorSelection( startPosOfInline, endPosOfInline ); + } + // --------------------------------------------------------------------------- // ReadSpecialCharFromSCTL @@ -9547,110 +9388,5 @@ aReader.ReadTPtrC(); // Process ToolTip } -// returns the faded color of aColor -// aWhiteMap and aBlackMap parameters control the amount of fading -TRgb FadeRgb(TRgb aColor, TUint8 aBlackMap,TUint8 aWhiteMap) - { - TUint8 fadeMapFactor = aWhiteMap - aBlackMap + 1; - TUint8 fadeMapOffset = aBlackMap; - TInt value = aColor.Internal(); - TInt b = (((value & 0x000000ff) * fadeMapFactor) >> 8) + fadeMapOffset; - TInt g = (((value & 0x0000ff00) * fadeMapFactor) >> 16) + fadeMapOffset; - //the multiplication by iFadeMapFactor can overflow into the sign bit, so we shift down in two steps - TInt r = ((((value & 0x00ff0000) >> 16) * fadeMapFactor) >> 8) + fadeMapOffset; - TInt a = aColor.Alpha(); - return TRgb(r,g,b,a ); - } - -// --------------------------------------------------------------------------- -// CEikEdwin::EnableT2WL -// --------------------------------------------------------------------------- -// -EXPORT_C void CEikEdwin::EnableT2WL( TBool aEnable ) - { - if ( iEdwinExtension ) - { - if ( !aEnable && iEdwinExtension->iT2WBuf ) - { - delete iEdwinExtension->iT2WBuf; - iEdwinExtension->iT2WBuf = NULL; - if ( iTextView ) - { - TryToDrawT2W( ETrue ); - } - } - else if ( aEnable && !iEdwinExtension->iT2WBuf ) - { - CRepository* cenrep = NULL; - TInt supportT2W = 0; - TRAPD(error, cenrep = CRepository::NewL(KCRUidAvkon)); - if ( error == KErrNone ) - { - error = cenrep->Get( KAknEdwinTapToWrite, supportT2W ); - } - delete cenrep; - if ( supportT2W && !iEdwinExtension->iT2WBuf ) - { - iEdwinExtension->iT2WBuf = iEikonEnv->AllocReadResourceLC( R_AVKON_TAP_TO_WRITE ); - CleanupStack::Pop( iEdwinExtension->iT2WBuf ); - if ( iTextView ) - { - TryToDrawT2W(); - } - } - } - } - } - -// --------------------------------------------------------------------------- -// CEikEdwin::TryToDrawT2W -// --------------------------------------------------------------------------- -// -void CEikEdwin::TryToDrawT2W( TBool aClean ) - { - CAknEdwinState* edwinState = EditorState(); - TBool cursorVisible( EFalse ); - if ( edwinState ) - { - cursorVisible = ( edwinState->Flags() | EAknEditorFlagTextCursorVisible ); - } - - if ( iEdwinExtension ) - { - // When "tap to write" is enabled( started ) we should record the status of cursor. - if ( TextLength() == 0 && IsT2WEnabled() ) - { - SetCursorVisible( EFalse ); - iEdwinExtension->iT2WState |= CEikEdwinExtension::ERecordCursor; - if ( cursorVisible ) - { - iEdwinExtension->iT2WState |= CEikEdwinExtension::ECursorVisible; - } - else - { - iEdwinExtension->iT2WState &= ~CEikEdwinExtension::ECursorVisible; - } - DrawDeferred(); - } - // When "tap to write" is disabled ( ended ) we need to recover the status of cursor. - else if ( IsFocused() && - ( iEdwinExtension->iT2WState & CEikEdwinExtension::ERecordCursor ) ) - { - iEdwinExtension->iT2WState &= ~CEikEdwinExtension::ERecordCursor; - SetCursorVisible( iEdwinExtension->iT2WState & CEikEdwinExtension::ECursorVisible ); - } - // When focus off, we don't need to record the status anymore. So clean it. - else if ( !IsFocused() ) - { - iEdwinExtension->iT2WState &= ~CEikEdwinExtension::ERecordCursor; - } - } - - if ( aClean && TextLength() == 0 ) - { - DrawDeferred(); - } - } - // End of File diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/EIKLBV.CPP --- a/uifw/EikStd/coctlsrc/EIKLBV.CPP Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/EIKLBV.CPP Wed Oct 13 14:50:15 2010 +0300 @@ -1500,48 +1500,6 @@ } -// --------------------------------------------------------------------------- -// Sets all items selected. -// --------------------------------------------------------------------------- -// -void CListBoxView::SelectAllL( TBool aDrawItems ) - { - _AKNTRACE_FUNC_ENTER; - - __ASSERT_DEBUG( iSelectionIndexes, - Panic( EEikPanicListBoxNoSelIndexArray ) ); - __ASSERT_DEBUG( iModel, Panic( EEikPanicListBoxNoModel ) ); - -#ifdef RD_UI_TRANSITION_EFFECTS_LIST - MAknListBoxTfxInternal* transApi = CAknListLoader::TfxApiInternal( iGc ); -#endif // RD_UI_TRANSITION_EFFECTS_LIST - - ClearSelection(); - TInt numItems = iModel->NumberOfItems(); - - for ( TInt i = 0; i < numItems; i++ ) - { - if ( !iItemDrawer->Properties( i ).IsSelectionHidden() ) - { -#ifdef RD_UI_TRANSITION_EFFECTS_LIST - if ( transApi ) - { - transApi->Invalidate( MAknListBoxTfxInternal::EListItem, i ); - } -#endif // RD_UI_TRANSITION_EFFECTS_LIST - - iSelectionIndexes->AppendL( i ); - - if ( aDrawItems ) - { - DrawItem( i ); - } - } - } - _AKNTRACE_FUNC_EXIT; - } - - // class CSnakingListBoxView EXPORT_C CSnakingListBoxView::CSnakingListBoxView() diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/EIKLBX.CPP --- a/uifw/EikStd/coctlsrc/EIKLBX.CPP Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/EIKLBX.CPP Wed Oct 13 14:50:15 2010 +0300 @@ -75,7 +75,6 @@ #include #include #include -#include #include "akntrace.h" // timeout for long keypress used in markable lists @@ -1047,10 +1046,9 @@ if ( aExtensionId == MAknMarkingCollection::TYPE ) { a0 = static_cast( this ); - return KErrNone; - } - - return KErrNotFound; + } + + return KErrNone; } @@ -1061,33 +1059,7 @@ void CListBoxExt::SetMultipleMarkingState( TBool aActive ) { _AKNTRACE_FUNC_ENTER; - if ( iMarkingModeInUse != aActive ) - { - if ( aActive ) - { - iListBox.iView->ItemDrawer()->SetFlags( - CListItemDrawer::EMarkingModeEnabled ); - } - else - { - iListBox.iView->ItemDrawer()->ClearFlags( - CListItemDrawer::EMarkingModeEnabled ); - - if ( iListBox.iView->SelectionIndexes()->Count() > 0 ) - { - iListBox.iView->ClearSelection( EFalse ); - } - } - - iMarkingModeInUse = aActive; - iListBox.DrawDeferred(); - } - - if ( iListBox.MarkingModeObserver() ) - { - iListBox.MarkingModeObserver()->MarkingModeStatusChanged( aActive ); - } - + iListBox.SetMarkingMode( aActive ); _AKNTRACE_FUNC_EXIT; } @@ -1143,7 +1115,7 @@ if ( index >= 0 && !iListBox.iItemDrawer->Properties( index ).IsSelectionHidden() ) { - iListBox.View()->SelectItemL( index ); + iListBox.View()->SelectItemL( iListBox.CurrentItemIndex() ); } } _AKNTRACE_FUNC_EXIT; @@ -1157,11 +1129,16 @@ void CListBoxExt::MarkAllL() { _AKNTRACE_FUNC_ENTER; - - if ( iListBox.MarkingMode() && - iListBox.Model()->NumberOfItems() > 0 ) - { - iListBox.View()->SelectAllL( ETrue ); + + if ( iListBox.MarkingMode() ) + { + for ( TInt i = 0; i < iListBox.Model()->NumberOfItems(); ++i ) + { + if ( !iListBox.iItemDrawer->Properties( i ).IsSelectionHidden() ) + { + iListBox.View()->SelectItemL( i ); + } + } } _AKNTRACE_FUNC_EXIT; } @@ -1212,8 +1189,8 @@ _AKNTRACE_FUNC_ENTER; iLongTappedItem = iLastDownTappedItem; iLastDownTappedItem = KErrNotFound; - iListBox.ReportListBoxEventL( MEikListBoxObserver::EEventItemLongTapped ); iItemActionMenu->ShowMenuL( aPenEventScreenLocation, 0 ); + IgnorePointerEventsUntilUp(); iOldWinPos = iListBox.DrawableWindow()->OrdinalPosition(); _AKNTRACE_FUNC_EXIT; } @@ -3444,13 +3421,9 @@ iView->ClearFlags(CListBoxView::EItemCountModified); - if ( iListBoxExt->iItemActionMenu && - iListBoxExt->iLongTappedItem != KErrNotFound ) - { - // Item action menu is being shown and it needs to be closed when - // items are added or removed to the list array, otherwise the - // item specific commands may be targeted to the wrong item. - iListBoxExt->iItemActionMenu->HideMenu(); + if ( iListBoxExt && iListBoxExt->iLongTappedItem != KErrNotFound ) + { + iListBoxExt->EnableHighlight( EFalse ); } FireItemChange(); @@ -3535,7 +3508,7 @@ { _AKNTRACE_FUNC_ENTER; __ASSERT_DEBUG( iView, Panic( EEikPanicListBoxNoView ) ); - + //fix the bug EGGO-7SQA4S and EVSG-7TD9WZ TInt curItemIndex = iView->CurrentItemIndex(); if(curItemIndex >= 0 && curItemIndex < iModel->NumberOfItems() ) { @@ -3543,7 +3516,8 @@ iView->SetTopItemIndex( newTopItemIndex ); } iView->SetFlags(CListBoxView::EItemCountModified); - + // following breaks lists in square layout, not needed in SERIES60? + //iView->CalcDataWidth(); iView->CalcBottomItemIndex(); UpdateScrollBarsL(); UpdateScrollBarThumbs(); @@ -3553,7 +3527,7 @@ FireItemChange(); if ( iListBoxExt ) - { + { iListBoxExt->CheckScrollBarVisibility(); // Physics engine world size needs to be updated here, otherwise aknphysics // cone observer may block pointer events on new items. this can happen @@ -3562,17 +3536,7 @@ { iListBoxExt->InitPhysicsL(); } - - if ( iListBoxExt->iItemActionMenu && - iListBoxExt->iLongTappedItem != KErrNotFound ) - { - // Item action menu is being shown and it needs to be closed when - // items are added or removed to the list array, otherwise the - // item specific commands may be targeted to the wrong item. - iListBoxExt->iItemActionMenu->HideMenu(); - } - } - + } _AKNTRACE_FUNC_EXIT; } @@ -5193,8 +5157,7 @@ _AKNTRACE("TPointerEvent::EButton1Down"); // For drag outside listbox iListBoxExt->iIsDownOnItem = pointerIsOverAnItem; - iListBoxExt->iLastPoint = pointerPos; - iListBoxExt->iLongTappedItem = KErrNotFound; + iListBoxExt->iLastPoint = pointerPos; // update index of the last down tapped item iListBoxExt->iLastDownTappedItem = itemIndex; @@ -6750,19 +6713,36 @@ // EXPORT_C void CEikListBox::SetMarkingMode( TBool aEnable ) { - _AKNTRACE_FUNC_ENTER; - if ( iListBoxExt - && iListBoxExt->iSingleClickEnabled - && ( iListBoxFlags & CEikListBox::ES60StyleMarkable ) - && iListBoxExt->iItemActionMenu - && iListBoxExt->iMarkingModeInUse != aEnable ) - { - CAknMarkingMode& markingMode = iListBoxExt->iItemActionMenu->MarkingMode(); - // Multiple marking state will be set, navi pane will be updated - // and softkeys will be updated when entering and exiting marking mode. - markingMode.SetCollectionMultipleMarkingState( aEnable ); - } - _AKNTRACE_FUNC_EXIT; + if ( iListBoxExt && iListBoxExt->iSingleClickEnabled && + ( iListBoxFlags & CEikListBox::ES60StyleMarkable ) ) + { + if ( iListBoxExt->iMarkingModeInUse != aEnable ) + { + if ( aEnable ) + { + iView->ItemDrawer()->SetFlags( + CListItemDrawer::EMarkingModeEnabled ); + } + else + { + iView->ItemDrawer()->ClearFlags( + CListItemDrawer::EMarkingModeEnabled ); + + if ( iView->SelectionIndexes()->Count() > 0 ) + { + iView->ClearSelection( EFalse ); + } + } + + iListBoxExt->iMarkingModeInUse = aEnable; + DrawDeferred(); + } + + if ( MarkingModeObserver() ) + { + MarkingModeObserver()->MarkingModeStatusChanged( aEnable ); + } + } } @@ -6773,12 +6753,10 @@ EXPORT_C void CEikListBox::SetMarkingModeObserver( MAknMarkingModeObserver* aObserver ) { - _AKNTRACE_FUNC_ENTER; if ( iListBoxExt ) { iListBoxExt->iMarkingModeObserver = aObserver; } - _AKNTRACE_FUNC_EXIT; } @@ -6911,13 +6889,8 @@ TBool blockEvent = EFalse; - // If touch down in listbox area, kinetic scrolling is enabled, and single - // click is disabled or style popup menu is not shown when single click is - // enabled, events of kinetic scrolling are sent to listbox. - TBool allowDragEvent( ( iListBoxFlags & ELeftDownInViewRect ) - && !iListBoxExt->iScrollingDisabled - && ( !iListBoxExt->iSingleClickEnabled - || iListBoxExt->iLongTappedItem == KErrNotFound ) ); + TBool allowDragEvent( ( iListBoxFlags & ELeftDownInViewRect ) && !iListBoxExt->iScrollingDisabled ); + switch ( aPointerEvent.iType ) { diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/EIKMENUP.CPP --- a/uifw/EikStd/coctlsrc/EIKMENUP.CPP Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/EIKMENUP.CPP Wed Oct 13 14:50:15 2010 +0300 @@ -6384,10 +6384,6 @@ { resourceId = R_AVKON_MENU_SCT_ROW_DEFAULT_CONTENTS_CHINESE; } - if (FeatureManager::FeatureSupported(KFeatureIdKorean)) - { - resourceId = R_AVKON_MENU_SCT_ROW_DEFAULT_CONTENTS_KOREAN; - } iExtension->ConstructMenuSctRowL( aSpecialChars, resourceId ); } diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/EIKSCRLB.CPP --- a/uifw/EikStd/coctlsrc/EIKSCRLB.CPP Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/EIKSCRLB.CPP Wed Oct 13 14:50:15 2010 +0300 @@ -1286,7 +1286,7 @@ thumbPositionPix = position - extension->iPointerOffsetFromThumb; TInt oldPosition = thumbPosition; - TReal newPosition = (TReal)thumbPositionPix * ( scrollSpan - thumbSpan ) / scrollSpanPix; + TReal newPosition = thumbPositionPix * ( scrollSpan - thumbSpan ) / (TReal)scrollSpanPix; thumbPosition = newPosition; // round the value to the nearest possible position diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/aknedwinphysicshandler.cpp --- a/uifw/EikStd/coctlsrc/aknedwinphysicshandler.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/aknedwinphysicshandler.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -190,6 +190,17 @@ + KMaxWorldSize ); TSize viewSize( iViewRect.Width(), iViewRect.Height() ); + CTextLayout* layout = iEdwin.TextLayout(); + + if ( layout ) + { + TInt pixelsAbove = layout->PixelsAboveBand(); + if ( pixelsAbove > 0 ) + { + MoveScrollIndex( -pixelsAbove ); + } + } + iPhysics->InitPhysicsL( totalSize, viewSize, EFalse ); } } diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/aknitemactionmenu.cpp --- a/uifw/EikStd/coctlsrc/aknitemactionmenu.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/aknitemactionmenu.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -219,18 +219,6 @@ // --------------------------------------------------------------------------- -// CAknItemActionMenu::MarkingMode -// --------------------------------------------------------------------------- -// -EXPORT_C CAknMarkingMode& CAknItemActionMenu::MarkingMode() - { - _AKNTRACE_FUNC_ENTER; - _AKNTRACE_FUNC_EXIT; - return *iMarking; - } - - -// --------------------------------------------------------------------------- // CAknItemActionMenu::AddCollectionStateL // --------------------------------------------------------------------------- // @@ -393,6 +381,18 @@ // --------------------------------------------------------------------------- +// CAknItemActionMenu::MarkingMode +// --------------------------------------------------------------------------- +// +CAknMarkingMode& CAknItemActionMenu::MarkingMode() + { + _AKNTRACE_FUNC_ENTER; + _AKNTRACE_FUNC_EXIT; + return *iMarking; + } + + +// --------------------------------------------------------------------------- // CAknItemActionMenu::CollectionHasMarkedItems // --------------------------------------------------------------------------- // @@ -414,21 +414,6 @@ _AKNTRACE_FUNC_EXIT; return markedItems; } - - -// --------------------------------------------------------------------------- -// CAknItemActionMenu::HideMenu -// --------------------------------------------------------------------------- -// -void CAknItemActionMenu::HideMenu() - { - if ( iPopupMenu && !iProcessingCommand ) - { - iPopupMenu->HideMenu(); - } - } - - // --------------------------------------------------------------------------- // CAknItemActionMenu::CAknItemActionMenu // --------------------------------------------------------------------------- diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/aknmarkingmode.cpp --- a/uifw/EikStd/coctlsrc/aknmarkingmode.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/aknmarkingmode.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -59,8 +59,7 @@ // CAknMarkingMode::SetCollectionMultipleMarkingState // --------------------------------------------------------------------------- // -EXPORT_C void CAknMarkingMode::SetCollectionMultipleMarkingState( - TBool aActive ) +void CAknMarkingMode::SetCollectionMultipleMarkingState( TBool aActive ) { _AKNTRACE_FUNC_ENTER; for ( TInt i = 0; i < iCollections.Count(); i++ ) @@ -122,12 +121,17 @@ for ( TInt i = 0; i < iCollections.Count(); i++ ) { MAknCollection* collection( iCollections[i] ); - MAknMarkingCollection* markingCollection - = MarkingCollection( *collection ); - if ( markingCollection ) + if ( collection->CollectionState() & + MAknCollection::EStateCollectionVisible ) { - markingActive = markingCollection->MarkingState() - & MAknMarkingCollection::EStateMarkingMode; + MAknMarkingCollection* markingCollection + = MarkingCollection( *collection ); + if ( markingCollection ) + { + markingActive = markingCollection->MarkingState() + & MAknMarkingCollection::EStateMarkingMode; + } + break; } } _AKNTRACE_FUNC_EXIT; diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/aknstyluspopupmenu.cpp --- a/uifw/EikStd/coctlsrc/aknstyluspopupmenu.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/aknstyluspopupmenu.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -426,7 +426,14 @@ { if ( aControl && aEventType == EEventStateChanged ) { - HidePreviewPopup(); + if ( iPreviewPopup ) + { + iPreviewPopup->HidePopUp(); + } + if ( iController ) + { + iController->HidePopUp(); + } if ( iMenuObserver ) { @@ -456,14 +463,20 @@ } else if ( aControl && aEventType == EEventRequestExit ) { - HidePreviewPopup(); + if ( iPreviewPopup ) + { + iPreviewPopup->HidePopUp(); + } + + if ( iController ) + { + iController->HidePopUp(); + } StartControllerIdleL(); } else if ( aControl && aEventType == EEventRequestCancel ) { - HidePreviewPopup(); - if ( iMenuObserver ) { TBool isAlreadySet = iFlags.IsSet( EIdleDisabled ); @@ -506,20 +519,6 @@ } } - -// --------------------------------------------------------------------------- -// CAknStylusPopUpMenu::HideMenu -// --------------------------------------------------------------------------- -// -void CAknStylusPopUpMenu::HideMenu() - { - if ( iController ) - { - iController->HidePopUp(); - } - } - - // ----------------------------------------------------------------------------- // CAknStylusPopUpMenu::StartControllerIdleL // ----------------------------------------------------------------------------- @@ -574,20 +573,3 @@ { static_cast( aParam )->iIsDeleted = NULL; } - -// ----------------------------------------------------------------------------- -// Hide Preview Popups -// ----------------------------------------------------------------------------- -// -void CAknStylusPopUpMenu::HidePreviewPopup() - { - if ( iPreviewPopup ) - { - iPreviewPopup->HidePopUp(); - } - - if ( iController ) - { - iController->HidePopUp(); - } - } diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/aknstyluspopupmenucontent.cpp --- a/uifw/EikStd/coctlsrc/aknstyluspopupmenucontent.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/aknstyluspopupmenucontent.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -1030,7 +1030,7 @@ { AknListUtils::DrawSeparator( aGc, rect, textColor, skin ); } - } + } } // ----------------------------------------------------------------------------- @@ -1214,11 +1214,11 @@ { iSBFrame->DrawBackground( EFalse, EFalse ); if ( AknLayoutUtils::LayoutMirrored() ) - { + { listRect.iTl.iX += AknLayoutScalable_Avkon::scroll_pane().LayoutLine().iW; - } + } else - { + { listRect.iBr.iX -= AknLayoutScalable_Avkon::scroll_pane().LayoutLine().iW; } } @@ -1227,14 +1227,14 @@ else { if ( AknLayoutUtils::LayoutMirrored() ) - { + { listRect.iTl.iX += AknLayoutScalable_Avkon::scroll_pane().LayoutLine().iW; - } + } else - { + { listRect.iBr.iX -= AknLayoutScalable_Avkon::scroll_pane().LayoutLine().iW; - } - } + } + } } @@ -1295,18 +1295,12 @@ iItems[i]->iRect = itemRect; } - // info: - // 1, according to the function MinimumSize the following - // condition is always true: Rect().Height() % singleItemHeight == 0 - // 2, the Offset is in the range of [0 , singleItemHeight) - // we get partial items only when Offset is not zero during scrolling - // note: - // should subtract the lastItem when Offset is zero without partical items - if ( lastItem == iItems.Count() || ( 0 == Offset() ) ) + if ( lastItem == iItems.Count() || ( Rect().Height() % singleItemHeight ) == 0 ) { + // substract the partially visible item --lastItem; } - + return lastItem; } diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/eikcba.cpp --- a/uifw/EikStd/coctlsrc/eikcba.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/eikcba.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -132,7 +132,7 @@ result = ETrue; } } - _AKNTRACE( "IsMskEnabledLayoutActive is %d", result ); + _AKNTRACE_FUNC_EXIT; return result; } @@ -784,10 +784,9 @@ */ TBool Active() const { - TBool ret; - ret = iOwner.IsVisible() && !iOwner.IsEmpty(); - _AKNTRACE( "Active is %d", ret ); - return ret; + _AKNTRACE_FUNC_ENTER; + _AKNTRACE_FUNC_EXIT; + return iOwner.IsVisible() && !iOwner.IsEmpty(); } /* @@ -2957,8 +2956,8 @@ // If the status pane is invisible in landscape, softkey need to draw frame to cover // the area of combine pane. CEikStatusPaneBase* statusPane = CEikStatusPaneBase::Current(); - if ( ( iCbaFlags & EEikCbaFlagAppMskIcon ) || ( statusPane && !statusPane->IsVisible() && isLandscapeOrient && - statusPane->PaneCapabilities(TUid::Uid(EEikStatusPaneUidCombined)).IsInCurrentLayout())) + if (statusPane && !statusPane->IsVisible() && isLandscapeOrient && + statusPane->PaneCapabilities(TUid::Uid(EEikStatusPaneUidCombined)).IsInCurrentLayout()) { iFlags.Set( ECbaCombinePaneUncovered ); } @@ -2984,95 +2983,90 @@ // If status indicators and clock are shown in control pane area, // then remove those areas from cba window region. // - // - // NOTE: MSK is not supported in landscape except the flag EEikCbaFlagAppMskIcon is defined . + // NOTE: MSK is not supported in landscape. // - - if ( !(iCbaFlags & EEikCbaFlagAppMskIcon ) ) - { - if( statusPane && + if ( statusPane && statusPane->IsVisible() && AknStatuspaneUtils::ExtendedFlatLayoutActive() ) - { - if ( iBgIID == KAknsIIDQsnBgAreaControlMp ) + { + if ( iBgIID == KAknsIIDQsnBgAreaControlMp ) + { + if ( !iIsClockIndicBgIIDSet ) + { + statusPane->SetCbaAreaBackgroundID( + iBgIID, + CEikStatusPaneBase::EDrawDeferred ); + iIsClockIndicBgIIDSet = ETrue; + } + } + else + { + if ( statusPane->CbaAreaBackgroundID() != iBgIID ) { - if ( !iIsClockIndicBgIIDSet ) + statusPane->SetCbaAreaBackgroundID( + iBgIID, + CEikStatusPaneBase::EDrawDeferred ); + } + } + + if ( statusPane->PaneCapabilities( + TUid::Uid( EEikStatusPaneUidCombined ) ).IsInCurrentLayout() ) + { + TRect combinedPaneRect( 0, 0, 0, 0 ); + TRAPD( err, + combinedPaneRect = + statusPane->PaneRectL( TUid::Uid( + EEikStatusPaneUidCombined ) ) ); + + if ( !err ) + { + TPoint cbaPositionRelativeToScreen( PositionRelativeToScreen() ); + TRect cbaRectRelativeToScreen( cbaPositionRelativeToScreen, Size() ); + + if ( cbaRectRelativeToScreen.Intersects( combinedPaneRect ) ) { - statusPane->SetCbaAreaBackgroundID( - iBgIID, - CEikStatusPaneBase::EDrawDeferred ); - iIsClockIndicBgIIDSet = ETrue; - } - } - else - { - if ( statusPane->CbaAreaBackgroundID() != iBgIID ) - { - statusPane->SetCbaAreaBackgroundID( - iBgIID, - CEikStatusPaneBase::EDrawDeferred ); + combinedPaneRect.Move( + -cbaPositionRelativeToScreen.iX, + -cbaPositionRelativeToScreen.iY ); + + region.SubRect( combinedPaneRect ); } } - - if ( statusPane->PaneCapabilities( - TUid::Uid( EEikStatusPaneUidCombined ) ).IsInCurrentLayout() ) - { - TRect combinedPaneRect( 0, 0, 0, 0 ); - TRAPD( err, - combinedPaneRect = - statusPane->PaneRectL( TUid::Uid( - EEikStatusPaneUidCombined ) ) ); + } + else + { + TRect digitalClockRect( 0, 0, 0, 0 ); + TRect indicatorRect( 0, 0, 0, 0 ); + + TRAPD( err1, + indicatorRect = statusPane->PaneRectL( TUid::Uid( + EEikStatusPaneUidIndic ) ) ); + + TRAPD( err2, + digitalClockRect = statusPane->PaneRectL( TUid::Uid( + EEikStatusPaneUidDigitalClock ) ) ); - if ( !err ) - { - TPoint cbaPositionRelativeToScreen( PositionRelativeToScreen() ); - TRect cbaRectRelativeToScreen( cbaPositionRelativeToScreen, Size() ); - - if ( cbaRectRelativeToScreen.Intersects( combinedPaneRect ) ) - { - combinedPaneRect.Move( - -cbaPositionRelativeToScreen.iX, - -cbaPositionRelativeToScreen.iY ); - - region.SubRect( combinedPaneRect ); - } - } - } - else + if ( !err1 && !err2 ) { - TRect digitalClockRect( 0, 0, 0, 0 ); - TRect indicatorRect( 0, 0, 0, 0 ); - - TRAPD( err1, - indicatorRect = statusPane->PaneRectL( TUid::Uid( - EEikStatusPaneUidIndic ) ) ); - - TRAPD( err2, - digitalClockRect = statusPane->PaneRectL( TUid::Uid( - EEikStatusPaneUidDigitalClock ) ) ); - - if ( !err1 && !err2 ) + TPoint cbaPositionRelativeToScreen( PositionRelativeToScreen() ); + TRect cbaRectRelativeToScreen( cbaPositionRelativeToScreen, Size() ); + + if ( cbaRectRelativeToScreen.Intersects( indicatorRect ) ) { - TPoint cbaPositionRelativeToScreen( PositionRelativeToScreen() ); - TRect cbaRectRelativeToScreen( cbaPositionRelativeToScreen, Size() ); - - if ( cbaRectRelativeToScreen.Intersects( indicatorRect ) ) - { - indicatorRect.Move( - -cbaPositionRelativeToScreen.iX, - -cbaPositionRelativeToScreen.iY ); + indicatorRect.Move( + -cbaPositionRelativeToScreen.iX, + -cbaPositionRelativeToScreen.iY ); - region.SubRect( indicatorRect ); - } + region.SubRect( indicatorRect ); + } - if ( cbaRectRelativeToScreen.Intersects( digitalClockRect ) ) - { - digitalClockRect.Move( - -cbaPositionRelativeToScreen.iX, - -cbaPositionRelativeToScreen.iY ); + if ( cbaRectRelativeToScreen.Intersects( digitalClockRect ) ) + { + digitalClockRect.Move( + -cbaPositionRelativeToScreen.iX, + -cbaPositionRelativeToScreen.iY ); - region.SubRect( digitalClockRect ); - } + region.SubRect( digitalClockRect ); } } } @@ -3570,7 +3564,6 @@ { if( button1->IsDimmed() ) { - _AKNTRACE_FUNC_EXIT; return EKeyWasConsumed; } // Return immediately if the button is invisible @@ -3608,7 +3601,6 @@ { if( button2->IsDimmed() ) { - _AKNTRACE_FUNC_EXIT; return EKeyWasConsumed; } // Return immediately if the button is invisible. @@ -3663,8 +3655,7 @@ && !Window().IsFaded() ) { if( buttonMSK->IsDimmed() ) - { - _AKNTRACE_FUNC_EXIT; + { return EKeyWasConsumed; } if (KControlArrayCBAButtonMSKPosn < iControlArray->Count()) @@ -3892,7 +3883,6 @@ if( button1->IsDimmed() ) { CCoeControl::HandlePointerEventL( aPointerEvent ); - _AKNTRACE_FUNC_EXIT; return; } if ( button1->IsVisible() ) @@ -3957,7 +3947,6 @@ if( button2->IsDimmed() ) { CCoeControl::HandlePointerEventL( aPointerEvent ); - _AKNTRACE_FUNC_EXIT; return; } if ( button2->IsVisible() ) @@ -4024,7 +4013,6 @@ if( buttonMSK->IsDimmed() ) { CCoeControl::HandlePointerEventL( aPointerEvent ); - _AKNTRACE_FUNC_EXIT; return; } if ( buttonMSK->IsVisible() ) @@ -4563,7 +4551,6 @@ // Embedded CBA doesn't draw anything if ( iFlags.IsSet( ECbaInsideDialog ) ) { - _AKNTRACE_FUNC_EXIT; return; } @@ -4572,7 +4559,6 @@ CWindowGc &gc = SystemGc(); iExtension->DrawSemiTransparency( gc ); - _AKNTRACE_FUNC_EXIT; return; } @@ -5284,7 +5270,7 @@ TRect posInScreen( cbarect.Rect() ); TBool mskEnabledInPlatform( iMSKEnabledInPlatform && - ( IsMskEnabledLayoutActive() || ( iCbaFlags & EEikCbaFlagAppMskIcon ) ) ); + IsMskEnabledLayoutActive() ); TBool mskEnabledInApplication( AknLayoutUtils::MSKEnabled() && iMSKset ); @@ -7750,14 +7736,11 @@ // TBool CEikCba::MskAllowed() const { - _AKNTRACE_FUNC_ENTER; - TBool ret = EFalse; - ret = iMSKEnabledInPlatform && - ( ( AknLayoutUtils::MSKEnabled() && - IsMskEnabledLayoutActive() ) || ( iCbaFlags & EEikCbaFlagAppMskIcon ) ); - _AKNTRACE( "MskAllowed is %d", ret ); - _AKNTRACE_FUNC_EXIT; - return ret; + _AKNTRACE_FUNC_ENTER; + _AKNTRACE_FUNC_EXIT; + return ( iMSKEnabledInPlatform && + AknLayoutUtils::MSKEnabled() && + IsMskEnabledLayoutActive() ); } @@ -7896,10 +7879,6 @@ void CEikCba::UpdateMultipleMarkingSoftkey() { _AKNTRACE_FUNC_ENTER; - if ( iFlags.IsSet( ECbaEmbedded ) ) - { - return; - } if ( iFlags.IsSet( ECbaSingleClickEnabled ) && iExtension && iExtension->iItemActionMenu ) { diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/eiklay.cpp --- a/uifw/EikStd/coctlsrc/eiklay.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/eiklay.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -97,7 +97,7 @@ { 0, 0, }, // Sa 26 { KUsualForbidden, KOpFlag | KPrFlag | KPoFlag | KIdFlag | KBbFlag | KB2Flag }, // Ai 27 { 0, 0, }, // Xx 28 - { KUsualForbidden, KUsualAllowed | KCalSpaceFlag }, // CalSpace 29 + { KUsualForbidden, KUsualAllowed | KCalSpaceFlag | KCmFlag }, // CalSpace 29 }; const TText KPrivateUseAreaStart = 0xE000; diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/eikspane.cpp --- a/uifw/EikStd/coctlsrc/eikspane.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/eikspane.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -3726,18 +3726,6 @@ // Read statuspane shape TRAP_IGNORE( GetShapeL( statusPaneRegion, ETrue, ETrue ) ); - - // We need to subduce the rect of digital clock pane here, - // because it stay on the bottom cba area always in landscape mode. - if (Layout_Meta_Data::IsLandscapeOrientation()) - { - CEikStatusPaneLayoutTree* pane = iModel->CurrentLayout()->Find(TUid::Uid(EEikStatusPaneUidDigitalClock)); - if (pane != NULL) - { - statusPaneRegion.SubRect(pane->Rect()); - } - } - statusPaneRegion.Tidy(); // Get largest possible rect that does not overlap with sp shape diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/smileycustomwrap.cpp --- a/uifw/EikStd/coctlsrc/smileycustomwrap.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/smileycustomwrap.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -14,7 +14,7 @@ * Description: smiely engine class * */ -#include + #include "smileymanager.h" #include "smileycustomwrap.h" @@ -51,12 +51,12 @@ customWrap->iPrevCodeIsSmiley = !iPlaceHolder; customWrap->iPlaceHolder = EFalse; } - else if ( ( iPrevCodeIsSmiley || iPlaceHolder ) && aCode == CAknSmileyManager::KCompensateChar ) + else if ( ( iPrevCodeIsSmiley || iPlaceHolder ) && aCode == CSmileyManager::KCompensateChar ) { breakClass = MTmCustom::EClLineBreakClass; customWrap->iPrevCodeIsSmiley = EFalse; } - else if ( aCode == CAknSmileyManager::KPlaceHolder ) + else if ( aCode == CSmileyManager::KPlaceHolder ) { breakClass = MTmCustom::EB2LineBreakClass; customWrap->iPlaceHolder = ETrue; diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/smileymanager.cpp --- a/uifw/EikStd/coctlsrc/smileymanager.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/smileymanager.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -18,7 +18,6 @@ #include #include #include -#include #include "smileymodel.h" #include "smileyinforeader.h" @@ -218,8 +217,7 @@ // TBool CSmileyManager::IsSmileyCode( TText aCode ) { - return ( aCode >= CAknSmileyManager::KSmileyCodeMin && - aCode <= CAknSmileyManager::KSmileyCodeMax ); + return ( aCode >= KSmileyCodeMin && aCode <= KSmileyCodeMax ); } // --------------------------------------------------------------------------- diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/coctlsrc/smileymodel.cpp --- a/uifw/EikStd/coctlsrc/smileymodel.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/coctlsrc/smileymodel.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -15,7 +15,8 @@ * */ -#include +//#include + #include "smileymanager.h" #include "smileymodel.h" @@ -204,8 +205,8 @@ // void CSmileyModel::AddSimleyL( CSmileyInfo& aInfo ) { - if ( aInfo.iImageInfo.iCode < CAknSmileyManager::KSmileyCodeMin || - aInfo.iImageInfo.iCode > CAknSmileyManager::KSmileyCodeMax || + if ( aInfo.iImageInfo.iCode < CSmileyManager::KSmileyCodeMin || + aInfo.iImageInfo.iCode > CSmileyManager::KSmileyCodeMax || aInfo.iStrArray.Count() == 0 ) { return; @@ -382,11 +383,11 @@ TInt len( iLinkArray[linkIndex].iStrLength ); TInt imageIndex( iLinkArray[linkIndex].iImageIndex ); aText[aDocPos] = iImageInfoArray[imageIndex].iCode; - aText[aDocPos + 1] = CAknSmileyManager::KCompensateChar; + aText[aDocPos + 1] = CSmileyManager::KCompensateChar; const TInt KThirdIndex = 2; for ( TInt i( KThirdIndex ); i < len; i++ ) { - aText[i + aDocPos] = CAknSmileyManager::KPlaceHolder; + aText[i + aDocPos] = CSmileyManager::KPlaceHolder; } } @@ -446,14 +447,8 @@ while(pos > 0) { const TUint16 word = aText[--pos]; - // Since in most cases, URL is comprised of ASCII characters, - // so if there is a character out of the ASCII printable characters, - // we can stop the search. - const TInt KMinPrintableAscIIChar( 0x21 ); // excluding space - const TInt KMaxPrintableAscIIChar( 0x7e ); - if( word < KMinPrintableAscIIChar || word > KMaxPrintableAscIIChar ) + if(word == ' ' || word == 0x2029) { - pos++; // make the string begin with printable character. break; } } @@ -467,22 +462,7 @@ if(KErrNotFound != pos) { return ETrue; - } - else - { - // Although the string doesn't contain '://', it is also considered - // as an URL if it contains 'www.'. - HBufC* fieldTextBuf( field.Alloc() ); - if ( fieldTextBuf ) - { - TPtr fieldText( fieldTextBuf->Des() ); - // Use lower case for search to avoid case sensitive mismatch. - fieldText.LowerCase(); - TBool result( fieldText.Find( _L("www.") ) != KErrNotFound ); - delete fieldTextBuf; - return result; - } - } + } } return EFalse; diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/dlgsrc/EIKDIALG.CPP --- a/uifw/EikStd/dlgsrc/EIKDIALG.CPP Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/dlgsrc/EIKDIALG.CPP Wed Oct 13 14:50:15 2010 +0300 @@ -2077,7 +2077,10 @@ GfxTransEffect::NotifyExternalState(ECaptureComponentsAbort, (const TDesC8*)this); GfxTransEffect::Abort(this); } - + + // Draw again in cast any content change in OkToExitL + DrawDeferred(); + _AKNTRACE("CEikDialog::TryExitL return with OkToExitL false"); return; } @@ -2462,19 +2465,16 @@ if ( !isForm ) { SizeChanged(); - } - - if( iPageSelector ) - { - TInt lastPage = ( iPageSelector->PageContainer()->NumPages() - 1 ); - TInt pageIndex = 0; - CEikDialogPage* page( NULL ); - - while ( pageIndex++ <= lastPage ) - { - page = iPageSelector->PageContainer()->Page( pageIndex ); - page->HandleResourceChange( KEikDynamicLayoutVariantSwitch ); - } + + TInt lastPage = ( iPageSelector->PageContainer()->NumPages() - 1 ); + TInt pageIndex = 0; + CEikDialogPage* page; + + while ( pageIndex++ <= lastPage ) + { + page = iPageSelector->PageContainer()->Page( pageIndex ); + page->HandleResourceChange( KEikDynamicLayoutVariantSwitch ); + } } if (iExtension) diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/dlgsrc/EIKDLG.MMP --- a/uifw/EikStd/dlgsrc/EIKDLG.MMP Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/dlgsrc/EIKDLG.MMP Wed Oct 13 14:50:15 2010 +0300 @@ -73,7 +73,7 @@ LIBRARY avkon.lib LIBRARY form.lib LIBRARY fepbase.lib -LIBRARY CdlEngine.lib +LIBRARY cdlengine.lib LIBRARY gdi.lib LIBRARY aknskins.lib LIBRARY fbscli.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/dlgsrc/EIKDPAGE.CPP --- a/uifw/EikStd/dlgsrc/EIKDPAGE.CPP Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/dlgsrc/EIKDPAGE.CPP Wed Oct 13 14:50:15 2010 +0300 @@ -1384,38 +1384,6 @@ } } - // If control height is greater then screen. Make sure that edwin's cursor is visible - if (controlType == EEikCtEdwin && controlHeight > Rect().Height()) - { - CEikEdwin* edwin = dynamic_cast(capCtrl->iControl); - if (edwin) - { - TInt pos = edwin->CursorPos(); - TRect linerect; - TRAP_IGNORE( linerect = edwin->TextLayout()->GetLineRectL(pos, pos) ); - - TPoint capctrlpos = capCtrl->Position(); - TPoint edwinpos = edwin->Position(); - if (edwinpos.iY - capctrlpos.iY + (linerect.iTl.iY + linerect.iBr.iY)/2 > Rect().Height()/2) // cursor not fully visible - { - TInt offset = edwinpos.iY - capctrlpos.iY + (linerect.iTl.iY + linerect.iBr.iY)/2 - Rect().Height()/2; - if (topYPosOfControlWhichMustBeViewable + offset + Rect().Height() <= bottomYPosOfControlWhichMustBeViewable) - { - topYPosOfControlWhichMustBeViewable += offset; - bottomYPosOfControlWhichMustBeViewable = topYPosOfControlWhichMustBeViewable + Rect().Height(); - } - else - { - topYPosOfControlWhichMustBeViewable = bottomYPosOfControlWhichMustBeViewable - Rect().Height(); - } - } - else - { - bottomYPosOfControlWhichMustBeViewable = topYPosOfControlWhichMustBeViewable + Rect().Height(); - } - } - } - SetDataPosition( topYPosOfControlWhichMustBeViewable, bottomYPosOfControlWhichMustBeViewable, aForceResize ); if ( aLine != iLastExposedLine ) @@ -1969,10 +1937,9 @@ AknLayoutScalable_Avkon::listscroll_form_pane(), AknLayoutScalable_Avkon::scroll_pane_cp8()); - //Using Rect() instead of main pane rect for supporting partial input mode. - //TRect scrollBarParent( MainPane().Size() ); - AknLayoutUtils::LayoutVerticalScrollBar(iPageContainer->ScrollBar(), Rect(), layout.LayoutLine()); - + TRect scrollBarParent( MainPane().Size() ); + + AknLayoutUtils::LayoutVerticalScrollBar(iPageContainer->ScrollBar(), scrollBarParent, layout.LayoutLine()); if(!ScbState() && iCurrentLine!=-1 && iCurrentLine < iLines->Count() ) { CEikCaptionedControl *ctrl = (*iLines)[iCurrentLine]; @@ -2245,8 +2212,6 @@ { ExposeLine( iCurrentLine, ETrue ); } - TRAP_IGNORE( RecordLinesL() ); - DrawDeferred(); break; case KAknMessageFocusLost: @@ -2262,15 +2227,6 @@ ShowFocus( EFalse, ETrue ); } } - //Stop physics and synchronize the page to reset KS - //when page losing foreground. - if ( IsEditable() && iExtension->iScrolling - && iPhysics->OngoingPhysicsAction() == - CAknPhysics::EAknPhysicsActionDragging ) - { - iPhysics->Stop(); - Synchronize(); - } break; default: @@ -3213,7 +3169,7 @@ if ( ( touchedLine < iLines->Count() ) && ( touchedLine != iCurrentLine ) ) { - TRAP_IGNORE( (*iLines)[touchedLine]->ActivateL() ); + (*iLines)[touchedLine]->ActivateL(); if ( LineIsFocusable( touchedLine ) ) { @@ -4453,15 +4409,32 @@ iPageSelector = aPageSelector; } -void CEikDialogPageContainer::SetPageFormSized(const TRect& aRect) +void CEikDialogPageContainer::SetPageFormSized() { iForm = ETrue; // // Form layout - // + // + + /** Dialog page container and page have the same size */ + TRect mainPaneRect; + AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, mainPaneRect ); + mainPaneRect = TRect( mainPaneRect.Size() ); // Moving to point (0, 0) + TAknLayoutRect formPaneLt; + formPaneLt.LayoutRect( mainPaneRect, AknLayoutScalable_Avkon::listscroll_form_pane().LayoutLine() ); + formPaneLt.LayoutRect( formPaneLt.Rect(), AknLayoutScalable_Avkon::list_form_gen_pane().LayoutLine() ); - SetRect(aRect); + // + // End of form layout + // + + if ( formPaneLt.Rect() != Rect() ) + { + // TODO: use static method to do variation between traditional scrolling and panning when available + //SetRect( formPaneLt.Rect() ); + SetRect( mainPaneRect ); + } /** Only forms have line highlight animations. Animation creation is delayed * here. diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/dlgsrc/EIKDPSEL.CPP --- a/uifw/EikStd/dlgsrc/EIKDPSEL.CPP Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/dlgsrc/EIKDPSEL.CPP Wed Oct 13 14:50:15 2010 +0300 @@ -592,7 +592,7 @@ if ( iIsForm ) { - iPageContainer->SetPageFormSized(Rect()); + iPageContainer->SetPageFormSized(); } else { diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/srvuiinc/eikkeysoundserver.h --- a/uifw/EikStd/srvuiinc/eikkeysoundserver.h Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/srvuiinc/eikkeysoundserver.h Wed Oct 13 14:50:15 2010 +0300 @@ -103,13 +103,9 @@ TInt Preference(); TVolumeSetting Volume(); virtual void DoPlay() = 0; - TBool IsWaittingPlay(); - void SetDestroyAfterPlay(TBool aDestroyAfterPlay); protected: TInt iPriority; TInt iPreference; - TBool iWaittingPlay; - TBool iDestroyAfterPlay; TVolumeSetting iVolume; }; diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/srvuisrc/EIKSRVUI.MMP --- a/uifw/EikStd/srvuisrc/EIKSRVUI.MMP Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/srvuisrc/EIKSRVUI.MMP Wed Oct 13 14:50:15 2010 +0300 @@ -71,17 +71,17 @@ LIBRARY mediaclientaudio.lib LIBRARY eiksrv.lib LIBRARY avkon.lib -LIBRARY Eikalert.lib +LIBRARY eikalert.lib LIBRARY apfile.lib -LIBRARY CdlEngine.lib -LIBRARY CommonEngine.lib +LIBRARY cdlengine.lib +LIBRARY commonengine.lib LIBRARY aknnotify.lib LIBRARY aknskins.lib LIBRARY fbscli.lib LIBRARY featmgr.lib LIBRARY aknicon.lib LIBRARY egul.lib -LIBRARY AknLayout2Scalable.lib +LIBRARY aknlayout2scalable.lib LIBRARY oodmonitor.lib LIBRARY uiklaf.lib LIBRARY viewcli.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/EikStd/srvuisrc/eikkeysoundserver.cpp --- a/uifw/EikStd/srvuisrc/eikkeysoundserver.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/EikStd/srvuisrc/eikkeysoundserver.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -88,7 +88,6 @@ TInt CEikKeySoundServer::LaunchServer(TThreadId& aThreadId) { - LOGTEXT(_L("CEikKeySoundServer::LaunchServer")); // First, check that ther server isn't already running. TFindServer findServer(__KEYSOUND_SERVER_NAME); TFullName name; @@ -193,7 +192,6 @@ void CEikKeySoundServer::ConstructL() { - LOGTEXT(_L("CEikKeySoundServer::ConstructL")); iInit = EFalse; iSidList = new(ELeave)CArrayFixFlat(KAknSoundInfoMapGranularity); iSoundList = new(ELeave)CArrayPtrFlat(KAknSoundInfoMapGranularity); @@ -244,7 +242,6 @@ CEikKeySoundServer::~CEikKeySoundServer() { - LOGTEXT(_L("CEikKeySoundServer::~CEikKeySoundServer")); if (iProfilesNotifyHandler) { iProfilesNotifyHandler->StopListening(); @@ -267,7 +264,6 @@ CSession2* CEikKeySoundServer::NewSessionL(const TVersion& aVersion, const RMessage2& /*aMessage*/) const { - LOGTEXT(_L("CEikKeySoundServer::NewSessionL")); TVersion ver(KKeySoundServMajorVN, KKeySoundServMinorVN, KKeySoundServBuildVN); if (!User::QueryVersionSupported(ver, aVersion)) { @@ -294,7 +290,6 @@ void CEikKeySoundServer::PlaySid(TInt aSid, TBool aPlaySelf) { - LOGTEXT1(_L("CEikKeySoundServer::PlaySid aSid: %d"), aSid); if (aSid == EAvkonSIDWarningTone && iWarningToneEnabled == 0) { // Don't play warning tone, when the warning tone is disabled in setting. @@ -389,8 +384,6 @@ void CEikKeySoundServer::SetDisabledScanCode( TInt aScanCode ) { - LOGTEXT1(_L("CEikKeySoundServer::SetDisabledScanCode aScanCode: %d"), - aScanCode); iDisabledScanCode = aScanCode; } @@ -434,8 +427,6 @@ CEikKeySoundSession::~CEikKeySoundSession() { - LOGTEXT1(_L("CEikKeySoundSession::~CEikKeySoundSession iClientUid %d"), - iClientUid); RemoveSids(iClientUid); if (iHasLockedContext) { @@ -446,7 +437,6 @@ } if (iOwnsDefaultSounds) { - LOGTEXT(_L("CEikKeySoundSession::~CEikKeySoundSession OwnsDefaultSounds")); RemoveSids(0); iServer->iInit = EFalse; } @@ -480,8 +470,6 @@ void CEikKeySoundSession::ServiceL(const RMessage2& aMessage) { - LOGTEXT1(_L("CEikKeySoundSession::ServiceL aMessage: %d"), - aMessage.Function()); if (aMessage.Function() == EKeySoundServerPlayKey) { TInt scancode = aMessage.Int0() & 0xff; @@ -595,7 +583,7 @@ { TInt uid = aMessage.Int0(); TInt size = aMessage.Int1(); - LOGTEXT1(_L("CEikKeySoundSession::AddSoundIdBufferL uid: %d"), uid); + // CBufFlat requires that size must be positive and not larger than KMaxTInt / 2. // Without this check the KeySoundServer could panic. if (size <= 0 || size >= ((KMaxTInt / 2) - KKeySoundServerBufExpandSize)) @@ -712,7 +700,6 @@ void CEikKeySoundSession::RemoveSids(TInt aUid) { - LOGTEXT1(_L("CEikKeySoundSession::RemoveSids aUid %d"), aUid); TUint uid = aUid << 16; if (!iServer->iSidList) { @@ -743,18 +730,7 @@ if (!duplicateFound) { // Remove sound at this position - if(id.iSoundInfo->IsWaittingPlay()) - { - LOGTEXT1(_L("CEikKeySoundSession::RemoveSids DestroyAfterplay : %d"), - (TInt)id.iSoundInfo ); - id.iSoundInfo->SetDestroyAfterPlay(ETrue); - } - else - { - LOGTEXT1(_L("CEikKeySoundSession::RemoveSids Destroy : %d"), - (TInt)id.iSoundInfo ); - delete id.iSoundInfo; - } + delete id.iSoundInfo; if (iServer->iSoundList) { iServer->iSoundList->Delete(ii); @@ -824,7 +800,6 @@ void CEikKeySoundSession::AddToneSidL(const TAknSoundID& aSoundID, CAknToneSoundInfo* aSoundInfo) { - LOGTEXT(_L("CEikKeySoundSession::AddToneSidL")); aSoundInfo->InitL(); TKeyArrayFix sidKey(_FOFF(TAknSoundID, iSid), ECmpTUint); @@ -843,7 +818,6 @@ void CEikKeySoundSession::AddSequenceSidL(const TAknSoundID& aSoundID, CAknSequenceSoundInfo* aSoundInfo) { - LOGTEXT(_L("CEikKeySoundSession::AddSequenceSidL")); aSoundInfo->InitL(); TKeyArrayFix sidKey(_FOFF(TAknSoundID, iSid), ECmpTUint); @@ -863,7 +837,6 @@ void CEikKeySoundSession::AddFileSidL(const TAknSoundID& aSoundID, CAknFileSoundInfo* aSoundInfo, const TDesC& aFileName) { - LOGTEXT(_L("CEikKeySoundSession::AddFileSidL")); aSoundInfo->InitL(aFileName, NULL); TKeyArrayFix sidKey(_FOFF(TAknSoundID, iSid), ECmpTUint); @@ -887,8 +860,6 @@ { iPriority = aPriority; iPreference = aPreference; - iWaittingPlay = EFalse; - iDestroyAfterPlay = EFalse; iVolume = ESoundVolume9; // default to loudest } @@ -908,17 +879,6 @@ return iVolume; } -TBool CEikSoundInfo::IsWaittingPlay() - { - LOGTEXT1(_L("CEikSoundInfo::IsWaittingPlay : %d"), iWaittingPlay); - return iWaittingPlay; - } - -void CEikSoundInfo::SetDestroyAfterPlay(TBool aDestroyAfterPlay) - { - iDestroyAfterPlay = aDestroyAfterPlay; - } - // ================================== // CAknSynthSoundInfo implementation. // ================================== @@ -1170,7 +1130,7 @@ delete iAudioPlayer; } -void CAknFileSoundInfo::InitL(const TDesC& aFileName, CMdaServer* /*aMdaServer*/) +void CAknFileSoundInfo::InitL(const TDesC& aFileName, CMdaServer* aMdaServer) { LOGTEXT(_L("CAknFileSoundInfo::InitL() - Filename:")); LOGTEXT(aFileName); @@ -1188,7 +1148,6 @@ // Create audio player. DoPlay() will be called in all circumstances. iAudioPlayer = CMdaAudioPlayerUtility::NewFilePlayerL(iFileName, *this, iPriority,(TMdaPriorityPreference)iPreference ); - iWaittingPlay =ETrue; LOGTEXT(_L(" CAknFileSoundInfo::PlayL() - Exit")); } @@ -1218,7 +1177,6 @@ delete iAudioPlayer; iAudioPlayer = NULL; - iWaittingPlay = EFalse; } } @@ -1245,7 +1203,6 @@ delete iAudioPlayer; iAudioPlayer = NULL; iPrepared = EFalse; - iWaittingPlay = EFalse; } } @@ -1312,19 +1269,12 @@ void CAknFileSoundInfo::MapcPlayComplete(TInt /*aError*/) { LOGTEXT(_L("CAknFileSoundInfo::MapcPlayComplete()")); - LOGTEXT1(_L(" aError:%d"), aError); + iPlaying = EFalse; - iWaittingPlay = EFalse; delete iAudioPlayer; iAudioPlayer = NULL; iPrepared = EFalse; - if(iDestroyAfterPlay) - { - LOGTEXT1(_L("CAknFileSoundInfo::MapcPlayComplete DestroyAfterPlay : %d"), - TInt(this)); - delete this; - } } // End of file diff -r 85902f042028 -r a5e7a4f63858 uifw/eikctl/group/eikctl.mmp --- a/uifw/eikctl/group/eikctl.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/eikctl/group/eikctl.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -88,18 +88,18 @@ LIBRARY insock.lib LIBRARY fepbase.lib LIBRARY avkon.lib -LIBRARY CdlEngine.lib +LIBRARY cdlengine.lib LIBRARY aknskins.lib LIBRARY numberconversion.lib LIBRARY aknpictograph.lib LIBRARY aknicon.lib -LIBRARY aknlayout2.lib +LIBRARY AknLayout2.lib LIBRARY AknLayout2Scalable.lib LIBRARY centralrepository.lib -LIBRARY lbs.lib +LIBRARY Lbs.lib LIBRARY bitgdi.lib LIBRARY cenrepnotifhandler.lib -LIBRARY CommonEngine.lib +LIBRARY commonengine.lib #ifdef RD_UI_TRANSITION_EFFECTS_LIST LIBRARY aknlistloadertfx.lib #endif //RD_UI_TRANSITION_EFFECTS_LIST @@ -109,7 +109,7 @@ LIBRARY aknphysics.lib // For trace log -LIBRARY aknnotify.lib +LIBRARY AknNotify.lib DEFFILE EIKCTL.DEF START WINS diff -r 85902f042028 -r a5e7a4f63858 uifw/eikctl/src/EIKCLBD.CPP --- a/uifw/eikctl/src/EIKCLBD.CPP Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/eikctl/src/EIKCLBD.CPP Wed Oct 13 14:50:15 2010 +0300 @@ -2619,11 +2619,12 @@ TBool useOverrideColor = view->ItemDrawer()->Flags() & CListItemDrawer::EUseOverrideSkinTextColor; if ( AknsUtils::AvkonSkinEnabled() && !useOverrideColor ) { - if ( iExtension->iTextColor != NULL ) + if (iExtension->iTextColor != NULL) { aGc.SetPenColor(iExtension->iTextColor); } - if ( aHighlight && iExtension->iHighlightedTextColor != NULL ) + + if (aHighlight && iExtension->iHighlightedTextColor != NULL) { aGc.SetPenColor(iExtension->iHighlightedTextColor); } @@ -2840,8 +2841,12 @@ & CListItemDrawer::EMarkingModeEnabled && !aProperties.IsSelectionHidden() && iExtension->iMarkingIconArray && +#ifdef RD_TOUCH2_MARKING iExtension->iMarkingIconArray->Count() == - KMarkingModeIconArraySize ) + KMarkingModeIconArraySize ) +#else + iExtension->iMarkingIconArray->Count() == 2 ) +#endif // RD_TOUCH2_MARKING { if ( AknLayoutUtils::LayoutMirrored() ) { diff -r 85902f042028 -r a5e7a4f63858 uifw/eikctl/src/EIKMFNE.CPP --- a/uifw/eikctl/src/EIKMFNE.CPP Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/eikctl/src/EIKMFNE.CPP Wed Oct 13 14:50:15 2010 +0300 @@ -151,7 +151,7 @@ { } -void CEikTimeEditorExtension::HandleInputCapabilitiesEventL( TInt aEvent, TAny* /*aParams*/ ) +void CEikTimeEditorExtension::HandleInputCapabilitiesEventL( TInt aEvent, TAny* aParams ) { switch ( aEvent ) { @@ -213,7 +213,7 @@ { } -void CEikTimeAndDateEditorExtension::HandleInputCapabilitiesEventL( TInt aEvent, TAny* /*aParams*/ ) +void CEikTimeAndDateEditorExtension::HandleInputCapabilitiesEventL( TInt aEvent, TAny* aParams ) { switch ( aEvent ) { @@ -2053,7 +2053,6 @@ iExtension->iDisablePenInput = !( iExtension->iFingerSupport ); iExtension->iFingerParam = aFeatureParam; iExtension->iHighlightAll = ( iExtension->iFingerSupport && - !iExtension->iTouchActivated && aFeatureParam == EnableWithAllHighlight ); } else @@ -4090,22 +4089,6 @@ EXPORT_C void CEikTimeEditor::HandlePointerEventL(const TPointerEvent& aPointerEvent) { CEikTTimeEditor::HandlePointerEventL(aPointerEvent); - // If touch input is disabled or qwerty key board is opened, AM/PM will change when - // user taps at AM/PM filed; else touch input will be opened. - if ( aPointerEvent.iType == TPointerEvent::EButton1Up && - ( ( iExtension->iExtendedInputCapabilities->Capabilities() & - CAknExtendedInputCapabilities::EInputEditorQwertyInputActive ) || - iExtension->iDisablePenInput || iExtension->iPartialScreenInput ) ) - { - TAmPmName amName( EAm ); - TAmPmName pmName( EPm ); - if ( !IsUninitialised() && - ( !iFields[iCurrentField]->FieldText().Compare( amName ) || - !iFields[iCurrentField]->FieldText().Compare( pmName ) ) ) - { - ChangeAmPm(); - } - } } EXPORT_C void* CEikTimeEditor::ExtensionInterface( TUid /*aInterface*/ ) @@ -4499,22 +4482,6 @@ EXPORT_C void CEikTimeAndDateEditor::HandlePointerEventL(const TPointerEvent& aPointerEvent) { CEikTTimeEditor::HandlePointerEventL(aPointerEvent); - // If touch input is disabled or qwerty key board is opened, AM/PM will change when - // user taps at AM/PM filed; else touch input will be opened. - if ( aPointerEvent.iType == TPointerEvent::EButton1Up && - ( ( iExtension->iExtendedInputCapabilities->Capabilities() & - CAknExtendedInputCapabilities::EInputEditorQwertyInputActive ) || - iExtension->iDisablePenInput || iExtension->iPartialScreenInput ) ) - { - TAmPmName amName( EAm ); - TAmPmName pmName( EPm ); - if ( !IsUninitialised() && - ( !iFields[iCurrentField]->FieldText().Compare( amName ) || - !iFields[iCurrentField]->FieldText().Compare( pmName ) ) ) - { - ChangeAmPm(); - } - } } EXPORT_C void* CEikTimeAndDateEditor::ExtensionInterface( TUid /*aInterface*/ ) diff -r 85902f042028 -r a5e7a4f63858 uifw/eikctl/src/EIKSECED.CPP --- a/uifw/eikctl/src/EIKSECED.CPP Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/eikctl/src/EIKSECED.CPP Wed Oct 13 14:50:15 2010 +0300 @@ -283,15 +283,6 @@ delete listener; } #endif - // When destruct secret editor, inform FEP that secret editor has been destroyed , - // so FEP can get opportunity to do some clean work, e.g. closing opened SCT dialog. - if ( iFepState ) - { - TRAP_IGNORE( - static_cast( iFepState )->ReportAknEdStateEventL( - MAknEdStateObserver::EAknEdwinDestroy ) - ); - } delete iInlineEditText; delete iFepState; delete iTimer; @@ -951,8 +942,7 @@ editorState->SetFlags( EAknEditorFlagNoLRNavigation | EAknEditorFlagLatinInputModesOnly | EAknEditorFlagNoT9 | - EAknEditorFlagUseSCTNumericCharmap | - EAknEditorFlagAvkonSecretEditor ); + EAknEditorFlagUseSCTNumericCharmap ); editorState->SetDefaultInputMode(EAknEditorSecretAlphaInputMode); editorState->SetCurrentInputMode(EAknEditorSecretAlphaInputMode); @@ -1218,7 +1208,7 @@ TInt textWidth( iRevealSecretText ? iFont->TextWidthInPixels( *iSecCharArr ) : iFont->CharWidthInPixels( KSecretChar ) * pos ); - TInt x( 0 ); + TInt x; if ( iExtension ) { if ( iAlign == CGraphicsContext::ELeft ) @@ -1288,11 +1278,11 @@ TInt flags( edwinState->Flags() ); if ( aEnable ) { - flags |= EAknEditorFlagTextCursorVisible; + flags &= ~EEikEdwinAvkonDisableCursor; } else { - flags &= ~EAknEditorFlagTextCursorVisible; + flags |= EEikEdwinAvkonDisableCursor; } edwinState->SetFlags( flags ); } diff -r 85902f042028 -r a5e7a4f63858 uifw/ganes/group/bld.inf --- a/uifw/ganes/group/bld.inf Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/ganes/group/bld.inf Wed Oct 13 14:50:15 2010 +0300 @@ -46,7 +46,6 @@ -c32,8 qgn_graf_mup_adtl_reorder_up\ -c32,8 qgn_graf_mup_adtl_reorder_updown\ -c32,8 qgn_prop_checkbox_on\ - -c32,8 qgn_prop_checkbox_off\ -c32,8 qgn_indi_button_exit_fs\ -c32,8 qgn_indi_media_thumbnail END diff -r 85902f042028 -r a5e7a4f63858 uifw/ganes/group/ganes.mmp --- a/uifw/ganes/group/ganes.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/ganes/group/ganes.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -73,20 +73,20 @@ MW_LAYER_SYSTEMINCLUDE LIBRARY aknicon.lib -LIBRARY aknlayout2.lib +LIBRARY AknLayout2.lib LIBRARY AknLayout2Scalable.lib LIBRARY aknnotify.lib LIBRARY aknphysics.lib -LIBRARY aknskins.lib +LIBRARY aknskins.lib LIBRARY aknskinsrv.lib LIBRARY akntouchgesturefw.lib LIBRARY apparc.lib LIBRARY avkon.lib LIBRARY bitgdi.lib LIBRARY CdlEngine.lib -LIBRARY cenrepnotifhandler.lib +LIBRARY CenrepNotifHandler.lib LIBRARY centralrepository.lib -LIBRARY CommonEngine.lib +LIBRARY commonengine.lib LIBRARY cone.lib LIBRARY efsrv.lib LIBRARY egul.lib @@ -97,7 +97,7 @@ LIBRARY euser.lib LIBRARY fbscli.lib LIBRARY fepbase.lib -LIBRARY featmgr.lib +LIBRARY FeatMgr.lib LIBRARY gdi.lib LIBRARY imageconversion.lib LIBRARY libOpenVG.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/ganes/inc/HgIndicatorManager.h --- a/uifw/ganes/inc/HgIndicatorManager.h Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/ganes/inc/HgIndicatorManager.h Wed Oct 13 14:50:15 2010 +0300 @@ -45,15 +45,14 @@ const TRect& aRect, TInt aFlags, TAknWindowComponentLayout aFirstIndicatorLayout, - TAknWindowComponentLayout aSecondIndicatorLayout, - TBool aMarkingMode + TAknWindowComponentLayout aSecondIndicatorLayout ) const; TBool DrawIndicator( CWindowGc& aGc, TAknLayoutRect& aRect, TInt aFlags, - TBool& aMemIndicator + TBool& aMemIndicator ) const; void InitIconL( @@ -91,7 +90,6 @@ CGulIcon* iDrmExpIcon; // icon for expired drm rights indicator CGulIcon* iVideoIcon; // icon for video indicator CGulIcon* iMarkIcon; // Icon for selection marking - CGulIcon* iMarkIconOff; // Icon for selection marking, the off state CGulIcon* iMmcIcon; // Mmc indicator icon CGulIcon* iPlaybackIndicatorIcon; // Playback indicator icon CGulIcon* iPauseIndicatorIcon; // Playback pause indicator icon diff -r 85902f042028 -r a5e7a4f63858 uifw/ganes/inc/HgScrollbar.h --- a/uifw/ganes/inc/HgScrollbar.h Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/ganes/inc/HgScrollbar.h Wed Oct 13 14:50:15 2010 +0300 @@ -116,20 +116,17 @@ TRect iScrollbarRect; TRect iNaviRect; - TPoint iHandlePosition; //exists only for CHgScrollbar::HandlePosition() - TReal iHandlePos; - TReal iPageSize; - TInt iScrollLength; - TSize iHandleSize; - + TPoint iHandlePosition; TPoint iPrevDrag; TSize iTotalSize; TSize iViewSize; + TSize iHandleSize; TBool iLandscapeScrolling; TBool iDragging; TBool iHandler; TBool iStatic; + TInt iScrollLength; TInt iTotalLength; }; diff -r 85902f042028 -r a5e7a4f63858 uifw/ganes/inc/HgVgEGL.h --- a/uifw/ganes/inc/HgVgEGL.h Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/ganes/inc/HgVgEGL.h Wed Oct 13 14:50:15 2010 +0300 @@ -64,8 +64,6 @@ CFbsBitmap* GetSurfaceToBitmap(const TRect& aRect, TBool aLandscape = EFalse) const; - static TBool EglInitialized(); - protected: // Constructors CHgVgEGL(); diff -r 85902f042028 -r a5e7a4f63858 uifw/ganes/src/HgDoubleGraphicList.cpp --- a/uifw/ganes/src/HgDoubleGraphicList.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/ganes/src/HgDoubleGraphicList.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -206,8 +206,7 @@ aRect, item->Flags(), iLayoutData->FirstIndicatorLayout(), - iLayoutData->SecondIndicatorLayout(), - iFlags & EHgScrollerSelectionMode || iSelectionMode != ENoSelection ); + iLayoutData->SecondIndicatorLayout() ); } // ----------------------------------------------------------------------------- diff -r 85902f042028 -r a5e7a4f63858 uifw/ganes/src/HgDoubleTextList.cpp --- a/uifw/ganes/src/HgDoubleTextList.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/ganes/src/HgDoubleTextList.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -171,8 +171,7 @@ aRect, item->Flags(), iLayoutData->FirstIndicatorLayout(), - iLayoutData->SecondIndicatorLayout(), - iFlags & EHgScrollerSelectionMode || iSelectionMode != ENoSelection ); + iLayoutData->SecondIndicatorLayout() ); } // ----------------------------------------------------------------------------- diff -r 85902f042028 -r a5e7a4f63858 uifw/ganes/src/HgGrid.cpp --- a/uifw/ganes/src/HgGrid.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/ganes/src/HgGrid.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -285,8 +285,7 @@ aRect, item->Flags(), iLayoutData->FirstIndicatorLayout(), - iLayoutData->SecondIndicatorLayout(), - iFlags & EHgScrollerSelectionMode || iSelectionMode != ENoSelection ); + iLayoutData->SecondIndicatorLayout() ); } // ----------------------------------------------------------------------------- diff -r 85902f042028 -r a5e7a4f63858 uifw/ganes/src/HgIndicatorManager.cpp --- a/uifw/ganes/src/HgIndicatorManager.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/ganes/src/HgIndicatorManager.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -47,7 +47,6 @@ delete iPlaybackIndicatorIcon; delete iMmcIcon; delete iMarkIcon; - delete iMarkIconOff; delete iPauseIndicatorIcon; delete iBrokenPlaylistIcon; delete iBrokenTrackIcon; @@ -110,15 +109,9 @@ // Skinned icons // Mark icon - InitIconL( iMarkIcon, KAknsIIDQgnPropCheckboxOn, - EMbmGanesQgn_prop_checkbox_on, - EMbmGanesQgn_prop_checkbox_on_mask, - aIndicatorSize ); - - // Mark icon, off state - InitIconL( iMarkIconOff, KAknsIIDQgnPropCheckboxOff, - EMbmGanesQgn_prop_checkbox_off, - EMbmGanesQgn_prop_checkbox_off_mask, + InitIconL( iMarkIcon, KAknsIIDQgnPropSubMarked, + EMbmGanesQgn_prop_sub_marked, + EMbmGanesQgn_prop_sub_marked_mask, aIndicatorSize ); // DRM valid icon @@ -193,8 +186,7 @@ const TRect& aRect, TInt aFlags, TAknWindowComponentLayout aFirstIndicatorLayout, - TAknWindowComponentLayout aSecondIndicatorLayout, - TBool aMarkingMode + TAknWindowComponentLayout aSecondIndicatorLayout ) const { TAknLayoutRect secondIndicator; @@ -213,12 +205,6 @@ ++indicatorsDrawn; rect = firstIndicator; } - else if(aMarkingMode) - { - rect.DrawImage(aGc, iMarkIconOff->Bitmap(), iMarkIconOff->Mask()); - ++indicatorsDrawn; - rect = firstIndicator; - } if( DrawIndicator(aGc, rect, aFlags, memIndicator) ) { @@ -248,7 +234,7 @@ CWindowGc& aGc, TAknLayoutRect& aRect, TInt aFlags, - TBool& aMemIndicator + TBool& aMemIndicator ) const { TBool ret = EFalse; diff -r 85902f042028 -r a5e7a4f63858 uifw/ganes/src/HgScrollbar.cpp --- a/uifw/ganes/src/HgScrollbar.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/ganes/src/HgScrollbar.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -126,7 +126,6 @@ iViewSize = aViewSize; iLandscapeScrolling = aLandscapeScrolling; iHandlePosition.SetXY(0,0); - iHandlePos = 0.0; if(iLandscapeScrolling) { @@ -154,16 +153,16 @@ { if (AknLayoutUtils::LayoutMirrored()) { - iHandlePos = 1.0 - (TReal(aPosition.iX) / TReal(iTotalLength)); + iHandlePosition.iX = (iScrollLength) * (1.0 - aPosition.iX / TReal(iTotalLength)); } else { - iHandlePos = TReal(aPosition.iX) / TReal(iTotalLength); + iHandlePosition.iX = (iScrollLength) * (aPosition.iX / TReal(iTotalLength)); } } else { - iHandlePos = TReal(aPosition.iY) / TReal(iTotalLength); + iHandlePosition.iY = (iScrollLength) * (aPosition.iY / TReal(iTotalLength)); } CheckHandlePosition( EFalse ); } @@ -187,32 +186,15 @@ TBool ret = EFalse; // Quick and dirty hack, remove when logic for fetching the correct drag rect is available TRect dragArea( iScrollbarRect ); - if (iLandscapeScrolling) - { - dragArea.iBr.iY += KScrollAreaOffset; - dragArea.iTl.iY -= KScrollAreaOffset; - } - else - { - dragArea.iBr.iX += KScrollAreaOffset; - dragArea.iTl.iX -= KScrollAreaOffset; - } - + dragArea.iBr.iX += KScrollAreaOffset; + dragArea.iTl.iX -= KScrollAreaOffset; + // Start drag if( aEvent.iType == TPointerEvent::EButton1Down && dragArea.Contains(aEvent.iPosition)) { - TSize size = iHandleSize; - TRect handleRect; - if (iLandscapeScrolling) - { - size.iHeight += KScrollAreaOffset*2; - handleRect = TRect( dragArea.iTl + TPoint(iHandlePos*iScrollLength, 0), size ); - } - else - { - size.iWidth += KScrollAreaOffset*2; - handleRect = TRect( dragArea.iTl + TPoint(0, iHandlePos*iScrollLength), size ); - } + TSize size(iHandleSize); + size.iWidth += KScrollAreaOffset*2; + TRect handleRect( dragArea.iTl + iHandlePosition, size ); iDragging = handleRect.Contains( aEvent.iPosition ); iPrevDrag = aEvent.iPosition; iHandler = ret = ETrue; @@ -226,11 +208,11 @@ { if(iLandscapeScrolling) { - iHandlePos -= (iPrevDrag.iX - aEvent.iPosition.iX)/TReal(iScrollLength); + iHandlePosition.iX -= iPrevDrag.iX - aEvent.iPosition.iX; } else { - iHandlePos -= (iPrevDrag.iY - aEvent.iPosition.iY)/TReal(iScrollLength); + iHandlePosition.iY -= iPrevDrag.iY - aEvent.iPosition.iY; } CheckHandlePosition( !iStatic ); @@ -245,16 +227,9 @@ if(!iDragging) { TBool below = iLandscapeScrolling ? - aEvent.iPosition.iX > iHandlePos*iScrollLength - : aEvent.iPosition.iY > iHandlePos*iScrollLength; - if(below) - { - iHandlePos += iPageSize; - } - else - { - iHandlePos -= iPageSize; - } + aEvent.iPosition.iX > iHandlePosition.iX + : aEvent.iPosition.iY > iHandlePosition.iY; + iHandlePosition += below ? iHandleSize.AsPoint() : -iHandleSize.AsPoint(); } CheckHandlePosition( !iStatic ); iHandler = iDragging = EFalse; @@ -323,21 +298,19 @@ if(iLandscapeScrolling) { - if(iHandlePos < 0.0 ) - iHandlePos = 0.0; - if(iHandlePos > 1.0) - iHandlePos = 1; - - iHandlePosition.SetXY(iHandlePos*iScrollLength, 0); + iHandlePosition.iY = 0; + if(iHandlePosition.iX < 0 ) + iHandlePosition.iX = 0; + if(iHandlePosition.iX > iScrollLength) + iHandlePosition.iX = iScrollLength; } else { - if(iHandlePos < 0.0 ) - iHandlePos = 0.0; - if(iHandlePos > 1) - iHandlePos = 1.0; - - iHandlePosition.SetXY(0, iHandlePos*iScrollLength); + iHandlePosition.iX = 0; + if(iHandlePosition.iY < 0 ) + iHandlePosition.iY = 0; + if(iHandlePosition.iY > iScrollLength) + iHandlePosition.iY = iScrollLength; } if( aReportChange ) { @@ -346,16 +319,16 @@ { if (AknLayoutUtils::LayoutMirrored()) { - pos.iX += (1.0 - iHandlePos) * iTotalLength; + pos.iX += (1.0 - iHandlePosition.iX / TReal(iScrollLength)) * (iTotalLength); } else { - pos.iX += iHandlePos * iTotalLength; + pos.iX += (iHandlePosition.iX / TReal(iScrollLength)) * (iTotalLength); } } else { - pos.iY += iHandlePos * iTotalLength; + pos.iY += (iHandlePosition.iY / TReal(iScrollLength)) * (iTotalLength); } iObserver.ScrollBarPositionChanged( pos ); @@ -381,33 +354,28 @@ TReal xFactor = iScrollbarRect.Width()/TReal(iTotalSize.iWidth); TReal yFactor = iScrollbarRect.Height()/TReal(iTotalSize.iHeight); - - TReal handleSizeWidth = iViewSize.iWidth * xFactor; - TReal handleSizeHeight = iViewSize.iHeight * yFactor; + + iHandleSize = TSize ( iViewSize.iWidth * xFactor, iViewSize.iHeight * yFactor ); if(iLandscapeScrolling) { - iPageSize = TReal(iViewSize.iWidth) / TReal(iTotalSize.iWidth - (iTotalSize.iWidth % iViewSize.iWidth) ); - TReal min = 2 * handleSizeHeight; - if( handleSizeWidth < min ) + TInt min = 2*iHandleSize.iHeight; + if( iHandleSize.iWidth < min ) { - handleSizeWidth = min; + iHandleSize.iWidth = min; } - iScrollLength = TReal(iScrollbarRect.Width()) - handleSizeWidth; + iScrollLength = iScrollbarRect.Width() - iHandleSize.iWidth; } else { - iPageSize = TReal(iViewSize.iHeight) / TReal(iTotalSize.iHeight - (iTotalSize.iHeight % iViewSize.iHeight) ); - TReal min = 2 * handleSizeWidth; - if( handleSizeHeight < min ) + TInt min = 2*iHandleSize.iWidth; + if( iHandleSize.iHeight < min ) { - handleSizeHeight = min; + iHandleSize.iHeight = min; } - iScrollLength = TReal(iScrollbarRect.Height()) - handleSizeHeight; + iScrollLength = iScrollbarRect.Height() - iHandleSize.iHeight; } - iHandleSize = TSize(handleSizeWidth,handleSizeHeight); - delete iScrollbarHandle; iScrollbarHandle = NULL; delete iScrollbarHandleSelected; iScrollbarHandleSelected = NULL; diff -r 85902f042028 -r a5e7a4f63858 uifw/ganes/src/HgScroller.cpp --- a/uifw/ganes/src/HgScroller.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/ganes/src/HgScroller.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -15,6 +15,7 @@ * */ + // INCLUDE FILES #include @@ -240,9 +241,9 @@ if( iMarkingObserver ) { TRAP_IGNORE( iMarkingObserver->HandleMarkingL( aIndex, ETrue ) ); - } + } } - } + } } // ----------------------------------------------------------------------------- @@ -589,16 +590,9 @@ iPointerDown = ETrue; HandleDownEventL( aEvent ); - // Long tap is supported in marking mode only for an item that is marked. - const TBool validIndex = iSelectedIndex != KErrNotFound && - iSelectedIndex >= 0 && iSelectedIndex < iItems.Count(); - const TBool selectionMode = iFlags & EHgScrollerSelectionMode; - const TBool longTapEnabled = validIndex && (!selectionMode || - (selectionMode && iItems[iSelectedIndex]->Flags() & CHgItem::EHgItemFlagMarked)); - if( iDetector - && longTapEnabled - && !HasHighlight() + && iSelectedIndex != KErrNotFound + && !HasHighlight() && iActionMenu->InitMenuL() ) { iDetector->PointerEventL( aEvent ); @@ -891,7 +885,6 @@ iPointerDown = EFalse; iPanning = EFalse; - iEnterKeyHandled = EFalse; } // ----------------------------------------------------------------------------- @@ -1062,37 +1055,33 @@ iViewPosition = aNewPosition; iPhysics->StopPhysics(); - // show a letter popup only if we are currently dragging with scrollbar - if(iScrollbar && iScrollbar->IsDragging()) + if( iScrollBarType == EHgScrollerTimeStrip ) { - if( iScrollBarType == EHgScrollerTimeStrip ) + // Show first item's time. + TInt selectedItem = CurrentIndex(); + if( selectedItem >= 0 && selectedItem < iItems.Count() + && iItems[selectedItem]->Time().Int64() ) { - // Show first item's time. - TInt selectedItem = CurrentIndex(); - if( selectedItem >= 0 && selectedItem < iItems.Count() - && iItems[selectedItem]->Time().Int64() ) + TRAP_IGNORE( + iItems[selectedItem]->Time().FormatL( iPopupText1, KGanesMonthString ); + iItems[selectedItem]->Time().FormatL( iPopupText2, KGanesYearString ); + ) + // To display month and year correctly in arabic. + AknTextUtils::LanguageSpecificNumberConversion( iPopupText1 ); + AknTextUtils::LanguageSpecificNumberConversion( iPopupText2 ); + } + } + else if( iScrollBarType == EHgScrollerLetterStrip + || iScrollBarType == EHgScrollerLetterStripLite ) + { + TInt selectedItem = CurrentIndex(); + if( selectedItem >= 0 && selectedItem < iItems.Count() ) + { + if(iItems[selectedItem]->Title().Length()) { - TRAP_IGNORE( - iItems[selectedItem]->Time().FormatL( iPopupText1, KGanesMonthString ); - iItems[selectedItem]->Time().FormatL( iPopupText2, KGanesYearString ); - ) - // To display month and year correctly in arabic. - AknTextUtils::LanguageSpecificNumberConversion( iPopupText1 ); - AknTextUtils::LanguageSpecificNumberConversion( iPopupText2 ); - } - } - else if( iScrollBarType == EHgScrollerLetterStrip - || iScrollBarType == EHgScrollerLetterStripLite ) - { - TInt selectedItem = CurrentIndex(); - if( selectedItem >= 0 && selectedItem < iItems.Count() ) - { - if(iItems[selectedItem]->Title().Length()) - { - iPopupText1.Zero(); - iPopupText1.Append( iItems[selectedItem]->Title()[0] ); - iPopupText1.UpperCase(); - } + iPopupText1.Zero(); + iPopupText1.Append( iItems[selectedItem]->Title()[0] ); + iPopupText1.UpperCase(); } } } @@ -1196,46 +1185,24 @@ case EKeyEnter: case EKeyOK: { - // If enter key is pushed down for a long time, many key events - // are generated. Enter should be handled only ones. - if (!iEnterKeyHandled) + if( iSelectedIndex != KErrNotFound && HasHighlight() ) { - iEnterKeyHandled = ETrue; - if( iSelectedIndex != KErrNotFound && HasHighlight()) - { - iEnterKeyHandled = ETrue; - const TBool validIndex = iSelectedIndex >= 0 && iSelectedIndex < iItems.Count(); - const TBool selectionMode = iFlags & EHgScrollerSelectionMode; - if (validIndex && selectionMode) - { - // In selection mode enterkey should mark/unmark item. - iItems[iSelectedIndex]->Flags() & CHgItem::EHgItemFlagMarked ? - UnMark(iSelectedIndex) : Mark(iSelectedIndex); - DrawDeferred(); - } - else - { - // Item will be opened so highlight is removed. - iShowHighlight = EFalse; - if( iSelectionObserver ) - { - TRAP_IGNORE( iSelectionObserver->HandleOpenL( iSelectedIndex ); ) - } - } - iDrawUtils->EnableMarquee(HasHighlight()); - return EKeyWasConsumed; - } - else if( iItemCount ) - { - iSelectedIndex = CurrentIndex(); - FitSelectionToView(); - iShowHighlight = ETrue; - iDrawUtils->EnableMarquee(HasHighlight()); - DrawDeferred(); - if( iSelectionObserver ) - TRAP_IGNORE( iSelectionObserver->HandleSelectL( iSelectedIndex ); ) - return EKeyWasConsumed; - } + iShowHighlight = EFalse; + iDrawUtils->EnableMarquee(HasHighlight()); + if( iSelectionObserver ) + TRAP_IGNORE( iSelectionObserver->HandleOpenL( iSelectedIndex ); ) + return EKeyWasConsumed; + } + else if( iItemCount ) + { + iSelectedIndex = iCurrentRow; + FitSelectionToView(); + iShowHighlight = ETrue; + iDrawUtils->EnableMarquee(HasHighlight()); + DrawDeferred(); + if( iSelectionObserver ) + TRAP_IGNORE( iSelectionObserver->HandleSelectL( iSelectedIndex ); ) + return EKeyWasConsumed; } return EKeyWasNotConsumed; } @@ -1304,21 +1271,6 @@ { if(iItemCount) { - iHighlightTimer->Cancel(); - iPointerDown = EFalse; - if(iDetector) - { - TRAP_IGNORE(iDetector->CancelAnimationL()); - } - iPanning = EFalse; - - iPhysics->StopPhysics(); - iPhysics->ResetFriction(); - - iFocusedIndex = KErrNotFound; - iSelectionToFocusedItem = EFalse; - iDrawUtils->EnableMarquee(false); - iItems.ResetAndDestroy(); iItemCount = 0; iSelectedIndex = KErrNotFound; @@ -1329,9 +1281,6 @@ } HandleItemCountChanged(); - - iViewPosition = TPoint(iWidth/2, iHeight/2); - HandleViewPositionChanged(); } } @@ -1341,14 +1290,6 @@ // EXPORT_C void CHgScroller::SetFlags(TInt aFlags) { - const TBool currentSelectionMode = iFlags & EHgScrollerSelectionMode; - const TBool newSelectionMode = aFlags & EHgScrollerSelectionMode; - if( currentSelectionMode != newSelectionMode ) - { - // when selection mode changes we need to repaint - DrawDeferred(); - } - iFlags |= aFlags; } @@ -1657,18 +1598,12 @@ // void CHgScroller::SetSelectionMode( TSelectionMode aMode ) { - if( aMode != iSelectionMode ) - { - DrawDeferred(); - } - iSelectionMode = aMode; if( iSelectionMode == ESelectionPossible || iSelectionMode == ENoSelection ) { iCoeEnv->InputCapabilitiesChanged(); } - } // --------------------------------------------------------------------------- @@ -1811,14 +1746,7 @@ void CHgScroller::HandleLongTapEventL( const TPoint& /*aPenEventLocation*/, const TPoint& aPenEventScreenLocation) { - // Long tap is supported in marking mode only for an item that is marked. - const TBool validIndex = iSelectedIndex != KErrNotFound && - iSelectedIndex >= 0 && iSelectedIndex < iItems.Count(); - const TBool selectionMode = iFlags & EHgScrollerSelectionMode; - const TBool longTapEnabled = validIndex && (!selectionMode || - (selectionMode && iItems[iSelectedIndex]->Flags() & CHgItem::EHgItemFlagMarked)); - - if( iActionMenu && longTapEnabled ) + if( iActionMenu ) { iOldWinPos = DrawableWindow()->OrdinalPosition(); iActionMenu->ShowMenuL(aPenEventScreenLocation); diff -r 85902f042028 -r a5e7a4f63858 uifw/ganes/src/HgSingleGraphicList.cpp --- a/uifw/ganes/src/HgSingleGraphicList.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/ganes/src/HgSingleGraphicList.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -162,8 +162,7 @@ aRect, item->Flags(), iLayoutData->FirstIndicatorLayout(), - iLayoutData->SecondIndicatorLayout(), - iFlags & EHgScrollerSelectionMode || iSelectionMode != ENoSelection ); + iLayoutData->SecondIndicatorLayout() ); } // ----------------------------------------------------------------------------- diff -r 85902f042028 -r a5e7a4f63858 uifw/ganes/src/HgSingleLargeList.cpp --- a/uifw/ganes/src/HgSingleLargeList.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/ganes/src/HgSingleLargeList.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -163,8 +163,7 @@ aRect, item->Flags(), iLayoutData->FirstIndicatorLayout(), - iLayoutData->SecondIndicatorLayout(), - iFlags & EHgScrollerSelectionMode || iSelectionMode != ENoSelection ); + iLayoutData->SecondIndicatorLayout() ); } // ----------------------------------------------------------------------------- diff -r 85902f042028 -r a5e7a4f63858 uifw/ganes/src/HgSingleTextList.cpp --- a/uifw/ganes/src/HgSingleTextList.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/ganes/src/HgSingleTextList.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -143,8 +143,7 @@ aRect, item->Flags(), iLayoutData->FirstIndicatorLayout(), - iLayoutData->SecondIndicatorLayout(), - iFlags & EHgScrollerSelectionMode || iSelectionMode != ENoSelection ); + iLayoutData->SecondIndicatorLayout() ); } // ----------------------------------------------------------------------------- diff -r 85902f042028 -r a5e7a4f63858 uifw/ganes/src/HgSingleTextListWithIcon.cpp --- a/uifw/ganes/src/HgSingleTextListWithIcon.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/ganes/src/HgSingleTextListWithIcon.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -144,8 +144,7 @@ aRect, item->Flags(), iGraphicLayoutData->FirstIndicatorLayout(), - iGraphicLayoutData->SecondIndicatorLayout(), - iFlags & EHgScrollerSelectionMode || iSelectionMode != ENoSelection ); + iGraphicLayoutData->SecondIndicatorLayout() ); } // ----------------------------------------------------------------------------- diff -r 85902f042028 -r a5e7a4f63858 uifw/ganes/src/HgVgEGL.cpp --- a/uifw/ganes/src/HgVgEGL.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/ganes/src/HgVgEGL.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -47,12 +47,6 @@ void CHgVgEGL::ConstructL (RWindow& aWindow) { InitEGL(aWindow); - // Enable flag that is used to determine whether egl has been initialized. - // For example vgImages shouldn't be created before egl has been initialized. - // There will be only one instance of this class so there is no need to check - // whether there is already something in the DLL tls. - TBool* eglInitialized = new TBool(ETrue); - Dll::SetTls((TAny*)eglInitialized); } // ----------------------------------------------------------------------------- @@ -72,10 +66,6 @@ CHgVgEGL::~CHgVgEGL ( ) { DestroyEGL(); - // Disable flag that is used to determine whether egl has been initialized. - // For example vgImages shouldn't be created before egl has been initialized. - delete Dll::Tls(); - Dll::FreeTls(); } // --------------------------------------------------------------------------- @@ -367,14 +357,4 @@ return bitmap; } -// --------------------------------------------------------------------------- -// CHgVgEGL::EglInitialized() -// --------------------------------------------------------------------------- -// -TBool CHgVgEGL::EglInitialized() -{ - TBool* eglInitialized = (TBool*)Dll::Tls(); - return eglInitialized ? *eglInitialized : EFalse; -} - // End of File diff -r 85902f042028 -r a5e7a4f63858 uifw/ganes/src/HgVgHelper.cpp --- a/uifw/ganes/src/HgVgHelper.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/ganes/src/HgVgHelper.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -20,7 +20,6 @@ #include "HgVgHelper.h" #include "HgVgDrawBuffer.h" #include "HgVgImageCreator.h" -#include "HgVgEGL.h" #include #include @@ -108,9 +107,7 @@ // VGImage CreateVgImageFromIconL(const CGulIcon& aIcon) { - // If egl has not been initialized we aren't allowed to create vgimages. - if (!CHgVgEGL::EglInitialized()) return VG_INVALID_HANDLE; - + CFbsBitmap* bitmap = aIcon.Bitmap(); User::LeaveIfNull(bitmap); CFbsBitmap* mask = aIcon.Mask(); diff -r 85902f042028 -r a5e7a4f63858 uifw/ganes/src/HgVgMediaWall.cpp --- a/uifw/ganes/src/HgVgMediaWall.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/ganes/src/HgVgMediaWall.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -159,15 +159,11 @@ // Set the windows size SetRect ( aRect ); -#ifdef MEDIAWALL_ORIENTATION_FIX +#ifdef MEDIAWALL_ORIENTATION_FIX TSize screenSize = iCoeEnv->ScreenDevice()->SizeInPixels(); if (aRect == TRect(TPoint(0,0), screenSize) && iMediaWallStyle == EHgVgMediaWallStyleCoverflowFullScreen) { - TPixelsAndRotation sizeAndRotation; - iCoeEnv->ScreenDevice()->GetDefaultScreenSizeAndRotation(sizeAndRotation); - iRotatedDraw = sizeAndRotation.iRotation != CFbsBitGc::EGraphicsOrientationNormal; - Window().FixNativeOrientation(); } #endif @@ -230,12 +226,7 @@ // EXPORT_C TInt CHgVgMediaWall::SelectedIndex() { - // iObserverNotified flag is set on when animation is about to end and - // observer is notified from the selected index. - return ((iAnimationState == EHgVgMediaWallAnimationStateTransition || - iAnimationState == EHgVgMediaWallAnimationStateFastTransition) && - !iObserverNotified) ? - KErrNotFound : iSelectedIndex * iRowCount; + return iSelectedIndex * iRowCount; } // ----------------------------------------------------------------------------- @@ -348,9 +339,6 @@ iPopupText1.Close(); iPopupText2.Close(); - // Just to be safe, this will release all resource, eventhought - // they should be already released at this point. - eglReleaseThread(); } // ----------------------------------------------------------------------------- @@ -877,11 +865,10 @@ handled = ETrue; } break; case EKeyEnter: - case EKeyOK: { if( iSelectedIndex != KErrNotFound && iSelectionObserver ) { - TRAP_IGNORE( DoStartOpeningAnimationL( ); ) + TRAP_IGNORE( DoStartOpeningAnimationL( ); ) return EKeyWasConsumed; } return EKeyWasNotConsumed; @@ -1120,9 +1107,8 @@ return NULL; #ifdef MEDIAWALL_ORIENTATION_FIX - return iEGL->GetSurfaceToBitmap( - iRect, - iRotatedDraw && (iMediaWallStyle == EHgVgMediaWallStyleCoverflowFullScreen) ); + return iEGL->GetSurfaceToBitmap(iRect, + iMediaWallStyle == EHgVgMediaWallStyleCoverflowFullScreen); #else return iEGL->GetSurfaceToBitmap(iRect, EFalse); #endif @@ -1604,8 +1590,7 @@ #ifdef MEDIAWALL_ORIENTATION_FIX iScrollBar->EnableLandscapeRendering( - iRotatedDraw - && (iMediaWallStyle == CHgVgMediaWall::EHgVgMediaWallStyleCoverflowFullScreen) ); + iMediaWallStyle == CHgVgMediaWall::EHgVgMediaWallStyleCoverflowFullScreen ); #endif } @@ -2454,15 +2439,15 @@ InitScrollBarL(EFalse); -#ifdef MEDIAWALL_ORIENTATION_FIX - iRenderer->EnableLandscapeMode(iRotatedDraw); - iAlbumLabel->EnableLandscapeRendering(iRotatedDraw); - iArtistLabel->EnableLandscapeRendering(iRotatedDraw); - iEmptyLabel->EnableLandscapeRendering(iRotatedDraw); - iSkinRenderer->EnableLanscapeRendering(iRotatedDraw); - iScrollBar->EnableLandscapeRendering(iRotatedDraw); - iHideSKButton->EnableLandscapeRendering(iRotatedDraw); - iLetterPopup->EnableLandscapeRendering(iRotatedDraw); +#ifdef MEDIAWALL_ORIENTATION_FIX + iRenderer->EnableLandscapeMode(ETrue); + iAlbumLabel->EnableLandscapeRendering(ETrue); + iArtistLabel->EnableLandscapeRendering(ETrue); + iEmptyLabel->EnableLandscapeRendering(ETrue); + iSkinRenderer->EnableLanscapeRendering(ETrue); + iScrollBar->EnableLandscapeRendering(ETrue); + iHideSKButton->EnableLandscapeRendering(ETrue); + iLetterPopup->EnableLandscapeRendering(ETrue); #endif } diff -r 85902f042028 -r a5e7a4f63858 uifw/tsrc/public/basic/AknSoundServerStifTest/group/AknSoundServerStifTest.mmp --- a/uifw/tsrc/public/basic/AknSoundServerStifTest/group/AknSoundServerStifTest.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/tsrc/public/basic/AknSoundServerStifTest/group/AknSoundServerStifTest.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -37,7 +37,7 @@ MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib -LIBRARY StifTestInterface.lib +LIBRARY stiftestinterface.lib LIBRARY stiftestengine.lib LIBRARY avkon.lib LIBRARY cone.lib diff -r 85902f042028 -r a5e7a4f63858 uifw/uiklaf/Group/EikCoCtlLaf.MMP --- a/uifw/uiklaf/Group/EikCoCtlLaf.MMP Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/uiklaf/Group/EikCoCtlLaf.MMP Wed Oct 13 14:50:15 2010 +0300 @@ -87,12 +87,12 @@ LIBRARY avkon.lib LIBRARY apgrfx.lib LIBRARY aknnotify.lib -LIBRARY CommonEngine.lib +LIBRARY commonengine.lib LIBRARY eikcore.lib LIBRARY aknskins.lib -LIBRARY CdlEngine.lib -LIBRARY estor.lib -LIBRARY uiklaf.lib +LIBRARY cdlengine.lib +LIBRARY ESTOR.LIB +LIBRARY Uiklaf.lib deffile EIKCOCTLLAF.DEF diff -r 85902f042028 -r a5e7a4f63858 uifw/uiklaf/Group/UIKLAF.MMP --- a/uifw/uiklaf/Group/UIKLAF.MMP Wed Sep 15 12:29:17 2010 +0300 +++ b/uifw/uiklaf/Group/UIKLAF.MMP Wed Oct 13 14:50:15 2010 +0300 @@ -81,16 +81,16 @@ LIBRARY avkon.lib LIBRARY apgrfx.lib LIBRARY aknnotify.lib -LIBRARY CommonEngine.lib +LIBRARY commonengine.lib LIBRARY eikcore.lib LIBRARY aknskins.lib -LIBRARY CdlEngine.lib -LIBRARY estor.lib +LIBRARY cdlengine.lib +LIBRARY ESTOR.LIB LIBRARY EikCoCtlLaf.lib -LIBRARY fontutils.lib +LIBRARY FontUtils.lib LIBRARY AknLayout2Scalable.lib LIBRARY FontProvider.lib -LIBRARY akncapserverclient.lib +LIBRARY AknCapServerClient.lib #if defined(ARMCC) DEFFILE /epoc32/include/uiklaf/private/eabi/uiklaf.def diff -r 85902f042028 -r a5e7a4f63858 uiutils/Findutil/group/FindUtil.mmp --- a/uiutils/Findutil/group/FindUtil.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uiutils/Findutil/group/FindUtil.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,7 +49,7 @@ LIBRARY euser.lib #if defined(WINS) -LIBRARY featmgr.lib +LIBRARY FeatMgr.lib #endif // end of file diff -r 85902f042028 -r a5e7a4f63858 uiutils/Findutil/group/FindUtilImpl.mmp --- a/uiutils/Findutil/group/FindUtilImpl.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uiutils/Findutil/group/FindUtilImpl.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -48,17 +48,13 @@ SOURCE FindUtilKorean.cpp LIBRARY euser.lib -LIBRARY FindUtil.lib +LIBRARY findutil.lib LIBRARY ptiengine.lib -LIBRARY CommonEngine.lib -LIBRARY centralrepository.lib -LIBRARY cenrepnotifhandler.lib +LIBRARY commonengine.lib +LIBRARY CentralRepository.lib +LIBRARY CenRepNotifHandler.lib LIBRARY cone.lib LIBRARY fepbase.lib LIBRARY avkon.lib eikcoctl.lib eikctl.lib form.lib uiklaf.lib -LIBRARY featmgr.lib - -DEBUGLIBRARY charconv.lib -DEBUGLIBRARY efsrv.lib // end of file diff -r 85902f042028 -r a5e7a4f63858 uiutils/Findutil/group/FindUtilImplChina.mmp --- a/uiutils/Findutil/group/FindUtilImplChina.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uiutils/Findutil/group/FindUtilImplChina.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -49,11 +49,11 @@ SOURCE ChineseFindUtils.cpp LIBRARY euser.lib -LIBRARY FindUtil.lib +LIBRARY findutil.lib LIBRARY ptiengine.lib -LIBRARY CommonEngine.lib -LIBRARY centralrepository.lib -LIBRARY cenrepnotifhandler.lib +LIBRARY commonengine.lib +LIBRARY CentralRepository.lib +LIBRARY CenRepNotifHandler.lib LIBRARY cone.lib LIBRARY fepbase.lib LIBRARY avkon.lib eikcoctl.lib eikctl.lib form.lib uiklaf.lib diff -r 85902f042028 -r a5e7a4f63858 uiutils/Findutil/group/FindUtilImplJapan.mmp --- a/uiutils/Findutil/group/FindUtilImplJapan.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uiutils/Findutil/group/FindUtilImplJapan.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -47,11 +47,11 @@ SOURCE FindUtilJapanese.cpp LIBRARY euser.lib -LIBRARY FindUtil.lib +LIBRARY findutil.lib LIBRARY ptiengine.lib -LIBRARY CommonEngine.lib -LIBRARY centralrepository.lib -LIBRARY cenrepnotifhandler.lib +LIBRARY commonengine.lib +LIBRARY CentralRepository.lib +LIBRARY CenRepNotifHandler.lib LIBRARY cone.lib LIBRARY fepbase.lib LIBRARY avkon.lib eikcoctl.lib eikctl.lib form.lib uiklaf.lib diff -r 85902f042028 -r a5e7a4f63858 uiutils/Findutil/group/FindUtilImplThai.mmp --- a/uiutils/Findutil/group/FindUtilImplThai.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uiutils/Findutil/group/FindUtilImplThai.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -47,11 +47,11 @@ SOURCE FindUtilThai.cpp LIBRARY euser.lib -LIBRARY FindUtil.lib +LIBRARY findutil.lib LIBRARY ptiengine.lib -LIBRARY CommonEngine.lib -LIBRARY centralrepository.lib -LIBRARY cenrepnotifhandler.lib +LIBRARY commonengine.lib +LIBRARY CentralRepository.lib +LIBRARY CenRepNotifHandler.lib LIBRARY cone.lib LIBRARY fepbase.lib LIBRARY avkon.lib eikcoctl.lib eikctl.lib form.lib uiklaf.lib diff -r 85902f042028 -r a5e7a4f63858 uiutils/Findutil/inc/FindUtilKorean.h --- a/uiutils/Findutil/inc/FindUtilKorean.h Wed Sep 15 12:29:17 2010 +0300 +++ b/uiutils/Findutil/inc/FindUtilKorean.h Wed Oct 13 14:50:15 2010 +0300 @@ -24,11 +24,6 @@ #include "FindUtilBase.h" -#ifdef _DEBUG -#include -class CCnvCharacterSetConverter; -#endif - /** * CFindUtilKorean utils class * @@ -62,13 +57,6 @@ private: - enum TMatchFlag - { - EMatchFlagNone = 0x0000, - EMatchFlagAsterikInLast = 0x0001, - EMatchFlagAsterikInStart = 0x0002 - }; - CFindUtilKorean(); void ConstructL(); @@ -81,10 +69,9 @@ * @param aSearchText for text to be used in searching * @return ETrue if match found, EFalse otherwise */ - TInt IsFindMatch( + TBool IsFindMatchL( const TDesC& aItemString, - const TDesC& aSearchText, - const TMatchFlag aFlag = EMatchFlagNone); + const TDesC& aSearchText ); /** * Decomposes given string to plain jamos. @@ -97,8 +84,6 @@ const TDesC& aString, HBufC* aDecomposedString ); - void DecomposeChar( TChar aChar, TDes& aDecomposedString ); - /** * Decomposes hangul syllables to single jamos. * @@ -181,27 +166,6 @@ const TDesC& aSearchText, HBufC*& aNextChars); - private: - - void TakeIntoNextCharsL(HBufC*& aNextChars, TChar aChar); - - void InsertNextCharsL( - HBufC*& aNextChars, - TBool& aReAlloced, - const TChar& aChar, - const TInt aIndex = KErrNotFound); - - inline TBool MatchConsonentBased(const TChar& aA, const TChar& aB); - - private: - - TUid iCurrentProcessUid3; - -#ifdef _DEBUG - RFs iFs; - CCnvCharacterSetConverter* iConv; -#endif - }; #endif // __FINDUTILKOREAN__ diff -r 85902f042028 -r a5e7a4f63858 uiutils/Findutil/src/FindUtilKorean.cpp --- a/uiutils/Findutil/src/FindUtilKorean.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uiutils/Findutil/src/FindUtilKorean.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -17,11 +17,6 @@ #include "FindUtilKorean.h" -#include - -#ifdef _DEBUG -#include -#endif const TInt KSBase = 0xac00; // base address for hangul syllables const TInt KLBase = 0x1100; // base address for L-jamo @@ -98,48 +93,8 @@ 0x1175, }; -const TUint16 conversionTableFromLJamoToCompatibilityJamo[] = { -0x3131, /* ? */ -0x3132, /* ? */ -0x3134, /* ? */ -0x3137, /* ? */ -0x3138, /* ? */ -0x3139, /* ? */ -0x3141, /* ? */ -0x3142, /* ? */ -0x3143, /* ? */ -0x3145, /* ? */ -0x3146, /* ? */ -0x3147, /* ? */ -0x3148, /* ? */ -0x3149, /* ? */ -0x314A, /* ? */ -0x314B, /* ? */ -0x314C, /* ? */ -0x314D, /* ? */ -0x314E /* ? */ -}; - #define KCCount (sizeof(conversionTableFromCompatibilityJamoToJamo) / sizeof(TUint16)) -#define KCountCompToJamo (sizeof(conversionTableFromCompatibilityJamoToJamo) / sizeof(TUint16)) - -#define KCountLJamoToComp (sizeof(conversionTableFromLJamoToCompatibilityJamo) / sizeof(TUint16)) - -#define ISLJamo(a) (KLBase <= a && a <= KLBase + KLCount) - -#define IsCompatibilityJamo(a) (0x3130 <= a && a <= 0x318F) - -const TInt KNextCharsGranuarity = 20; - -const TUid KUidPhoneBook = {0x101F4CCE}; -const TUid KUidPhoneBookServer = {0x10207277}; -const TUid KUidSymbianContactModel = {0x10003A73}; - -#define IsPhoneBookProcess(a) ( a == KUidSymbianContactModel || a == KUidPhoneBook || a == KUidPhoneBookServer ) - - - // ============================ MEMBER FUNCTIONS ============================= @@ -162,13 +117,6 @@ // void CFindUtilKorean::ConstructL() { -#ifdef _DEBUG - User::LeaveIfError( iFs.Connect() ); - iConv = CCnvCharacterSetConverter::NewL(); - iConv->PrepareToConvertToOrFromL(0x200100FF, iFs); -#endif - - iCurrentProcessUid3 = ( RProcess().Type() )[2]; } // --------------------------------------------------------------------------- @@ -185,10 +133,6 @@ // CFindUtilKorean::~CFindUtilKorean() { -#ifdef _DEBUG - delete iConv; - iFs.Close(); -#endif } // --------------------------------------------------------------------------- @@ -212,140 +156,35 @@ // Compares two strings against others. // --------------------------------------------------------------------------- // -TInt CFindUtilKorean::IsFindMatch( - const TDesC& aItemString, - const TDesC& aSearchText, - const TMatchFlag aFlag) +TBool CFindUtilKorean::IsFindMatchL( + const TDesC& aItemString, + const TDesC& aSearchText ) { - -#ifdef _DEBUG - TRAP_IGNORE( - HBufC8* bufItemString = HBufC8::NewLC((aItemString.Length() + 1) * 2); - HBufC8* bufSearchText = HBufC8::NewLC((aSearchText.Length() + 1) * 2); - TPtr8 ptrItemString(bufItemString->Des()); - ptrItemString.FillZ(ptrItemString.MaxLength()); - TPtr8 ptrSearchText(bufSearchText->Des()); - ptrSearchText.FillZ(ptrSearchText.MaxLength()); - iConv->ConvertFromUnicode(ptrItemString, aItemString); - iConv->ConvertFromUnicode(ptrSearchText, aSearchText); - RDebug::Printf("DBG: comparing %s, %s", bufItemString->Ptr(), bufSearchText->Ptr()); - CleanupStack::PopAndDestroy(2); - ); -#endif + TBool result( EFalse ); // To disable the wildchar matching provided by MatchC. - if ( aFlag == EMatchFlagNone && - KErrNotFound != aSearchText.Locate( KLitQuestion ) && + if ( KErrNotFound != aSearchText.Locate( KLitQuestion ) && KErrNotFound != aSearchText.Locate( KLitStar ) ) { -#ifdef _DEBUG - RDebug::Printf("DBG: comparing includes wild"); -#endif - return KErrNotFound; + return EFalse; } - -#if 1 // 2009.08.14 consonent based search - TUint flag = aFlag; - - TInt lenItemString = aItemString.Length(); - TInt lenSearchText = aSearchText.Length(); - - // detect asterik in end of string - if (lenSearchText > 0 && aSearchText[lenSearchText - 1] == KLitStar) - { - flag |= EMatchFlagAsterikInLast; - lenSearchText--; - } - - // set asterik start - if (!IsPhoneBookProcess(iCurrentProcessUid3) || - (aSearchText.Length() > 0 && aSearchText[0] == KLitStar)) - { - flag |= EMatchFlagAsterikInStart; - } - - if (lenItemString < lenSearchText) - { - return KErrNotFound; - } - - if (IsPhoneBookProcess(iCurrentProcessUid3)) - { - TInt i = 0; - TInt j = 0; - for (; i < lenItemString && j < lenSearchText; i++) - { - TChar ch(aItemString[i]); - if (IsFindWordSeparator(ch)) - { - continue; - } - - if (MatchConsonentBased(ch, aSearchText[j])) - { - j++; - } - else - { - break; - } - } - - if (j == lenSearchText) - return 0; - } - - for (TInt i = 0; i < lenItemString - lenSearchText + 1; i++) - { - if (!(flag & EMatchFlagAsterikInStart)) - { - if (0 != i && !IsFindWordSeparator(aItemString[i - 1])) - { - continue; - } - } - - TBool matched(ETrue); - for (TInt j = 0; j < lenSearchText; j++) - { - if (!MatchConsonentBased(aItemString[i + j], aSearchText[j])) - { -#ifdef _DEBUG - RDebug::Printf("DBG: mismatch between %d %d", i + j, j); -#endif - matched = EFalse; - break; - } - } - - if (matched) - { -#ifdef _DEBUG - RDebug::Print(_L("DBG: comparing matched")); -#endif - return i; - } - } - - return KErrNotFound; - -#else + // Convert aItemString to single jamo's. HBufC* itemString = HBufC::NewLC( aItemString.Length() * KMaxLengthDecomposedSyllable ); DecomposeToPlainJamos( aItemString, itemString ); - + HBufC* searchText = HBufC::NewLC( aSearchText.Length() * KMaxLengthDecomposedSyllable + 2 ); searchText->Des().Append( KLitStar ); // Convert aSearchText to single jamo's. DecomposeToPlainJamos( aSearchText, searchText ); searchText->Des().Append( KLitStar ); - + // Compare strings containing plain jamo's against others. for ( TInt i = 0; i < itemString->Length() && !result; i++ ) { - if ( 0 == i || IsFindWordSeparator( - static_cast( itemString->Des()[ i - 1 ] ) ) ) + if ( 0 == i || IsFindWordSeparator( + static_cast( itemString->Des()[ i - 1 ] ) ) ) { if ( KErrNotFound != itemString->Mid( i ).MatchC( *searchText ) ) { @@ -353,12 +192,11 @@ } } } - + CleanupStack::PopAndDestroy( searchText ); CleanupStack::PopAndDestroy( itemString ); - - return result; -#endif + + return result; } // --------------------------------------------------------------------------- @@ -392,25 +230,6 @@ } } -void CFindUtilKorean::DecomposeChar( TChar aChar, TDes& aDecomposedString ) - { - aDecomposedString.Zero(); - if ( IsHangulSyllable( aChar ) ) - { - Decompose( aChar, aDecomposedString ); - } - else if ( IsHangulCompatibilityJamo( aChar ) ) - { - TUint16 jamo = conversionTableFromCompatibilityJamoToJamo[ (TInt)aChar - KCBase ]; - aDecomposedString.Append( jamo ); - } - // Otherwise append character directly to 'decomposed string'. - else - { - aDecomposedString.Append( aChar ); - } - } - // --------------------------------------------------------------------------- // Decomposes hangul syllables to single jamos. // --------------------------------------------------------------------------- @@ -466,7 +285,7 @@ { // Character is 'hangul compatibility jamo' // if it's numeric value is between KCBase and KCBase + KCCount. - TInt index = static_cast( aChar ) - KCBase; + TInt index = static_cast ( aChar ) - KCBase; if ( index < 0 || index >= KCCount ) { return EFalse; @@ -485,17 +304,20 @@ // does not contain any characters. if ( aContactsField.Length() ) { - // In case that both of strings contain some characters, - // matching is made with function below. -#ifdef _DEBUG - RDebug::Printf("DBG: Comparing from Match"); -#endif - retVal = (IsFindMatch( aContactsField, aWord ) != KErrNotFound); + // In case that both of strings contain some characters, + // matching is made with function below. + TRAPD(err, retVal = IsFindMatchL( aContactsField, aWord )); + + if (err != KErrNone) + { + retVal = EFalse; + } } - return retVal; + return retVal; } + // --------------------------------------------------------------------------- // It tests a partial matching. // --------------------------------------------------------------------------- @@ -520,11 +342,7 @@ // In case that both of strings contain some characters, // matching is made with function below. -#ifdef _DEBUG - RDebug::Printf("DBG: Comparing from MatchRefineL"); -#endif - - return (IsFindMatch( aItemString, aSearchText ) != KErrNotFound); + return IsFindMatchL( aItemString, aSearchText ); } // ----------------------------------------------------------------------------- @@ -532,276 +350,19 @@ // (other items were commented in a header). // ----------------------------------------------------------------------------- // -TBool CFindUtilKorean::MatchAdaptiveRefineL(const TDesC& aItemString, - const TDesC& aSearchText, HBufC*& aNextChars) - { - if (aSearchText.Length() == 0) - { - TakeIntoNextCharsL(aNextChars, aItemString[0]); - return ETrue; - } - else - { - const TInt lenItemString = aItemString.Length(); - const TInt lenSearchText = aSearchText.Length(); - - if (lenItemString < lenSearchText) - { - return EFalse; - } - -#ifdef _DEBUG - RDebug::Printf("DBG: Comparing from MatchAdaptiveRefineL"); -#endif - TInt idx = IsFindMatch(aItemString, aSearchText, - EMatchFlagAsterikInLast); - - if (idx == KErrNotFound) - { - return EFalse; - } - - TLex lexItemString(aItemString); - if (IsPhoneBookProcess(iCurrentProcessUid3) && idx == 0) - { - // find out the position next to last matched string. - // work through strings when it reaches length of search string, - // while skipping spaces due to ingnoring space matching scheme. - for (TInt compareCount = 0; compareCount < lenSearchText;) - { - if (!IsFindWordSeparator(lexItemString.Get())) - { - compareCount++; - } - } - - if (lexItemString.Eos()) - return EFalse; - - // Skip spaces - while (IsFindWordSeparator(lexItemString.Peek())) - { - lexItemString.Inc(); - } - - if (lexItemString.Eos()) - { - return EFalse; - } - } - else - { - lexItemString.Inc(idx + lenSearchText); - } - - TChar next = lexItemString.Peek(); - if (next == 0) - { - // nothing to take - } - else - { - TakeIntoNextCharsL(aNextChars, next); - } - } - - return ETrue; - } - -void CFindUtilKorean::TakeIntoNextCharsL(HBufC*& aNextChars, - TChar aCharToInsert) - { - // examine the characters to be inserted - TBuf<3> jamo; - if (IsHangulSyllable(aCharToInsert)) - { - Decompose(aCharToInsert, jamo); - } - else if (IsHangulCompatibilityJamo(aCharToInsert)) - { - TUint16 ljamo = - conversionTableFromCompatibilityJamoToJamo[(TInt)aCharToInsert - KCBase]; - jamo.Append(ljamo); - } - else - { - aCharToInsert.UpperCase(); - } - - TPtr nextChar(aNextChars->Des()); - TBool reAlloced(EFalse); - - // in case there is no character in the list - if (nextChar.Length() == 0) - { - __ASSERT_ALWAYS(nextChar.MaxLength() > 2, User::Panic(_L("FINDUTIL"), __LINE__)); - - // Hangul only - if (jamo.Length() && ISLJamo(jamo[0])) - { - const TChar consonentToInsert = - conversionTableFromLJamoToCompatibilityJamo[jamo[0] - KLBase]; - - InsertNextCharsL(aNextChars, reAlloced, consonentToInsert); - - // if Jamo only character, return... - if (jamo.Length() == 1) - { - return; - } - } - - InsertNextCharsL(aNextChars, reAlloced, aCharToInsert); - return; - } - - TBool jamoInserted(EFalse); - TInt length = nextChar.Length(); - const TBool isPB(IsPhoneBookProcess(iCurrentProcessUid3)); - - for (TInt i = 0; i < length; i++) - { - const TChar ch = nextChar[i]; - // Hangul consonent check - if (!jamoInserted && jamo.Length() && ISLJamo(jamo[0])) - { - const TChar consonentToInsert = - conversionTableFromLJamoToCompatibilityJamo[jamo[0] - KLBase]; - - if (ch == consonentToInsert) - { - // Jamo only character finished - if (jamo.Length() == 1) - { - return; - } - - jamoInserted = ETrue; - } - else if ((isPB && !IsCompatibilityJamo(ch)) || (ch > consonentToInsert)) - { - InsertNextCharsL(aNextChars, reAlloced, consonentToInsert, i); - // Jamo only character finished - if (jamo.Length() == 1) - { - return; - } - - jamoInserted = ETrue; - } - else - { - // pass - } - } - // Hangul or Latin - else - { - if (ch == aCharToInsert) - { - return; // already exist - } - else if (isPB && IsCompatibilityJamo(ch)) - { - // pass - } - else if (ch > aCharToInsert) - { - InsertNextCharsL(aNextChars, reAlloced, aCharToInsert, i); - return; // finished - } - else - { - // pass - } - } - - if (reAlloced) - { - nextChar.Set(aNextChars->Des()); - length = nextChar.Length(); - } - } - - InsertNextCharsL(aNextChars, reAlloced, aCharToInsert); - } - -void CFindUtilKorean::InsertNextCharsL(HBufC*& aNextChars, TBool& aReAlloced, - const TChar& aChar, const TInt aIndex) - { - aReAlloced = EFalse; - TPtr ptr(aNextChars->Des()); - const TInt len = ptr.Length(); - const TInt maxLen = ptr.MaxLength(); - - if (KErrNotFound != ptr.Locate(aChar)) - { - // Do not insert duplicate characters - return; - } - - if (len == maxLen) - { - aNextChars = aNextChars->ReAllocL(maxLen + KNextCharsGranuarity); - ptr.Set(aNextChars->Des()); - aReAlloced = ETrue; - -#ifdef _DEBUG - RDebug::Printf("DBG: Next Character buffer created with %d", - ptr.MaxLength()); -#endif - } - - if (aIndex == KErrNotFound) - { - ptr.Append(aChar); - } - else - { - TBuf<1> buf; - buf.Append(aChar); - ptr.Insert(aIndex, buf); - } - } +TBool CFindUtilKorean::MatchAdaptiveRefineL( const TDesC& /*aItemString*/, + const TDesC& /*aSearchText*/, HBufC*& /*aNextChars*/ ) + { + return 0; + } // --------------------------------------------------------------------------- // It checks whether aWord is valid. // --------------------------------------------------------------------------- // -TBool CFindUtilKorean::IsWordValidForMatching(const TDesC& /*aWord*/) +TBool CFindUtilKorean::IsWordValidForMatching( const TDesC& /*aWord*/ ) { return ETrue; } -TBool CFindUtilKorean::MatchConsonentBased(const TChar& aA, const TChar& aB) - { - TBuf<3> jamoItemString; - TBuf<3> jamoSearchText; - DecomposeChar(aA, jamoItemString); - DecomposeChar(aB, jamoSearchText); - const TInt lenJamoItemString = jamoItemString.Length(); - const TInt lenJamoSearchText = jamoSearchText.Length(); - - // check consonent match for one character - if (lenJamoSearchText == 1 && - ISLJamo(jamoItemString[0]) && ISLJamo(jamoSearchText[0])) - { - if (jamoItemString[0] == jamoSearchText[0]) - { - return ETrue; - } - } - else - { - TChar chItemString(aA); - TChar chSearchText(aB); - chItemString.UpperCase(); - chSearchText.UpperCase(); - if (chItemString == chSearchText) - { - return ETrue; - } - } - return EFalse; - } // End of file diff -r 85902f042028 -r a5e7a4f63858 uiutils/Findutil/src/FindUtilWestern.cpp --- a/uiutils/Findutil/src/FindUtilWestern.cpp Wed Sep 15 12:29:17 2010 +0300 +++ b/uiutils/Findutil/src/FindUtilWestern.cpp Wed Oct 13 14:50:15 2010 +0300 @@ -29,9 +29,6 @@ #include "FindUtilKorean.h" #include #include -#include -#include - const TInt KLitTab('\t'); const TInt KLitSpace(' '); const TInt KLitHyphen('-'); @@ -286,12 +283,10 @@ iNotifyHandler->StartListeningL(); } //TSW: LYEE-7Q2GRV - FeatureManager::InitializeLibL(); - if( !iFindUtilKorean && FeatureManager::FeatureSupported( KFeatureIdKorean ) ) - { + if(!iFindUtilKorean) + { iFindUtilKorean = CFindUtilKorean::NewL(); - } - FeatureManager::UnInitializeLib(); + } } void CFindUtilWestern::HandleNotifyInt( TUint32 aId, TInt aNewValue ) @@ -308,13 +303,13 @@ TBool CFindUtilWestern::Match(const TDesC& aContactsField, const TDesC& aWord) { - if ( iFindUtilKorean && ( iFindUtilKorean->IsKoreanLanguage( aContactsField ) || iFindUtilKorean->IsKoreanLanguage( aWord ) ) ) + if ( iFindUtilKorean->IsKoreanLanguage( aContactsField ) || iFindUtilKorean->IsKoreanLanguage( aWord ) ) { return iFindUtilKorean->Match( aContactsField, aWord ); } else { - TInt numChar = 1; + TInt numChar = 1; if (!aContactsField.Length()) { _LIT( KNone, "*" ); @@ -347,24 +342,22 @@ // TBool CFindUtilWestern::MatchRefineL( const TDesC& aItemString, const TDesC& aSearchText ) { - if ( iFindUtilKorean && - ( iFindUtilKorean->IsKoreanLanguage( aItemString ) || - iFindUtilKorean->IsKoreanLanguage( aSearchText ) ) ) + if ( iFindUtilKorean->IsKoreanLanguage( aItemString ) || iFindUtilKorean->IsKoreanLanguage( aSearchText ) ) { return iFindUtilKorean->MatchRefineL( aItemString, aSearchText ); } else + { + if ( aItemString.Length() == 0 ) { - if ( aItemString.Length() == 0 ) - { - return EFalse; - } - - if ( aSearchText.Length() == 0 ) - { - return ETrue; - } - return IsFindMatch( aItemString, aSearchText, iInputLanguage ); + return EFalse; + } + + if ( aSearchText.Length() == 0 ) + { + return ETrue; + } + return IsFindMatch( aItemString, aSearchText, iInputLanguage ); } } @@ -1317,12 +1310,6 @@ { return EFalse; } - - if ( iFindUtilKorean && ( iFindUtilKorean->IsKoreanLanguage( aItemString ) || iFindUtilKorean->IsKoreanLanguage( aSearchText ) ) ) - { - return iFindUtilKorean->MatchAdaptiveRefineL(aItemString,aSearchText,aNextChars); - } - if ( aSearchText.Length() == 0 ) { UpdateNextCharsFromString( aNextChars, aItemString ); diff -r 85902f042028 -r a5e7a4f63858 uiutils/Localizer/group/DirectoryLocalizer.mmp --- a/uiutils/Localizer/group/DirectoryLocalizer.mmp Wed Sep 15 12:29:17 2010 +0300 +++ b/uiutils/Localizer/group/DirectoryLocalizer.mmp Wed Oct 13 14:50:15 2010 +0300 @@ -48,7 +48,7 @@ LIBRARY cone.lib LIBRARY efsrv.lib #ifdef RD_MULTIPLE_DRIVE -LIBRARY platformenv.lib +LIBRARY PlatformEnv.lib #endif //RD_MULTIPLE_DRIVE // End of file.