зеркало из https://github.com/mozilla/gecko-dev.git
Factoring history prefs into separate pane (5236). a=pavlov
This commit is contained in:
mcafee%netscape.com
Родитель
952b503a2a
Коммит
67e5d85054
|
|
@ -23,6 +23,7 @@ pref-download.xul
|
|||
pref-editing.xul
|
||||
pref-fonts.xul
|
||||
pref-fonts.js
|
||||
pref-history.xul
|
||||
pref-languages.xul
|
||||
pref-languages2.xul
|
||||
pref-languages-add.xul
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@ CHROME_CONTENT = \
|
|||
pref-editing.xul \
|
||||
pref-fonts.xul \
|
||||
pref-fonts.js \
|
||||
pref-history.xul \
|
||||
pref-languages.xul \
|
||||
pref-languages2.xul \
|
||||
pref-languages-add.xul \
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ CHROME_CONTENT = \
|
|||
.\pref-editing.xul \
|
||||
.\pref-fonts.xul \
|
||||
.\pref-fonts.js \
|
||||
.\pref-history.xul \
|
||||
.\pref-languages.xul \
|
||||
.\pref-languages2.xul \
|
||||
.\pref-languages-add.xul \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,94 @@
|
|||
<?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):
|
||||
-->
|
||||
|
||||
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
|
||||
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
|
||||
|
||||
<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-history.dtd" >
|
||||
|
||||
<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
class="color-dialog"
|
||||
orient="vertical" title="&title.label;"
|
||||
onload="parent.initPanel('chrome://communicator/content/pref/pref-history.xul');">
|
||||
|
||||
<script language="javascript" src="chrome://global/content/strres.js"></script>
|
||||
<script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"></script>
|
||||
<script language="javascript" src="chrome://global/content/nsJSComponentManager.js"></script>
|
||||
|
||||
<script language="JavaScript">
|
||||
|
||||
<![CDATA[
|
||||
_elementIDs = ["histDay"];
|
||||
]]>
|
||||
|
||||
function Startup()
|
||||
{
|
||||
var urlBarHist = nsJSComponentManager.getService("component://netscape/browser/urlbarhistory",
|
||||
"nsIUrlbarHistory");
|
||||
if ( urlBarHist )
|
||||
{
|
||||
var button = document.getElementById("ClearUrlBarHistoryButton");
|
||||
if ( urlBarHist.count == 0 )
|
||||
{
|
||||
button.setAttribute("disabled","true");
|
||||
}
|
||||
else
|
||||
{
|
||||
button.removeAttribute("disabled");
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<box class="box-smallheader" title="&lHeader;"/>
|
||||
|
||||
<!-- history -->
|
||||
<titledbox orient="vertical">
|
||||
<title><text value="&header3.label;"/></title>
|
||||
<html>&historyPages.label;</html>
|
||||
<box autostretch="never">
|
||||
<text class="label" value="&pageHis.label;" accesskey="&pageHis.accesskey;" for="histDay"/>
|
||||
<textfield id="histDay" size="3" wsm_persist="true"
|
||||
pref="true" preftype="int" prefstring="browser.history_expire_days"
|
||||
prefattribute="value"/>
|
||||
<text class="label" value="&days.label;"/>
|
||||
<spring flex="1"/>
|
||||
<button class="dialog" value="&clearHistory.label;" accesskey="&clearHistory.accesskey;"/>
|
||||
</box>
|
||||
</titledbox>
|
||||
|
||||
<!-- no honey, I haven't been viewing porn, honest! -->
|
||||
<titledbox orient="vertical">
|
||||
<title><text value="&locationBarHistory.label;"/></title>
|
||||
<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;"
|
||||
oncommand="prefClearUrlbarHistory();"/>
|
||||
</box>
|
||||
</box>
|
||||
</titledbox>
|
||||
|
||||
</window>
|
||||
|
||||
|
|
@ -38,25 +38,8 @@
|
|||
</script>
|
||||
<script language="JavaScript">
|
||||
<![CDATA[
|
||||
_elementIDs = ["startupPage", "browserStartupHomepage", "histDay"];
|
||||
_elementIDs = ["startupPage", "browserStartupHomepage"];
|
||||
]]>
|
||||
function Startup()
|
||||
{
|
||||
var urlBarHist = nsJSComponentManager.getService("component://netscape/browser/urlbarhistory",
|
||||
"nsIUrlbarHistory");
|
||||
if ( urlBarHist )
|
||||
{
|
||||
var button = document.getElementById("ClearUrlBarHistoryButton");
|
||||
if ( urlBarHist.count == 0 )
|
||||
{
|
||||
button.setAttribute("disabled","true");
|
||||
}
|
||||
else
|
||||
{
|
||||
button.removeAttribute("disabled");
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<box class="box-smallheader" title="&lHeader;"/>
|
||||
|
|
@ -65,7 +48,7 @@
|
|||
<titledbox>
|
||||
<title><text value="&navRadio;"/></title>
|
||||
|
||||
<radiogroup id="startupPage" autostretch="never"
|
||||
<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;"/>
|
||||
|
|
@ -94,32 +77,5 @@
|
|||
</box>
|
||||
</titledbox>
|
||||
|
||||
<!-- history -->
|
||||
<titledbox orient="vertical">
|
||||
<title><text value="&header3.label;"/></title>
|
||||
<html>&historyPages.label;</html>
|
||||
<box autostretch="never">
|
||||
<text class="label" value="&pageHis.label;" accesskey="&pageHis.accesskey;" for="histDay"/>
|
||||
<textfield id="histDay" size="3" wsm_persist="true"
|
||||
pref="true" preftype="int" prefstring="browser.history_expire_days"
|
||||
prefattribute="value"/>
|
||||
<text class="label" value="&days.label;"/>
|
||||
<spring flex="1"/>
|
||||
<button class="dialog" value="&clearHistory.label;" accesskey="&clearHistory.accesskey;"/>
|
||||
</box>
|
||||
</titledbox>
|
||||
|
||||
<!-- no honey, I haven't been viewing porn, honest! -->
|
||||
<titledbox orient="vertical">
|
||||
<title><text value="&locationBarHistory.label;"/></title>
|
||||
<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;"
|
||||
oncommand="prefClearUrlbarHistory();"/>
|
||||
</box>
|
||||
</box>
|
||||
</titledbox>
|
||||
|
||||
</window>
|
||||
|
||||
|
|
|
|||
|
|
@ -74,6 +74,11 @@
|
|||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-navigator.xul" value="&navigator.label;"/>
|
||||
</treerow>
|
||||
<treechildren>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-history.xul" value="&history.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-languages2.xul" value="&languages.label;"/>
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ pref-composer.dtd
|
|||
pref-debug.dtd
|
||||
pref-download.dtd
|
||||
pref-fonts.dtd
|
||||
pref-history.dtd
|
||||
pref-languages.dtd
|
||||
pref-languages2.dtd
|
||||
pref-navigator.dtd
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ CHROME_L10N = \
|
|||
pref-debug.dtd \
|
||||
pref-download.dtd \
|
||||
pref-fonts.dtd \
|
||||
pref-history.dtd \
|
||||
pref-languages.dtd \
|
||||
pref-languages2.dtd \
|
||||
pref-navigator.dtd \
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ CHROME_L10N = \
|
|||
.\pref-debug.dtd \
|
||||
.\pref-editing.dtd \
|
||||
.\pref-fonts.dtd \
|
||||
.\pref-history.dtd \
|
||||
.\pref-languages.dtd \
|
||||
.\pref-languages2.dtd \
|
||||
.\pref-navigator.dtd \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
<!ENTITY title.label "History">
|
||||
<!ENTITY lHeader "History">
|
||||
|
||||
<!ENTITY header3.label "Browsing history">
|
||||
<!ENTITY historyPages.label "History is a list of pages you have previously visited.">
|
||||
<!ENTITY pageHis.label "Pages in history expire after:">
|
||||
<!ENTITY pageHis.accesskey "x">
|
||||
<!ENTITY days.label "days.">
|
||||
<!ENTITY clearHistory.label "Clear History">
|
||||
<!ENTITY clearHistory.accesskey "r">
|
||||
|
||||
<!ENTITY locationBarHistory.label "Location Bar history">
|
||||
<!ENTITY clearLocationBar.label "Clear the list of sites stored in the location bar menu.">
|
||||
<!ENTITY clearLocationBarButton.label "Clear Location Bar">
|
||||
<!ENTITY clearLocationBarButton.accesskey "b">
|
||||
|
||||
|
|
@ -19,16 +19,3 @@
|
|||
<!ENTITY browseFile.label "Choose File...">
|
||||
<!ENTITY browseFile.accesskey "c">
|
||||
|
||||
<!ENTITY header3.label "History">
|
||||
<!ENTITY historyPages.label "History is a list of pages you have previously visited.">
|
||||
<!ENTITY pageHis.label "Pages in history expire after:">
|
||||
<!ENTITY pageHis.accesskey "x">
|
||||
<!ENTITY days.label "days.">
|
||||
<!ENTITY clearHistory.label "Clear History">
|
||||
<!ENTITY clearHistory.accesskey "r">
|
||||
|
||||
<!ENTITY locationBarHistory.label "Location Bar history">
|
||||
<!ENTITY clearLocationBar.label "Clear the list of sites stored in the location bar menu.">
|
||||
<!ENTITY clearLocationBarButton.label "Clear Location Bar">
|
||||
<!ENTITY clearLocationBarButton.accesskey "b">
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
<!ENTITY themes.label "Themes">
|
||||
<!--LOCALIZATION NOTE (navigator.label): DONT_TRANSLATE -->
|
||||
<!ENTITY navigator.label "Navigator">
|
||||
<!ENTITY history.label "History">
|
||||
<!ENTITY languages.label "Languages">
|
||||
<!ENTITY applications.label "Helper Applications">
|
||||
<!--LOCALIZATION NOTE (smartBrowse.label): DONT_TRANSLATE -->
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче