Bug 455880 Move <filefield> to toolkit/content/widgets r=Enn
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Fri, 10 Oct 2008 00:04:06 +0100
changeset 20230 4f1e7711b92f109b3fd1bc9e11e0c40282c89d0d
parent 20229 6251e69516c9280e9e057c106f5cd6178aedecbd
child 20232 d85c83763479773c880bf09e86db6f1f82761416
push idunknown
push userunknown
push dateunknown
reviewersEnn
bugs455880
milestone1.9.1b2pre
Bug 455880 Move <filefield> to toolkit/content/widgets r=Enn
toolkit/content/jar.mn
toolkit/content/widgets/filefield.xml
toolkit/content/xul.css
toolkit/locales/en-US/chrome/mozapps/preferences/preferences.properties
toolkit/locales/jar.mn
toolkit/mozapps/jar.mn
toolkit/mozapps/preferences/preferences.xml
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -39,16 +39,18 @@ toolkit.jar:
 *+ content/global/bindings/browser.xml         (widgets/browser.xml)
 *+ content/global/bindings/button.xml          (widgets/button.xml)
 *+ content/global/bindings/checkbox.xml        (widgets/checkbox.xml)
 *+ content/global/bindings/colorpicker.xml     (widgets/colorpicker.xml)
 *+ content/global/bindings/datetimepicker.xml  (widgets/datetimepicker.xml)
 *+ content/global/bindings/dialog.xml          (widgets/dialog.xml)
 *+ content/global/bindings/editor.xml          (widgets/editor.xml)
 *  content/global/bindings/expander.xml        (widgets/expander.xml)
+*  content/global/bindings/filefield.xml       (widgets/filefield.xml)
+*+ content/global/bindings/findbar.xml         (widgets/findbar.xml)
 *+ content/global/bindings/general.xml         (widgets/general.xml)
 *+ content/global/bindings/groupbox.xml        (widgets/groupbox.xml)
 *+ content/global/bindings/listbox.xml         (widgets/listbox.xml)
 *+ content/global/bindings/menu.xml            (widgets/menu.xml)
 *+ content/global/bindings/menulist.xml        (widgets/menulist.xml)
 *+ content/global/bindings/notification.xml    (widgets/notification.xml)
 *+ content/global/bindings/numberbox.xml       (widgets/numberbox.xml)
 *+ content/global/bindings/popup.xml           (widgets/popup.xml)
@@ -65,15 +67,14 @@ toolkit.jar:
 *+ content/global/bindings/tabbox.xml          (widgets/tabbox.xml)
 *+ content/global/bindings/text.xml            (widgets/text.xml)
 *+ content/global/bindings/textbox.xml         (widgets/textbox.xml)
 *+ content/global/bindings/toolbar.xml         (widgets/toolbar.xml)
 *+ content/global/bindings/toolbarbutton.xml   (widgets/toolbarbutton.xml)
 *+ content/global/bindings/tree.xml            (widgets/tree.xml)
 *+ content/global/bindings/videocontrols.xml   (widgets/videocontrols.xml)
 *+ content/global/bindings/wizard.xml          (widgets/wizard.xml)
-*+ content/global/bindings/findbar.xml         (widgets/findbar.xml)
 #ifdef XP_MACOSX
 *  content/global/macWindowMenu.js             (macWindowMenu.js)
 #endif
 #ifdef MOZ_SVG
    content/global/svg/svgBindings.xml          (/layout/svg/base/src/resources/content/svgBindings.xml)
 #endif
rename from toolkit/mozapps/preferences/preferences.xml
rename to toolkit/content/widgets/filefield.xml
--- a/toolkit/mozapps/preferences/preferences.xml
+++ b/toolkit/content/widgets/filefield.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 
-<bindings id="PreferencesSkinBindings"
+<bindings id="filefieldBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xbl="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <binding id="fileField" extends="chrome://global/content/bindings/general.xml#control-item">
+  <binding id="filefield" extends="chrome://global/content/bindings/general.xml#basetext">
     <content>
-      <xul:stringbundle anonid="bundle" src="chrome://mozapps/locale/preferences/preferences.properties"/>
+      <xul:stringbundle anonid="bundle" src="chrome://global/locale/filefield.properties"/>
       <xul:hbox class="fileFieldContentBox" align="center" flex="1" xbl:inherits="disabled">
         <xul:image class="fileFieldIcon" xbl:inherits="src=image,disabled"/>
         <xul:textbox class="fileFieldLabel" xbl:inherits="value=label,disabled,accesskey,tabindex,aria-labelledby" flex="1" readonly="true"/>
       </xul:hbox>
     </content>
     <implementation implements="nsIDOMXULLabeledControlElement">
       <property name="label" onget="return this.getAttribute('label');">
         <setter>
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -1091,8 +1091,14 @@ timepicker {
   -moz-binding: url('chrome://global/content/bindings/datetimepicker.xml#timepicker');
 }
 
 
 /*********** findbar ************/
 findbar {
   -moz-binding: url('chrome://global/content/bindings/findbar.xml#findbar');
 }
