diff -r 0818dd463d41 -r 924385140d98 coreapplicationuis/SysAp/Group/SysAp.mmp
--- a/coreapplicationuis/SysAp/Group/SysAp.mmp	Thu Aug 19 10:05:08 2010 +0300
+++ b/coreapplicationuis/SysAp/Group/SysAp.mmp	Tue Aug 31 15:24:25 2010 +0300
@@ -18,7 +18,7 @@
 
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-TARGET      SysAp.exe
+TARGET      sysap.exe
 TARGETTYPE  exe
 UID         0x0 0x100058F3
 
@@ -35,123 +35,49 @@
 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
-
-LIBRARY hal.lib
-SOURCE SysApAccessoryObserver.cpp
-LIBRARY AccClient.lib
-
-SOURCE SysApEtelConnector.cpp
+SOURCE hbdevicepowermenusymbian.cpp
+SOURCE hbdeviceinputdialogsymbian.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
+SYSTEMINCLUDE		/epoc32/include/mw/hb/hbwidgets
+SYSTEMINCLUDE		/epoc32/include/mw/hb/hbcore
 
-SOURCE sysapdefaultkeyhandler.cpp
-#ifdef RD_LIGHT_CONTROL_CHANGE
-SOURCE sysaplightpluginhandler.cpp
-#endif
+SYSTEMINCLUDE      	/epoc32/include/mw
+
 
-SOURCE sysapaudioroutingobserver.cpp
-SOURCE sysapeteldatabearerobserver.cpp
-
-SOURCE memorycard/SysApMMCObserver.cpp
-#ifdef RD_MULTIPLE_DRIVE
-SOURCE memorycard/sysapdrivelist.cpp
-SOURCE memorycard/sysapdriveunlockhandler.cpp
-SOURCE memorycard/sysapdriveejecthandler.cpp
-#endif // RD_MULTIPLE_DRIVE
+USERINCLUDE        . 
+USERINCLUDE        ../Inc
+USERINCLUDE        ../Src/CenRepObservers 
+USERINCLUDE        ../Src/Usb 
+USERINCLUDE        ../Src/powersavemode
+USERINCLUDE        ../../inc // subsystem headers
+USERINCLUDE        ../../../inc // ado headers
+USERINCLUDE        ../CenRep
+USERINCLUDE        ../PubSub
+USERINCLUDE        ../Src/memorycard
 
-SOURCE sysapetelnetworkinfoobserver.cpp
-SOURCE sysapremconobserver.cpp
-SOURCE powersavemode/sysappsmcontroller.cpp
-SOURCE sysapbatteryinfocontroller.cpp
-
-SOURCE gan\sysapganpropertylistener.cpp
-SOURCE gan\sysapganhandler.cpp
-
-SOURCE SysApSatObserver.cpp
-LIBRARY	    satclient.lib       // for sat refresh
+MW_LAYER_SYSTEMINCLUDE 
+APP_LAYER_SYSTEMINCLUDE
 
 START RESOURCE ../Data/SysAp.rss
 HEADER
@@ -171,22 +97,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
-
-USERINCLUDE ../src/gan
-
-APP_LAYER_SYSTEMINCLUDE // used instead of MW_LAYER_SYSTEMINCLUDE due to dependencies to APP layer
 
 LIBRARY euser.lib
 LIBRARY apparc.lib
@@ -194,67 +104,131 @@
 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 dsclient.lib
+LIBRARY profileeng.lib
+LIBRARY starterclient.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
+
+
+//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
+
+LIBRARY bmpanim.lib
+
+SOURCEPATH ../Src/powersavemode
+SOURCE sysappsmcontroller.cpp 
+LIBRARY psmclient.lib
+
+SOURCEPATH ../Src
+SOURCE sysapbatteryinfocontroller.cpp SysApSimChanged.cpp
 
-// POC launching
-LIBRARY ServiceHandler.lib
+LIBRARY secui.lib
+LIBRARY bsutil.lib
+LIBRARY CommonEngine.lib
+SOURCEPATH ../Src/Bt
+SOURCE SysApBtControllerImpl.cpp
+SOURCEPATH ../Src/BtSap
+SOURCE SysApBtSapControllerImpl.cpp
 
-LIBRARY ecom.lib
+//LIBRARY eikcoctl.lib
+//LIBRARY etelpckt.lib
 
 
-LIBRARY mediatorclient.lib
-LIBRARY bmpanim.lib
+LIBRARY btengconnman.lib
+LIBRARY btdevice.lib
+LIBRARY bluetooth.lib
+
+LIBRARY btengdevman.lib
+LIBRARY btengsettings.lib
+LIBRARY btmanclient.lib
+
+LIBRARY lockclient.lib
 
-LIBRARY TelephonyAudioRouting.lib
-LIBRARY etelpckt.lib
+SOURCEPATH ../Src
+SOURCE sysapkeymanagement.cpp SysApTaskList.cpp
+SOURCE SysApKeySndHandler.cpp SysApKeySndAnim.cpp SysApAnimKeySndControl.cpp SysApShutdownAnimation.cpp
+
+//For Shutdown
+LIBRARY	    SVGEngine.lib
+LIBRARY	    gdi.lib
+
+SOURCEPATH  ../Src
+
+SOURCE memorycard/SysApMMCObserver.cpp
+#ifdef RD_MULTIPLE_DRIVE
+SOURCE memorycard/sysapdrivelist.cpp
+SOURCE memorycard/sysapdriveunlockhandler.cpp
+SOURCE memorycard/sysapdriveejecthandler.cpp
+#endif // RD_MULTIPLE_DRIVE
 
 #ifdef RD_MULTIPLE_DRIVE
 LIBRARY platformenv.lib
 LIBRARY disknotifyhandler.lib
 #endif // RD_MULTIPLE_DRIVE
 
-LIBRARY psmclient.lib
 
-LIBRARY keylockpolicyapi.lib
+LIBRARY avkon.lib
 
-LIBRARY bsutil.lib
-LIBRARY batterypopupcontrol.lib
+LIBRARY customapi.lib
 
-LIBRARY eikcoctl.lib
-//  End of File
+SOURCE SysApEtelNetworkStatusNspsObserver.cpp SysApEtelConnector.cpp SysApEtelNetworkBarObserver.cpp SysApEtelSmsStoreObserver.cpp sysapeteldatabearerobserver.cpp sysapetelnetworkbargetter.cpp sysapetelnetworkinfoobserver.cpp
+
+LIBRARY etelpckt.lib
 
 
-