mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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 2006-05-17 02:34:33 +00:00
Родитель 06d820d9a4
Коммит 1e2d5d9ba4
23 изменённых файлов: 373 добавлений и 591 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

60
layout/inspector/src/inDOMView.cpp
Просмотреть файл

@ -142,7 +142,7 @@ inDOMView::~inDOMView()
NS_IMPL_ISUPPORTS3(inDOMView,
inIDOMView,
nsIOutlinerView,
nsITreeView,
nsIDocumentObserver);
////////////////////////////////////////////////////////////////////////
@ -286,12 +286,12 @@ inDOMView::Rebuild()
nsCOMPtr<nsIDOMNode> root;
GetRootNode(getter_AddRefs(root));
SetRootNode(root);
mOutliner->Invalidate();
mTree->Invalidate();
return NS_OK;
}
////////////////////////////////////////////////////////////////////////
// nsIOutlinerView
// nsITreeView
NS_IMETHODIMP
inDOMView::GetRowCount(PRInt32 *aRowCount)
@ -370,6 +370,24 @@ inDOMView::GetColumnProperties(const PRUnichar *colID, nsIDOMElement *colElt, ns
return NS_OK;
}
NS_IMETHODIMP
inDOMView::GetImageSrc(PRInt32 row, const PRUnichar *colID, nsAString& _retval)
{
return NS_OK;
}
NS_IMETHODIMP
inDOMView::GetProgressMode(PRInt32 row, const PRUnichar *colID, PRInt32* _retval)
{
return NS_OK;
}
NS_IMETHODIMP
inDOMView::GetCellValue(PRInt32 row, const PRUnichar *colID, nsAString& _retval)
{
return NS_OK;
}
NS_IMETHODIMP
inDOMView::GetCellText(PRInt32 row, const PRUnichar *colID, nsAString& _retval)
{
@ -461,7 +479,7 @@ inDOMView::GetParentIndex(PRInt32 rowIndex, PRInt32 *_retval)
RowToNode(rowIndex, &node);
if (!node) return NS_ERROR_FAILURE;
inDOMViewNode* checkNode;
inDOMViewNode* checkNode = nsnull;
PRUint32 i = rowIndex - 1;
do {
RowToNode(i, &checkNode);
@ -501,29 +519,29 @@ inDOMView::ToggleOpenState(PRInt32 index)
ExpandNode(index);
// Update the twisty.
mOutliner->InvalidateRow(index);
mTree->InvalidateRow(index);
mOutliner->RowCountChanged(index+1, GetRowCount() - oldCount);
mTree->RowCountChanged(index+1, GetRowCount() - oldCount);
return NS_OK;
}
NS_IMETHODIMP
inDOMView::SetOutliner(nsIOutlinerBoxObject *outliner)
inDOMView::SetTree(nsITreeBoxObject *tree)
{
mOutliner = outliner;
mTree = tree;
return NS_OK;
}
NS_IMETHODIMP
inDOMView::GetSelection(nsIOutlinerSelection * *aSelection)
inDOMView::GetSelection(nsITreeSelection * *aSelection)
{
*aSelection = mSelection;
NS_IF_ADDREF(*aSelection);
return NS_OK;
}
NS_IMETHODIMP inDOMView::SetSelection(nsIOutlinerSelection * aSelection)
NS_IMETHODIMP inDOMView::SetSelection(nsITreeSelection * aSelection)
{
mSelection = aSelection;
return NS_OK;
@ -614,7 +632,7 @@ NS_IMETHODIMP
inDOMView::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, PRInt32 aNameSpaceID,
nsIAtom* aAttribute, PRInt32 aModType, PRInt32 aHint)
{
if (!mOutliner)
if (!mTree)
return NS_ERROR_FAILURE;
PRBool filtered;
@ -634,7 +652,7 @@ inDOMView::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, PRInt3
// No fancy stuff here, just invalidate the changed row
PRInt32 row = 0;
NodeToRow(domAttr, &row);
mOutliner->InvalidateRange(row, row);
mTree->InvalidateRange(row, row);
} else if (aModType == nsIDOMMutationEvent::ADDITION) {
// get the number of attributes on this content node
nsCOMPtr<nsIDOMNamedNodeMap> attrs;
@ -673,7 +691,7 @@ inDOMView::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, PRInt3
InsertLinkBefore(newNode, insertNode);
}
InsertNode(newNode, attrRow);
mOutliner->RowCountChanged(attrRow, 1);
mTree->RowCountChanged(attrRow, 1);
} else if (aModType == nsIDOMMutationEvent::REMOVAL) {
// At this point, the attribute is already gone from the DOM, but is still represented
// in our mRows array. Search through the content node's children for the corresponding
@ -709,7 +727,7 @@ inDOMView::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, PRInt3
// we have found the row for the attribute that was removed
RemoveLink(checkNode);
RemoveNode(row);
mOutliner->RowCountChanged(row, -1);
mTree->RowCountChanged(row, -1);
break;
}
}
@ -725,7 +743,7 @@ inDOMView::AttributeChanged(nsIDocument *aDocument, nsIContent* aContent, PRInt3
NS_IMETHODIMP
inDOMView::ContentAppended(nsIDocument *aDocument, nsIContent* aContainer, PRInt32 aNewIndexInContainer)
{
if (!mOutliner)
if (!mTree)
return NS_ERROR_FAILURE;
nsCOMPtr<nsIContent> child;
@ -736,7 +754,7 @@ inDOMView::ContentAppended(nsIDocument *aDocument, nsIContent* aContainer, PRInt
NS_IMETHODIMP
inDOMView::ContentInserted(nsIDocument *aDocument, nsIContent* aContainer, nsIContent* aChild, PRInt32 aIndexInContainer)
{
if (!mOutliner)
if (!mTree)
return NS_ERROR_FAILURE;
nsresult rv;
@ -791,7 +809,7 @@ inDOMView::ContentInserted(nsIDocument *aDocument, nsIContent* aContainer, nsICo
// insert new node
InsertNode(newNode, row);
mOutliner->RowCountChanged(row, 1);
mTree->RowCountChanged(row, 1);
return NS_OK;
}
@ -799,7 +817,7 @@ inDOMView::ContentInserted(nsIDocument *aDocument, nsIContent* aContainer, nsICo
NS_IMETHODIMP
inDOMView::ContentReplaced(nsIDocument *aDocument, nsIContent* aContainer, nsIContent* aOldChild, nsIContent* aNewChild, PRInt32 aIndexInContainer)
{
if (!mOutliner)
if (!mTree)
return NS_ERROR_FAILURE;
nsresult rv;
@ -824,7 +842,7 @@ inDOMView::ContentReplaced(nsIDocument *aDocument, nsIContent* aContainer, nsICo
ReplaceNode(newNode, row);
// XXX can this go into ReplaceNode?
mOutliner->InvalidateRange(row, oldRowCount-1);
mTree->InvalidateRange(row, oldRowCount-1);
return NS_OK;
}
@ -832,7 +850,7 @@ inDOMView::ContentReplaced(nsIDocument *aDocument, nsIContent* aContainer, nsICo
NS_IMETHODIMP
inDOMView::ContentRemoved(nsIDocument *aDocument, nsIContent* aContainer, nsIContent* aChild, PRInt32 aIndexInContainer)
{
if (!mOutliner)
if (!mTree)
return NS_ERROR_FAILURE;
nsresult rv;
@ -852,7 +870,7 @@ inDOMView::ContentRemoved(nsIDocument *aDocument, nsIContent* aContainer, nsICon
RemoveLink(oldNode);
RemoveNode(row);
mOutliner->RowCountChanged(row, -1);
mTree->RowCountChanged(row, -1);
return NS_OK;
}

12
layout/inspector/src/inDOMView.h
Просмотреть файл

@ -41,8 +41,8 @@
#include "inIDOMView.h"
#include "nsIOutlinerView.h"
#include "nsIOutlinerSelection.h"
#include "nsITreeView.h"
#include "nsITreeSelection.h"
#include "nsIDocumentObserver.h"
#include "nsIDOMNode.h"
#include "nsIDOMDocument.h"
@ -51,13 +51,13 @@
class inDOMViewNode;
class inDOMView : public inIDOMView,
public nsIOutlinerView,
public nsITreeView,
public nsIDocumentObserver
{
public:
NS_DECL_ISUPPORTS
NS_DECL_INIDOMVIEW
NS_DECL_NSIOUTLINERVIEW
NS_DECL_NSITREEVIEW
inDOMView();
virtual ~inDOMView();
@ -131,8 +131,8 @@ protected:
static nsIAtom* kDocumentFragmentNodeAtom;
static nsIAtom* kNotationNodeAtom;
nsCOMPtr<nsIOutlinerBoxObject> mOutliner;
nsCOMPtr<nsIOutlinerSelection> mSelection;
nsCOMPtr<nsITreeBoxObject> mTree;
nsCOMPtr<nsITreeSelection> mSelection;
PRBool mShowAnonymous;
PRBool mShowSubDocuments;

2
suite/common/pref/nsPrefWindow.js
Просмотреть файл

@ -379,7 +379,7 @@ nsPrefWindow.prototype =
var index = panelTree.contentView.getIndexOfItem( selectItem );
if ( !panelTree.view.isContainerOpen( index ) )
panelTree.view.toggleOpenState(index);
panelTree.outlinerBoxObject.selection.select( index );
panelTree.treeBoxObject.selection.select( index );
}
};

24
suite/common/pref/permissionsPrefsOverlay.xul
Просмотреть файл

@ -26,20 +26,20 @@
<overlay id="cookiePrefsOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<outlinerchildren id="securityChildren">
<outlineritem position="1">
<outlinerrow>
<outlinercell url="chrome://cookie/content/pref-cookies.xul"
<treechildren id="securityChildren">
<treeitem position="1">
<treerow>
<treecell url="chrome://cookie/content/pref-cookies.xul"
label="&cookies.label;"
id="cookiesCell"/>
</outlinerrow>
</outlineritem>
<outlineritem position="2">
<outlinerrow>
<outlinercell url="chrome://cookie/content/pref-images.xul"
</treerow>
</treeitem>
<treeitem position="2">
<treerow>
<treecell url="chrome://cookie/content/pref-images.xul"
label="&images.label;"/>
</outlinerrow>
</outlineritem>
</outlinerchildren>
</treerow>
</treeitem>
</treechildren>
</overlay>

26
suite/common/pref/pref-applications.js
Просмотреть файл

@ -20,7 +20,7 @@
var gNewTypeRV = null;
var gUpdateTypeRV = null;
var gTree = null;
var gList = null;
var gDS = null;
var gPrefApplicationsBundle = null;
@ -35,8 +35,8 @@ function newType()
{
window.openDialog("chrome://communicator/content/pref/pref-applications-new.xul", "appEdit", "chrome,modal=yes,resizable=no");
if (gNewTypeRV) {
//gTree.builder.rebuild();
gTree.setAttribute("ref", "urn:mimetypes");
//gList.builder.rebuild();
gList.setAttribute("ref", "urn:mimetypes");
gNewTypeRV = null;
}
}
@ -49,17 +49,17 @@ function removeType()
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService(Components.interfaces.nsIPromptService);
var remove = promptService.confirm(window, titleMsg, dialogMsg);
if (remove) {
var uri = gTree.selectedItems[0].id;
var uri = gList.selectedItems[0].id;
var handlerOverride = new HandlerOverride(uri);
removeOverride(handlerOverride.mimeType);
gTree.setAttribute("ref", "urn:mimetypes");
gList.setAttribute("ref", "urn:mimetypes");
}
}
function editType()
{
if (gTree.selectedItems && gTree.selectedItems[0]) {
var uri = gTree.selectedItems[0].id;
if (gList.selectedItems && gList.selectedItems[0]) {
var uri = gList.selectedItems[0].id;
var handlerOverride = new HandlerOverride(uri);
window.openDialog("chrome://communicator/content/pref/pref-applications-edit.xul", "appEdit", "chrome,modal=yes,resizable=no", handlerOverride);
selectApplication();
@ -72,7 +72,7 @@ function Startup()
gPrefApplicationsBundle = document.getElementById("bundle_prefApplications");
// set up the elements
gTree = document.getElementById("appTree");
gList = document.getElementById("appList");
gExtensionField = document.getElementById("extension");
gMIMETypeField = document.getElementById("mimeType");
gHandlerField = document.getElementById("handler");
@ -92,15 +92,15 @@ function Startup()
dump("spec is " + ioService.getURLSpecFromFile(file));
gDS = gRDF.GetDataSource(ioService.getURLSpecFromFile(file));
// intialise the tree
gTree.database.AddDataSource(gDS);
gTree.setAttribute("ref", "urn:mimetypes");
// intialize the listbox
gList.database.AddDataSource(gDS);
gList.setAttribute("ref", "urn:mimetypes");
}
function selectApplication()
{
if (gTree.selectedItems && gTree.selectedItems.length && gTree.selectedItems[0]) {
var uri = gTree.selectedItems[0].id;
if (gList.selectedItems && gList.selectedItems.length && gList.selectedItems[0]) {
var uri = gList.selectedItems[0].id;
var handlerOverride = new HandlerOverride(uri);
gExtensionField.setAttribute("value", handlerOverride.extensions);
gMIMETypeField.setAttribute("value", handlerOverride.mimeType);

16
suite/common/pref/pref-applications.xul
Просмотреть файл

@ -41,12 +41,9 @@
<label value="&fileTypes.label;"/>
<hbox flex="1">
<vbox flex="1">
<tree id="appTree" flex="1"
<listbox id="appList" flex="1"
datasources="rdf:null" ref="urn:mimetypes"
onselect="selectApplication();">
<treecolgroup>
<treecol flex="1"/>
</treecolgroup>
<template>
<rule>
<conditions>
@ -63,17 +60,12 @@
predicate="http://home.netscape.com/NC-rdf#editable"/>
</conditions>
<action>
<treechildren flex="1">
<treeitem uri="?type">
<treerow>
<treecell label="?value"/>
</treerow>
</treeitem>
</treechildren>
<listitem uri="?type" label="?value"/>
</action>
</rule>
</template>
</tree>
</listbox>
<hbox>
<vbox><image id="contentTypeImage"/></vbox>
<grid orient="horizontal">

105
suite/common/pref/pref-charset.js
Просмотреть файл

@ -47,7 +47,7 @@ function readRDFString(aDS,aRes,aProp)
function LoadAvailableCharSets()
{
try {
var available_charsets_treeroot = document.getElementById('available_charsets_root');
var available_charsets_listbox = document.getElementById('available_charsets');
var rdf=Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
var kNC_Root = rdf.GetResource("NC:DecodersRoot");
var kNC_name = rdf.GetResource("http://home.netscape.com/NC-rdf#Name");
@ -64,8 +64,8 @@ function LoadAvailableCharSets()
availCharsetDict[i][0] = readRDFString(rdfDataSource, charset, kNC_name);
availCharsetDict[i][1] = charset.Value;
AddTreeItem(document,
available_charsets_treeroot,
AddListItem(document,
available_charsets_listbox,
availCharsetDict[i][1],
availCharsetDict[i][0]);
}
@ -115,7 +115,6 @@ function AddRemoveLatin1(action)
function LoadActiveCharSets()
{
var active_charsets = document.getElementById('active_charsets');
var active_charsets_treeroot = document.getElementById('active_charsets_root');
var arrayOfPrefs = [];
var str;
var tit;
@ -127,7 +126,7 @@ function LoadActiveCharSets()
str = arrayOfPrefs[i];
tit = GetCharSetTitle(str);
if (str && tit)
AddTreeItem(document, active_charsets_treeroot, str, tit);
AddListItem(document, active_charsets, str, tit);
}
}
}
@ -194,27 +193,18 @@ function update_buttons()
function AddAvailableCharset()
{
var active_charsets = document.getElementById('active_charsets');
var active_charsets_treeroot = document.getElementById('active_charsets_root');
var available_charsets = document.getElementById('available_charsets');
for (var nodeIndex=0; nodeIndex < available_charsets.selectedItems.length; nodeIndex++)
{
var selItem = available_charsets.selectedItems[nodeIndex];
var selRow = selItem.firstChild;
var selCell = selRow.firstChild;
var charsetname = selCell.getAttribute('label');
var charsetid = selCell.getAttribute('id');
var charsetname = selItem.id;
var charsetid = selItem.id;
var already_active = false;
for (var item = active_charsets_treeroot.firstChild; item != null; item = item.nextSibling) {
var row = item.firstChild;
var cell = row.firstChild;
var active_charsetid = cell.getAttribute('id');
if (active_charsetid == charsetid)
{
for (var item = active_charsets.firstChild; item != null; item = item.nextSibling) {
if (charsetid == item.id) {
already_active = true;
break;
}//if
@ -222,7 +212,7 @@ function AddAvailableCharset()
}//for
if (already_active == false) {
AddTreeItem(document, active_charsets_treeroot, charsetid, charsetname);
AddListItem(document, active_charsets, charsetid, charsetname);
}//if
}//for
@ -236,14 +226,14 @@ function AddAvailableCharset()
function RemoveActiveCharset()
{
var active_charsets_treeroot = document.getElementById('active_charsets_root');
var tree = document.getElementById('active_charsets');
var listbox = document.getElementById('active_charsets');
var nextNode = null;
var numSelected = tree.selectedItems.length;
var numSelected = listbox.selectedItems.length;
var deleted_all = false;
while (tree.selectedItems.length > 0) {
var selectedNode = tree.selectedItems[0];
while (listbox.selectedItems.length > 0) {
var selectedNode = listbox.selectedItems[0];
dump(selectedNode + " - " + listbox.selectedItems.length + "\n");
nextNode = selectedNode.nextSibling;
if (!nextNode) {
@ -251,18 +241,13 @@ function RemoveActiveCharset()
nextNode = selectedNode.previousSibling;
}
var row = selectedNode.firstChild;
var cell = row.firstChild;
row.removeChild(cell);
selectedNode.removeChild(row);
active_charsets_treeroot.removeChild(selectedNode);
listbox.removeChild(selectedNode);
} //while
if (nextNode) {
tree.selectItem(nextNode)
listbox.selectItem(nextNode)
} else {
//tree.clearSelection();
//listbox.clearSelection();
}
enable_save();
@ -276,19 +261,13 @@ function Save()
// that the user has chosen.
var active_charsets = document.getElementById('active_charsets');
var active_charsets_treeroot = document.getElementById('active_charsets_root');
var row = null;
var cell = null;
var charsetid = "";
var num_charsets = 0;
var pref_string_content = '';
for (var item = active_charsets_treeroot.firstChild; item != null; item = item.nextSibling) {
row = item.firstChild;
cell = row.firstChild;
charsetid = cell.getAttribute('id');
for (var item = active_charsets.firstChild; item != null; item = item.nextSibling) {
charsetid = item.id;
if (charsetid.length > 1) {
num_charsets++;
@ -316,14 +295,14 @@ function Save()
function MoveUp() {
var tree = document.getElementById('active_charsets');
if (tree.selectedItems.length == 1) {
var selected = tree.selectedItems[0];
var listbox = document.getElementById('active_charsets');
if (listbox.selectedItems.length == 1) {
var selected = listbox.selectedItems[0];
var before = selected.previousSibling
if (before) {
before.parentNode.insertBefore(selected, before);
tree.selectItem(selected);
tree.ensureElementIsVisible(selected);
listbox.insertBefore(selected, before);
listbox.selectItem(selected);
listbox.ensureElementIsVisible(selected);
}
}
@ -333,37 +312,29 @@ function MoveUp() {
function MoveDown() {
var tree = document.getElementById('active_charsets');
if (tree.selectedItems.length == 1) {
var selected = tree.selectedItems[0];
var listbox = document.getElementById('active_charsets');
if (listbox.selectedItems.length == 1) {
var selected = listbox.selectedItems[0];
if (selected.nextSibling) {
if (selected.nextSibling.nextSibling) {
selected.parentNode.insertBefore(selected, selected.nextSibling.nextSibling);
}
else {
if (selected.nextSibling.nextSibling)
listbox.insertBefore(selected, selected.nextSibling.nextSibling);
else
selected.parentNode.appendChild(selected);
}
tree.selectItem(selected);
listbox.selectItem(selected);
}
}
enable_save();
} //MoveDown
function AddTreeItem(doc, treeRoot, ID, UIstring)
function AddListItem(doc, listbox, ID, UIstring)
{
// Create a treerow for the new item
var item = doc.createElement('treeitem');
var row = doc.createElement('treerow');
var cell = doc.createElement('treecell');
var item = doc.createElement('listitem');
// Copy over the attributes
cell.setAttribute('label', UIstring);
cell.setAttribute('id', ID);
item.setAttribute('label', UIstring);
item.setAttribute('id', ID);
// Add it to the tree
item.appendChild(row);
row.appendChild(cell);
treeRoot.appendChild(item);
listbox.appendChild(item);
}

28
suite/common/pref/pref-charset.xul
Просмотреть файл

@ -44,34 +44,26 @@
<vbox flex="1">
<label value="&charset.customize.additional.label;"/>
<!-- Available Charsets Tree -->
<tree id="available_charsets" flex="1"
<listbox id="available_charsets" flex="1" seltype="multiple"
onselect="SelectAvailableCharset();"
ondblclick="AddAvailableCharset();"
datasources="rdf:null" seltype="multiple">
<treecolgroup>
<treecol flex="1"/>
</treecolgroup>
<treechildren id="available_charsets_root" flex="1"/>
</tree>
ondblclick="AddAvailableCharset();"/>
<separator class="thin"/>
<hbox align="center">
<button id="add_button" oncommand="AddAvailableCharset();"
label="&charset.customize.add.label;" disabled="true"/>
</hbox>
</vbox>
</vbox>
<separator orient="vertical"/>
<vbox flex="1">
<label value="&charset.customize.current.label;"/>
<tree id="active_charsets" flex="1"
<listbox id="active_charsets" flex="1" seltype="multiple"
onselect="SelectActiveCharset();"
ondblclick="RemoveActiveCharset();"
datasources="rdf:null"
indent="false" seltype="multiple">
<treecolgroup>
<treecol flex="1"/>
</treecolgroup>
<treechildren id="active_charsets_root" flex="1"/>
</tree>
ondblclick="RemoveActiveCharset();"/>
<separator class="thin"/>
<hbox align="center">
<button id="remove_button" oncommand="RemoveActiveCharset();"

9
suite/common/pref/pref-languages-add.xul
Просмотреть файл

@ -38,13 +38,8 @@
<separator class="thin"/>
<description>&languages.customize.available.label;</description>
<tree id="available_languages" flex="1"
datasources="rdf:null" seltype="multiple" ondblclick="HandleDoubleClick(event.target)">
<treecolgroup>
<treecol flex="1"/>
</treecolgroup>
<treechildren id="available_languages_root" flex="1"/>
</tree>
<listbox id="available_languages" flex="1" seltype="multiple"
ondblclick="HandleDoubleClick(event.target)"/>
<hbox align="center">
<label value="&languages.customize.others.label;" control="languages.other"/>

68
suite/common/pref/pref-languages.js
Просмотреть файл

@ -33,13 +33,9 @@ var prefLangBundle;
//dictionary of all supported locales
var availLanguageDict;
//XUL tree handles
//XUL listbox handles
var available_languages;
var available_languages_treeroot;
//XUL tree handles
var active_languages;
var active_languages_treeroot;
//XUL window pref window interface object
var pref_string = new String();
@ -73,7 +69,6 @@ function Init()
try {
active_languages = document.getElementById('active_languages');
active_languages_treeroot = document.getElementById('active_languages_root');
} //try
catch(ex) {
@ -98,9 +93,7 @@ function Init()
//add language popup
available_languages = document.getElementById('available_languages');
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').label;
} //try
@ -214,7 +207,7 @@ function LoadAvailableLanguages()
if (availLanguageDict[i][2] == 'true') {
AddTreeItem(document, available_languages_treeroot, availLanguageDict[i][1], availLanguageDict[i][0]);
AddListItem(document, available_languages, availLanguageDict[i][1], availLanguageDict[i][0]);
} //if
@ -234,7 +227,7 @@ function LoadActiveLanguages()
if (str) {
if (!tit)
tit = '[' + str + ']';
AddTreeItem(document, active_languages_treeroot, str, tit);
AddListItem(document, active_languages, str, tit);
} //if
} //for
@ -345,15 +338,13 @@ function AddAvailableLanguage()
for (var nodeIndex=0; nodeIndex < available_languages.selectedItems.length; nodeIndex++) {
var selItem = available_languages.selectedItems[nodeIndex];
var selRow = selItem.firstChild;
var selCell = selRow.firstChild;
Languagename = selCell.getAttribute('label');
Languageid = selCell.getAttribute('id');
Languagename = selItem.getAttribute('label');
Languageid = selItem.getAttribute('id');
if (!LangAlreadyActive(Languageid)) {
AddTreeItem(window.opener.document, active_languages_treeroot, Languageid, Languagename);
AddListItem(window.opener.document, active_languages, Languageid, Languagename);
}//if
@ -381,7 +372,7 @@ function AddAvailableLanguage()
if (!LangAlreadyActive(Languageid)) {
AddTreeItem(window.opener.document, active_languages_treeroot, Languageid, Languagename);
AddListItem(window.opener.document, active_languages, Languageid, Languagename);
}//if
}
@ -398,7 +389,7 @@ function HandleDoubleClick(node)
if (languageName && languageName.length > 0)
{
if (!LangAlreadyActive(languageId)) {
AddTreeItem(window.opener.document, active_languages_treeroot, languageId, languageName);
AddListItem(window.opener.document, active_languages, languageId, languageName);
}
window.close();
}//if
@ -421,13 +412,7 @@ function RemoveActiveLanguage()
if (selectedNode.previousSibling)
nextNode = selectedNode.previousSibling;
var row = selectedNode.firstChild;
var cell = row.firstChild;
row.removeChild(cell);
selectedNode.removeChild(row);
active_languages_treeroot.removeChild(selectedNode);
active_languages.removeChild(selectedNode);
} //while
if (nextNode) {
@ -456,24 +441,18 @@ function GetLanguageTitle(id)
}
function AddTreeItem(doc, treeRoot, langID, langTitle)
function AddListItem(doc, listbox, langID, langTitle)
{
try { //let's beef up our error handling for languages without label / title
// Create a treerow for the new Language
var item = doc.createElement('treeitem');
var row = doc.createElement('treerow');
var cell = doc.createElement('treecell');
// Create a listitem for the new Language
var item = doc.createElement('listitem');
// Copy over the attributes
cell.setAttribute('label', langTitle);
cell.setAttribute('id', langID);
item.setAttribute('label', langTitle);
item.setAttribute('id', langID);
// Add it to the active languages tree
item.appendChild(row);
row.appendChild(cell);
treeRoot.appendChild(item);
listbox.appendChild(item);
} //try
@ -488,11 +467,9 @@ function UpdateSavePrefString()
var num_languages = 0;
pref_string = "";
for (var item = active_languages_treeroot.firstChild; item != null; item = item.nextSibling) {
for (var item = active_languages.firstChild; item != null; item = item.nextSibling) {
var row = item.firstChild;
var cell = row.firstChild;
var languageid = cell.getAttribute('id');
var languageid = item.getAttribute('id');
if (languageid.length > 1) {
@ -530,7 +507,7 @@ function MoveUp() {
moveUp.disabled = true;
}
if (active_languages_treeroot.childNodes.length > 1)
if (active_languages.childNodes.length > 1)
{
// more than one item so we can move selected item back down
var moveDown = document.getElementById("down");
@ -548,24 +525,23 @@ function MoveDown() {
var selected = active_languages.selectedItems[0];
if (selected.nextSibling) {
if (selected.nextSibling.nextSibling) {
selected.parentNode.insertBefore(selected, selected.nextSibling.nextSibling);
active_languages.insertBefore(selected, selected.nextSibling.nextSibling);
}
else {
selected.parentNode.appendChild(selected);
active_languages.appendChild(selected);
}
active_languages.selectItem(selected);
}
}
if (active_languages.selectedIndex ==
(active_languages_treeroot.childNodes.length - 1))
if (active_languages.selectedIndex == active_languages.childNodes.length - 1)
{
// selected item is last
var moveDown = document.getElementById("down");
moveDown.disabled = true;
}
if (active_languages_treeroot.childNodes.length > 1)
if (active_languages.childNodes.length > 1)
{
// more than one item so we can move selected item back up
var moveUp = document.getElementById("up");

9
suite/common/pref/pref-languages.xul
Просмотреть файл

@ -50,14 +50,9 @@
<description>&languages.customize.active.label;</description>
<hbox flex="1">
<tree id="active_languages" flex="1" style="width: 0px; height: 0px;"
<listbox id="active_languages" flex="1" style="width: 0px; height: 0px;"
preftype="localizedstring" prefstring="intl.accept_languages" prefvalue="" prefattribute="prefvalue" wsm_attributes="prefvalue"
datasources="rdf:null" seltype="multiple" onselect="SelectLanguage();">
<treecolgroup>
<treecol flex="1"/>
</treecolgroup>
<treechildren id="active_languages_root" flex="1"/>
</tree>
seltype="multiple" onselect="SelectLanguage();"/>
<vbox>
<button oncommand="MoveUp();" id="up" class="up" disabled="true"
label="&languages.customize.moveUp.label;"

4
suite/common/pref/pref-policies.xul
Просмотреть файл

@ -17,9 +17,9 @@
<label value="&policies.label;"/>
<hbox>
<tree id="zones" flex="1">
<treecolgroup>
<treecols>
<treecol flex="1"/>
</treecolgroup>
</treecols>
<treechildren id="zoneChildren" flex="1">
<treeitem open="true">

41
suite/common/pref/pref-scripts.js
Просмотреть файл

@ -40,38 +40,6 @@ const pref = Components.classes["@mozilla.org/preferences;1"].getService(Compone
// need it globally, but can only set it in startup()
var data;
function doAllowWindowOpen(){
data.scriptData["allowWindowOpenChanged"].value = !data.scriptData["allowWindowOpenChanged"].value;
}
function doAllowTargetNew(){
data.scriptData["allowTargetNewChanged"].value = !data.scriptData["allowTargetNewChanged"].value;
}
function doWindowMoveResize(){
data.scriptData["allowWindowMoveResizeChanged"].value = !data.scriptData["allowWindowMoveResizeChanged"].value;
}
function doWindowStatusChange(){
data.scriptData["allowWindowStatusChangeChanged"].value = !data.scriptData["allowWindowStatusChangeChanged"].value;
}
function doWindowFlipChange(){
data.scriptData["allowWindowFlipChanged"].value = !data.scriptData["allowWindowFlipChanged"].value;
}
function doAllowCookieSet(){
data.scriptData["allowDocumentCookieSetChanged"].value = !data.scriptData["allowDocumentCookieSetChanged"].value;
}
function doAllowCookieGet(){
data.scriptData["allowDocumentCookieGetChanged"].value = !data.scriptData["allowDocumentCookieGetChanged"].value;
}
function doAllowImageSrcChange(){
data.scriptData["allowImageSrcChangeChanged"].value = !data.scriptData["allowImageSrcChangeChanged"].value;
}
function changeDisabledState(state){
//Set the states of the groupbox children state based on the "javascript enabled" checkbox value
document.getElementById("allowScripts").disabled = state;
@ -201,6 +169,8 @@ function Startup(){
javascriptEnabledChange();
document.getElementById("AllowList").addEventListener("CheckboxStateChange", onCheckboxCheck, false);
parent.hPrefWindow.registerOKCallbackFunc(doOnOk);
}
@ -214,7 +184,7 @@ function doOnOk(){
//The nested functions are needed because doOnOk cannot access anything outside of its scope
//when it is called
function getCheckboxValue(name){
if ("doAllowWindowOpen" in window)
if ("onCheckboxCheck" in window)
return document.getElementById(name).checked;
return data[name].checked;
@ -289,3 +259,8 @@ function doOnOk(){
getCheckboxValue("allowImageSrcChange"));
}
}
function onCheckboxCheck(event)
{
data.scriptData[event.target.id+"Changed"].value = !data.scriptData[event.target.id+"Changed"].value;
}

38
suite/common/pref/pref-scripts.xul
Просмотреть файл

@ -65,32 +65,14 @@
<label id="allowScripts" value="&allowScripts.label;"/>
<tree>
<treechildren flex="1">
<treerow>
<checkbox id="allowWindowOpen" label="&allowWindowOpen.label;" oncommand="doAllowWindowOpen();"/>
</treerow>
<treerow>
<checkbox id="allowTargetNew" label="&allowTargetNew.label;" oncommand="doAllowTargetNew();"/>
</treerow>
<treerow>
<checkbox id="allowWindowMoveResize" label="&allowWindowMoveResize.label;" oncommand="doWindowMoveResize();"/>
</treerow>
<treerow>
<checkbox id="allowWindowFlip" label="&allowWindowFlip.label;" oncommand="doWindowFlipChange();"/>
</treerow>
<treerow>
<checkbox id="allowWindowStatusChange" label="&allowWindowStatusChange.label;" oncommand="doWindowStatusChange();"/>
</treerow>
<treerow>
<checkbox id="allowImageSrcChange" label="&allowWindowImageSrcChange.label;" oncommand="doAllowImageSrcChange();"/>
</treerow>
<treerow>
<checkbox id="allowDocumentCookieSet" label="&allowDocumentCookieSet.label;" oncommand="doAllowCookieSet();"/>
</treerow>
<treerow>
<checkbox id="allowDocumentCookieGet" label="&allowDocumentCookieGet.label;" oncommand="doAllowCookieGet();"/>
</treerow>
</treechildren>
</tree>
<listbox id="AllowList">
<listitem type="checkbox" id="allowWindowOpen" label="&allowWindowOpen.label;"/>
<listitem type="checkbox" id="allowTargetNew" label="&allowTargetNew.label;"/>
<listitem type="checkbox" id="allowWindowMoveResize" label="&allowWindowMoveResize.label;"/>
<listitem type="checkbox" id="allowWindowFlip" label="&allowWindowFlip.label;"/>
<listitem type="checkbox" id="allowWindowStatusChange" label="&allowWindowStatusChange.label;"/>
<listitem type="checkbox" id="allowImageSrcChange" label="&allowWindowImageSrcChange.label;"/>
<listitem type="checkbox" id="allowDocumentCookieSet" label="&allowDocumentCookieSet.label;"/>
<listitem type="checkbox" id="allowDocumentCookieGet" label="&allowDocumentCookieGet.label;"/>
</listbox>
</page>

46
suite/common/pref/pref-smart_browsing.js
Просмотреть файл

@ -23,7 +23,7 @@
function Startup()
{
// populate tree
// populate listbox
var domainPrefField = document.getElementById( "browserRelatedDisabledForDomains" );
var domains = domainPrefField.getAttribute("value").split(",");
if (domains[0] != "")
@ -41,10 +41,9 @@ function Startup()
function selectFirstCell()
{
var domainKids = document.getElementById( "disabledKids" );
if (domainKids.childNodes.length >= 1) {
var domainTree = document.getElementById( "disabledDomains" );
domainTree.selectItem( domainKids.firstChild );
var domainList = document.getElementById( "disabledDomains" );
if (domainList.childNodes.length >= 1) {
domainList.selectItem( domainList.firstChild );
}
}
@ -52,8 +51,8 @@ function addDomain()
{
var domainField = document.getElementById( "addDomain" );
if (domainField.value != "") {
var domainTree = document.getElementById( "disabledDomains" );
domainTree.selectItem( createCell( domainField.value ) );
var domainList = document.getElementById( "disabledDomains" );
domainList.selectItem( createCell( domainField.value ) );
rebuildPrefValue();
domainField.value = "";
doButtonEnabling();
@ -63,14 +62,13 @@ function addDomain()
function removeDomain()
{
var domainTree = document.getElementById( "disabledDomains" );
var treeKids = document.getElementById( "disabledKids" );
var selectedItems = domainTree.selectedItems;
var domainList = document.getElementById( "disabledDomains" );
var selectedItems = domainList.selectedItems;
if (selectedItems.length >= 1)
{
for (var i = 0; i < selectedItems.length; i++)
{
treeKids.removeChild( selectedItems[i] );
domainList.removeChild( selectedItems[i] );
}
}
selectFirstCell();
@ -80,13 +78,13 @@ function removeDomain()
function rebuildPrefValue()
{
var treeKids = document.getElementById( "disabledKids" );
var domainList = document.getElementById( "disabledDomains" );
var string = "";
if (treeKids.hasChildNodes())
if (domainList.hasChildNodes())
{
for (var i = 0; i < treeKids.childNodes.length; i++)
for (var i = 0; i < domainList.childNodes.length; i++)
{
var domain = treeKids.childNodes[i].firstChild.firstChild.getAttribute("label");
var domain = domainList.childNodes[i].getAttribute("label");
string += ( domain + "," );
}
}
@ -96,18 +94,14 @@ function rebuildPrefValue()
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( "label", aLabel );
row.appendChild( cell );
item.appendChild( row );
treeKids.appendChild( item );
var domainList = document.getElementById( "disabledDomains" );
var item = document.createElement( "listitem" );
item.setAttribute( "label", aLabel );
domainList.appendChild( item );
return item;
}
function treeHandleEvent( aEvent )
function listboxHandleEvent( aEvent )
{
if (aEvent.keyCode == 46)
removeDomain();
@ -133,9 +127,9 @@ function doButtonEnabling()
function toggleRemoveButton()
{
var domains = document.getElementById("disabledKids");
var domainList = document.getElementById("disabledDomains");
var removeButton = document.getElementById("removeDomain");
if (domains.childNodes.length == 0)
if (domainList.childNodes.length == 0)
removeButton.disabled = true;
else
removeButton.disabled = false;

8
suite/common/pref/pref-smart_browsing.xul
Просмотреть файл

@ -77,12 +77,8 @@
</row>
<separator class="thin"/>
<row flex="1">
<tree id="disabledDomains" seltype="multiple" onkeyup="treeHandleEvent(event)" style="height: 0px; width: 0px;" flex="1">
<treecolgroup>
<treecol flex="1"/>
</treecolgroup>
<treechildren id="disabledKids" flex="1"/>
</tree>
<listbox id="disabledDomains" seltype="multiple"
onkeyup="listboxHandleEvent(event)" style="height: 0px; width: 0px;" flex="1"/>
<vbox align="center">
<button id="removeDomain" label="&removeDomain.label;"
accesskey="&removeDomain.accesskey;" disabled="true"

4
suite/common/pref/pref-smartupdate.xul
Просмотреть файл

@ -95,9 +95,9 @@
<html:div class="hspace-both">&selectUninstall.label;</html:div>
<hbox class="hspace-both vspace" flex="100%" style="width: 93%; height: 100%">
<tree id="smartUpdatePackages" flex="100%" style="height: 40%;">
<treecolgroup>
<treecols>
<treecol flex="1"/>
</treecolgroup>
</treecols>
<treechildren flex="1">
<treeitem>
<treerow>

25
suite/common/pref/pref-themes.js
Просмотреть файл

@ -50,9 +50,9 @@ catch(e) {}
function Startup()
{
gData = parent.hPrefWindow.wsm.dataManager.pageData["chrome://communicator/content/pref/pref-themes.xul"];
var tree = document.getElementById( "skinsTree" );
var list = document.getElementById( "skinsList" );
if (gData.loaded) {
tree.selectedIndex = gData.themeIndex;
list.selectedIndex = gData.themeIndex;
return;
}
gData.loaded = true;
@ -68,17 +68,16 @@ function Startup()
Components.interfaces.nsISupportsWString).data;
} catch (e) {
}
var theSkinKids = document.getElementById("theSkinKids");
var matches;
for (var i = 0; i < theSkinKids.childNodes.length; ++i) {
var child = theSkinKids.childNodes[i];
for (var i = 0; i < list.childNodes.length; ++i) {
var child = list.childNodes[i];
var name = child.getAttribute("name");
if (!theme)
matches = chromeRegistry.isSkinSelected(name, true) == Components.interfaces.nsIChromeRegistry.FULL;
else
matches = name == theme;
if (matches) {
tree.selectItem(child);
list.selectItem(child);
break;
}
}
@ -146,31 +145,31 @@ function applySkin()
function uninstallSkin()
{
var tree = document.getElementById("skinsTree");
var selectedSkinItem = tree.selectedItems[0];
var list = document.getElementById("skinsList");
var selectedSkinItem = list.selectedItems[0];
var skinName = selectedSkinItem.getAttribute("name");
var inUse = chromeRegistry.isSkinSelected(skinName, true);
chromeRegistry.uninstallSkin(skinName, true);
if (inUse)
chromeRegistry.refreshSkins();
tree.selectedIndex = 0;
list.selectedIndex = 0;
}
function themeSelect()
{
var tree = document.getElementById("skinsTree");
var list = document.getElementById("skinsList");
if (!tree)
if (!list)
return;
var prefbundle = document.getElementById("bundle_prefutilities");
var selectedItem = tree.selectedItems.length ? tree.selectedItems[0] : null;
var selectedItem = list.selectedItems.length ? list.selectedItems[0] : null;
if (selectedItem && selectedItem.getAttribute("skin") == "true") {
var themeName = selectedItem.getAttribute("displayName");
var skinName = selectedItem.getAttribute("name");
gData.name = skinName;
gData.themeIndex = tree.selectedIndex;
gData.themeIndex = list.selectedIndex;
var oldTheme;
try {

29
suite/common/pref/pref-themes.xul
Просмотреть файл

@ -49,31 +49,22 @@
<description>&installedThemes.label;</description>
<tree id="skinsTree" datasources="rdf:chrome"
<listbox id="skinsList" datasources="rdf:chrome"
onselect="themeSelect();"
ref="urn:mozilla:skin:root" rows="5">
<treecolgroup>
<treecol flex="1"/>
</treecolgroup>
<template>
<rule>
<treechildren>
<treeitem uri="..." skin="true"
author="rdf:http://www.mozilla.org/rdf/chrome#author"
displayName="rdf:http://www.mozilla.org/rdf/chrome#displayName"
name="rdf:http://www.mozilla.org/rdf/chrome#name"
description="rdf:http://www.mozilla.org/rdf/chrome#description"
image="rdf:http://www.mozilla.org/rdf/chrome#image"
loctype="rdf:http://www.mozilla.org/rdf/chrome#locType">
<treerow>
<treecell label="rdf:http://www.mozilla.org/rdf/chrome#displayName"/>
</treerow>
</treeitem>
</treechildren>
<listitem uri="..." skin="true"
label="rdf:http://www.mozilla.org/rdf/chrome#displayName"
author="rdf:http://www.mozilla.org/rdf/chrome#author"
displayName="rdf:http://www.mozilla.org/rdf/chrome#displayName"
name="rdf:http://www.mozilla.org/rdf/chrome#name"
description="rdf:http://www.mozilla.org/rdf/chrome#description"
image="rdf:http://www.mozilla.org/rdf/chrome#image"
loctype="rdf:http://www.mozilla.org/rdf/chrome#locType"/>
</rule>
</template>
<treechildren id="theSkinKids" flex="1"/>
</tree>
</listbox>
<separator class="thin"/>

132
suite/common/pref/pref-winhooks.xul
Просмотреть файл

@ -41,124 +41,30 @@
<!-- File types -->
<label value="&files.text;"/>
<tree class="indent" style="width: 0px; height: 0px;" flex="2">
<treechildren flex="1">
<treeitem>
<treerow>
<treecell>
<checkbox id="isHandlingHTML" label="&html.label;" accesskey="&html.accesskey;" allowevents="true"/>
</treecell>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell>
<checkbox id="isHandlingJPEG" label="&jpeg.label;" accesskey="&jpeg.accesskey;" allowevents="true"/>
</treecell>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell>
<checkbox id="isHandlingGIF" label="&gif.label;" accesskey="&gif.accesskey;" allowevents="true"/>
</treecell>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell>
<checkbox id="isHandlingPNG" label="&png.label;" accesskey="&png.accesskey;" allowevents="true"/>
</treecell>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell>
<checkbox id="isHandlingMNG" label="&mng.label;" accesskey="&mng.accesskey;" allowevents="true"/>
</treecell>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell>
<checkbox id="isHandlingBMP" label="&bmp.label;" accesskey="&bmp.accesskey;" allowevents="true"/>
</treecell>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell>
<checkbox id="isHandlingICO" label="&ico.label;" accesskey="&ico.accesskey;" allowevents="true"/>
</treecell>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell>
<checkbox id="isHandlingXML" label="&xml.label;" accesskey="&xml.accesskey;" allowevents="true"/>
</treecell>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell>
<checkbox id="isHandlingXHTML" label="&xhtml.label;" accesskey="&xhtml.accesskey;" allowevents="true"/>
</treecell>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell>
<checkbox id="isHandlingXUL" label="&xul.label;" accesskey="&xul.accesskey;" allowevents="true"/>
</treecell>
</treerow>
</treeitem>
</treechildren>
</tree>
<listbox class="indent" style="width: 0px; height: 0px;" flex="2">
<listitem type="checkbox" id="isHandlingHTML" label="&html.label;" accesskey="&html.accesskey;"/>
<listitem type="checkbox" id="isHandlingJPEG" label="&jpeg.label;" accesskey="&jpeg.accesskey;"/>
<listitem type="checkbox" id="isHandlingGIF" label="&gif.label;" accesskey="&gif.accesskey;"/>
<listitem type="checkbox" id="isHandlingPNG" label="&png.label;" accesskey="&png.accesskey;"/>
<listitem type="checkbox" id="isHandlingMNG" label="&mng.label;" accesskey="&mng.accesskey;"/>
<listitem type="checkbox" id="isHandlingBMP" label="&bmp.label;" accesskey="&bmp.accesskey;"/>
<listitem type="checkbox" id="isHandlingICO" label="&ico.label;" accesskey="&ico.accesskey;"/>
<listitem type="checkbox" id="isHandlingXML" label="&xml.label;" accesskey="&xml.accesskey;"/>
<listitem type="checkbox" id="isHandlingXHTML" label="&xhtml.label;" accesskey="&xhtml.accesskey;"/>
<listitem type="checkbox" id="isHandlingXUL" label="&xul.label;" accesskey="&xul.accesskey;"/>
</listbox>
<separator/>
<!-- Internet Shortcuts -->
<label value="&shortcuts.text;"/>
<tree class="inset indent" style="width: 0px; height: 0px;" flex="2">
<treechildren flex="1">
<treeitem>
<treerow>
<treecell>
<checkbox id="isHandlingHTTP" label="&http.label;" accesskey="&http.accesskey;" allowevents="true"/>
</treecell>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell>
<checkbox id="isHandlingHTTPS" label="&https.label;" accesskey="&https.accesskey;" allowevents="true"/>
</treecell>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell>
<checkbox id="isHandlingFTP" label="&ftp.label;" accesskey="&ftp.accesskey;" allowevents="true"/>
</treecell>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell>
<checkbox id="isHandlingCHROME" label="&chrome.label;" accesskey="&chrome.accesskey;" allowevents="true"/>
</treecell>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell>
<checkbox id="isHandlingGOPHER" label="&gopher.label;" accesskey="&gopher.accesskey;" allowevents="true"/>
</treecell>
</treerow>
</treeitem>
</treechildren>
</tree>
<listbox class="indent" style="width: 0px; height: 0px;" flex="2">
<listitem type="checkbox" id="isHandlingHTTP" label="&http.label;" accesskey="&http.accesskey;"/>
<listitem type="checkbox" id="isHandlingHTTPS" label="&https.label;" accesskey="&https.accesskey;"/>
<listitem type="checkbox" id="isHandlingFTP" label="&ftp.label;" accesskey="&ftp.accesskey;"/>
<listitem type="checkbox" id="isHandlingCHROME" label="&chrome.label;" accesskey="&chrome.accesskey;"/>
<listitem type="checkbox" id="isHandlingGOPHER" label="&gopher.label;" accesskey="&gopher.accesskey;"/>
</listbox>
<separator/>

2
suite/common/pref/pref.xul
Просмотреть файл

@ -56,7 +56,7 @@
<hbox flex="1">
<!-- tree sidebar -->
<outliner id="prefsTree" style="width: 13em;"/>
<tree id="prefsTree" style="width: 13em;"/>
<vbox flex="1">
<dialogheader id="header"/>
<iframe id="panelFrame" name="panelFrame" style="width: 0px" flex="1"/>

262
suite/common/pref/preftree.xul
Просмотреть файл

@ -36,144 +36,144 @@
]]>
</script>
<outliner id="prefsTree" seltype="single" hidecolumnpicker="true"
<tree id="prefsTree" seltype="single" hidecolumnpicker="true"
onselect="if( hPrefWindow ) hPrefWindow.switchPage();">
<outlinercols>
<outlinercol id="categoryCol" label="&category.label;" flex="1" primary="true"/>
</outlinercols>
<outlinerchildren id="panelChildren">
<outlineritem container="true" id="appearance">
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-appearance.xul" label="&appear.label;"/>
</outlinerrow>
<outlinerchildren id="appearanceChildren">
<outlineritem>
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-fonts.xul" label="&fonts.label;"/>
</outlinerrow>
</outlineritem>
<outlineritem>
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-colors.xul" label="&colors.label;"/>
</outlinerrow>
</outlineritem>
<outlineritem id="themes-panel">
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-themes.xul" label="&themes.label;"/>
</outlinerrow>
</outlineritem>
</outlinerchildren>
</outlineritem>
<treecols>
<treecol id="categoryCol" label="&category.label;" flex="1" primary="true"/>
</treecols>
<treechildren id="panelChildren">
<treeitem container="true" id="appearance">
<treerow>
<treecell url="chrome://communicator/content/pref/pref-appearance.xul" label="&appear.label;"/>
</treerow>
<treechildren id="appearanceChildren">
<treeitem>
<treerow>
<treecell url="chrome://communicator/content/pref/pref-fonts.xul" label="&fonts.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell url="chrome://communicator/content/pref/pref-colors.xul" label="&colors.label;"/>
</treerow>
</treeitem>
<treeitem id="themes-panel">
<treerow>
<treecell url="chrome://communicator/content/pref/pref-themes.xul" label="&themes.label;"/>
</treerow>
</treeitem>
</treechildren>
</treeitem>
<!-- XXX remove this when overlays.rdf works for navigator -->
<outlineritem container="true" id="navigator">
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-navigator.xul" label="&navigator.label;"/>
</outlinerrow>
<outlinerchildren>
<outlineritem>
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-history.xul" label="&history.label;"/>
</outlinerrow>
</outlineritem>
<outlineritem>
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-languages.xul" label="&languages.label;"/>
</outlinerrow>
</outlineritem>
<outlineritem>
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-applications.xul" label="&applications.label;"/>
</outlinerrow>
</outlineritem>
<outlineritem>
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-smart_browsing.xul" label="&smartBrowse.label;"/>
</outlinerrow>
</outlineritem>
<outlineritem>
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-search.xul" label="&search.label;"/>
</outlinerrow>
</outlineritem>
<outlineritem>
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-tabs.xul" label="&tabWindows.label;"/>
</outlinerrow>
</outlineritem>
<treeitem container="true" id="navigator">
<treerow>
<treecell url="chrome://communicator/content/pref/pref-navigator.xul" label="&navigator.label;"/>
</treerow>
<treechildren>
<treeitem>
<treerow>
<treecell url="chrome://communicator/content/pref/pref-history.xul" label="&history.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell url="chrome://communicator/content/pref/pref-languages.xul" label="&languages.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell url="chrome://communicator/content/pref/pref-applications.xul" label="&applications.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell url="chrome://communicator/content/pref/pref-smart_browsing.xul" label="&smartBrowse.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell url="chrome://communicator/content/pref/pref-search.xul" label="&search.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell url="chrome://communicator/content/pref/pref-tabs.xul" label="&tabWindows.label;"/>
</treerow>
</treeitem>
<!-- Taking out Policies panel b/c bug 44121
<outlineritem>
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-policies.xul" label="&policies.label;"/>
</outlinerrow>
</outlineritem> -->
</outlinerchildren>
</outlineritem>
<treeitem>
<treerow>
<treecell url="chrome://communicator/content/pref/pref-policies.xul" label="&policies.label;"/>
</treerow>
</treeitem> -->
</treechildren>
</treeitem>
<!-- Security and Privacy items -->
<outlineritem container="true" id="securityItem">
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-security.xul" label="&security.label;" />
</outlinerrow>
<outlinerchildren id="securityChildren"/>
</outlineritem>
<treeitem container="true" id="securityItem">
<treerow>
<treecell url="chrome://communicator/content/pref/pref-security.xul" label="&security.label;" />
</treerow>
<treechildren id="securityChildren"/>
</treeitem>
<outlineritem container="true" id="advancedItem">
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-advanced.xul" label="&advance.label;"/>
</outlinerrow>
<outlinerchildren id="advancedChildren">
<outlineritem>
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-scripts.xul" label="&scriptsAndWindows.label;"/>
</outlinerrow>
</outlineritem>
<outlineritem>
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-cache.xul" label="&cache.label;"/>
</outlinerrow>
</outlineritem>
<outlineritem>
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-proxies.xul" label="&proxies.label;"/>
</outlinerrow>
</outlineritem>
<outlineritem>
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-smartupdate.xul" label="&smart.label;"/>
</outlinerrow>
</outlineritem>
<outlineritem id="mousewheelItem">
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-mousewheel.xul" label="&mousewheel.label;"/>
</outlinerrow>
</outlineritem>
</outlinerchildren>
</outlineritem>
<treeitem container="true" id="advancedItem">
<treerow>
<treecell url="chrome://communicator/content/pref/pref-advanced.xul" label="&advance.label;"/>
</treerow>
<treechildren id="advancedChildren">
<treeitem>
<treerow>
<treecell url="chrome://communicator/content/pref/pref-scripts.xul" label="&scriptsAndWindows.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell url="chrome://communicator/content/pref/pref-cache.xul" label="&cache.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell url="chrome://communicator/content/pref/pref-proxies.xul" label="&proxies.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell url="chrome://communicator/content/pref/pref-smartupdate.xul" label="&smart.label;"/>
</treerow>
</treeitem>
<treeitem id="mousewheelItem">
<treerow>
<treecell url="chrome://communicator/content/pref/pref-mousewheel.xul" label="&mousewheel.label;"/>
</treerow>
</treeitem>
</treechildren>
</treeitem>
<outlineritem container="true" id="debugItem">
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-debug.xul" label="&debug.label;"/>
</outlinerrow>
<outlinerchildren id="debugChildren">
<outlineritem>
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-debug1.xul" label="&debug1.label;"/>
</outlinerrow>
</outlineritem>
<outlineritem>
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-debug2.xul" label="&debug2.label;"/>
</outlinerrow>
</outlineritem>
</outlinerchildren>
</outlineritem>
<treeitem container="true" id="debugItem">
<treerow>
<treecell url="chrome://communicator/content/pref/pref-debug.xul" label="&debug.label;"/>
</treerow>
<treechildren id="debugChildren">
<treeitem>
<treerow>
<treecell url="chrome://communicator/content/pref/pref-debug1.xul" label="&debug1.label;"/>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell url="chrome://communicator/content/pref/pref-debug2.xul" label="&debug2.label;"/>
</treerow>
</treeitem>
</treechildren>
</treeitem>
<outlineritem id="offlineItem">
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-offline.xul" label="&offline.label;"/>
</outlinerrow>
</outlineritem>
</outlinerchildren>
</outliner>
<treeitem id="offlineItem">
<treerow>
<treecell url="chrome://communicator/content/pref/pref-offline.xul" label="&offline.label;"/>
</treerow>
</treeitem>
</treechildren>
</tree>
</overlay>

14
suite/common/pref/win/platformPrefOverlay.xul
Просмотреть файл

@ -29,13 +29,13 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<!-- Windows integration is (obviously) only applicable on Windows. -->
<outlinerchildren id="advancedChildren">
<outlineritem id="winhooks">
<outlinerrow>
<outlinercell url="chrome://communicator/content/pref/pref-winhooks.xul" label="&winhooks.label;"/>
</outlinerrow>
</outlineritem>
</outlinerchildren>
<treechildren id="advancedChildren">
<treeitem id="winhooks">
<treerow>
<treecell url="chrome://communicator/content/pref/pref-winhooks.xul" label="&winhooks.label;"/>
</treerow>
</treeitem>
</treechildren>
</overlay>