--- a/applicationinterworkingfw/ServiceHandler/group/ServiceHandler.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/applicationinterworkingfw/ServiceHandler/group/ServiceHandler.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -71,7 +71,6 @@
LIBRARY efsrv.lib
LIBRARY estor.lib
LIBRARY eikcore.lib
-LIBRARY aknnotify.lib
START WINS
END
--- a/applicationinterworkingfw/ServiceHandler/src/AiwServiceHandlerImpl.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/applicationinterworkingfw/ServiceHandler/src/AiwServiceHandlerImpl.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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<TInt>& 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;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()));
-
- }
// CCoeEnv/CEikonEnv needs to be accessible.
if(!iCoeEnv)
{
@@ -675,16 +592,11 @@
}
}
}
-
- _AKNTRACE_FUNC_EXIT;
}
TInt CAiwServiceHandlerImpl::ServiceCmdByMenuCmd(TInt aMenuCmdId) const
{
- _AKNTRACE_FUNC_ENTER;
- _AKNTRACE("aMenuCmdId:%x",aMenuCmdId);
-
for (TInt i = 0; i < iMenuBindings.Count(); i++)
{
if ((IsInLastInitialized(iMenuBindings[i]->MenuPane())) &&
@@ -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<CAiwCriteriaItem>& 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<CAiwCriteriaItem>* interestArray =
reinterpret_cast<RPointerArray<CAiwCriteriaItem>*> ( aAny );
- interestArray->ResetAndDestroy();
-
- _AKNTRACE_FUNC_EXIT;
+ interestArray->ResetAndDestroy();
}
void FilteredCleanup( TAny* aAny )
{
- _AKNTRACE_FUNC_ENTER;
-
RPointerArray<CAiwCriteriaItem>* filteredArray =
reinterpret_cast<RPointerArray<CAiwCriteriaItem>*> ( aAny );
- filteredArray->Reset();
-
- _AKNTRACE_FUNC_EXIT;
+ filteredArray->Reset();
}
void IntArrayCleanup(TAny* aAny)
{
- _AKNTRACE_FUNC_ENTER;
-
RArray<TInt>* intArray =
reinterpret_cast<RArray<TInt>*> ( 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<CAiwCriteriaItem>& aOriginal,
RPointerArray<CAiwCriteriaItem>& 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<CAiwServiceHandlerImpl*>(aImpl);
TRAPD(err, impl->SynchronizeDbL());
-
- _AKNTRACE_FUNC_EXIT;
-
return err;
}
@@ -2065,8 +1775,6 @@
void CAiwServiceHandlerImpl::SynchronizeDbL()
{
- _AKNTRACE_FUNC_ENTER;
-
TInt i;
RArray<TInt> providers;
RImplInfoPtrArray infoArray;
@@ -2090,16 +1798,12 @@
}
CleanupStack::PopAndDestroy(2); // providers, infoArray
-
- _AKNTRACE_FUNC_EXIT;
}
void CAiwServiceHandlerImpl::HandleRemovedProviders(RArray<TInt>& 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<TInt>& 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
--- a/classicui_plat/aiw_provider_utility_api/tsrc/group/testdomaiwpro.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/aiw_provider_utility_api/tsrc/group/testdomaiwpro.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/aiw_service_interface_base_api/tsrc/group/testdomserviceib.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/aiw_service_interface_base_api/tsrc/group/testdomserviceib.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -52,9 +52,9 @@
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
-LIBRARY servicehandler.lib
+LIBRARY ServiceHandler.lib
LANG SC
--- a/classicui_plat/aiw_service_interface_menu_api/tsrc/group/testdomserviceim.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/aiw_service_interface_menu_api/tsrc/group/testdomserviceim.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/alarm_api/tsrc/group/testdomalarm.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/alarm_api/tsrc/group/testdomalarm.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/application_switching_api/tsrc/group/testdomapplicationswitching.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/application_switching_api/tsrc/group/testdomapplicationswitching.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/avkon_fonts_api/tsrc/group/testdomakfonts.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/avkon_fonts_api/tsrc/group/testdomakfonts.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/avkon_localised_texts_api/loc/avkon.loc Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/avkon_localised_texts_api/loc/avkon.loc Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/avkon_secondary_display_support_api/tsrc/group/testdomasds.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/avkon_secondary_display_support_api/tsrc/group/testdomasds.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/avkon_settings_api/inc/AvkonInternalCRKeys.h Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/avkon_settings_api/inc/AvkonInternalCRKeys.h Fri Oct 22 15:49:04 2010 +0100
@@ -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 };
--- a/classicui_plat/avkon_testability_api/tsrc/group/testplattestability.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/avkon_testability_api/tsrc/group/testplattestability.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/avkon_ui_server_api/tsrc/group/testdomuiserver.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/avkon_ui_server_api/tsrc/group/testdomuiserver.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/battery_pane_api/tsrc/group/testdombatterypane.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/battery_pane_api/tsrc/group/testdombatterypane.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group/testdomcfdfilterfactory.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/common_file_dialogs_filter_factory_api/tsrc/group/testdomcfdfilterfactory.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/custom_cursors_api/tsrc/group/testdomcustomcursors.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/custom_cursors_api/tsrc/group/testdomcustomcursors.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/eikon_server_extension_client_api/tsrc/group/testdomesec.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/eikon_server_extension_client_api/tsrc/group/testdomesec.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/emergency_call_support_api/tsrc/group/testdomemergencycallsupport.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/emergency_call_support_api/tsrc/group/testdomemergencycallsupport.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/extended_aiw_criteria_api/tsrc/group/testdomextaiwcriteria.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_aiw_criteria_api/tsrc/group/testdomextaiwcriteria.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/extended_animation_api/tsrc/group/testdomextanimation.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_animation_api/tsrc/group/testdomextanimation.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/extended_buttons_api/tsrc/group/testdomextbuttons.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_buttons_api/tsrc/group/testdomextbuttons.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/extended_editors_api/inc/AknPhoneNumberEditor.h Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_editors_api/inc/AknPhoneNumberEditor.h Fri Oct 22 15:49:04 2010 +0100
@@ -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 .
--- a/classicui_plat/extended_editors_api/tsrc/group/testdomeditor.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_editors_api/tsrc/group/testdomeditor.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/extended_grids_api/tsrc/group/testdomgrids.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_grids_api/tsrc/group/testdomgrids.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/extended_indicators_api/tsrc/group/testdomindicator.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_indicators_api/tsrc/group/testdomindicator.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/extended_initialization_api/tsrc/group/testdomextinit.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_initialization_api/tsrc/group/testdomextinit.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/extended_input_capabilities_api/tsrc/group/testdominputcap.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_input_capabilities_api/tsrc/group/testdominputcap.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -50,7 +50,7 @@
SOURCE testdominputcapext.cpp
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
LIBRARY eikctl.lib
--- a/classicui_plat/extended_lists_api/tsrc/group/testdomlists.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_lists_api/tsrc/group/testdomlists.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/extended_notes_api/tsrc/group/testdomextnotes.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_notes_api/tsrc/group/testdomextnotes.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/extended_notifiers_api/inc/AknSignalNotify.h Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_notifiers_api/inc/AknSignalNotify.h Fri Oct 22 15:49:04 2010 +0100
@@ -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__
--- a/classicui_plat/extended_notifiers_api/tsrc/group/testdomextnotifiers.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_notifiers_api/tsrc/group/testdomextnotifiers.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/extended_options_menu_api/inc/aknitemactionmenu.h Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_options_menu_api/inc/aknitemactionmenu.h Fri Oct 22 15:49:04 2010 +0100
@@ -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"
@@ -238,13 +238,6 @@
* @return ETrue if collection has marked items.
*/
TBool CollectionHasMarkedItems();
-
- /**
- * Hides this item action menu.
- *
- * @internal
- */
- void HideMenu();
private:
--- a/classicui_plat/extended_options_menu_api/tsrc/group/testdomoptionsmenu.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_options_menu_api/tsrc/group/testdomoptionsmenu.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/extended_setting_pages_api/tsrc/group/testdomsetpage.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_setting_pages_api/tsrc/group/testdomsetpage.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/extended_sounds_api/tsrc/group/testplatextsound.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_sounds_api/tsrc/group/testplatextsound.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/extended_status_pane_api/inc/aknsgcc.h Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_status_pane_api/inc/aknsgcc.h Fri Oct 22 15:49:04 2010 +0100
@@ -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();
--- a/classicui_plat/extended_status_pane_api/tsrc/group/testdomstatuspane.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_status_pane_api/tsrc/group/testdomstatuspane.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/extended_utilities_api/tsrc/group/testdomextendedutlts.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/extended_utilities_api/tsrc/group/testdomextendedutlts.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/find_item_ui_api/inc/finditemdialog.h Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/find_item_ui_api/inc/finditemdialog.h Fri Oct 22 15:49:04 2010 +0100
@@ -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();
--- a/classicui_plat/find_item_ui_api/inc/finditemmenu.h Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/find_item_ui_api/inc/finditemmenu.h Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/find_item_ui_api/tsrc/group/testdomfinditem.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/find_item_ui_api/tsrc/group/testdomfinditem.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/ganes_api/inc/ganes/HgVgMediaWall.h Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/ganes_api/inc/ganes/HgVgMediaWall.h Fri Oct 22 15:49:04 2010 +0100
@@ -808,8 +808,6 @@
TBool iObserverNotified;
TRect iOpenedItemRect;
-
- TBool iRotatedDraw;
};
--- a/classicui_plat/ganes_api/tsrc/group/testplatgane.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/ganes_api/tsrc/group/testplatgane.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/generic_parameter_api/tsrc/group/testdomgenparam.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/generic_parameter_api/tsrc/group/testdomgenparam.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/global_popup_priority_controller_api/tsrc/group/testdomgppc.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/global_popup_priority_controller_api/tsrc/group/testdomgppc.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/indicator_plugin_api/tsrc/group/testdomindiplugin.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/indicator_plugin_api/tsrc/group/testdomindiplugin.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -54,7 +54,7 @@
SOURCE testdomindipluginext.cpp
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
LIBRARY avkon.lib
--- a/classicui_plat/input_block_api/tsrc/group/testdominputblk.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/input_block_api/tsrc/group/testdominputblk.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -52,9 +52,9 @@
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
-LIBRARY avkon.lib
+LIBRARY Avkon.lib
LANG SC
--- a/classicui_plat/item_finder_api/tsrc/group/testdomitemfinder.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/item_finder_api/tsrc/group/testdomitemfinder.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/japanese_reading_api/tsrc/group/testdomjapanesereading.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/japanese_reading_api/tsrc/group/testdomjapanesereading.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/key_rotator_api/tsrc/group/testdomkeyrotator.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/key_rotator_api/tsrc/group/testdomkeyrotator.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/layout_configuration_api/tsrc/group/testdomlayoutcfg.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/layout_configuration_api/tsrc/group/testdomlayoutcfg.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -49,7 +49,7 @@
SOURCE testdomlayoutcfgblocks.cpp
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
LIBRARY avkon.lib
--- a/classicui_plat/list_effects_api/tsrc/group/testdomlisteffects.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/list_effects_api/tsrc/group/testdomlisteffects.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/long_tap_animation_api/tsrc/group/testdomlongtap.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/long_tap_animation_api/tsrc/group/testdomlongtap.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -49,7 +49,7 @@
SOURCE testdomlongtapblocks.cpp
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
LIBRARY avkon.lib
--- a/classicui_plat/media_shared_document_api/tsrc/group/testdommediashareddoc.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/media_shared_document_api/tsrc/group/testdommediashareddoc.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/memory_card_ui_api/tsrc/group/testdommemorycard.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/memory_card_ui_api/tsrc/group/testdommemorycard.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -49,7 +49,7 @@
SOURCE testdommemorycardblocks.cpp
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
LIBRARY aknmemorycardui.lib
--- a/classicui_plat/number_grouping_api/tsrc/group/testdomnumbergrouping.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/number_grouping_api/tsrc/group/testdomnumbergrouping.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/personalisation_framework_api/tsrc/group/testdompslnframework.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/personalisation_framework_api/tsrc/group/testdompslnframework.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/phone_number_text_utilities_api/tsrc/group/testdomphonecontentutil.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/phone_number_text_utilities_api/tsrc/group/testdomphonecontentutil.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/physics_api/tsrc/group/testplatphysics.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/physics_api/tsrc/group/testplatphysics.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/pointer_event_modifier_api/tsrc/group/testdompoieventmod.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/pointer_event_modifier_api/tsrc/group/testdompoieventmod.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/popup_form_api/tsrc/group/testdompopupform.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/popup_form_api/tsrc/group/testdompopupform.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -65,7 +65,7 @@
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
LIBRARY avkon.lib
LIBRARY cone.lib
--- a/classicui_plat/server_application_services_api/tsrc/group/testdomserverappservice.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/server_application_services_api/tsrc/group/testdomserverappservice.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/signal_pane_api/inc/aknsignal.h Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/signal_pane_api/inc/aknsignal.h Fri Oct 22 15:49:04 2010 +0100
@@ -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();
--- a/classicui_plat/signal_pane_api/tsrc/group/testdomsignalpane.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/signal_pane_api/tsrc/group/testdomsignalpane.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/skinnable_clock_api/tsrc/group/testdomskinnableclock.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/skinnable_clock_api/tsrc/group/testdomskinnableclock.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/special_character_table_api/inc/AknCharMap.h Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/special_character_table_api/inc/AknCharMap.h Fri Oct 22 15:49:04 2010 +0100
@@ -412,7 +412,6 @@
TInt Category();
TBool IsSupportCategoryButtonUi() const;
TBool IsJapaneseSctUi() const;
- TBool IsKoreanSctUi() const;
const TDesC* TitleWithSelectingSpecialChar();
private:
--- a/classicui_plat/special_character_table_api/inc/AknSctDialog.h Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/special_character_table_api/inc/AknSctDialog.h Fri Oct 22 15:49:04 2010 +0100
@@ -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:
--- a/classicui_plat/special_character_table_api/inc/AknSmileyUtils.h Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/special_character_table_api/inc/AknSmileyUtils.h Fri Oct 22 15:49:04 2010 +0100
@@ -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();
--- a/classicui_plat/special_character_table_api/tsrc/group/testdomspecialchartab.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/special_character_table_api/tsrc/group/testdomspecialchartab.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/stylus_activated_popup_api/tsrc/group/testdomstylusactivepopup.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/stylus_activated_popup_api/tsrc/group/testdomstylusactivepopup.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/task_list_api/tsrc/group/testdomtasklist.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/task_list_api/tsrc/group/testdomtasklist.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/text_scroller_api/tsrc/group/testdomtextscroller.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/text_scroller_api/tsrc/group/testdomtextscroller.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/touch_gesture_framework_api/tsrc/group/akntouchgesturefwtest.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/touch_gesture_framework_api/tsrc/group/akntouchgesturefwtest.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/touch_pane_api/tsrc/group/testsdktouchpane.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/touch_pane_api/tsrc/group/testsdktouchpane.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/transition_effect_parameters_api/tsrc/group/testdomtransitioneffectpara.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/transition_effect_parameters_api/tsrc/group/testdomtransitioneffectpara.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -49,7 +49,7 @@
SOURCE testdomtransitioneffectparablocks.cpp
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
LANG SC
--- a/classicui_plat/transition_effect_utilities_api/tsrc/group/testdomtransitioneffectutilities.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/transition_effect_utilities_api/tsrc/group/testdomtransitioneffectutilities.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_plat/volume_popup_api/tsrc/group/testdomvolumepopup.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_plat/volume_popup_api/tsrc/group/testdomvolumepopup.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/aiw_criteria_api/tsrc/group/testsdkaiwcri.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/aiw_criteria_api/tsrc/group/testsdkaiwcri.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/aiw_generic_parameter_api/inc/AiwGenericParam.hrh Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/aiw_generic_parameter_api/inc/AiwGenericParam.hrh Fri Oct 22 15:49:04 2010 +0100
@@ -192,12 +192,6 @@
EGenericParamLastName = 1921,
EGenericParamNickname = 1922
// BRANCH_END 08-28-08: gronoff
-
- ,
- EGenericParamHideCallSubmenu = 1950,
- EGenericParamVoiceCall = 1951,
- EGenericParamVideoCall = 1952,
- EGenericParamVoIPCall = 1953
};
--- a/classicui_pub/aiw_generic_parameter_api/tsrc/group/testsdkaiwgp.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/aiw_generic_parameter_api/tsrc/group/testsdkaiwgp.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/aiw_service_handler_api/tsrc/group/testsdkaiwservicehandler.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/aiw_service_handler_api/tsrc/group/testsdkaiwservicehandler.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/animation_api/tsrc/group/testsdkanimation.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/animation_api/tsrc/group/testsdkanimation.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/application_framework_api/tsrc/group/testsdkappfw.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/application_framework_api/tsrc/group/testsdkappfw.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/base_controls_api/tsrc/group/testsdkbasecontrols.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/base_controls_api/tsrc/group/testsdkbasecontrols.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/buttons_api/tsrc/group/testsdkbuttons.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/buttons_api/tsrc/group/testsdkbuttons.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/choice_list_api/tsrc/group/testsdkchoicelist.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/choice_list_api/tsrc/group/testsdkchoicelist.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/common_file_dialogs_api/tsrc/group/testsdkcfd.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/common_file_dialogs_api/tsrc/group/testsdkcfd.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/context_pane_api/tsrc/group/testsdkcontextpane.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/context_pane_api/tsrc/group/testsdkcontextpane.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/dialog_shutter_api/tsrc/group/testsdkdialogshutter.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/dialog_shutter_api/tsrc/group/testsdkdialogshutter.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/dialogs_api/tsrc/group/testsdkdialogs.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/dialogs_api/tsrc/group/testsdkdialogs.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/document_handler_api/tsrc/group/testsdkdocumenthandler.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/document_handler_api/tsrc/group/testsdkdocumenthandler.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/editors_api/inc/EIKEDWIN.H Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/editors_api/inc/EIKEDWIN.H Fri Oct 22 15:49:04 2010 +0100
@@ -500,23 +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;
};
public:
@@ -2402,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:
/**
@@ -2803,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 );
@@ -2836,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;
@@ -3155,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:
/**
--- a/classicui_pub/editors_api/tsrc/group/testsdkeditors.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/editors_api/tsrc/group/testsdkeditors.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/error_ui_api/tsrc/group/testsdkerrui.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/error_ui_api/tsrc/group/testsdkerrui.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/fonts_api/tsrc/group/testsdkfonts.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/fonts_api/tsrc/group/testsdkfonts.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/form_api/tsrc/group/testsdkform.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/form_api/tsrc/group/testsdkform.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/generic_button_api/inc/AknButton.h Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/generic_button_api/inc/AknButton.h Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/generic_button_api/tsrc/group/testsdkgenericbutton.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/generic_button_api/tsrc/group/testsdkgenericbutton.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/grids_api/tsrc/group/testsdkgrids.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/grids_api/tsrc/group/testsdkgrids.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/hierarchical_lists_api/tsrc/group/testsdkhierarchicallists.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/hierarchical_lists_api/tsrc/group/testsdkhierarchicallists.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/hotkeys_api/tsrc/group/testsdkeikhkeyt.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/hotkeys_api/tsrc/group/testsdkeikhkeyt.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/images_api/tsrc/group/testsdkimages.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/images_api/tsrc/group/testsdkimages.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/indicators_api/tsrc/group/testsdkindicators.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/indicators_api/tsrc/group/testsdkindicators.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/info_popup_note_api/tsrc/group/testsdkinfopopupnote.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/info_popup_note_api/tsrc/group/testsdkinfopopupnote.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/information_preview_popup_api/inc/AknPreviewPopUpController.h Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/information_preview_popup_api/inc/AknPreviewPopUpController.h Fri Oct 22 15:49:04 2010 +0100
@@ -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"
--- a/classicui_pub/information_preview_popup_api/tsrc/group/testsdkinformationpreviewpopup.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/information_preview_popup_api/tsrc/group/testsdkinformationpreviewpopup.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/initialization_api/tsrc/group/testsdkinitialization.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/initialization_api/tsrc/group/testsdkinitialization.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/input_frame_api/tsrc/group/testsdkif.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/input_frame_api/tsrc/group/testsdkif.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/keylock_api/tsrc/group/testsdkkeylock.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/keylock_api/tsrc/group/testsdkkeylock.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -49,7 +49,7 @@
SOURCE testsdkkeylockblocks.cpp
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
LIBRARY avkon.lib
--- a/classicui_pub/labels_api/tsrc/group/testsdklabels.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/labels_api/tsrc/group/testsdklabels.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -72,7 +72,7 @@
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
LIBRARY eikcoctl.lib
LIBRARY gdi.lib
--- a/classicui_pub/lists_api/inc/EIKLBO.H Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/lists_api/inc/EIKLBO.H Fri Oct 22 15:49:04 2010 +0100
@@ -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:
--- a/classicui_pub/lists_api/inc/EIKLBV.H Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/lists_api/inc/EIKLBV.H Fri Oct 22 15:49:04 2010 +0100
@@ -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:
--- a/classicui_pub/lists_api/inc/EIKLBX.H Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/lists_api/inc/EIKLBX.H Fri Oct 22 15:49:04 2010 +0100
@@ -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 );
--- a/classicui_pub/lists_api/tsrc/group/testsdklists.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/lists_api/tsrc/group/testsdklists.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/misc_controls_api/tsrc/group/testsdkmisccontrols.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/misc_controls_api/tsrc/group/testsdkmisccontrols.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/navigation_pane_api/tsrc/group/testsdknavipane.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/navigation_pane_api/tsrc/group/testsdknavipane.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -78,7 +78,7 @@
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
LIBRARY avkon.lib
LIBRARY bafl.lib
--- a/classicui_pub/notes_api/inc/aknnotecontrol.h Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/notes_api/inc/aknnotecontrol.h Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/notes_api/tsrc/group/testsdknotes.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/notes_api/tsrc/group/testsdknotes.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/notifiers_api/tsrc/group/testsdknotifiers.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/notifiers_api/tsrc/group/testsdknotifiers.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/options_menu_api/tsrc/group/testsdkoptionsmenu.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/options_menu_api/tsrc/group/testsdkoptionsmenu.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/popups_api/tsrc/group/testsdkpopups.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/popups_api/tsrc/group/testsdkpopups.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/private_ui_framework_api/inc/EIKDPAGE.H Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/private_ui_framework_api/inc/EIKDPAGE.H Fri Oct 22 15:49:04 2010 +0100
@@ -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;
--- a/classicui_pub/private_ui_framework_api/tsrc/group/testsdkprivateuiframework.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/private_ui_framework_api/tsrc/group/testsdkprivateuiframework.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -50,7 +50,7 @@
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
LIBRARY eikcoctl.lib
LIBRARY eikcore.lib
--- a/classicui_pub/queries_api/tsrc/group/testsdkqueries.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/queries_api/tsrc/group/testsdkqueries.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/screen_clearer_api/tsrc/group/testsdkscreenclearer.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/screen_clearer_api/tsrc/group/testsdkscreenclearer.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/screen_mode_api/tsrc/group/testsdkscreenmode.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/screen_mode_api/tsrc/group/testsdkscreenmode.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/screen_saver_api/tsrc/group/testsdkscreensaver.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/screen_saver_api/tsrc/group/testsdkscreensaver.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -37,7 +37,7 @@
SOURCE testsdkscreensaverblocks.cpp
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
LIBRARY ecom.lib
--- a/classicui_pub/scroller_api/tsrc/group/testsdkscroller.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/scroller_api/tsrc/group/testsdkscroller.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/searchfield_api/tsrc/group/testsdksearchfield.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/searchfield_api/tsrc/group/testsdksearchfield.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/server_application_api/tsrc/group/testsdkserverapplication.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/server_application_api/tsrc/group/testsdkserverapplication.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -41,7 +41,7 @@
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
LIBRARY avkon.lib
LIBRARY apparc.lib
--- a/classicui_pub/setting_pages_api/tsrc/group/testsdksettingpages.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/setting_pages_api/tsrc/group/testsdksettingpages.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/slider_api/tsrc/group/testsdkslider.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/slider_api/tsrc/group/testsdkslider.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/sounds_api/tsrc/group/testsdksounds.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/sounds_api/tsrc/group/testsdksounds.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/status_pane_api/tsrc/group/testsdkstatuspane.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/status_pane_api/tsrc/group/testsdkstatuspane.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/stylus_popup_menu_api/inc/aknstyluspopupmenu.h Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/stylus_popup_menu_api/inc/aknstyluspopupmenu.h Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/stylus_popup_menu_api/tsrc/group/testsdkstyluspopupmenu.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/stylus_popup_menu_api/tsrc/group/testsdkstyluspopupmenu.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tabs_api/inc/akntabgrp.h Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tabs_api/inc/akntabgrp.h Fri Oct 22 15:49:04 2010 +0100
@@ -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,13 +863,6 @@
void SetNaviArrowsVisible( TBool aVisible );
private:
- /**
- * Resets the highlight status for tabs
- */
- void ResetHighlightStatus();
-
-
-private:
CArrayPtr<CAknTab>* iTabArray;
TInt iActiveTab;
TRect iSpareRect;
--- a/classicui_pub/tabs_api/tsrc/group/testsdktabgrp.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tabs_api/tsrc/group/testsdktabgrp.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/title_pane_api/tsrc/group/testsdktitlepane.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/title_pane_api/tsrc/group/testsdktitlepane.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -68,7 +68,7 @@
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
LIBRARY avkon.lib
LIBRARY bafl.lib
--- a/classicui_pub/toolbar_api/tsrc/group/testsdktoolbar.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/toolbar_api/tsrc/group/testsdktoolbar.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -68,7 +68,7 @@
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
LIBRARY avkon.lib
LIBRARY eikcoctl.lib
--- a/classicui_pub/touch_ui_utilities_api/tsrc/group/testsdktouchuiutil.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/touch_ui_utilities_api/tsrc/group/testsdktouchuiutil.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -52,7 +52,7 @@
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
LIBRARY avkon.lib
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestaknsound/group/bctestaknsound.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestaknsound/group/bctestaknsound.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestappfrm/group/bctestappfrm.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestappfrm/group/bctestappfrm.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestbuttons/group/bctestbuttons.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestbuttons/group/bctestbuttons.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestcmdlg/group/bctestcmdlg.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestcmdlg/group/bctestcmdlg.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestdocandinit/group/bctestDocAndInit.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestdocandinit/group/bctestDocAndInit.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteditor/group/bctesteditor.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteditor/group/bctesteditor.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteh/group/bctesteh.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteh/group/bctesteh.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteikbctrl/group/bctesteikbctrl.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteikbctrl/group/bctesteikbctrl.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteikfrm/group/bctesteikfrm.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctesteikfrm/group/bctesteikfrm.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestfontinput/group/bctestfontinput.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestfontinput/group/bctestfontinput.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestform/group/bctestForm.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestform/group/bctestForm.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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.
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestgrids/group/bctestgrids.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestgrids/group/bctestgrids.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestimage/group/bctestimage.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestimage/group/bctestimage.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestkeylock/group/bctestkeylock.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestkeylock/group/bctestkeylock.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestlabelinfoindicators/group/bctestlabelinfoindicators.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestlabelinfoindicators/group/bctestlabelinfoindicators.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestlist/group/bctestlist.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestlist/group/bctestlist.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestmenu/group/bctestmenu.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestmenu/group/bctestmenu.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestmisccontrol/group/bctestmisccontrol.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestmisccontrol/group/bctestmisccontrol.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestnote/group/bctestnote.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestnote/group/bctestnote.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestnotifier/group/bctestnotifier.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestnotifier/group/bctestnotifier.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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:
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestpane/group/bctestpane.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestpane/group/bctestpane.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestpopups/group/bctestpopups.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestpopups/group/bctestpopups.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestprivateuifrm/group/bctestprivateuifrm.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestprivateuifrm/group/bctestprivateuifrm.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestptieng/group/bctestptieng.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestptieng/group/bctestptieng.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestquery/group/bctestquery.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestquery/group/bctestquery.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestscreenclearer/group/bctestscreenclearer.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestscreenclearer/group/bctestscreenclearer.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestscrollerbar/group/bctestscroller.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestscrollerbar/group/bctestscroller.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsearchfield/group/bctestsearchfield.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsearchfield/group/bctestsearchfield.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestserverapp/group/bctestserverapp.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestserverapp/group/bctestserverapp.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsettingpage/group/bctestsettingpage.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsettingpage/group/bctestsettingpage.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestskins/group/bctestskins.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestskins/group/bctestskins.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsliderandicons/group/bctestsliderandicons.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestsliderandicons/group/bctestsliderandicons.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestutilities/group/bctestutilities.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestutilities/group/bctestutilities.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestvolume/group/bctestvolume.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.0/bctestvolume/group/bctestvolume.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestlocation/group/bctestlocation.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestlocation/group/bctestlocation.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestmisc/group/bctestmisc.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestmisc/group/bctestmisc.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestocr/group/bctestocr.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.1/bctestocr/group/bctestocr.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestlocalizer/group/bctestlocalizer.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestlocalizer/group/bctestlocalizer.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestmisc32/group/bctestmisc32.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestmisc32/group/bctestmisc32.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestpreviewpopup/group/bctestpreviewpopup.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestpreviewpopup/group/bctestpreviewpopup.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestservicehandler/group/bctestservicehandler.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestservicehandler/group/bctestservicehandler.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestuniteditor/group/bctestuniteditor.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK3.2/bctestuniteditor/group/bctestuniteditor.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestbutton/group/bctestbutton.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestbutton/group/bctestbutton.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestchoicelist/group/bctestchoicelist.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestchoicelist/group/bctestchoicelist.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestpane/group/bctestpane.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctestpane/group/bctestpane.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttoolbar/group/bctesttoolbar.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttoolbar/group/bctesttoolbar.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttouchpane/group/bctesttouchpane.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttouchpane/group/bctesttouchpane.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttreelist/group/bctesttreelist.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/S60_SDK5.0/bctesttreelist/group/bctesttreelist.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/bctestlauncher/group/bctestlauncher.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/bctestlauncher/group/bctestlauncher.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/bctesttemplate/group/bctesttemplate.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/bctesttemplate/group/bctesttemplate.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/tsrc/bc/apps/bctestutil/group/bctestutil.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/tsrc/bc/apps/bctestutil/group/bctestutil.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/ui_framework_definitions_api/inc/EIKON.HRH Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/ui_framework_definitions_api/inc/EIKON.HRH Fri Oct 22 15:49:04 2010 +0100
@@ -222,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
--- a/classicui_pub/ui_framework_definitions_api/inc/avkon.hrh Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/ui_framework_definitions_api/inc/avkon.hrh Fri Oct 22 15:49:04 2010 +0100
@@ -1306,16 +1306,7 @@
EAknSignalHsdpaIndicatorEstablishingContext,
EAknSignalHsdpaIndicatorContext,
EAknSignalHsdpaIndicatorSuspended,
- EAknSignalHsdpaIndicatorMultipdp,
-
- // UMA indicator states
- EAknSignalUmaIndicatorOff = 0x600,
- EAknSignalUmaIndicatorAvailable,
- EAknSignalUmaIndicatorAttached,
- EAknSignalUmaIndicatorEstablishingContext,
- EAknSignalUmaIndicatorContext,
- EAknSignalUmaIndicatorSuspended,
- EAknSignalUmaIndicatorMultipdp
+ EAknSignalHsdpaIndicatorMultipdp
};
#define KAknSignalOffLineMode 0x00010000
--- a/classicui_pub/ui_framework_definitions_api/tsrc/group/testsdkuiframedefinitions.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/ui_framework_definitions_api/tsrc/group/testsdkuiframedefinitions.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -49,7 +49,7 @@
SOURCE testsdkuiframedefinitionsblocks.cpp
LIBRARY euser.lib
-LIBRARY StifTestInterface.lib
+LIBRARY stiftestinterface.lib
LIBRARY stiftestengine.lib
LIBRARY avkon.lib
--- a/classicui_pub/ui_framework_utilities_api/tsrc/group/testsdkuifwutil.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/ui_framework_utilities_api/tsrc/group/testsdkuifwutil.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/uikon_core_controls/tsrc/group/testsdkuikoncc.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/uikon_core_controls/tsrc/group/testsdkuikoncc.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/volume_control_api/tsrc/group/testsdkvolumecontrol.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/volume_control_api/tsrc/group/testsdkvolumecontrol.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/classicui_pub/window_server_event_observer_api/tsrc/group/testsdkwinsereventobserver.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/classicui_pub/window_server_event_observer_api/tsrc/group/testsdkwinsereventobserver.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/commonuis/CommonDialogs/group/CommonDialogs.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/commonuis/CommonDialogs/group/CommonDialogs.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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"
--- a/commonuis/CommonDialogs/group_test/CommonDialogs.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/commonuis/CommonDialogs/group_test/CommonDialogs.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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"
--- a/commonuis/CommonDialogs/src/AknCFDUtility.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/commonuis/CommonDialogs/src/AknCFDUtility.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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());
Binary file commonuis/CommonUi/CenRep/keys_commonui.xls has changed
--- a/commonuis/CommonUi/EABI/CommonUIU.DEF Fri Sep 17 17:57:10 2010 +0100
+++ b/commonuis/CommonUi/EABI/CommonUIU.DEF Fri Oct 22 15:49:04 2010 +0100
@@ -121,6 +121,4 @@
_ZN12MPBAiwNotify13HandleNotifyLEiiR20CAiwGenericParamListRKS0_ @ 120 NONAME
_ZN11CItemFinder22SetItemFinderObserverLEP22MAknItemFinderObserver @ 121 NONAME
_ZN15CFindItemDialog17EnableSingleClickEi @ 122 NONAME
- _ZN13CFindItemMenu24SetCallSubMenuVisibilityEi @ 123 NONAME
- _ZN15CFindItemDialog24SetCallSubMenuVisibilityEi @ 124 NONAME
--- a/commonuis/CommonUi/bwins/CommonUIU.def Fri Sep 17 17:57:10 2010 +0100
+++ b/commonuis/CommonUi/bwins/CommonUIU.def Fri Oct 22 15:49:04 2010 +0100
@@ -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)
--- a/commonuis/CommonUi/group/CommonUI.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/commonuis/CommonUi/group/CommonUI.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/commonuis/CommonUi/src/FindItemDialog.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/commonuis/CommonUi/src/FindItemDialog.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/commonuis/CommonUi/src/FindItemMenu.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/commonuis/CommonUi/src/FindItemMenu.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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;
}
@@ -887,8 +889,7 @@
if ( ( !iHideCallMenu ||
( iFindItemVoIPExtension->IsVoIPSupported() &&
iFindItemVoIPExtension->VoIPProfilesExistL() ) ) &&
- iMenuPane->MenuItemExists( EFindItemCmdCall, dummy ) &&
- !iHideCallSubMenu )
+ iMenuPane->MenuItemExists( EFindItemCmdCall, dummy ) )
{
iMenuPane->SetItemDimmed( EFindItemCmdCall, ETrue );
iMenuPane->AddMenuItemsL(
@@ -897,18 +898,6 @@
}
}
-
-// -----------------------------------------------------------------------------
-// CFindItemMenu::SetCallSubMenuVisibility
-// Sets AIW submenu visibility
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CFindItemMenu::SetCallSubMenuVisibility( TBool aVisible )
- {
- iHideCallSubMenu = !aVisible;
- }
-
-
EXPORT_C void CFindItemMenu::HandleItemFinderCommandL( TInt aCommand )
{
switch ( aCommand )
--- a/commonuis/CommonUi/src/ItemFinder.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/commonuis/CommonUi/src/ItemFinder.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -38,7 +38,6 @@
#include <centralrepository.h>
#include <CommonUiInternalCRKeys.h>
-#include <AknSmileyUtils.h>
// 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<CItemFinder::CFindItemExt>( 10 );
--- a/commonuisupport/uikon/group/BLD.INF Fri Sep 17 17:57:10 2010 +0100
+++ b/commonuisupport/uikon/group/BLD.INF Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/commonuisupport/uikon/srvinc/EIKNFYSV.H Fri Sep 17 17:57:10 2010 +0100
+++ b/commonuisupport/uikon/srvinc/EIKNFYSV.H Fri Oct 22 15:49:04 2010 +0100
@@ -68,12 +68,13 @@
public:
TUid iNotifierUid;
TSecureId iSecureId;
+ TInt iCount;
};
/** @internalComponent */
typedef RArray<const TNotifierMessageInfo> RNotifierMessageInfoQueue;
/** @internalComponent */
-typedef RArray<const TNotifierSecureInfo> RNotifierSecureInfoQueue;
+typedef RArray<TNotifierSecureInfo> RNotifierSecureInfoQueue;
/**
@internalComponent
--- a/commonuisupport/uikon/srvsrc/EIKNFYSV.CPP Fri Sep 17 17:57:10 2010 +0100
+++ b/commonuisupport/uikon/srvsrc/EIKNFYSV.CPP Fri Oct 22 15:49:04 2010 +0100
@@ -219,16 +219,13 @@
//aAction is not set because default value to it is already set(CPolicyServer::EFailClient)
//aMissing is not set because it is not needed as we aren't overriding CheckFailedL
{
- const TUid notifierUid = TUid::Uid(aMsg.Int0());
const TSecureId clientSid = aMsg.SecureId();
-
const TInt count = iAsyncSecureInfoQueue.Count();
for(int i = 0; i < count; i++)
{
if(iAsyncSecureInfoQueue[i].iSecureId == clientSid)
return CPolicyServer::EPass;
}
-
return CPolicyServer::EFail;
}
@@ -448,32 +445,59 @@
const TUid notifierUid = TUid::Uid(aMessage.Int0());
const TSecureId secureId = aMessage.SecureId();
RNotifierSecureInfoQueue& secureInfoQueue = Server().AsyncSecureInfoQueue();
- secureInfoQueue.AppendL(TNotifierSecureInfo(notifierUid, secureId));
+ TInt queueTotal = secureInfoQueue.Count();
+ TBool needsNewEntry = ETrue;
+ TInt indexOfInfo=0;
+ for(indexOfInfo = 0; indexOfInfo < queueTotal; indexOfInfo++)
+ {
+ if (secureInfoQueue[indexOfInfo].iNotifierUid == notifierUid && secureInfoQueue[indexOfInfo].iSecureId == secureId)
+ {
+ secureInfoQueue[indexOfInfo].iCount++;
+ needsNewEntry = EFalse;
+ break;
+ }
+ }
+ if (needsNewEntry)
+ {
+ secureInfoQueue.AppendL(TNotifierSecureInfo(notifierUid, secureId));
+ }
if (!aMessage.Int2()) // if the third parameter is null
{
- TRAPD(err, Server().Manager()->NotifierStartL(TUid::Uid(aMessage.Int0()),*inputBuffer,NULL,iClientId));
- if(err)
- {
- secureInfoQueue.Remove(secureInfoQueue.Count()-1);
- User::Leave(err);
- }
+ TRAPD(err, Server().Manager()->NotifierStartL(TUid::Uid(aMessage.Int0()),*inputBuffer,NULL,iClientId));
+ if(err)
+ {
+ if (needsNewEntry)
+ {
+ secureInfoQueue.Remove(queueTotal);
+ }
+ else
+ {
+ secureInfoQueue[indexOfInfo].iCount--;
+ }
+ User::Leave(err);
+ }
}
else
{
HBufC8* const responseBuffer = HBufC8::NewLC(User::LeaveIfError(aMessage.GetDesMaxLength(2)));
TPtr8 response(responseBuffer->Des());
- TRAPD(err, Server().Manager()->NotifierStartL(TUid::Uid(aMessage.Int0()), *inputBuffer, &response, iClientId));
- if(err)
- {
- secureInfoQueue.Remove(secureInfoQueue.Count()-1);
- User::Leave(err);
- }
-
- aMessage.WriteL(2,response);
- CleanupStack::PopAndDestroy(responseBuffer);
- }
-
+ TRAPD(err, Server().Manager()->NotifierStartL(TUid::Uid(aMessage.Int0()), *inputBuffer, &response, iClientId));
+ if(err)
+ {
+ if (needsNewEntry)
+ {
+ secureInfoQueue.Remove(queueTotal);
+ }
+ else
+ {
+ secureInfoQueue[indexOfInfo].iCount--;
+ }
+ User::Leave(err);
+ }
+ aMessage.WriteL(2,response);
+ CleanupStack::PopAndDestroy(responseBuffer);
+ }
CleanupStack::PopAndDestroy(inputBuffer);
}
@@ -520,12 +544,34 @@
const TUid notifierUid = TUid::Uid(aMessage.Int0());
const TSecureId secureId = aMessage.SecureId();
RNotifierSecureInfoQueue& secureInfoQueue = Server().AsyncSecureInfoQueue();
- secureInfoQueue.AppendL(TNotifierSecureInfo(notifierUid,secureId));
+ TInt queueTotal = secureInfoQueue.Count();
+ TBool needsNewEntry = ETrue;
+ TInt indexOfInfo=0;
+ for(indexOfInfo = 0; indexOfInfo < queueTotal; indexOfInfo++)
+ {
+ if (secureInfoQueue[indexOfInfo].iNotifierUid == notifierUid && secureInfoQueue[indexOfInfo].iSecureId == secureId)
+ {
+ secureInfoQueue[indexOfInfo].iCount++;
+ needsNewEntry = EFalse;
+ break;
+ }
+ }
+ if (needsNewEntry)
+ {
+ secureInfoQueue.AppendL(TNotifierSecureInfo(notifierUid,secureId));
+ }
TRAPD(err, Server().Manager()->NotifierStartAndGetResponseL(TUid::Uid(aMessage.Int0()), *inputBuffer, 2, aMessage, iClientId, aCleanupComplete));
if(err)
{
- secureInfoQueue.Remove(secureInfoQueue.Count()-1);
+ if (needsNewEntry)
+ {
+ secureInfoQueue.Remove(queueTotal);
+ }
+ else
+ {
+ secureInfoQueue[indexOfInfo].iCount--;
+ }
User::Leave(err);
}
@@ -566,7 +612,14 @@
{
if(secureInfoQueue[i].iNotifierUid == notifierUid && secureInfoQueue[i].iSecureId == secureId)
{
- secureInfoQueue.Remove(i);
+ if(secureInfoQueue[i].iCount)
+ {
+ secureInfoQueue[i].iCount--;
+ }
+ else
+ {
+ secureInfoQueue.Remove(i);
+ }
return KErrNone;
}
}
@@ -2057,7 +2110,7 @@
//
TNotifierSecureInfo::TNotifierSecureInfo(const TUid aNotifierUid, const TSecureId aSecureId)
- : iNotifierUid(aNotifierUid), iSecureId(aSecureId)
+ : iNotifierUid(aNotifierUid), iSecureId(aSecureId), iCount(0)
{
}
--- a/psln/Group/Psln.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/psln/Group/Psln.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/psln/PslnFramework/PslnFramework.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/psln/PslnFramework/PslnFramework.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/psln/PslnGSPlugin/group/PslnGSPlugin.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/psln/PslnGSPlugin/group/PslnGSPlugin.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/psln/PslnLibraryLoaders/group/pslnprofilesettingsloader.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/psln/PslnLibraryLoaders/group/pslnprofilesettingsloader.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/psln/Src/PslnScreenSaverContainer.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/psln/Src/PslnScreenSaverContainer.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -123,7 +123,6 @@
delete itemBuf;
}
}
- iListBox->HandleItemAdditionL();
// Create pre- and post-text icons.
CPslnFWIconHelper* iconHelper = CPslnFWIconHelper::NewL();
Binary file psln/help/data/xhtml.zip has changed
--- a/psln/pslnengine/group/PslnEngine.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/psln/pslnengine/group/PslnEngine.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/psln/pslnengine/src/PslnModel.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/psln/pslnengine/src/PslnModel.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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,
--- a/psln/pslnslidesetdialog/group/pslnslidesetdialog.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/psln/pslnslidesetdialog/group/pslnslidesetdialog.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/psln/pslnslidesetdialog/src/pslnslidesetdrmverifier.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/psln/pslnslidesetdialog/src/pslnslidesetdrmverifier.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AknGlobalUI/OldStyleNotif/Src/AknNotifyPlugin.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AknGlobalUI/OldStyleNotif/Src/AknNotifyPlugin.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -275,7 +275,7 @@
}
if ( sParams.iGprsState != EAknSignalGprsIndicatorBgTypeWipe &&
- sParams.iGprsState != EAknSignalGprsIndicatorBgTypeSolid &&
+ sParams.iGprsState != EAknNaviPaneBackgroundTypeSolid &&
sParams.iGprsState >= 0 )
{
publisher->SetSignalIcon( sParams.iGprsState );
--- a/uifw/AknGlobalUI/OldStyleNotif/group/AknOldStyleNotif.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AknGlobalUI/OldStyleNotif/group/AknOldStyleNotif.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/EABI/AVKONU.DEF Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/EABI/AVKONU.DEF Fri Oct 22 15:49:04 2010 +0100
@@ -4603,7 +4603,4 @@
_ZN26CAknRadioButtonSettingPage15ProcessCommandLEi @ 4602 NONAME
_ZThn84_N20CAknPopupSettingPage15ProcessCommandLEi @ 4603 NONAME
_ZThn84_N26CAknRadioButtonSettingPage15ProcessCommandLEi @ 4604 NONAME
- _ZN14CAknSignalPane12ShowUmaIconLEi @ 4605 NONAME
- _ZN21CAknPhoneNumberEditor16SetQwertyAllowedEi @ 4606 NONAME
- _ZN21CAknPhoneNumberEditor20SetHybridModeAllowedEi @ 4607 NONAME
--- a/uifw/AvKon/EABI/AknNotifyU.DEF Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/EABI/AknNotifyU.DEF Fri Oct 22 15:49:04 2010 +0100
@@ -150,5 +150,3 @@
_ZN22CAknGlobalListMsgQueryD2Ev @ 149 NONAME
_Z13AknTracePrint11TRefByValueIK7TDesC16Ez @ 150 NONAME
_Z13AknTracePrintPKcz @ 151 NONAME
- _ZN16CAknSignalNotify12SetUmaStateLEi @ 152 NONAME
-
--- a/uifw/AvKon/akncompamode/group/akncompamode.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/akncompamode/group/akncompamode.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/akncompamode/gs/group/akncompags.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/akncompamode/gs/group/akncompags.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/akncompamode/src/akncompakb.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/akncompamode/src/akncompakb.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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)
{
--- a/uifw/AvKon/aknconf/group/aknconf.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/aknconf/group/aknconf.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/aknhlist/group/aknhlist.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/aknhlist/group/aknhlist.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -71,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
@@ -83,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
--- a/uifw/AvKon/aknhlist/src/akntreelistphysicshandler.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/aknhlist/src/akntreelistphysicshandler.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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 )
--- a/uifw/AvKon/aknphysics/group/bld.inf Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/aknphysics/group/bld.inf Fri Oct 22 15:49:04 2010 +0100
@@ -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)
--- a/uifw/AvKon/aknphysics/src/aknphysicsengine.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/aknphysics/src/aknphysicsengine.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -60,11 +60,7 @@
CAknPhysicsEngine::~CAknPhysicsEngine()
{
DeletePhysics();
- if ( iAlfClient )
- {
- iAlfClient->Close();
- delete iAlfClient;
- }
+ delete iAlfClient;
}
--- a/uifw/AvKon/animdllsrc/AknAnimDll.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/animdllsrc/AknAnimDll.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -45,7 +45,7 @@
LIBRARY euser.lib
LIBRARY centralrepository.lib
LIBRARY featmgr.lib
-LIBRARY hwrmlightclient.lib
+LIBRARY HWRMLightClient.lib
LIBRARY tactileclickplugin.lib
EXPORTUNFROZEN
--- a/uifw/AvKon/bwins/AKNNOTIFYU.DEF Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/bwins/AKNNOTIFYU.DEF Fri Oct 22 15:49:04 2010 +0100
@@ -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<const TDesC16> aFmt, ...)
- ?SetUmaStateL@CAknSignalNotify@@QAEXH@Z @ 126 NONAME ; void CAknSignalNotify::SetUmaStateL(int)
-
--- a/uifw/AvKon/bwins/AVKONU.def Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/bwins/AVKONU.def Fri Oct 22 15:49:04 2010 +0100
@@ -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)
Binary file uifw/AvKon/conf/s60/avkon.confml has changed
Binary file uifw/AvKon/conf/s60/avkon_101F876E.crml has changed
--- a/uifw/AvKon/group/Iconlist.txt Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/group/Iconlist.txt Fri Oct 22 15:49:04 2010 +0100
@@ -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
-
--- a/uifw/AvKon/group/avkon.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/group/avkon.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/group/bld.inf Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/group/bld.inf Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/inc/AknSignalIcon.h Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/inc/AknSignalIcon.h Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/inc/AknSmileyModel.h Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/inc/AknSmileyModel.h Fri Oct 22 15:49:04 2010 +0100
@@ -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;
--- a/uifw/AvKon/inc/AknTabGrpGraphics.h Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/inc/AknTabGrpGraphics.h Fri Oct 22 15:49:04 2010 +0100
@@ -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.
--- a/uifw/AvKon/inc/aknindicatorpopupcontent.h Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/inc/aknindicatorpopupcontent.h Fri Oct 22 15:49:04 2010 +0100
@@ -335,11 +335,6 @@
* Current rect of press down effect
*/
TRect iPressedDownRect;
-
- /**
- * Ordinal upon button down
- */
- TInt iOrdinal;
};
#endif // C_AKNINDICATORPOPUPCONTENT_H
--- a/uifw/AvKon/memorycardui/group/AknMemoryCardUi.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/memorycardui/group/AknMemoryCardUi.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -48,7 +48,7 @@
LIBRARY centralrepository.lib
LIBRARY aknnotify.lib
-LIBRARY CommonEngine.lib
+LIBRARY commonengine.lib
LIBRARY platformenv.lib // PathInfo
LIBRARY efsrv.lib // TDriveUnit
--- a/uifw/AvKon/notifsrc/AknSignalNotify.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/notifsrc/AknSignalNotify.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/src/AknAdaptiveSearch.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknAdaptiveSearch.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -245,10 +245,9 @@
{
//hide grid
HideAdaptiveSearchGridL();
- if( iSearchField->IsVisible() )
- {
- iSearchField->SetFocus( ETrue );
- }
+ iSearchField->MakeVisible( ETrue );
+ iSearchField->SetFocus( ETrue );
+
}
else if( aCommand == CAknAdaptiveSearchGrid::EDeleteLastCharPressed )
{
--- a/uifw/AvKon/src/AknBitmapAnimation.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknBitmapAnimation.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -557,7 +557,7 @@
LOCAL_C TInt WaitForUiEffect(TAny* aArg)
{
CAknBitmapAnimation* self = (CAknBitmapAnimation*)aArg;
- TRAP_IGNORE(self->StartAnimationL());
+ self->StartAnimationL();
return EFalse;
}
#endif
--- a/uifw/AvKon/src/AknCharMap.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknCharMap.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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,15 +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
- {
- return FeatureManager::FeatureSupported( KFeatureIdKorean );
- }
// -----------------------------------------------------------------------------
// CAknCharMap::TitleWithSelectingSpecialChar()
// Return the title string with the selecting special characters
@@ -6762,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); i<end; i++ )
+ {
+ TChar code = (*iChars)[i];
+ CAknSmileyIcon* icon = iExtension->EmotionIcon(code);
+ if( !icon )
+ {
+ continue;
+ }
+
+ if( ( aIsActive ) &&
+ ( Extension()->IsShowingEmotion() || Extension()->iMenuSctHighlighted)
+ )
+ {
+ icon->PlayAnimationL( KAnimationRepeat, KAnimationDelay );
+ }
+ else
+ {
+ icon->StopAnimation();
+ }
}
}
--- a/uifw/AvKon/src/AknLayoutUtilsHelpers.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknLayoutUtilsHelpers.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -28,12 +28,16 @@
#include <AknSettingCache.h>
#include <AknsUtils.h>
#include <AknPanic.h>
+#include <txtglobl.h> // CGlobalText
+#include <aknextendedinputcapabilities.h> // 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<CGlobalText*>( 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(
--- a/uifw/AvKon/src/AknListBoxSettingPage.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknListBoxSettingPage.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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;
}
--- a/uifw/AvKon/src/AknPhoneNumberEditor.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknPhoneNumberEditor.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -32,10 +32,6 @@
#include <touchfeedback.h>
#include <aknnotedialog.h>
-#include <e32property.h>
-#include <AvkonInternalCRKeys.h> // for checking qwerty availability
-
-
static const TInt KPlainTextPos = 0;
typedef CArrayFixFlat<CAknPhoneNumberEditor::TFormat> 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<CAknPhoneNumberEditor*>( 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) );
--- a/uifw/AvKon/src/AknPopupField.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknPopupField.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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
{
--- a/uifw/AvKon/src/AknPreviewPopUp.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknPreviewPopUp.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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"
--- a/uifw/AvKon/src/AknProgressDialog.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknProgressDialog.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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();
--- a/uifw/AvKon/src/AknQueryControl.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknQueryControl.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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 );
}
}
@@ -3396,7 +3393,7 @@
to open in input dialog (usability). The valid area is enlarged to editor frame rect,
instead of text's rect, because text rect is too small for user to tap*/
CCoeControl* ctrl = ControlByLayoutOrNull( iQueryType );
- if( ctrl )
+ if( ctrl && !EmbeddedVirtualInput() )
{
TPointerEvent pointerEvent( aPointerEvent );
if( !ctrl->Rect().Contains( aPointerEvent.iPosition ) && ( NbrOfEditorLines() == 1 ) )
@@ -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 );
}
}
--- a/uifw/AvKon/src/AknQueryDialog.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknQueryDialog.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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);
--- a/uifw/AvKon/src/AknRadioButtonSettingPage.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknRadioButtonSettingPage.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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<CAknAppUi*>(
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);
}
--- a/uifw/AvKon/src/AknSctDialog.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknSctDialog.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -56,7 +56,6 @@
#include "aknsctfocushandler.h"
#include <eikdialogext.h>
-#include <aknglobalpopupprioritycontroller.h>
//
// class CAknCharMapDialog
@@ -92,9 +91,6 @@
private:
CAknCharMapDialogExtension(CAknCharMapDialog* aCaller);
void ConstructL();
-
-public: // New method
- void SetCharacterCaseIfRequiredL();
public:
TInt iFlags;
@@ -105,7 +101,7 @@
TInt iShowAnotherTableCharCase;
TAknCharMapPictoMode iPictoMode;
TAknCharMapEmotionMode iEmotionMode;
- TBool iFirstOrientation;
+
};
// -----------------------------------------------------------------------------
@@ -153,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
@@ -222,12 +179,6 @@
{
CAknCharMap* charmapControl = static_cast<CAknCharMap*>( Control( EAknSCTQueryContentId ) );
- if (aType==KEikDynamicLayoutVariantSwitch)
- {
- TRAP_IGNORE(iExtension->SetCharacterCaseIfRequiredL());
- //DoLayout();
- }
-
CAknDialog::HandleResourceChange(aType);
if (aType==KEikDynamicLayoutVariantSwitch)
@@ -297,12 +248,10 @@
// to select multiple characters before.
if (aButtonId == EAknSoftkeyOk || aButtonId == EAknSoftkeySelect || aButtonId == EAknSoftkeyExit)
{
- // In Korean UI, SCT isn't closed by pressing "Select" softkey,
+ // In Japanese UI, SCT isn't closed by pressing "Select" softkey,
// but SCT is closed by pressing "Back"(button id is EAknSoftkeyClose).
- // Japanese feature for SCT will not be supported since TB9.2 PS2,
- // so remove the code for Japanese SCT.
MAknSctFocusHandler* handler = charmapControl->FocusHandler();
- if ( charmapControl->IsKoreanSctUi() &&
+ if (charmapControl->IsJapaneseSctUi() &&
aButtonId != EAknSoftkeyExit &&
handler->FocusedControl() == charmapControl)
{
@@ -399,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 )
@@ -993,8 +937,5 @@
}
}
-TInt CAknCharMapDialog::CharacterCase()
- {
- return iCharCase & KCharMapCaseMask;
- }
+
// End of File
--- a/uifw/AvKon/src/AknServerApp.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknServerApp.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -21,7 +21,6 @@
#include <avkon.hrh>
#include <aknenv.h>
-#include <AknSgcc.h>
#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();
}
--- a/uifw/AvKon/src/AknSettingItemList.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknSettingItemList.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -111,7 +111,7 @@
// -------------------------------
//
-NONSHARABLE_CLASS( CAknSettingItemExtension ) : public CBase
+NONSHARABLE_CLASS( CAknSettingItemExtension ) : CBase
{
public:
--- a/uifw/AvKon/src/AknSettingPage.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknSettingPage.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -592,7 +592,7 @@
iEikonEnv->EikAppUi()->RemoveFromStack(this);
- TRAP_IGNORE(AknItemActionMenuRegister::SetOverridingMenuBarOwnerL( NULL ));
+ AknItemActionMenuRegister::SetOverridingMenuBarOwnerL( NULL );
if (iMenuBar)
{
--- a/uifw/AvKon/src/AknSignalIcon.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknSignalIcon.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -22,7 +22,6 @@
#include <eikenv.h>
#include <akniconconfig.h>
#include <avkon.mbg>
-#include <featmgr.h>
#include <AknTasHook.h>
#include <AvkonInternalCRKeys.h>
@@ -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
--- a/uifw/AvKon/src/AknSkinnableClock.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknSkinnableClock.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -417,7 +417,7 @@
homeTime.HomeTime();
if (iFace)
{
- TRAP_IGNORE(iFace->DrawTimeToBitmapL(rect, gc, homeTime));
+ iFace->DrawTimeToBitmapL(rect, gc, homeTime);
}
}
--- a/uifw/AvKon/src/AknSkinnableClockFace.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknSkinnableClockFace.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -90,6 +90,11 @@
locale.Refresh();
TDigitType digitType( locale.DigitType() );
+ if ( uiLanguage == ELangUrdu )
+ {
+ return EFalse;
+ }
+
return ( AknTextUtils::DigitModeQuery() &&
digitType != EDigitTypeDevanagari );
}
--- a/uifw/AvKon/src/AknSmileyImage.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknSmileyImage.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/src/AknSmileyModel.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknSmileyModel.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -1025,40 +1025,12 @@
}
}
-void CSmileyModel::PlayAnimationL(const TDesC& aText, TInt aRepeat, TInt aDelay)
- {
- for(TInt i(0); i<aText.Length(); i++)
- {
- PlayAnimationL(aText[i], aRepeat, aDelay);
- }
- }
-
-void CSmileyModel::StopAnimation(const TDesC& aText)
- {
- for(TInt i(0); i<aText.Length(); i++)
- {
- StopAnimation(aText[i]);
- }
- }
-
void CSmileyModel::LoadStillImageL(TChar aChar)
{
CSmileyIcon* icon = static_cast<CSmileyIcon*>(Smiley(aChar));
iSmileyLoader.AddTaskL(icon);
}
-void CSmileyModel::PlayAnimationL(TChar aChar, TInt aRepeat, TInt aDelay)
- {
- CSmileyIcon* icon = static_cast<CSmileyIcon*>(Smiley(aChar));
- if(icon) icon->PlayAnimationL(aRepeat, aDelay);
- }
-
-void CSmileyModel::StopAnimation(TChar aChar)
- {
- CSmileyIcon* icon = static_cast<CSmileyIcon*>(Smiley(aChar));
- if(icon) icon->StopAnimation();
- }
-
const TDesC& CSmileyModel::Text(TInt aIndex, TInt aVariant) const
{
CSmileyIcon* icon = static_cast<CSmileyIcon*>((*this)[aIndex]);
--- a/uifw/AvKon/src/AknSmileyUtils.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknSmileyUtils.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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*/)
--- a/uifw/AvKon/src/AknTabGrpGraphics.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknTabGrpGraphics.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/src/AknViewAppUi.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknViewAppUi.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -269,10 +269,10 @@
CAknAppUi::CurrentFixedToolbar()->SetToolbarVisibility( EFalse );
}
- delete iClearer;
- delete iShutter;
- delete iActivationTick;
-
+ delete iClearer;
+ delete iShutter;
+ delete iActivationTick;
+
if ( iActivationQueue )
{
iActivationQueue->ResetAndDestroy();
--- a/uifw/AvKon/src/AknVolumePopup.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/AknVolumePopup.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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();
}
// ---------------------------------------------------------------------------
--- a/uifw/AvKon/src/aknchoicelist.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/aknchoicelist.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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 )
--- a/uifw/AvKon/src/akngrid.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/akngrid.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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();
--- a/uifw/AvKon/src/aknindicatorpopupcontent.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/aknindicatorpopupcontent.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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 ) )
{
--- a/uifw/AvKon/src/akninfrm.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/akninfrm.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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<CEikEdwin*>( 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<CEikEdwin*>( iField )->SetSkinBackgroundControlContextL( iInputContext );
}
if ( iInputContext )
@@ -516,7 +509,7 @@
{
case KAknsMessageSkinChange:
case KEikDynamicLayoutVariantSwitch:
- TRAP_IGNORE(CreateIconL());
+ CreateIconL();
break;
default:
--- a/uifw/AvKon/src/aknmessagequerycontrol.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/aknmessagequerycontrol.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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 );
--- a/uifw/AvKon/src/aknnoteattributes.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/aknnoteattributes.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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 );
}
}
--- a/uifw/AvKon/src/aknnotecontrol.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/aknnotecontrol.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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()];
}
--- a/uifw/AvKon/src/aknqueryeditorindicator.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/aknqueryeditorindicator.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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) )
--- a/uifw/AvKon/src/aknsfld.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/aknsfld.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -896,11 +896,7 @@
{
iEditor->SetFocus( aVisible );
}
- }
- if( iAdaptiveSearch && !aVisible )
- {
- TRAP_IGNORE( iAdaptiveSearch->HideAdaptiveSearchGridL() );
- }
+ }
_AKNTRACE_FUNC_EXIT;
}
--- a/uifw/AvKon/src/aknsgcc.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/aknsgcc.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -46,8 +46,7 @@
EHandlingChange,
EInAknSrv,
ESystemFaded,
- ENeverRelinquish,
- EUseForegroundPriority
+ ENeverRelinquish
};
@@ -619,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.
@@ -658,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();
--- a/uifw/AvKon/src/aknsignal.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/aknsignal.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/src/aknsignaldataobserver.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/aknsignaldataobserver.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -133,13 +133,7 @@
{
// HSPDA
iSignalPane->ShowHsdpaIcon(state.iIconState);
- }
- else if (state.iIconState >= EAknSignalUmaIndicatorOff
- && state.iIconState <= EAknSignalUmaIndicatorMultipdp)
- {
- // UMA
- iSignalPane->ShowUmaIconL(state.iIconState);
- }
+ }
}
if (!updateAnimation)
--- a/uifw/AvKon/src/akntabgrp.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/akntabgrp.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -104,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()
@@ -298,8 +295,6 @@
if ( !iExtension )
{
iExtension = CAknTabExtension::NewL();
- //set the default highlight status of the tab
- iExtension->iHighlight = EFalse;
}
iLabel = new (ELeave) CEikLabel;
@@ -812,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.
// ---------------------------------------------------------------------------
@@ -1045,7 +1033,7 @@
}
else
{
- if (iActive || iExtension->iHighlight)
+ if ( iActive )
{
TInt error = AknsUtils::GetCachedColor( skin, color,
KAknsIIDQsnTextColors, EAknsCIQsnTextColorsCG3 );
@@ -1083,7 +1071,7 @@
iColorBitmaps->At(KTabColorBitmapActiveColorIndex) &&
iColorBitmaps->At(KTabColorBitmapPassiveColorIndex) )
{
- if (iActive || iExtension->iHighlight)
+ if( iActive )
{
colorBitmap = iColorBitmaps->At(KTabColorBitmapActiveColorIndex);
}
@@ -1274,8 +1262,8 @@
if ( !iColorBitmaps )
{
- TRAP_IGNORE(LoadColorBitmapL());
- }
+ LoadColorBitmapL();
+ }
}
void CAknTab::SetNarrowTabLayout( TBool aNarrow )
@@ -1411,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;
};
@@ -1421,8 +1406,6 @@
{
iPointerDownTab = -1;
iPointerDownXPosition = -1;
- //Highlight is disabled by default.
- iHighlight = EFalse;
}
@@ -1888,7 +1871,7 @@
{
iExtension->iTabBackgroundLayout.iUse = EFalse;
- iExtension->iTabSvgGraphics->DrawTabGroupBackground(
+ iExtension->iTabSvgGraphics->DrawTabGroupBackgroundL(
CAknTabGroupGraphics::ENoDraw,
iLongTabs,
iNumberOfTabsShown,
@@ -2634,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
{
@@ -2650,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
@@ -2918,20 +2881,6 @@
}
iExtension->iPointerDownTab = newTab;
iExtension->iPointerDownXPosition = aPointerEvent.iPosition.iX;
-
- //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();
- }
-
return;
}
else if ( aPointerEvent.iType == TPointerEvent::EButton1Up )
@@ -2961,15 +2910,9 @@
// if the button up event occurs ouside tabgroup, ignore it.
if ( !Rect().Contains( aPointerEvent.iPosition ) || iExtension->iPointerDownTab != newTab )
{
- iExtension->iPointerDownTab = -1;
+ iExtension->iPointerDownTab = -1;
iExtension->iPointerDownXPosition = -1;
- if (iExtension->iHighlight)
- {
- iExtension->iHighlight = EFalse;
- ResetHighlightStatus();
- DrawDeferred();
- }
- return;
+ return ;
}
if ( newTab != iActiveTab &&
@@ -3077,12 +3020,6 @@
iExtension->iPointerDownTab = -1;
iExtension->iPointerDownXPosition = -1;
- if( iExtension->iHighlight )
- {
- iExtension->iHighlight = EFalse;
- ResetHighlightStatus();
- DrawDeferred();
- }
}
}
}
@@ -3451,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 );
}
@@ -3466,11 +3403,6 @@
if ( iExtension )
{
iExtension->iNarrowTabLayout = EFalse;
- if( iExtension->iHighlight )
- {
- iExtension->iHighlight = EFalse;
- ResetHighlightStatus();
- }
}
if ( !COMPARE_BOOLS( iMirrored, AknLayoutUtils::LayoutMirrored() ) )
@@ -4111,7 +4043,7 @@
if ( aNarrow )
{
iExtension->iNextTabBackgroundLayout.iUse = EFalse;
- iExtension->iTabSvgGraphics->DrawTabGroupNarrowBackground(
+ iExtension->iTabSvgGraphics->DrawTabGroupNarrowBackgroundL(
CAknTabGroupGraphics::ENoDraw,
iLongTabs,
iNumberOfTabsShown,
@@ -4123,7 +4055,7 @@
if ( !aUseAnimation )
{
iExtension->iTabBackgroundLayout.iUse = EFalse;
- iExtension->iTabSvgGraphics->DrawTabGroupNarrowBackground(
+ iExtension->iTabSvgGraphics->DrawTabGroupNarrowBackgroundL(
CAknTabGroupGraphics::ENoDraw,
iLongTabs,
iNumberOfTabsShown,
@@ -4136,7 +4068,7 @@
else
{
iExtension->iNextTabBackgroundLayout.iUse = EFalse;
- iExtension->iTabSvgGraphics->DrawTabGroupBackground(
+ iExtension->iTabSvgGraphics->DrawTabGroupBackgroundL(
CAknTabGroupGraphics::ENoDraw,
iLongTabs,
iNumberOfTabsShown,
@@ -4147,7 +4079,7 @@
iExtension->iNextTabBackgroundLayout.iUse = ETrue;
iExtension->iTabBackgroundLayout.iUse = EFalse;
- iExtension->iTabSvgGraphics->DrawTabGroupBackground(
+ iExtension->iTabSvgGraphics->DrawTabGroupBackgroundL(
CAknTabGroupGraphics::ENoDraw,
iLongTabs,
iNumberOfTabsShown,
@@ -4512,12 +4444,4 @@
CancelTabAnimationEventTimer();
}
-void CAknTabGroup::ResetHighlightStatus()
- {
- // Resets highlight status to EFalse
- for( TInt i = 0; i < iTabArray->Count(); i++ )
- {
- iTabArray->At(i)->SetHighlight( EFalse );
- }
- }
// End of File
--- a/uifw/AvKon/src/aknutils.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/aknutils.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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,
--- a/uifw/AvKon/src/eikfrlbd.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/src/eikfrlbd.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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() )
{
--- a/uifw/AvKon/srcdata/avkon.rss Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/srcdata/avkon.rss Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestaknsound/group/bctestaknsound.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestaknsound/group/bctestaknsound.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestappfrm/group/bctestappfrm.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestappfrm/group/bctestappfrm.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestbuttons/group/bctestbuttons.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestbuttons/group/bctestbuttons.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestcmdlg/group/bctestcmdlg.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestcmdlg/group/bctestcmdlg.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestdocandinit/group/bctestDocAndInit.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestdocandinit/group/bctestDocAndInit.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteditor/group/bctesteditor.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteditor/group/bctesteditor.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteh/group/bctesteh.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteh/group/bctesteh.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteikbctrl/group/bctesteikbctrl.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteikbctrl/group/bctesteikbctrl.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteikfrm/group/bctesteikfrm.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctesteikfrm/group/bctesteikfrm.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestfontinput/group/bctestfontinput.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestfontinput/group/bctestfontinput.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestform/group/bctestForm.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestform/group/bctestForm.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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.
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestgrids/group/bctestgrids.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestgrids/group/bctestgrids.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestimage/group/bctestimage.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestimage/group/bctestimage.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestkeylock/group/bctestkeylock.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestkeylock/group/bctestkeylock.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestlabelinfoindicators/group/bctestlabelinfoindicators.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestlabelinfoindicators/group/bctestlabelinfoindicators.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestlist/group/bctestlist.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestlist/group/bctestlist.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestmenu/group/bctestmenu.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestmenu/group/bctestmenu.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestmisccontrol/group/bctestmisccontrol.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestmisccontrol/group/bctestmisccontrol.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestnote/group/bctestnote.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestnote/group/bctestnote.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestnotifier/group/bctestnotifier.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestnotifier/group/bctestnotifier.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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:
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestpane/group/bctestpane.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestpane/group/bctestpane.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestpopups/group/bctestpopups.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestpopups/group/bctestpopups.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestprivateuifrm/group/bctestprivateuifrm.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestprivateuifrm/group/bctestprivateuifrm.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestptieng/group/bctestptieng.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestptieng/group/bctestptieng.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestquery/group/bctestquery.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestquery/group/bctestquery.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestscreenclearer/group/bctestscreenclearer.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestscreenclearer/group/bctestscreenclearer.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestscrollerbar/group/bctestscroller.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestscrollerbar/group/bctestscroller.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsearchfield/group/bctestsearchfield.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsearchfield/group/bctestsearchfield.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestserverapp/group/bctestserverapp.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestserverapp/group/bctestserverapp.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsettingpage/group/bctestsettingpage.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsettingpage/group/bctestsettingpage.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestskins/group/bctestskins.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestskins/group/bctestskins.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsliderandicons/group/bctestsliderandicons.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestsliderandicons/group/bctestsliderandicons.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestutilities/group/bctestutilities.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestutilities/group/bctestutilities.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestvolume/group/bctestvolume.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.0/bctestvolume/group/bctestvolume.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestlocation/group/bctestlocation.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestlocation/group/bctestlocation.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestmisc/group/bctestmisc.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestmisc/group/bctestmisc.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestocr/group/bctestocr.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.1/bctestocr/group/bctestocr.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bcextendedfontapi/group/BCExtendedFontApi.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bcextendedfontapi/group/BCExtendedFontApi.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestbutton/group/bctestbutton.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestbutton/group/bctestbutton.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestchoicelist/group/bctestchoicelist.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestchoicelist/group/bctestchoicelist.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestlocalizer/group/bctestlocalizer.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestlocalizer/group/bctestlocalizer.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestmisc32/group/bctestmisc32.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestmisc32/group/bctestmisc32.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestservicehandler/group/bctestservicehandler.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestservicehandler/group/bctestservicehandler.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctesttouchpane/group/bctesttouchpane.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctesttouchpane/group/bctesttouchpane.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestuniteditor/group/bctestuniteditor.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestuniteditor/group/bctestuniteditor.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestutilities/group/bctestutilities.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2/bctestutilities/group/bctestutilities.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctestpreviewpopup/group/bctestpreviewpopup.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctestpreviewpopup/group/bctestpreviewpopup.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctesttoolbar/group/bctesttoolbar.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctesttoolbar/group/bctesttoolbar.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctesttreelist/group/bctesttreelist.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK3.2ED/bctesttreelist/group/bctesttreelist.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bcmultidriver/group/bctestmultidriver.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bcmultidriver/group/bctestmultidriver.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestappfrm/group/bctestappfrm.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestappfrm/group/bctestappfrm.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestdocandinit/group/bctestDocAndInit.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestdocandinit/group/bctestDocAndInit.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestfontinput/group/BCTestFontInput.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestfontinput/group/BCTestFontInput.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestmix50/group/bctestmix50.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestmix50/group/bctestmix50.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestsettingpage/group/bctestsettingpage.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestsettingpage/group/bctestsettingpage.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestsliderandicons/group/bctestsliderandicons.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDK5.0/bctestsliderandicons/group/bctestsliderandicons.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDKMCL/bctestmixmcl/group/bctestmixmcl.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDKMCL/bctestmixmcl/group/bctestmixmcl.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/S60_SDKMCL/bctestsingleclick/group/bctestsingleclick.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/S60_SDKMCL/bctestsingleclick/group/bctestsingleclick.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomaiwakn/group/bctestdomaiwakn.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomaiwakn/group/bctestdomaiwakn.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomavkonpsln/group/bctestdomavkonpsln.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomavkonpsln/group/bctestdomavkonpsln.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomcdl/group/bctestdomcdl.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomcdl/group/bctestdomcdl.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomcoreui/group/bctestdomcoreui.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomcoreui/group/bctestdomcoreui.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomfntlay/group/bctestdomfntlay.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomfntlay/group/bctestdomfntlay.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomnotifier/group/bctestdomnotifier.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdomnotifier/group/bctestdomnotifier.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdompopup/group/bctestdompopup.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/bctestdom3.2/bctestdompopup/group/bctestdompopup.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomaiwakn/group/bctestdomaiwakn.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomaiwakn/group/bctestdomaiwakn.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomavkonpsln/group/bctestdomavkonpsln.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomavkonpsln/group/bctestdomavkonpsln.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomcdl/group/bctestdomcdl.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomcdl/group/bctestdomcdl.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomcoreui/group/bctestdomcoreui.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomcoreui/group/bctestdomcoreui.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomfntlay/group/bctestdomfntlay.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomfntlay/group/bctestdomfntlay.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomnotifier/group/bctestdomnotifier.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdomnotifier/group/bctestdomnotifier.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdompopup/group/bctestdompopup.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/bctestdom5.0/bctestdompopup/group/bctestdompopup.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/bctestlauncher/group/bctestlauncher.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/bctestlauncher/group/bctestlauncher.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/AvKon/tsrc/bc/bctestutil/group/bctestutil.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/AvKon/tsrc/bc/bctestutil/group/bctestutil.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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)
--- a/uifw/EikStd/EABI/EIKCOCTLU.DEF Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/EABI/EIKCOCTLU.DEF Fri Oct 22 15:49:04 2010 +0100
@@ -2017,5 +2017,4 @@
_ZN10CAknButton14EnableFeedbackEi @ 2016 NONAME
_ZN22CAknLocalScreenClearer4NewLEii @ 2017 NONAME
_ZN22CAknLocalScreenClearer5NewLCEii @ 2018 NONAME
- _ZN9CEikEdwin10EnableT2WLEi @ 2019 NONAME
--- a/uifw/EikStd/bwins/EIKCOCTLU.DEF Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/bwins/EIKCOCTLU.DEF Fri Oct 22 15:49:04 2010 +0100
@@ -1628,4 +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)
--- a/uifw/EikStd/coctlinc/smileymanager.h Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/coctlinc/smileymanager.h Fri Oct 22 15:49:04 2010 +0100
@@ -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
{
--- a/uifw/EikStd/coctlsrc/AknButton.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/coctlsrc/AknButton.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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,9 +2290,9 @@
{
return;
}
- TBool hitArea( EFalse );
- TRAP_IGNORE( hitArea = HitAreaContainsL( aPointerEvent.iPosition, EFalse ))
- if ( ( iFlags & KAknButtonHitTest ) && !hitArea )
+
+ if ( ( iFlags & KAknButtonHitTest ) &&
+ !HitAreaContainsL( aPointerEvent.iPosition, EFalse ) )
{
buttonEvent = 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.
--- a/uifw/EikStd/coctlsrc/AknDoubleSpanScrollIndicator.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/coctlsrc/AknDoubleSpanScrollIndicator.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -258,7 +258,7 @@
if ( roomForMovementInSpan > 0 && roomForMovementInPixels > 0 )
{
focusPositionInPixels =
- (TInt64)checkedFocusPosition * roomForMovementInPixels /
+ checkedFocusPosition * roomForMovementInPixels /
roomForMovementInSpan;
}
--- a/uifw/EikStd/coctlsrc/EIKCOCTL.MMP Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/coctlsrc/EIKCOCTL.MMP Fri Oct 22 15:49:04 2010 +0100
@@ -156,18 +156,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
@@ -183,14 +183,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
--- a/uifw/EikStd/coctlsrc/EIKEDWIN.CPP Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/coctlsrc/EIKEDWIN.CPP Fri Oct 22 15:49:04 2010 +0100
@@ -97,7 +97,7 @@
#include <aknpointereventsuppressor.h>
#include <aknnotedialog.h>
#include <AknFepGlobalEnums.h>
-#include <AknSmileyUtils.h>
+
#include "smileymanager.h"
#include "smileycustomwrap.h"
#include <touchfeedback.h>
@@ -105,11 +105,6 @@
// declare function
void ReadSpecialCharFromSCTL( TPtr& ptr, TInt sctResourceId );
void ReadSCTHeadPane( TResourceReader& aReader );
-// for supporting TapToWrite
-#include <AvkonInternalCRKeys.h>
-#include <e32property.h>
-#include <AknFepInternalPSKeys.h>
-#include <AknFontAccess.h>
GLDEF_C void Panic(TEikEdwinPanic aPanic)
{
@@ -162,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
@@ -515,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);
@@ -810,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
@@ -818,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] ) )
@@ -1088,7 +1076,6 @@
*iDestroyedPtr = ETrue;
iDestroyedPtr = NULL;
}
- delete iT2WBuf;
delete iSmiley;
delete iSmileyWrap;
}
@@ -2299,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;
}
@@ -2360,7 +2345,6 @@
if (!isPicture)
ClearUndo();
iTextView->HandleCharEditL(charEditType,formatHasChanged);
- TryToDrawT2W();
reportChange=ETrue;
formatChange=formatHasChanged;
}
@@ -2438,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;
@@ -2457,7 +2439,6 @@
ETrue );
}
iTextView->HandleCharEditL(charEditType);
- TryToDrawT2W();
reportChange=ETrue;
}
else
@@ -2564,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);
}
@@ -2624,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;
@@ -3145,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
@@ -3442,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();
@@ -4026,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
@@ -4052,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())
{
@@ -4130,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
@@ -4477,23 +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->iExtendedInputCapabilities->Capabilities() &
- CAknExtendedInputCapabilities::EInputEditorQwertyInputActive );
- }
-
void CEikEdwin::SetCursorVisibilityL(TBool aEmphasis)
{
TCursor::TVisibility textCursor=(aEmphasis? TCursor::EFCursorFlashing : TCursor::EFCursorInvisible);
@@ -4505,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 )
@@ -4982,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();
@@ -5066,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 );
@@ -5155,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();
@@ -5305,11 +5203,7 @@
DrawContents();
}
else
- {
iTextView->HandleInsertDeleteL(selection,selLength,formatHasChanged);
- // try to draw "tap to write"
- TryToDrawT2W();
- }
iEikonEnv->BusyMsgCancel();
User::LeaveIfError(err);
}
@@ -6656,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 );
@@ -6965,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);
@@ -7070,7 +6960,6 @@
yPosQ.SetFillScreen();
TRAP_IGNORE( iTextView->SetViewL( docPos, yPos, yPosQ ) );
}
- TRAP_IGNORE( MoveViewToCursorLineL() );
}
break;
case KEikMessageVirtualCursorStateChange:
@@ -7112,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;
}
@@ -7347,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)
@@ -8070,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()
@@ -8136,7 +8009,10 @@
SetParaFormatLayer(paraFormatLayer);
if (iTextView)
{
- NotifyNewFormatL();
+ if ( ( iEdwinInternalFlags & ESuppressFormatting ) == 0 )
+ {
+ NotifyNewFormatL();
+ }
}
else
{
@@ -8604,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)
{
@@ -8744,10 +8586,11 @@
TBool partialScreenDisabled( !( aNewFlags & EAknEditorFlagEnablePartialScreen ) &&
( aOldFlags & EAknEditorFlagEnablePartialScreen ) );
-
- if ( ( textViewHideEnabled &&
- !( aNewFlags & EAknEditorFlagEnablePartialScreen ) ) ||
- ( partialScreenDisabled && ( aNewFlags & EAknEditorFlagHideTextView ) ) )
+
+ if (IsActivated() &&
+ ( (textViewHideEnabled && !(aNewFlags & EAknEditorFlagEnablePartialScreen)) ||
+ (partialScreenDisabled && (aNewFlags & EAknEditorFlagHideTextView)) )
+ )
{
iTextView->MakeVisible( EFalse );
iEdwinExtension->iTextViewHidden = ETrue;
@@ -9448,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
@@ -9519,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
--- a/uifw/EikStd/coctlsrc/EIKLBV.CPP Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/coctlsrc/EIKLBV.CPP Fri Oct 22 15:49:04 2010 +0100
@@ -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()
--- a/uifw/EikStd/coctlsrc/EIKLBX.CPP Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/coctlsrc/EIKLBX.CPP Fri Oct 22 15:49:04 2010 +0100
@@ -75,7 +75,6 @@
#include <aknlongtapdetector.h>
#include <AknPriv.hrh>
#include <aknmarkingmodeobserver.h>
-#include <aknmarkingmode.h>
#include "akntrace.h"
// timeout for long keypress used in markable lists
@@ -1047,10 +1046,9 @@
if ( aExtensionId == MAknMarkingCollection::TYPE )
{
a0 = static_cast<MAknMarkingCollection*>( 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 )
{
--- a/uifw/EikStd/coctlsrc/EIKMENUP.CPP Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/coctlsrc/EIKMENUP.CPP Fri Oct 22 15:49:04 2010 +0100
@@ -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 );
}
--- a/uifw/EikStd/coctlsrc/EIKSCRLB.CPP Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/coctlsrc/EIKSCRLB.CPP Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/EikStd/coctlsrc/aknedwinphysicshandler.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/coctlsrc/aknedwinphysicshandler.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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 );
}
}
--- a/uifw/EikStd/coctlsrc/aknitemactionmenu.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/coctlsrc/aknitemactionmenu.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -414,21 +414,6 @@
_AKNTRACE_FUNC_EXIT;
return markedItems;
}
-
-
-// ---------------------------------------------------------------------------
-// CAknItemActionMenu::HideMenu
-// ---------------------------------------------------------------------------
-//
-void CAknItemActionMenu::HideMenu()
- {
- if ( iPopupMenu && !iProcessingCommand )
- {
- iPopupMenu->HideMenu();
- }
- }
-
-
// ---------------------------------------------------------------------------
// CAknItemActionMenu::CAknItemActionMenu
// ---------------------------------------------------------------------------
--- a/uifw/EikStd/coctlsrc/aknstyluspopupmenu.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/coctlsrc/aknstyluspopupmenu.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -519,20 +519,6 @@
}
}
-
-// ---------------------------------------------------------------------------
-// CAknStylusPopUpMenu::HideMenu
-// ---------------------------------------------------------------------------
-//
-void CAknStylusPopUpMenu::HideMenu()
- {
- if ( iController )
- {
- iController->HidePopUp();
- }
- }
-
-
// -----------------------------------------------------------------------------
// CAknStylusPopUpMenu::StartControllerIdleL
// -----------------------------------------------------------------------------
--- a/uifw/EikStd/coctlsrc/aknstyluspopupmenucontent.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/coctlsrc/aknstyluspopupmenucontent.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -1026,11 +1026,11 @@
layoutText.DrawText( aGc, *(iItems[aItem]->iText), ETrue, textColor );
- if ( aItem < iItems.Count()-1 )
+ if ( aItem < iLastVisibleItem )
{
AknListUtils::DrawSeparator( aGc, rect, textColor, skin );
}
- }
+ }
}
// -----------------------------------------------------------------------------
--- a/uifw/EikStd/coctlsrc/eiklay.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/coctlsrc/eiklay.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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;
--- a/uifw/EikStd/coctlsrc/smileycustomwrap.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/coctlsrc/smileycustomwrap.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -14,7 +14,7 @@
* Description: smiely engine class
*
*/
-#include <AknSmileyUtils.h>
+
#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;
--- a/uifw/EikStd/coctlsrc/smileymanager.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/coctlsrc/smileymanager.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -18,7 +18,6 @@
#include <coecntrl.h>
#include <eikedwin.h>
#include <frmtlay.h>
-#include <AknSmileyUtils.h>
#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 );
}
// ---------------------------------------------------------------------------
--- a/uifw/EikStd/coctlsrc/smileymodel.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/coctlsrc/smileymodel.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -15,7 +15,8 @@
*
*/
-#include <AknSmileyUtils.h>
+//#include <streamlogger.h>
+
#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;
}
}
--- a/uifw/EikStd/dlgsrc/EIKDIALG.CPP Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/dlgsrc/EIKDIALG.CPP Fri Oct 22 15:49:04 2010 +0100
@@ -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)
--- a/uifw/EikStd/dlgsrc/EIKDLG.MMP Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/dlgsrc/EIKDLG.MMP Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/EikStd/dlgsrc/EIKDPAGE.CPP Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/dlgsrc/EIKDPAGE.CPP Fri Oct 22 15:49:04 2010 +0100
@@ -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<CEikEdwin*>(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.
--- a/uifw/EikStd/dlgsrc/EIKDPSEL.CPP Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/dlgsrc/EIKDPSEL.CPP Fri Oct 22 15:49:04 2010 +0100
@@ -592,7 +592,7 @@
if ( iIsForm )
{
- iPageContainer->SetPageFormSized(Rect());
+ iPageContainer->SetPageFormSized();
}
else
{
--- a/uifw/EikStd/srvuisrc/EIKSRVUI.MMP Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/EikStd/srvuisrc/EIKSRVUI.MMP Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/eikctl/group/eikctl.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/eikctl/group/eikctl.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/eikctl/src/EIKCLBD.CPP Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/eikctl/src/EIKCLBD.CPP Fri Oct 22 15:49:04 2010 +0100
@@ -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() )
{
--- a/uifw/eikctl/src/EIKMFNE.CPP Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/eikctl/src/EIKMFNE.CPP Fri Oct 22 15:49:04 2010 +0100
@@ -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*/ )
--- a/uifw/eikctl/src/EIKSECED.CPP Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/eikctl/src/EIKSECED.CPP Fri Oct 22 15:49:04 2010 +0100
@@ -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<CAknEdwinState*>( 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 );
}
--- a/uifw/ganes/group/bld.inf Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/ganes/group/bld.inf Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/ganes/group/ganes.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/ganes/group/ganes.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/ganes/inc/HgIndicatorManager.h Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/ganes/inc/HgIndicatorManager.h Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/ganes/inc/HgVgEGL.h Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/ganes/inc/HgVgEGL.h Fri Oct 22 15:49:04 2010 +0100
@@ -64,8 +64,6 @@
CFbsBitmap* GetSurfaceToBitmap(const TRect& aRect, TBool aLandscape = EFalse) const;
- static TBool EglInitialized();
-
protected: // Constructors
CHgVgEGL();
--- a/uifw/ganes/src/HgDoubleGraphicList.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/ganes/src/HgDoubleGraphicList.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -206,8 +206,7 @@
aRect,
item->Flags(),
iLayoutData->FirstIndicatorLayout(),
- iLayoutData->SecondIndicatorLayout(),
- iFlags & EHgScrollerSelectionMode || iSelectionMode != ENoSelection );
+ iLayoutData->SecondIndicatorLayout() );
}
// -----------------------------------------------------------------------------
--- a/uifw/ganes/src/HgDoubleTextList.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/ganes/src/HgDoubleTextList.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -171,8 +171,7 @@
aRect,
item->Flags(),
iLayoutData->FirstIndicatorLayout(),
- iLayoutData->SecondIndicatorLayout(),
- iFlags & EHgScrollerSelectionMode || iSelectionMode != ENoSelection );
+ iLayoutData->SecondIndicatorLayout() );
}
// -----------------------------------------------------------------------------
--- a/uifw/ganes/src/HgGrid.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/ganes/src/HgGrid.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -285,8 +285,7 @@
aRect,
item->Flags(),
iLayoutData->FirstIndicatorLayout(),
- iLayoutData->SecondIndicatorLayout(),
- iFlags & EHgScrollerSelectionMode || iSelectionMode != ENoSelection );
+ iLayoutData->SecondIndicatorLayout() );
}
// -----------------------------------------------------------------------------
--- a/uifw/ganes/src/HgIndicatorManager.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/ganes/src/HgIndicatorManager.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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;
--- a/uifw/ganes/src/HgScroller.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/ganes/src/HgScroller.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -15,6 +15,7 @@
*
*/
+
// INCLUDE FILES
#include <ganes/HgScroller.h>
@@ -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 );
@@ -1201,7 +1195,7 @@
}
else if( iItemCount )
{
- iSelectedIndex = CurrentIndex();
+ iSelectedIndex = iCurrentRow;
FitSelectionToView();
iShowHighlight = ETrue;
iDrawUtils->EnableMarquee(HasHighlight());
@@ -1277,19 +1271,6 @@
{
if(iItemCount)
{
- iHighlightTimer->Cancel();
- iPointerDown = EFalse;
- if(iDetector)
- iDetector->CancelAnimationL();
- iPanning = EFalse;
-
- iPhysics->StopPhysics();
- iPhysics->ResetFriction();
-
- iFocusedIndex = KErrNotFound;
- iSelectionToFocusedItem = EFalse;
- iDrawUtils->EnableMarquee(false);
-
iItems.ResetAndDestroy();
iItemCount = 0;
iSelectedIndex = KErrNotFound;
@@ -1300,9 +1281,6 @@
}
HandleItemCountChanged();
-
- iViewPosition = TPoint(iWidth/2, iHeight/2);
- HandleViewPositionChanged();
}
}
@@ -1312,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;
}
@@ -1628,18 +1598,12 @@
//
void CHgScroller::SetSelectionMode( TSelectionMode aMode )
{
- if( aMode != iSelectionMode )
- {
- DrawDeferred();
- }
-
iSelectionMode = aMode;
if( iSelectionMode == ESelectionPossible
|| iSelectionMode == ENoSelection )
{
iCoeEnv->InputCapabilitiesChanged();
}
-
}
// ---------------------------------------------------------------------------
@@ -1782,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);
--- a/uifw/ganes/src/HgSingleGraphicList.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/ganes/src/HgSingleGraphicList.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -162,8 +162,7 @@
aRect,
item->Flags(),
iLayoutData->FirstIndicatorLayout(),
- iLayoutData->SecondIndicatorLayout(),
- iFlags & EHgScrollerSelectionMode || iSelectionMode != ENoSelection );
+ iLayoutData->SecondIndicatorLayout() );
}
// -----------------------------------------------------------------------------
--- a/uifw/ganes/src/HgSingleLargeList.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/ganes/src/HgSingleLargeList.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -163,8 +163,7 @@
aRect,
item->Flags(),
iLayoutData->FirstIndicatorLayout(),
- iLayoutData->SecondIndicatorLayout(),
- iFlags & EHgScrollerSelectionMode || iSelectionMode != ENoSelection );
+ iLayoutData->SecondIndicatorLayout() );
}
// -----------------------------------------------------------------------------
--- a/uifw/ganes/src/HgSingleTextList.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/ganes/src/HgSingleTextList.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -143,8 +143,7 @@
aRect,
item->Flags(),
iLayoutData->FirstIndicatorLayout(),
- iLayoutData->SecondIndicatorLayout(),
- iFlags & EHgScrollerSelectionMode || iSelectionMode != ENoSelection );
+ iLayoutData->SecondIndicatorLayout() );
}
// -----------------------------------------------------------------------------
--- a/uifw/ganes/src/HgSingleTextListWithIcon.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/ganes/src/HgSingleTextListWithIcon.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -144,8 +144,7 @@
aRect,
item->Flags(),
iGraphicLayoutData->FirstIndicatorLayout(),
- iGraphicLayoutData->SecondIndicatorLayout(),
- iFlags & EHgScrollerSelectionMode || iSelectionMode != ENoSelection );
+ iGraphicLayoutData->SecondIndicatorLayout() );
}
// -----------------------------------------------------------------------------
--- a/uifw/ganes/src/HgVgEGL.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/ganes/src/HgVgEGL.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/ganes/src/HgVgHelper.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/ganes/src/HgVgHelper.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -20,7 +20,6 @@
#include "HgVgHelper.h"
#include "HgVgDrawBuffer.h"
#include "HgVgImageCreator.h"
-#include "HgVgEgl.h"
#include <e32math.h>
#include <gulicon.h>
@@ -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();
--- a/uifw/ganes/src/HgVgMediaWall.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/ganes/src/HgVgMediaWall.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -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
}
--- a/uifw/tsrc/public/basic/AknSoundServerStifTest/group/AknSoundServerStifTest.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/tsrc/public/basic/AknSoundServerStifTest/group/AknSoundServerStifTest.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/uiklaf/Group/EikCoCtlLaf.MMP Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/uiklaf/Group/EikCoCtlLaf.MMP Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uifw/uiklaf/Group/UIKLAF.MMP Fri Sep 17 17:57:10 2010 +0100
+++ b/uifw/uiklaf/Group/UIKLAF.MMP Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uiutils/Findutil/group/FindUtil.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uiutils/Findutil/group/FindUtil.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -49,7 +49,7 @@
LIBRARY euser.lib
#if defined(WINS)
-LIBRARY featmgr.lib
+LIBRARY FeatMgr.lib
#endif
// end of file
--- a/uiutils/Findutil/group/FindUtilImpl.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uiutils/Findutil/group/FindUtilImpl.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uiutils/Findutil/group/FindUtilImplChina.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uiutils/Findutil/group/FindUtilImplChina.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uiutils/Findutil/group/FindUtilImplJapan.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uiutils/Findutil/group/FindUtilImplJapan.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uiutils/Findutil/group/FindUtilImplThai.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uiutils/Findutil/group/FindUtilImplThai.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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
--- a/uiutils/Findutil/inc/FindUtilKorean.h Fri Sep 17 17:57:10 2010 +0100
+++ b/uiutils/Findutil/inc/FindUtilKorean.h Fri Oct 22 15:49:04 2010 +0100
@@ -24,11 +24,6 @@
#include "FindUtilBase.h"
-#ifdef _DEBUG
-#include <f32file.h>
-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__
--- a/uiutils/Findutil/src/FindUtilKorean.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uiutils/Findutil/src/FindUtilKorean.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -17,11 +17,6 @@
#include "FindUtilKorean.h"
-#include <e32svr.h>
-
-#ifdef _DEBUG
-#include <charconv.h>
-#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<TChar>( itemString->Des()[ i - 1 ] ) ) )
+ if ( 0 == i || IsFindWordSeparator(
+ static_cast<TChar>( 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<TInt>( aChar ) - KCBase;
+ TInt index = static_cast<TInt> ( 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
--- a/uiutils/Findutil/src/FindUtilWestern.cpp Fri Sep 17 17:57:10 2010 +0100
+++ b/uiutils/Findutil/src/FindUtilWestern.cpp Fri Oct 22 15:49:04 2010 +0100
@@ -29,9 +29,6 @@
#include "FindUtilKorean.h"
#include <avkon.rsg>
#include <StringLoader.h>
-#include <featmgr.h>
-#include <bldvariant.hrh>
-
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 );
--- a/uiutils/Localizer/group/DirectoryLocalizer.mmp Fri Sep 17 17:57:10 2010 +0100
+++ b/uiutils/Localizer/group/DirectoryLocalizer.mmp Fri Oct 22 15:49:04 2010 +0100
@@ -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.