fix a SeaMonkey bug where toolbars wouldn't appear correctly in view menu or menubar...

[themes.git] / LCARStrek / global / globalBindings.xml

diff --git a/LCARStrek/global/globalBindings.xml b/LCARStrek/global/globalBindings.xml
index 95568c4d9aee5b7a4b4233baa9f2edbfc7f38f42..03c29f24b32815cc53709bbc95e705c83f32c54e 100755 (executable)
--- a/LCARStrek/global/globalBindings.xml
+++ b/LCARStrek/global/globalBindings.xml
@@ -2,24 +2,66 @@
 
 <bindings id="globalBindings"
    xmlns="http://www.mozilla.org/xbl"
-   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+   xmlns:xbl="http://www.mozilla.org/xbl">
 
-  <binding id="radio" extends="chrome://global/content/bindings/radio.xml#radio">
+  <binding id="radio"
+           extends="chrome://global/content/bindings/radio.xml#radio">
     <content>
-      <xul:hbox class="radio-check-box1" inherits="selected,checked,disabled">
+      <xul:hbox class="radio-check-box1" xbl:inherits="selected,checked,disabled">
         <xul:hbox class="radio-check-box2" flex="1">
-          <xul:image class="radio-check" inherits="selected,checked,disabled"/>
+          <xul:image class="radio-check" xbl:inherits="selected,checked,disabled"/>
         </xul:hbox>
       </xul:hbox>
-      <xul:hbox class="radio-label-box" flex="1">
-        <xul:image class="radio-icon" inherits="src"/>
-        <xul:label class="radio-label" inherits="xbl:text=label,accesskey,crop" flex="1"/>
+      <xul:hbox class="radio-label-box" align="center" flex="1">
+        <xul:image class="radio-icon" xbl:inherits="src"/>
+        <xul:label class="radio-label" xbl:inherits="xbl:text=label,accesskey,crop" flex="1"/>
       </xul:hbox>
     </content>
   </binding>
 
+  <binding id="radio-with-spacing"
+           extends="chrome://global/skin/globalBindings.xml#radio">
 
-  <binding id="statusbar" extends="xul:statusbar">
+    <content>
+      <xul:hbox class="radio-spacer-box">
+        <xul:hbox class="radio-check-box1" xbl:inherits="selected,checked,disabled">
+          <xul:hbox class="radio-check-box2" flex="1">
+            <xul:image class="radio-check" xbl:inherits="selected,checked,disabled"/>
+          </xul:hbox>
+        </xul:hbox>
+      </xul:hbox>
+      <xul:hbox class="radio-label-center-box" flex="1">
+        <xul:hbox class="radio-label-box" flex="1">
+          <xul:image class="radio-icon" xbl:inherits="src"/>
+          <xul:label class="radio-label" xbl:inherits="xbl:text=label,accesskey,crop" flex="1"/>
+        </xul:hbox>
+      </xul:hbox>
+    </content>
+  </binding>
+
+  <binding id="toolbarpaletteitem-spacer"
+           extends="chrome://global/content/bindings/toolbar.xml#toolbarpaletteitem">
+    <content>
+      <xul:spacer class="spacer-left"/>
+      <children/>
+      <xul:spacer class="spacer-right"/>
+    </content>
+  </binding>
+
+  <binding id="menulist-compact" display="xul:menu"
+           extends="chrome://global/content/bindings/menulist.xml#menulist">
+    <content sizetopopup="false">
+      <xul:hbox class="menulist-label-box" flex="1">
+        <xul:image class="menulist-icon" xbl:inherits="src"/>
+        <xul:label class="menulist-label" xbl:inherits="value=label,crop,accesskey" crop="right" flex="1"/>
+      </xul:hbox>
+      <children includes="menupopup"/>
+    </content>
+  </binding>
+
+
+  <binding id="statusbar" extends="chrome://global/content/bindings/general.xml#statusbar">
     <content>
       <xul:box class="statusbar-left"/>
       <xul:hbox class="statusbar-center" autostretch="never" flex="1">
@@ -31,14 +73,66 @@
 
   <binding id="toolbar" extends="chrome://global/content/bindings/toolbar.xml#toolbar">
     <content>
