--- a/radioapp/radiowidgets/res/layout/stationsview.docml	Fri Jun 11 16:24:13 2010 +0100
+++ b/radioapp/radiowidgets/res/layout/stationsview.docml	Thu Jul 22 16:33:45 2010 +0100
@@ -26,17 +26,17 @@
     </object>
     <object name="sv:local_stations_button" type="HbAction">
         <bool name="checkable" value="TRUE"/>
-        <icon iconName=":/images/removefavoriteicon.png" name="icon"/>
+        <icon iconName="qtg_mono_radio_stations" name="icon"/>
         <string name="text" locid="txt_rad_button_local_stations" />
     </object>
     <object name="sv:favorite_stations_button" type="HbAction">
         <bool name="checkable" value="TRUE"/>
-        <icon iconName=":/images/setfavoriteicon.png" name="icon"/>
+        <icon iconName="qtg_mono_favourites" name="icon"/>
         <string name="text" locid="txt_rad_button_favourites" />
     </object>
-    <widget name="view" plugin="radiowidgetsplugin" type="RadioStationsView">
-        <icon name="nowPlayingIcon" iconName=":/images/nowplayingicon.png" />
-        <icon name="favoriteIcon" iconName=":/images/setfavoriteicon.png" />
+    <widget name="view" type="HbView">
+        <icon name="nowPlayingIcon" iconName="qtg_mono_play" />
+        <icon name="favoriteIcon" iconName="qtg_small_favorite" />
         <widget name="mMenu" role="HbView:menu" type="HbMenu">
             <ref object="sv:scan_action" role="HbMenu:addAction"/>
             <ref object="sv:clear_list_action" role="HbMenu:addAction"/>
@@ -49,13 +49,15 @@
             <ref object="sv:favorite_stations_button" role="HbToolBar:addAction"/>
         </widget>
         <widget name="content" role="HbView:widget" type="HbWidget">
-            <widget name="sv:heading_banner" plugin="radiowidgetsplugin" type="RadioBannerLabel">
-                <sizehint height="30" type="MAXIMUM"/>
-                <string name="plainText" locid="txt_rad_subhead_all_stations" />
+            <widget name="sv:heading_banner" type="HbGroupBox">
+                <sizepolicy horizontalPolicy="Expanding" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+                <sizehint height="expr(var(hb-param-text-height-secondary)+2*var(hb-param-margin-gene-middle-vertical))" type="PREFERRED"/>
+                <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
+                <string name="heading" locid="txt_rad_subhead_all_stations" />
             </widget>
             <widget name="sv:stacked_widget" type="HbWidget">
                 <widget name="sv:scan_button" type="HbPushButton">
-                    <bool name="visible" value="TRUE"/>
+                    <bool name="visible" value="FALSE"/>
                 </widget>
                 <widget name="sv:empty_container" type="HbWidget">
                     <bool name="visible" value="FALSE"/>
@@ -102,13 +104,6 @@
         </widget>
         <string name="title" locid="txt_rad_title_fm_radio"/>
     </widget>
-    <connect receiver="view" sender="sv:scan_action" signal="triggered()" slot="startScanning()"/>
-    <connect receiver="view" sender="sv:scan_button" signal="clicked()" slot="startScanning()"/>
-    <connect receiver="view" sender="exit_action" signal="triggered()" slot="quit()"/>
-    <connect receiver="view" sender="sv:stations_list" signal="pressed(QModelIndex)" slot="listItemClicked(QModelIndex)"/>
-    <connect receiver="view" sender="sv:stations_list" signal="longPressed(HbAbstractViewItem*,const QPointF)" slot="listItemLongPressed(HbAbstractViewItem*,const QPointF)"/>
-    <connect receiver="sv:favorite_stations_button" sender="sv:local_stations_button" signal="triggered()" slot="toggle()"/>
-    <connect receiver="sv:local_stations_button" sender="sv:favorite_stations_button" signal="triggered()" slot="toggle()"/>
 
     <widget name="sv:context_menu" type="HbMenu">
         <ref object="sv:play_action" role="HbMenu:addAction" />
@@ -116,9 +111,6 @@
         <ref object="sv:toggle_favorite_action" role="HbMenu:addAction" />
         <ref object="sv:delete_action" role="HbMenu:addAction" />
     </widget>
-    <connect receiver="view" sender="sv:rename_action" signal="triggered()" slot="rename()"/>
-    <connect receiver="view" sender="sv:toggle_favorite_action" signal="triggered()" slot="toggleFavorite()"/>
-    <connect receiver="view" sender="sv:delete_action" signal="triggered()" slot="deleteStation()"/>
 
     <section name="show_scan_text">
         <widget name="sv:stations_list">
@@ -127,6 +119,9 @@
         <widget name="sv:empty_container">
             <bool name="visible" value="TRUE"/>
         </widget>
+        <widget name="sv:scan_button">
+            <bool name="visible" value="TRUE"/>
+        </widget>
     </section>
     <section name="hide_scan_text">
         <widget name="sv:stations_list">
@@ -135,6 +130,9 @@
         <widget name="sv:empty_container">
             <bool name="visible" value="FALSE"/>
         </widget>
+        <widget name="sv:scan_button">
+            <bool name="visible" value="FALSE"/>
+        </widget>
     </section>
     <section name="show_all_stations">
         <object name="sv:local_stations_button">
@@ -144,7 +142,7 @@
             <bool name="checked" value="FALSE"/>
         </object>
         <widget name="sv:heading_banner">
-            <string name="plainText" locid="txt_rad_subhead_all_stations" />
+            <string name="heading" locid="txt_rad_subhead_all_stations" />
         </widget>
         <widget name="sv:scan_button">
             <bool name="visible" value="TRUE"/>
@@ -164,7 +162,7 @@
             <bool name="checked" value="TRUE"/>
         </object>
         <widget name="sv:heading_banner">
-            <string name="plainText" locid="txt_rad_subhead_favorite_stations" />
+            <string name="heading" locid="txt_rad_subhead_favorite_stations" />
         </widget>
         <widget name="sv:scan_button">
             <bool name="visible" value="FALSE"/>