Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing 70746: major xul syntax changes. If you use xul, this WILL affect you! Read n.p.m.xpfe for details on the changes and how you can fix your code. r=hewitt sr=hyatt, ben

Browse Source
This commit is contained in:
blakeross%telocity.com 2006-05-17 02:28:51 +00:00
parent 7af70dd6fe
commit 476f40a9ff
34 changed files with 590 additions and 588 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
suite/common/pref/permissionsPrefsOverlay.xul
View File

@ -31,7 +31,7 @@
<treerow>
<treecell class="treecell-indent"
url="chrome://cookie/content/pref-cookies.xul"
value="&cookies.label;"
label="&cookies.label;"
id="cookiesCell"/>
</treerow>
</treeitem>
@ -39,7 +39,7 @@
<treerow>
<treecell class="treecell-indent"
url="chrome://cookie/content/pref-images.xul"
value="&images.label;"/>
label="&images.label;"/>
</treerow>
</treeitem>
</treechildren>

8
suite/common/pref/pref-advanced.xul
View File

@ -56,12 +56,12 @@
<box class="box-smallheader" title="&lHeader;"/>
<titledbox orient="vertical" id="advancedSettings">
<title value="&advancedTitle.label;"/>
<label value="&advancedTitle.label;"/>
<vbox autostretch="never" id="contentEnablingBox">
<checkbox id="advancedJavaAllow" value="&enbJavaCheck.label;" accesskey="&enbJavaCheck.accesskey;"
<checkbox id="advancedJavaAllow" label="&enbJavaCheck.label;" accesskey="&enbJavaCheck.accesskey;"
pref="true" preftype="bool" prefstring="security.enable_java"
prefattribute="checked"/>
<checkbox id="javascriptEnabled" value="&enbJsCheck.label;" accesskey="&enbJsCheck.accesskey;"
<checkbox id="javascriptEnabled" label="&enbJsCheck.label;" accesskey="&enbJsCheck.accesskey;"
pref="true" preftype="bool" prefstring="javascript.enabled"
prefattribute="checked"/>
</vbox>
@ -71,7 +71,7 @@
<separator/>
</vbox>
<vbox autostretch="never">
<checkbox id="advancedMailFTP" value="&sendAddFtpCheck.label;" accesskey="&sendAddFtpCheck.accesskey;"
<checkbox id="advancedMailFTP" label="&sendAddFtpCheck.label;" accesskey="&sendAddFtpCheck.accesskey;"
pref="true" preftype="bool" prefstring="advanced.mailftp"
prefattribute="checked" oncommand="ftpCheck();"/>
</vbox>

16
suite/common/pref/pref-appearance.xul
View File

@ -49,11 +49,11 @@
<box class="box-smallheader" title="&lHeader;"/>
<titledbox id="generalStartupPreferences" orient="vertical" autostretch="never">
<title><text value="&onStartLegend.label;"/></title>
<label value="&onStartLegend.label;"/>
<!-- XXX remove when navigator overlays.rdf works -->
<checkbox id="generalStartupBrowser" wsm_persist="true"
value="&navCheck.label;" accesskey="&navCheck.accesskey;"
label="&navCheck.label;" accesskey="&navCheck.accesskey;"
pref="true" preftype="bool" prefstring="general.startup.browser"
prefattribute="checked"/>
<!-- XXX -->
@ -62,17 +62,17 @@
<!-- displaying none for beta -->
<titledbox id="toolbarStyleBox" orient="vertical" style="display: none;">
<title><text value="&showToolsLegend.label;"/></title>
<label value="&showToolsLegend.label;"/>
<radiogroup id="toolbarStyle" orient="vertical" autostretch="never"
pref="true" preftype="int" prefstring="browser.chrome.toolbar_style"
prefattribute="data" wsm_persist="true">
<radio group="toolbarStyle" data="2" value="&picsNtextRadio.label;" accesskey="&picsNtextRadio.accesskey;"/>
<radio group="toolbarStyle" data="0" value="&picsOnlyRadio.label;" accesskey="&picsOnlyRadio.accesskey;"/>
<radio group="toolbarStyle" data="1" value="&textonlyRadio.label;" accesskey="&textonlyRadio.accesskey;"/>
prefattribute="value" wsm_persist="true">
<radio group="toolbarStyle" value="2" label="&picsNtextRadio.label;" accesskey="&picsNtextRadio.accesskey;"/>
<radio group="toolbarStyle" value="0" label="&picsOnlyRadio.label;" accesskey="&picsOnlyRadio.accesskey;"/>
<radio group="toolbarStyle" value="1" label="&textonlyRadio.label;" accesskey="&textonlyRadio.accesskey;"/>
</radiogroup>
</titledbox>
<box autostretch="never">
<checkbox id="showHideTooltips" value="&showHideTooltips.label;"
<checkbox id="showHideTooltips" label="&showHideTooltips.label;"
accesskey="&showHideTooltips.accesskey;" pref="true"
preftype="bool" prefstring="browser.chrome.toolbar_tips"
prefattribute="checked"/>

26
suite/common/pref/pref-applications-edit.xul
View File

