--- a/locationsystemui/locationsysui/locsuplsettingsui/data/locsuplservereditor.rss	Tue Sep 14 22:09:33 2010 +0300
+++ b/locationsystemui/locationsysui/locsuplsettingsui/data/locsuplservereditor.rss	Wed Sep 15 12:40:28 2010 +0300
@@ -70,10 +70,6 @@
         	},
         MENU_ITEM	
         	{	
-        	command = ELocServerEditorChange; 	txt = qtn_loc_server_options_change; 	flags = EEikMenuItemAction;
-        	},
-        MENU_ITEM	
-        	{	
         	command = ELocServerEditorRemove; 	txt = qtn_loc_detail_options_delete; 	flags = EEikMenuItemSpecific;
         	},
         MENU_ITEM	
@@ -108,6 +104,21 @@
     form 	= 	r_suplserver_editor_form;
 	}
 
+//----------------------------------------------------
+// RESOURCE DIALOG r_suplserver_editor_form_dialog_noap
+// Form dialog to create an event
+//----------------------------------------------------
+//
+RESOURCE DIALOG r_suplserver_editor_form_dialog_noap
+    {
+    flags   =   EEikDialogFlagNoDrag | EEikDialogFlagFillAppClientRect |
+                EEikDialogFlagNoTitleBar | EEikDialogFlagButtonsRight |
+                EEikDialogFlagCbaButtons | EEikDialogFlagNoBorder |
+                EEikDialogFlagWait;
+    buttons =   r_suplserver_editor_options_edit_back;
+    form    =   r_suplserver_editor_form_noap;
+    }
+
 //----------------------------------------------------  
 // RESOURCE CBA r_suplserver_editor_options_nomsk_back
 // CBA for SUPL Settings UI view.
@@ -193,7 +204,7 @@
             type		=	EEikCtEdwin;
             prompt		=	qtn_loc_server_iap;
             id			=	ELocSuplServerIdAccessPoint;
-            itemflags 	= 	EEikDlgItemTakesEnterKey | EEikDlgItemOfferAllHotKeys | EEikDlgItemAsLabel;
+            itemflags 	= 	EEikDlgItemTakesEnterKey | EEikDlgItemOfferAllHotKeys | EEikDlgItemAsLabel | EEikEdwinReadOnly;
             control		=	EDWIN 
                 {       
                 flags 		= 	EEikEdwinResizable | EEikEdwinReadOnly | EEikEdwinAvkonDisableCursor | EEikEdwinNoAutoSelection ;
@@ -230,6 +241,57 @@
 	}
     
 //----------------------------------------------------
+// RESOURCE DIALOG r_suplserver_editor_form_noap
+// Form to create/view a server
+//----------------------------------------------------
+//
+RESOURCE FORM r_suplserver_editor_form_noap
+    {
+    flags   =  EEikFormUseDoubleSpacedFormat;
+    items   =
+        {
+        DLG_LINE
+            {
+            type        =   EEikCtEdwin;
+            prompt      =   qtn_loc_server_address_name;
+            id          =   ELocSuplServerIdServerAddr;
+            itemflags   =   EEikDlgItemTakesEnterKey | EEikDlgItemOfferAllHotKeys;
+            control     =   EDWIN 
+                {
+                flags       =   EEikEdwinJustAutoCurEnd | EEikEdwinResizable | EEikEdwinNoLineOrParaBreaks  ;
+                width       =   16; 
+                maxlength   =   255;
+                lines       =   10;
+                };
+            },
+               
+        DLG_LINE
+            {
+            type = EEikCtEdwin;
+            prompt = qtn_loc_server_usage;
+            id = ELocSuplServerIdUsageInHomeNw;
+            itemflags = EEikDlgItemTakesEnterKey;
+            control = EDWIN
+                {
+                flags = EEikEdwinNoHorizScrolling | EEikEdwinResizable |
+                EEikEdwinNoAutoSelection | EEikEdwinReadOnly|
+                EEikEdwinAvkonDisableCursor|EEikEdwinAvkonNotEditable |EEikEdwinDisplayOnly;
+                //         maxlength = ECalenAbsoluteMaxTextEditorLength;
+                default_case = EAknEditorTextCase;
+                allowed_case_modes = EAknEditorAllCaseModes;
+                numeric_keymap = EAknEditorStandardNumberModeKeymap;
+                special_character_table = R_AVKON_SPECIAL_CHARACTER_TABLE_DIALOG;
+                avkon_flags = EAknEditorFlagUseSCTNumericCharmap |
+                EAknEditorFlagDefault |
+                EAknEditorFlagEnablePictographInput;
+                // let Avkon decide which is maximum number of lines
+                // It's based on layout.
+                max_view_height_in_lines = 0;
+                };
+            }
+        };
+    }
+//----------------------------------------------------
 // RESOURCE ARRAY r_suplserver_editor_usageinhomenw_array
 // array for usage in homw nw pop-up dialog
 //----------------------------------------------------
@@ -271,33 +333,6 @@
         };
     }
 
-//----------------------------------------------------  
-// RESOURCE CBA r_suplserver_editor_options_define_back
-// CBA for SUPL Editor UI view.
-//----------------------------------------------------
-//   
-RESOURCE CBA r_suplserver_editor_options_define_done
-    {
-    flags 	= 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyDone; 
-            txt = text_softkey_done;
-            },
-        CBA_BUTTON
-            {
-            id 	= ELocServerEditorMSKDefine; 
-            txt = qtn_msk_define;
-            }
-        };
-    }
 
 //----------------------------------------------------  
 // RESOURCE CBA r_suplserver_editor_options_change_done