diff -r 8d8fb0db2489 -r d56c5d6796ca logsui/logsapp/resources/matchesView.docml
--- a/logsui/logsapp/resources/matchesView.docml	Fri Jun 11 16:24:14 2010 +0100
+++ b/logsui/logsapp/resources/matchesView.docml	Thu Jul 22 16:33:49 2010 +0100
@@ -1,19 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="0.7">
+<hbdocument version="1.0">
     <object name="logs_act_video_call" type="HbAction">
-        <string name="iconText" value="Video call"/>
-        <string name="text" value="Video call" locid="txt_common_opt_video_call"/>
-        <string name="toolTip" value="Video call"/>
+        <string locid="txt_common_opt_video_call" name="text" value="Video call"/>
     </object>
     <object name="logs_act_create_message" type="HbAction">
-        <string name="iconText" value="Send message"/>
-        <string name="text" value="Send message" locid="txt_common_opt_create_message"/>
-        <string name="toolTip" value="Send message"/>
+        <string locid="txt_common_opt_create_message" name="text" value="Send message"/>
     </object>
     <object name="logs_act_contact_search" type="HbAction">
-        <string name="iconText" value="Contact search"/>
-        <string name="text" value="Contact search" locid="txt_dialer_ui_opt_contact_search"/>
-        <string name="toolTip" value="Contact search"/>
+        <string locid="txt_dialer_ui_opt_contact_search" name="text" value="Contact search"/>
     </object>
     <object name="logs_act_dialer" type="HbAction">
         <icon iconName="qtg_mono_dialer" name="icon"/>
@@ -28,64 +22,50 @@
         <string name="toolTip" value="Show"/>
     </object>
     <object name="logs_act_recent" type="HbAction">
-        <string name="iconText" value="Recent calls"/>
-        <string name="text" value="Recent calls" locid="txt_dialer_subhead_recent_calls"/>
-        <string name="toolTip" value="Recent calls"/>
+        <string locid="txt_dialer_ui_list_recent" name="text" value="Recent calls"/>
     </object>
     <object name="logs_act_received" type="HbAction">
-        <string name="iconText" value="Received calls"/>
-        <string name="text" value="Received calls" locid="txt_dial_subhead_received_calls"/>
-        <string name="toolTip" value="Received calls"/>
+        <string locid="txt_dialer_ui_list_received" name="text" value="Received calls"/>
     </object>
     <object name="logs_act_dialled" type="HbAction">
-        <string name="iconText" value="Dialled calls"/>
-        <string name="text" value="Dialled calls" locid="txt_dialer_subhead_dialled_calls"/>
-        <string name="toolTip" value="Dialled calls"/>
+        <string locid="txt_dialer_ui_list_dialled" name="text" value="Dialled calls"/>
     </object>
     <object name="logs_act_missed" type="HbAction">
-        <string name="iconText" value="Missed calls"/>
-        <string name="text" value="Missed calls" locid="txt_dialer_subhead_missed_calls"/>
-        <string name="toolTip" value="Missed calls"/>
+        <string locid="txt_dialer_ui_list_missed" name="text" value="Missed calls"/>
     </object>
     <widget name="logs_matches_view" type="HbView">
         <widget name="logs_content" role="HbView:widget" type="HbWidget">
-            <widget name="logs_list_view" type="HbListView">
-                <real name="z" value="2.0001"/>
-                <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
-                <real name="spacing" value="0un"/>
-            </widget>
             <widget name="logs_label_empty_list" type="HbLabel">
                 <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
-                <real name="z" value="3"/>
-                <rect height="26.12959" name="geometry" width="349.95" x="0.75un" y="8.25un"/>
-                <sizehint height="3.9un" type="PREFERRED" width="18.91045un"/>
-                <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+                <real name="z" value="1"/>
                 <bool name="visible" value="FALSE"/>
