--- a/radioapp/radiowidgets/src/radiowizardview.cpp	Fri Mar 19 09:29:04 2010 +0200
+++ b/radioapp/radiowidgets/src/radiowizardview.cpp	Fri Apr 16 14:58:55 2010 +0300
@@ -16,8 +16,8 @@
 */
 
 // System includes
-#include <hblistview.h>
-#include <hbaction.h>
+#include <HbListView>
+#include <HbAction>
 
 // User includes
 #include "radiowizardview.h"
@@ -79,18 +79,6 @@
 }
 
 /*!
- *
- */
-void RadioWizardView::startScanning()
-{
-    if ( !mStartScanningRequested ) {
-        mStartScanningRequested = true;
-        RadioFrequencyScanner* scanner = new RadioFrequencyScanner( mMainWindow->uiEngine(), this );
-        scanner->startScanning();
-    }
-}
-
-/*!
  * From RadioViewBase
  *
  */
@@ -110,18 +98,8 @@
 
     // "Go to stations view" menu item
     connectViewChangeMenuItem( DOCML_NAME_WV_STATIONSVIEWACTION, SLOT(activateStationsView()) );
-}
-
-/*!
- * From RadioViewBase
- *
- */
-void RadioWizardView::initSecondarySoftkey()
-{
-    // The default back button activates the tuning view
-    mSecondarySoftkeyction = new HbAction( Hb::DoneAction, this );
-    connectAndTest( mSecondarySoftkeyction, SIGNAL(triggered()),
-                    this,                   SLOT(saveSelectedAsFavorites()) );
+    
+    setDoneAction();
 }
 
 /*!
@@ -143,3 +121,27 @@
         connectAndTest( engine, SIGNAL(radioStatusChanged(bool)), this, SLOT(engineStatusChanged(bool)) );
     }
 }
+
+/*!
+ *
+ */
+void RadioWizardView::setDoneAction()
+{
+    // The default back button activates the tuning view
+    HbAction* doneAction = new HbAction( Hb::DoneNaviAction, this );
+    connectAndTest( doneAction, SIGNAL(triggered()),
+                    this,       SLOT(saveSelectedAsFavorites()) );
+    setNavigationAction( doneAction );
+}
+
+/*!
+ *
+ */
+void RadioWizardView::startScanning()
+{
+    if ( !mStartScanningRequested ) {
+        mStartScanningRequested = true;
+        RadioFrequencyScanner* scanner = new RadioFrequencyScanner( mMainWindow->uiEngine(), this );
+        scanner->startScanning();
+    }
+}