diff -r 73a1feb507fb -r bc78a40cd63c tsrc/CenrepEditor/data/cenrepeditor.rss
--- a/tsrc/CenrepEditor/data/cenrepeditor.rss	Tue Aug 31 15:12:07 2010 +0300
+++ b/tsrc/CenrepEditor/data/cenrepeditor.rss	Wed Sep 01 12:31:01 2010 +0100
@@ -137,28 +137,27 @@
     {
     type = ENaviDecoratorControlTabGroup;
     control = TAB_GROUP
-        {
-        tab_width = EAknTabWidthWithThreeTabs;  // three tabs
-        active = 0;
-        tabs = 
-            {
-            TAB
-                {
+		{
+		tab_width = EAknTabWidthWithThreeTabs;  // three tabs
+		active = 0;
+		tabs = {
+			TAB
+				{
                 id = EAvkonViewExampleView1Tab; // from application hrh
                 txt = qtn_view1_tab;
                 },
-            TAB
-                {
+			TAB
+				{
                 id = EAvkonViewExampleView2Tab;
                 txt = qtn_view2_tab;
-                },
-            TAB
-                {
+				},
+			TAB
+				{
                 id = EAvkonViewExampleView3Tab;
                 txt = qtn_view3_tab;
-                }
-            };
-        };
+				}
+			};
+		};
 	}
 
 
@@ -176,22 +175,21 @@
     }
     
 RESOURCE CBA r_cenrepeditor_softkeys_save_exit
-    {
-    buttons =
-        {
-        CBA_BUTTON
-            {
-            id = EAknSoftKeySave;
-            txt = qtn_cenrepeditor_cba_text_save;
-            },
-        CBA_BUTTON
-            {
-            id = EAknSoftKeyExit;
-            txt = qtn_cenrepeditor_cba_text_Exit;
-            }
-        };
-    }
-
+	{
+		buttons =
+			{
+			CBA_BUTTON
+				{
+				id = EAknSoftKeySave;
+				txt = qtn_cenrepeditor_cba_text_save;
+				},
+		CBA_BUTTON
+				{
+				id = EAknSoftKeyExit;
+				txt = qtn_cenrepeditor_cba_text_Exit;
+				}
+			};
+	}
 RESOURCE AVKON_SETTING_ITEM_LIST r_phone_resource_details_settings_list
 	{
     flags= EAknSettingItemNumberedStyle;    
@@ -202,60 +200,85 @@
         AVKON_SETTING_ITEM
             {
             identifier = EPhoneResouceCamera;
-            setting_page_resource = r_popup_settings_page;
+            setting_page_resource = r_availability_settings_page;
             name = "CameraAvailability";
             associated_resource = r_availability_settings_page_texts;
             },	
         AVKON_SETTING_ITEM
             {
             identifier = EPhoneResouceKeypad;
-            setting_page_resource = r_popup_settings_page;
+            setting_page_resource = r_availability_settings_page;
             name = "KeypadAvailability";
             associated_resource = r_availability_settings_page_texts;
             },				
-        AVKON_SETTING_ITEM
-            {
-            identifier = EPhoneResouceVideoPlayer;
-            setting_page_resource = r_popup_settings_page;
-            name = "VideoPlayerAvailability";
+		AVKON_SETTING_ITEM
+			{
+			identifier = EPhoneResouceVideoPlayer;
+			setting_page_resource = r_availability_settings_page;
+			name = "VideoPlayerAvailability";
             associated_resource = r_availability_settings_page_texts;
-            },
+			},
+		AVKON_SETTING_ITEM
+			{
+			identifier = EPhoneResouceCameraInformation;
+			setting_page_resource = r_CameraInformation_settings_page;
+			name = "CameraInformation";
+            associated_resource = r_CameraInformation_settings_page_texts;
+			},
         AVKON_SETTING_ITEM
-            {
-            identifier = EPhoneResouceCameraInformation;
-            setting_page_resource = r_popup_settings_page;
-            name = "CameraInformation";
-            associated_resource = r_CameraInformation_settings_page_texts;
-            },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EKodiakPhoneCall;
-            setting_page_resource = r_popup_settings_page;
-            name = "KodiakPTT";
+			{
+			identifier = EKodiakPhoneCall;
+			setting_page_resource = r_kodiak_call_settings_page;
+			name = "KodiakPTT";
             associated_resource = r_kodiak_call_settings_page_texts;
-            }
+			}
 		};
 	}
 
 
 
 //camera	
