Bug 418877 - "Error/Warning/Information/Question icons" [p=ispence@gmail.com (Ian Spence) / reed@reedloden.com (Reed Loden) r=gavin a1.9=schrep]

toolkit/mozapps/extensions/content/extensions.js

@@ -1067,7 +1067,11 @@ function Startup()
     var buttonLabel = getExtensionString("enableButtonLabel");
     var buttonAccesskey = getExtensionString("enableButtonAccesskey");
     var notifyData = "addons-enable-compatibility";
+#ifdef MOZ_WIDGET_GTK2
+    showMessage("moz-icon://stock/gtk-dialog-info?size=menu",
+#else
     showMessage("chrome://mozapps/skin/extensions/question.png",
+#endif
                 msgText, buttonLabel, buttonAccesskey,
                 true, notifyData);
   }
@@ -1083,13 +1087,21 @@ function Startup()
       var buttonLabel = getExtensionString("enableButtonLabel");
       var buttonAccesskey = getExtensionString("enableButtonAccesskey");
       var notifyData = "addons-enable-updatesecurity";
+#ifdef MOZ_WIDGET_GTK2
+      showMessage("moz-icon://stock/gtk-dialog-info?size=menu",
+#else
       showMessage("chrome://mozapps/skin/extensions/question.png",
+#endif
                   msgText, buttonLabel, buttonAccesskey,
                   true, notifyData);
     }
   }
   if (gInSafeMode) {
+#ifdef MOZ_WIDGET_GTK2
+    showMessage("moz-icon://stock/gtk-dialog-info?size=menu",
+#else
     showMessage("chrome://mozapps/skin/extensions/question.png",
+#endif
                 getExtensionString("safeModeMsg"),
                 null, null, true, null);
   }
@@ -1113,7 +1125,11 @@ function Startup()
         document.getElementById("viewGroup").hidden = true;
         document.getElementById("extensionsView").setAttribute("norestart", "");
         showView("updates");
+#ifdef MOZ_WIDGET_GTK2
+        showMessage("moz-icon://stock/gtk-dialog-info?size=menu",
+#else
         showMessage("chrome://mozapps/skin/extensions/question.png",
+#endif
                     getExtensionString("newUpdatesAvailableMsg"),
                     null, null, true, null);
         document.title = getExtensionString("newUpdateWindowTitle", [getBrandShortName()]);
@@ -1122,8 +1138,12 @@ function Startup()
         gNewAddons = window.arguments[1].split(",");
         var installMsg = PluralForm.get(gNewAddons.length, getExtensionString("newAddonsNotificationMsg2"));
         installMsg = installMsg.replace("%S", gNewAddons.length);
-        showMessage("chrome://mozapps/skin/extensions/question.png", installMsg,
-                    null, null, true, null);
+#ifdef MOZ_WIDGET_GTK2
+        showMessage("moz-icon://stock/gtk-dialog-info?size=menu",
+#else
+        showMessage("chrome://mozapps/skin/extensions/question.png",
+#endif
+                    installMsg, null, null, true, null);
         var extensionCount = 0;
         var themeCount = 0;
         var localeCount = 0;
@@ -1440,7 +1460,11 @@ UpdateCheckListener.prototype = {
     if (this._updateFound)
       showView("updates");
     else {
+#ifdef MOZ_WIDGET_GTK2
+      showMessage("moz-icon://stock/gtk-dialog-info?size=menu",
+#else
       showMessage("chrome://mozapps/skin/extensions/question.png",
+#endif
                   getExtensionString("noUpdatesMsg"),
                   null, null, true, "addons-no-updates");
       window.addEventListener("select", noUpdatesDismiss, true);
@@ -2013,7 +2037,11 @@ function isXPInstallEnabled() {
   var buttonLabel = locked ? null : getExtensionString("enableButtonLabel");
   var buttonAccesskey = locked ? null : getExtensionString("enableButtonAccesskey");
   var notifyData = locked ? null : "addons-enable-xpinstall";
+#ifdef MOZ_WIDGET_GTK2
+  showMessage("moz-icon://stock/gtk-dialog-info?size=menu",
+#else
   showMessage("chrome://mozapps/skin/extensions/question.png",
+#endif
               msgText, buttonLabel, buttonAccesskey,
               !locked, notifyData);
   return false;
@@ -2023,7 +2051,11 @@ function isOffline(messageKey) {
   var ioService = Components.classes["@mozilla.org/network/io-service;1"]
                             .getService(nsIIOService);
   if (ioService.offline) {
+#ifdef MOZ_WIDGET_GTK2
+    showMessage("moz-icon://stock/gtk-dialog-info?size=menu",
+#else
     showMessage("chrome://mozapps/skin/extensions/question.png",
+#endif
                 getExtensionString(messageKey, [getBrandShortName()]),
                 getExtensionString("goOnlineButtonLabel"),
                 getExtensionString("goOnlineButtonAccesskey"),

toolkit/themes/gnomestripe/global/findBar.css

@@ -83,7 +83,7 @@ findbar {
 }
 
 .find-status-icon[status="notfound"] {
-  list-style-image: url("moz-icon://stock/gtk-stop?size=menu");
+  list-style-image: url("moz-icon://stock/gtk-dialog-error?size=menu");
 }
 
 .findbar-textbox {

toolkit/themes/gnomestripe/mozapps/update/updates.css

@@ -51,7 +51,7 @@ license {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
 }
 .licenseLoadingThrobber[state="error"] {
-  list-style-image: url("chrome://global/skin/icons/notfound.png");
+  list-style-image: url("moz-icon://stock/gtk-dialog-error?size=menu");
 }
 
 /**
@@ -80,7 +80,7 @@ wizard[currentpageid="updatesfound"] .wizard-button[dlgtype="next"] > .button-bo
 }
 
 #alertImage {
-  list-style-image: url("chrome://global/skin/icons/Warning.png");
+  list-style-image: url("moz-icon://stock/gtk-dialog-warning?size=dnd");
   margin-right: 5px;
 }
 
@@ -115,7 +115,7 @@ wizard[currentpageid="updatesfound"] .wizard-button[dlgtype="next"] > .button-bo
 }
 
 #verificationFailedIcon {
-  list-style-image: url("chrome://global/skin/icons/notfound.png");
+  list-style-image: url("moz-icon://stock/gtk-dialog-warning?size=menu");
   margin: 5px 3px 0px 5px;
 }
 

toolkit/themes/winstripe/global/config.css

@@ -50,7 +50,11 @@
 
 #exclam
 {
+%ifdef MOZ_WIDGET_GTK2
+  list-style-image: url("moz-icon://stock/gtk-dialog-warning?size=dialog");
+%else
   list-style-image: url("chrome://global/skin/icons/warning-large.png");
+%endif
   -moz-margin-end: 3em;
 }
 

toolkit/themes/winstripe/global/jar.mn

@@ -10,7 +10,7 @@ classic.jar:
         skin/classic/global/button.css
         skin/classic/global/checkbox.css
         skin/classic/global/colorpicker.css
-        skin/classic/global/config.css
+*       skin/classic/global/config.css
         skin/classic/global/customizeToolbar.css
         skin/classic/global/datetimepicker.css
         skin/classic/global/dialog.css