--- a/camerauis/cameraxui/cxengine/tsrc/fakeclasses/cxefakesettingsstore.cpp	Thu May 13 21:30:19 2010 +0300
+++ b/camerauis/cameraxui/cxengine/tsrc/fakeclasses/cxefakesettingsstore.cpp	Thu Jul 15 01:55:05 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -30,13 +30,28 @@
     mSettingKeyHash.insert(CxeSettingIds::FNAME_MONTH_FOLDER,  QVariant("08042009"));
     mSettingKeyHash.insert(CxeSettingIds::FNAME_IMAGE_COUNTER, QVariant(0));
     mSettingKeyHash.insert(CxeSettingIds::FNAME_VIDEO_COUNTER, QVariant(0));
+    
+    mSettingKeyHash.insert(CxeSettingIds::CAMERA_MODE, QVariant(0));
+    mSettingKeyHash.insert(CxeSettingIds::FLASH_MODE, QVariant(0));
+    mSettingKeyHash.insert(CxeSettingIds::IMAGE_SCENE,  QVariant("image_scene_auto"));
+    mSettingKeyHash.insert(CxeSettingIds::VIDEO_SCENE, QVariant("video_scene_auto"));
+    mSettingKeyHash.insert(CxeSettingIds::STILL_SHOWCAPTURED, QVariant(0));
+    mSettingKeyHash.insert(CxeSettingIds::VIDEO_SHOWCAPTURED, QVariant(0));
+    mSettingKeyHash.insert(CxeSettingIds::VIDEO_MUTE_SETTING,  QVariant(0));
+    
+    mSettingKeyHash.insert(CxeSettingIds::GEOTAGGING, QVariant(0));
+    mSettingKeyHash.insert(CxeSettingIds::GEOTAGGING_DISCLAIMER, QVariant(1));
+    mSettingKeyHash.insert(CxeSettingIds::FACE_TRACKING, QVariant(1));
+    mSettingKeyHash.insert(CxeSettingIds::IMAGE_QUALITY,  QVariant(0));
+    mSettingKeyHash.insert(CxeSettingIds::VIDEO_QUALITY, QVariant(0));
+
 }
 
 CxeFakeSettingsStore::~CxeFakeSettingsStore()
 {
 }
 
-/*
+/*!
 * Reads a value from cenrep
 * @param "key"   - setting key
 * @param "value" - setting value read from cenrep
@@ -55,14 +70,14 @@
     return error;
 }
 
-/*
+/*!
 * Reads a value from cenrep
 * @param "uid"   - UID of the component that own setting key
 * @param "key"   - setting key id
 * @param "type"  - type of setting key
 * @param "value" - setting value read from cenrep
 */
-void CxeFakeSettingsStore::get(long int uid, unsigned long int key, Cxe::SettingKeyType type, QVariant &value)
+void CxeFakeSettingsStore::startMonitoring(long int uid, unsigned long int key, Cxe::SettingKeyType type, QVariant &value)
 {
     Q_UNUSED(uid);
     Q_UNUSED(key);
@@ -72,7 +87,7 @@
     // no support yet
 }
 
-/*
+/*!
 * Reads/loads all run-time settings values from cenrep
 * @param QList<QString> contains list of all runtime key ids which we use to load values from cenrep.
 * returns: QHash container, "contains" values associated with each key that are read from cenrep
@@ -106,7 +121,7 @@
 }
 
 
-/*
+/*!
 * Sets a new value to cenrep
 * @param "key"   - setting key
 * @param "newValue" - new value set to the key in cenrep
@@ -121,7 +136,7 @@
     return error;
 }
 
-/*
+/*!
 * resets the cenrep store
 */
 void CxeFakeSettingsStore::reset()