@ -85,7 +85,7 @@
else
data = 2;
gHandlerGroup.selectedItem = gHandlerGroup.getElementsByAttribute("data", data)[0];
gHandlerGroup.selectedItem = gHandlerGroup.getElementsByAttribute("value", data)[0];
doEnabling();
var appPath = handlerInfo.appPath;
@ -101,7 +101,7 @@
function doEnabling()
{
if (gHandlerGroup.data != "2")
if (gHandlerGroup.value != "2")
gAskBeforeOpen.setAttribute("disabled", "true");
else
gAskBeforeOpen.removeAttribute("disabled");
@ -131,8 +131,8 @@
function selectAppRadio()
{
if (gHandlerGroup.data != "2")
gHandlerGroup.selectedItem = gHandlerGroup.getElementsByAttribute("data", "2")[0];
if (gHandlerGroup.value != "2")
gHandlerGroup.selectedItem = gHandlerGroup.getElementsByAttribute("value", "2")[0];
doEnabling();
}
@ -188,12 +188,12 @@
}
// other info we need to set (not reflected in UI)
if (gHandlerGroup.data == "2") {
if (gHandlerGroup.value == "2") {
handlerInfo.appPath = gAppPath.value;
handlerInfo.setHandlerProcedure("saveToDisk", "false");
handlerInfo.setHandlerProcedure("handleInternal", "false");
}
else if (gHandlerGroup.data == "1")
else if (gHandlerGroup.value == "1")
handlerInfo.saveToDisk = true;
else
handlerInfo.handleInternal = true;
@ -264,25 +264,25 @@
</grid>
<box autostretch="never">
<checkbox id="outgoingDefault" value="&outgoingDefault.label;" accesskey="&outgoingDefault.accesskey;" disabled="true"/>
<checkbox id="outgoingDefault" label="&outgoingDefault.label;" accesskey="&outgoingDefault.accesskey;" disabled="true"/>
</box>
<separator class="thin"/>
<titledbox orient="vertical">
<title><text value="&handledby.label;"/></title>
<label value="&handledby.label;"/>
<radiogroup id="handler" orient="vertical">
<box orient="vertical" autostretch="never">
<radio data="0" value="&navigator.label;" accesskey="&navigator.accesskey;" oncommand="doEnabling();"/>
<radio data="1" value="&saveToDisk.label;" accesskey="&saveToDisk.accesskey;" oncommand="doEnabling();"/>
<radio value="0" label="&navigator.label;" accesskey="&navigator.accesskey;" oncommand="doEnabling();"/>
<radio value="1" label="&saveToDisk.label;" accesskey="&saveToDisk.accesskey;" oncommand="doEnabling();"/>
</box>
<box autostretch="never">
<radio data="2" value="&application.label;" accesskey="&application.accesskey;" oncommand="doEnabling();"/>
<radio value="2" label="&application.label;" accesskey="&application.accesskey;" oncommand="doEnabling();"/>
<textbox id="appPath" flex="1" onchange="selectAppRadio();"/>
</box>
<box autostretch="never" halign="right">
<button value="&browse.label;" accesskey="&browse.accesskey;"
<button label="&browse.label;" accesskey="&browse.accesskey;"
oncommand="chooseApp();"/>
</box>
</radiogroup>
@ -290,7 +290,7 @@
</titledbox>
<box autostretch="never">
<checkbox id="askBeforeOpen" value="&askBeforeOpen.label;" accesskey="&askBeforeOpen.accesskey;"/>
<checkbox id="askBeforeOpen" label="&askBeforeOpen.label;" accesskey="&askBeforeOpen.accesskey;"/>
</box>
<separator/>

12
suite/common/pref/pref-applications.xul
View File

@ -44,7 +44,7 @@
<box class="box-smallheader" title="&lHeader;"/>
<titledbox>
<title><text value="&descript;"/></title>
<label value="&descript;"/>
<box orient="vertical" flex="1">
<text class="label" value="&fileTypes.label;"/>
@ -73,7 +73,7 @@
<treechildren flex="1">
<treeitem uri="?type">
<treerow>
<treecell value="?value"/>
<treecell label="?value"/>
</treerow>
</treeitem>
</treechildren>
@ -85,19 +85,19 @@
<box orient="vertical">
<button id="newTypeButton"
value="&newTypeButton.label;" accesskey="&newTypeButton.accesskey;"
label="&newTypeButton.label;" accesskey="&newTypeButton.accesskey;"
oncommand="newType();"/>
<button id="editButton"
value="&editButton.label;" accesskey="&editButton.accesskey;"
label="&editButton.label;" accesskey="&editButton.accesskey;"
oncommand="editType();"/>
<button id="removeButton"
value="&removeButton.label;" accesskey="&removeButton.accesskey;"
label="&removeButton.label;" accesskey="&removeButton.accesskey;"
oncommand="removeType();"/>
</box>
</titledbox>
<titledbox orient="vertical">
<title><text value="&file;"/></title>
<label value="&file;"/>
<grid flex="1">
<columns>
<column/>

14
suite/common/pref/pref-cache.xul
View File

@ -46,7 +46,7 @@
<box class="box-smallheader" title="&lHeader;"/>
<titledbox orient="vertical">
<title><text value="&cacheTitle.label;"/></title>
<label value="&cacheTitle.label;"/>
<html>&cachePara;</html>
@ -67,7 +67,7 @@
prefstring="browser.cache.memory_cache_size" prefattribute="value"/>
<text class="label" value="&kbyes;"/>
</box>
<button class="dialog" value="&clearMemCache.label;" accesskey="&clearMemCache.accesskey;"
<button class="dialog" label="&clearMemCache.label;" accesskey="&clearMemCache.accesskey;"
oncommand="prefClearMemCache();"/>
</row>
<row>
@ -77,7 +77,7 @@
prefstring="browser.cache.disk_cache_size" prefattribute="value"/>
<text class="label" value="&kbyes;"/>
</box>
<button class="dialog" value="&clearDiskCache.label;" accesskey="&clearDiskCache.accesskey;"
<button class="dialog" label="&clearDiskCache.label;" accesskey="&clearDiskCache.accesskey;"
oncommand="prefClearDiskCache();"/>
</row>
</rows>
@ -89,10 +89,10 @@
<box orient="vertical" autostretch="never" class="indent">
<radiogroup id="browserCacheCheckDocFrequency" orient="vertical" autostretch="never"
pref="true" preftype="int" prefstring="browser.cache.check_doc_frequency"
prefattribute="data">
<radio group="browserCacheCheckDocFrequency" data="0" value="&oncePsessionRadio.label;" accesskey="&oncePsessionRadio.accesskey;"/>
<radio group="browserCacheCheckDocFrequency" data="1" value="&everyTimeRadio.label;" accesskey="&everyTimeRadio.accesskey;"/>
<radio group="browserCacheCheckDocFrequency" data="2" value="&neverRadio.label;" accesskey="&neverRadio.accesskey;"/>
prefattribute="value">
<radio group="browserCacheCheckDocFrequency" value="0" label="&oncePsessionRadio.label;" accesskey="&oncePsessionRadio.accesskey;"/>
<radio group="browserCacheCheckDocFrequency" value="1" label="&everyTimeRadio.label;" accesskey="&everyTimeRadio.accesskey;"/>
<radio group="browserCacheCheckDocFrequency" value="2" label="&neverRadio.label;" accesskey="&neverRadio.accesskey;"/>
</radiogroup>
</box>

4
suite/common/pref/pref-charset.js
View File

@ -250,7 +250,7 @@ function AddAvailableCharset()
var selRow = selItem.firstChild;
var selCell = selRow.firstChild;
var charsetname = selCell.getAttribute('value');
var charsetname = selCell.getAttribute('label');
var charsetid = selCell.getAttribute('id');
var already_active = false;
@ -404,7 +404,7 @@ function AddTreeItem(doc, treeRoot, ID, UIstring)
var cell = doc.createElement('treecell');
// Copy over the attributes
cell.setAttribute('value', UIstring);
cell.setAttribute('label', UIstring);
cell.setAttribute('id', ID);
// Add it to the tree

4
suite/common/pref/pref-charset.xul
View File

@ -61,7 +61,7 @@
<separator class="thin"/>
<box autostretch="never">
<button id="add_button" oncommand="AddAvailableCharset();" class="dialog"
value="&charset.customize.add.label;" disabled="true"/>
label="&charset.customize.add.label;" disabled="true"/>
</box>
</box>
<separator orient="vertical"/>
@ -81,7 +81,7 @@
<box autostretch="never">
<button id="remove_button" oncommand="RemoveActiveCharset();"
class="dialog" disabled="true"
value="&charset.customize.remove.label;"/>
label="&charset.customize.remove.label;"/>
</box>
</box>
<box orient="vertical">

14
suite/common/pref/pref-colors.xul
View File

@ -47,7 +47,7 @@
<box>
<titledbox orient="vertical" flex="1" id="pageColours">
<title><text value="&color;"/></title>
<label value="&color;"/>
<box>
<text class="label" value="&textColor.label;" accesskey="&textColor.accesskey;" for="foregroundtextmenu"/>
<spring flex="1"/>
@ -62,13 +62,13 @@
</box>
<separator class="thin"/>
<box autostretch="never">
<checkbox id="browserUseSystemColors" value="&useSystemColors.label;" accesskey="&useSystemColors.accesskey;"
<checkbox id="browserUseSystemColors" label="&useSystemColors.label;" accesskey="&useSystemColors.accesskey;"
pref="true" preftype="bool" prefstring="browser.display.use_system_colors" prefattribute="checked"/>
</box>
</titledbox>
<titledbox orient="vertical" flex="1">
<title><text value="&links;"/></title>
<label value="&links;"/>
<box>
<text class="label" value="&linkColor.label;" accesskey="&linkColor.accesskey;" for="unvisitedlinkmenu"/>
<spring flex="1"/>
@ -83,7 +83,7 @@
</box>
<separator class="thin"/>
<box autostretch="never">
<checkbox id="browserUnderlineAnchors" value="&underlineLinks.label;" accesskey="&underlineLinks.accesskey;"
<checkbox id="browserUnderlineAnchors" label="&underlineLinks.label;" accesskey="&underlineLinks.accesskey;"
pref="true" preftype="bool" prefstring="browser.underline_anchors" prefattribute="checked"/>
</box>
</titledbox>
@ -94,9 +94,9 @@
<radiogroup id="browserUseDocumentColors" orient="vertical" autostretch="never"
pref="true" preftype="bool" prefstring="browser.display.use_document_colors"
prefattribute="data">
<radio group="browserUseDocumentColors" data="true" value="&alwaysUseDocumentColors.label;" accesskey="&alwaysUseDocumentColors.accesskey;"/>
<radio group="browserUseDocumentColors" data="false" value="&useMyColors.label;" accesskey="&useMyColors.label;"/>
prefattribute="value">
<radio group="browserUseDocumentColors" value="true" label="&alwaysUseDocumentColors.label;" accesskey="&alwaysUseDocumentColors.accesskey;"/>
<radio group="browserUseDocumentColors" value="false" label="&useMyColors.label;" accesskey="&useMyColors.label;"/>
</radiogroup>
</titledbox>

18
suite/common/pref/pref-cookies.xul
View File

@ -46,7 +46,7 @@
{
parent.initPanel('chrome://communicator/content/pref/pref-cookies.xul');
var enabled = document.getElementById("networkCookieBehaviour").data != "2";
var enabled = document.getElementById("networkCookieBehaviour").value != "2";
setWarnAboutCookiesEnabled(enabled);
}
@ -72,26 +72,26 @@
<box class="box-smallheader" id="cookieHeader" title="&lHeader;"/>
<titledbox orient="vertical">
<title><text value="&cookiePolicy.label;"/></title>
<label value="&cookiePolicy.label;"/>
<html>&cookieDetails;</html>
<radiogroup id="networkCookieBehaviour" orient="vertical" autostretch="never"
pref="true" preftype="int" prefstring="network.cookie.cookieBehavior"
prefattribute="data">
prefattribute="value">
<radio group="networkCookieBehaviour" data="2" value="&disableCookies.label;"
<radio group="networkCookieBehaviour" value="2" label="&disableCookies.label;"
accesskey="&disableCookies.accesskey;" oncommand="setWarnAboutCookiesEnabled(false);"/>
<radio group="networkCookieBehaviour" data="0" value="&accAllCookiesRadio.label;"
<radio group="networkCookieBehaviour" value="0" label="&accAllCookiesRadio.label;"
accesskey="&accAllCookiesRadio.accesskey;" oncommand="setWarnAboutCookiesEnabled(true);"/>
<radio group="networkCookieBehaviour" data="1" value="&accOrgCookiesRadio.label;"
<radio group="networkCookieBehaviour" value="1" label="&accOrgCookiesRadio.label;"
accesskey="&accOrgCookiesRadio.accesskey;" oncommand="setWarnAboutCookiesEnabled(true);"/>
</radiogroup>
<separator/>
<box autostretch="never">
<checkbox id="networkWarnAboutCookies" value="&warnAboutCookies.label;" accesskey="&warnAboutCookies.accesskey;"
<checkbox id="networkWarnAboutCookies" label="&warnAboutCookies.label;" accesskey="&warnAboutCookies.accesskey;"
pref="true" preftype="bool" prefstring="network.cookie.warnAboutCookies"
prefattribute="checked"/>
</box>
@ -99,8 +99,8 @@
<separator/>
<box autostretch="never" halign="right">
<button class="dialog" value="&viewCookies.label;" accesskey="&viewCookies.accesskey;" oncommand="viewCookies();"/>
<button class="dialog" value="&viewTutorial.label;" accesskey="&viewTutorial.accesskey;" oncommand="viewTutorial();"/>
<button class="dialog" label="&viewCookies.label;" accesskey="&viewCookies.accesskey;" oncommand="viewCookies();"/>
<button class="dialog" label="&viewTutorial.label;" accesskey="&viewTutorial.accesskey;" oncommand="viewTutorial();"/>
</box>
</titledbox>

22
suite/common/pref/pref-debug.xul
View File

@ -43,11 +43,11 @@
<box class="box-smallheader" title="&lHeader;"/>
<titledbox orient="vertical" autostretch="never">
<title><text value="&widgetRendering.label;"/></title>
<checkbox id="nglayoutDebugWindow" value="&debugWindow.label;"
<label value="&widgetRendering.label;"/>
<checkbox id="nglayoutDebugWindow" label="&debugWindow.label;"
pref="true" preftype="bool" prefstring="nglayout.widget.debugWindow"
prefattribute="checked"/>
<checkbox id="debugXULBoxes" value="&debugXULBox.label;"
<checkbox id="debugXULBoxes" label="&debugXULBox.label;"
pref="true" preftype="bool" prefstring="xul.debug.box"
prefattribute="checked"/>
</titledbox>
@ -55,26 +55,26 @@
<!-- nothing on this page has accesskeys because this is a temporary debug
panel and you can damn well click the widgets! -->
<titledbox orient="vertical" autostretch="never">
<title><text value="&debugMiscellaneous.label;"/></title>
<checkbox id="nglayoutDebugUseXBLForms" value="Use XBL-based form controls (takes effect after restart). Don't file bugs on these controls; they are still under construction."
<label value="&debugMiscellaneous.label;"/>
<checkbox id="nglayoutDebugUseXBLForms" label="Use XBL-based form controls (takes effect after restart). Don't file bugs on these controls; they are still under construction."
pref="true" preftype="bool" prefstring="nglayout.debug.enable_xbl_forms"
prefattribute="checked"/>
<checkbox id="nglayoutDebugDisableXULCache" value="&debugDisableXULCache.label;"
<checkbox id="nglayoutDebugDisableXULCache" label="&debugDisableXULCache.label;"
pref="true" preftype="bool" prefstring="nglayout.debug.disable_xul_cache"
prefattribute="checked"/>
<checkbox id="browserEnableCache" value="&debugEnableMemCache.label;"
<checkbox id="browserEnableCache" label="&debugEnableMemCache.label;"
pref="true" preftype="bool" prefstring="browser.enable.cache"
prefattribute="checked"/>
<checkbox id="browserEnableTBDnD" value="&debugEnableTBDnD.label;"
<checkbox id="browserEnableTBDnD" label="&debugEnableTBDnD.label;"
pref="true" preftype="bool" prefstring="browser.enable.tb_dnd"
prefattribute="checked"/>
<checkbox id="browserEnableDiskCache" value="&debugEnableDiskCache.label;"
<checkbox id="browserEnableDiskCache" label="&debugEnableDiskCache.label;"
pref="true" preftype="bool" prefstring="browser.cache.disk.enable"
prefattribute="checked"/>
<checkbox id="nglayoutDebugEnableXPCOMRefcntLog" value="&debugEnableXPCOMRefcntLog.label;"
<checkbox id="nglayoutDebugEnableXPCOMRefcntLog" label="&debugEnableXPCOMRefcntLog.label;"
pref="true" preftype="bool" prefstring="nglayout.debug.enable_xpcom_refcnt_log"
prefattribute="checked"/>
<checkbox id="showAboutAsStupidModalWindow" value="&debugShowAboutAsStupidModalWindow.label;"
<checkbox id="showAboutAsStupidModalWindow" label="&debugShowAboutAsStupidModalWindow.label;"
pref="true" preftype="bool" prefstring="browser.show_about_as_stupid_modal_window"
prefattribute="checked"/>
</titledbox>

14
suite/common/pref/pref-debug1.xul
View File

@ -48,24 +48,24 @@
<!-- Event Debugging -->
<titledbox orient="vertical">
<title><text value="&debugEventDebugging.label;"/></title>
<label value="&debugEventDebugging.label;"/>
<vbox autostretch="never">
<checkbox id="nglayoutDebugPaintFlashing" value="&debugPaintFlashing.label;"
<checkbox id="nglayoutDebugPaintFlashing" label="&debugPaintFlashing.label;"
pref="true" preftype="bool" prefstring="nglayout.debug.paint_flashing"
prefattribute="checked"/>
<checkbox id="nglayoutDebugPaintDumping" value="&debugPaintDumping.label;"
<checkbox id="nglayoutDebugPaintDumping" label="&debugPaintDumping.label;"
pref="true" preftype="bool" prefstring="nglayout.debug.paint_dumping"
prefattribute="checked"/>
<checkbox id="nglayoutDebugInvalidateDumping" value="&debugInvalidateDumping.label;"
<checkbox id="nglayoutDebugInvalidateDumping" label="&debugInvalidateDumping.label;"
pref="true" preftype="bool" prefstring="nglayout.debug.invalidate_dumping"
prefattribute="checked"/>
<checkbox id="nglayoutDebugEventDumping" value="&debugEventDumping.label;"
<checkbox id="nglayoutDebugEventDumping" label="&debugEventDumping.label;"
pref="true" preftype="bool" prefstring="nglayout.debug.invalidate_dumping"
prefattribute="checked"/>
<checkbox id="nglayoutDebugMotionEventDumping" value="&debugMotionEventDumping.label;"
<checkbox id="nglayoutDebugMotionEventDumping" label="&debugMotionEventDumping.label;"
pref="true" preftype="bool" prefstring="nglayout.debug.motion_event_dumping"
prefattribute="checked"/>
<checkbox id="nglayoutDebugCrossingEventDumping" value="&debugCrossingEventDumping.label;"
<checkbox id="nglayoutDebugCrossingEventDumping" label="&debugCrossingEventDumping.label;"
pref="true" preftype="bool" prefstring="nglayout.debug.motion_event_dumping"
prefattribute="checked"/>
</vbox>

6
suite/common/pref/pref-debug2.xul
View File

@ -44,12 +44,12 @@
panel and you can damn well click the widgets! -->
<titledbox orient="vertical">
<title><text value="&debugNetworking.label;"/></title>
<label value="&debugNetworking.label;"/>
<vbox autostretch="never">
<checkbox id="browserEnableKeepAlive" value="&debugEnableKeepAlive.label;"
<checkbox id="browserEnableKeepAlive" label="&debugEnableKeepAlive.label;"
pref="true" preftype="bool" prefstring="network.http.keep-alive"
prefattribute="checked"/>
<checkbox id="browserEnablePipelining" value="&debugEnablePipelining.label;"
<checkbox id="browserEnablePipelining" label="&debugEnablePipelining.label;"
pref="true" preftype="bool" prefstring="network.http.pipelining"
prefattribute="checked"/>
</vbox>

2
suite/common/pref/pref-download.xul
View File

@ -134,7 +134,7 @@
<box align="vertical" flex="100%" style="width: 100%; height: 100%">
<html:div class="hspace-both">&offlineMsgs;</html:div>
<html:div class="hspace-both vspace">
<button class="dialog push" value="&select;" align="left"/>
<button class="dialog push" label="&select;" align="left"/>
</html:div>
</box>
<spring style="height: 30px;"/>

62
suite/common/pref/pref-fonts.js
View File

@ -30,10 +30,10 @@ function GetFields()
if( !dataObject.dataEls )
dataObject.dataEls = [];
dataObject.dataEls[ lists[i] ] = [];
dataObject.dataEls[ lists[i] ].data = document.getElementById( lists[i] ).data;
dataObject.dataEls[ lists[i] ].value = document.getElementById( lists[i] ).value;
}
dataObject.defaultFont = document.getElementById( "defaultFont" ).data;
dataObject.defaultFont = document.getElementById( "defaultFont" ).value;
dataObject.fontDPI = document.getElementById( "browserScreenResolution" ).value;
dataObject.useDocFonts = document.getElementById( "browserUseDocumentFonts" ).checked ? 0 : 1;
@ -56,8 +56,8 @@ function SetFields( aDataObject )
var element = document.getElementById( lists[i] );
if( aDataObject.dataEls )
{
element.data = aDataObject.dataEls[ lists[i] ].data;
element.selectedItem = element.getElementsByAttribute( "data", aDataObject.dataEls[ lists[i] ].data )[0];
element.value = aDataObject.dataEls[ lists[i] ].value;
element.selectedItem = element.getElementsByAttribute( "value", aDataObject.dataEls[ lists[i] ].value )[0];
}
else
{
@ -66,8 +66,8 @@ function SetFields( aDataObject )
if( prefstring && preftype )
{
var prefvalue = parent.hPrefWindow.getPref( preftype, prefstring );
element.data = prefvalue;
element.selectedItem = element.getElementsByAttribute( "data", prefvalue )[0];
element.value = prefvalue;
element.selectedItem = element.getElementsByAttribute( "value", prefvalue )[0];
}
}
}
@ -98,6 +98,8 @@ function Startup()
fixedSize = document.getElementById( "sizeMono" );
languageList = document.getElementById( "selectLangs" );
bundle = srGetStrBundle("chrome://communicator/locale/pref/prefutilities.properties");
gPrefutilitiesBundle = document.getElementById("bundle_prefutilities");
// register our ok callback function
@ -127,7 +129,7 @@ listElement.prototype =
var menuItemNode = document.createElement( "menuitem" );
if( menuItemNode )
{
menuItemNode.setAttribute( "value", aString );
menuItemNode.setAttribute( "label", aString );
this.listElement.firstChild.appendChild( menuItemNode );
}
},
@ -142,17 +144,17 @@ listElement.prototype =
{
if( faces[i] == "" )
{
this.listElement.setAttribute( "data", faces[i] );
this.listElement.setAttribute("value",
gPrefutilitiesBundle.getString("nofontsforlang"));
this.listElement.setAttribute( "value", faces[i] );
this.listElement.setAttribute( "label",
gPrefutilitiesBundle.getString("nofontsforlang") );
this.listElement.setAttribute( "disabled", "true" );
gNoFontsForThisLang = true; // hack, hack hack!
}
else
{
var itemNode = document.createElement( "menuitem" );
itemNode.setAttribute( "data", faces[i] );
itemNode.setAttribute( "value", faces[i] );
itemNode.setAttribute( "label", faces[i] );
this.listElement.removeAttribute( "disabled" );
gNoFontsForThisLang = false; // hack, hack hack!
popupNode.appendChild( itemNode );
@ -244,14 +246,14 @@ function saveState()
// save data for the previous language
if( currentLanguage && languageData[currentLanguage] &&
languageData[currentLanguage].types )
languageData[currentLanguage].types[fontTypes[i]] = document.getElementById( fontTypes[i] ).data;
languageData[currentLanguage].types[fontTypes[i]] = document.getElementById( fontTypes[i] ).value;
}
if( currentLanguage && languageData[currentLanguage] &&
languageData[currentLanguage].types )
{
languageData[currentLanguage].variableSize = parseInt( variableSize.data );
languageData[currentLanguage].fixedSize = parseInt( fixedSize.data );
languageData[currentLanguage].variableSize = parseInt( variableSize.value );
languageData[currentLanguage].fixedSize = parseInt( fixedSize.value );
}
}
@ -261,27 +263,27 @@ function selectLanguage()
saveState();
if( !currentLanguage )
currentLanguage = languageList.data;
currentLanguage = languageList.value;
for( var i = 0; i < fontTypes.length; i++ )
{
// build and populate the font list for the newly chosen font type
var selectElement = new listElement( fontTypes[i] );
selectElement.clearList();
selectElement.appendStrings( enumerator.EnumerateFonts( languageList.data, fontTypes[i], fontCount ) );
selectElement.appendStrings( enumerator.EnumerateFonts( languageList.value, fontTypes[i], fontCount ) );
if( languageData[languageList.data] )
if( languageData[languageList.value] )
{
// data exists for this language, pre-select items based on this information
var dataElements = selectElement.listElement.getElementsByAttribute( "data", languageData[languageList.data].types[fontTypes[i]] );
var dataElements = selectElement.listElement.getElementsByAttribute( "value", languageData[languageList.value].types[fontTypes[i]] );
var selectedItem = dataElements.length ? dataElements[0] : null;
if (!gNoFontsForThisLang)
{
selectElement.listElement.selectedItem = selectedItem;
variableSize.removeAttribute("disabled");
fixedSize.removeAttribute("disabled");
variableSize.selectedItem = variableSize.getElementsByAttribute( "data", languageData[languageList.data].variableSize )[0];
fixedSize.selectedItem = fixedSize.getElementsByAttribute( "data", languageData[languageList.data].fixedSize )[0];
variableSize.selectedItem = variableSize.getElementsByAttribute( "value", languageData[languageList.value].variableSize )[0];
fixedSize.selectedItem = fixedSize.getElementsByAttribute( "value", languageData[languageList.value].fixedSize )[0];
}
else
{
@ -293,24 +295,24 @@ function selectLanguage()
{
try
{
var fontPrefString = "font.name." + fontTypes[i] + "." + languageList.data;
var fontPrefString = "font.name." + fontTypes[i] + "." + languageList.value;
var selectVal = parent.hPrefWindow.pref.CopyUnicharPref( fontPrefString );
var dataEls = selectElement.listElement.getElementsByAttribute( "data", selectVal );
var dataEls = selectElement.listElement.getElementsByAttribute( "value", selectVal );
selectedItem = dataEls.length ? dataEls[0] : null;
if (selectedItem)
{
selectElement.listElement.data = selectVal;
selectElement.listElement.value = selectVal;
selectElement.listElement.selectedItem = selectedItem;
var variableSizePref = "font.size.variable." + languageList.data;
var fixedSizePref = "font.size.fixed." + languageList.data;
var variableSizePref = "font.size.variable." + languageList.value;
var fixedSizePref = "font.size.fixed." + languageList.value;
var sizeVarVal = parent.hPrefWindow.pref.GetIntPref( variableSizePref );
var sizeFixedVal = parent.hPrefWindow.pref.GetIntPref( fixedSizePref );
variableSize.removeAttribute("disabled");
variableSize.data = sizeVarVal;
variableSize.selectedItem = variableSize.getElementsByAttribute( "data", sizeVarVal )[0];
variableSize.value = sizeVarVal;
variableSize.selectedItem = variableSize.getElementsByAttribute( "value", sizeVarVal )[0];
fixedSize.removeAttribute("disabled");
fixedSize.data = sizeFixedVal;
fixedSize.selectedItem = fixedSize.getElementsByAttribute( "data", sizeFixedVal )[0];
fixedSize.value = sizeFixedVal;
fixedSize.selectedItem = fixedSize.getElementsByAttribute( "value", sizeFixedVal )[0];
}
else
{
@ -324,6 +326,6 @@ function selectLanguage()
}
}
}
currentLanguage = languageList.data;
currentLanguage = languageList.value;
}

124
suite/common/pref/pref-fonts.xul
View File

@ -42,27 +42,27 @@
<box class="box-smallheader" title="&lHeader;"/>
<titledbox orient="vertical">
<title><text value="&displayFonts;"/></title>
<label value="&displayFonts;"/>
<box autostretch="never">
<text class="label" value="&language.label;" accesskey="&language.accesskey;" for="selectLangs"/>
<menulist id="selectLangs" oncommand="selectLanguage();">
<menupopup>
<menuitem data="x-western" value="&font.langGroup.latin1;"/>
<menuitem data="x-central-euro" value="&font.langGroup.latin2;"/>
<menuitem data="ja" value="&font.langGroup.japanese;"/>
<menuitem data="zh-TW" value="&font.langGroup.trad-chinese;"/>
<menuitem data="zh-CN" value="&font.langGroup.simpl-chinese;"/>
<menuitem data="ko" value="&font.langGroup.korean;"/>
<menuitem data="x-cyrillic" value="&font.langGroup.cyrillic;"/>
<menuitem data="x-baltic" value="&font.langGroup.baltic;"/>
<menuitem data="el" value="&font.langGroup.el;"/>
<menuitem data="tr" value="&font.langGroup.turkish;"/>
<menuitem data="x-unicode" value="&font.langGroup.unicode;"/>
<menuitem data="x-user-def" value="&font.langGroup.user-def;"/>
<menuitem data="th" value="&font.langGroup.thai;"/>
<menuitem data="he" value="&font.langGroup.hebrew;"/>
<menuitem data="ar" value="&font.langGroup.arabic;"/>
<menuitem value="x-western" label="&font.langGroup.latin1;"/>
<menuitem value="x-central-euro" label="&font.langGroup.latin2;"/>
<menuitem value="ja" label="&font.langGroup.japanese;"/>
<menuitem value="zh-TW" label="&font.langGroup.trad-chinese;"/>
<menuitem value="zh-CN" label="&font.langGroup.simpl-chinese;"/>
<menuitem value="ko" label="&font.langGroup.korean;"/>
<menuitem value="x-cyrillic" label="&font.langGroup.cyrillic;"/>
<menuitem value="x-baltic" label="&font.langGroup.baltic;"/>
<menuitem value="el" label="&font.langGroup.el;"/>
<menuitem value="tr" label="&font.langGroup.turkish;"/>
<menuitem value="x-unicode" label="&font.langGroup.unicode;"/>
<menuitem value="x-user-def" label="&font.langGroup.user-def;"/>
<menuitem value="th" label="&font.langGroup.thai;"/>
<menuitem value="he" label="&font.langGroup.hebrew;"/>
<menuitem value="ar" label="&font.langGroup.arabic;"/>
</menupopup>
</menulist>
<spring flex="1"/>
@ -88,27 +88,27 @@
<text class="label" value="&size.label;" accesskey="&sizeVar.accesskey;" for="sizeVar"/>
<menulist id="sizeVar">
<menupopup>
<menuitem data="8" value="8"/>
<menuitem data="9" value="9"/>
<menuitem data="10" value="10"/>
<menuitem data="11" value="11"/>
<menuitem data="12" value="12"/>
<menuitem data="13" value="13"/>
<menuitem data="14" value="14"/>
<menuitem data="15" value="15"/>
<menuitem data="16" value="16"/>
<menuitem data="18" value="18"/>
<menuitem data="20" value="20"/>
<menuitem data="24" value="24"/>
<menuitem data="26" value="26"/>
<menuitem data="28" value="28"/>
<menuitem data="32" value="32"/>
<menuitem data="36" value="36"/>
<menuitem data="40" value="40"/>
<menuitem data="48" value="48"/>
<menuitem data="56" value="56"/>
<menuitem data="64" value="64"/>
<menuitem data="72" value="72"/>
<menuitem value="8" label="8"/>
<menuitem value="9" label="9"/>
<menuitem value="10" label="10"/>
<menuitem value="11" label="11"/>
<menuitem value="12" label="12"/>
<menuitem value="13" label="13"/>
<menuitem value="14" label="14"/>
<menuitem value="15" label="15"/>
<menuitem value="16" label="16"/>
<menuitem value="18" label="18"/>
<menuitem value="20" label="20"/>
<menuitem value="24" label="24"/>
<menuitem value="26" label="26"/>
<menuitem value="28" label="28"/>
<menuitem value="32" label="32"/>
<menuitem value="36" label="36"/>
<menuitem value="40" label="40"/>
<menuitem value="48" label="48"/>
<menuitem value="56" label="56"/>
<menuitem value="64" label="64"/>
<menuitem value="72" label="72"/>
</menupopup>
</menulist>
<text class="label" value="&units.label;"/>
@ -148,8 +148,8 @@
<box autostretch="never" class="indent">
<text class="label" value="&default.type.label;"/>
<radiogroup id="defaultFont" preftype="string" prefstring="font.default">
<radio group="defaultFont" data="serif" value="&useDefaultFontSerif.label;" accesskey="&useDefaultFontSerif.accesskey;"/>
<radio group="defaultFont" data="sans-serif" value="&useDefaultFontSansSerif.label;" accesskey="&useDefaultFontSansSerif.accesskey;"/>
<radio group="defaultFont" value="serif" label="&useDefaultFontSerif.label;" accesskey="&useDefaultFontSerif.accesskey;"/>
<radio group="defaultFont" value="sans-serif" label="&useDefaultFontSansSerif.label;" accesskey="&useDefaultFontSansSerif.accesskey;"/>
</radiogroup>
</box>
@ -174,27 +174,27 @@
<text class="label" value="&size.label;" accesskey="&sizeMono.accesskey;" for="sizeMono"/>
<menulist id="sizeMono">
<menupopup>
<menuitem data="8" value="8"/>
<menuitem data="9" value="9"/>
<menuitem data="10" value="10"/>
<menuitem data="11" value="11"/>
<menuitem data="12" value="12"/>
<menuitem data="13" value="13"/>
<menuitem data="14" value="14"/>
<menuitem data="15" value="15"/>
<menuitem data="16" value="16"/>
<menuitem data="18" value="18"/>
<menuitem data="20" value="20"/>
<menuitem data="24" value="24"/>
<menuitem data="26" value="26"/>
<menuitem data="28" value="28"/>
<menuitem data="32" value="32"/>
<menuitem data="36" value="36"/>
<menuitem data="40" value="40"/>
<menuitem data="48" value="48"/>
<menuitem data="56" value="56"/>
<menuitem data="64" value="64"/>
<menuitem data="72" value="72"/>
<menuitem value="8" label="8"/>
<menuitem value="9" label="9"/>
<menuitem value="10" label="10"/>
<menuitem value="11" label="11"/>
<menuitem value="12" label="12"/>
<menuitem value="13" label="13"/>
<menuitem value="14" label="14"/>
<menuitem value="15" label="15"/>
<menuitem value="16" label="16"/>
<menuitem value="18" label="18"/>
<menuitem value="20" label="20"/>
<menuitem value="24" label="24"/>
<menuitem value="26" label="26"/>
<menuitem value="28" label="28"/>
<menuitem value="32" label="32"/>
<menuitem value="36" label="36"/>
<menuitem value="40" label="40"/>
<menuitem value="48" label="48"/>
<menuitem value="56" label="56"/>
<menuitem value="64" label="64"/>
<menuitem value="72" label="72"/>
</menupopup>
</menulist>
<text class="label" value="&units.label;"/>
@ -207,14 +207,14 @@
<box autostretch="never">
<!-- note that this removes the ability to select dynamic fonts -->
<checkbox id="browserUseDocumentFonts"
value="&useDocumentFonts.label;" accesskey="&useDocumentFonts.accesskey;"
label="&useDocumentFonts.label;" accesskey="&useDocumentFonts.accesskey;"
preftype="int" prefstring="browser.display.use_document_fonts"/>
</box>
</titledbox>
<titledbox orient="vertical">
<title><text value="&fontScaling;"/></title>
<label value="&fontScaling;"/>
<html>&fontScalingIntro;</html>
<box autostretch="never">
<text class="label" value="&resolution.label;" accesskey="&resolution.accesskey;" for="browserScreenResolution"/>

10
suite/common/pref/pref-history.xul
View File

@ -78,7 +78,7 @@
<!-- history -->
<titledbox orient="vertical">
<title><text value="&header3.label;"/></title>
<label value="&header3.label;"/>
<html>&historyPages.label;</html>
<box autostretch="never">
<text class="label" value="&pageHis.label;" accesskey="&pageHis.accesskey;" for="histDay"/>
@ -87,18 +87,18 @@
prefattribute="value"/>
<text class="label" value="&days.label;"/>
<spring flex="1"/>
<button class="dialog" value="&clearHistory.label;" accesskey="&clearHistory.accesskey;"
<button class="dialog" label="&clearHistory.label;" accesskey="&clearHistory.accesskey;"
oncommand="prefClearGlobalHistory();"/>
</box>
</titledbox>
<!-- no honey, I haven't been viewing porn, honest! -->
<titledbox orient="vertical">
<title><text value="&locationBarHistory.label;"/></title>
<label value="&locationBarHistory.label;"/>
<box autostretch="never">
<html flex="1">&clearLocationBar.label;</html>
<box autostretch="never" halign="right">
<button class="dialog" id="ClearUrlBarHistoryButton" value="&clearLocationBarButton.label;" accesskey="&clearLocationBarButton.accesskey;"
<button class="dialog" id="ClearUrlBarHistoryButton" label="&clearLocationBarButton.label;" accesskey="&clearLocationBarButton.accesskey;"
oncommand="prefClearUrlbarHistory();"/>
</box>
</box>
@ -107,7 +107,7 @@
<!-- Session History -->
<titledbox orient="vertical">
<title><text value="&shistory.label;"/></title>
<label value="&shistory.label;"/>
<html>&shistoryDescription1.label;</html>
<box autostretch="never">
<text class="label" value="&shistoryDescription2.label;" accesskey="&shistory.accesskey;" for="shistMax"/>

16
suite/common/pref/pref-images.xul
View File

@ -48,7 +48,7 @@
imageBlockingEnabled();
var enabled = document.getElementById("networkImageBehaviour").data != "2";
var enabled = document.getElementById("networkImageBehaviour").value != "2";
setWarnAboutImagesEnabled(enabled);
}
@ -79,20 +79,20 @@
<box class="box-smallheader" id="imagesHeader" title="&lHeader;"/>
<titledbox orient="vertical" id="imagesArea">
<title><text value="&imageBlocking.label;"/></title>
<label value="&imageBlocking.label;"/>
<html>&imageDetails;</html>
<radiogroup id="networkImageBehaviour" orient="vertical" autostretch="never"
pref="true" preftype="int" prefstring="network.image.imageBehavior"
prefattribute="data">
<radio group="networkImageBehaviour" data="2" value="&disableImages.label;"
prefattribute="value">
<radio group="networkImageBehaviour" value="2" label="&disableImages.label;"
accesskey="&disableImages.accesskey;"
oncommand="setWarnAboutImagesEnabled(false);"/>
<radio group="networkImageBehaviour" data="0" value="&accAllImagesRadio.label;"
<radio group="networkImageBehaviour" value="0" label="&accAllImagesRadio.label;"
accesskey="&accAllImagesRadio.accesskey;"
oncommand="setWarnAboutImagesEnabled(true);"/>
<radio group="networkImageBehaviour" data="1" value="&accOrgImagesRadio.label;"
<radio group="networkImageBehaviour" value="1" label="&accOrgImagesRadio.label;"
accesskey="&accOrgImagesRadio.accesskey;"
id="accOrgImages" observes="haveImageBlocking"
oncommand="setWarnAboutImagesEnabled(true);"/>
@ -100,7 +100,7 @@
<separator observes="haveImageBlocking"/>
<box autostretch="never">
<checkbox id="networkImageWarnAboutImages" value="&warnAboutImages.label;"
<checkbox id="networkImageWarnAboutImages" label="&warnAboutImages.label;"
accesskey="&warnAboutImages.accesskey;" observes="haveImageBlocking"
pref="true" preftype="bool" prefattribute="checked"
prefstring="network.image.warnAboutImages"/>
@ -109,7 +109,7 @@
<separator observes="haveImageBlocking"/>
<box autostretch="never" halign="right">
<button class="dialog" id="viewImages" value="&viewImages.label;"
<button class="dialog" id="viewImages" label="&viewImages.label;"
accesskey="&viewImages.accesskey;" oncommand="viewImages();"
observes="haveImageBlocking"/>
</box>

10
suite/common/pref/pref-languages.js
View File

@ -107,7 +107,7 @@ function Init()
available_languages_treeroot = document.getElementById('available_languages_root');
active_languages = window.opener.document.getElementById('active_languages');
active_languages_treeroot = window.opener.document.getElementById('active_languages_root');
pref_string = window.opener.document.getElementById('intlAcceptLanguages').value;
pref_string = window.opener.document.getElementById('intlAcceptLanguages').label;
} //try
@ -122,7 +122,7 @@ function Init()
function AddLanguage()
{
//cludge: make pref string available from the popup
document.getElementById('intlAcceptLanguages').value = pref_string;
document.getElementById('intlAcceptLanguages').label = pref_string;
window.openDialog("chrome://communicator/content/pref/pref-languages-add.xul","","modal=yes,chrome,resizable=yes", "addlangwindow");
UpdateSavePrefString();
SelectLanguage();
@ -349,7 +349,7 @@ function AddAvailableLanguage()
var selRow = selItem.firstChild;
var selCell = selRow.firstChild;
Languagename = selCell.getAttribute('value');
Languagename = selCell.getAttribute('label');
Languageid = selCell.getAttribute('id');
if (!LangAlreadyActive(Languageid)) {
@ -394,7 +394,7 @@ function AddAvailableLanguage()
function HandleDoubleClick(node)
{
var languageId = node.id;
var languageName = node.getAttribute('value');
var languageName = node.getAttribute('label');
if (languageName && languageName.length > 0)
{
@ -467,7 +467,7 @@ function AddTreeItem(doc, treeRoot, langID, langTitle)
var cell = doc.createElement('treecell');
// Copy over the attributes
cell.setAttribute('value', langTitle);
cell.setAttribute('label', langTitle);
cell.setAttribute('id', langID);
// Add it to the active languages tree

16
suite/common/pref/pref-languages.xul
View File

@ -52,7 +52,7 @@
-->
<titledbox orient="vertical" flex="1">
<title><text value="&langtitle.label;"/></title>
<label value="&langtitle.label;"/>
<html>&languages.customize.prefLangDescript;</html>
@ -67,31 +67,31 @@
</tree>
<box orient="vertical">
<button oncommand="MoveUp();" id="up" class="up" disabled="true"
value="&languages.customize.moveUp.label;"
label="&languages.customize.moveUp.label;"
accesskey="&languages.customize.moveUp.accesskey;"/>
<button oncommand="MoveDown();" id="down" class="down" disabled="true"
value="&languages.customize.moveDown.label;"
label="&languages.customize.moveDown.label;"
accesskey="&languages.customize.moveDown.accesskey;"/>
<spring flex="1"/>
<button class="dialog" id="add"
value="&languages.customize.addButton.label;"
label="&languages.customize.addButton.label;"
oncommand="AddLanguage();"/>
<button class="dialog" id="remove" disabled="true"
value="&languages.customize.deleteButton.label;"
label="&languages.customize.deleteButton.label;"
oncommand="RemoveActiveLanguage();"/>
</box>
</box>
</titledbox>
<titledbox orient="vertical" autostretch="never">
<title value="&languages.customize.Charset.grouplabel;"/>
<label value="&languages.customize.Charset.grouplabel;"/>
<box autostretch="never">
<text class="label" value="&languages.customize.DefaultCharset.label;" for="DefaultCharsetList"/>
<menulist id="DefaultCharsetList" ref="NC:DecodersRoot" datasources="rdf:charset-menu"
pref="true" preftype="string" prefstring="intl.charset.default"
prefattribute="data" wsm_attributes="data">
prefattribute="value" wsm_attributes="value">
<template>
<menupopup>
<menuitem value="rdf:http://home.netscape.com/NC-rdf#Name" data="..." uri="..."/>
<menuitem label="rdf:http://home.netscape.com/NC-rdf#Name" value="..." uri="..."/>
</menupopup>
</template>
</menulist>

62
suite/common/pref/pref-mousewheel.xul
View File

@ -50,7 +50,7 @@
function switchPage( aElement )
{
var deck = document.getElementById( "modifierDeck" );
deck.setAttribute( "index", aElement.selectedItem.data );
deck.setAttribute( "index", aElement.selectedItem.value );
}
function doEnableElement( aEventTarget, aElementID )
@ -102,18 +102,18 @@
<separator class="thin"/>
<titledbox orient="vertical">
<title>
<label>
<box>
<menulist id="mouseWheelMode" oncommand="switchPage(this);">
<menupopup>
<menuitem data="0" value="&usingJustTheWheel.label;"/>
<menuitem data="1" value="&usingWheelAndAlt.label;"/>
<menuitem data="2" value="&usingWheelAndCtrl.label;"/>
<menuitem data="3" value="&usingWheelAndShft.label;"/>
<menuitem value="0" label="&usingJustTheWheel.label;"/>
<menuitem value="1" label="&usingWheelAndAlt.label;"/>
<menuitem value="2" label="&usingWheelAndCtrl.label;"/>
<menuitem value="3" label="&usingWheelAndShft.label;"/>
</menupopup>
</menulist>
</box>
</title>
</label>
<deck id="modifierDeck" class="indent">
@ -121,9 +121,9 @@
<!-- no key modifiers -->
<radiogroup id="mousewheelWithNoKeyAction" orient="vertical" autostretch="never"
pref="true" preftype="int" prefstring="mousewheel.withnokey.action"
prefattribute="data">
prefattribute="value">
<box autostretch="never" valign="top">
<radio group="mousewheelWithNoKeyAction" data="0" value="&scroll.label;" accesskey="&scroll.accesskey;"/>
<radio group="mousewheelWithNoKeyAction" value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
<box orient="vertical" autostretch="never">
<hbox autostretch="never">
<textbox id="mousewheelWithNoKeyNumlines" size="3"
@ -131,22 +131,22 @@
prefattribute="value"/>
<text class="label" value="&scrollLines.label;"/>
</hbox>
<checkbox id="mousewheelWithNoKeySysNumlines" value="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
<checkbox id="mousewheelWithNoKeySysNumlines" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
pref="true" preftype="bool" prefstring="mousewheel.withnokey.sysnumlines"
prefattribute="checked" oncommand="enableField(this, 'mousewheelWithNoKeyNumlines');"/>
</box>
</box>
<radio group="mousewheelWithNoKeyAction" data="1" value="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
<radio group="mousewheelWithNoKeyAction" data="2" value="&history.label;" accesskey="&history.accesskey;"/>
<radio group="mousewheelWithNoKeyAction" data="3" value="&textsize.label;" accesskey="&textsize.accesskey;"/>
<radio group="mousewheelWithNoKeyAction" value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
<radio group="mousewheelWithNoKeyAction" value="2" label="&history.label;" accesskey="&history.accesskey;"/>
<radio group="mousewheelWithNoKeyAction" value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
</radiogroup>
<!-- alt modifiers -->
<radiogroup id="mousewheelWithAltKeyAction" orient="vertical" autostretch="never"
pref="true" preftype="int" prefstring="mousewheel.withaltkey.action"
prefattribute="data">
prefattribute="value">
<box autostretch="never" valign="top">
<radio group="mousewheelWithAltKeyAction" data="0" value="&scroll.label;" accesskey="&scroll.accesskey;"/>
<radio group="mousewheelWithAltKeyAction" value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
<box orient="vertical" autostretch="never">
<hbox autostretch="never">
<textbox id="mousewheelWithAltKeyNumlines" size="3"
@ -154,22 +154,22 @@
prefattribute="value"/>
<text class="label" value="&scrollLines.label;"/>
</hbox>
<checkbox id="mousewheelWithAltKeySysNumlines" value="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
<checkbox id="mousewheelWithAltKeySysNumlines" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
pref="true" preftype="bool" prefstring="mousewheel.withaltkey.sysnumlines"
prefattribute="checked" oncommand="enableField(this, 'mousewheelWithAltKeyNumlines');"/>
</box>
</box>
<radio group="mousewheelWithAltKeyAction" data="1" value="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
<radio group="mousewheelWithAltKeyAction" data="2" value="&history.label;" accesskey="&history.accesskey;"/>
<radio group="mousewheelWithAltKeyAction" data="3" value="&textsize.label;" accesskey="&textsize.accesskey;"/>
<radio group="mousewheelWithAltKeyAction" value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
<radio group="mousewheelWithAltKeyAction" value="2" label="&history.label;" accesskey="&history.accesskey;"/>
<radio group="mousewheelWithAltKeyAction" value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
</radiogroup>
<!-- ctrl modifiers -->
<radiogroup id="mousewheelWithCtrlKeyAction" orient="vertical" autostretch="never"
pref="true" preftype="int" prefstring="mousewheel.withcontrolkey.action"
prefattribute="data">
prefattribute="value">
<box autostretch="never" valign="top">
<radio group="mousewheelWithCtrlKeyAction" data="0" value="&scroll.label;" accesskey="&scroll.accesskey;"/>
<radio group="mousewheelWithCtrlKeyAction" value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
<box orient="vertical" autostretch="never">
<hbox autostretch="never">
<textbox id="mousewheelWithCtrlKeyNumlines" size="3"
@ -177,22 +177,22 @@
prefattribute="value"/>
<text class="label" value="&scrollLines.label;"/>
</hbox>
<checkbox id="mousewheelWithCtrlKeySysNumlines" value="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
<checkbox id="mousewheelWithCtrlKeySysNumlines" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
pref="true" preftype="bool" prefstring="mousewheel.withcontrolkey.sysnumlines"
prefattribute="checked" oncommand="enableField(this, 'mousewheelWithCtrlKeyNumlines');"/>
</box>
</box>
<radio group="mousewheelWithCtrlKeyAction" data="1" value="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
<radio group="mousewheelWithCtrlKeyAction" data="2" value="&history.label;" accesskey="&history.accesskey;"/>
<radio group="mousewheelWithCtrlKeyAction" data="3" value="&textsize.label;" accesskey="&textsize.accesskey;"/>
<radio group="mousewheelWithCtrlKeyAction" value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
<radio group="mousewheelWithCtrlKeyAction" value="2" label="&history.label;" accesskey="&history.accesskey;"/>
<radio group="mousewheelWithCtrlKeyAction" value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
</radiogroup>
<!-- shift modifiers -->
<radiogroup id="mousewheelWithShiftKeyAction" orient="vertical" autostretch="never"
pref="true" preftype="int" prefstring="mousewheel.withshiftkey.action"
prefattribute="data">
prefattribute="value">
<box autostretch="never" valign="top">
<radio group="mousewheelWithShiftKeyAction" data="0" value="&scroll.label;" accesskey="&scroll.accesskey;"/>
<radio group="mousewheelWithShiftKeyAction" value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
<box orient="vertical" autostretch="never">
<hbox autostretch="never">
<textbox id="mousewheelWithShiftKeyNumlines" size="3"
@ -200,14 +200,14 @@
prefattribute="value"/>
<text class="label" value="&scrollLines.label;"/>
</hbox>
<checkbox id="mousewheelWithShiftKeySysNumlines" value="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
<checkbox id="mousewheelWithShiftKeySysNumlines" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
pref="true" preftype="bool" prefstring="mousewheel.withshiftkey.sysnumlines"
prefattribute="checked" oncommand="enableField(this, 'mousewheelWithShiftKeyNumlines');"/>
</box>
</box>
<radio group="mousewheelWithShiftKeyAction" data="1" value="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
<radio group="mousewheelWithShiftKeyAction" data="2" value="&history.label;" accesskey="&history.accesskey;"/>
<radio group="mousewheelWithShiftKeyAction" data="3" value="&textsize.label;" accesskey="&textsize.accesskey;"/>
<radio group="mousewheelWithShiftKeyAction" value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
<radio group="mousewheelWithShiftKeyAction" value="2" label="&history.label;" accesskey="&history.accesskey;"/>
<radio group="mousewheelWithShiftKeyAction" value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
</radiogroup>
</deck>
</titledbox>

28
suite/common/pref/pref-navigator.xul
View File

@ -50,21 +50,21 @@
<!-- navigator starts with -->
<titledbox>
<title value="&navRadio;"/>
<label value="&navRadio;"/>
<radiogroup id="startupPage" autostretch="never" orient="vertical"
pref="true" preftype="int" prefstring="browser.startup.page"
prefattribute="data">
<radio group="startupPage" data="0" value="&blankPageRadio.label;" accesskey="&blankPageRadio.accesskey;"/>
<radio group="startupPage" data="1" value="&homePageRadio.label;" accesskey="&homePageRadio.accesskey;"/>
<radio group="startupPage" data="2" value="&lastPageRadio.label;" accesskey="&lastPageRadio.accesskey;"/>
prefattribute="value">
<radio group="startupPage" value="0" label="&blankPageRadio.label;" accesskey="&blankPageRadio.accesskey;"/>
<radio group="startupPage" value="1" label="&homePageRadio.label;" accesskey="&homePageRadio.accesskey;"/>
<radio group="startupPage" value="2" label="&lastPageRadio.label;" accesskey="&lastPageRadio.accesskey;"/>
</radiogroup>
</titledbox>
<!-- homepage specification -->
<titledbox orient="vertical">
<title value="&header2.label;"/>
<label value="&header2.label;"/>
<html>&homePageIntro.label;</html>
<box autostretch="never">
<text class="label" value="&location.label;" accesskey="&location.accesskey;" for="browserStartupHomepage"/>
@ -74,16 +74,16 @@
when we support fancy formatted local filenames -->
</box>
<box autostretch="never" halign="right">
<button class="dialog" value="&useCurrent.label;" accesskey="&useCurrent.accesskey;"
<button class="dialog" label="&useCurrent.label;" accesskey="&useCurrent.accesskey;"
oncommand="setHomePageToCurrentPage('browserStartupHomepage');"/>
<button class="dialog" value="&browseFile.label;" accesskey="&browseFile.accesskey;"
<button class="dialog" label="&browseFile.label;" accesskey="&browseFile.accesskey;"
oncommand="prefNavSelectFile('browserStartupHomepage', 'choosehomepage', false );"/>
</box>
</titledbox>
<!-- toolbar buttons customization -->
<titledbox flex="1" orient="vertical">
<title value="&header3.label;"/>
<label value="&header3.label;"/>
<html>&toolbarIntro.label;</html>
<tree flex="1" class="dialog inset" style="-moz-user-focus:ignore !important;">
<treecolgroup>
@ -95,7 +95,7 @@
<treecell>
<checkbox allowevents="true"
id="bookmarksButton"
value="&bookmarksButton.label;"
label="&bookmarksButton.label;"
pref="true"
preftype="bool"
prefstring="browser.toolbars.showbutton.bookmarks"
@ -108,7 +108,7 @@
<treecell>
<checkbox allowevents="true"
id="goButton"
value="&goButton.label;"
label="&goButton.label;"
pref="true"
preftype="bool"
prefstring="browser.toolbars.showbutton.go"
@ -121,7 +121,7 @@
<treecell>
<checkbox allowevents="true"
id="homeButton"
value="&homeButton.label;"
label="&homeButton.label;"
pref="true"
preftype="bool"
prefstring="browser.toolbars.showbutton.home"
@ -134,7 +134,7 @@
<treecell>
<checkbox allowevents="true"
id="printButton"
value="&printButton.label;"
label="&printButton.label;"
pref="true"
preftype="bool"
prefstring="browser.toolbars.showbutton.print"
@ -147,7 +147,7 @@
<treecell>
<checkbox allowevents="true"
id="searchButton"
value="&searchButton.label;"
label="&searchButton.label;"
pref="true"
preftype="bool"
prefstring="browser.toolbars.showbutton.search"

14
suite/common/pref/pref-policies.xul
View File

@ -34,37 +34,37 @@
<treechildren id="zoneChildren" flex="1">
<treeitem open="true">
<treerow>
<treecell value="&default.label;"/>
<treecell label="&default.label;"/>
</treerow>
<treechildren id="defaultChildren">
<treeitem>
<treerow>
<treecell indent="true" value="&allWebsites.label;"/>
<treecell indent="true" label="&allWebsites.label;"/>
</treerow>
</treeitem>
</treechildren>
</treeitem>
<treeitem open="true">
<treerow>
<treecell value="&trusted.label;"/>
<treecell label="&trusted.label;"/>
</treerow>
<treechildren id="trustedChildren"/>
</treeitem>
<treeitem open="true">
<treerow>
<treecell value="&annoyances.label;"/>
<treecell label="&annoyances.label;"/>
</treerow>
</treeitem>
<treeitem open="true">
<treerow>
<treecell value="&restricted.label;"/>
<treecell label="&restricted.label;"/>
</treerow>
</treeitem>
</treechildren>
</tree>
<box orient="vertical">
<button class="dialog" value="&addSite.label;" accesskey="&addSite.accesskey;"
<button class="dialog" label="&addSite.label;" accesskey="&addSite.accesskey;"
oncommand="addSite();"/>
<spring flex="1"/>
</box>
@ -77,7 +77,7 @@
</box>
<box autostretch="never">
<button class="dialog" value="&settings.label;" accesskey="&settings.accesskey;"
<button class="dialog" label="&settings.label;" accesskey="&settings.accesskey;"
oncommand="settings();"/>
</box>

6
suite/common/pref/pref-proxies.js
View File

@ -8,8 +8,8 @@ function showManualProxyConfig()
manualRow.style.display = "inherit";
}
else {
viewHideButton.value = prefutilitiesBundle.getString("viewrow");
manualRow.style.display = "none"
viewHideButton.label = prefutilitiesBundle.getString("viewrow");
manualRow.style.display = "none";
}
}
@ -42,7 +42,7 @@ function DoEnabling()
// radio buttons
var radiogroup = document.getElementById("networkProxyType");
switch ( radiogroup.data ) {
switch ( radiogroup.value ) {
case "0":
for (i = 0; i < manual.length; i++)
manual[i].setAttribute( "disabled", "true" );

12
suite/common/pref/pref-proxies.xul
View File

@ -55,15 +55,15 @@
<box class="box-smallheader" title="&lHeader;"/>
<titledbox orient="vertical">
<title><text value="&proxyTitle.label;"/></title>
<label value="&proxyTitle.label;"/>
<html>&networkHeader.label;</html>
<radiogroup id="networkProxyType" orient="vertical"
pref="true" preftype="int" prefstring="network.proxy.type"
prefattribute="data">
prefattribute="value">
<vbox autostretch="never">
<radio group="networkProxyType" data="0" value="&directTypeRadio.label;" accesskey="&directTypeRadio.accesskey;" oncommand="DoEnabling();"/>
<radio group="networkProxyType" data="1" value="&manualTypeRadio.label;" accesskey="&manualTypeRadio.accesskey;" oncommand="DoEnabling();"/>
<radio group="networkProxyType" value="0" label="&directTypeRadio.label;" accesskey="&directTypeRadio.accesskey;" oncommand="DoEnabling();"/>
<radio group="networkProxyType" value="1" label="&manualTypeRadio.label;" accesskey="&manualTypeRadio.accesskey;" oncommand="DoEnabling();"/>
</vbox>
<grid class="indent" flex="1">
<columns>
@ -135,13 +135,13 @@
</rows>
</grid>
<box autostretch="never">
<radio group="networkProxyType" data="2" value="&autoTypeRadio.label;" accesskey="&autoTypeRadio.accesskey;" oncommand="DoEnabling();"/>
<radio group="networkProxyType" value="2" label="&autoTypeRadio.label;" accesskey="&autoTypeRadio.accesskey;" oncommand="DoEnabling();"/>
</box>
<box class="indent" flex="1">
<textbox id="networkProxyAutoconfigURL" flex="1"
pref="true" preftype="string" prefstring="network.proxy.autoconfig_url"
prefattribute="value"/>
<button id="autoReload" class="dialog" value="&reload.label;" accesskey="&reload.accesskey;"/>
<button id="autoReload" class="dialog" label="&reload.label;" accesskey="&reload.accesskey;"/>
</box>
</radiogroup>

2
suite/common/pref/pref-search.js
View File

@ -26,7 +26,7 @@
function checkEngine()
{
var engineList = document.getElementById("engineList");
var engineValue = engineList.value;
var engineValue = engineList.label;
if (!engineValue)
engineList.selectedIndex = 6;
}

10
suite/common/pref/pref-search.xul
View File

@ -40,26 +40,26 @@
<box class="box-smallheader" title="&lHeader;"/>
<titledbox>
<title><text value="&legendHeader;"/></title>
<label value="&legendHeader;"/>
<text class="label" value="&defaultSearchEngine.label;" accesskey="&defaultSearchEngine.accesskey;" for="engineList"/>
<menulist id="engineList" ref="NC:SearchEngineRoot" datasources="rdf:internetsearch"
sortResource="http://home.netscape.com/NC-rdf#Name" sortDirection="ascending"
pref="true" preftype="string" prefstring="browser.search.defaultengine"
prefattribute="data">
prefattribute="value">
<template>
<menupopup>
<menuitem value="rdf:http://home.netscape.com/NC-rdf#Name" data="..." uri="..."/>
<menuitem label="rdf:http://home.netscape.com/NC-rdf#Name" value="..." uri="..."/>
</menupopup>
</template>
</menulist>
</titledbox>
<titledbox orient="vertical">
<title><text value="&searchResults.label;"/></title>
<label value="&searchResults.label;"/>
<box autostretch="never">
<checkbox id="openSidebarPanel" value="&openSidebarSearchPanel.label;" accesskey="&openSidebarSearchPanel.accesskey;"
<checkbox id="openSidebarPanel" label="&openSidebarSearchPanel.label;" accesskey="&openSidebarSearchPanel.accesskey;"
pref="true" preftype="bool" prefstring="browser.search.opensidebarsearchpanel"
prefattribute="checked"/>
</box>

22
suite/common/pref/pref-smart_browsing.xul
View File

@ -111,7 +111,7 @@
{
for( var i = 0; i < treeKids.childNodes.length; i++ )
{
var domain = treeKids.childNodes[i].firstChild.firstChild.getAttribute("value");
var domain = treeKids.childNodes[i].firstChild.firstChild.getAttribute("label");
string += ( domain + "," );
}
}
@ -119,13 +119,13 @@
domainPrefField.setAttribute("value",string);
}
function createCell( aValue )
function createCell( aLabel )
{
var treeKids = document.getElementById( "disabledKids" );
var item = document.createElement( "treeitem" );
var row = document.createElement( "treerow" );
var cell = document.createElement( "treecell" );
cell.setAttribute( "value", aValue );
cell.setAttribute( "label", aLabel );
row.appendChild( cell );
item.appendChild( row );
treeKids.appendChild( item );
@ -180,7 +180,7 @@
<box class="box-smallheader" title="&lHeader;"/>
<titledbox orient="vertical">
<title><text value="&whatsRelated.label;"/></title>
<label value="&whatsRelated.label;"/>
<html id="doNotAcceptText">&doNotDecp.label;</html>
@ -198,7 +198,7 @@
<treechildren id="disabledKids" flex="1"/>
</tree>
<box autostretch="never" valign="top">
<button class="dialog" id="removeDomain" value="&removeDomain.label;" accesskey="&removeDomain.accesskey;"
<button class="dialog" id="removeDomain" label="&removeDomain.label;" accesskey="&removeDomain.accesskey;"
oncommand="removeDomain();"/>
</box>
</row>
@ -207,7 +207,7 @@
<text class="label" id="domainText" value="&domain.label;" accesskey="&domain.accesskey;" for="addDomain"/>
<textbox id="addDomain" flex="1" oninput="doButtonEnabling();"/>
</box>
<button disabled="true" class="dialog" id="addDomainButton" value="&addDomain.label;" accesskey="&addDomain.accesskey;"
<button disabled="true" class="dialog" id="addDomainButton" label="&addDomain.label;" accesskey="&addDomain.accesskey;"
oncommand="addDomain();"/>
</row>
</rows>
@ -219,25 +219,25 @@
</titledbox>
<titledbox orient="vertical">
<title><text value="&internetKeywordsHeader.label;"/></title>
<label value="&internetKeywordsHeader.label;"/>
<html>&internetKeywordsDescription.label;</html>
<box autostretch="never">
<checkbox id="browserGoBrowsingEnabled" value="&keywordsEnabled.label;" accesskey="&keywordsEnabled.accesskey;"
<checkbox id="browserGoBrowsingEnabled" label="&keywordsEnabled.label;" accesskey="&keywordsEnabled.accesskey;"
pref="true" preftype="bool" prefstring="keyword.enabled"
prefattribute="checked"/>
<spring flex="1"/>
<button class="dialog" value="&moreInformation.label;" accesskey="&moreInformation.accesskey;" oncommand="moreInfo();"/>
<button class="dialog" label="&moreInformation.label;" accesskey="&moreInformation.accesskey;" oncommand="moreInfo();"/>
</box>
</titledbox>
<titledbox orient="vertical">
<title><text value="&autoCompleteHeader.label;"/></title>
<label value="&autoCompleteHeader.label;"/>
<html>&autoCompleteDescription.label;</html>
<box autostretch="never">
<checkbox id="browserAutoCompleteEnabled" value="&autoCompleteEnabled.label;" accesskey="&autoCompleteEnabled.accesskey;"
<checkbox id="browserAutoCompleteEnabled" label="&autoCompleteEnabled.label;" accesskey="&autoCompleteEnabled.accesskey;"
pref="true" preftype="bool" prefstring="browser.urlbar.autocomplete.enabled"
prefattribute="checked"/>
<spring flex="1"/>

10
suite/common/pref/pref-smartupdate.xul
View File

@ -21,15 +21,15 @@
<box class="box-smallheader" title="&lHeader;"/>
<titledbox orient="vertical" autostretch="never">
<title><text value="&smartTitle.label;"/></title>
<checkbox id="XPInstallEnabled" value="&enableSU.label;" accesskey="&enableSU.accesskey;"
<label value="&smartTitle.label;"/>
<checkbox id="XPInstallEnabled" label="&enableSU.label;" accesskey="&enableSU.accesskey;"
pref="true" preftype="bool" prefstring="xpinstall.enabled"
prefattribute="checked"/>
</titledbox>
<!--
<titledbox orient="vertical" autostretch="never">
<title><text value="Installed Packages"/></title>
<label value="Installed Packages"/>
<script>
<![CDATA[
@ -44,7 +44,7 @@
}
]]>
</script>
<button value="Install Package" oncommand="InstallPackage();"/>
<button label="Install Package" oncommand="InstallPackage();"/>
</titledbox>
-->
@ -66,7 +66,7 @@
</tree>
<spring flex="5%"/>
<box align="vertical">
<button class="dialog push" id="pref:0:bool:smartupdate" value="&uninstallButton.label;" accesskey="&uninstallButton.accesskey;"/>
<button class="dialog push" id="pref:0:bool:smartupdate" label="&uninstallButton.label;" accesskey="&uninstallButton.accesskey;"/>
<spring flex="100%"/>
</box>
</box>

4
suite/common/pref/pref-themes.js
View File

@ -83,8 +83,8 @@ function themeSelect()
var uninstallLabel = gPrefutilitiesBundle.getString("uninstallThemePrefix");
applyLabel = applyLabel.replace(/%theme_name%/, themeName);
uninstallLabel = uninstallLabel.replace(/%theme_name%/, themeName);
applyButton.value = applyLabel;
uninstallButton.value = uninstallLabel;
applyButton.label = applyLabel;
uninstallButton.label = uninstallLabel;
var locType = selectedItem.getAttribute("loctype");
uninstallButton.disabled = (locType == "install");
}

6
suite/common/pref/pref-themes.xul
View File

@ -63,7 +63,7 @@
image="rdf:http://www.mozilla.org/rdf/chrome#image"
loctype="rdf:http://www.mozilla.org/rdf/chrome#locType">
<treerow>
<treecell value="rdf:http://www.mozilla.org/rdf/chrome#displayName"/>
<treecell label="rdf:http://www.mozilla.org/rdf/chrome#displayName"/>
</treerow>
</treeitem>
</treechildren>
@ -90,8 +90,8 @@
<html id="description" flex="1"/>
</box>
<box orient="vertical" align="top">
<button id="applySkin" value="&selectSkin.label;" accesskey="&selectSkin.accesskey;" oncommand="applySkin();"/>
<button id="uninstallSkin" value="&uninstallSkin.label;" oncommand="uninstallSkin();"/>
<button id="applySkin" label="&selectSkin.label;" accesskey="&selectSkin.accesskey;" oncommand="applySkin();"/>
<button id="uninstallSkin" label="&uninstallSkin.label;" oncommand="uninstallSkin();"/>
</box>
</box>

26
suite/common/pref/pref-winhooks.xul
View File

@ -47,42 +47,42 @@
<!-- File types -->
<titledbox>
<title value="&files.label;"/>
<label value="&files.label;"/>
<box orient="vertical" flex="1">
<html>
&files.text;
</html>
<box class="indent">
<box orient="vertical" autostretch="never" flex="1">
<checkbox id="isHandlingHTML" value="&html.label;" accesskey="&html.accesskey;"/>
<checkbox id="isHandlingXML" value="&xml.label;" accesskey="&xml.accesskey;"/>
<checkbox id="isHandlingXUL" value="&xul.label;" accesskey="&xul.accesskey;"/>
<checkbox id="isHandlingHTML" label="&html.label;" accesskey="&html.accesskey;"/>
<checkbox id="isHandlingXML" label="&xml.label;" accesskey="&xml.accesskey;"/>
<checkbox id="isHandlingXUL" label="&xul.label;" accesskey="&xul.accesskey;"/>
</box>
<box orient="vertical" autostretch="never" flex="1">
<checkbox id="isHandlingJPEG" value="&jpeg.label;" accesskey="&jpeg.accesskey;"/>
<checkbox id="isHandlingGIF" value="&gif.label;" accesskey="&gif.accesskey;"/>
<checkbox id="isHandlingPNG" value="&png.label;" accesskey="&png.accesskey;"/>
<checkbox id="isHandlingJPEG" label="&jpeg.label;" accesskey="&jpeg.accesskey;"/>
<checkbox id="isHandlingGIF" label="&gif.label;" accesskey="&gif.accesskey;"/>
<checkbox id="isHandlingPNG" label="&png.label;" accesskey="&png.accesskey;"/>
</box>
</box>
</box>
</titledbox>
<!-- Internet Shortcuts -->
<titledbox>
<title value="&shortcuts.label;"/>
<label value="&shortcuts.label;"/>
<box orient="vertical" autostretch="never" flex="1">
<html>
&shortcuts.text;
</html>
<checkbox id="isHandlingHTTP" value="&http.label;" accesskey="&http.accesskey;" class="indent"/>
<checkbox id="isHandlingHTTPS" value="&https.label;" accesskey="&https.accesskey;" class="indent"/>
<checkbox id="isHandlingFTP" value="&ftp.label;" accesskey="&ftp.accesskey;" class="indent"/>
<checkbox id="isHandlingCHROME" value="&chrome.label;" accesskey="&chrome.accesskey;" class="indent"/>
<checkbox id="isHandlingHTTP" label="&http.label;" accesskey="&http.accesskey;" class="indent"/>
<checkbox id="isHandlingHTTPS" label="&https.label;" accesskey="&https.accesskey;" class="indent"/>
<checkbox id="isHandlingFTP" label="&ftp.label;" accesskey="&ftp.accesskey;" class="indent"/>
<checkbox id="isHandlingCHROME" label="&chrome.label;" accesskey="&chrome.accesskey;" class="indent"/>
<checkbox id="isHandlingGOPHER" value="&gopher.label;" accesskey="&gopher.accesskey;" class="indent"/>
</box>
</titledbox>
<!-- Misc -->
<box autostretch="never">
<checkbox id="showDialog" value="&showDialog.label;" accesskey="&showDialog.accesskey;"/>
<checkbox id="showDialog" label="&showDialog.label;" accesskey="&showDialog.accesskey;"/>
</box>
</window>

42
suite/common/pref/preftree.xul
View File

@ -42,29 +42,29 @@
<treehead name="tree">
<treerow>
<treecell class="treecell-header outset" url="__header" value="&categoryHeader;"/>
<treecell class="treecell-header outset" url="__header" label="&categoryHeader;"/>
</treerow>
</treehead>
<treechildren id="panelChildren" flex="1">
<treeitem container="true" open="true" id="appearance">
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-appearance.xul" value="&appear.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-appearance.xul" label="&appear.label;"/>
</treerow>
<treechildren>
<treeitem>
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-fonts.xul" value="&fonts.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-fonts.xul" label="&fonts.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-colors.xul" value="&colors.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-colors.xul" label="&colors.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-themes.xul" value="&themes.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-themes.xul" label="&themes.label;"/>
</treerow>
</treeitem>
</treechildren>
@ -73,43 +73,43 @@
<!-- XXX remove this when overlays.rdf works for navigator -->
<treeitem container="true" open="true" id="navigator">
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-navigator.xul" value="&navigator.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-navigator.xul" label="&navigator.label;"/>
</treerow>
<treechildren>
<treeitem>
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-history.xul" value="&history.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-history.xul" label="&history.label;"/>
</treerow>
</treeitem>
<treeitem id="bookmarks">
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/bookmarks/pref-bookmarks.xul" value="&bookmarks.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/bookmarks/pref-bookmarks.xul" label="&bookmarks.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-languages.xul" value="&languages.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-languages.xul" label="&languages.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-applications.xul" value="&applications.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-applications.xul" label="&applications.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-smart_browsing.xul" value="&smartBrowse.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-smart_browsing.xul" label="&smartBrowse.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-search.xul" value="&search.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-search.xul" label="&search.label;"/>
</treerow>
</treeitem>
<!-- Taking out Policies panel b/c bug 44121
<treeitem>
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-policies.xul" value="&policies.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-policies.xul" label="&policies.label;"/>
</treerow>
</treeitem> -->
</treechildren>
@ -118,27 +118,27 @@
<treeitem container="true" open="true" id="advancedItem">
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-advanced.xul" value="&advance.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-advanced.xul" label="&advance.label;"/>
</treerow>
<treechildren id="advancedChildren">
<treeitem>
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-cache.xul" value="&cache.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-cache.xul" label="&cache.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-proxies.xul" value="&proxies.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-proxies.xul" label="&proxies.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-smartupdate.xul" value="&smart.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-smartupdate.xul" label="&smart.label;"/>
</treerow>
</treeitem>
<treeitem id="mousewheelItem">
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-mousewheel.xul" value="&mousewheel.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-mousewheel.xul" label="&mousewheel.label;"/>
</treerow>
</treeitem>
</treechildren>
@ -146,19 +146,19 @@
<treeitem container="true" open="true" id="debugItem">
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-debug.xul" value="&debug.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-debug.xul" label="&debug.label;"/>
</treerow>
<treechildren id="debugChildren">
<treeitem>
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-debug1.xul" value="&debug1.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-debug1.xul" label="&debug1.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-debug2.xul" value="&debug2.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-debug2.xul" label="&debug2.label;"/>
</treerow>
</treeitem>

2
suite/common/pref/win/platformPrefOverlay.xul
View File

@ -32,7 +32,7 @@
<treechildren id="advancedChildren">
<treeitem id="winhooks">
<treerow>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-winhooks.xul" value="&winhooks.label;"/>
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-winhooks.xul" label="&winhooks.label;"/>
</treerow>
</treeitem>
</treechildren>