wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

merge bug 451025 — <preferences> element should work outside of a <prefwindow>

Browse Source
This commit is contained in:
Daniel Brooks 2008-10-09 18:15:57 -05:00
commit e2d8bf93f7
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
toolkit/content/jar.mn
View File

@ -44,6 +44,8 @@ toolkit.jar:
*+ 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)
@ -70,7 +72,6 @@ toolkit.jar:
*+ 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

6
toolkit/mozapps/preferences/preferences.xml → toolkit/content/widgets/filefield.xml
View File

@ -1,13 +1,13 @@
<?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"/>

6
toolkit/content/xul.css
View File

@ -1096,3 +1096,9 @@ timepicker {
findbar {
-moz-binding: url('chrome://global/content/bindings/findbar.xml#findbar');
}
/*********** filefield ************/
filefield {
-moz-binding: url("chrome://global/content/bindings/filefield.xml#filefield");
}

4
toolkit/locales/en-US/chrome/mozapps/preferences/preferences.properties
View File

@ -1,7 +1,3 @@
#### Change Action
downloadHelperNoneSelected=None Selected
#### Master Password
password_not_set=(not set)

1
toolkit/locales/jar.mn
View File

@ -21,6 +21,7 @@
* 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)

2
toolkit/mozapps/jar.mn
View File

@ -14,8 +14,6 @@ toolkit.jar:
* 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)