Fix bug 639799 - New icons for the tasks header. r=philipp ui-r=clarkbw

calendar/base/jar.mn

@@ -1,8 +1,6 @@
 #filter substitution
 calendar.jar:
 % content calendar %content/calendar/
-% style chrome://calendar/content/calendar-event-dialog.xul chrome://global/skin/toolbar.css
-% style chrome://global/content/customizeToolbar.xul chrome://calendar/skin/calendar-task-view.css
     content/calendar/agenda-listbox.js                     (content/agenda-listbox.js)
     content/calendar/agenda-listbox.xml                    (content/agenda-listbox.xml)
     content/calendar/calendar-bindings.css                 (content/calendar-bindings.css)
@@ -101,6 +99,8 @@ calendar.jar:
     content/calendar/Windows98ToZoneInfoTZId.properties    (src/Windows98ToZoneInfoTZId.properties)
     content/calendar/WindowsNTToZoneInfoTZId.properties    (src/WindowsNTToZoneInfoTZId.properties)
 % skin calendar classic/1.0 %skin/calendar/
+% style chrome://calendar/content/calendar-event-dialog.xul chrome://global/skin/toolbar.css
+% style chrome://global/content/customizeToolbar.xul chrome://calendar/skin/calendar-task-view.css
     skin/calendar/abcard.png                               (themes/common/images/abcard.png)
     skin/calendar/alarm-flashing.png                       (themes/common/images/alarm-flashing.png)
     skin/calendar/alarm-icons.png                          (themes/common/images/alarm-icons.png)
@@ -151,10 +151,18 @@ calendar.jar:
     skin/calendar/calendar-views.css                       (themes/@THEME@/calendar-views.css)
     skin/calendar/checkbox-images.png                      (themes/@THEME@/images/checkbox-images.png)
     skin/calendar/ok-cancel.png                            (themes/@THEME@/images/ok-cancel.png)
+    skin/calendar/tasks-actions.png                        (themes/@THEME@/images/tasks-actions.png)
     skin/calendar/today-pane.css                           (themes/@THEME@/today-pane.css)
     skin/calendar/toolbar-large.png                        (themes/@THEME@/images/toolbar-large.png)
     skin/calendar/toolbar-small.png                        (themes/@THEME@/images/toolbar-small.png)
     skin/calendar/widgets/calendar-widgets.css             (themes/@THEME@/widgets/calendar-widgets.css)
+# The following files are added for aero support on windows.
+#ifdef XP_WIN
+% style chrome://calendar/content/calendar-common-sets.xul chrome://calendar/skin/calendar-aero.css os=WINNT osversion>=6
+    skin/calendar/calendar-aero.css                        (themes/@THEME@/calendar-aero.css)
+    skin/calendar/tasks-actions-aero.png                   (themes/@THEME@/images/tasks-actions-aero.png)
+#endif
+
 #ifdef XP_MACOSX
     skin/calendar/sidebar-item.png                         (themes/@THEME@/images/sidebar-item.png)
 #endif

calendar/base/themes/pinstripe/calendar-task-view.css

@@ -182,23 +182,23 @@ window[toolboxId="task-actions-toolbox"] #modelist menuitem:first-child {
 }
 
 #task-actions-category {