-                <string name="plainText" value="No matches found" locid="txt_dialer_ui_list_no_matches_found"/>
-                <enums name="logicalFont" value="FontPrimary"/>
-            </widget>
-            <widget name="logs_groupbox_matched_calls" type="HbGroupBox">
-                <string name="heading" value="Matches" locid="txt_dialer_ui_subhead_matches"/>
-                <bool name="collapsable" value="FALSE"/>
-                <real name="spacing" value="0un"/>
+                <string locid="txt_dialer_ui_list_no_matches_found" name="plainText" value="No matches found"/>
+                <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
             </widget>
             <widget name="logs_button_addtocontacts" type="HbPushButton">
-                <icon iconName="qtg_mono_add_contact" name="icon"/>
-                <enums name="layoutDirection" value="RightToLeft"/>
-                <real name="z" value="4"/>
-                <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
-                <sizehint height="9.0un" type="PREFERRED" width="22.0un"/>
-                <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
-                <rect height="9.0un" name="geometry" width="22.0un" x="15.86un" y="16.71642un"/>
-            </widget>	    
-            <layout orientation="Vertical" type="linear">
-                <contentsmargins bottom="var(hb-param-margin-view-bottom)" left="var(hb-param-margin-view-left)" right="var(hb-param-margin-view-right)" top="var(hb-param-margin-view-top)"/>
-                <linearitem itemname="logs_groupbox_matched_calls"/>
-                <linearitem itemname="logs_list_view"/>
-            </layout>
+                <icon iconName="qtg_mono_add_to_contact" name="icon"/>
+                <real name="z" value="2"/>
+                <sizehint height="9un" type="PREFERRED" width="22un"/>
+                <bool name="visible" value="FALSE"/>
+            </widget>
+            <widget name="container" type="HbWidget">
+                <widget name="logs_groupbox_matched_calls" type="HbGroupBox">
+                    <bool name="collapsable" value="FALSE"/>
+                    <string locid="txt_dialer_ui_subhead_matches" name="heading" value="Matches"/>
+                </widget>
+                <widget name="logs_list_view" type="HbListView">
+                    <widget name="listItemPrototype" role="HbAbstractView:prototype" type="HbListViewItem"/>
+                </widget>
+                <real name="z" value="3"/>
+                <layout orientation="Vertical" type="linear">
+                    <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+                    <linearitem itemname="logs_groupbox_matched_calls"/>
+                    <linearitem itemname="logs_list_view"/>
+                </layout>
+            </widget>
+            <contentsmargins bottom="expr(var(hb-param-margin-view-bottom))" left="expr(var(hb-param-margin-view-left))" right="expr(var(hb-param-margin-view-right))" top="expr(var(hb-param-margin-view-top))"/>
         </widget>
         <widget name="logs_toolbar" role="HbView:toolBar" type="HbToolBar">
-            <real name="z" value="2"/>
             <enums name="orientation" value="Horizontal"/>
             <ref object="logs_act_contacts" role="HbToolBar:addAction"/>
             <ref object="logs_act_dialer" role="HbToolBar:addAction"/>
@@ -94,66 +74,12 @@
         <widget name="logs_view_menu2" role="HbView:menu" type="HbMenu">
             <ref object="logs_act_video_call" role="HbMenu:addAction"/>
             <ref object="logs_act_create_message" role="HbMenu:addAction"/>
-	    <ref object="logs_act_contact_search" role="HbMenu:addAction"/>
-        </widget>
-        <string name="title" value="Dialer"/>
-    </widget>
-    <section name="portrait_dialpad">
-        <widget name="logs_content" role="HbView:widget" type="HbWidget">
-            <layout orientation="Vertical" type="linear">
-                <contentsmargins bottom="expr(var(hb-param-margin-view-bottom)+54un)" left="var(hb-param-margin-view-left)" right="var(hb-param-margin-view-right)" top="var(hb-param-margin-view-top)"/>
-                <linearitem itemname="logs_groupbox_matched_calls"/>
-                <linearitem itemname="logs_list_view"/>
-            </layout>
-        </widget>
-        <widget name="logs_label_empty_list" type="HbLabel">
-            <rect height="26.12959" name="geometry" width="349.95" x="0.75un" y="8un"/>
-        </widget>
-        <widget name="logs_button_addtocontacts" type="HbPushButton">
-            <rect height="9.0un" name="geometry" width="22.0un" x="15.86un" y="16.71642un"/>
-        </widget>
-        <widget name="logs_toolbar" role="HbView:toolBar" type="HbToolBar">
-            <bool name="visible" value="FALSE"/>
+            <ref object="logs_act_contact_search" role="HbMenu:addAction"/>
         </widget>
