mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-11 16:32:59 +00:00
Remove final overlay on prefs dlg; remove unused files.
This commit is contained in:
blakeross%telocity.com
parent
4595bddb3c
commit
99d0a31454
@ -1,8 +1,6 @@
|
||||
<?xml version="1.0"?>
|
||||
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
|
||||
|
||||
<?xul-overlay href="chrome://browser/content/pref/preftree.xul"?>
|
||||
|
||||
<!DOCTYPE window SYSTEM "chrome://browser/locale/pref/pref.dtd" >
|
||||
|
||||
<dialog id="prefDialog"
|
||||
@ -51,8 +49,78 @@
|
||||
<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
|
||||
|
||||
<hbox flex="1">
|
||||
<!-- tree sidebar -->
|
||||
<tree id="prefsTree" style="width: 13em;"/>
|
||||
<tree id="prefsTree" seltype="single" hidecolumnpicker="true" style="width: 13em;"
|
||||
onselect="if( hPrefWindow ) hPrefWindow.switchPage();">
|
||||
<treecols>
|
||||
<treecol id="categoryCol" flex="1" hideheader="true" primary="true"/>
|
||||
</treecols>
|
||||
|
||||
<treechildren id="panelChildren">
|
||||
<treeitem id="navigator">
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-navigator.xul" label="&navigator.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-fonts.xul" label="&fonts.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<treeitem id="themes-panel">
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-themes.xul" label="&themes.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<!-- XXX remove this when overlays.rdf works for navigator -->
|
||||
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-privacy.xul" label="&privacy.label;" />
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-connection.xul" label="&connection.label;" />
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
|
||||
<treeitem id="advancedItem" container="true">
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-advanced.xul" label="&advance.label;"/>
|
||||
</treerow>
|
||||
<treechildren id="advancedChildren">
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-popups.xul" label="&popups.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-scripts.xul" label="&scriptsAndWindows.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-tabs.xul" label="&tabs.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
#ifdef XP_WIN
|
||||
<treeitem id="winhooks">
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-winhooks.xul" label="&winhooks.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
#endif
|
||||
</treechildren>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
</tree>
|
||||
<vbox flex="1">
|
||||
<dialogheader id="header"/>
|
||||
<iframe id="panelFrame" name="panelFrame" style="width: 0px" flex="1"/>
|
||||
|
||||
@ -1,109 +0,0 @@
|
||||
<?xml version="1.0"?>
|
||||
# The contents of this file are subject to the Netscape Public
|
||||
# License Version 1.1 (the "License"); you may not use this file
|
||||
# except in compliance with the License. You may obtain a copy of
|
||||
# the License at http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS
|
||||
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
# implied. See the License for the specific language governing
|
||||
# rights and limitations under the License.
|
||||
#
|
||||
# The Original Code is Mozilla Communicator client code, released
|
||||
# March 31, 1998.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998-1999 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Ben Goodger <ben@netscape.com>
|
||||
# Dave Hyatt (hyatt@apple.com)
|
||||
|
||||
<!DOCTYPE window SYSTEM "chrome://browser/locale/pref/preftree.dtd" >
|
||||
|
||||
<overlay id="prefTreeOverlay"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<script>
|
||||
<![CDATA[
|
||||
var _elementIDs = []; // hack
|
||||
]]>
|
||||
</script>
|
||||
|
||||
<tree id="prefsTree" seltype="single" hidecolumnpicker="true"
|
||||
onselect="if( hPrefWindow ) hPrefWindow.switchPage();">
|
||||
<treecols>
|
||||
<treecol id="categoryCol" flex="1" hideheader="true" primary="true"/>
|
||||
</treecols>
|
||||
|
||||
<treechildren id="panelChildren">
|
||||
<treeitem id="navigator">
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-navigator.xul" label="&navigator.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-fonts.xul" label="&fonts.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<treeitem id="themes-panel">
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-themes.xul" label="&themes.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<!-- XXX remove this when overlays.rdf works for navigator -->
|
||||
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-privacy.xul" label="&privacy.label;" />
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-connection.xul" label="&connection.label;" />
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
|
||||
<treeitem id="advancedItem" container="true">
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-advanced.xul" label="&advance.label;"/>
|
||||
</treerow>
|
||||
<treechildren id="advancedChildren">
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-popups.xul" label="&popups.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-scripts.xul" label="&scriptsAndWindows.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-tabs.xul" label="&tabs.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
#ifdef XP_WIN
|
||||
<treeitem id="winhooks">
|
||||
<treerow>
|
||||
<treecell url="chrome://browser/content/pref/pref-winhooks.xul" label="&winhooks.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
#endif
|
||||
</treechildren>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
</tree>
|
||||
|
||||
</overlay>
|
||||
@ -20,9 +20,8 @@ browser.jar:
|
||||
* content/browser/pref/pref-scripts.js (content/pref-scripts.js)
|
||||
* content/browser/pref/pref-privacy.xul (content/pref-privacy.xul)
|
||||
* content/browser/pref/pref-popups.xul (content/pref-popups.xul)
|
||||
content/browser/pref/pref.xul (content/pref.xul)
|
||||
* content/browser/pref/pref.xul (content/pref.xul)
|
||||
* content/browser/pref/nsPrefWindow.js (content/nsPrefWindow.js)
|
||||
* content/browser/pref/preftree.xul (content/preftree.xul)
|
||||
* content/browser/pref/pref-winhooks.xul (content/pref-winhooks.xul)
|
||||
* content/browser/pref/pref-winhooks.js (content/pref-winhooks.js)
|
||||
* content/browser/pref/pref-tabs.xul (content/pref-tabs.xul)
|
||||
@ -41,6 +40,5 @@ en-US.jar:
|
||||
locale/en-US/browser/pref/pref-privacy.dtd (locale/pref-privacy.dtd)
|
||||
locale/en-US/browser/pref/pref-popups.dtd (locale/pref-popups.dtd)
|
||||
locale/en-US/browser/pref/prefutilities.properties (locale/prefutilities.properties)
|
||||
* locale/en-US/browser/pref/preftree.dtd (locale/preftree.dtd)
|
||||
locale/en-US/browser/pref/pref.dtd (locale/pref.dtd)
|
||||
* locale/en-US/browser/pref/pref.dtd (locale/pref.dtd)
|
||||
locale/en-US/browser/pref/pref-winhooks.dtd (locale/pref-winhooks.dtd)
|
||||
|
||||
@ -11,3 +11,18 @@
|
||||
XUL/FE DEVELOPERS: DO NOT MODIFY THIS VALUE. It represents the correct
|
||||
size of this window for en-US. -->
|
||||
<!ENTITY prefWindow.size "width: 52em; height: 41em;">
|
||||
<!--LOCALIZATION NOTE : FILE Lists preferences categories that appear on the left of the preferences dialog -->
|
||||
<!ENTITY fonts.label "Fonts and Colors">
|
||||
<!ENTITY themes.label "Themes and Extensions">
|
||||
<!--LOCALIZATION NOTE (navigator.label): DONT_TRANSLATE -->
|
||||
<!ENTITY navigator.label "General">
|
||||
<!--LOCALIZATION NOTE (smartBrowse.label): DONT_TRANSLATE -->
|
||||
<!ENTITY privacy.label "Privacy">
|
||||
<!ENTITY advance.label "Advanced">
|
||||
<!ENTITY connection.label "Connection">
|
||||
<!ENTITY popups.label "Popup Windows">
|
||||
<!ENTITY scriptsAndWindows.label "JavaScript">
|
||||
<!ENTITY tabs.label "Tabbed Browsing">
|
||||
#ifdef XP_WIN
|
||||
<!ENTITY winhooks.label "System">
|
||||
#endif
|
||||
@ -1,17 +0,0 @@
|
||||
<!ENTITY category.label "Category">
|
||||
|
||||
<!--LOCALIZATION NOTE : FILE Lists preferences categories that appear on the left of the preferences dialog -->
|
||||
<!ENTITY fonts.label "Fonts and Colors">
|
||||
<!ENTITY themes.label "Themes and Extensions">
|
||||
<!--LOCALIZATION NOTE (navigator.label): DONT_TRANSLATE -->
|
||||
<!ENTITY navigator.label "General">
|
||||
<!--LOCALIZATION NOTE (smartBrowse.label): DONT_TRANSLATE -->
|
||||
<!ENTITY privacy.label "Privacy">
|
||||
<!ENTITY advance.label "Advanced">
|
||||
<!ENTITY connection.label "Connection">
|
||||
<!ENTITY popups.label "Popup Windows">
|
||||
<!ENTITY scriptsAndWindows.label "JavaScript">
|
||||
<!ENTITY tabs.label "Tabbed Browsing">
|
||||
#ifdef XP_WIN
|
||||
<!ENTITY winhooks.label "System">
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user