Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 411226 - Migrate SeaMonkey's smart browsing preferences to new pref window (also rename panel to 'Location Bar'). r=IanN, sr=Neil.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@251265 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
stefanh%inbox.com 2008-05-06 17:10:05 +00:00
parent 892b089eb6
commit 1ab78e48f9
24 changed files with 218 additions and 632 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/embedding/config/xulprefs.mn
View File

@ -98,9 +98,5 @@ locale/XXXX/communicator/pref/preftree.dtd, XXXX/locale/XXXX/communicator/pref/p
locale/XXXX/communicator/pref/pref.dtd, XXXX/locale/XXXX/communicator/pref/pref.dtd locale/XXXX/communicator/pref/pref.dtd, XXXX/locale/XXXX/communicator/pref/pref.dtd
locale/XXXX/communicator/pref/pref-mousewheel.dtd, XXXX/locale/XXXX/communicator/pref/pref-mousewheel.dtd locale/XXXX/communicator/pref/pref-mousewheel.dtd, XXXX/locale/XXXX/communicator/pref/pref-mousewheel.dtd
locale/XXXX/communicator/pref/pref-winhooks.dtd, XXXX/locale/XXXX/communicator/pref/pref-winhooks.dtd locale/XXXX/communicator/pref/pref-winhooks.dtd, XXXX/locale/XXXX/communicator/pref/pref-winhooks.dtd
locale/XXXX/communicator/pref/autocomplete-autofill-on.gif, XXXX/locale/XXXX/communicator/pref/autocomplete-autofill-on.gif
locale/XXXX/communicator/pref/autocomplete-autofill-off.gif, XXXX/locale/XXXX/communicator/pref/autocomplete-autofill-off.gif
locale/XXXX/communicator/pref/autocomplete-showpopup.gif, XXXX/locale/XXXX/communicator/pref/autocomplete-showpopup.gif
locale/XXXX/communicator/pref/autocomplete-showsearch.gif, XXXX/locale/XXXX/communicator/pref/autocomplete-showsearch.gif
locale/XXXX/global/dialog.properties, XXXX/locale/XXXX/global/dialog.properties. locale/XXXX/global/dialog.properties, XXXX/locale/XXXX/global/dialog.properties.

1
mozilla/suite/browser/browser-prefs.js
View File

