From 65c4789907b107ac0b9929a8ece1dea91a02798e Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk" <neil%parkwaycc.co.uk>
Date: Tue, 1 Jan 2008 20:47:53 +0000
Subject: [PATCH] Bug 407931 Switch from buttonstyle to mode r=stefanh,IanN
 sr=jag

---
 suite/browser/navigator.xul                   | 18 +++++++-----
 suite/common/bindings/toolbar.xml             | 18 ++----------
 suite/themes/classic/communicator/brand.css   |  4 +--
 .../classic/communicator/mac/button.css       |  8 ++---
 .../classic/communicator/win/button.css       |  8 ++---
 suite/themes/classic/navigator/navigator.css  |  2 +-
 suite/themes/modern/communicator/brand.css    |  6 ++--
 suite/themes/modern/communicator/button.css   | 12 ++++----
 suite/themes/modern/communicator/toolbar.css  | 15 +++++-----
 .../communicator/toolbar/toolbarBindings.xml  |  4 +--
 suite/themes/modern/global/globalBindings.xml |  4 +--
 .../modern/messenger/primaryToolbar.css       |  3 +-
 suite/themes/modern/navigator/navigator.css   | 29 +++++++------------
 13 files changed, 56 insertions(+), 75 deletions(-)

diff --git a/suite/browser/navigator.xul b/suite/browser/navigator.xul
index e4a0ad113da..4252bb008a4 100644
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -142,8 +142,8 @@
     <toolbar class="toolbar-primary chromeclass-toolbar" id="nav-bar" persist="collapsed" 
              grippytooltiptext="&navigationToolbar.tooltip;"
              fullscreentoolbar="true">
-      <hbox id="nav-bar-buttons">
-        <toolbarbutton id="back-button" type="menu-button" class="toolbarbutton-1"
+        <toolbarbutton id="back-button" type="menu-button"
+                       class="toolbarbutton-1 chromeclass-toolbar-additional"
                        label="&backButton.label;"
                        oncommand="if (event.target==this) BrowserBack(); else gotoHistoryIndex(event);"
                        observes="canGoBack" context="backMenu"
@@ -151,7 +151,8 @@
           <menupopup context="" onpopupshowing="BrowserBackMenu(event);"/>
         </toolbarbutton>
         
-        <toolbarbutton id="forward-button" type="menu-button" class="toolbarbutton-1"
+        <toolbarbutton id="forward-button" type="menu-button"
+                       class="toolbarbutton-1 chromeclass-toolbar-additional"
                        label="&forwardButton.label;"
                        oncommand="if (event.target==this) BrowserForward(); else gotoHistoryIndex(event);"
                        observes="canGoForward" context="forwardMenu"
@@ -159,19 +160,19 @@
           <menupopup context="" onpopupshowing="BrowserForwardMenu(event);"/>
         </toolbarbutton>
         
-        <toolbarbutton id="reload-button" class="toolbarbutton-1"
+        <toolbarbutton id="reload-button"
+                       class="toolbarbutton-1 chromeclass-toolbar-additional"
                        label="&reloadButton.label;"
                        oncommand="if (event.shiftKey) BrowserReloadSkipCache(); else BrowserReload();"  
                        tooltiptext="&reloadButton.tooltip;"/>
                        
-        <toolbarbutton id="stop-button" class="toolbarbutton-1"
+        <toolbarbutton id="stop-button"
+                       class="toolbarbutton-1 chromeclass-toolbar-additional"
                        label="&stopButton.label;"
                        oncommand="BrowserStop();" observes="canStop"  
                        tooltiptext="&stopButton.tooltip;"/>
-      </hbox>
  
       <hbox id="nav-bar-inner" flex="1">
-        <observes element="nav-bar" attribute="buttonstyle"/>
         <!-- Need hidden label on textbox for accessibility, because what 
              receives focus needs a text name -->
         <label control="urlbar" hidden="true" value="&locationBar.title;"/>
