--- a/controlpanelui/src/cpapplication/src/main.cpp	Mon May 03 12:32:06 2010 +0300
+++ b/controlpanelui/src/cpapplication/src/main.cpp	Fri May 14 13:21:08 2010 +0800
@@ -16,14 +16,15 @@
 */
 
 #include <hbapplication.h>
-#include <hbmainwindow.h>
+#include <cpmainwindow.h>
+#include <cpmainview.h>
 #include <hbstyleloader.h>
 #include <QTranslator>
+#include <QLocale>
 #include <QLatin1String>
 #include <QDir>
 #include <cplogger.h>
 #include <cpbasepath.h>
-#include "cpmainview.h"
 
 int main(int argc, char **argv)
 {
@@ -50,11 +51,13 @@
     
     HbStyleLoader::registerFilePath(CP_RESOURCE_PATH + QDir::separator() + WIDGETML_SUB_PATH);
 
-    HbMainWindow mainWindow;
-    CpMainView *mainView = new CpMainView();
-  
-    QObject::connect(mainView,SIGNAL(aboutToClose()),&app, SLOT(quit()));  
+    CpMainWindow mainWindow;
+    
+    CpMainView *mainView = new CpMainView(&mainWindow);
+    QObject::connect(mainView,SIGNAL(aboutToClose()),qApp,SLOT(quit()));
     mainWindow.addView(mainView);
+    mainWindow.setCurrentView(mainView);
+    
     mainWindow.show();
     
     int ret = app.exec();