diff -r 7ac58b2aae6f -r ce92091cbd61 calendarui/views/src/calenmonthview.cpp --- a/calendarui/views/src/calenmonthview.cpp Mon Sep 20 12:44:39 2010 +0530 +++ b/calendarui/views/src/calenmonthview.cpp Tue Oct 05 13:57:00 2010 +0530 @@ -31,7 +31,7 @@ #include #include #include // hbapplication -#include //Activity Manager + //user includes #include "calenmonthview.h" @@ -83,7 +83,6 @@ mOrientation = mServices.MainWindow().orientation(); // Read the date from the context mDate = mServices.Context().focusDateAndTime(); - mCurrentDay = mDate; // Create the settings manager instance and settings key for week number mSettingsManager = new XQSettingsManager(this); @@ -240,13 +239,11 @@ mIsFirstTimeLoad = true; - // get a pointner to activity manager - HbActivityManager* activityManager = qobject_cast(qApp)->activityManager(); - // clean up any previous versions of this activity, if any, i.e. activityName, from the activity manager. + // clean up any previous versions of this activity, if any, i.e. activityName // Ignore return value, first boot would always return False. bool declared // only for debugging purpose. - bool ok = activityManager->removeActivity(activityName); + bool ok = removeActivity(); OstTraceFunctionExit0( CALENMONTHVIEW_SETUPVIEW_EXIT ); } @@ -940,17 +937,6 @@ } /*! - Returns the currDay(Today) - */ -QDateTime CalenMonthView::getCurrentDay() -{ - OstTraceFunctionEntry0( CALENMONTHVIEW_GETCURRENTDAY_ENTRY ); - - OstTraceFunctionExit0( CALENMONTHVIEW_GETCURRENTDAY_EXIT ); - return mCurrentDay; -} - -/*! Returns the active day(currently focussed day) */ QDateTime CalenMonthView::getActiveDay() @@ -1448,11 +1434,10 @@ OstTraceFunctionEntry0( CALENMONTHVIEW_LAUNCHDAYVIEW_ENTRY ); mServices.IssueCommandL(ECalenDayView); - // day view launched now, disconnect to get the call backs for saveActivity - // on aboutToQuit signal - disconnectAboutToQuitEvent(); - - OstTraceFunctionExit0( CALENMONTHVIEW_LAUNCHDAYVIEW_EXIT ); + // day view launched now, captre the screen shot of month view + captureScreenshot(true); + + OstTraceFunctionExit0( CALENMONTHVIEW_LAUNCHDAYVIEW_EXIT ); } /*! @@ -1660,12 +1645,9 @@ void CalenMonthView::onLocaleChanged(int reason) { OstTraceFunctionEntry0( CALENMONTHVIEW_ONLOCALECHANGED_ENTRY ); - - if ((reason & EChangesSystemTime) - || (reason & EChangesMidnightCrossover)) { - mCurrentDay = CalenDateUtils::today(); - } - OstTraceFunctionExit0( CALENMONTHVIEW_ONLOCALECHANGED_EXIT ); + Q_UNUSED(reason); + return; + OstTraceFunctionExit0( CALENMONTHVIEW_ONLOCALECHANGED_EXIT ); } /*!