Bug 1625881 - Port bug 1625637: Remove icon attributes from XUL buttons. r=mkmelin
authorRichard Marti <richard.marti@gmail.com>
Mon, 30 Mar 2020 12:08:28 +0200
changeset 38628 ca0a93e99eb8d3c00e0f37c1749bac2decd03558
parent 38627 c3577a22840c92f6f09c0678d61ff0f792e47d0b
child 38629 73ad2c5d51ec158662599fa6132e5956208fa52c
push id400
push userclokep@gmail.com
push dateMon, 04 May 2020 18:56:09 +0000
reviewersmkmelin
bugs1625881, 1625637
Bug 1625881 - Port bug 1625637: Remove icon attributes from XUL buttons. r=mkmelin Port of https://hg.mozilla.org/mozilla-central/rev/8162e13692ac
common/src/customizeToolbar.xhtml
mail/components/preferences/cookies.xhtml
mail/components/preferences/general.inc.xhtml
mail/components/preferences/permissions.xhtml
mail/extensions/openpgp/content/ui/keyPicker.xhtml
mailnews/extensions/newsblog/content/feed-subscriptions.xhtml
--- a/common/src/customizeToolbar.xhtml
+++ b/common/src/customizeToolbar.xhtml
@@ -86,26 +86,26 @@
 #ifndef MOZ_SUITE
         <menuitem id="textbesideiconItem" value="textbesideicon" label="&iconsBesideText.label;"/>
 #endif
       </menupopup>
     </menulist>
 
     <checkbox id="smallicons" oncommand="updateIconSize(this.checked ? 'small' : 'large');" label="&useSmallIcons.label;"/>
 
-    <button id="restoreDefault" label="&restoreDefaultSet.label;" oncommand="restoreDefaultSet();" icon="revert"/>
+    <button id="restoreDefault" label="&restoreDefaultSet.label;" oncommand="restoreDefaultSet();"/>
 #ifndef MOZ_SUITE
     <vbox id="titlebarSettings" hidden="true">
       <checkbox id="showTitlebar" oncommand="updateTitlebar();" label="&showTitlebar.label;"/>
       <checkbox id="showDragSpace" oncommand="updateDragSpace();" label="&extraDragSpace.label;"/>
     </vbox>
 #endif
   </box>
 
   <separator class="groove"/>
 
   <hbox align="center" pack="end">
     <button id="donebutton" label="&saveChanges.label;" oncommand="onClose();"
-            default="true" icon="close"/>
+            default="true"/>
   </hbox>
 </vbox>
 
 </window>
--- a/mail/components/preferences/cookies.xhtml
+++ b/mail/components/preferences/cookies.xhtml
@@ -89,22 +89,22 @@
         <html:input id="isSecure" type="text" readonly="readonly"/>
         <html:input id="expires" type="text" readonly="readonly"/>
         <html:input id="userContext" type="text" readonly="readonly"/>
       </vbox>
     </hbox>
   </vbox>
   <hbox align="end">
     <hbox class="actionButtons" flex="1">
-      <button id="removeSelectedCookies" disabled="true" icon="remove"
+      <button id="removeSelectedCookies" disabled="true"
               label="&button.removecookie.label;" accesskey="&button.removecookie.accesskey;"
               oncommand="gCookiesWindow.deleteCookie();"/>
-      <button id="removeAllCookies" disabled="true" icon="clear"
+      <button id="removeAllCookies" disabled="true"
               label="&button.removeallcookies.label;" accesskey="&button.removeallcookies.accesskey;"
               oncommand="gCookiesWindow.deleteAllCookies();"/>
       <spacer flex="1"/>
 #ifndef XP_MACOSX
-      <button oncommand="window.close();" icon="close"
+      <button oncommand="window.close();"
               label="&button.close.label;" accesskey="&button.close.accesskey;"/>
 #endif
     </hbox>
   </hbox>
 </window>
--- a/mail/components/preferences/general.inc.xhtml
+++ b/mail/components/preferences/general.inc.xhtml
@@ -143,19 +143,19 @@
                 <menuitem value="56" label="56"/>
                 <menuitem value="64" label="64"/>
                 <menuitem value="72" label="72"/>
               </menupopup>
             </menulist>
           </hbox>
         </vbox>
         <vbox id="colorsRow">
-          <button id="advancedFonts" flex="1" label="&fontOptions.label;" icon="select-font"
+          <button id="advancedFonts" flex="1" label="&fontOptions.label;"
                   accesskey="&fontOptions.accesskey;" oncommand="gGeneralPane.configureFonts();"/>
-          <button id="colors" flex="1" icon="select-color" label="&colorButton.label;"
+          <button id="colors" flex="1" label="&colorButton.label;"
                   accesskey="&colorButton.accesskey;" oncommand="gGeneralPane.configureColors();"/>
         </vbox>
       </hbox>
       <hbox>
         <html:legend>&displayWidth.label;</html:legend>
       </hbox>
       <hbox>
         <checkbox id="displayGlyph"