-      <xul:toolbargrippy inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar,hidden=grippyhidden"
-                         tbattr="toolbar-grippy"
-                         class="toolbar-grippy"/>
-      <xul:hbox flex="1" class="toolbar-holder" align="center"
-               inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
-        <children/>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:vbox class="toolbar-startcap"/>
+        <xul:hbox flex="1" class="toolbar-holder" align="center"
+                  xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="toolbar-endcap"/>
+      </xul:hbox>
+    </content>
+  </binding>
+
+  <binding id="toolbar-browsercustom" extends="chrome://browser/content/customizableui/toolbar.xml#toolbar">
+    <content>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:vbox class="toolbar-startcap"/>
+        <xul:hbox flex="1" class="toolbar-holder" align="center"
+                  xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="toolbar-endcap"/>
+      </xul:hbox>
+    </content>
+  </binding>
+
+  <binding id="toolbar-drag-browsercustom" extends="chrome://browser/content/customizableui/toolbar.xml#toolbar-drag">
+    <content>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:vbox class="toolbar-startcap"/>
+        <xul:hbox flex="1" class="toolbar-holder" align="center"
+                  xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="toolbar-endcap"/>
+      </xul:hbox>
+    </content>
+  </binding>
+
+  <binding id="toolbar-menubar-autohide" extends="chrome://global/content/bindings/toolbar.xml#toolbar-menubar-autohide">
+    <content>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:vbox class="toolbar-startcap"/>
+        <xul:hbox flex="1" class="toolbar-holder" align="center"
+                  xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="toolbar-endcap"/>
+      </xul:hbox>
+    </content>
+  </binding>
+
+  <binding id="toolbar-menubar-autohide-browsercustom" extends="chrome://browser/content/customizableui/toolbar.xml#toolbar-menubar-autohide">
+    <content>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:vbox class="toolbar-startcap"/>
+        <xul:hbox flex="1" class="toolbar-holder" align="center"
+                  xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="toolbar-endcap"/>
       </xul:hbox>
-      <xul:hbox class="toolbar-endcap"/>
     </content>
   </binding>
 
@@ -48,13 +142,91 @@
     </resources>
 
     <content>
-      <xul:toolbargrippy inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar,hidden=grippyhidden"
-                         tbattr="toolbar-grippy" class="toolbar-grippy"/>
-      <xul:hbox flex="1" class="toolbar-holder" inherits="collapsed,last-toolbar" align="center">
-        <children/>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:vbox class="menubar-startcap"/>
+        <xul:hbox flex="1" class="toolbar-holder" xbl:inherits="collapsed,last-toolbar" align="center">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="menubar-endcap"/>
+      </xul:hbox>
+    </content>
+  </binding>
+
+  <binding id="grippytoolbar" extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar">
+    <content>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:toolbargrippy xbl:inherits="last-toolbar,hidden=grippyhidden"
+                           tbattr="toolbar-grippy"
+                           class="toolbar-grippy"/>
+        <xul:hbox flex="1" class="toolbar-holder"
+                  xbl:inherits="collapsed,last-toolbar,orient,align,pack">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="toolbar-endcap"/>
+      </xul:hbox>
+    </content>
+  </binding>
+
+  <binding id="grippytoolbar-drag" extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-drag">
+    <content>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:toolbargrippy xbl:inherits="last-toolbar,hidden=grippyhidden"
+                           tbattr="toolbar-grippy"
+                           class="toolbar-grippy"/>
+        <xul:hbox flex="1" class="toolbar-holder"
+                  xbl:inherits="collapsed,last-toolbar,orient,align,pack">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="toolbar-endcap"/>
+      </xul:hbox>
+    </content>
+  </binding>
+
+  <binding id="grippytoolbar-primary" extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary">
+    <content>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:toolbargrippy xbl:inherits="last-toolbar,hidden=grippyhidden"
+                           tbattr="toolbar-grippy"
+                           class="toolbar-grippy"/>
+        <xul:hbox flex="1" class="toolbar-holder"
+                  xbl:inherits="collapsed,last-toolbar,orient,align,pack">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="toolbar-endcap"/>
+      </xul:hbox>
+    </content>
+  </binding>
+
+  <binding id="grippytoolbar-primary-drag" extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary-drag">
+    <content>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:toolbargrippy xbl:inherits="last-toolbar,hidden=grippyhidden"
+                           tbattr="toolbar-grippy"
+                           class="toolbar-grippy"/>
+        <xul:hbox flex="1" class="toolbar-holder"
+                  xbl:inherits="collapsed,last-toolbar,orient,align,pack">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="toolbar-endcap"/>
+      </xul:hbox>
+    </content>
+  </binding>
+
+  <binding id="grippytoolbar-menubar" extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-menubar">
+    <resources>
+      <stylesheet src="chrome://global/skin/toolbar.css"/>
+    </resources>
+
+    <content>
+      <xul:hbox flex="1" class="toolbar-box">
+        <xul:toolbargrippy xbl:inherits="last-toolbar,hidden=grippyhidden"
+                           tbattr="toolbar-grippy" class="toolbar-grippy"/>
+        <xul:hbox flex="1" class="toolbar-holder" xbl:inherits="collapsed,last-toolbar">
+          <children/>
+        </xul:hbox>
+        <xul:vbox class="menubar-endcap"/>
       </xul:hbox>
-      <xul:hbox class="menubar-endcap"/>
     </content>
   </binding>
 
-</bindings>
+</bindings>
\ No newline at end of file