Bug 572043: Update add-on manager icons for beta 1. r=robstrong

toolkit/mozapps/extensions/content/extensions.xml

@@ -363,7 +363,7 @@
   <!-- Category item - an item in the category list. -->
   <binding id="category"
            extends="chrome://global/content/bindings/richlistbox.xml#richlistitem">
-    <content>
+    <content align="center">
       <xul:image anonid="icon" class="category-icon"/>
       <xul:label anonid="name" class="category-name" flex="1" xbl:inherits="value=name"/>
       <xul:label anonid="badge" class="category-badge" xbl:inherits="value=count"/>

toolkit/mozapps/xpinstall/content/xpinstallConfirm.js

@@ -68,8 +68,11 @@ XPInstallConfirm.init = function ()
     installItem.name = args.installs[i].addon.name;
     installItem.url = args.installs[i].sourceURL;
     var icon = args.installs[i].iconURL;
-    if (icon != null)
+    if (icon)
       installItem.icon = icon;
+    var type = args.installs[i].type;
+    if (type)
+      installItem.type = type;
     if (args.installs[i].certName) {
       installItem.cert = bundle.getFormattedString("signed", [args.installs[i].certName]);
     }

toolkit/mozapps/xpinstall/content/xpinstallItem.xml

@@ -38,6 +38,8 @@
                               onget="return this.getAttribute('url');"/>
       <property name="icon"   onset="this.setAttribute('icon', val); return val;"
                               onget="return this.getAttribute('icon');"/>
+      <property name="type"   onset="this.setAttribute('type', val); return val;"
+                              onget="return this.getAttribute('type');"/>
     </implementation>
   </binding>
          

toolkit/themes/gnomestripe/mozapps/extensions/extensions.css

@@ -313,13 +313,17 @@
   margin: 7px 5px;
   width: 32px;
   height: 32px;
-  list-style-image: url("chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png");
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
 }
 
 .addon[type="theme"] .icon {
   list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
 }
 
+.addon[type="locale"] .icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
+}
+
 .addon[type="plugin"] .icon {
   list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
 }
@@ -451,13 +455,17 @@
   width: 32px;
   height: 32px;
   -moz-margin-end: 10px;
-  list-style-image: url("chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png");
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
 }
 
 #detail-view[type="theme"] #detail-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
 }
 
+#detail-view[type="locale"] #detail-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
+}
+
 #detail-view[type="plugin"] #detail-icon {
   list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
 }

toolkit/themes/gnomestripe/mozapps/jar.mn

@@ -3,7 +3,6 @@ toolkit.jar:
 + skin/classic/mozapps/downloads/downloadIcon.png          (downloads/downloadIcon.png)
 + skin/classic/mozapps/downloads/downloads.css             (downloads/downloads.css)
 + skin/classic/mozapps/extensions/extensions.css           (extensions/extensions.css)
-+ skin/classic/mozapps/extensions/themeGeneric.png         (extensions/themeGeneric.png)
 + skin/classic/mozapps/extensions/category-search.png      (extensions/category-search.png)
 + skin/classic/mozapps/extensions/category-discover.png    (extensions/category-discover.png)
 + skin/classic/mozapps/extensions/category-languages.png   (extensions/category-languages.png)
@@ -11,6 +10,13 @@ toolkit.jar:
 + skin/classic/mozapps/extensions/category-extensions.png  (extensions/category-extensions.png)
 + skin/classic/mozapps/extensions/category-themes.png      (extensions/category-themes.png)
 + skin/classic/mozapps/extensions/category-plugins.png     (extensions/category-plugins.png)
++ skin/classic/mozapps/extensions/category-recent.png      (extensions/category-recent.png)
++ skin/classic/mozapps/extensions/category-available.png   (extensions/category-available.png)
++ skin/classic/mozapps/extensions/extensionGeneric.png     (extensions/extensionGeneric.png)
++ skin/classic/mozapps/extensions/extensionGeneric-16.png  (extensions/extensionGeneric-16.png)
++ skin/classic/mozapps/extensions/themeGeneric.png         (extensions/themeGeneric.png)
++ skin/classic/mozapps/extensions/themeGeneric-16.png      (extensions/themeGeneric-16.png)
++ skin/classic/mozapps/extensions/localeGeneric.png        (extensions/localeGeneric.png)
 + skin/classic/mozapps/extensions/go-back.png              (extensions/go-back.png)
 + skin/classic/mozapps/extensions/rating-won.png           (extensions/rating-won.png)
 + skin/classic/mozapps/extensions/rating-not-won.png       (extensions/rating-not-won.png)
