--- a/clock/clockui/clockviewmanager/src/clockviewmanager.cpp	Tue Jul 06 14:14:56 2010 +0300
+++ b/clock/clockui/clockviewmanager/src/clockviewmanager.cpp	Wed Aug 18 09:47:38 2010 +0300
@@ -19,8 +19,9 @@
 // System includes
 #include <HbMainWindow>
 #include <HbInstance>
-#include <hbapplication> // hbapplication
-#include <hbactivitymanager> // hbactivitymanager
+#include <HbApplication>
+#include <HbActivityManager>
+#include <HbToolBar>
 
 // User includes
 #include "clockviewmanager.h"
@@ -29,6 +30,11 @@
 #include "clockcommon.h"
 #include "clockdatatypes.h"
 #include "clockworldview.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "clockviewmanagerTraces.h"
+#endif
+
 
 /*!
 	\class ClockViewManager
@@ -48,6 +54,7 @@
  mAppControllerIf(controllerIf),
  mWorldClockView(0)
 {
+    OstTraceFunctionEntry0( CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_ENTRY );
     // Activity Reason from Activity Manager
     int activityReason = qobject_cast<HbApplication*>(qApp)->activateReason();
     
@@ -86,6 +93,7 @@
                 this, SLOT(loadOtherViews()));
     }
 
+OstTraceFunctionExit0( CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_EXIT );
 }
 
 /*!
@@ -93,7 +101,9 @@
  */
 ClockViewManager::~ClockViewManager()
 {
+	OstTraceFunctionEntry0( DUP1_CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_ENTRY );
 	// No implementation yet.
+OstTraceFunctionExit0( DUP1_CLOCKVIEWMANAGER_CLOCKVIEWMANAGER_EXIT );
 }
 
 /*!
@@ -103,6 +113,7 @@
  */
 void ClockViewManager::showView(ClockViews view)
 {
+	OstTraceFunctionEntry0( CLOCKVIEWMANAGER_SHOWVIEW_ENTRY );
 	HbMainWindow *window = hbInstance->allMainWindows().first();
 
 	switch (view) {
@@ -130,6 +141,7 @@
 		default:
 			break;
 	}
+OstTraceFunctionExit0( CLOCKVIEWMANAGER_SHOWVIEW_EXIT );
 }
 
 /*!
@@ -137,6 +149,7 @@
  */
 void ClockViewManager::loadMainView()
 {
+	OstTraceFunctionEntry0( CLOCKVIEWMANAGER_LOADMAINVIEW_ENTRY );
 	bool loadSuccess;
 
 	// Construct the document loader instance
@@ -148,12 +161,16 @@
 	// Find the main view.
 	mMainView = static_cast<ClockMainView *> (
 			docLoader->findWidget(CLOCK_MAIN_VIEW));
+	
+	// Disable animation effect on toolbar.
+	HbEffect::disable(mMainView->toolBar()->graphicsItem());
 
 	// Setup the view.
 	mMainView->setupView(mAppControllerIf, docLoader);
 
 	// Set the main view to the window
 	hbInstance->allMainWindows().first()->addView(mMainView);
+OstTraceFunctionExit0( CLOCKVIEWMANAGER_LOADMAINVIEW_EXIT );
 }
 
 /*!
@@ -161,6 +178,7 @@
  */
 void ClockViewManager::loadWorldClockView()
 {
+	OstTraceFunctionEntry0( CLOCKVIEWMANAGER_LOADWORLDCLOCKVIEW_ENTRY );
 	// Construct the document loader instance
 	ClockDocLoader *docLoader = new ClockDocLoader();
 
@@ -172,8 +190,12 @@
 	// Get the world list view.
 	mWorldClockView = static_cast<ClockWorldView *> (
 			docLoader->findWidget(CLOCK_WORLD_VIEW));
+	
+	// Disable animation effect on toolbar.
+	HbEffect::disable(mWorldClockView->toolBar()->graphicsItem());
 
 	mWorldClockView->setupView(mAppControllerIf, docLoader);
+OstTraceFunctionExit0( CLOCKVIEWMANAGER_LOADWORLDCLOCKVIEW_EXIT );
 }
 
 /*!
@@ -181,6 +203,7 @@
  */
 void ClockViewManager::loadOtherViews()
 {
+	OstTraceFunctionEntry0( CLOCKVIEWMANAGER_LOADOTHERVIEWS_ENTRY );
 	mMainView->setupAfterViewReady();
 	
 	// Load world clock view
@@ -191,6 +214,13 @@
 	disconnect(
 			window, SIGNAL(viewReady()),
 			this, SLOT(loadOtherViews()));
+	
+	// Need to emit this signal after the view is fully constructed & populated
+	// with actual data and ready to be used. So entry view & instance view
+	// needs to be created so that a new entry can also be created. Finally
+	// NotesApplication object needs to emit applicationReady Signal.
+	emit appReady();
+OstTraceFunctionExit0( CLOCKVIEWMANAGER_LOADOTHERVIEWS_EXIT );
 }
 
 // End of file	--Don't remove this.