From 014d6cbcc3c446c271f2d1cb87e00a2615a4ab03 Mon Sep 17 00:00:00 2001
From: "ben%netscape.com"
 <ben%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 28 May 2000 06:06:20 +0000
Subject: [PATCH] create bindings for smaller toolbar menubuttons, for advanced
 print functionality.

git-svn-id: svn://10.0.0.236/trunk@71015 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/themes/classic/global/win/menu.css    |  5 ++++
 mozilla/themes/modern/communicator/button.css |  2 +-
 .../themes/modern/communicator/menubutton.css | 26 ++++++++++++++++++-
 .../communicator/menubuttonBindings.xml       | 12 +++++++++
 .../themes/modern/editor/EditorToolbars.css   | 12 ++++++---
 mozilla/themes/modern/global/menu.css         |  6 +++++
 mozilla/themes/modern/messenger/messenger.css |  9 ++++---
 7 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/mozilla/themes/classic/global/win/menu.css b/mozilla/themes/classic/global/win/menu.css
index 656ebb9a1fa..1e68e312425 100644
--- a/mozilla/themes/classic/global/win/menu.css
+++ b/mozilla/themes/classic/global/win/menu.css
@@ -16,6 +16,11 @@ menuitem[menuactive="true"][disabled="true"]
 	  color                 : graytext;
   }
 
+menuitem[default="true"]
+  {
+    font-weight           : bold;
+  }  
+  
 /* XXX menupopups have to have a color explicitly specified. this is a bug */
 menupopup, popup 
   {
diff --git a/mozilla/themes/modern/communicator/button.css b/mozilla/themes/modern/communicator/button.css
index 29cfe1e8725..019cc135263 100644
--- a/mozilla/themes/modern/communicator/button.css
+++ b/mozilla/themes/modern/communicator/button.css
@@ -154,7 +154,7 @@
   .button-toolbar-2[disabled="true"]:hover:active
     {
       background-image    : url("chrome://global/skin/button28-bg-disabled.gif");
-      margin              : 3px 7px 1px 1px;
+      margin              : 4px 7px 1px 1px;
       border              : none;
     }
     
diff --git a/mozilla/themes/modern/communicator/menubutton.css b/mozilla/themes/modern/communicator/menubutton.css
index 5adc45c9925..831a2c4d999 100644
--- a/mozilla/themes/modern/communicator/menubutton.css
+++ b/mozilla/themes/modern/communicator/menubutton.css
@@ -66,6 +66,17 @@
     list-style-image        : inherit;
   }
 
+.button-toolbar-2.menubutton-dual-button
+  {
+    list-style-image        : inherit;
+    margin                  : 4px 7px 1px 1px;
+  }  
+
+.button-toolbar-2.menubutton-dual-button > .button-internal-box > .button-text-container
+  {
+    padding-top             : 5px;
+  }
+  
 .menubutton-dual-dropmarker
   {
     background              : transparent;
@@ -83,6 +94,19 @@
     margin-left             : 32px;
     margin-bottom           : 1px;
   }
-
   
+.button-toolbar-2 + .menubutton-dual-dropmarker-box  
+  {
+    margin-left             : 28px;
+    margin-bottom           : 1em;
+  }
+  
+/*  
+  
+  	  <xul:box class="button-internal-box" orient="vertical" autostretch="never" flex="1">
+        <xul:image class="button-icon" inherits="src"/>
+        <xul:box orient="vertical" class="button-text-container" autostretch="never" flex="1">
+          <xul:text class="button-text" inherits="value,accesskey,crop"/>
+        </xul:box>
+      </xul:box>
   
\ No newline at end of file
diff --git a/mozilla/themes/modern/communicator/menubuttonBindings.xml b/mozilla/themes/modern/communicator/menubuttonBindings.xml
index d377b7a47e4..a1a7592aa68 100644
--- a/mozilla/themes/modern/communicator/menubuttonBindings.xml
+++ b/mozilla/themes/modern/communicator/menubuttonBindings.xml
@@ -16,5 +16,17 @@
       </xul:stack>
     </content>
   </binding>
+
+  <binding id="menubutton-dual-standard">
+    <content excludes="observes,template,menupopup">
+      <xul:stack>
+        <xul:button class="menubutton-dual-button button-toolbar-2 top" allowevents="true" 
+                    inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value,crop,accesskey,disabled"/>
+        <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="bottom" flex="1">
+          <xul:image class="menubutton-dual-dropmarker" inherits="disabled"/>
+        </xul:box>
+      </xul:stack>
+    </content>
+  </binding>
   
 </bindings>
\ No newline at end of file
diff --git a/mozilla/themes/modern/editor/EditorToolbars.css b/mozilla/themes/modern/editor/EditorToolbars.css
index d7455138395..2c053ac8780 100644
--- a/mozilla/themes/modern/editor/EditorToolbars.css
+++ b/mozilla/themes/modern/editor/EditorToolbars.css
@@ -166,9 +166,15 @@ button.edit-mode[selected="1"]:hover:active {
 #previewButton {
 	list-style-image:url("chrome://editor/skin/images/preview.gif");
 }
-#printButton {
-	list-style-image:url("chrome://editor/skin/images/print.gif");
-}
+
+#printButton 
+  {
+    behavior              : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-dual-standard");
+	  list-style-image      : url("chrome://editor/skin/images/print.gif");
+    margin-top            : 0px;
+    margin-left           : 0px !important;
+  }
+
 #findButton {
 	list-style-image:url("chrome://editor/skin/images/find.gif");
 }
diff --git a/mozilla/themes/modern/global/menu.css b/mozilla/themes/modern/global/menu.css
index 758dee9c54f..cda72afc18b 100644
--- a/mozilla/themes/modern/global/menu.css
+++ b/mozilla/themes/modern/global/menu.css
@@ -15,6 +15,11 @@ menu, menuitem
 	  vertical-align        : middle;
   }
 
+menuitem[default="true"]
+  {
+    font-weight           : bold;
+  }  
+  
 menu[disabled="true"], menuitem[disabled="true"],
 menu[menuactive="true"][disabled="true"],
 menuitem[menuactive="true"][disabled="true"]
@@ -119,6 +124,7 @@ popup > menuitem[menuactive="true"]
 .menu-text 
   {
     padding-left          : 15px;
+    font-weight           : inherit;
   }
 
 .menu-accel 
diff --git a/mozilla/themes/modern/messenger/messenger.css b/mozilla/themes/modern/messenger/messenger.css
index 4724a4567f7..bc3f96f6445 100644
--- a/mozilla/themes/modern/messenger/messenger.css
+++ b/mozilla/themes/modern/messenger/messenger.css
@@ -98,9 +98,12 @@ iframe {
 	list-style-image:url("chrome://messenger/skin/trash.gif");
 }
 
-#button-print {
-	list-style-image:url("chrome://global/skin/print.gif");
-}
+#button-print 
+  {
+    behavior              : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-dual-standard");
+	  list-style-image      : url("chrome://global/skin/print.gif");
+    margin                : 0px;
+  }
 
 #button-stop {
 	list-style-image:url("chrome://global/skin/stop.gif");