@@ -28,7 +34,7 @@ toolkit.jar:
 + skin/classic/mozapps/plugins/pluginGeneric-16.png        (plugins/pluginGeneric-16.png)
 + skin/classic/mozapps/profile/profileicon.png             (profile/profileicon.png)
 + skin/classic/mozapps/viewsource/viewsource.css           (viewsource/viewsource.css)
-+ skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png  (xpinstall/xpinstallItemGeneric.png)
++ skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png  (extensions/extensionGeneric.png)
 #ifdef MOZ_PLACES
 + skin/classic/mozapps/places/defaultFavicon.png           (places/defaultFavicon.png)
 + skin/classic/mozapps/places/tagContainerIcon.png         (places/tagContainerIcon.png)

toolkit/themes/pinstripe/mozapps/extensions/extensions.css

@@ -313,13 +313,17 @@
   margin: 7px 5px;
   width: 32px;
   height: 32px;
-  list-style-image: url("chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png");
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
 }
 
 .addon[type="theme"] .icon {
   list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
 }
 
+.addon[type="locale"] .icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
+}
+
 .addon[type="plugin"] .icon {
   list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
 }
@@ -451,13 +455,17 @@
   width: 32px;
   height: 32px;
   -moz-margin-end: 10px;
-  list-style-image: url("chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png");
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
 }
 
 #detail-view[type="theme"] #detail-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
 }
 
+#detail-view[type="locale"] #detail-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
+}
+
 #detail-view[type="plugin"] #detail-icon {
   list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
 }

toolkit/themes/pinstripe/mozapps/jar.mn

@@ -5,7 +5,6 @@ toolkit.jar:
   skin/classic/mozapps/downloads/downloadStatusIcon.png           (downloads/downloadStatusIcon.png)
 * skin/classic/mozapps/downloads/downloads.css                    (downloads/downloads.css)
   skin/classic/mozapps/downloads/unknownContentType.css           (downloads/unknownContentType.css)
-  skin/classic/mozapps/extensions/themeGeneric.png                (extensions/themeGeneric.png)
   skin/classic/mozapps/extensions/category-search.png             (extensions/category-search.png)
   skin/classic/mozapps/extensions/category-discover.png           (extensions/category-discover.png)
   skin/classic/mozapps/extensions/category-languages.png          (extensions/category-languages.png)
@@ -13,6 +12,13 @@ toolkit.jar:
   skin/classic/mozapps/extensions/category-extensions.png         (extensions/category-extensions.png)
   skin/classic/mozapps/extensions/category-themes.png             (extensions/category-themes.png)
   skin/classic/mozapps/extensions/category-plugins.png            (extensions/category-plugins.png)
+  skin/classic/mozapps/extensions/category-recent.png             (extensions/category-recent.png)
+  skin/classic/mozapps/extensions/category-available.png          (extensions/category-available.png)
+  skin/classic/mozapps/extensions/extensionGeneric.png            (extensions/extensionGeneric.png)
+  skin/classic/mozapps/extensions/extensionGeneric-16.png         (extensions/extensionGeneric-16.png)
+  skin/classic/mozapps/extensions/themeGeneric.png                (extensions/themeGeneric.png)
+  skin/classic/mozapps/extensions/themeGeneric-16.png             (extensions/themeGeneric-16.png)
+  skin/classic/mozapps/extensions/localeGeneric.png               (extensions/localeGeneric.png)
   skin/classic/mozapps/extensions/go-back.png                     (extensions/go-back.png)
   skin/classic/mozapps/extensions/rating-won.png                  (extensions/rating-won.png)
   skin/classic/mozapps/extensions/rating-not-won.png              (extensions/rating-not-won.png)
@@ -45,7 +51,7 @@ toolkit.jar:
   skin/classic/mozapps/update/buttons.png                         (update/buttons.png)
 * skin/classic/mozapps/update/updates.css                         (update/updates.css)
   skin/classic/mozapps/viewsource/viewsource.css                  (viewsource/viewsource.css)
