Bug 415654 Use different alarm icon for suppressed alarms; r=philipp

git-svn-id: svn://10.0.0.236/trunk@244933 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/calendar/base/content/calendar-view-core.xml

@@ -228,10 +228,12 @@
               }
           }
 
-          var alarmImage = document.getAnonymousElementByAttribute(this, "anonid", "alarm-image");
           if ((item.alarmOffset || item.parentItem.alarmOffset) &&
-              getPrefSafe("calendar.alarms.indicator.show", true) &&
-              !item.calendar.getProperty("suppressAlarms")) {
+              getPrefSafe("calendar.alarms.indicator.show", true)) {
+              var alarmImage = document.getAnonymousElementByAttribute(this, "anonid", "alarm-image");
+              if (item.calendar.getProperty("suppressAlarms")) {
+                  alarmImage.setAttribute("suppressed", "true");
+              }
               alarmImage.removeAttribute("hidden");
           }
         ]]></body>

mozilla/calendar/base/jar.mn

@@ -90,6 +90,7 @@ calendar.jar:
     content/calendar/sun-calendar-event-dialog-attendees.js  (/calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.js)
 % skin calendar classic/1.0 %skin/classic/calendar/
     skin/classic/calendar/abcard.png             (themes/common/abcard.png)
+    skin/classic/calendar/alarm-suppressed.png   (themes/common/alarm-suppressed.png)
     skin/classic/calendar/alarm-flashing.png     (themes/common/alarm-flashing.png)
     skin/classic/calendar/alarm.png              (themes/common/alarm.png)
 #expand    skin/classic/calendar/cal-icon32.png         (themes/__THEME__/cal-icon32.png)

mozilla/calendar/base/themes/pinstripe/calendar-views.css

@@ -469,3 +469,7 @@ calendar-event-box[readOnly="true"]:hover .calendar-event-box-grippy-bottom {
 .alarm-image[flashing="true"] {
   list-style-image: url(chrome://calendar/skin/alarm-flashing.png);
 }
+
+.alarm-image[suppressed="true"] {
+  list-style-image: url(chrome://calendar/skin/alarm-suppressed.png);
+}

mozilla/calendar/base/themes/winstripe/calendar-views.css

@@ -469,3 +469,7 @@ calendar-event-box[readOnly="true"]:hover .calendar-event-box-grippy-bottom {
 .alarm-image[flashing="true"] {
   list-style-image: url(chrome://calendar/skin/alarm-flashing.png);
 }
+
+.alarm-image[suppressed="true"] {
+  list-style-image: url(chrome://calendar/skin/alarm-suppressed.png);
+}