Add icons for bug 363932 - Delete Warning should be redesigned. r=mschroeder,ui-r=christian

calendar/base/content/calendar-occurrence-prompt.xul

@@ -72,6 +72,9 @@
                      "header.isrepeating." + itemType + ".label");
 
       // Set up buttons
+      document.getElementById("accept-buttons-box")
+              .setAttribute("action", action);
+
       document.getElementById("accept-occurrence-button").label =
         calGetString("calendar-occurrence-prompt",
                      "buttons.occurrence." + action + ".label");
@@ -81,9 +84,6 @@
       document.getElementById("accept-parent-button").label =
         calGetString("calendar-occurrence-prompt",
                      "buttons.parent." + action + ".label");
-
-      // Make "just this occurrence" the default button
-
     }
   ]]></script>
 

calendar/base/jar.mn

@@ -107,6 +107,7 @@ calendar.jar:
 #expand    skin/classic/calendar/widgets/calendar-widgets.css   (themes/__THEME__/widgets/calendar-widgets.css)
 #expand    skin/classic/calendar/calendar-event-dialog.css (themes/__THEME__/calendar-event-dialog.css)
 #expand    skin/classic/calendar/calendar-occurrence-prompt.css (themes/__THEME__/calendar-occurrence-prompt.css)
+#expand    skin/classic/calendar/calendar-occurrence-prompt.png (themes/__THEME__/calendar-occurrence-prompt.png)
 #expand    skin/classic/calendar/calendar-properties-dialog.css (themes/__THEME__/calendar-properties-dialog.css)
 #expand    skin/classic/calendar/calendar-unifinder.css (themes/__THEME__/calendar-unifinder.css)
 #expand    skin/classic/calendar/calendar-views.css     (themes/__THEME__/calendar-views.css)

calendar/base/themes/pinstripe/calendar-occurrence-prompt.css

@@ -70,15 +70,26 @@
   list-style-image: url(chrome://calendar/skin/calendar-occurrence-prompt.png);
 }
 
-#accept-occurrence-button {
+#accept-buttons-box[action="edit"] > #accept-occurrence-button {
   -moz-image-region: rect(0 20px 20px 0);
 }
 
-#accept-allfollowing-button {
-  /* TODO will be taken care of in a different bug */
+#accept-buttons-box[action="edit"] > #accept-parent-button {
   -moz-image-region: rect(0 40px 20px 20px);
 }
 
-#accept-parent-button {
+#accept-buttons-box[action="edit"] > #accept-allfollowing-button {
   -moz-image-region: rect(0 60px 20px 40px);
 }
+
+#accept-buttons-box[action="delete"] > #accept-occurrence-button {
+  -moz-image-region: rect(0 80px 20px 60px);
+}
+
+#accept-buttons-box[action="delete"] > #accept-parent-button {
+  -moz-image-region: rect(0 100px 20px 80px);
+}
+
+#accept-buttons-box[action="delete"] > #accept-allfollowing-button {
+  -moz-image-region: rect(0 120px 20px 100px);
+}

calendar/base/themes/winstripe/calendar-occurrence-prompt.css

@@ -70,15 +70,26 @@
   list-style-image: url(chrome://calendar/skin/calendar-occurrence-prompt.png);
 }
 
-#accept-occurrence-button {
+#accept-buttons-box[action="edit"] > #accept-occurrence-button {
   -moz-image-region: rect(0 20px 20px 0);
 }
 
-#accept-allfollowing-button {
-  /* TODO will be taken care of in a different bug */
+#accept-buttons-box[action="edit"] > #accept-parent-button {
   -moz-image-region: rect(0 40px 20px 20px);
 }
 
-#accept-parent-button {
+#accept-buttons-box[action="edit"] > #accept-allfollowing-button {
   -moz-image-region: rect(0 60px 20px 40px);
 }
+
+#accept-buttons-box[action="delete"] > #accept-occurrence-button {
+  -moz-image-region: rect(0 80px 20px 60px);
+}
+
+#accept-buttons-box[action="delete"] > #accept-parent-button {
+  -moz-image-region: rect(0 100px 20px 80px);
+}
+
+#accept-buttons-box[action="delete"] > #accept-allfollowing-button {
+  -moz-image-region: rect(0 120px 20px 100px);
+}