+RESOURCE AVKON_SETTING_PAGE r_availability_settings_page
+    {
+    number = 1;
+    type = EAknCtPopupSettingList;
+    editor_resource_id = r_enumerated_text_setting_other_editor;
+    }
+
+
 RESOURCE AVKON_POPUP_SETTING_TEXTS r_availability_settings_page_texts
     {
     setting_texts_resource = r_availability_page_texts_array;
+    popped_up_texts_resource = r_availability_settings_page_popedup;
     }
 
 RESOURCE ARRAY r_availability_page_texts_array
     {
-    items =
-        {
+        items =
+        {        
         AVKON_ENUMERATED_TEXT { value=1; text = "1.EAvailable"; },        
         AVKON_ENUMERATED_TEXT { value=2; text = "2.ENotAvailable"; }
         };
     }
 
+RESOURCE ARRAY r_availability_settings_page_popedup
+    {
+    items =
+        {        
+        LBUF { txt = "1.EAvailable"; },        
+        LBUF { txt = "2.ENotAvailable"; }        
+        };
+    }
 
 //camera information
+RESOURCE AVKON_SETTING_PAGE r_CameraInformation_settings_page
+    {
+    number = 1;
+    label = "Value";
+    type = EAknCtPopupSettingList;
+    editor_resource_id = r_enumerated_text_setting_other_editor;
+    }
+
 RESOURCE AVKON_POPUP_SETTING_TEXTS r_CameraInformation_settings_page_texts
     {
     setting_texts_resource = r_CameraInformation_settings_page_texts_array;
@@ -264,7 +287,7 @@
 
 RESOURCE ARRAY r_CameraInformation_settings_page_texts_array
     {
-    items =
+        items =
         {
         AVKON_ENUMERATED_TEXT { value=1; text = "1.EUsePrimaryCamera"; },
         AVKON_ENUMERATED_TEXT { value=2; text = "2.EUseSecondaryCamera"; }        
@@ -273,28 +296,45 @@
 
 RESOURCE ARRAY r_CameraInformation_settings_page_popedup
     {
-    items =
-        {
+        items =
+        { 
         LBUF { txt = "1.EUsePrimaryCamera"; },
         LBUF { txt = "2.EUseSecondaryCamera"; }        
         };
     }
 
 //kodiak PTT
+RESOURCE AVKON_SETTING_PAGE r_kodiak_call_settings_page
+    {
+    number = 1;
+    type = EAknCtPopupSettingList;
+    editor_resource_id = r_enumerated_text_setting_other_editor;
+    }
+
 RESOURCE AVKON_POPUP_SETTING_TEXTS r_kodiak_call_settings_page_texts
     {
     setting_texts_resource = r_kodiak_call_settings_page_texts_array;
+    popped_up_texts_resource = r_kodiak_call_settings_page_popedup;
     }
 
 RESOURCE ARRAY r_kodiak_call_settings_page_texts_array
     {
-    items =
+        items =
         {
         AVKON_ENUMERATED_TEXT { value=0; text = "0.EPSCTsyKodiakPttNotActive"; },
         AVKON_ENUMERATED_TEXT { value=1; text = "1.EPSCTsyKodiakPttActive"; }        
         };
     }
 
+RESOURCE ARRAY r_kodiak_call_settings_page_popedup
+    {
+        items =
+        {
+        LBUF { txt = "0.EPSCTsyKodiakPttNotActive"; },
+        LBUF { txt = "1.EPSCTsyKodiakPttActive"; }        
+        };
+    }
+
 RESOURCE POPUP_SETTING_LIST r_enumerated_text_setting_other_editor
     {    
    // other="-1.Undefined";
@@ -321,406 +361,477 @@
 
 
 RESOURCE AVKON_SETTING_ITEM_LIST r_other_resource_details_settings_list
-    {
+	{
     flags= EAknSettingItemNumberedStyle; 
-    title = qtn_otherresource_details;
-    initial_number = 1;
-    items =     
-        {
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourceActivation;
-            setting_page_resource = r_popup_settings_page;
-            name = "Activation";
+	title = qtn_otherresource_details;
+	initial_number = 1;
+	items =     
+		{
+		AVKON_SETTING_ITEM
+			{
+			identifier = EOtherResourceActivation;
+			setting_page_resource = r_activation_editor_settings_page;
+			name = "Activation";
             associated_resource = r_activation_editor_settings_page_texts;
-            },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourceOperatorVariant;
-            setting_page_resource = r_popup_settings_page;
-            name = "OperatorVariant";
+			},
+		AVKON_SETTING_ITEM
+			{
+			identifier = EOtherResourceOperatorVariant;
+			setting_page_resource = r_operator_editor_settings_page;
+			name = "OperatorVariant";
             associated_resource = r_operator_editor_settings_page_texts;
-            },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourceAuditoryNotification;
-            setting_page_resource = r_popup_settings_page;
-            name = "AuditoryNotification";
+			},
+		AVKON_SETTING_ITEM
+			{
+			identifier = EOtherResourceAuditoryNotification;
+			setting_page_resource = r_Auditory_editor_settings_page;
+			name = "AuditoryNotification";
             associated_resource = r_Auditory_editor_settings_page_texts;
-            },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourcePopupNotification;
-            setting_page_resource = r_popup_settings_page;
-            name = "PopupNotification";
+			},
+		AVKON_SETTING_ITEM
+			{
+			identifier = EOtherResourcePopupNotification;
+			setting_page_resource = r_Popup_editor_settings_page;
+			name = "PopupNotification";
             associated_resource = r_Popup_editor_settings_page_texts;
-            },
-        AVKON_SETTING_ITEM
+			},
+		AVKON_SETTING_ITEM
+			{
+			identifier = EOtherResourcePopupNotificationType;
+			setting_page_resource = r_PopupType_editor_settings_page;
+			name = "PopupNotificationType";
+            associated_resource = r_PopupType_editor_settings_page_texts;
+			},
+		AVKON_SETTING_ITEM
+			{
+			identifier = EOtherResourceEdgeDtmSupport;
+			setting_page_resource = r_edgedtm_editor_settings_page;
+			name = "EdgeDtmSupport";
+            associated_resource = r_edgedtm_editor_settings_page_texts;
+			},
+		AVKON_SETTING_ITEM
+			{
+			identifier = EOtherResourceSessionSetupMethod;
+			setting_page_resource = r_signal_editor_settings_page;
+			name = "ForceInternetSignaling";
+            associated_resource = r_signal_editor_settings_page_texts;
+			},
+		AVKON_SETTING_ITEM
+			{
+			identifier = EOtherResourceAutoRecord;
+			setting_page_resource = r_videosaving_editor_settings_page;
+			name = "AutoRecord";
+            associated_resource = r_videosaving_editor_settings_page_texts;
+			},
+		AVKON_SETTING_ITEM
+			{
+			identifier = EOtherResourceVideoLocation;
+			setting_page_resource = r_editor_settings_page;
+			name = "VideoLocation";            
+			},
+		AVKON_SETTING_ITEM
+			{
+			identifier = EOtherResourceSipProfileId;
+			setting_page_resource = r_editor_settings_page;
+			name = "SipProfileId";            
+			},
+		AVKON_SETTING_ITEM
+			{
+			identifier = EOtherResourceUiOrientation;
+			setting_page_resource = r_uiorientation_editor_settings_page;
+			name = "UiOrientation";
+            associated_resource = r_uiorientation_editor_settings_page_texts;
+			},
+		AVKON_SETTING_ITEM
+			{
+			identifier = EOtherResourceCapabilityQuery;
+			setting_page_resource = r_capquery_editor_settings_page;
+			name = "CapabilityQuery";
+            associated_resource = r_capquery_editor_settings_page_texts;
+			},
+		AVKON_SETTING_ITEM
+			{
+			identifier = EOtherResourceProductModeVariationKey;
+			setting_page_resource = r_editor_settings_page;
+			name = "ProductModeVariation";            
+			},
+		AVKON_SETTING_ITEM
             {
-            identifier = EOtherResourcePopupNotificationType;
-            setting_page_resource = r_popup_settings_page;
-            name = "PopupNotificationType";
-            associated_resource = r_PopupType_editor_settings_page_texts;
-            },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourceEdgeDtmSupport;
-            setting_page_resource = r_popup_settings_page;
-            name = "EdgeDtmSupport";
-            associated_resource = r_edgedtm_editor_settings_page_texts;
-            },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourceSessionSetupMethod;
-            setting_page_resource = r_popup_settings_page;
-            name = "ForceInternetSignaling";
-            associated_resource = r_signal_editor_settings_page_texts;
-            },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourceAutoRecord;
-            setting_page_resource = r_popup_settings_page;
-            name = "AutoRecord";
-            associated_resource = r_videosaving_editor_settings_page_texts;
-            },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourceVideoLocation;
-            setting_page_resource = r_editor_settings_page;
-            name = "VideoLocation";            
-            },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourceSipProfileId;
-            setting_page_resource = r_editor_settings_page;
-            name = "SipProfileId";            
+            identifier = EOtherRResourcePrivacyVariationMode;
+            setting_page_resource = r_privacy_settings_page;
+            name = "Privacy variation";
+            associated_resource = r_privacy_editor_settings_page_texts;
             },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourceUiOrientation;
-            setting_page_resource = r_popup_settings_page;
-            name = "UiOrientation";
-            associated_resource = r_uiorientation_editor_settings_page_texts;
-            },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourceCapabilityQuery;
-            setting_page_resource = r_popup_settings_page;
-            name = "CapabilityQuery";
-            associated_resource = r_capquery_editor_settings_page_texts;
-            },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourceProductModeVariationKey;
-            setting_page_resource = r_editor_settings_page;
-            name = "ProductModeVariation";            
-            },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourceEncoderConfigurationInfo;
-            setting_page_resource = r_encoder_info_settings_page;
-            name = "EncoderConfigurationInfo";            
-            },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourceEncodingDevice;
-            setting_page_resource = r_encoding_device_settings_page;
-            name = "EncodingDevice";            
-            },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourceAllowOnlyWithActiveCSCall;
-            setting_page_resource = r_popup_settings_page;
-            name = "AllowWithCSCallOnly";
-            associated_resource = r_activecscall_editor_settings_page_texts;
-            },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourceAllowOnlyIn3GNetwork;
-            setting_page_resource = r_popup_settings_page;
-            name = "AllowIn3GNetworkOnly";
-            associated_resource = r_3gnetwork_editor_settings_page_texts;
-            },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourceCameraUsage;
-            setting_page_resource = r_popup_settings_page;
-            name = "CameraUsage";
-            associated_resource = r_camera_usage_settings_page_texts;
-            },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourceVideoDirection;
-            setting_page_resource = r_popup_settings_page;
-            name = "VideoDirection";
-            associated_resource = r_video_direction_settings_page_texts;
-            },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourceVideoBandwidth;
-            setting_page_resource = r_editor_settings_page;
-            name = "VideoBandwidth,KBits";
-            },
-        AVKON_SETTING_ITEM
-            {
-            identifier = EOtherResourceFastMode;
-            setting_page_resource = r_popup_settings_page;
-            name = "FastStartupMode";
-            associated_resource = r_fast_mode_settings_page_texts;
-            }
-        };
-    }
+		AVKON_SETTING_ITEM
+		    {
+		    identifier = EOtherResourceEncoderConfigurationInfo;
+		    setting_page_resource = r_encoder_info_settings_page;
+		    name = "EncoderConfigurationInfo";            
+		    },
+		AVKON_SETTING_ITEM
+		    {
+		    identifier = EOtherResourceEncodingDevice;
+		    setting_page_resource = r_encoding_device_settings_page;
+		    name = "EncodingDevice";            
+		    }
+		};
+	}
 	
 //activation
+RESOURCE AVKON_SETTING_PAGE r_activation_editor_settings_page
+    {
+    number = 1;
+    type = EAknCtPopupSettingList;
+    editor_resource_id = r_enumerated_text_setting_other_editor;
+    }
+
 RESOURCE AVKON_POPUP_SETTING_TEXTS r_activation_editor_settings_page_texts
     {
     setting_texts_resource = r_activation_editor_settings_page_texts_array;
+    popped_up_texts_resource = r_activation_editor_settings_page_popedup;
     }
 
 RESOURCE ARRAY r_activation_editor_settings_page_texts_array
     {
-    items =
+        items =
         {
-        AVKON_ENUMERATED_TEXT { value=-1; text = "Not defined"; },
-        AVKON_ENUMERATED_TEXT { value=0; text = "0.EAlwaysActive"; },
-        AVKON_ENUMERATED_TEXT { value=1; text = "1.EActiveInHomeNetworks"; },        
-        AVKON_ENUMERATED_TEXT { value=2; text = "2.ENever"; }        
+        AVKON_ENUMERATED_TEXT { value=0; text = "0.EAlwaysActive"; },   
+        AVKON_ENUMERATED_TEXT { value=1; text = "1.ENever"; }        
+        };
+    }
+
+RESOURCE ARRAY r_activation_editor_settings_page_popedup
+    {
+        items =
+        {
+        LBUF { txt = "0.EAlwaysActive"; },
+        LBUF { txt = "1.ENever"; }
         };
     }
 
 //operator variant
+RESOURCE AVKON_SETTING_PAGE r_operator_editor_settings_page
+    {
+    number = 1;
+    type = EAknCtPopupSettingList;
+    editor_resource_id = r_enumerated_text_setting_other_editor;
+    }
+
 RESOURCE AVKON_POPUP_SETTING_TEXTS r_operator_editor_settings_page_texts
     {
     setting_texts_resource = r_operator_editor_settings_page_texts_array;
+    popped_up_texts_resource = r_operator_editor_settings_page_popedup;
     }
 
 RESOURCE ARRAY r_operator_editor_settings_page_texts_array
     {
-    items =
+        items =
         {
-        AVKON_ENUMERATED_TEXT { value=-1; text = "Not defined"; },
         AVKON_ENUMERATED_TEXT { value=0; text = "0.EStandard"; },
         AVKON_ENUMERATED_TEXT { value=1; text = "1.EOperatorSpecific"; }        
         };
     }
 
+RESOURCE ARRAY r_operator_editor_settings_page_popedup
+    {
+        items =
+        {
+        LBUF { txt = "0.EStandard"; },
+        LBUF { txt = "1.EOperatorSpecific"; }        
+        };
+    }
+
 //Auditory Notification
+RESOURCE AVKON_SETTING_PAGE r_Auditory_editor_settings_page
+    {
+    number = 1;
+    type = EAknCtPopupSettingList;
+    editor_resource_id = r_enumerated_text_setting_other_editor;
+    }
+
 RESOURCE AVKON_POPUP_SETTING_TEXTS r_Auditory_editor_settings_page_texts
     {
     setting_texts_resource = r_Auditory_editor_settings_page_texts_array;
+    popped_up_texts_resource = r_Auditory_editor_settings_page_popedup;
     }
 
 RESOURCE ARRAY r_Auditory_editor_settings_page_texts_array
     {
-    items =
+        items =
         {
-        AVKON_ENUMERATED_TEXT { value=-1; text = "Not defined"; },
         AVKON_ENUMERATED_TEXT { value=0; text = "0.EAuditoryNotificationOn"; },
         AVKON_ENUMERATED_TEXT { value=1; text = "1.EAuditoryNotificationOff"; }        
         };
     }
 
+RESOURCE ARRAY r_Auditory_editor_settings_page_popedup
+    {
+        items =
+        {
+        LBUF { txt = "0.EAuditoryNotificationOn"; },
+        LBUF { txt = "1.EAuditoryNotificationOff"; }        
+        };
+    }
+
+
 //Popup Notification
+RESOURCE AVKON_SETTING_PAGE r_Popup_editor_settings_page
+    {
+    number = 1;
+    type = EAknCtPopupSettingList;
+    editor_resource_id = r_enumerated_text_setting_other_editor;
+    }
+
 RESOURCE AVKON_POPUP_SETTING_TEXTS r_Popup_editor_settings_page_texts
     {
     setting_texts_resource = r_Popup_editor_settings_page_texts_array;
+    popped_up_texts_resource = r_Popup_editor_settings_page_popedup;
     }
 
 RESOURCE ARRAY r_Popup_editor_settings_page_texts_array
     {
-    items =
+        items =
         {
-        AVKON_ENUMERATED_TEXT { value=-1; text = "Not defined"; },
         AVKON_ENUMERATED_TEXT { value=0; text = "0.EPopupNotificationOn"; },
         AVKON_ENUMERATED_TEXT { value=1; text = "1.EPopupNotificationOff"; }        
         };
     }
 
+RESOURCE ARRAY r_Popup_editor_settings_page_popedup
+    {
+        items =
+        {        
+        LBUF { txt = "0.EPopupNotificationOn"; },
+        LBUF { txt = "1.EPopupNotificationOff"; }        
+        };
+    }
+
 //Popup Notification Type
+RESOURCE AVKON_SETTING_PAGE r_PopupType_editor_settings_page
+    {
+    number = 1;
+    type = EAknCtPopupSettingList;
+    editor_resource_id = r_enumerated_text_setting_other_editor;
+    }
+
 RESOURCE AVKON_POPUP_SETTING_TEXTS r_PopupType_editor_settings_page_texts
     {
     setting_texts_resource = r_PopupType_editor_settings_page_texts_array;
+    popped_up_texts_resource = r_PopupType_editor_settings_page_popedup;
     }
 
 RESOURCE ARRAY r_PopupType_editor_settings_page_texts_array
     {
-    items =
+        items =
         {
-        AVKON_ENUMERATED_TEXT { value=-1; text = "Not defined"; },
         AVKON_ENUMERATED_TEXT { value=0; text = "0.ENotificationTypeQueryUser"; },
         AVKON_ENUMERATED_TEXT { value=1; text = "1.ENotificationTypePopup"; }        
         };
     }
 
+RESOURCE ARRAY r_PopupType_editor_settings_page_popedup
+    {
+        items =
+        {
+        LBUF { txt = "0.ENotificationTypeQueryUser"; },
+        LBUF { txt = "1.ENotificationTypePopup"; }        
+        };
+    }
+
+
 //EDGE/DTM
+RESOURCE AVKON_SETTING_PAGE r_edgedtm_editor_settings_page
+    {
+    number = 1;
+    type = EAknCtPopupSettingList;
+    editor_resource_id = r_enumerated_text_setting_other_editor;
+    }
+
 RESOURCE AVKON_POPUP_SETTING_TEXTS r_edgedtm_editor_settings_page_texts
     {
     setting_texts_resource = r_edgedtm_editor_settings_page_texts_array;
+    popped_up_texts_resource = r_edgedtm_editor_settings_page_popedup;
     }
 
 RESOURCE ARRAY r_edgedtm_editor_settings_page_texts_array
     {
-    items =
+        items =
         {
-        AVKON_ENUMERATED_TEXT { value=-1; text = "Not defined"; },
         AVKON_ENUMERATED_TEXT { value=0; text = "0.EDtmModeAllowed"; },
         AVKON_ENUMERATED_TEXT { value=1; text = "1.EDtmModeNotAllowed"; }        
         };
     }
 
+RESOURCE ARRAY r_edgedtm_editor_settings_page_popedup
+    {
+        items =
+        {
+        LBUF { txt = "0.EDtmModeAllowed"; },
+        LBUF { txt = "1.EDtmModeNotAllowed"; }        
+        };
+    }
+
 //Internet Signalling
+RESOURCE AVKON_SETTING_PAGE r_signal_editor_settings_page
+    {
+    number = 1;
+    type = EAknCtPopupSettingList;
+    editor_resource_id = r_enumerated_text_setting_other_editor;
+    }
+
 RESOURCE AVKON_POPUP_SETTING_TEXTS r_signal_editor_settings_page_texts
     {
     setting_texts_resource = r_signal_editor_settings_page_texts_array;
+    popped_up_texts_resource = r_signal_editor_settings_page_popedup;
     }
 
 RESOURCE ARRAY r_signal_editor_settings_page_texts_array
     {
-    items =
+        items =
         {
-        AVKON_ENUMERATED_TEXT { value=-1; text = "Not defined"; },
         AVKON_ENUMERATED_TEXT { value=0; text = "0.EForceInternetSignaling"; },
         AVKON_ENUMERATED_TEXT { value=1; text = "1.EFollowProfileConfiguration"; }        
         };
     }
 
+RESOURCE ARRAY r_signal_editor_settings_page_popedup
+    {
+        items =
+        {
+        LBUF { txt = "0.EForceInternetSignaling"; },
+        LBUF { txt = "1.EFollowProfileConfiguration"; }        
+        };
+    }
+
 //Video Saving 
+RESOURCE AVKON_SETTING_PAGE r_videosaving_editor_settings_page
+    {
+    number = 1;
+    type = EAknCtPopupSettingList;
+    editor_resource_id = r_enumerated_text_setting_other_editor;
+    }
+
 RESOURCE AVKON_POPUP_SETTING_TEXTS r_videosaving_editor_settings_page_texts
     {
     setting_texts_resource = r_videosaving_editor_settings_page_texts_array;
+    popped_up_texts_resource = r_videosaving_editor_settings_page_popedup;
     }
 
 RESOURCE ARRAY r_videosaving_editor_settings_page_texts_array
     {
-    items =
+        items =
         {
-        AVKON_ENUMERATED_TEXT { value=-1; text = "Not defined"; },
         AVKON_ENUMERATED_TEXT { value=0; text = "0.EAutoRecordOn"; },
         AVKON_ENUMERATED_TEXT { value=1; text = "1.EAutoRecordOff"; }
         };
     }
 
+RESOURCE ARRAY r_videosaving_editor_settings_page_popedup
+    {
+        items =
+        {
+        LBUF { txt = "0.EAutoRecordOn"; },
+        LBUF { txt = "1.EAutoRecordOff"; } 
+        };
+    }
+
 //UI Orientation
+RESOURCE AVKON_SETTING_PAGE r_uiorientation_editor_settings_page
+    {
+    number = 1;
+    type = EAknCtPopupSettingList;
+    editor_resource_id = r_enumerated_text_setting_other_editor;
+    }
+
 RESOURCE AVKON_POPUP_SETTING_TEXTS r_uiorientation_editor_settings_page_texts
     {
     setting_texts_resource = r_uiorientation_editor_settings_page_texts_array;
+    popped_up_texts_resource = r_uiorientation_editor_settings_page_popedup;
     }
 
 RESOURCE ARRAY r_uiorientation_editor_settings_page_texts_array
     {
-    items =
+        items =
         {
-        AVKON_ENUMERATED_TEXT { value=-1; text = "Not defined"; },
         AVKON_ENUMERATED_TEXT { value=0; text = "0.EPortrait"; },
         AVKON_ENUMERATED_TEXT { value=1; text = "1.ELandscape"; }        
         };
     }
 
+RESOURCE ARRAY r_uiorientation_editor_settings_page_popedup
+    {
+        items =
+        {
+        LBUF { txt = "0.EPortrait"; },
+        LBUF { txt = "1.ELandscape"; }               
+        };
+    }
 
 //Capability Query
+RESOURCE AVKON_SETTING_PAGE r_capquery_editor_settings_page
+    {
+    number = 1;
+    type = EAknCtPopupSettingList;
+    editor_resource_id = r_enumerated_text_setting_other_editor;
+    }
+
 RESOURCE AVKON_POPUP_SETTING_TEXTS r_capquery_editor_settings_page_texts
     {
     setting_texts_resource = r_capquery_editor_settings_page_texts_array;
+    popped_up_texts_resource = r_capquery_editor_settings_page_popedup;
     }
 
 RESOURCE ARRAY r_capquery_editor_settings_page_texts_array
     {
-    items =
+        items =
         {
-        AVKON_ENUMERATED_TEXT { value=-1; text = "Not defined"; },
         AVKON_ENUMERATED_TEXT { value=0; text = "0.ESequential"; },
         AVKON_ENUMERATED_TEXT { value=1; text = "1.EParallel"; },        
         AVKON_ENUMERATED_TEXT { value=2; text = "2.ENoOptions"; }   
         };
     }
 
-
-//Allow multimedia sharing only with active CS call 
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_activecscall_editor_settings_page_texts
+RESOURCE ARRAY r_capquery_editor_settings_page_popedup
     {
-    setting_texts_resource = r_activecscall_editor_settings_page_texts_array;
-    }
-
-RESOURCE ARRAY r_activecscall_editor_settings_page_texts_array
-    {
-    items =
+        items =
         {
-        AVKON_ENUMERATED_TEXT { value=-1; text = "Not defined"; },
-        AVKON_ENUMERATED_TEXT { value=0; text = "0.EAllowedAllCalls"; },
-        AVKON_ENUMERATED_TEXT { value=1; text = "1.EAllowedCSOnly"; }
-        };
-    }
-
-
-//Allow multimedia sharing only in 3G network 
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_3gnetwork_editor_settings_page_texts
-    {
-    setting_texts_resource = r_3gnetwork_editor_settings_page_texts_array;
-    }
-
-RESOURCE ARRAY r_3gnetwork_editor_settings_page_texts_array
-    {
-    items =
-        {
-        AVKON_ENUMERATED_TEXT { value=-1; text = "Not defined"; },
-        AVKON_ENUMERATED_TEXT { value=0; text = "0.EAllowedAllBearers"; },
-        AVKON_ENUMERATED_TEXT { value=1; text = "1.EAllowed3GOnly"; }
+        LBUF { txt = "0.ESequential"; },
+        LBUF { txt = "1.EParallel"; },               
+        LBUF { txt = "2.ENoOptions"; }               
         };
     }
 
-
-//Camera Usage 
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_camera_usage_settings_page_texts
+//Privacy
+RESOURCE AVKON_SETTING_PAGE r_privacy_settings_page
     {
-    setting_texts_resource = r_camera_usage_settings_page_texts_array;
+    number = 1;
+    type = EAknCtPopupSettingList;
+    editor_resource_id = r_enumerated_text_setting_other_editor;
     }
 
-RESOURCE ARRAY r_camera_usage_settings_page_texts_array
+RESOURCE AVKON_POPUP_SETTING_TEXTS r_privacy_editor_settings_page_texts
     {
-    items =
-        {
-        AVKON_ENUMERATED_TEXT { value=-1; text = "Not defined"; },
-        AVKON_ENUMERATED_TEXT { value=0; text = "0.EUseOnlyMainCamera"; },
-        AVKON_ENUMERATED_TEXT { value=1; text = "1.EUseOnlySecondaryCamera"; },
-        AVKON_ENUMERATED_TEXT { value=2; text = "2.EUseCameraSwapping"; }
-        };
-    }
-
-
-//Video direction 
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_video_direction_settings_page_texts
-    {
-    setting_texts_resource = r_video_direction_settings_page_texts_array;
+    setting_texts_resource = r_privacy_editor_settings_page_texts_array;
+    popped_up_texts_resource = r_privacy_editor_settings_page_popedup;
     }
 
-RESOURCE ARRAY r_video_direction_settings_page_texts_array
+RESOURCE ARRAY r_privacy_editor_settings_page_texts_array
     {
-    items =
+        items =
         {
-        AVKON_ENUMERATED_TEXT { value=-1; text = "Not defined"; },
-        AVKON_ENUMERATED_TEXT { value=0; text = "0.EOneWayVideo"; },
-        AVKON_ENUMERATED_TEXT { value=1; text = "1.ETwoWayVideo"; }
+        AVKON_ENUMERATED_TEXT { value=1; text = "0.EPrivacyOn"; },
+        AVKON_ENUMERATED_TEXT { value=2; text = "1.ErivacyOff"; }        
         };
     }
