From bf31725f9718c75ecbf921babd103ec0c38cbcba Mon Sep 17 00:00:00 2001
From: "chanial%noos.fr" <chanial%noos.fr@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 14 Dec 2003 08:43:04 +0000
Subject: [PATCH] Enhancements to the dialog widget: - on linux, adopt the
 gnome convention (same as MacOSX): the accept button is rightwards the cancel
 button, and the help button is on the left side. - ability to give specific
 labels and accesskeys to the implicit buttons, by adding buttonlabelxxx and
 buttonaccesskeyxxx, xxx being accept, cancel, disclosure, extra1, extra2 and
 help - extra2 button moved on the left bottom part of the dialog.

git-svn-id: svn://10.0.0.236/trunk@150288 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/toolkit/content/widgets/dialog.xml | 41 +++++++++++++---------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/mozilla/toolkit/content/widgets/dialog.xml b/mozilla/toolkit/content/widgets/dialog.xml
index 7ed82985057..31e8ae764ea 100644
--- a/mozilla/toolkit/content/widgets/dialog.xml
+++ b/mozilla/toolkit/content/widgets/dialog.xml
@@ -18,21 +18,20 @@
       </xul:vbox>
           
       <xul:hbox class="dialog-button-box" anonid="buttons"
-                xbl:inherits="pack=buttonpack,align=buttonalign,dir=buttondir,orient=buttonorient"
-#ifdef XP_MACOSX
-                >
+                xbl:inherits="pack=buttonpack,align=buttonalign,dir=buttondir,orient=buttonorient">
+#ifdef XP_UNIX
         <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
         <xul:button dlgtype="help" class="dialog-button" hidden="true"/>
-        <xul:button dlgtype="extra2" class="dialog-button" hidden="true" label=""/>
-        <xul:button dlgtype="extra1" class="dialog-button" hidden="true" label=""/>
+        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
+        <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
         <xul:spacer flex="1"/>
         <xul:button dlgtype="cancel" class="dialog-button"/>
         <xul:button dlgtype="accept" class="dialog-button"/>
 #else
-                pack="end">
+        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
+        <xul:spacer flex="1"/>
         <xul:button dlgtype="accept" class="dialog-button"/>
-        <xul:button dlgtype="extra1" class="dialog-button" hidden="true" label=""/>
-        <xul:button dlgtype="extra2" class="dialog-button" hidden="true" label=""/>
+        <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
         <xul:button dlgtype="cancel" class="dialog-button"/>
         <xul:button dlgtype="help" class="dialog-button" hidden="true"/>
         <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
@@ -203,24 +202,34 @@
           // add the label and oncommand handler to each button
           for (dlgtype in buttons) {
             var button = buttons[dlgtype];
-            buttons[dlgtype].addEventListener("command", this._handleButtonCommand, true);
+            button.addEventListener("command", this._handleButtonCommand, true);
+            
+
             // don't override custom labels with pre-defined labels on explicit buttons
             if (!button.hasAttribute("label")) {
-              button.setAttribute("label", this.mStrBundle.GetStringFromName("button-"+dlgtype));
-              var accessKey = this.mStrBundle.GetStringFromName("accesskey-"+dlgtype);
-              if (accessKey)
-                button.setAttribute("accesskey", accessKey);
+              // first look at the dialog attributes
+              if (this.hasAttribute("buttonlabel"+dlgtype))
+                button.setAttribute("label", this.getAttribute("buttonlabel"+dlgtype))
+              if (this.hasAttribute("buttonaccesskey"+dlgtype))
+                button.setAttribute("accesskey", this.getAttribute("buttonaccesskey"+dlgtype))
+
+              if (dlgtype != "extra1" && dlgtype != "extra2") {
+                // then at the localized dialog.properties file
+                button.setAttribute("label", this.mStrBundle.GetStringFromName("button-"+dlgtype));
+                var accessKey = this.mStrBundle.GetStringFromName("accesskey-"+dlgtype);
+                if (accessKey)
+                  button.setAttribute("accesskey", accessKey);
+              }
             }
           }
-          
+
           // ensure that hitting enter triggers ondialogaccept
           buttons["accept"].setAttribute("default", "true");
           
           // if there is a special button configuration, use it
           if (aButtons) {
-            // expect a comma delimitd list of dlgtype values
+            // expect a comma delimited list of dlgtype values
             var list = aButtons.split(",");
-  
             // mark shown dlgtypes as true
             var shown = { accept: false, cancel: false, help: false,
                           disclosure: false, extra1: false, extra2: false };