-    </section>
-    <section name="landscape_dialpad">
-        <widget name="logs_content" role="HbView:widget" type="HbWidget">
-            <layout orientation="Vertical" type="linear">
-                <contentsmargins bottom="var(hb-param-margin-view-bottom)" left="var(hb-param-margin-view-left)" right="expr(var(hb-param-margin-view-right)+48un)" top="var(hb-param-margin-view-top)"/>
-                <linearitem itemname="logs_groupbox_matched_calls"/>
-                <linearitem itemname="logs_list_view"/>
-            </layout>
-        </widget>
-        <widget name="logs_label_empty_list" type="HbLabel">
-            <rect height="26" name="geometry" width="312.75" x="0.75un" y="8un"/>
-        </widget>
-        <widget name="logs_button_addtocontacts" type="HbPushButton">
-            <rect height="9.0un" name="geometry" width="22.0un" x="12.88un" y="16.71642un"/>
-        </widget>
-        <widget name="logs_toolbar" role="HbView:toolBar" type="HbToolBar">
-            <bool name="visible" value="FALSE"/>
-        </widget>
-    </section>
-    <section name="default">
-        <widget name="logs_content" role="HbView:widget" type="HbWidget">
-            <layout orientation="Vertical" type="linear">
-                <contentsmargins bottom="var(hb-param-margin-view-bottom)" left="var(hb-param-margin-view-left)" right="var(hb-param-margin-view-right)" top="var(hb-param-margin-view-top)"/>
-                <linearitem itemname="logs_groupbox_matched_calls"/>
-                <linearitem itemname="logs_list_view"/>
-            </layout>
-        </widget>
-        <widget name="logs_label_empty_list" type="HbLabel">
-            <rect height="26.12959" name="geometry" width="349.95" x="0.75un" y="8un"/>
-        </widget>
-        <widget name="logs_toolbar" role="HbView:toolBar" type="HbToolBar">
-            <bool name="visible" value="TRUE"/>
-        </widget>
-    </section>
-
+        <string locid="txt_dial_title_dialer" name="title" value="Dialer"/>
+    </widget>
     <!-- Context menu -->    
     <widget name="logs_show_filter_menu" type="HbMenu">
-        <integer name="timeout" value="5000000"/> <!-- 5 seconds timeout -->
-        <enums name="dismissPolicy" value="TapAnywhere"/>
         <ref object="logs_act_recent" role="HbMenu:addAction"/>
         <ref object="logs_act_dialled" role="HbMenu:addAction"/>
         <ref object="logs_act_received" role="HbMenu:addAction"/>
@@ -167,7 +93,64 @@
     <connect receiver="logs_matches_view" sender="logs_button_addtocontacts" signal="clicked()" slot="saveNumberInDialpadToContacts()"/>
     <connect receiver="logs_matches_view" sender="logs_act_show" signal="triggered(bool)" slot="showFilterMenu()"/>
     <connect receiver="logs_matches_view" sender="logs_show_filter_menu" signal="triggered(HbAction*)" slot="changeFilter(HbAction*)"/>
