--- a/filemanager/src/filemanager/src/fmmainwindow.cpp	Mon May 03 12:24:39 2010 +0300
+++ b/filemanager/src/filemanager/src/fmmainwindow.cpp	Tue Aug 24 10:24:14 2010 +0800
@@ -17,17 +17,20 @@
  */
 
 #include "fmmainwindow.h"
+#include "fmcommon.h"
 
 #include <hbaction.h>
 
-FmMainWindow::FmMainWindow()
+FmMainWindow::FmMainWindow() : mViewManager( 0 ), mFirstViewLoaded( false )
 {
+   // connect(this, SIGNAL(viewReady()), this, SLOT(delayedLoading()));
     init();
-	QMetaObject::connectSlotsByName( this );
 }
 
 FmMainWindow::~FmMainWindow()
 {
+   //save file manager activity to activity manager.
+    mViewManager->saveActivity();   
     FmViewManager::RemoveViewManager();
 }
 
@@ -45,13 +48,15 @@
 
 void FmMainWindow::init()
 {
+    FM_LOG("FmMainWindow::init start");
     mViewManager = FmViewManager::CreateViewManager( this );
-    
     mViewManager->createDriverView();
-    
+    connect(this, SIGNAL(aboutToChangeView(HbView *, HbView *)), 
+            mViewManager, SLOT(onAboutToChangeView(HbView *, HbView *)));
     connect( this, SIGNAL( orientationChanged( Qt::Orientation ) ),
              this, SLOT( onOrientationChanged( Qt::Orientation ) ) );
     
+    FM_LOG("FmMainWindow::init end");
 //    if ( orientation() == Qt::Vertical ) {
 //        createDriverView();
 //    } else {
@@ -59,3 +64,14 @@
 //    }
 }
 
+void FmMainWindow::delayedLoading()
+{
+    FM_LOG("FmMainWindow::delayedLoading start");
+    if( mFirstViewLoaded ) {
+        return;
+    }
+    init();
+    mFirstViewLoaded = true;
+    FM_LOG("FmMainWindow::delayedLoading end");
+}
+