@@ -225,7 +226,8 @@
                 tooltiptext="&searchButton.tooltip;"/> 
       </hbox>
 
-      <toolbarbutton id="print-button" type="menu-button" class="toolbarbutton-1"
+      <toolbarbutton id="print-button" type="menu-button"
+                     class="toolbarbutton-1 chromeclass-toolbar-additional"
                      label="&printButton.label;"
                      oncommand="if (event.target==this) PrintUtils.print();"
                      tooltiptext="&printButton.tooltip;">  
diff --git a/suite/common/bindings/toolbar.xml b/suite/common/bindings/toolbar.xml
index 19a15a9f2c1..730e64dc279 100644
--- a/suite/common/bindings/toolbar.xml
+++ b/suite/common/bindings/toolbar.xml
@@ -198,27 +198,13 @@
         <body>
           <![CDATA[
             if (topic == "nsPref:changed" && name == this.domain) {
-              const styles = ["pictures", "text", null];
+              const styles = ["icons", "text", null];
               const style = styles[this.prefs.getIntPref(name)];
-              this.setAttribute("buttonstyle", style);
-              this.update("toolbarbutton", style);
-              this.update("button", style);
+              this.setAttribute("mode", style);
             }
           ]]>
         </body>
       </method>
-
-      <method name="update">
-        <parameter name="tag"/>
-        <parameter name="style"/>
-        <body>
-          <![CDATA[
-            var elements = this.getElementsByTagName(tag);
-            for (var i = 0; i < elements.length; i++)
-              elements[i].setAttribute("buttonstyle", style);
-          ]]>
-        </body>
-      </method>
     </implementation>
   </binding>
 
diff --git a/suite/themes/classic/communicator/brand.css b/suite/themes/classic/communicator/brand.css
index 2790af2ba21..efb53749a78 100644
--- a/suite/themes/classic/communicator/brand.css
+++ b/suite/themes/classic/communicator/brand.css
@@ -61,14 +61,14 @@
 }
   
 window[chromehidden~="toolbar"] #navigator-throbber,
-#navigator-throbber[buttonstyle="text"],
+toolbar[mode="text"] #navigator-throbber,
 #navigator-throbber[toolbarmode="small"] {
   margin: 0 5px;
   list-style-image: url("chrome://communicator/skin/brand/throbber16-single.gif");
 }
 
 window[chromehidden~="toolbar"] #navigator-throbber[busy="true"],
-#navigator-throbber[buttonstyle="text"][busy="true"],
+toolbar[mode="text"] #navigator-throbber[busy="true"],
 #navigator-throbber[toolbarmode="small"][busy="true"] {
   list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.gif");
 }
diff --git a/suite/themes/classic/communicator/mac/button.css b/suite/themes/classic/communicator/mac/button.css
index c69fd3c09b6..426f71f0d2f 100644
--- a/suite/themes/classic/communicator/mac/button.css
+++ b/suite/themes/classic/communicator/mac/button.css
@@ -60,13 +60,13 @@
   -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu-vertical");
 }
 