-  skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png         (xpinstall/xpinstallItemGeneric.png)
+  skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png         (extensions/extensionGeneric.png)
   skin/classic/mozapps/xpinstall/xpinstallConfirm.css             (xpinstall/xpinstallConfirm.css)
 #ifdef MOZ_PLACES
   skin/classic/mozapps/places/defaultFavicon.png                  (places/defaultFavicon.png)

toolkit/themes/pinstripe/mozapps/xpinstall/xpinstallConfirm.css

@@ -66,6 +66,17 @@ installitem {
 .xpinstallItemIcon {
   max-width: 32px;
   max-height: 32px;
-  list-style-image: url("chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png");
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
 }
 
+installitem[type="theme"] .xpinstallItemIcon {
+  list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
+}
+
+installitem[type="locale"] .xpinstallItemIcon {
+  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
+}
+
+installitem[type="plugin"] .xpinstallItemIcon {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
+}

toolkit/themes/winstripe/mozapps/extensions/extensions.css

@@ -313,13 +313,17 @@
   margin: 7px 5px;
   width: 32px;
   height: 32px;
-  list-style-image: url("chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png");
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
 }
 
 .addon[type="theme"] .icon {
   list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
 }
 
+.addon[type="locale"] .icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
+}
+
 .addon[type="plugin"] .icon {
   list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
 }
@@ -451,13 +455,17 @@
   width: 32px;
   height: 32px;
   -moz-margin-end: 10px;
-  list-style-image: url("chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png");
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
 }
 
 #detail-view[type="theme"] #detail-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
 }
 
+#detail-view[type="locale"] #detail-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
+}
+
 #detail-view[type="plugin"] #detail-icon {
   list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
 }

toolkit/themes/winstripe/mozapps/jar.mn

@@ -11,7 +11,6 @@ toolkit.jar:
         skin/classic/mozapps/extensions/blocklist.css              (extensions/blocklist.css)
         skin/classic/mozapps/extensions/extensions.css             (extensions/extensions.css)
         skin/classic/mozapps/extensions/update.css                 (extensions/update.css)
-        skin/classic/mozapps/extensions/themeGeneric.png           (extensions/themeGeneric.png)
         skin/classic/mozapps/extensions/category-search.png        (extensions/category-search.png)
         skin/classic/mozapps/extensions/category-discover.png      (extensions/category-discover.png)
         skin/classic/mozapps/extensions/category-languages.png     (extensions/category-languages.png)
@@ -19,6 +18,13 @@ toolkit.jar:
         skin/classic/mozapps/extensions/category-extensions.png    (extensions/category-extensions.png)
         skin/classic/mozapps/extensions/category-themes.png        (extensions/category-themes.png)
         skin/classic/mozapps/extensions/category-plugins.png       (extensions/category-plugins.png)
+        skin/classic/mozapps/extensions/category-recent.png        (extensions/category-recent.png)
+        skin/classic/mozapps/extensions/category-available.png     (extensions/category-available.png)
+        skin/classic/mozapps/extensions/extensionGeneric.png       (extensions/extensionGeneric.png)
+        skin/classic/mozapps/extensions/extensionGeneric-16.png    (extensions/extensionGeneric-16.png)
+        skin/classic/mozapps/extensions/themeGeneric.png           (extensions/themeGeneric.png)
+        skin/classic/mozapps/extensions/themeGeneric-16.png        (extensions/themeGeneric-16.png)
+        skin/classic/mozapps/extensions/localeGeneric.png          (extensions/localeGeneric.png)
         skin/classic/mozapps/extensions/go-back.png                (extensions/go-back.png)
         skin/classic/mozapps/extensions/rating-won.png             (extensions/rating-won.png)
         skin/classic/mozapps/extensions/rating-not-won.png         (extensions/rating-not-won.png)
@@ -53,7 +59,7 @@ toolkit.jar:
         skin/classic/mozapps/update/updates.css                    (update/updates.css)
         skin/classic/mozapps/viewsource/viewsource.css             (viewsource/viewsource.css)
 *       skin/classic/mozapps/xpinstall/xpinstallConfirm.css        (xpinstall/xpinstallConfirm.css)
