--- a/calendarui/controller/inc/calenviewmanager.h	Mon May 03 12:30:32 2010 +0300
+++ b/calendarui/controller/inc/calenviewmanager.h	Mon Jun 28 15:22:02 2010 +0530
@@ -28,10 +28,10 @@
 #include "hb_calencommands.hrh"
 #include "calencommandhandler.h"
 
-
+class CalenNativeView;
 class CCalenController;
 class CalenMonthView;
-class CalenDayView;
+class CalenAgendaView;
 class AgendaEventViewer;
 class CalenLandscapeDayView;
 class CalenSettingsView;
@@ -52,8 +52,12 @@
 		/**
 		 * Constructor
 		 */
-		CalenViewManager ( CCalenController& aController, 
-		                   bool isFromServiceFrmwrk);
+		CalenViewManager ( CCalenController& aController);
+		
+		/**
+		 * Second Phase Constructor
+		 */
+		void SecondPhaseConstruction();
 		
         /**
          * Destructor
@@ -93,7 +97,12 @@
 		
 		void showPrevDay();
 		
-		void removeDayViews();
+		void removePreviousView();
+		
+		void constructOtherViews();
+		
+		void launchSettingsView();
+		
 		
 	public: // from MCalenNotificationHandler
    
@@ -110,7 +119,7 @@
         /**
 		 * Loads day view frm the docml
 		 */
-        void loadDayView();
+        void loadAgendaView();
 	    /**
 	     * Activates the default view, as retrieved from settings.
 	     */
@@ -131,33 +140,35 @@
 		 * to provide illusion of swiping to next or prev
 		 * day
 		 */
-		void loadAlternateDayView();
-		
-	public slots:
-		void constructOtherViews();
+		void loadAlternateAgendaView();
         
     private slots:
+		void handleMainViewReady();
 		void handleViewingCompleted(const QDate date);
 		void handleEditingStarted();
 		void handleEditingCompleted();
 		void handleDeletingStarted();
 		void handleDeletingCompleted();
+		void handleInstanceViewCreation(int status);
+		void handleEntryViewCreation(int status);
+		void handleDayViewReady();
 		
     private:  // Data        
 
 		CCalenController		&mController;
 		CalenMonthView			*mCalenMonthView;
-		CalenDayView			*mCalenDayView;
+		CalenAgendaView			*mCalenAgendaView;
 		AgendaEventViewer		*mCalenEventViewer;
 		CalenLandscapeDayView	*mCalenLandscapeDayView;
 		CalenSettingsView		*mSettingsView;
-		CalenDocLoader			*mDayViewDocLoader;
+		CalenDocLoader			*mAgendaViewDocLoader;
 		CalenDocLoader			*mMonthViewDocLoader;
-		CalenDayView            *mCalenDayViewAlt;
-		CalenDocLoader          *mDayViewAltDocLoader;
+		CalenAgendaView         *mCalenAgendaViewAlt;
+		CalenDocLoader          *mAgendaViewAltDocLoader;
+		CalenNativeView			*mCalenDayView;
         
 		int  mCurrentViewId;
-		int  mPreviousViewId;
+		int  mPreviousViewsId;
 		int  mFirstView;
         };