@ -160,7 +160,6 @@ pref("browser.translation.serviceDomain", "chrome://navigator-region/locale/regi
pref("browser.related.provider", "http://www-rl.netscape.com/wtgn?"); pref("browser.related.provider", "http://www-rl.netscape.com/wtgn?");
pref("browser.related.disabledForDomains", ""); pref("browser.related.disabledForDomains", "");
pref("keyword.enabled", true); pref("keyword.enabled", true);
pref("keyword.moreInfoURL", "chrome://branding/locale/brand.properties");
//Internet Search //Internet Search
pref("browser.search.defaultenginename", "chrome://communicator-region/locale/region.properties"); pref("browser.search.defaultenginename", "chrome://communicator-region/locale/region.properties");

5
mozilla/suite/common/jar.mn
View File

@ -180,6 +180,8 @@ comm.jar:
content/communicator/pref/pref-languages.js (pref/pref-languages.js) content/communicator/pref/pref-languages.js (pref/pref-languages.js)
content/communicator/pref/pref-languages.xul (pref/pref-languages.xul) content/communicator/pref/pref-languages.xul (pref/pref-languages.xul)
content/communicator/pref/pref-languages-add.xul (pref/pref-languages-add.xul) content/communicator/pref/pref-languages-add.xul (pref/pref-languages-add.xul)
content/communicator/pref/pref-locationbar.js (pref/pref-locationbar.js)
content/communicator/pref/pref-locationbar.xul (pref/pref-locationbar.xul)
content/communicator/pref/pref-mousewheel.js (pref/pref-mousewheel.js) content/communicator/pref/pref-mousewheel.js (pref/pref-mousewheel.js)
content/communicator/pref/pref-mousewheel.xul (pref/pref-mousewheel.xul) content/communicator/pref/pref-mousewheel.xul (pref/pref-mousewheel.xul)
content/communicator/pref/pref-navigator.js (pref/pref-navigator.js) content/communicator/pref/pref-navigator.js (pref/pref-navigator.js)
@ -197,9 +199,6 @@ comm.jar:
content/communicator/pref/pref-search.xul (pref/pref-search.xul) content/communicator/pref/pref-search.xul (pref/pref-search.xul)
content/communicator/pref/pref-security.js (pref/pref-security.js) content/communicator/pref/pref-security.js (pref/pref-security.js)
content/communicator/pref/pref-security.xul (pref/pref-security.xul) content/communicator/pref/pref-security.xul (pref/pref-security.xul)
content/communicator/pref/pref-smart_browsing.js (pref/pref-smart_browsing.js)
content/communicator/pref/pref-smart_browsing.xul (pref/pref-smart_browsing.xul)
content/communicator/pref/pref-smart_browsing-ac.xul (pref/pref-smart_browsing-ac.xul)
content/communicator/pref/pref-smartupdate.js (pref/pref-smartupdate.js) content/communicator/pref/pref-smartupdate.js (pref/pref-smartupdate.js)
content/communicator/pref/pref-smartupdate.xul (pref/pref-smartupdate.xul) content/communicator/pref/pref-smartupdate.xul (pref/pref-smartupdate.xul)
content/communicator/pref/pref-tabs.xul (pref/pref-tabs.xul) content/communicator/pref/pref-tabs.xul (pref/pref-tabs.xul)

70
mozilla/suite/common/pref/pref-locationbar.js
View File

@ -22,6 +22,7 @@
* Contributor(s): * Contributor(s):
* Diego Biurrun <diego@biurrun.de> * Diego Biurrun <diego@biurrun.de>
* Ian Neal <bugzilla@arlen.demon.co.uk> * Ian Neal <bugzilla@arlen.demon.co.uk>
* Stefan Hermes <stefanh@inbox.com>
* *
* Alternatively, the contents of this file may be used under the terms of * Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"), * either of the GNU General Public License Version 2 or later (the "GPL"),
@ -37,48 +38,53 @@
* *
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
function moreInfo() function Startup()
{ {
var browserURL = null; // On systems that has the file view component, autoFill and showPopup will
try { // return results from local browsing "history", even if autocomplete.enabled
browserURL = parent.hPrefWindow.getPref("string", "browser.chromeURL"); // is turned off, so we'll need to remove the dependent look in the ui.
} catch(e) {
if ("@mozilla.org/autocomplete/search;1?name=file" in Components.classes)
{
// We indent the checkboxes with the class attribute set to "indent", so
// just remove the attribute.
document.getElementById("autoFill").removeAttribute("class");
document.getElementById("showPopup").removeAttribute("class");
} }
if (browserURL == null)
browserURL = "chrome://navigator/content/navigator.xul";
var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"] updateDependent(document.getElementById("browser.urlbar.autocomplete.enabled").value);
.getService(Components.interfaces.nsIURLFormatter);
window.openDialog(browserURL, "_blank", "chrome,all,dialog=no",
formatter.formatURLPref("keyword.moreInfoURL"));
} }
function showACAdvanced() function updateDependent(aValue)
{ {
window.openDialog("chrome://communicator/content/pref/pref-smart_browsing-ac.xul", "", // The matchOnlyTyped checkbox always depend on autocomplete.enabled.
"modal=yes,chrome,resizable=no", updateMatchOnlyTyped();
document.getElementById("browserUrlbarAutoFill").getAttribute("value"),
document.getElementById("browserUrlbarShowPopup").getAttribute("value"), // If autoFill has a class attribute, we don't have the file view component.
document.getElementById("browserUrlbarShowSearch").getAttribute("value"), // We then need to update autoFill and showPopup.
document.getElementById("browserUrlbarMatchOnlyTyped").getAttribute("value"), if (document.getElementById("autoFill").hasAttribute("class"))
document.getElementById("browserUrlbarAutoFill").getAttribute("disabled"), {
document.getElementById("browserUrlbarShowPopup").getAttribute("disabled"), toggleCheckbox("autoFill", aValue);
document.getElementById("browserUrlbarShowSearch").getAttribute("disabled"), toggleCheckbox("showPopup", aValue);
document.getElementById("browserUrlbarMatchOnlyTyped").getAttribute("disabled")); }
} }
function receiveACPrefs(aAutoFill, aShowPopup, aShowSearch, aAutoType) function toggleCheckbox(aCheckbox, aPrefValue)
{ {
document.getElementById("browserUrlbarAutoFill").setAttribute("value", aAutoFill); if (!document.getElementById("browser.urlbar." + aCheckbox).locked)
document.getElementById("browserUrlbarShowPopup").setAttribute("value", aShowPopup); document.getElementById(aCheckbox).disabled = !aPrefValue;
document.getElementById("browserUrlbarShowSearch").setAttribute("value", aShowSearch);
document.getElementById("browserUrlbarMatchOnlyTyped").setAttribute("value", aAutoType);
} }
function updateMatchOnlyTyped()
function toggleAutoCompleteAdvancedButton()
{ {
var browserAutoCompleteEnabled = document.getElementById("browserAutoCompleteEnabled"); if (!document.getElementById("browser.urlbar.matchOnlyTyped").locked)
var autoCompleteAdvancedButton = document.getElementById("autoCompleteAdvancedButton"); {
autoCompleteAdvancedButton.disabled = !browserAutoCompleteEnabled.checked; var autoCompletePref = document.getElementById("browser.urlbar.autocomplete.enabled");
var autoFillPref = document.getElementById("browser.urlbar.autoFill");
var showPopupPref = document.getElementById("browser.urlbar.showPopup");
// matchOnlyTyped doesn't makes sense if both autoFill and showPopup prefs
// are false or if autocomplete is turned off.
document.getElementById("matchOnlyTyped").disabled =
(!autoFillPref.value && !showPopupPref.value) || !autoCompletePref.value;
}
} }

136
mozilla/suite/common/pref/pref-locationbar.xul
View File

@ -23,6 +23,7 @@
Contributor(s): Contributor(s):
Blake Ross <blakeross@telocity.com> Blake Ross <blakeross@telocity.com>
Diego Biurrun <diego@biurrun.de> Diego Biurrun <diego@biurrun.de>
Stefan Hermes <stefanh@inbox.com>
Alternatively, the contents of this file may be used under the terms of Alternatively, the contents of this file may be used under the terms of
either of the GNU General Public License Version 2 or later (the "GPL"), either of the GNU General Public License Version 2 or later (the "GPL"),
@ -41,71 +42,82 @@
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://communicator/skin/prefpanels.css" type="text/css"?> <?xml-stylesheet href="chrome://communicator/skin/prefpanels.css" type="text/css"?>
<!DOCTYPE page [ <!DOCTYPE overlay SYSTEM "chrome://communicator/locale/pref/pref-locationbar.dtd">
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
%brandDTD;
<!ENTITY % prefSmartBrowsingDTD SYSTEM "chrome://communicator/locale/pref/pref-smart_browsing.dtd" >
%prefSmartBrowsingDTD;
]>
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
onload="parent.initPanel('chrome://communicator/content/pref/pref-smart_browsing.xul');"
headertitle="&pref.smartBrowsing.title;">
<script type="application/x-javascript" src="chrome://communicator/content/pref/pref-smart_browsing.js"/> <prefpane id="locationBar_pane"
label="&pref.locationBar.title;"
script="chrome://communicator/content/pref/pref-locationbar.js">
<script type="application/x-javascript"> <preferences id="locationBar_preferences">
<![CDATA[ <preference id="browser.urlbar.autocomplete.enabled"
name="browser.urlbar.autocomplete.enabled"
type="bool"
onchange="updateDependent(this.value);"/>
<preference id="browser.urlbar.matchOnlyTyped"
name="browser.urlbar.matchOnlyTyped"
type="bool"/>
<preference id="browser.urlbar.autoFill"
name="browser.urlbar.autoFill"
type="bool"
onchange="updateMatchOnlyTyped();"/>
<preference id="browser.urlbar.showPopup"
name="browser.urlbar.showPopup"
type="bool"
onchange="updateMatchOnlyTyped();"/>
<preference id="browser.urlbar.showSearch"
name="browser.urlbar.showSearch"
type="bool"/>
<preference id="browser.fixup.alternate.enabled"
name="browser.fixup.alternate.enabled"
type="bool"/>
<preference id="keyword.enabled"
name="keyword.enabled"
type="bool"/>
</preferences>
var _elementIDs = ["browserGoBrowsingEnabled", "browserAutoCompleteEnabled", <groupbox>
"browserUrlbarAutoFill", "browserUrlbarShowPopup", "browserUrlbarShowSearch", <caption label="&autoComplete.label;"/>
"browserUrlbarMatchOnlyTyped", "domainGuessingEnabled"]; <checkbox id="autoCompleteEnabled"
label="&enableAutoComplete.label;"
accesskey="&enableAutoComplete.accesskey;"
preference="browser.urlbar.autocomplete.enabled"/>
<checkbox id="matchOnlyTyped"
class="indent"
label="&autoCompleteMatchOnlyTyped.label;"
accesskey="&autoCompleteMatchOnlyTyped.accesskey;"
preference="browser.urlbar.matchOnlyTyped"/>
<checkbox id="autoFill"
class="indent"
label="&autoCompleteAutoFill.label;"
accesskey="&autoCompleteAutoFill.accesskey;"
preference="browser.urlbar.autoFill"/>
<checkbox id="showPopup"
class="indent"
label="&autoCompleteShowPopup.label;"
accesskey="&autoCompleteShowPopup.accesskey;"
preference="browser.urlbar.showPopup"/>
</groupbox>
]]> <groupbox>
</script> <caption label="&searchEngine.label;"/>
<checkbox id="showSearch"
label="&showSearchEngine.label;"
accesskey="&showSearchEngine.accesskey;"
preference="browser.urlbar.showSearch"/>
</groupbox>
<groupbox> <groupbox>
<caption label="&internetKeywordsHeader.label;"/> <caption label="&unknownLocations.label;"/>
<checkbox id="domainGuessingEnabled"
<description>&internetKeywordsDescription.label;</description> label="&domainGuessing.label;"
accesskey="&domainGuessing.accesskey;"
<hbox align="center"> preference="browser.fixup.alternate.enabled"/>
<checkbox id="browserGoBrowsingEnabled" label="&keywordsEnabled.label;" accesskey="&keywordsEnabled.accesskey;" <checkbox id="browserGoBrowsingEnabled"
prefstring="keyword.enabled"/> label="&keywords.label;"
<spacer flex="1"/> accesskey="&keywords.accesskey;"
<button label="&moreInformation.label;" accesskey="&moreInformation.accesskey;" oncommand="moreInfo();" preference="keyword.enabled"/>
id="moreInformationButton" </groupbox>
prefstring="pref.browser.smartbrowsing.disable_button.more_info"/> </prefpane>
</hbox> </overlay>
</groupbox>
<groupbox>
<caption label="&autoCompleteHeader.label;"/>
<hbox align="center">
<checkbox id="browserAutoCompleteEnabled" label="&autoCompleteEnabled.label;"
accesskey="&autoCompleteEnabled.accesskey;"
prefstring="browser.urlbar.autocomplete.enabled"
oncommand="toggleAutoCompleteAdvancedButton()" flex="1"/>
<button label="&autoCompleteAdvanced.label;" oncommand="showACAdvanced()" id="autoCompleteAdvancedButton"
accesskey="&autoCompleteAdvanced.accesskey;"/>
<data id="browserUrlbarAutoFill" preftype="bool" prefattribute="value"
prefstring="browser.urlbar.autoFill"/>
<data id="browserUrlbarShowPopup" preftype="bool" prefattribute="value"
prefstring="browser.urlbar.showPopup"/>
<data id="browserUrlbarShowSearch" preftype="bool" prefattribute="value"
prefstring="browser.urlbar.showSearch"/>
<data id="browserUrlbarMatchOnlyTyped" preftype="bool" prefattribute="value"
prefstring="browser.urlbar.matchOnlyTyped"/>
</hbox>
</groupbox>
<groupbox>
<caption label="&domainGuessingHeader.label;"/>
<checkbox id="domainGuessingEnabled"
label="&domainGuessingEnabled.label;"
accesskey="&domainGuessingEnabled.accesskey;"
prefstring="browser.fixup.alternate.enabled"/>
</groupbox>
</page>

142
mozilla/suite/common/pref/pref-smart_browsing-ac.xul
View File

@ -1,142 +0,0 @@
<?xml version="1.0"?>
<!-- ***** BEGIN LICENSE BLOCK *****
Version: MPL 1.1/GPL 2.0/LGPL 2.1
The contents of this file are subject to the Mozilla 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/MPL/
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 the Initial Developer are Copyright (C) 1998-1999
the Initial Developer. All Rights Reserved.
Contributor(s):
Joe Hewitt <hewitt@netscape.com>
Ian Neal <bugzilla@arlen.demon.co.uk>
Alternatively, the contents of this file may be used under the terms of
either of the GNU General Public License Version 2 or later (the "GPL"),
or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
in which case the provisions of the GPL or the LGPL are applicable instead
of those above. If you wish to allow use of your version of this file only
under the terms of either the GPL or the LGPL, and not to allow others to
use your version of this file under the terms of the MPL, indicate your
decision by deleting the provisions above and replace them with the notice
and other provisions required by the GPL or the LGPL. If you do not delete
the provisions above, a recipient may use your version of this file under
the terms of any one of the MPL, the GPL or the LGPL.
***** END LICENSE BLOCK ***** -->
<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/pref/pref-smart_browsing.dtd" >
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://communicator/skin/prefpanels.css" type="text/css"?>
<dialog id="pref-smart_browsing-ac" title="&autoCompleteAdvanced.title;"
buttons="accept,cancel,help"
ondialogaccept="return onAccept();"
ondialoghelp="doHelpButton();"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
<script type="application/x-javascript"><![CDATA[
var gShowSearchLocked;
window.onload = function()
{
setCheck("cbxAutoFill", window.arguments[0], window.arguments[4]);
setCheck("cbxShowPopup", window.arguments[1], window.arguments[5]);
setCheck("cbxShowSearch", window.arguments[2], window.arguments[6]);
setCheck("cbxMatchOnlyTyped", window.arguments[3], window.arguments[7]);
gShowSearchLocked = (window.arguments[6] == "true");
updateImage("AutoFill");
updateImage("ShowPopup");
updateImage("ShowSearch");
updateShowPopup();
}
function onAccept()
{
window.opener.receiveACPrefs(getCheck("cbxAutoFill"),
getCheck("cbxShowPopup"),
getCheck("cbxShowSearch"),
getCheck("cbxMatchOnlyTyped"));
return true;
}
function getCheck(aName)
{
return document.getElementById(aName).checked;
}
function setCheck(aName, aTruth, aDisabled)
{
document.getElementById(aName).checked = (aTruth == "true");
document.getElementById(aName).disabled = (aDisabled == "true");
}
function updateImage(aImg)
{
var img = document.getElementById("img"+aImg);
var checked = document.getElementById("cbx"+aImg).checked;
if (aImg == "AutoFill") {
img.setAttribute("src", "chrome://communicator/locale/pref/autocomplete-autofill-"+(checked?"on":"off")+".gif");
} else if (aImg == "ShowPopup") {
img.setAttribute("hidden", !checked);
updateImage("ShowSearch");
} else if (aImg == "ShowSearch") {
var checked2 = document.getElementById("cbxShowPopup").checked;
img.setAttribute("hidden", !checked2 || !checked);
}
}
function updateShowPopup()
{
var spChecked = document.getElementById("cbxShowPopup").checked;
var showSearch = document.getElementById("cbxShowSearch");
showSearch.disabled = !spChecked || gShowSearchLocked;
}
function doHelpButton() {
openHelp('navigator_pref_autocomplete-adv', 'chrome://communicator/locale/help/suitehelp.rdf');
}
]]></script>
<groupbox>
<caption label="&autoCompleteAdvanced.title;"/>
<vbox>
<checkbox id="cbxAutoFill" label="&autoCompleteAutoFill.label;"
oncommand="updateImage('AutoFill')"/>
<checkbox id="cbxShowPopup" label="&autoCompleteShowPopup.label;"
oncommand="updateShowPopup(); updateImage('ShowPopup')"/>
<checkbox id="cbxShowSearch" label="&autoCompleteShowSearch.label;"
oncommand="updateImage('ShowSearch')"/>
<checkbox id="cbxMatchOnlyTyped" label="&autoCompleteMatchOnlyTyped.label;"/>
</vbox>
</groupbox>
<label value="&autocompletePreview.label;"/>
<dialogheader>
<vbox height="159">
<image id="imgAutoFill" style="min-width: 401px;"/>
<image id="imgShowPopup" src="chrome://communicator/locale/pref/autocomplete-showpopup.gif"/>
<image id="imgShowSearch" src="chrome://communicator/locale/pref/autocomplete-showsearch.gif"/>
</vbox>
</dialogheader>
</dialog>

84
mozilla/suite/common/pref/pref-smart_browsing.js
View File

@ -1,84 +0,0 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla 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/MPL/
*
* 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
* August 15, 2001.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corp.
* Portions created by the Initial Developer are Copyright (C) 2001
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Diego Biurrun <diego@biurrun.de>
* Ian Neal <bugzilla@arlen.demon.co.uk>
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
function moreInfo()
{
var browserURL = null;
try {
browserURL = parent.hPrefWindow.getPref("string", "browser.chromeURL");
} catch(e) {
}
if (browserURL == null)
browserURL = "chrome://navigator/content/navigator.xul";
var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
.getService(Components.interfaces.nsIURLFormatter);
window.openDialog(browserURL, "_blank", "chrome,all,dialog=no",
formatter.formatURLPref("keyword.moreInfoURL"));
}
function showACAdvanced()
{
window.openDialog("chrome://communicator/content/pref/pref-smart_browsing-ac.xul", "",
"modal=yes,chrome,resizable=no",
document.getElementById("browserUrlbarAutoFill").getAttribute("value"),
document.getElementById("browserUrlbarShowPopup").getAttribute("value"),
document.getElementById("browserUrlbarShowSearch").getAttribute("value"),
document.getElementById("browserUrlbarMatchOnlyTyped").getAttribute("value"),
document.getElementById("browserUrlbarAutoFill").getAttribute("disabled"),
document.getElementById("browserUrlbarShowPopup").getAttribute("disabled"),
document.getElementById("browserUrlbarShowSearch").getAttribute("disabled"),
document.getElementById("browserUrlbarMatchOnlyTyped").getAttribute("disabled"));
}
function receiveACPrefs(aAutoFill, aShowPopup, aShowSearch, aAutoType)
{
document.getElementById("browserUrlbarAutoFill").setAttribute("value", aAutoFill);
document.getElementById("browserUrlbarShowPopup").setAttribute("value", aShowPopup);
document.getElementById("browserUrlbarShowSearch").setAttribute("value", aShowSearch);
document.getElementById("browserUrlbarMatchOnlyTyped").setAttribute("value", aAutoType);
}
function toggleAutoCompleteAdvancedButton()
{
var browserAutoCompleteEnabled = document.getElementById("browserAutoCompleteEnabled");
var autoCompleteAdvancedButton = document.getElementById("autoCompleteAdvancedButton");
autoCompleteAdvancedButton.disabled = !browserAutoCompleteEnabled.checked;
}

111
mozilla/suite/common/pref/pref-smart_browsing.xul
View File

@ -1,111 +0,0 @@
<?xml version="1.0"?>
<!-- ***** BEGIN LICENSE BLOCK *****
Version: MPL 1.1/GPL 2.0/LGPL 2.1
The contents of this file are subject to the Mozilla 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/MPL/
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 the Initial Developer are Copyright (C) 1998-1999
the Initial Developer. All Rights Reserved.
Contributor(s):
Blake Ross <blakeross@telocity.com>
Diego Biurrun <diego@biurrun.de>
Alternatively, the contents of this file may be used under the terms of
either of the GNU General Public License Version 2 or later (the "GPL"),
or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
in which case the provisions of the GPL or the LGPL are applicable instead
of those above. If you wish to allow use of your version of this file only
under the terms of either the GPL or the LGPL, and not to allow others to
use your version of this file under the terms of the MPL, indicate your
decision by deleting the provisions above and replace them with the notice
and other provisions required by the GPL or the LGPL. If you do not delete
the provisions above, a recipient may use your version of this file under
the terms of any one of the MPL, the GPL or the LGPL.
***** END LICENSE BLOCK ***** -->
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://communicator/skin/prefpanels.css" type="text/css"?>
<!DOCTYPE page [
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
%brandDTD;
<!ENTITY % prefSmartBrowsingDTD SYSTEM "chrome://communicator/locale/pref/pref-smart_browsing.dtd" >
%prefSmartBrowsingDTD;
]>
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="parent.initPanel('chrome://communicator/content/pref/pref-smart_browsing.xul');"
headertitle="&pref.smartBrowsing.title;">
<script type="application/x-javascript" src="chrome://communicator/content/pref/pref-smart_browsing.js"/>
<script type="application/x-javascript">
<![CDATA[
var _elementIDs = ["browserGoBrowsingEnabled", "browserAutoCompleteEnabled",
"browserUrlbarAutoFill", "browserUrlbarShowPopup", "browserUrlbarShowSearch",
"browserUrlbarMatchOnlyTyped", "domainGuessingEnabled"];
]]>
</script>
<groupbox>
<caption label="&internetKeywordsHeader.label;"/>
<description>&internetKeywordsDescription.label;</description>
<hbox align="center">
<checkbox id="browserGoBrowsingEnabled" label="&keywordsEnabled.label;" accesskey="&keywordsEnabled.accesskey;"
prefstring="keyword.enabled"/>
<spacer flex="1"/>
<button label="&moreInformation.label;" accesskey="&moreInformation.accesskey;" oncommand="moreInfo();"
id="moreInformationButton"
prefstring="pref.browser.smartbrowsing.disable_button.more_info"/>
</hbox>
</groupbox>
<groupbox>
<caption label="&autoCompleteHeader.label;"/>
<hbox align="center">
<checkbox id="browserAutoCompleteEnabled" label="&autoCompleteEnabled.label;"
accesskey="&autoCompleteEnabled.accesskey;"
prefstring="browser.urlbar.autocomplete.enabled"
oncommand="toggleAutoCompleteAdvancedButton()" flex="1"/>
<button label="&autoCompleteAdvanced.label;" oncommand="showACAdvanced()" id="autoCompleteAdvancedButton"
accesskey="&autoCompleteAdvanced.accesskey;"/>
<data id="browserUrlbarAutoFill" preftype="bool" prefattribute="value"
prefstring="browser.urlbar.autoFill"/>
<data id="browserUrlbarShowPopup" preftype="bool" prefattribute="value"
prefstring="browser.urlbar.showPopup"/>
<data id="browserUrlbarShowSearch" preftype="bool" prefattribute="value"
prefstring="browser.urlbar.showSearch"/>
<data id="browserUrlbarMatchOnlyTyped" preftype="bool" prefattribute="value"
prefstring="browser.urlbar.matchOnlyTyped"/>
</hbox>
</groupbox>
<groupbox>
<caption label="&domainGuessingHeader.label;"/>
<checkbox id="domainGuessingEnabled"
label="&domainGuessingEnabled.label;"
accesskey="&domainGuessingEnabled.accesskey;"
prefstring="browser.fixup.alternate.enabled"/>
</groupbox>
</page>

7
mozilla/suite/common/pref/preferences.xul
View File

@ -122,9 +122,12 @@
prefpane="applications_pane" prefpane="applications_pane"
helpTopic="navigator_pref_helper_applications" helpTopic="navigator_pref_helper_applications"
url="chrome://communicator/content/pref/pref-applications.xul"/> url="chrome://communicator/content/pref/pref-applications.xul"/>
<treeitem id="locationBarItem"
label="&locationBar.label;"
prefpane="locationBar_pane"
helpTopic="navigator_pref_location_bar"
url="chrome://communicator/content/pref/pref-locationbar.xul"/>
<!-- commenting out yet unmigrated panels <!-- commenting out yet unmigrated panels
<treeitem label="&smartBrowse.label;"
url="chrome://communicator/content/pref/pref-smart_browsing.xul"/>
<treeitem label="&search.label;" <treeitem label="&search.label;"
url="chrome://communicator/content/pref/pref-search.xul"/> url="chrome://communicator/content/pref/pref-search.xul"/>
--> -->

2
mozilla/suite/common/pref/preftree.xul
View File

@ -94,7 +94,7 @@
</treeitem> </treeitem>
<treeitem> <treeitem>
<treerow> <treerow>
<treecell url="chrome://communicator/content/pref/pref-smart_browsing.xul" label="&smartBrowse.label;"/> <treecell label="(Migrated: &locationBar.label;)"/>
</treerow> </treerow>
</treeitem> </treeitem>
<treeitem> <treeitem>

1
mozilla/suite/locales/en-US/chrome/branding/brand.properties
View File

@ -9,4 +9,3 @@ extensions.getMorePluginsURL=https://%LOCALE%.add-ons.mozilla.org/%LOCALE%/%APP%
spellchecker.dictionaries.download.url=https://%LOCALE%.add-ons.mozilla.org/%LOCALE%/%APP%/%VERSION%/dictionaries/ spellchecker.dictionaries.download.url=https://%LOCALE%.add-ons.mozilla.org/%LOCALE%/%APP%/%VERSION%/dictionaries/
app.releaseNotesURL=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/ app.releaseNotesURL=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
app.vendorURL=http://www.seamonkey-project.org/ app.vendorURL=http://www.seamonkey-project.org/
keyword.moreInfoURL=http://www.mozilla.org/docs/end-user/internet-keywords.html

95
mozilla/suite/locales/en-US/chrome/common/help/cs_nav_prefs_navigator.xhtml
View File

@ -31,7 +31,7 @@
<li><a href="#history">History</a></li> <li><a href="#history">History</a></li>
<li><a href="#languages">Languages</a></li> <li><a href="#languages">Languages</a></li>
<li><a href="#helper_applications">Helper Applications</a></li> <li><a href="#helper_applications">Helper Applications</a></li>
<li><a href="#smart_browsing">Smart Browsing</a></li> <li><a href="#location_bar">Location Bar</a></li>
<li><a href="#internet_search">Internet Search</a></li> <li><a href="#internet_search">Internet Search</a></li>
<li><a href="#tabbed_browsing">Tabbed Browsing</a></li> <li><a href="#tabbed_browsing">Tabbed Browsing</a></li>
<li><a href="#downloads">Downloads</a></li> <li><a href="#downloads">Downloads</a></li>
@ -292,64 +292,79 @@
<p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p> <p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
<h2 id="smart_browsing">Browser Preferences - Smart Browsing</h2> <h2 id="location_bar">Browser Preferences - Location Bar</h2>
<p>This section describes how to use the Smart Browsing preferences panel. If <p>This section describes how to use the Location Bar preferences panel. If
you&apos;re not already viewing it, follow these steps:</p> you&apos;re not already viewing it, follow these steps:</p>
<ol> <ol>
<li>Open the <span class="mac">&brandShortName;</span> <li>Open the <span class="mac">&brandShortName;</span>
<span class="noMac">Edit</span> menu and choose Preferences.</li> <span class="noMac">Edit</span> menu and choose Preferences.</li>
<li>Under the Browser category, click Smart Browsing. (If no subcategories <li>Under the Browser category, click Location Bar. (If no subcategories
are visible, double-click Browser to expand the list.)</li> are visible, double-click Browser to expand the list.)</li>
</ol> </ol>
<p>The Smart Browsing preferences panel allows you to better browse web pages <p>The Location Bar Preferences panel lets you fine-tune the behavior of the
using Internet Keywords, Location Bar Autocomplete and Domain Guessing.</p> Location Bar.</p>
<ul> <ul>
<li><strong>Internet Keywords</strong>: <li id="location_bar_autocomplete"><strong>Autocomplete</strong>:
<ul> <ul>
<li><strong>Enable Internet Keywords</strong>: Select this to enable fast <li><strong>Autocomplete from your browsing history as you type</strong>:
access to services such as stock quotes, search, and other information Select this to let &brandShortName; automatically show suggestions from
from the Location bar.</li> your browsing history when you type in the Location Bar.
<li><strong>More Information</strong>: Click this to learn more about
using Internet Keywords.</li>
</ul>
</li>
<li id="location_bar_autocomplete"><strong>Location Bar
Autocomplete</strong>:
<ul>
<li><strong>Automatically complete text typed into Location bar</strong>:
Select this to automatically complete text you previously entered into
the Location bar.</li>
<li><strong>Advanced</strong>: Click this and select one or more of the
following options:
<ul> <ul>
<li><strong>Autocomplete best match as you type</strong>: As you <li><strong>Match only website&apos;s you&apos;ve typed
previously</strong>: Shows only websites that you&apos;ve typed in
the Location Bar and not sites that were opened in other ways, such
as clicking a link on a web page.</li>
<li><strong>Automatically prefill the best match</strong>: As you
type in the Location Bar, &brandShortName; will automatically type in the Location Bar, &brandShortName; will automatically
complete your web address using the visited website it most closely complete your web address using the visited website it most closely
matches.</li> matches. <span class="unix"><strong>Note</strong>: Having this
option on will prefill local addresses (like paths to files on your
hard drive) even if you have turned off <q>Autocomplete from your
browsing history as you type</q>.</span></li>
<li><strong>Show list of matching results</strong>: As you type in <li><strong>Show list of matching results</strong>: As you type in
the Location Bar, &brandShortName; will show a drop-down list of the Location Bar, &brandShortName; will show a drop-down list of
matching visited web addresses.</li> matching visited web addresses.
<li><strong>Show internet search engine</strong>: Shows a drop-down <span class="unix"><strong>Note</strong>: If you have turned off
list item allowing you to search the default search engine for <q>Autocomplete from your browsing history as you type</q>
words you enter.</li> matching results from locations on your hard drive will still be
<li><strong>Match only website you&apos;ve typed previously</strong>: shown in the drop-down list.</span></li>
Shows only websites that you&apos;ve typed in the Location Bar and </ul></li>
not sites that were opened in other ways, such as clicking a link </ul>
on a web page.</li> </li>
</ul> <li><strong>Internet Search Engine</strong>:
</li> <ul>
<li><strong>Show default search engine</strong>: Shows a drop-down list item,
allowing you to search with the default search engine for words you
enter.</li>
</ul>
</li>
<li><strong>Unknown Locations</strong>
<ul>
<li><strong>Add <q>www.</q> and <q>.com</q> to the location if a web page
is not found</strong>: Select this if you want &brandShortName; to
automatically add <tt>www.</tt> to the beginning and <tt>.com</tt> to
the end of a web page location that can&apos;t be found. For more
detailed information about this feature, see the online document
<a href="http://www.mozilla.org/docs/end-user/domain-guessing.html">
Domain Guessing</a>.</li>
<li><strong>Perform a web search when entered text is not a web
location</strong>: Select this to let &brandShortName; automatically
search the web for text entered in the Location Bar. If the text
you&apos;ve typed is not a web location, &brandShortName; will do a web
search when you press <kbd class="noMac">Enter</kbd>
<kbd class="mac">Return</kbd> in the Location Bar. See the online
document
<a href="http://www.mozilla.org/docs/end-user/internet-keywords.html">
Internet Keywords</a> for a more technical description about this
feature. <strong>Note</strong>: The search engine used can not be
changed by the <a href="#internet_search">Internet Search
Preferences</a>.</li>
</ul> </ul>
</li> </li>
<li><strong>Domain Guessing</strong>: Select this if you want
&brandShortName; to automatically add <tt>www.</tt> and <tt>.com</tt> to a
web page location that can&apos;t be found. For more detailed information
about the Domain Guessing feature, see the online document
<a href="http://www.mozilla.org/docs/end-user/domain-guessing.html">Domain
Guessing</a>.</li>
</ul> </ul>
<p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p> <p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>

5
mozilla/suite/locales/en-US/chrome/common/help/help-index1.rdf
View File

@ -811,11 +811,6 @@
<rdf:Description ID="intermediate_server_CA_certificates" <rdf:Description ID="intermediate_server_CA_certificates"
nc:name="intermediate server CA certificates" nc:name="intermediate server CA certificates"
nc:link="cert_dialog_help.xhtml#web_site_certified_by_an_unknown_authority"/> nc:link="cert_dialog_help.xhtml#web_site_certified_by_an_unknown_authority"/>
</rdf:li>
<rdf:li>
<rdf:Description ID="Internet_Keywords"
nc:name="Internet Keywords"
nc:link="nav_help.xhtml#using_internet_keywords"/>
</rdf:li></rdf:Seq> </rdf:li></rdf:Seq>
</nc:subheadings> </nc:subheadings>
</rdf:Description> </rdf:Description>

83
mozilla/suite/locales/en-US/chrome/common/help/nav_help.xhtml
View File

@ -368,7 +368,6 @@
Mode</a></li> Mode</a></li>
<li><a href="#setting_search_preferences">Setting Search <li><a href="#setting_search_preferences">Setting Search
Preferences</a></li> Preferences</a></li>
<li><a href="#using_internet_keywords">Using Internet Keywords</a></li>
<li><a href="#searching_within_a_page">Searching Within a Page</a></li> <li><a href="#searching_within_a_page">Searching Within a Page</a></li>
<li><a href="#using_find_as_you_type">Using Find-as-you-type</a></li> <li><a href="#using_find_as_you_type">Using Find-as-you-type</a></li>
<li><a href="#searching_the_bookmarks_or_history_list">Searching the <li><a href="#searching_the_bookmarks_or_history_list">Searching the
@ -403,11 +402,11 @@
drop-down list in the Location Bar. (Your default search engine may be drop-down list in the Location Bar. (Your default search engine may be
different.) different.)
<p>The default search engine you choose in <p>The default search engine you choose in the
<a href="cs_nav_prefs_navigator.xhtml#smart_browsing">Preferences</a> <a href="cs_nav_prefs_navigator.xhtml#internet_search">Internet
is used. Search results for <q>baby doll</q> appear in both the Search Preferences</a> is used. Search results for <q>baby doll</q>
browser window and in Sidebar. Click the links to visit web pages appear in both the browser window and in Sidebar. Click the links to
about baby dolls.</p> visit web pages about baby dolls.</p>
</li> </li>
</ul> </ul>
</li> </li>
@ -417,8 +416,15 @@
tab until you do a new search. You don&apos;t have to click the Back button tab until you do a new search. You don&apos;t have to click the Back button
to retrieve the search results.</p> to retrieve the search results.</p>
<p>Note: You can also use <a href="#using_internet_keywords">Internet <p><strong>Note</strong>: In the <q>Unknown Locations</q> section of the
Keywords</a> to search from the Location Bar.</p> <a href="cs_nav_prefs_navigator.xhtml#location_bar">Location Bar
Preferences</a>, you can set up the Location Bar so a search is automatically
performed if the text you have typed is not a web location. Typing a word in
the Location Bar and pressing <kbd class="noMac">Enter</kbd><kbd class="mac">
Return</kbd> will then perform a search. For a more technical description of
this feature, see the online document
<a href="http://www.mozilla.org/docs/end-user/internet-keywords.html">
Internet Keywords</a>.</p>
<h3 id="searching_from_sidebar">Searching from Sidebar</h3> <h3 id="searching_from_sidebar">Searching from Sidebar</h3>
@ -576,61 +582,6 @@
<p>[<a href="#searching_the_web">Return to beginning of section</a>]</p> <p>[<a href="#searching_the_web">Return to beginning of section</a>]</p>
<h2 id="using_internet_keywords">Using Internet Keywords</h2>
<p>Internet Keywords work with the Location Bar to help you quickly find
specific types of information. There are several ways to use Internet
Keywords:</p>
<ul>
<li>Type a specific product, trademark, or company name and press
<kbd class="mac">Return</kbd><kbd class="noMac">Enter</kbd>, to go
directly to a company&apos;s website.</li>
<li>Type certain verbs, such as <q>shop</q> or <q>quote</q>,
followed by the word you want to look up, to get specific information. For
instance, <q>shop pets</q> takes you to a page with links to online
pet stores.</li>
<li>Type the name of a city or town followed by certain words such as
<q>movies</q> or <q>restaurants</q>, for local information. For
instance, type <q>san francisco restaurants</q>.</li>
</ul>
<p><strong>Important</strong>: To use Internet Keywords, you must press
<kbd class="mac">Return</kbd><kbd class="noMac">Enter</kbd>
on your keyboard instead of clicking the Search button.
Pressing <kbd class="mac">Return</kbd><kbd class="noMac">Enter</kbd>
activates the Internet Keyword feature; clicking Search initiates a
search.</p>
<p>To see the difference, try this:</p>
<ol>
<li>Type <q>apple imac</q> into the Location Bar and press
<kbd class="mac">Return</kbd><kbd class="noMac">Enter</kbd>. Apple
Computer&apos;s iMac Web page appears.</li>
<li>Now type <q>apple imac</q> into the Location Bar and click Search.
You see a list of links related to Apple Computer&apos;s iMac models.</li>
</ol>
<p>If typing Internet Keywords into the Location Bar is not working for you,
check your
<a href="cs_nav_prefs_navigator.xhtml#smart_browsing">Smart Browsing
preferences</a> to be sure the Internet Keywords feature is enabled.</p>
<h3 id="quick_stock_quotes">Quick Stock Quotes</h3>
<p>To see a recent stock quote for a company, type <q>quote</q> followed
by the company&apos;s stock ticker symbol, and press
<kbd class="mac">Return</kbd><kbd class="noMac">Enter</kbd>.</p>
<p>If you don&apos;t know a company&apos;s stock ticker symbol, type the
company&apos;s name. The quote page will list all companies with similar
names, and you can choose the one for which you want a quote.</p>
<p>[<a href="#searching_the_web">Return to beginning of section</a>]</p>
<h2 id="searching_within_a_page">Searching Within a Page</h2>
<p>To find text within the page you are currently viewing in the browser:</p> <p>To find text within the page you are currently viewing in the browser:</p>
<ol> <ol>
@ -1217,8 +1168,8 @@
<h2 id="finding_localized_version">Finding a &brandShortName; version in your <h2 id="finding_localized_version">Finding a &brandShortName; version in your
own language</h2> own language</h2>
<p>If you're looking for a version of &brandShortName; in a language other than <p>If you&apos;re looking for a version of &brandShortName; in a language other
American English, you can download it from the than American English, you can download it from the
<a href="http://www.seamonkey-project.org/releases/">SeaMonkey <a href="http://www.seamonkey-project.org/releases/">SeaMonkey
Project Releases</a> page.</p> Project Releases</a> page.</p>
@ -1475,7 +1426,7 @@
<li>In the File Bookmark dialog, look the Location field. Replace the <li>In the File Bookmark dialog, look the Location field. Replace the
dummy string (e.g. <tt>ILoveMozilla</tt>) with <kbd>%s</kbd>. dummy string (e.g. <tt>ILoveMozilla</tt>) with <kbd>%s</kbd>.
For example, the location might become For example, the location might become
<kbd>http://www.google.com/search?q=<strong>%s</strong>&amp;btnI=I'mFeelingLucky</kbd>.</li> <kbd>http://www.google.com/search?q=<strong>%s</strong>&amp;btnI=I&apos;mFeelingLucky</kbd>.</li>
<li>Enter a keyword in the Keyword field.</li> <li>Enter a keyword in the Keyword field.</li>
<li>Give the bookmark a name and choose the location for the bookmark.</li> <li>Give the bookmark a name and choose the location for the bookmark.</li>
<li>Close the dialog.</li> <li>Close the dialog.</li>

11
mozilla/suite/locales/en-US/chrome/common/help/suite-toc.rdf
View File

@ -71,7 +71,6 @@
<rdf:li> <rdf:Description ID="nav-doc-searchweb" nc:name="Fast Searches" nc:link="nav_help.xhtml#fast_searches"/> </rdf:li> <rdf:li> <rdf:Description ID="nav-doc-searchweb" nc:name="Fast Searches" nc:link="nav_help.xhtml#fast_searches"/> </rdf:li>
<rdf:li> <rdf:Description ID="nav-doc-smartsearch" nc:name="Sidebar Advanced Search Mode" nc:link="nav_help.xhtml#sidebar_advanced_search_mode"/> </rdf:li> <rdf:li> <rdf:Description ID="nav-doc-smartsearch" nc:name="Sidebar Advanced Search Mode" nc:link="nav_help.xhtml#sidebar_advanced_search_mode"/> </rdf:li>
<rdf:li> <rdf:Description ID="nav-doc-searchprefs" nc:name="Setting Search Preferences" nc:link="nav_help.xhtml#setting_search_preferences"/> </rdf:li> <rdf:li> <rdf:Description ID="nav-doc-searchprefs" nc:name="Setting Search Preferences" nc:link="nav_help.xhtml#setting_search_preferences"/> </rdf:li>
<rdf:li> <rdf:Description ID="nav-doc-keywords" nc:name="Using Internet Keywords" nc:link="nav_help.xhtml#using_internet_keywords"/> </rdf:li>
<rdf:li> <rdf:Description ID="nav-doc-searchpage" nc:name="Searching Within a Page" nc:link="nav_help.xhtml#searching_within_a_page"/> </rdf:li> <rdf:li> <rdf:Description ID="nav-doc-searchpage" nc:name="Searching Within a Page" nc:link="nav_help.xhtml#searching_within_a_page"/> </rdf:li>
<rdf:li> <rdf:Description ID="nav-doc-find_as_you_type" nc:name="Using Find-as-you-type" nc:link="nav_help.xhtml#using_find_as_you_type"/></rdf:li> <rdf:li> <rdf:Description ID="nav-doc-find_as_you_type" nc:name="Using Find-as-you-type" nc:link="nav_help.xhtml#using_find_as_you_type"/></rdf:li>
<rdf:li> <rdf:Description ID="nav-doc-searchbookmark" nc:name="Searching the Bookmarks or History List" nc:link="nav_help.xhtml#searching_the_bookmarks_or_history_list"/> </rdf:li> <rdf:li> <rdf:Description ID="nav-doc-searchbookmark" nc:name="Searching the Bookmarks or History List" nc:link="nav_help.xhtml#searching_the_bookmarks_or_history_list"/> </rdf:li>
@ -756,7 +755,7 @@
<rdf:li><rdf:Description ID="navigator_pref_history" nc:name="History" nc:link="cs_nav_prefs_navigator.xhtml#history"/> </rdf:li> <rdf:li><rdf:Description ID="navigator_pref_history" nc:name="History" nc:link="cs_nav_prefs_navigator.xhtml#history"/> </rdf:li>
<rdf:li><rdf:Description ID="navigator_pref_languages" nc:name="Languages" nc:link="cs_nav_prefs_navigator.xhtml#languages"/> </rdf:li> <rdf:li><rdf:Description ID="navigator_pref_languages" nc:name="Languages" nc:link="cs_nav_prefs_navigator.xhtml#languages"/> </rdf:li>
<rdf:li><rdf:Description ID="navigator_pref_helper_applications" nc:name="Helper Applications" nc:link="cs_nav_prefs_navigator.xhtml#helper_applications"/> </rdf:li> <rdf:li><rdf:Description ID="navigator_pref_helper_applications" nc:name="Helper Applications" nc:link="cs_nav_prefs_navigator.xhtml#helper_applications"/> </rdf:li>
<rdf:li><rdf:Description ID="navigator_pref_smart_browsing" nc:name="Smart Browsing" nc:link="cs_nav_prefs_navigator.xhtml#smart_browsing"/> </rdf:li> <rdf:li><rdf:Description ID="navigator_pref_location_bar" nc:name="Location Bar" nc:link="cs_nav_prefs_navigator.xhtml#location_bar"/> </rdf:li>
<rdf:li><rdf:Description ID="navigator_pref_internet_searching" nc:name="Internet Search" nc:link="cs_nav_prefs_navigator.xhtml#internet_search"/> </rdf:li> <rdf:li><rdf:Description ID="navigator_pref_internet_searching" nc:name="Internet Search" nc:link="cs_nav_prefs_navigator.xhtml#internet_search"/> </rdf:li>
<rdf:li><rdf:Description ID="navigator_pref_tabbed_browsing" nc:name="Tabbed Browsing" nc:link="cs_nav_prefs_navigator.xhtml#tabbed_browsing"/> </rdf:li> <rdf:li><rdf:Description ID="navigator_pref_tabbed_browsing" nc:name="Tabbed Browsing" nc:link="cs_nav_prefs_navigator.xhtml#tabbed_browsing"/> </rdf:li>
<rdf:li><rdf:Description ID="navigator_pref_downloads" nc:name="Downloads" nc:link="cs_nav_prefs_navigator.xhtml#downloads"/> </rdf:li> <rdf:li><rdf:Description ID="navigator_pref_downloads" nc:name="Downloads" nc:link="cs_nav_prefs_navigator.xhtml#downloads"/> </rdf:li>
@ -764,14 +763,6 @@
</nc:subheadings> </nc:subheadings>
</rdf:Description> </rdf:Description>
<rdf:Description about="#navigator_pref_smart_browsing">
<nc:subheadings>
<rdf:Seq>
<rdf:li><rdf:Description ID="navigator_pref_autocomplete-adv" nc:name="Auto-complete" nc:link="cs_nav_prefs_navigator.xhtml#location_bar_autocomplete"/> </rdf:li>
</rdf:Seq>
</nc:subheadings>
</rdf:Description>
<rdf:Description about="#advanced_pref_advanced"> <rdf:Description about="#advanced_pref_advanced">
<nc:subheadings> <nc:subheadings>
<rdf:Seq> <rdf:Seq>

BIN
mozilla/suite/locales/en-US/chrome/common/pref/autocomplete-autofill-off.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 619 B

BIN
mozilla/suite/locales/en-US/chrome/common/pref/autocomplete-autofill-on.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 743 B

BIN
mozilla/suite/locales/en-US/chrome/common/pref/autocomplete-showpopup.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
mozilla/suite/locales/en-US/chrome/common/pref/autocomplete-showsearch.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 723 B

44
mozilla/suite/locales/en-US/chrome/common/pref/pref-locationbar.dtd
View File

@ -1,30 +1,22 @@
<!-- extracted from content/pref-smart_browsing.xul --> <!--LOCALIZATION NOTE : FILE The Location Bar prefs panel -->
<!ENTITY pref.locationBar.title "Location Bar">
<!--LOCALIZATION NOTE : FILE The SmartBrowsing prefs dialog --> <!ENTITY autoComplete.label "Autocomplete">
<!ENTITY pref.smartBrowsing.title "Smart Browsing"> <!ENTITY enableAutoComplete.label "Autocomplete from your browsing history as you type">
<!ENTITY enableAutoComplete.accesskey "A">
<!--LOCALIZATION NOTE (internetKeywordsHeader.label): DONT_TRANSLATE --> <!ENTITY autoCompleteAutoFill.label "Automatically prefill the best match">
<!ENTITY internetKeywordsHeader.label "Internet Keywords"> <!ENTITY autoCompleteAutoFill.accesskey "u">
<!ENTITY internetKeywordsDescription.label "Internet Keywords enable fast access to services such as stock quotes, search and other information from the Location bar.">
<!ENTITY moreInformation.label "More Information…">
<!ENTITY moreInformation.accesskey "M">
<!--LOCALIZATION NOTE (enableKeyCheck.label): Do not translate 'Internet Keywords' -->
<!ENTITY keywordsEnabled.label "Enable Internet Keywords">
<!ENTITY keywordsEnabled.accesskey "K">
<!ENTITY autoCompleteHeader.label "Location Bar Autocomplete">
<!ENTITY autoCompleteEnabled.label "Automatically complete text typed into the Location bar">
<!ENTITY autoCompleteEnabled.accesskey "L">
<!ENTITY autoCompleteAdvanced.label "Advanced…">
<!ENTITY autoCompleteAdvanced.accesskey "A">
<!ENTITY autoCompleteAdvanced.title "Autocomplete Preferences">
<!ENTITY autoCompleteAutoFill.label "Autocomplete best match as you type">
<!ENTITY autoCompleteShowPopup.label "Show list of matching results"> <!ENTITY autoCompleteShowPopup.label "Show list of matching results">
<!ENTITY autoCompleteShowSearch.label "Show internet search engine"> <!ENTITY autoCompleteShowPopup.accesskey "S">
<!ENTITY autoCompleteMatchOnlyTyped.label "Match only websites you've typed previously"> <!ENTITY autoCompleteMatchOnlyTyped.label "Match only websites you've typed previously">
<!ENTITY autocompletePreview.label "Preview"> <!ENTITY autoCompleteMatchOnlyTyped.accesskey "M">
<!ENTITY domainGuessingHeader.label "Domain Guessing"> <!ENTITY searchEngine.label "Internet Search Engine">
<!ENTITY domainGuessingEnabled.label "Automatically add &quot;www.&quot; and &quot;.com&quot; to the location if a web page isn't found"> <!ENTITY showSearchEngine.label "Show default search engine">
<!ENTITY domainGuessingEnabled.accesskey "u"> <!ENTITY showSearchEngine.accesskey "e">
<!ENTITY unknownLocations.label "Unknown Locations">
<!ENTITY domainGuessing.label "Add &quot;www.&quot; and &quot;.com&quot; to the location if a web page is not found">
<!ENTITY domainGuessing.accesskey "d">
<!ENTITY keywords.label "Perform a web search when entered text is not a web location">
<!ENTITY keywords.accesskey "P">

30
mozilla/suite/locales/en-US/chrome/common/pref/pref-smart_browsing.dtd
View File

@ -1,30 +0,0 @@
<!-- extracted from content/pref-smart_browsing.xul -->
<!--LOCALIZATION NOTE : FILE The SmartBrowsing prefs dialog -->
<!ENTITY pref.smartBrowsing.title "Smart Browsing">
<!--LOCALIZATION NOTE (internetKeywordsHeader.label): DONT_TRANSLATE -->
<!ENTITY internetKeywordsHeader.label "Internet Keywords">
<!ENTITY internetKeywordsDescription.label "Internet Keywords enable fast access to services such as stock quotes, search and other information from the Location bar.">
<!ENTITY moreInformation.label "More Information…">
<!ENTITY moreInformation.accesskey "M">
<!--LOCALIZATION NOTE (enableKeyCheck.label): Do not translate 'Internet Keywords' -->
<!ENTITY keywordsEnabled.label "Enable Internet Keywords">
<!ENTITY keywordsEnabled.accesskey "K">
<!ENTITY autoCompleteHeader.label "Location Bar Autocomplete">
<!ENTITY autoCompleteEnabled.label "Automatically complete text typed into the Location bar">
<!ENTITY autoCompleteEnabled.accesskey "L">
<!ENTITY autoCompleteAdvanced.label "Advanced…">
<!ENTITY autoCompleteAdvanced.accesskey "A">
<!ENTITY autoCompleteAdvanced.title "Autocomplete Preferences">
<!ENTITY autoCompleteAutoFill.label "Autocomplete best match as you type">
<!ENTITY autoCompleteShowPopup.label "Show list of matching results">
<!ENTITY autoCompleteShowSearch.label "Show internet search engine">
<!ENTITY autoCompleteMatchOnlyTyped.label "Match only websites you've typed previously">
<!ENTITY autocompletePreview.label "Preview">
<!ENTITY domainGuessingHeader.label "Domain Guessing">
<!ENTITY domainGuessingEnabled.label "Automatically add &quot;www.&quot; and &quot;.com&quot; to the location if a web page isn't found">
<!ENTITY domainGuessingEnabled.accesskey "u">

3
mozilla/suite/locales/en-US/chrome/common/pref/preftree.dtd
View File

@ -10,8 +10,7 @@
<!ENTITY bidi.label "Bidi Options"> <!ENTITY bidi.label "Bidi Options">
<!ENTITY languages.label "Languages"> <!ENTITY languages.label "Languages">
<!ENTITY applications.label "Helper Applications"> <!ENTITY applications.label "Helper Applications">
<!--LOCALIZATION NOTE (smartBrowse.label): DONT_TRANSLATE --> <!ENTITY locationBar.label "Location Bar">
<!ENTITY smartBrowse.label "Smart Browsing">
<!ENTITY tabWindows.label "Tabbed Browsing"> <!ENTITY tabWindows.label "Tabbed Browsing">
<!ENTITY compose.label "Composer"> <!ENTITY compose.label "Composer">
<!ENTITY editing.label "New Page Settings"> <!ENTITY editing.label "New Page Settings">

6
mozilla/suite/locales/jar.mn
View File

@ -132,10 +132,6 @@
locale/@AB_CD@/communicator/permissions/permissionsManager.dtd (%chrome/common/permissions/permissionsManager.dtd) locale/@AB_CD@/communicator/permissions/permissionsManager.dtd (%chrome/common/permissions/permissionsManager.dtd)
locale/@AB_CD@/communicator/permissions/permissionsManager.properties (%chrome/common/permissions/permissionsManager.properties) locale/@AB_CD@/communicator/permissions/permissionsManager.properties (%chrome/common/permissions/permissionsManager.properties)
locale/@AB_CD@/communicator/permissions/permissionsNavigatorOverlay.dtd (%chrome/common/permissions/permissionsNavigatorOverlay.dtd) locale/@AB_CD@/communicator/permissions/permissionsNavigatorOverlay.dtd (%chrome/common/permissions/permissionsNavigatorOverlay.dtd)
locale/@AB_CD@/communicator/pref/autocomplete-autofill-on.gif (%chrome/common/pref/autocomplete-autofill-on.gif)
locale/@AB_CD@/communicator/pref/autocomplete-autofill-off.gif (%chrome/common/pref/autocomplete-autofill-off.gif)
locale/@AB_CD@/communicator/pref/autocomplete-showpopup.gif (%chrome/common/pref/autocomplete-showpopup.gif)
locale/@AB_CD@/communicator/pref/autocomplete-showsearch.gif (%chrome/common/pref/autocomplete-showsearch.gif)
locale/@AB_CD@/communicator/pref/pref.dtd (%chrome/common/pref/pref.dtd) locale/@AB_CD@/communicator/pref/pref.dtd (%chrome/common/pref/pref.dtd)
locale/@AB_CD@/communicator/pref/prefutilities.properties (%chrome/common/pref/prefutilities.properties) locale/@AB_CD@/communicator/pref/prefutilities.properties (%chrome/common/pref/prefutilities.properties)
locale/@AB_CD@/communicator/pref/preftree.dtd (%chrome/common/pref/preftree.dtd) locale/@AB_CD@/communicator/pref/preftree.dtd (%chrome/common/pref/preftree.dtd)
@ -160,6 +156,7 @@
locale/@AB_CD@/communicator/pref/pref-keynav.dtd (%chrome/common/pref/pref-keynav.dtd) locale/@AB_CD@/communicator/pref/pref-keynav.dtd (%chrome/common/pref/pref-keynav.dtd)
locale/@AB_CD@/communicator/pref/pref-languages.dtd (%chrome/common/pref/pref-languages.dtd) locale/@AB_CD@/communicator/pref/pref-languages.dtd (%chrome/common/pref/pref-languages.dtd)
locale/@AB_CD@/communicator/pref/pref-languages.properties (%chrome/common/pref/pref-languages.properties) locale/@AB_CD@/communicator/pref/pref-languages.properties (%chrome/common/pref/pref-languages.properties)
locale/@AB_CD@/communicator/pref/pref-locationbar.dtd (%chrome/common/pref/pref-locationbar.dtd)
locale/@AB_CD@/communicator/pref/pref-mousewheel.dtd (%chrome/common/pref/pref-mousewheel.dtd) locale/@AB_CD@/communicator/pref/pref-mousewheel.dtd (%chrome/common/pref/pref-mousewheel.dtd)
locale/@AB_CD@/communicator/pref/pref-navigator.dtd (%chrome/common/pref/pref-navigator.dtd) locale/@AB_CD@/communicator/pref/pref-navigator.dtd (%chrome/common/pref/pref-navigator.dtd)
locale/@AB_CD@/communicator/pref/pref-offline.dtd (%chrome/common/pref/pref-offline.dtd) locale/@AB_CD@/communicator/pref/pref-offline.dtd (%chrome/common/pref/pref-offline.dtd)
@ -170,7 +167,6 @@
locale/@AB_CD@/communicator/pref/pref-scripts.dtd (%chrome/common/pref/pref-scripts.dtd) locale/@AB_CD@/communicator/pref/pref-scripts.dtd (%chrome/common/pref/pref-scripts.dtd)
locale/@AB_CD@/communicator/pref/pref-search.dtd (%chrome/common/pref/pref-search.dtd) locale/@AB_CD@/communicator/pref/pref-search.dtd (%chrome/common/pref/pref-search.dtd)
locale/@AB_CD@/communicator/pref/pref-security.dtd (%chrome/common/pref/pref-security.dtd) locale/@AB_CD@/communicator/pref/pref-security.dtd (%chrome/common/pref/pref-security.dtd)
locale/@AB_CD@/communicator/pref/pref-smart_browsing.dtd (%chrome/common/pref/pref-smart_browsing.dtd)
locale/@AB_CD@/communicator/pref/pref-smartupdate.dtd (%chrome/common/pref/pref-smartupdate.dtd) locale/@AB_CD@/communicator/pref/pref-smartupdate.dtd (%chrome/common/pref/pref-smartupdate.dtd)
locale/@AB_CD@/communicator/pref/pref-tabs.dtd (%chrome/common/pref/pref-tabs.dtd) locale/@AB_CD@/communicator/pref/pref-tabs.dtd (%chrome/common/pref/pref-tabs.dtd)
locale/@AB_CD@/communicator/pref/pref-winhooks.dtd (%chrome/common/pref/pref-winhooks.dtd) locale/@AB_CD@/communicator/pref/pref-winhooks.dtd (%chrome/common/pref/pref-winhooks.dtd)

4
mozilla/xpfe/components/autocomplete/resources/content/autocomplete.xml
View File

@ -1124,7 +1124,7 @@
<!-- --> <!-- -->
<method name="openResultPopup"> <method name="openResultPopup">
<body><![CDATA[ <body><![CDATA[
if (!this.mMenuOpen && this.showPopup && this.focused && if (!this.mMenuOpen && this.focused &&
(this.getResultCount("") >= this.minResultsForPopup (this.getResultCount("") >= this.minResultsForPopup
|| this.mFailureItems)) { || this.mFailureItems)) {
var w = this.boxObject.width; var w = this.boxObject.width;
@ -1151,7 +1151,7 @@
<parameter name="aSessionName"/> <parameter name="aSessionName"/>
<parameter name="aResults"/> <parameter name="aResults"/>
<body><![CDATA[ <body><![CDATA[
if (this.focused) { if (this.focused && this.showPopup) {
this.view.addResults(aResults); this.view.addResults(aResults);
this.resultsPopup.adjustHeight(); this.resultsPopup.adjustHeight();
} }