-    list-style-image: url(chrome://calendar/skin/toolbar-small.png);
-    -moz-image-region: rect(72px, 544px, 88px, 528px);
+    list-style-image: url(chrome://calendar/skin/tasks-actions.png);
+    -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
 #task-actions-markcompleted {
-    list-style-image: url(chrome://calendar/skin/toolbar-small.png);
-    -moz-image-region: rect(72px, 568px, 88px, 552px);
+    list-style-image: url(chrome://calendar/skin/tasks-actions.png);
+    -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
 #task-actions-priority {
-    list-style-image: url(chrome://calendar/skin/toolbar-small.png);
-    -moz-image-region: rect(72px, 592px, 88px, 576px);
+    list-style-image: url(chrome://calendar/skin/tasks-actions.png);
+    -moz-image-region: rect(0px, 48px, 16px, 32px);
 }
 
 #calendar-delete-task-button {
-    list-style-image: url(chrome://messenger/skin/icons/folder-trash.png);
-}
+    list-style-image: url(chrome://messenger/skin/icons/message-header-toolbar.png);
+    -moz-image-region: rect(0px, 96px, 16px, 80px);}
 
 #calendar-add-task-button {
     list-style-image: url(chrome://calendar/skin/toolbar-small.png);

calendar/base/themes/winstripe/calendar-aero.css

@@ -0,0 +1,55 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Calendar code.
+ *
+ * The Initial Developer of the Original Code is
+ *   Philipp Kewisch <mozilla@kewis.ch>
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#task-actions-category {
+    list-style-image: url(chrome://calendar/skin/tasks-actions-aero.png);
+    -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+#task-actions-markcompleted {
+    list-style-image: url(chrome://calendar/skin/tasks-actions-aero.png);
+    -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+#task-actions-priority {
+    list-style-image: url(chrome://calendar/skin/tasks-actions-aero.png);
+    -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+#calendar-delete-task-button {
+    list-style-image: url(chrome://messenger/skin/icons/mail-toolbar.png);
+    -moz-image-region: rect(0px, 144px, 18px, 126px);
+}

calendar/base/themes/winstripe/calendar-task-view.css

@@ -192,18 +192,18 @@ window[toolboxId="task-actions-toolbox"] #modelist menuitem:first-child {
 }
 
 #task-actions-category {
-    list-style-image: url(chrome://calendar/skin/toolbar-small.png);
-    -moz-image-region: rect(0px, 368px, 16px, 352px);
+    list-style-image: url(chrome://calendar/skin/tasks-actions.png);
+    -moz-image-region: rect(0px, 16px, 16px, 0px);
 }
 
 #task-actions-markcompleted {
-    list-style-image: url(chrome://calendar/skin/toolbar-small.png);
-    -moz-image-region: rect(0px, 384px, 16px, 368px);
+    list-style-image: url(chrome://calendar/skin/tasks-actions.png);
+    -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 
 #task-actions-priority {
-    list-style-image: url(chrome://calendar/skin/toolbar-small.png);
-    -moz-image-region: rect(0px, 400px, 16px, 384px);
+    list-style-image: url(chrome://calendar/skin/tasks-actions.png);
+    -moz-image-region: rect(0px, 48px, 16px, 32px);
 }
 
 #calendar-delete-task-button {

calendar/lightning/content/messenger-overlay-toolbar.xul

@@ -52,7 +52,6 @@
 
 <?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>
 <?xml-stylesheet href="chrome://lightning/skin/lightning-toolbar.css" type="text/css"?>
-<?xml-stylesheet href="chrome://lightning-aero/skin/lightning-aero.css" type="text/css"?>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 

calendar/lightning/jar.mn

@@ -54,9 +54,11 @@ lightning.jar:
     skin/lightning/lightning-widgets.css                   (themes/@THEME@/lightning-widgets.css)
     skin/lightning/suite-accountCentral.css                (themes/common/suite-accountCentral.css)
     skin/lightning/mode-switch-icons.png                   (themes/common/images/mode-switch-icons.png)
+#ifdef XP_WIN
+% style chrome://lightning/content/messenger-overlay-sidebar.xul chrome://lightning/skin/lightning-aero.css os=WINNT osversion>=6
+    skin/lightning/lightning-aero.css                      (themes/winstripe/lightning-aero.css)
+#endif
 
-% skin lightning-aero classic/1.0 %skin/lightning-aero/ os=WINNT osversion>=6
-    skin/lightning-aero/lightning-aero.css                 (themes/winstripe/lightning-aero.css)
 
 calendar.jar:
     content/calendar/calendarCreation.xul                  (/calendar/resources/content/calendarCreation.xul)