+
+
+/*********** filefield ************/
+filefield {
+  -moz-binding: url("chrome://global/content/bindings/filefield.xml#filefield");
+}
--- a/toolkit/locales/en-US/chrome/mozapps/preferences/preferences.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/preferences/preferences.properties
@@ -1,12 +1,8 @@
-#### Change Action
-
-downloadHelperNoneSelected=None Selected
-
 #### Master Password
 
 password_not_set=(not set)
 failed_pw_change=Unable to change Master Password.
 incorrect_pw=You did not enter the correct current Master Password. Please try again.
 pw_change_ok=Master Password successfully changed.
 pw_erased_ok=You have deleted your Master Password. 
 pw_not_wanted=Warning! You have decided not to use a Master Password.
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -16,16 +16,17 @@
 * locale/@AB_CD@/global/contentAreaCommands.properties  (%chrome/global/contentAreaCommands.properties)
 * locale/@AB_CD@/global/customizeCharset.dtd            (%chrome/global/customizeCharset.dtd)
 + locale/@AB_CD@/global/customizeToolbar.dtd            (%chrome/global/customizeToolbar.dtd)
 + locale/@AB_CD@/global/customizeToolbar.properties     (%chrome/global/customizeToolbar.properties)
 + locale/@AB_CD@/global/datetimepicker.dtd              (%chrome/global/datetimepicker.dtd)
 * locale/@AB_CD@/global/dialogOverlay.dtd               (%chrome/global/dialogOverlay.dtd)
   locale/@AB_CD@/global/downloadProgress.properties     (%chrome/global/downloadProgress.properties)
 + locale/@AB_CD@/global/editMenuOverlay.dtd             (%chrome/global/editMenuOverlay.dtd)
+  locale/@AB_CD@/global/filefield.properties            (%chrome/global/filefield.properties)
   locale/@AB_CD@/global/filepicker.dtd                  (%chrome/global/filepicker.dtd)
   locale/@AB_CD@/global/filepicker.properties           (%chrome/global/filepicker.properties)
   locale/@AB_CD@/global/findbar.dtd                     (%chrome/global/findbar.dtd)
   locale/@AB_CD@/global/findbar.properties              (%chrome/global/findbar.properties)
 + locale/@AB_CD@/global/finddialog.dtd                  (%chrome/global/finddialog.dtd)
 + locale/@AB_CD@/global/finddialog.properties           (%chrome/global/finddialog.properties)
 + locale/@AB_CD@/global/intl.css                        (%chrome/global/intl.css)
 + locale/@AB_CD@/global/intl.properties                 (%chrome/global/intl.properties)
--- a/toolkit/mozapps/jar.mn
+++ b/toolkit/mozapps/jar.mn
@@ -9,18 +9,16 @@ toolkit.jar:
 * content/mozapps/downloads/download.xml                        (downloads/content/download.xml)
 * content/mozapps/preferences/ocsp.js                           (preferences/ocsp.js)
 * content/mozapps/preferences/ocsp.xul                          (preferences/ocsp.xul)
 * content/mozapps/preferences/fontbuilder.js                    (preferences/fontbuilder.js)
 * content/mozapps/preferences/changemp.js                       (preferences/changemp.js)
 * content/mozapps/preferences/changemp.xul                      (preferences/changemp.xul)
 * content/mozapps/preferences/removemp.js                       (preferences/removemp.js)
 * content/mozapps/preferences/removemp.xul                      (preferences/removemp.xul)
-  content/mozapps/preferences/preferences.css                   (preferences/preferences.css)
-* content/mozapps/preferences/preferences.xml                   (preferences/preferences.xml)
   content/mozapps/plugins/pluginInstallerWizard.xul             (plugins/content/pluginInstallerWizard.xul)
   content/mozapps/plugins/pluginInstallerWizard.js              (plugins/content/pluginInstallerWizard.js)
   content/mozapps/plugins/pluginInstallerWizard.css             (plugins/content/pluginInstallerWizard.css)
   content/mozapps/plugins/pluginInstallerDatasource.js          (plugins/content/pluginInstallerDatasource.js)
   content/mozapps/plugins/pluginInstallerService.js             (plugins/content/pluginInstallerService.js)
   content/mozapps/plugins/missingPlugin.xml                     (plugins/content/missingPlugin.xml)
   content/mozapps/plugins/missingPluginBinding.css              (plugins/content/missingPluginBinding.css)
   content/mozapps/handling/handler.css                          (handling/content/handler.css)