Changeset 164 for Mulberry

Timestamp:

07/04/08 14:24:45 (5 months ago)

Author:

cyrusdaboo

Message:

Color the calendar inbox when it has contents.

Files:

• Mulberry/branches/v4.1d1/MacOS/Sources/Application/Calendar/Calendar_View/Calendar_Store_View/CCalendarStoreTable.cp (modified) (1 diff)

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

@@ -755 +755 @@
                         Style text_style = normal;
 
-                        text_color = CPreferences::sPrefs->mMboxClosedStyle.GetValue().color;
-                        color_set = true;
-                        text_style = text_style | CPreferences::sPrefs->mMboxClosedStyle.GetValue().style & 0x007F;
-                        strike =  strike || ((CPreferences::sPrefs->mMboxClosedStyle.GetValue().style & 0x0080) != 0);
+                        if (node->IsSubscribed())
+                        {
+                                iCal::CICalendar* cal = node->GetCalendar();
+                                if (node->IsInbox() && (cal != NULL) && cal->HasData())
+                                {
+                                        text_color = CPreferences::sPrefs->mMboxUnseenStyle.GetValue().color;
+                                        color_set = true;
+                                        text_style = text_style | CPreferences::sPrefs->mMboxUnseenStyle.GetValue().style & 0x007F;
+                                        strike =  strike || ((CPreferences::sPrefs->mMboxUnseenStyle.GetValue().style & 0x0080) != 0);
+                                }
+                                else
+                                {                               
+                                        text_color = CPreferences::sPrefs->mMboxFavouriteStyle.GetValue().color;
+                                        color_set = true;
+                                        text_style = text_style | CPreferences::sPrefs->mMboxFavouriteStyle.GetValue().style & 0x007F;
+                                        strike =  strike || ((CPreferences::sPrefs->mMboxFavouriteStyle.GetValue().style & 0x0080) != 0);
+                                }
+                        }
+                        if (!color_set)
+                        {
+                                text_color = CPreferences::sPrefs->mMboxClosedStyle.GetValue().color;
+                                color_set = true;
+                                text_style = text_style | CPreferences::sPrefs->mMboxClosedStyle.GetValue().style & 0x007F;
+                                strike =  strike || ((CPreferences::sPrefs->mMboxClosedStyle.GetValue().style & 0x0080) != 0);
+                        }
 
                         ::RGBForeColor(&text_color);