@@ -660,17 +660,17 @@
       <html:h1 data-l10n-id="general-network-and-diskspace-header"/>
     </hbox>
 
     <!-- Networking & Disk Space -->
     <html:fieldset data-category="paneGeneral">
       <html:legend>&connectionsInfo.caption;</html:legend>
       <hbox align="center">
         <description flex="1" control="catProxiesButton">&proxiesConfigure.label;</description>
-        <button id="catProxiesButton" icon="network" label="&showSettings.label;"
+        <button id="catProxiesButton" label="&showSettings.label;"
                 accesskey="&showSettings.accesskey;"
                 oncommand="gGeneralPane.showConnections();"/>
       </hbox>
     </html:fieldset>
 
     <html:fieldset data-category="paneGeneral">
       <html:legend>&offlineInfo.caption;</html:legend>
       <hbox align="center">
@@ -680,17 +680,17 @@
                 oncommand="gGeneralPane.showOffline();"/>
       </hbox>
     </html:fieldset>
 
     <html:fieldset data-category="paneGeneral">
       <html:legend>&Diskspace;</html:legend>
       <hbox align="center">
         <label id="actualDiskCacheSize" flex="1"/>
-        <button id="clearCacheButton" icon="clear"
+        <button id="clearCacheButton"
                 label="&clearCacheNow.label;" accesskey="&clearCacheNow.accesskey;"
                 oncommand="gGeneralPane.clearCache();"/>
       </hbox>
       <hbox>
         <checkbox preference="browser.cache.disk.smart_size.enabled"
                   id="allowSmartSize"
                   label="&overrideSmartCacheSize.label;"
                   accesskey="&overrideSmartCacheSize.accesskey;"/>
--- a/mail/components/preferences/permissions.xhtml
+++ b/mail/components/preferences/permissions.xhtml
@@ -65,24 +65,24 @@
       </treecols>
       <treechildren/>
     </tree>
   </vbox>
   <vbox>
     <hbox class="actionButtons" flex="1">
       <button id="removePermission" disabled="true"
               accesskey="&removepermission.accesskey;"
-              icon="remove" label="&removepermission.label;"
+              label="&removepermission.label;"
               oncommand="gPermissionManager.onPermissionDeleted();"/>
       <button id="removeAllPermissions"
-              icon="clear" label="&removeallpermissions.label;"
+              label="&removeallpermissions.label;"
               accesskey="&removeallpermissions.accesskey;"
               oncommand="gPermissionManager.onAllPermissionsDeleted();"/>
     </hbox>
     <spacer flex="1"/>
     <hbox class="actionButtons" pack="end" flex="1">
-      <button oncommand="window.close();" icon="close"
+      <button oncommand="window.close();"
               label="&button.cancel.label;" accesskey="&button.cancel.accesskey;" />
-      <button id="btnApplyChanges" oncommand="gPermissionManager.onApplyChanges();" icon="save"
+      <button id="btnApplyChanges" oncommand="gPermissionManager.onApplyChanges();"
               label="&button.ok.label;" accesskey="&button.ok.accesskey;"/>
     </hbox>
   </vbox>
 </window>
--- a/mail/extensions/openpgp/content/ui/keyPicker.xhtml
+++ b/mail/extensions/openpgp/content/ui/keyPicker.xhtml
@@ -38,14 +38,14 @@
                data-isCurrentSortCol="true"/>
     </listheader>
     <richlistbox id="keyIDBox" flex="1" selected="true"/>
   </vbox>
 
 
   <spacer flex="1"/>
   <hbox class="actionButtons" pack="end">
-    <button oncommand="window.close();" icon="close"
+    <button oncommand="window.close();"
             data-l10n-id="key-picker-button-cancel"/>
-    <button id="btnApplyChanges" oncommand="gKeyPicker.onApplyChanges();" icon="save"
+    <button id="btnApplyChanges" oncommand="gKeyPicker.onApplyChanges();"
             data-l10n-id="key-picker-button-ok"/>
   </hbox>
 </window>
--- a/mailnews/extensions/newsblog/content/feed-subscriptions.xhtml
+++ b/mailnews/extensions/newsblog/content/feed-subscriptions.xhtml
@@ -255,14 +255,13 @@
                 accesskey="&button.exportOPML.accesskey;"
                 tooltiptext="&button.exportOPML.tooltip;"
                 oncommand="FeedSubscriptions.exportOPML(event);"/>
 
         <spacer flex="1"/>
 
         <button id="close"
                 label="&button.close.label;"
-                icon="close"
                 oncommand="if (FeedSubscriptions.onClose()) window.close();"/>
       </hbox>
     </hbox>
   </vbox>
 </window>