--- a/bluetoothengine/btnotif/btdevicedialogplugin/docml/bt-device-search-dialog.docml	Fri Jun 11 13:48:51 2010 +0300
+++ b/bluetoothengine/btnotif/btdevicedialogplugin/docml/bt-device-search-dialog.docml	Wed Jun 23 18:23:52 2010 +0300
@@ -1,19 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.0">
-    <widget name="dialog" type="HbDialog">
+<hbdocument version="1.1">
+    <object name="viewaction" type="HbAction">
+        <string locid="txt_common_button_show" name="text"/>
+    </object>
+    <object name="stopretryaction" type="HbAction">
+        <string locid="txt_common_button_stop" name="text"/>
+    </object>
+    <widget name="searchdialog" type="HbDialog">
+        <rect height="72.07463un" name="geometry" width="49.73134un" x="1.73134un" y="11.64179un"/>
         <widget name="heading" role="HbDialog:headingWidget" type="HbLabel">
             <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+            <string locid="txt_bt_subhead_bluetooth_found_devices" name="plainText"/>
         </widget>
         <widget name="container" role="HbDialog:contentWidget" type="HbWidget">
             <widget name="container_1" type="HbWidget">
                 <widget name="searchDoneLabel" type="HbLabel">
                     <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
                     <sizehint height="3.8806un" type="PREFERRED" width="26.86567un"/>
-                    <string name="plainText" value="Search Done"/>
+                    <string locid="txt_bt_subhead_search_done" name="plainText"/>
                 </widget>
                 <widget name="searchLabel" type="HbLabel">
                     <sizehint height="3.8806un" type="PREFERRED" width="18.95522un"/>
-                    <string name="plainText" value="Searching..."/>
+                    <string locid="txt_bt_subhead_searching" name="plainText"/>
                 </widget>
                 <widget name="iconLabel" type="HbLabel">
                     <sizehint height="3.8806un" type="PREFERRED" width="3.43284un"/>
@@ -31,32 +39,18 @@
             </widget>
             <widget name="listView" type="HbListView">
                 <widget name="listItemPrototype" role="HbAbstractView:prototype" type="HbListViewItem"/>
+                <enums name="verticalScrollBarPolicy" value="ScrollBarAsNeeded"/>
                 <sizehint height="47.7612un" type="PREFERRED" width="35.8209un"/>
-                <enums name="verticalScrollBarPolicy" value="ScrollBarAsNeeded"/>
-            </widget>
-            <widget name="container_3" type="HbWidget">
-                <widget name="viewby" type="HbPushButton">
-                    <string name="text" value="View"/>
-                </widget>
-                <widget name="stop" type="HbPushButton">
-                    <string name="text" value="Stop"/>
-                </widget>
-                <real name="z" value="0"/>
-                <sizehint height="9.85821un" type="PREFERRED" width="23.8806un"/>
-                <sizehint height="8.85821un" type="MINIMUM"/>
-                <layout orientation="Horizontal" type="linear">
-                    <linearitem itemname="viewby"/>
-                    <linearitem itemname="stop"/>
-                </layout>
             </widget>
             <layout type="grid">
+                <griditem column="0" itemname="container_1" row="0"/>
                 <griditem column="0" itemname="listView" row="1"/>
-                <griditem column="0" itemname="container_1" row="0"/>
-                <griditem column="0" itemname="container_3" row="2"/>
             </layout>
         </widget>
+        <ref object="stopretryaction" role="HbWidget:addAction"/>
+        <ref object="viewaction" role="HbWidget:addAction"/>
     </widget>
-    <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
+    <metadata activeUIState="Common ui state" display="NHD-3.2-inch_portrait" unit="un">
         <uistate name="Common ui state" sections="#common"/>
         <dummydata objectName="listView" section="#common" value="empty_dummydata_template"/>
     </metadata>