mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 20:35:50 +00:00
bugs 110156, 110155
Removing support for <outliner> tags Removing <tree> layout code and moving <tree> tags to outliner layout Convert all usage of <outliner> to tree tags Convert all usage of <tree> tags to new <tree> syntax or <listbox> r=cmanske,varga sr=hyatt,sspitzer a=asa Also includes fixes by Jan Varga (varga@utcruk.sk) for bugs 132020, 133451, 131393, 115894, and 129327
This commit is contained in:
hewitt%netscape.com
parent
34eaa00c98
commit
b1860310f3
@ -38,29 +38,29 @@
|
||||
|
||||
<script type="application/x-javascript">
|
||||
<![CDATA[
|
||||
var _elementIDs = ["contentPackTree", "languagePackTree"];
|
||||
var _elementIDs = ["contentPackList", "languagePackList"];
|
||||
|
||||
|
||||
function Startup()
|
||||
{
|
||||
var contentTree = document.getElementById( "contentPackTree" );
|
||||
var regionName = contentTree.getAttribute("prefvalue");
|
||||
var regionElements = contentTree.getElementsByAttribute("value", regionName);
|
||||
var contentList = document.getElementById( "contentPackList" );
|
||||
var regionName = contentList.getAttribute("prefvalue");
|
||||
var regionElements = contentList.getElementsByAttribute("value", regionName);
|
||||
|
||||
if (regionElements.length) {
|
||||
contentTree.selectItem(regionElements[0].parentNode.parentNode);
|
||||
contentList.selectItem(regionElements[0]);
|
||||
} else {
|
||||
contentTree.selectedIndex = 0;
|
||||
contentList.selectedIndex = 0;
|
||||
}
|
||||
|
||||
var languageTree = document.getElementById( "languagePackTree" );
|
||||
var languageName = languageTree.getAttribute("prefvalue");
|
||||
var languageElements =languageTree.getElementsByAttribute("value", languageName);
|
||||
var languageList = document.getElementById( "languagePackList" );
|
||||
var languageName = languageList.getAttribute("prefvalue");
|
||||
var languageElements =languageList.getElementsByAttribute("value", languageName);
|
||||
|
||||
if (languageElements.length) {
|
||||
languageTree.selectItem(languageElements[0].parentNode.parentNode);
|
||||
languageList.selectItem(languageElements[0]);
|
||||
} else {
|
||||
languageTree.selectedIndex = 0;
|
||||
languageList.selectedIndex = 0;
|
||||
}
|
||||
parent.hPrefWindow.registerOKCallbackFunc( SwitchPacks );
|
||||
}
|
||||
@ -75,14 +75,14 @@
|
||||
var newContentPack;
|
||||
|
||||
try {
|
||||
var tree = document.getElementById("contentPackTree");
|
||||
if (tree) {
|
||||
var selectedItem = tree.selectedItems.length ? tree.selectedItems[0] : null;
|
||||
var listbox = document.getElementById("contentPackList");
|
||||
if (listbox) {
|
||||
var selectedItem = listbox.selectedItems.length ? listbox.selectedItems[0] : null;
|
||||
if (selectedItem) {
|
||||
newContentPack = selectedItem.firstChild.firstChild.getAttribute("value");
|
||||
}
|
||||
} else {
|
||||
newContentPack = parent.hPrefWindow.wsm.dataManager.getItemData( "chrome://communicator/content/pref/pref-content.xul", "contentPackTree" ).prefvalue;
|
||||
newContentPack = parent.hPrefWindow.wsm.dataManager.getItemData( "chrome://communicator/content/pref/pref-content.xul", "contentPackList" ).prefvalue;
|
||||
}
|
||||
}
|
||||
catch (e) {}
|
||||
@ -113,14 +113,14 @@
|
||||
var newLanguagePack;
|
||||
|
||||
try {
|
||||
var languageTree = document.getElementById("languagePackTree");
|
||||
if (languageTree) {
|
||||
var selectedItem = languageTree.selectedItems.length ? languageTree.selectedItems[0] : null;
|
||||
var languageList = document.getElementById("languagePackList");
|
||||
if (languageList) {
|
||||
var selectedItem = languageList.selectedItems.length ? languageList.selectedItems[0] : null;
|
||||
if (selectedItem) {
|
||||
newLanguagePack = selectedItem.firstChild.firstChild.getAttribute("value");
|
||||
}
|
||||
} else {
|
||||
newLanguagePack = parent.hPrefWindow.wsm.dataManager.getItemData( "chrome://communicator/content/pref/pref-content.xul", "languagePackTree" ).prefvalue;
|
||||
newLanguagePack = parent.hPrefWindow.wsm.dataManager.getItemData( "chrome://communicator/content/pref/pref-content.xul", "languagePackList" ).prefvalue;
|
||||
}
|
||||
}
|
||||
catch (e) {}
|
||||
@ -140,36 +140,36 @@
|
||||
|
||||
function SelectContentPack()
|
||||
{
|
||||
var tree = document.getElementById("contentPackTree");
|
||||
var selectedItem = tree.selectedItems.length ? tree.selectedItems[0] : null;
|
||||
var listbox = document.getElementById("contentPackList");
|
||||
var selectedItem = listbox.selectedItems.length ? listbox.selectedItems[0] : null;
|
||||
|
||||
if (selectedItem) {
|
||||
var classType = selectedItem.firstChild.firstChild.getAttribute("class");
|
||||
if (classType == "outofdate") {
|
||||
//Make it so that out of date content packs cannot be selected by the user
|
||||
tree.removeItemFromSelection(selectedItem);
|
||||
listbox.removeItemFromSelection(selectedItem);
|
||||
}
|
||||
else {
|
||||
var regionName = selectedItem.firstChild.firstChild.getAttribute("value");
|
||||
tree.setAttribute("prefvalue", regionName);
|
||||
listbox.setAttribute("prefvalue", regionName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function SelectLanguagePack()
|
||||
{
|
||||
var tree = document.getElementById("languagePackTree");
|
||||
var selectedItem = tree.selectedItems.length ? tree.selectedItems[0] : null;
|
||||
var listbox = document.getElementById("languagePackList");
|
||||
var selectedItem = listbox.selectedItems.length ? listbox.selectedItems[0] : null;
|
||||
|
||||
if (selectedItem) {
|
||||
var classType = selectedItem.firstChild.firstChild.getAttribute("class");
|
||||
if (classType == "outofdate") {
|
||||
//Make it so that out of date language packs cannot be selected by the user
|
||||
tree.removeItemFromSelection(selectedItem);
|
||||
listbox.removeItemFromSelection(selectedItem);
|
||||
}
|
||||
else {
|
||||
var languageName = selectedItem.firstChild.firstChild.getAttribute("value");
|
||||
tree.setAttribute("prefvalue", languageName);
|
||||
listbox.setAttribute("prefvalue", languageName);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -183,55 +183,42 @@
|
||||
|
||||
<hbox class="box-smallheader" title="&lHeader;"/>
|
||||
|
||||
<!-- Content (aka region) pack tree -->
|
||||
<!-- Content (aka region) pack listbox -->
|
||||
<description>&contentIntro.label;</description>
|
||||
<separator class="thin"/>
|
||||
<description>&installedContentPacks.label;</description>
|
||||
<tree id="contentPackTree" flex="1" rows="2"
|
||||
<listbox id="contentPackList" flex="1" rows="2"
|
||||
ref="urn:mozilla:locale:root" datasources="rdf:chrome"
|
||||
sortResource="http://www.mozilla.org/rdf/chrome#name"
|
||||
preftype="localizedstring" prefstring="general.useragent.contentlocale"
|
||||
prefvalue="" prefattribute="prefvalue" wsm_attributes="prefvalue"
|
||||
seltype="false" onselect="SelectContentPack();"
|
||||
sortDirection="ascending">
|
||||
<treecolgroup>
|
||||
<treecol flex="1"/>
|
||||
</treecolgroup>
|
||||
|
||||
<template xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
|
||||
|
||||
<!-- This rule displays only up to date content packs based on the localeVersion -->
|
||||
<rule chrome:localeType="region" chrome:localeVersion="&content.version;">
|
||||
<treechildren flex="1">
|
||||
<treeitem id="treechildren" uri="..." translation="true" nselected="false" >
|
||||
<treerow>
|
||||
<treecell label="rdf:http://www.mozilla.org/rdf/chrome#displayName"
|
||||
<listitem uri="..." translation="true" nselected="false"
|
||||
label="rdf:http://www.mozilla.org/rdf/chrome#displayName"
|
||||
value="rdf:http://www.mozilla.org/rdf/chrome#name"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
</rule>
|
||||
|
||||
<!-- This rule "falls through" to match obsolete content packs -->
|
||||
<rule chrome:localeType="region">
|
||||
<treechildren flex="1">
|
||||
<treeitem id="treechildren" uri="..." translation="true" nselected="false" >
|
||||
<treerow>
|
||||
<treecell class="outofdate"
|
||||
<listitem uri="..." translation="true" nselected="false" class="outofdate"
|
||||
label="rdf:http://www.mozilla.org/rdf/chrome#displayName &update.label;"
|
||||
value="rdf:http://www.mozilla.org/rdf/chrome#name"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
</rule>
|
||||
|
||||
</template>
|
||||
</tree>
|
||||
</listbox>
|
||||
|
||||
<!-- Language pack tree -->
|
||||
<!-- Language pack listbox -->
|
||||
<description>&languageIntro.label;</description>
|
||||
<separator class="thin"/>
|
||||
<description>&installedLanguagePacks.label;</description>
|
||||
<tree id="languagePackTree" flex="1" rows="3"
|
||||
<listbox id="languagePackList" flex="1" rows="3"
|
||||
ref="urn:mozilla:locale:root"
|
||||
datasources="rdf:chrome"
|
||||
sortResource="http://www.mozilla.org/rdf/chrome#name"
|
||||
@ -242,9 +229,6 @@
|
||||
seltype="false"
|
||||
onselect="SelectLanguagePack();"
|
||||
sortDirection="ascending">
|
||||
<treecolgroup>
|
||||
<treecol flex="1"/>
|
||||
</treecolgroup>
|
||||
<template xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
|
||||
|
||||
<!-- This rule eliminates region packs from the language pack list -->
|
||||
@ -252,30 +236,19 @@
|
||||
|
||||
<!-- This rule displays only up to date language packs based on the localeVersion -->
|
||||
<rule chrome:localeVersion="&lang.version;">
|
||||
<treechildren flex="1">
|
||||
<treeitem id="treechildren" uri="..." translation="true" nselected="false" >
|
||||
<treerow>
|
||||
<treecell label="rdf:http://www.mozilla.org/rdf/chrome#displayName"
|
||||
<listitem uri="..." translation="true" nselected="false"
|
||||
label="rdf:http://www.mozilla.org/rdf/chrome#displayName"
|
||||
value="rdf:http://www.mozilla.org/rdf/chrome#name"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
</rule>
|
||||
|
||||
<!-- This rule "falls through" to match obsolete language packs -->
|
||||
<rule>
|
||||
<treechildren flex="1">
|
||||
<treeitem id="treechildren" uri="..." translation="true" nselected="false" >
|
||||
<treerow>
|
||||
<treecell class="outofdate"
|
||||
<listitem uri="..." translation="true" nselected="false" class="outofdate"
|
||||
label="rdf:http://www.mozilla.org/rdf/chrome#displayName &update.label;"
|
||||
value="rdf:http://www.mozilla.org/rdf/chrome#name"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
</rule>
|
||||
</template>
|
||||
</tree>
|
||||
</listbox>
|
||||
|
||||
<separator class="thin"/>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user