--- a/controlpanelui/src/cpserviceprovider/src/cpservicemainwindow.cpp	Mon May 03 12:32:06 2010 +0300
+++ b/controlpanelui/src/cpserviceprovider/src/cpservicemainwindow.cpp	Fri May 14 13:21:08 2010 +0800
@@ -17,7 +17,7 @@
 
 #include "cpservicemainwindow.h"
 #include <QCoreApplication>
-#include <hbview.h>
+#include <cpbasesettingview.h>
 #include "cplauncherservice.h"
 #include "cpsplogger.h"
 
@@ -33,22 +33,29 @@
     CPSP_LOG("CpServiceMainWindow Destructing...");
 }
 
+void CpServiceMainWindow::setSettingView(CpBaseSettingView *settingView)
+{
+    mSettingViewPointer = settingView;
+    
+    connect(settingView, SIGNAL(aboutToClose()), this, SLOT(quit()));    
+    addView(settingView);
+    setCurrentView(settingView);
+}
+
 void CpServiceMainWindow::quit()
 {
     CPSP_LOG("CpServiceMainWindow::quit()");
- 
+    
     connect(mLauncherService, SIGNAL(returnValueDelivered()), qApp, SLOT(quit()));
     mLauncherService->complete();
-    qApp->quit();
-    
+  
     /*
     hide();
     mLauncherService->complete();
-    HbView *currView = currentView();
-    if (currView) {
-        removeView(currView);
-        currView->deleteLater();
-    }
+    if (mSettingViewPointer) {
+        removeView(mSettingViewPointer);
+        mSettingViewPointer->deleteLater();
+    }  
     */
 }