--- a/iaupdate/IAD/ui/src/iaupdatemainwindow.cpp	Tue Jun 15 13:36:10 2010 +0100
+++ b/iaupdate/IAD/ui/src/iaupdatemainwindow.cpp	Thu Jul 22 16:35:01 2010 +0100
@@ -21,15 +21,16 @@
 #include "iaupdatemainwindow.h"
 #include "iaupdateengine.h"
 #include "iaupdatemainview.h"
-#include "iaupdatehistoryview.h"
+#include "iaupdatesettingdialog.h"
 
 
 // ViewManager Constructor
 IAUpdateMainWindow::IAUpdateMainWindow(IAUpdateEngine *engine)
 {
     // Add the views to the main window
-    //addHistoryView();
     addMainView(engine);
+    addSettingView();
+    
     // show the main window (which will display the last view that was added)
     show();   //temp
 }
@@ -46,19 +47,24 @@
     addView(mMainView);
 }
 
-void IAUpdateMainWindow::addHistoryView()
+
+void IAUpdateMainWindow::addSettingView()
 {
-    mHistoryView = new IAUpdateHistoryView();
-    addView(mHistoryView);
+    
+    mSettingView = new CIAUpdateSettingDialog(mMainView);
+    addView(mSettingView);
 }
 
-
 // Slots to handle view change
 void IAUpdateMainWindow::toMainView()
 {
     setCurrentView(mMainView);
 }
 
+void IAUpdateMainWindow::toSettingView()
+{
+    setCurrentView(mSettingView);
+}
 void IAUpdateMainWindow::refreshMainView(const RPointerArray<MIAUpdateNode>& nodes,
                                          const RPointerArray<MIAUpdateFwNode>& fwNodes,
                                          int error)
@@ -68,10 +74,15 @@
 } 
 
 
-void IAUpdateMainWindow::toHistoryView()
-{
-    setCurrentView(mHistoryView);
-}
 
 
+IAUpdateMainView* IAUpdateMainWindow::GetMainView()
+{
+    return mMainView;    
+}
+   
+CIAUpdateSettingDialog* IAUpdateMainWindow::GetSettingView()
+{
+    return mSettingView;}
 
+