diff -r de27cc8389dd -r 301aeb18ae47 wlanutilities/wpswizard/resources/occ_wps_01_05.docml
--- a/wlanutilities/wpswizard/resources/occ_wps_01_05.docml	Thu Sep 02 21:36:44 2010 +0300
+++ b/wlanutilities/wpswizard/resources/occ_wps_01_05.docml	Fri Sep 17 08:35:49 2010 +0300
@@ -1,51 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.1">
-	<widget name="occ_wps_P1" type="HbWidget">
-		<widget name="radioButtonList" type="HbRadioButtonList"/>
+<hbdocument version="1.2">
+    <widget name="occ_wps_P1" type="HbWidget">
+        <!-- layout id: txt_occ_dblist_val_infrastructure_public -->
+        <widget name="radioButtonList" type="HbRadioButtonList"/>
+        <!-- layout id: txt_occ_dialog_insert_the_name_of_the_new_wlan_net -->
         <widget name="label" type="HbLabel">
-			<enums name="textWrapping" value="TextWordWrap"/>
-			<enums name="alignment" value="AlignTop"/>
-            <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>			
-		</widget>
-		<sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
-		<layout type="anchor"/>
-	</widget>
-	<section name="portrait">
-		<widget name="occ_wps_P1" type="HbWidget">
-			<widget name="label" type="HbLabel">
-				<sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
-            </widget>
-			<layout type="anchor">
-                <anchoritem dst="radioButtonList" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
-                <anchoritem dst="radioButtonList" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)" src="label" srcEdge="BOTTOM"/>
-                <anchoritem dst="radioButtonList" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
-                <anchoritem dst="radioButtonList" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
-                <anchoritem dst="label" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
-                <anchoritem dst="label" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
-                <anchoritem dst="label" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
+            <enums name="textWrapping" value="TextWordWrap"/>
+            <enums name="alignment" value="AlignTop"/>
+            <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+            <integer name="maximumLines" value="4"/>
+        </widget>
+        <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
+        <layout type="anchor"/>
+    </widget>
+    <section name="portrait">
+        <widget name="occ_wps_P1" type="HbWidget">
+            <layout type="anchor">
+                <anchoritem dst="radioButtonList" dstEdge="LEFT" src="" srcEdge="LEFT"/>
+                <anchoritem dst="radioButtonList" dstEdge="TOP" prefLength="var(hb-param-margin-gene-middle-vertical)" src="label" srcEdge="BOTTOM"/>
+                <anchoritem dst="radioButtonList" dstEdge="RIGHT" src="" srcEdge="RIGHT"/>
+                <anchoritem dst="radioButtonList" dstEdge="BOTTOM" src="" srcEdge="BOTTOM"/>
+                <anchoritem dst="label" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+                <anchoritem dst="label" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+                <anchoritem direction="NEGATIVE" dst="label" dstEdge="RIGHT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="RIGHT"/>
             </layout>
-		</widget>
-	</section>
-	<section name="landscape">
-		<widget name="occ_wps_P1" type="HbWidget">
-			 <widget name="label" type="HbLabel">
-                <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>                
-                <sizehint type="FIXED" width="expr((var(hb-param-screen-width) - var(hb-param-margin-gene-middle-horizontal))  / 2  - var(hb-param-margin-gene-screen) - var(hb-param-margin-gene-popup))"/>
-            </widget>
-			<layout type="anchor">
-                <anchoritem dst="label" dstEdge="TOP" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
-                <anchoritem dst="label" dstEdge="LEFT" spacing="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
-                <anchoritem dst="radioButtonList" dstEdge="LEFT" spacing="var(hb-param-margin-gene-middle-horizontal)" src="label" srcEdge="RIGHT"/>
-                <anchoritem dst="radioButtonList" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
-                <anchoritem dst="radioButtonList" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
-                <anchoritem dst="radioButtonList" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+        </widget>
+    </section>
+    <section name="landscape">
+        <widget name="occ_wps_P1" type="HbWidget">
+            <layout type="anchor">
+                <anchoritem dst="label" dstEdge="TOP" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="TOP"/>
+                <anchoritem dst="label" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-popup)" src="" srcEdge="LEFT"/>
+                <anchoritem direction="NEGATIVE" dst="label" dstEdge="RIGHT" prefLength="expr(var(hb-param-margin-gene-middle-horizontal) / 2)" src="" srcEdge="CENTERH"/>
+                <anchoritem dst="radioButtonList" dstEdge="LEFT" prefLength="var(hb-param-margin-gene-middle-horizontal)" src="label" srcEdge="RIGHT"/>
+                <anchoritem dst="radioButtonList" dstEdge="TOP" src="" srcEdge="TOP"/>
+                <anchoritem dst="radioButtonList" dstEdge="RIGHT" src="" srcEdge="RIGHT"/>
+                <anchoritem dst="radioButtonList" dstEdge="BOTTOM" src="" srcEdge="BOTTOM"/>
             </layout>
-		</widget>
-	</section>	
-	<metadata activeUIState="portrait" display="NHD portrait" unit="un">
+        </widget>
+    </section>
+    <metadata activeUIState="portrait" display="NHD-3.2-inch_portrait" unit="un">
         <uistate name="Common ui state" sections="#common"/>
         <uistate name="landscape" sections="#common landscape"/>
         <uistate name="portrait" sections="#common portrait"/>
     </metadata>
 </hbdocument>
-				
\ No newline at end of file