fix checkboxes and radios to not use the -with-spacing variant any more as the checkb...

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

diff --git a/LCARStrek/global/globalBindings.xml b/LCARStrek/global/globalBindings.xml
index b8dafc85670a09d3cea6fce7f3f63772844bf2a1..ca5703b542d22418c8b69fc27e77850b9d9f3225 100755 (executable)
--- a/LCARStrek/global/globalBindings.xml
+++ b/LCARStrek/global/globalBindings.xml
@@ -20,49 +20,79 @@
     </content>
   </binding>
 
-  <binding id="radio-with-spacing"
-           extends="chrome://global/skin/globalBindings.xml#radio">
+  <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="statusbar" extends="chrome://global/content/bindings/general.xml#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:box class="statusbar-left"/>
+      <xul:hbox class="statusbar-center" autostretch="never" flex="1">
+        <children/>
       </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:box class="statusbar-right"/>
+    </content>
+  </binding>
+
+  <binding id="toolbar" extends="chrome://global/content/bindings/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="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"/>
+  <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>
-      <children includes="menupopup"/>
     </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="statusbar" extends="chrome://global/content/bindings/general.xml#statusbar">
+  <binding id="toolbar-menubar-autohide" extends="chrome://global/content/bindings/toolbar.xml#toolbar-menubar-autohide">
     <content>
-      <xul:box class="statusbar-left"/>
-      <xul:hbox class="statusbar-center" autostretch="never" flex="1">
-        <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>
-      <xul:box class="statusbar-right"/>
     </content>
   </binding>
 
-  <binding id="toolbar" extends="chrome://global/content/bindings/toolbar.xml#toolbar">
+  <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"/>
@@ -106,6 +136,21 @@
     </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">
@@ -121,7 +166,22 @@
     </content>
   </binding>
 
-  <binding id="grippymenubar" extends="chrome://communicator/content/bindings/toolbar.xml#grippymenubar">
+  <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>
@@ -138,4 +198,4 @@
     </content>
   </binding>
 
-</bindings>
\ No newline at end of file
+</bindings>