-.toolbarbutton-1[buttonstyle="pictures"],
-.toolbarbutton-menubutton-button[buttonstyle="pictures"] {
+toolbar[mode="icons"] .toolbarbutton-1,
+toolbar[mode="icons"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   min-width: 0px;
 }
 
-.toolbarbutton-text[buttonstyle="pictures"],
-.toolbarbutton-icon[buttonstyle="text"] {
+toolbar[mode="icons"] .toolbarbutton-1 .toolbarbutton-text,
+toolbar[mode="text"] .toolbarbutton-1 .toolbarbutton-icon {
   display: none;
 }
 
diff --git a/suite/themes/classic/communicator/win/button.css b/suite/themes/classic/communicator/win/button.css
index b3f914d9f88..0545fcd6ed1 100644
--- a/suite/themes/classic/communicator/win/button.css
+++ b/suite/themes/classic/communicator/win/button.css
@@ -77,13 +77,13 @@
   -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu-vertical");
 }
 
-.toolbarbutton-1[buttonstyle="pictures"],
-.toolbarbutton-menubutton-button[buttonstyle="pictures"] {
+toolbar[mode="icons"] .toolbarbutton-1,
+toolbar[mode="icons"] .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   min-width: 0px;
 }
 
-.toolbarbutton-text[buttonstyle="pictures"],
-.toolbarbutton-icon[buttonstyle="text"] {
+toolbar[mode="icons"] .toolbarbutton-1 .toolbarbutton-text,
+toolbar[mode="text"] .toolbarbutton-1 .toolbarbutton-icon {
   display: none;
 }
 
diff --git a/suite/themes/classic/navigator/navigator.css b/suite/themes/classic/navigator/navigator.css
index cd97c7ed41f..9912d23b9ff 100644
--- a/suite/themes/classic/navigator/navigator.css
+++ b/suite/themes/classic/navigator/navigator.css
@@ -158,7 +158,7 @@
   display: none;
 }
 
-.toolbarbutton-text[buttonstyle="text"] {
+toolbar[mode="text"] .toolbarbutton-1 .toolbarbutton-text {
   padding: 4px 0;
 }
 
diff --git a/suite/themes/modern/communicator/brand.css b/suite/themes/modern/communicator/brand.css
index 650646321c7..96c358180aa 100644
--- a/suite/themes/modern/communicator/brand.css
+++ b/suite/themes/modern/communicator/brand.css
@@ -62,19 +62,19 @@
   background: url("chrome://communicator/skin/toolbar/prtb-bg-noline.gif") #B1BDC9 repeat-x top;
 }
 
-#navigator-throbber[buttonstyle="pictures"] {
+toolbar[mode="icons"] #navigator-throbber {
   margin: 4px 8px 2px 8px;
 }
 
 window[chromehidden~="toolbar"] #navigator-throbber,
-#navigator-throbber[buttonstyle="text"],
+toolbar[mode="text"] #navigator-throbber,
 #navigator-throbber[toolbarmode="small"] {
   margin: 2px 4px 2px 6px;
   list-style-image: url("chrome://communicator/skin/brand/throbber16-single.gif");
 }
 
 window[chromehidden~="toolbar"] #navigator-throbber[busy="true"],
-#navigator-throbber[buttonstyle="text"][busy="true"],
+toolbar[mode="text"] #navigator-throbber[busy="true"],
 #navigator-throbber[toolbarmode="small"][busy="true"] {
   list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.gif");
 }
diff --git a/suite/themes/modern/communicator/button.css b/suite/themes/modern/communicator/button.css
index 444ea127b70..343a587b75e 100644
--- a/suite/themes/modern/communicator/button.css
+++ b/suite/themes/modern/communicator/button.css
@@ -82,20 +82,22 @@
   display: none;
 }
 