-
-
-//Fast startup mode
-RESOURCE AVKON_POPUP_SETTING_TEXTS r_fast_mode_settings_page_texts
+RESOURCE ARRAY r_privacy_editor_settings_page_popedup
     {
-    setting_texts_resource = r_fast_mode_settings_page_texts_array;
-    }
-
-RESOURCE ARRAY r_fast_mode_settings_page_texts_array
-    {
-    items =
-        {
-        AVKON_ENUMERATED_TEXT { value=-1; text = "Not defined"; },
-        AVKON_ENUMERATED_TEXT { value=0; text = "0.EFastModeOn"; },
-        AVKON_ENUMERATED_TEXT { value=1; text = "1.EFastModeOff"; }
+        items =
+        {        
+        LBUF { txt = "0.EPrivacyOn"; },
+        LBUF { txt = "1.ErivacyOfff"; }        
         };
     }
-
-
+    
 // add setting page and editor resources for "details" field here
 RESOURCE AVKON_SETTING_PAGE r_editor_settings_page
     {
@@ -730,13 +841,6 @@
     editor_resource_id = r_integer_edwin;
     }
 
-RESOURCE AVKON_SETTING_PAGE r_popup_settings_page
-    {
-    number = 1;
-    type = EAknCtPopupSettingList;
-    editor_resource_id = r_enumerated_text_setting_other_editor;
-    }
-
 RESOURCE AVKON_SETTING_PAGE r_encoder_info_settings_page
     {
     number = 14;
@@ -769,54 +873,54 @@
     }
 
 RESOURCE CBA r_cenrepeditor_softkeys_start_exit
-    {
-    buttons =
-        {
-        CBA_BUTTON
-            {
-            id = EAknSoftKeyStart;
-            txt = qtn_cenrepeditor_cba_text_start;
-            },
-        CBA_BUTTON
-            {
-            id = EAknSoftKeyExit;
-            txt = qtn_cenrepeditor_cba_text_Exit;
-            }
-        };
-    }
+	{
+		buttons =
+			{
+			CBA_BUTTON
+				{
+				id = EAknSoftKeyStart;
+				txt = qtn_cenrepeditor_cba_text_start;
+				},
+		CBA_BUTTON
+				{
+				id = EAknSoftKeyExit;
+				txt = qtn_cenrepeditor_cba_text_Exit;
+				}
+			};
+	}
 	    
 RESOURCE CBA r_cenrepeditor_softkeys_stop_exit
-    {
-    buttons =
-        {
-        CBA_BUTTON
-            {
-            id = EAknSoftKeyStop;
-            txt = qtn_cenrepeditor_cba_text_stop;
-            },
-        CBA_BUTTON
-            {
-            id = EAknSoftKeyExit;
-            txt = qtn_cenrepeditor_cba_text_Exit;
-            }
-        };
-    }
+	{
+		buttons =
+			{
+			CBA_BUTTON
+				{
+				id = EAknSoftKeyStop;
+				txt = qtn_cenrepeditor_cba_text_stop;
+				},
+		CBA_BUTTON
+				{
+				id = EAknSoftKeyExit;
+				txt = qtn_cenrepeditor_cba_text_Exit;
+				}
+			};
+	}
 	
 RESOURCE AVKON_SETTING_ITEM_LIST r_cenrepeditor_start_stop_settings_list
 	{
-    flags = EAknSettingItemNumberedStyle;
-    items =     
-        {
-        AVKON_SETTING_ITEM
-            {
-            name = "Usecase";
-            identifier = EApplicationStartStop;
-            setting_page_resource = r_cenrepeditor_start_stop_settings_list_page;
-            associated_resource = r_cenrepeditor_start_stop_associated_settings_list_page;          
-            }
-        };
+	flags = EAknSettingItemNumberedStyle;
+	items =     
+		{
+		AVKON_SETTING_ITEM
+			{
+			name = "Usecase";
+			identifier = EApplicationStartStop;
+			setting_page_resource = r_cenrepeditor_start_stop_settings_list_page;
+			associated_resource = r_cenrepeditor_start_stop_associated_settings_list_page;
+			
+			}
+		};
 	}
-
 RESOURCE AVKON_SETTING_PAGE r_cenrepeditor_start_stop_settings_list_page
     {    
     number = -16380;    
@@ -832,40 +936,66 @@
 RESOURCE AVKON_POPUP_SETTING_TEXTS r_cenrepeditor_start_stop_associated_settings_list_page
     {    
     setting_texts_resource = r_usecase_array;
+    popped_up_texts_resource = r_usecase_array_texts;
     }
-
 RESOURCE ARRAY r_usecase_array
     {
     items = 
         {
-        AVKON_ENUMERATED_TEXT 
-            {
-            text = "Live";
-            value = 0; 
-            },
-        AVKON_ENUMERATED_TEXT 
-            {
-            text = "Clip";
-            value = 1; 
-            },
-        AVKON_ENUMERATED_TEXT 
-            {
-            text = "StillImage";
-            value = 2; 
-            },
-        AVKON_ENUMERATED_TEXT 
-            {
-            text = "Receive";
-            value = 3; 
-            },
-        AVKON_ENUMERATED_TEXT 
-            {
-            text = "Continue";
-            value = 4; 
-            }
+				AVKON_ENUMERATED_TEXT 
+					{
+					text = "Live";
+                    value = 0; 
+					},
+				AVKON_ENUMERATED_TEXT 
+					{
+					text = "Clip";
+					value = 1; 
+					},
+				AVKON_ENUMERATED_TEXT 
+					{
+					text = "StillImage";
+					value = 2; 
+					},
+				AVKON_ENUMERATED_TEXT 
+					{
+					text = "Receive";
+					value = 3; 
+					},
+				AVKON_ENUMERATED_TEXT 
+					{
+					text = "Continue";
+					value = 4; 
+					}
         };
     }
 
+RESOURCE ARRAY r_usecase_array_texts
+    {
+    items = { 
+    				LBUF 
+    					{ 
+    					txt = "Live"; 
+    					},
+    				LBUF 
+    					{
+    					txt = "Clip"; 
+    					},
+    				LBUF 
+    					{ 
+    					txt = "StillImage"; 
+    					},
+    				LBUF 
+    					{ 
+    					txt = "Receive"; 
+    					},
+    				LBUF 
+    					{ 
+    					txt = "Continue"; 
+    					}
+        };
+    }    
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------