--- a/camerauis/cameraxui/cxui/layouts/setting.docml	Fri Sep 24 11:12:50 2010 +0300
+++ b/camerauis/cameraxui/cxui/layouts/setting.docml	Wed Oct 06 15:52:13 2010 +0300
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.0">
+<hbdocument version="1.2">
     <object name="action_ok" type="HbAction">
-        <string name="role" value="HbDialog:primaryAction"/>
         <string locid="txt_common_button_ok" name="text" value="Ok"/>
     </object>
     <object name="action_cancel" type="HbAction">
-        <string name="role" value="HbDialog:secondaryAction"/>
         <string locid="txt_common_button_cancel" name="text" value="Cancel"/>
     </object>
     <widget name="settings_dialog" type="HbDialog">
+        <sizehint type="MINIMUM" width="var(hb-param-widget-dialog-width)"/>
+        <ref object="action_ok" role="HbWidget:addAction"/>
+        <ref object="action_cancel" role="HbWidget:addAction"/>
         <widget name="settings_dialog_heading" role="HbDialog:headingWidget" type="HbLabel">
-            <enums name="alignment" value="AlignVCenter|AlignLeft"/>
+            <enums name="alignment" value="AlignLeft|AlignVCenter|AlignLeading"/>
             <string name="plainText" value="Dummy settings dialog"/>
             <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
         </widget>
@@ -19,18 +20,17 @@
                 <container name="items" type="stringlist">
                     <string value="Dummy item 1"/>
                     <string value="Dummy item 2"/>
+                    <string value="Dummy item 3"/>
+                    <string value="Dummy item 4"/>
                 </container>
-                <sizehint type="MINIMUM" height="30un"/>
             </widget>
-            <layout orientation="Vertical" type="linear">
+            <layout orientation="Vertical" spacing="0un" type="linear">
+                <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
                 <linearitem itemname="settings_dialog_list"/>
             </layout>
         </widget>
-        <sizehint type="MINIMUM" width="var(hb-param-widget-dialog-width)"/>
-        <ref object="action_ok" role="HbDialog:primaryAction"/>
-        <ref object="action_cancel" role="HbDialog:secondaryAction"/>
     </widget>
-    <metadata activeUIState="Common ui state" display="NHD landscape" unit="un">
+    <metadata activeUIState="Common ui state" display="NHD-3.2-inch_landscape" unit="un">
         <uistate name="Common ui state" sections="#common"/>
     </metadata>
 </hbdocument>