improve 2.0a1-updated LCARStrek

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

diff --git a/LCARStrek/global/globalBindings.xml b/LCARStrek/global/globalBindings.xml
index 4fdab86f3f32311339574d9b947ad775c322c497..b248396e22aa84dbc78e2333405c0bb2376d82bf 100755 (executable)
--- a/LCARStrek/global/globalBindings.xml
+++ b/LCARStrek/global/globalBindings.xml
@@ -5,14 +5,15 @@
    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" 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 class="radio-label-box" 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>
@@ -39,6 +40,17 @@
     </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="xul:statusbar">
     <content>
@@ -51,30 +63,55 @@
   </binding>
 
   <binding id="toolbar" extends="chrome://global/content/bindings/toolbar.xml#toolbar">
+    <content>
+      <xul:hbox 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:hbox class="toolbar-endcap"/>
+    </content>
+  </binding>
+
+  <binding id="menubar" extends="chrome://global/content/bindings/toolbar.xml#menubar">
+    <resources>
+      <stylesheet src="chrome://global/skin/toolbar.css"/>
+    </resources>
+
+    <content>
+      <xul:hbox class="menubar-startcap"/>
+      <xul:hbox flex="1" class="toolbar-holder" xbl:inherits="collapsed,last-toolbar" align="center">
+        <children/>
+      </xul:hbox>
+      <xul:hbox class="menubar-endcap"/>
+    </content>
+  </binding>
+
+  <binding id="grippytoolbar" extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar">
     <content>
       <xul:toolbargrippy xbl:inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar,hidden=grippyhidden"
                          tbattr="toolbar-grippy" class="toolbar-grippy"/>
       <xul:hbox flex="1" class="toolbar-holder" align="center"
-               xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
+                xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
         <children/>
       </xul:hbox>
       <xul:hbox class="toolbar-endcap"/>
     </content>
   </binding>
 
-  <binding id="toolbar-primary" extends="chrome://global/content/bindings/toolbar.xml#toolbar-primary">
+  <binding id="grippytoolbar-primary" extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary">
     <content>
       <xul:toolbargrippy xbl:inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar,hidden=grippyhidden"
                          tbattr="toolbar-grippy" class="toolbar-grippy"/>
       <xul:hbox flex="1" class="toolbar-holder" align="center"
-               xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
+                xbl:inherits="collapsed,last-toolbar,orient=tborient,align=tbalign,pack=tbpack">
         <children/>
       </xul:hbox>
       <xul:hbox class="toolbar-endcap"/>
     </content>
   </binding>
 
-  <binding id="menubar" extends="chrome://global/content/bindings/toolbar.xml#menubar">
+  <binding id="grippymenubar" extends="chrome://communicator/content/bindings/toolbar.xml#grippymenubar">
     <resources>
       <stylesheet src="chrome://global/skin/toolbar.css"/>
     </resources>