-.toolbarbutton-1[buttonstyle="text"] {
+toolbar[mode="text"] .toolbarbutton-1 {
   min-width: 46px;
 }
 
-.toolbarbutton-text[buttonstyle="pictures"],
-.toolbarbutton-icon[buttonstyle="text"] {
+toolbar[mode="icons"] .toolbarbutton-1 .toolbarbutton-text,
+toolbar[mode="text"] .toolbarbutton-1 .toolbarbutton-icon {
   display: none;
 }
 
-.toolbarbutton-menubutton-dropmarker[buttonstyle="pictures"] {
+toolbar[mode="icons"] .toolbarbutton-1 > .toolbarbutton-menubutton-stack
+  > .toolbarbutton-menubutton-dropmarker {
   margin: 20px 0px 0px 40px;
 }
 
-.toolbarbutton-menubutton-dropmarker[buttonstyle="text"] {
+toolbar[mode="text"] .toolbarbutton-1 > .toolbarbutton-menubutton-stack
+  > .toolbarbutton-menubutton-dropmarker {
   margin: 8px 0px 0px 40px;
 }
 
diff --git a/suite/themes/modern/communicator/toolbar.css b/suite/themes/modern/communicator/toolbar.css
index 8d0fcd43c18..2df24f453d2 100644
--- a/suite/themes/modern/communicator/toolbar.css
+++ b/suite/themes/modern/communicator/toolbar.css
@@ -56,8 +56,8 @@
   border-left: none;
 }
 
-.toolbar-primary-holder[buttonstyle="pictures"],
-.toolbar-primary-holder[buttonstyle="text"] {
+.toolbar-primary-holder[mode="icons"],
+.toolbar-primary-holder[mode="text"] {
   background-image: url("chrome://communicator/skin/toolbar/prtb-bg-noline.gif");
 }
 
@@ -68,18 +68,17 @@
   background-position: top;
 }
 
-.toolbar-primary-icon[buttonstyle="pictures"],
-.toolbar-primary-icon[buttonstyle="text"] {
+.toolbar-primary-icon[mode="icons"],
+.toolbar-primary-icon[mode="text"] {
   display: none;
 }
 
-.toolbarbutton-1[buttonstyle="text"] > stack > .toolbarbutton-menubutton-dropmarker {
+toolbar[mode="text"] .toolbarbutton-1 > .toolbarbutton-menubutton-stack
+  > .toolbarbutton-menubutton-dropmarker {
   margin: 0px 2px 0px 38px !important;
 }
 
-.toolbarbutton-1[buttonstyle="text"] > stack > .toolbarbutton-menubutton-button 
-  > .toolbarbutton-text,
-.toolbarbutton-1[buttonstyle="text"] > .toolbarbutton-text {
+toolbar[mode="text"] .toolbarbutton-1 .toolbarbutton-text {
   margin: 5px 0px !important;
 }
 
diff --git a/suite/themes/modern/communicator/toolbar/toolbarBindings.xml b/suite/themes/modern/communicator/toolbar/toolbarBindings.xml
index f1f098f5349..2946949a461 100644
--- a/suite/themes/modern/communicator/toolbar/toolbarBindings.xml
+++ b/suite/themes/modern/communicator/toolbar/toolbarBindings.xml
@@ -53,8 +53,8 @@
     <content>
       <xul:toolbargrippy xbl:inherits="last-toolbar"
           tbattr="toolbar-grippy" class="toolbar-primary-grippy"/>
-      <xul:hbox class="toolbar-holder toolbar-primary-holder" flex="1" xbl:inherits="buttonstyle">
-        <xul:image class="toolbar-primary-icon" xbl:inherits="buttonstyle"/>
+      <xul:hbox class="toolbar-holder toolbar-primary-holder" flex="1" xbl:inherits="mode">
+        <xul:image class="toolbar-primary-icon" xbl:inherits="mode"/>
         <xul:hbox class="toolbar-button-box" flex="1">
           <children/>
         </xul:hbox>
diff --git a/suite/themes/modern/global/globalBindings.xml b/suite/themes/modern/global/globalBindings.xml
index 9ed9ed1b6e7..c15f4a9a579 100644
--- a/suite/themes/modern/global/globalBindings.xml
+++ b/suite/themes/modern/global/globalBindings.xml
@@ -16,8 +16,8 @@
         <xul:toolbarbutton class="box-inherit toolbarbutton-menubutton-button"
              anonid="button" allowevents="true"
              xbl:inherits="disabled,image,label,crop,accesskey,command,
-                           buttonover,buttondown,align,dir,pack,orient,toolbarmode,buttonstyle"/>
-        <xul:dropmarker type="menu-button" xbl:inherits="open,disabled,toolbarmode,buttonstyle"
+                           buttonover,buttondown,align,dir,pack,orient,toolbarmode"/>
+        <xul:dropmarker type="menu-button" xbl:inherits="open,disabled,toolbarmode"
                         class="toolbarbutton-menubutton-dropmarker"/>
       </xul:stack>
     </content>
diff --git a/suite/themes/modern/messenger/primaryToolbar.css b/suite/themes/modern/messenger/primaryToolbar.css
index 8f9ad336b6e..59890579fab 100644
--- a/suite/themes/modern/messenger/primaryToolbar.css
+++ b/suite/themes/modern/messenger/primaryToolbar.css
@@ -71,7 +71,8 @@
   -moz-image-region: rect(102px 199px 135px 150px) !important;
 } 
 
-#button-getmsg[buttonstyle="text"] > stack > .toolbarbutton-menubutton-dropmarker {
+toolbar[mode="text"] #button-getmsg > .toolbarbutton-menubutton-stack
+  > .toolbarbutton-menubutton-dropmarker {
   margin: 0px 2px 0px 55px !important;
 }
 
diff --git a/suite/themes/modern/navigator/navigator.css b/suite/themes/modern/navigator/navigator.css
index bfadc24edd7..31396459518 100644
--- a/suite/themes/modern/navigator/navigator.css
+++ b/suite/themes/modern/navigator/navigator.css
@@ -157,20 +157,17 @@ toolbox {
   display: inline !important;
 }
 
-#forward-button[buttonstyle="text"] > stack > .toolbarbutton-menubutton-dropmarker {
+toolbar[mode="text"] #forward-button > .toolbarbutton-menubutton-stack
+  > .toolbarbutton-menubutton-dropmarker {
   margin: 0px 2px 0px 56px !important;
 }
 
-.toolbarbutton-1[buttonstyle="text"] > stack > .toolbarbutton-menubutton-button 
-  > .toolbarbutton-text,
-.toolbarbutton-1[buttonstyle="text"] > .toolbarbutton-text {
+toolbar[mode="text"] .toolbarbutton-1 .toolbarbutton-text {
   display: -moz-box !important;
   margin-top: 10px !important;
 }
 
-.toolbarbutton-1[buttonstyle="text"] > stack > .toolbarbutton-menubutton-button 
-  > .toolbarbutton-icon,
-.toolbarbutton-1[buttonstyle="text"] > .toolbarbutton-icon {
+toolbar[mode="text"] .toolbarbutton-1 .toolbarbutton-icon {
   display: none !important;
 }
 
@@ -279,10 +276,6 @@ toolbox {
   border: none;
 }
 
-#nav-bar[toolbarmode="small"] > #nav-bar-buttons {
-  -moz-box-align: center;
-}
-
 #nav-bar[toolbarmode="small"] > .toolbar-primary-grippy {
   display: none;
 }
@@ -386,10 +379,6 @@ toolbox {
   background-image: url("chrome://communicator/skin/toolbar/prtb-bg-noline.gif");
 }
 
-#nav-bar-buttons {
-  margin: 0px 0px 3px 3px;
-}
-
 /* ::::: navbar-inner - the grooved area around the urlbar ::::: */
 
 #nav-bar-inner {
@@ -405,20 +394,22 @@ toolbox {
   min-width: 0px;
 }
 
-#nav-bar-inner[buttonstyle="text"] {  
+toolbar[mode="text"] #nav-bar-inner {
   margin: 2px 0px 2px 5px;
   border: 0px;
 }
 
-#search-button[buttonstyle="text"] {
+toolbar[mode="text"] #nav-bar-inner > #search-button {
   margin-right: 0px;
 }
 
-#search-button[buttonstyle="text"] > .button-box > .button-icon {
+toolbar[mode="text"] #nav-bar-inner > #search-button > .button-box
+  > .button-icon {
   display: none;
 }
 
-#search-button[buttonstyle="pictures"] > .button-box > .button-text {
+toolbar[mode="icons"] #nav-bar-inner > #search-button > .button-box
+  > .button-text {
   display: none;
 }