-    <metadata activeUIState="Common ui state" display="QHD portrait" unit="un">
+    <section name="portrait_dialpad">
+        <widget name="logs_toolbar" role="HbView:toolBar" type="HbToolBar">
+            <bool name="visible" value="FALSE"/>
+        </widget>
+        <widget name="logs_content" role="HbView:widget" type="HbWidget">
+            <contentsmargins bottom="expr(var(hb-param-screen-height)*0.55)" left="expr(var(hb-param-margin-view-left))" right="expr(var(hb-param-margin-view-right))" top="expr(var(hb-param-margin-view-top))"/>
+            <layout type="anchor">
+                <anchoritem dst="logs_button_addtocontacts" dstEdge="TOP" spacing="15un" src="" srcEdge="TOP"/>
+                <anchoritem dst="logs_button_addtocontacts" dstEdge="CENTERH" spacing="0un" src="" srcEdge="CENTERH"/>
+                <anchoritem dst="container" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+                <anchoritem dst="container" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
+                <anchoritem dst="container" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+                <anchoritem dst="container" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+                <anchoritem dst="logs_label_empty_list" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-screen) )" src="" srcEdge="LEFT"/>
+                <anchoritem dst="logs_label_empty_list" dstEdge="TOP" spacing="8.5un" src="" srcEdge="TOP"/>
+                <anchoritem dst="logs_label_empty_list" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-screen) )" src="" srcEdge="RIGHT"/>
+            </layout>
+        </widget>
+    </section>
+    <section name="landscape_dialpad">
+        <widget name="logs_toolbar" role="HbView:toolBar" type="HbToolBar">
+            <bool name="visible" value="FALSE"/>
+        </widget>
+        <widget name="logs_content" role="HbView:widget" type="HbWidget">
+            <contentsmargins bottom="expr(var(hb-param-margin-view-bottom))" left="expr(var(hb-param-margin-view-left))" right="expr(var(hb-param-screen-height)/2)" top="expr(var(hb-param-margin-view-top))"/>
+            <layout type="anchor">
+                <anchoritem dst="logs_button_addtocontacts" dstEdge="TOP" spacing="19un" src="" srcEdge="TOP"/>
+                <anchoritem dst="logs_button_addtocontacts" dstEdge="CENTERH" spacing="0un" src="" srcEdge="CENTERH"/>
+                <anchoritem dst="container" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+                <anchoritem dst="container" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
+                <anchoritem dst="container" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+                <anchoritem dst="container" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+                <anchoritem dst="logs_label_empty_list" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-screen) )" src="" srcEdge="LEFT"/>
+                <anchoritem dst="logs_label_empty_list" dstEdge="TOP" spacing="8.5un" src="" srcEdge="TOP"/>
+                <anchoritem dst="logs_label_empty_list" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-screen) )" src="" srcEdge="RIGHT"/>
+            </layout>
+        </widget>
+    </section>
+    <section name="default">
+        <widget name="logs_toolbar" role="HbView:toolBar" type="HbToolBar">
+            <bool name="visible" value="TRUE"/>
+        </widget>
+        <widget name="logs_content" role="HbView:widget" type="HbWidget">
+            <contentsmargins bottom="expr(var(hb-param-margin-view-bottom))" left="expr(var(hb-param-margin-view-left))" right="expr(var(hb-param-margin-view-right))" top="expr(var(hb-param-margin-view-top))"/>
+            <layout type="anchor">
+                <anchoritem dst="logs_button_addtocontacts" dstEdge="TOP" spacing="19un" src="" srcEdge="TOP"/>
+                <anchoritem dst="logs_button_addtocontacts" dstEdge="CENTERH" spacing="0un" src="" srcEdge="CENTERH"/>
+                <anchoritem dst="container" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+                <anchoritem dst="container" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
+                <anchoritem dst="container" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+                <anchoritem dst="container" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+                <anchoritem dst="logs_label_empty_list" dstEdge="LEFT" spacing="expr(var(hb-param-margin-gene-screen) )" src="" srcEdge="LEFT"/>
+                <anchoritem dst="logs_label_empty_list" dstEdge="TOP" spacing="8.5un" src="" srcEdge="TOP"/>
+                <anchoritem dst="logs_label_empty_list" dstEdge="RIGHT" spacing="expr(-var(hb-param-margin-gene-screen) )" src="" srcEdge="RIGHT"/>
+            </layout>
+        </widget>
+    </section>
+    <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
         <uistate name="Common ui state" sections="#common"/>
         <uistate name="portrait" sections="#common portrait_dialpad"/>
         <uistate name="landscape" sections="#common landscape_dialpad"/>