-        skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png    (xpinstall/xpinstallItemGeneric.png)
+        skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png    (extensions/extensionGeneric-aero.png)
 
 #ifdef XP_WIN
 toolkit.jar:
@@ -68,12 +74,19 @@ toolkit.jar:
         skin/classic/aero/mozapps/extensions/update.css                    (extensions/update.css)
         skin/classic/aero/mozapps/extensions/themeGeneric.png              (extensions/themeGeneric-aero.png)
         skin/classic/aero/mozapps/extensions/category-search.png           (extensions/category-search.png)
-        skin/classic/aero/mozapps/extensions/category-discover.png         (extensions/category-discover.png)
-        skin/classic/aero/mozapps/extensions/category-languages.png        (extensions/category-languages.png)
+        skin/classic/aero/mozapps/extensions/category-discover.png         (extensions/category-discover-aero.png)
+        skin/classic/aero/mozapps/extensions/category-languages.png        (extensions/category-languages-aero.png)
         skin/classic/aero/mozapps/extensions/category-searchengines.png    (extensions/category-searchengines.png)
-        skin/classic/aero/mozapps/extensions/category-extensions.png       (extensions/category-extensions.png)
-        skin/classic/aero/mozapps/extensions/category-themes.png           (extensions/category-themes.png)
-        skin/classic/aero/mozapps/extensions/category-plugins.png          (extensions/category-plugins.png)
+        skin/classic/aero/mozapps/extensions/category-extensions.png       (extensions/category-extensions-aero.png)
+        skin/classic/aero/mozapps/extensions/category-themes.png           (extensions/category-themes-aero.png)
+        skin/classic/aero/mozapps/extensions/category-plugins.png          (extensions/category-plugins-aero.png)
+        skin/classic/aero/mozapps/extensions/category-recent.png           (extensions/category-recent-aero.png)
+        skin/classic/aero/mozapps/extensions/category-available.png        (extensions/category-available-aero.png)
+        skin/classic/aero/mozapps/extensions/extensionGeneric.png          (extensions/extensionGeneric-aero.png)
+        skin/classic/aero/mozapps/extensions/extensionGeneric-16.png       (extensions/extensionGeneric-16-aero.png)
+        skin/classic/aero/mozapps/extensions/themeGeneric.png              (extensions/themeGeneric-aero.png)
+        skin/classic/aero/mozapps/extensions/themeGeneric-16.png           (extensions/themeGeneric-16-aero.png)
+        skin/classic/aero/mozapps/extensions/localeGeneric.png             (extensions/localeGeneric-aero.png)
         skin/classic/aero/mozapps/extensions/go-back.png                   (extensions/go-back.png)
         skin/classic/aero/mozapps/extensions/rating-won.png                (extensions/rating-won.png)
         skin/classic/aero/mozapps/extensions/rating-not-won.png            (extensions/rating-not-won.png)
@@ -108,5 +121,5 @@ toolkit.jar:
         skin/classic/aero/mozapps/update/updates.css                       (update/updates.css)
         skin/classic/aero/mozapps/viewsource/viewsource.css                (viewsource/viewsource.css)
 *       skin/classic/aero/mozapps/xpinstall/xpinstallConfirm.css           (xpinstall/xpinstallConfirm.css)
-        skin/classic/aero/mozapps/xpinstall/xpinstallItemGeneric.png       (xpinstall/xpinstallItemGeneric-aero.png)
+        skin/classic/aero/mozapps/xpinstall/xpinstallItemGeneric.png       (extensions/extensionGeneric-aero.png)
 #endif

toolkit/themes/winstripe/mozapps/xpinstall/xpinstallConfirm.css

@@ -77,5 +77,17 @@ installitem {
 .xpinstallItemIcon {
   max-width: 32px;
   max-height: 32px;
-  list-style-image: url("chrome://mozapps/skin/xpinstall/xpinstallItemGeneric.png");
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+}
+
+installitem[type="theme"] .xpinstallItemIcon {
+  list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
+}
+
+installitem[type="locale"] .xpinstallItemIcon {
+  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
+}
+
+installitem[type="plugin"] .xpinstallItemIcon {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
 }