Changeset 97 for Mulberry/branches/v4.1d1/MacOS/Sources/Application/Calendar/Calendar_View/Calendar_Store_View/CCalendarStoreTable.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_Store_View/CCalendarStoreTable.cp (modified) (13 diffs)

Mulberry/branches/v4.1d1/MacOS/Sources/Application/Calendar/Calendar_View/Calendar_Store_View/CCalendarStoreTable.cp

@@ -156 +156 @@
                 if (TestSelectionAnd((TestSelectionPP) &CCalendarStoreTable::TestSelectionServer))
                         OnServerProperties();
-                else if (TestSelectionAnd((TestSelectionPP) &CCalendarStoreTable::TestSelectionCalendar))
+                else if (TestSelectionAnd((TestSelectionPP) &CCalendarStoreTable::TestSelectionCalendarStoreNode))
                         OnCalendarProperties();
                 break;
@@ -230 +230 @@
         case cmd_FileExport:
         {
-                outEnabled = TestSelectionAnd((TestSelectionPP) &CCalendarStoreTable::TestSelectionCalendar);
+                outEnabled = TestSelectionAnd((TestSelectionPP) &CCalendarStoreTable::TestSelectionCanChangeCalendar);
                 LStr255 txt(STRx_Standards, str_ExportCalendar);
                 ::PLstrcpy(outName, txt);
@@ -276 +276 @@
                                         outEnabled = true;
                                         outUsesMark = true;
-                                        outMark = node->GetProtocol()->IsLoggedOn() ? (UInt16)checkMark : (UInt16)noMark;
+                                        outMark = node->GetProtocol()->IsLoggedOn() ? checkMark : noMark;
                                         ::GetIndString(outName, STRx_Standards, !outMark ? str_Logon : str_Logoff);
                                 }
@@ -296 +296 @@
                                         outEnabled = true;
                                         outUsesMark = true;
-                                        outMark = !node->GetProtocol()->IsDisconnected() ? (UInt16)checkMark : (UInt16)noMark;
+                                        outMark = !node->GetProtocol()->IsDisconnected() ? checkMark : noMark;
                                         ::GetIndString(outName, STRx_Standards, !outMark ? str_Logon : str_Logoff);
                                 }
@@ -327 +327 @@
         case cmd_SendCalendar:
                 // Only if calendar selection;
-                outEnabled = TestSelectionAnd((TestSelectionPP) &CCalendarStoreTable::TestSelectionCalendar);
+                outEnabled = TestSelectionAnd((TestSelectionPP) &CCalendarStoreTable::TestSelectionCanChangeCalendar);
                 break;
 
@@ -459 +459 @@
 
                 // Check for actual calendars
-                if (!inMouseDown.delaySelect && !node->IsProtocol() && !node->IsDirectory())
+                if (!inMouseDown.delaySelect && node->IsViewableCalendar())
                 {
                         switch(col_info.column_type)
@@ -619 +619 @@
 
                 // Do status flag
-                if (!node->IsProtocol() && !node->IsDirectory())
+                if (node->IsViewableCalendar())
                 {
                         if (node->IsCached())
@@ -694 +694 @@
         else
         {
-                return node->IsCached() ? 1807 : 1817;
+                if (node->IsCached())
+                        if (node->IsInbox())
+                                return 1823;
+                        else if (node->IsOutbox())
+                                return 1824;
+                        else
+                                return 1807;
+                else
+                        return 1817;
         }
 }
@@ -913 +921 @@
                         got_server = 1;
                 }
+                else if (node->IsInbox() || node->IsOutbox())
+                        // Cannot operate on Inbox/Outbox
+                        got_calendar = 2;
                 else
                         got_calendar = 1;
@@ -942 +953 @@
                 flavor = cDragCalServerType;
         }
-        else
+        else if (!node->IsInbox() && !node->IsOutbox())
         {
                 // Dragging mailbox
@@ -1047 +1058 @@
                 {
                         // Drop into valid calendars only
-                        return !node->IsProtocol() && !node->IsDirectory();
+                        return node->IsViewableCalendar();
                 }
                 case cDragCalServerType:
@@ -1054 +1065 @@
                 case cDragCalendarType:
                 {
-                        if (node->IsProtocol())
+                        if (node->IsProtocol() || node->IsInbox() || node->IsOutbox())
                                 return false;
                         else
-                                // Allow drop into any calendar (directory = move, mbox = copy)
+                                // Allow drop into any calendar (directory = move, calendar = copy)
                                 return true;
                 }
@@ -1167 +1178 @@
                 // Get drop cell type
                 calstore::CCalendarStoreNode* node = GetCellNode(theCell.row);
-                if (!node->IsProtocol())
+                if (!node->IsProtocol() && !node->IsInbox() && !node->IsOutbox())
                 {
                         CDragCalendarIntoCalendarTask* task = dynamic_cast<CDragCalendarIntoCalendarTask*>(CDragTask::GetCurrentDragTask());