Changeset 97 for Mulberry/branches/v4.1d1/MacOS/Sources/Application/Calendar/Calendar_View/Calendar_Window/CCalendarView.cp

Timestamp:

07/09/07 22:13:35 (2 years ago)

Author:

daboo

Message:

More v4.1 code. Includes experiment, though non-functioning WebKit? message
display option.

Files:

• Mulberry/branches/v4.1d1/MacOS/Sources/Application/Calendar/Calendar_View/Calendar_Window/CCalendarView.cp (modified) (5 diffs)

Mulberry/branches/v4.1d1/MacOS/Sources/Application/Calendar/Calendar_View/Calendar_Window/CCalendarView.cp

@@ -23 +23 @@
 #include "CDayWeekView.h"
 #include "CEventPreview.h"
+#include "CFreeBusyView.h"
 #include "CMonthView.h"
 #include "CMulberryCommon.h"
@@ -56 +57 @@
         mSummaryType = NCalendarView::eList;
         mSummaryRange = NCalendarView::eThisWeek;
+        mFreeBusyRange = CDayWeekViewTimeRange::e24Hrs;
+        mFreeBusyScale = 0;
         mSingleCalendar = false;
         mCalendar = NULL;
@@ -339 +342 @@
                         mSummaryRange = static_cast<CSummaryView*>(mCurrentView)->GetRange();
                         break;
+                case NCalendarView::eViewFreeBusy:
+                        mFreeBusyRange = static_cast<CFreeBusyView*>(mCurrentView)->GetRange();
+                        mFreeBusyScale = static_cast<CFreeBusyView*>(mCurrentView)->GetScale();
+                        break;
                 default:;
                 }
@@ -401 +408 @@
                 static_cast<CSummaryView*>(mCurrentView)->SetRange(mSummaryRange);
                 break;
+        case NCalendarView::eViewFreeBusy:
+                mCurrentView = static_cast<CFreeBusyView*>(UReanimator::CreateView(CFreeBusyView::pane_ID, mViewContainer, this));
+                mViewContainer->ExpandSubPane(mCurrentView, true, true);
+                static_cast<CFreeBusyView*>(mCurrentView)->SetRange(mFreeBusyRange);
+                static_cast<CFreeBusyView*>(mCurrentView)->SetScale(mFreeBusyScale);
+                break;
         }
         
@@ -524 +537 @@
                 break;
         case NCalendarView::eViewMonth:
+        default:
                 OnMonthBtn();
                 break;