diff -r 951aeeb3da43 -r eea20ed08f4b coreapplicationuis/SysAp/Group/SysAp.mmp --- a/coreapplicationuis/SysAp/Group/SysAp.mmp Fri Jun 11 13:48:03 2010 +0300 +++ b/coreapplicationuis/SysAp/Group/SysAp.mmp Tue Jun 29 10:40:11 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -35,119 +35,46 @@ MACRO SYSAP_USE_STARTUP_UI_PHASE #endif // RD_STARTUP_ANIMATION_CUSTOMIZATION + SOURCEPATH ../Src SOURCE SysApApp.cpp +SOURCE SysApDocument.cpp +//SOURCE main.cpp SOURCE SysApAppUi.cpp -SOURCE SysApDocument.cpp -SOURCE sysapkeymanagement.cpp +//SOURCE SysApWsClient.cpp +SOURCE SysApFeatureManager.cpp SOURCE SysApLightsController.cpp SOURCE SysApTimer.cpp - -SOURCE SysApPubSubObserver.cpp -SOURCE SysApProfileObserver.cpp -SOURCE SysApEtelNetworkBarObserver.cpp -SOURCE sysapetelnetworkbargetter.cpp - -//SOURCE CenRepObservers/sysapcenrepfmtxobserver.cpp -SOURCE CenRepObservers/SysApCenRepLogsObserver.cpp -SOURCE CenRepObservers/SysApCenRepBTObserver.cpp -SOURCE CenRepObservers/SysApCenRepHacSettingObserver.cpp -SOURCE CenRepObservers/sysapcenreplightsettingsobserver.cpp -SOURCE CenRepObservers/sysapcenrepcallforwardingobserver.cpp -SOURCE CenRepObservers/sysapcenrepmsgwaitingobserver.cpp -SOURCE SysApCenRepController.cpp - -SOURCE SysApStartupController.cpp -SOURCE SysApConnectionMonitorObserver.cpp -SOURCE SysApPowerKeyMenuObserver.cpp -SOURCE SysApSsSettingsObserver.cpp +SOURCE sysaplightpluginhandler.cpp +SOURCE SysApNspsHandler.cpp +SOURCE SysApNspsAnim.cpp +SOURCE SysApPubSubObserver.cpp SysApSubscriber.cpp sysapremconobserver.cpp +SOURCE sysapdefaultkeyhandler.cpp SysApStartupController.cpp SOURCE SysApShutdownImage.cpp -SOURCE SysApShutdownAnimation.cpp -#ifndef RD_STARTUP_ANIMATION_CUSTOMIZATION -SOURCE SysApShutdownTone.cpp -#endif // RD_STARTUP_ANIMATION_CUSTOMIZATION -SOURCE SysApMsgSimMemLowQuery.cpp -SOURCE SysApNspsAnim.cpp -SOURCE SysApNspsHandler.cpp -SOURCE SysApEtelNetworkStatusNspsObserver.cpp -SOURCE SysApEtelSmsStoreObserver.cpp -SOURCE SysApWaitNote.cpp -SOURCE SysApConfirmationQuery.cpp -SOURCE SysApFeatureManager.cpp -SOURCE SysApSubscriber.cpp - -SOURCE SysApAnimKeySndControl.cpp -SOURCE SysApKeySndAnim.cpp -SOURCE SysApKeySndHandler.cpp - -SOURCE SysApSimChanged.cpp -LIBRARY logcli.lib - -SOURCE SysApAccessoryObserver.cpp -LIBRARY accclient.lib - -SOURCE SysApEtelConnector.cpp +SOURCE hbdevicepowermenusymbian.cpp #ifdef __OFFLINE_MODE SOURCE OfflineModeController/SysApOfflineModeControllerImpl.cpp -#else -SOURCE OfflineModeController/SysApOfflineModeControllerStub.cpp -#endif - -//Always use stub implementation of privacy framework, as it is no longer supported -// Find out if/how a replacement must be done -SOURCE PrivacyFramework/SysApLocationPrivacyIndicatorStub.cpp - -#ifdef __USB -SOURCE Usb/SysApUsbIndicatorImpl.cpp -LIBRARY usbman.lib // USB Manager -#else -SOURCE Usb/SysApUsbIndicatorStub.cpp -#endif -SOURCE Usb/sysapusbchargerdetector.cpp - -#ifdef __BT -SOURCE Bt/SysApBtControllerImpl.cpp -LIBRARY btengdevman.lib -LIBRARY btengsettings.lib -LIBRARY btmanclient.lib -#else -SOURCE Bt/SysApBtControllerStub.cpp #endif -#ifdef __BT_SAP -SOURCE BtSap/SysApBtSapControllerImpl.cpp -LIBRARY btengconnman.lib -LIBRARY btdevice.lib -LIBRARY bluetooth.lib -#else -SOURCE BtSap/SysApBtSapControllerStub.cpp -#endif -SOURCE SysApMediatorObserver.cpp - -SOURCE sysapdefaultkeyhandler.cpp -#ifdef RD_LIGHT_CONTROL_CHANGE -SOURCE sysaplightpluginhandler.cpp -#endif +SYSTEMINCLUDE /epoc32/include/mw/hb/hbwidgets +SYSTEMINCLUDE /epoc32/include/mw/hb/hbcore +//SYSTEMINCLUDE /epoc32/include/mw/QtCore +SYSTEMINCLUDE /epoc32/include/mw -SOURCE sysapaudioroutingobserver.cpp -SOURCE sysapeteldatabearerobserver.cpp +USERINCLUDE . +USERINCLUDE ../Inc +USERINCLUDE ../Src/CenRepObservers +USERINCLUDE ../Src/Usb +USERINCLUDE ../Src/powersavemode +USERINCLUDE ../../inc // subsystem headers +USERINCLUDE ../../../inc // ado headers +USERINCLUDE ../CenRep +USERINCLUDE ../PubSub -SOURCE memorycard/SysApMMCObserver.cpp -#ifdef RD_MULTIPLE_DRIVE -SOURCE memorycard/sysapdrivelist.cpp -SOURCE memorycard/sysapdriveunlockhandler.cpp -SOURCE memorycard/sysapdriveejecthandler.cpp -#endif // RD_MULTIPLE_DRIVE +MW_LAYER_SYSTEMINCLUDE -SOURCE sysapetelnetworkinfoobserver.cpp -SOURCE sysapremconobserver.cpp -SOURCE powersavemode/sysappsmcontroller.cpp -SOURCE sysapbatteryinfocontroller.cpp - -SOURCE SysApSatObserver.cpp -LIBRARY satclient.lib // for sat refresh START RESOURCE ../Data/SysAp.rss HEADER @@ -167,20 +94,6 @@ TARGETPATH /private/10003a3f/apps END -SOURCEPATH ../Data - -USERINCLUDE . -USERINCLUDE ../Inc -USERINCLUDE ../Src/CenRepObservers -USERINCLUDE ../Src/memorycard -USERINCLUDE ../Src/Usb -USERINCLUDE ../Src/powersavemode -USERINCLUDE ../../inc // subsystem headers -USERINCLUDE ../../../inc // ado headers -USERINCLUDE ../CenRep -USERINCLUDE ../PubSub - -MW_LAYER_SYSTEMINCLUDE LIBRARY euser.lib LIBRARY apparc.lib @@ -188,67 +101,110 @@ LIBRARY eikcore.lib LIBRARY apgrfx.lib LIBRARY ws32.lib -LIBRARY avkon.lib + LIBRARY bafl.lib -LIBRARY aknnotify.lib + LIBRARY eiksrvc.lib LIBRARY connmon.lib LIBRARY dsclient.lib LIBRARY profileeng.lib LIBRARY starterclient.lib -LIBRARY centralrepository.lib -LIBRARY cenrepnotifhandler.lib -LIBRARY commonengine.lib -LIBRARY activitymanager.lib -LIBRARY akncapserverclient.lib -LIBRARY secui.lib -LIBRARY sssettings.lib + + LIBRARY fbscli.lib LIBRARY etel.lib LIBRARY etelmm.lib -LIBRARY customapi.lib +LIBRARY efsrv.lib + +LIBRARY esock.lib + +LIBRARY ecom.lib + +LIBRARY hbwidgets.lib +//LIBRARY qtcore.lib + +//LIBRARY HbDeviceInputDialogWidget.lib + +//For CHbIndicatorSymbian and for CHbPowereMenusymbian +LIBRARY hbcore.lib +LIBRARY hwrmlightclient.lib LIBRARY featmgr.lib -LIBRARY efsrv.lib -LIBRARY aknmemorycardui.lib -LIBRARY esock.lib +LIBRARY activitymanager.lib +LIBRARY remconcoreapi.lib +LIBRARY remconinterfacebase.lib +//LIBRARY hbpowermenuwidget.lib + +// End of File + + +#ifdef __USB +SOURCEPATH ../Src/Usb +SOURCE SysApUsbIndicatorImpl.cpp +LIBRARY usbman.lib // USB Manager +#endif +SOURCE sysapusbchargerdetector.cpp + +SOURCEPATH ../Src +SOURCE SysApAccessoryObserver.cpp SysApCenRepController.cpp +LIBRARY accclient.lib +LIBRARY accpolicy.lib + +SOURCE CenRepObservers/SysApCenRepBTObserver.cpp +SOURCE CenRepObservers/SysApCenRepHacSettingObserver.cpp +SOURCE CenRepObservers/sysapcenreplightsettingsobserver.cpp +SOURCE CenRepObservers/SysApCenRepLogsObserver.cpp +SOURCE CenRepObservers/sysapcenrepofflinemodeobserver.cpp + +LIBRARY centralrepository.lib +LIBRARY cenrepnotifhandler.lib + +SOURCE sysapaudioroutingobserver.cpp +LIBRARY telephonyaudiorouting.lib + #ifdef RD_STARTUP_ANIMATION_CUSTOMIZATION LIBRARY sanimctrl.lib #else // RD_STARTUP_ANIMATION_CUSTOMIZATION LIBRARY MediaClientAudio.lib #endif // RD_STARTUP_ANIMATION_CUSTOMIZATION -LIBRARY hwrmlightclient.lib -//LIBRARY hwrmfmtxclient.lib -LIBRARY remconcoreapi.lib -LIBRARY remconinterfacebase.lib -LIBRARY aknicon.lib -LIBRARY cdlengine.lib -// POC launching -LIBRARY servicehandler.lib - -LIBRARY ecom.lib - - -LIBRARY mediatorclient.lib LIBRARY bmpanim.lib -LIBRARY telephonyaudiorouting.lib -LIBRARY etelpckt.lib - -#ifdef RD_MULTIPLE_DRIVE -LIBRARY platformenv.lib -LIBRARY disknotifyhandler.lib -#endif // RD_MULTIPLE_DRIVE - +SOURCEPATH ../Src/powersavemode +SOURCE sysappsmcontroller.cpp LIBRARY psmclient.lib -LIBRARY keylockpolicyapi.lib +SOURCEPATH ../Src +SOURCE sysapbatteryinfocontroller.cpp SysApSimChanged.cpp +LIBRARY secui.lib LIBRARY bsutil.lib -LIBRARY batterypopupcontrol.lib +//LIBRARY batterypopupcontrol.lib +//LIBRARY CommonEngine.lib +SOURCEPATH ../Src/Bt +SOURCE SysApBtControllerImpl.cpp +SOURCEPATH ../Src/BtSap +SOURCE SysApBtSapControllerImpl.cpp -LIBRARY eikcoctl.lib -// End of File +//LIBRARY eikcoctl.lib +//LIBRARY etelpckt.lib +LIBRARY btengconnman.lib +LIBRARY btdevice.lib +LIBRARY bluetooth.lib +LIBRARY btengdevman.lib +LIBRARY btengsettings.lib +LIBRARY btmanclient.lib + +LIBRARY lockclient.lib + +SOURCEPATH ../Src +SOURCE sysapkeymanagement.cpp SysApTaskList.cpp +SOURCE SysApKeySndHandler.cpp SysApKeySndAnim.cpp SysApAnimKeySndControl.cpp + +//For Shutdown +LIBRARY SVGEngine.lib +LIBRARY gdi.lib + +LIBRARY avkon.lib