зеркало из https://github.com/mozilla/pjs.git
Bug 411226 - Migrate SeaMonkey's smart browsing preferences to new pref window (also rename panel to 'Location Bar'). r=IanN, sr=Neil.
This commit is contained in:
stefanh%inbox.com
Родитель
4f449407a5
Коммит
1fbf039288
|
|
@ -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-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/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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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.disabledForDomains", "");
|
||||
pref("keyword.enabled", true);
|
||||
pref("keyword.moreInfoURL", "chrome://branding/locale/brand.properties");
|
||||
|
||||
//Internet Search
|
||||
pref("browser.search.defaultenginename", "chrome://communicator-region/locale/region.properties");
|
||||
|
|
|
|||
|
|
@ -180,6 +180,8 @@ comm.jar:
|
|||
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-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.xul (pref/pref-mousewheel.xul)
|
||||
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-security.js (pref/pref-security.js)
|
||||
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.xul (pref/pref-smartupdate.xul)
|
||||
content/communicator/pref/pref-tabs.xul (pref/pref-tabs.xul)
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
* Contributor(s):
|
||||
* Diego Biurrun <diego@biurrun.de>
|
||||
* 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
|
||||
* either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
|
|
@ -37,48 +38,53 @@
|
|||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
function moreInfo()
|
||||
function Startup()
|
||||
{
|
||||
var browserURL = null;
|
||||
try {
|
||||
browserURL = parent.hPrefWindow.getPref("string", "browser.chromeURL");
|
||||
} catch(e) {
|
||||
// On systems that has the file view component, autoFill and showPopup will
|
||||
// return results from local browsing "history", even if autocomplete.enabled
|
||||
// is turned off, so we'll need to remove the dependent look in the ui.
|
||||
|
||||
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"]
|
||||
.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"));
|
||||
updateDependent(document.getElementById("browser.urlbar.autocomplete.enabled").value);
|
||||
}
|
||||
|
||||
function receiveACPrefs(aAutoFill, aShowPopup, aShowSearch, aAutoType)
|
||||
function updateDependent(aValue)
|
||||
{
|
||||
document.getElementById("browserUrlbarAutoFill").setAttribute("value", aAutoFill);
|
||||
document.getElementById("browserUrlbarShowPopup").setAttribute("value", aShowPopup);
|
||||
document.getElementById("browserUrlbarShowSearch").setAttribute("value", aShowSearch);
|
||||
document.getElementById("browserUrlbarMatchOnlyTyped").setAttribute("value", aAutoType);
|
||||
// The matchOnlyTyped checkbox always depend on autocomplete.enabled.
|
||||
updateMatchOnlyTyped();
|
||||
|
||||
// If autoFill has a class attribute, we don't have the file view component.
|
||||
// We then need to update autoFill and showPopup.
|
||||
if (document.getElementById("autoFill").hasAttribute("class"))
|
||||
{
|
||||
toggleCheckbox("autoFill", aValue);
|
||||
toggleCheckbox("showPopup", aValue);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function toggleAutoCompleteAdvancedButton()
|
||||
function toggleCheckbox(aCheckbox, aPrefValue)
|
||||
{
|
||||
var browserAutoCompleteEnabled = document.getElementById("browserAutoCompleteEnabled");
|
||||
var autoCompleteAdvancedButton = document.getElementById("autoCompleteAdvancedButton");
|
||||
autoCompleteAdvancedButton.disabled = !browserAutoCompleteEnabled.checked;
|
||||
if (!document.getElementById("browser.urlbar." + aCheckbox).locked)
|
||||
document.getElementById(aCheckbox).disabled = !aPrefValue;
|
||||
}
|
||||
|
||||
function updateMatchOnlyTyped()
|
||||
{
|
||||
if (!document.getElementById("browser.urlbar.matchOnlyTyped").locked)
|
||||
{
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@
|
|||
Contributor(s):
|
||||
Blake Ross <blakeross@telocity.com>
|
||||
Diego Biurrun <diego@biurrun.de>
|
||||
Stefan Hermes <stefanh@inbox.com>
|
||||
|
||||
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"),
|
||||
|
|
@ -41,71 +42,82 @@
|
|||
<?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;
|
||||
]>
|
||||
<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/pref/pref-locationbar.dtd">
|
||||
|
||||
<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;">
|
||||
<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<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">
|
||||
<![CDATA[
|
||||
|
||||
var _elementIDs = ["browserGoBrowsingEnabled", "browserAutoCompleteEnabled",
|
||||
"browserUrlbarAutoFill", "browserUrlbarShowPopup", "browserUrlbarShowSearch",
|
||||
"browserUrlbarMatchOnlyTyped", "domainGuessingEnabled"];
|
||||
|
||||
]]>
|
||||
</script>
|
||||
|
||||
<groupbox>
|
||||
<caption label="&internetKeywordsHeader.label;"/>
|
||||
<preferences id="locationBar_preferences">
|
||||
<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>
|
||||
|
||||
<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="&autoComplete.label;"/>
|
||||
<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>
|
||||
<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="&searchEngine.label;"/>
|
||||
<checkbox id="showSearch"
|
||||
label="&showSearchEngine.label;"
|
||||
accesskey="&showSearchEngine.accesskey;"
|
||||
preference="browser.urlbar.showSearch"/>
|
||||
</groupbox>
|
||||
|
||||
<groupbox>
|
||||
<caption label="&domainGuessingHeader.label;"/>
|
||||
|
||||
<checkbox id="domainGuessingEnabled"
|
||||
label="&domainGuessingEnabled.label;"
|
||||
accesskey="&domainGuessingEnabled.accesskey;"
|
||||
prefstring="browser.fixup.alternate.enabled"/>
|
||||
</groupbox>
|
||||
</page>
|
||||
<groupbox>
|
||||
<caption label="&unknownLocations.label;"/>
|
||||
<checkbox id="domainGuessingEnabled"
|
||||
label="&domainGuessing.label;"
|
||||
accesskey="&domainGuessing.accesskey;"
|
||||
preference="browser.fixup.alternate.enabled"/>
|
||||
<checkbox id="browserGoBrowsingEnabled"
|
||||
label="&keywords.label;"
|
||||
accesskey="&keywords.accesskey;"
|
||||
preference="keyword.enabled"/>
|
||||
</groupbox>
|
||||
</prefpane>
|
||||
</overlay>
|
||||
|
|
|
|||
|
|
@ -122,9 +122,12 @@
|
|||
prefpane="applications_pane"
|
||||
helpTopic="navigator_pref_helper_applications"
|
||||
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
|
||||
<treeitem label="&smartBrowse.label;"
|
||||
url="chrome://communicator/content/pref/pref-smart_browsing.xul"/>
|
||||
<treeitem label="&search.label;"
|
||||
url="chrome://communicator/content/pref/pref-search.xul"/>
|
||||
-->
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@
|
|||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell url="chrome://communicator/content/pref/pref-smart_browsing.xul" label="&smartBrowse.label;"/>
|
||||
<treecell label="(Migrated: &locationBar.label;)"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
|
|
|
|||
|
|
@ -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/
|
||||
app.releaseNotesURL=http://www.seamonkey-project.org/releases/seamonkey%VERSION%/
|
||||
app.vendorURL=http://www.seamonkey-project.org/
|
||||
keyword.moreInfoURL=http://www.mozilla.org/docs/end-user/internet-keywords.html
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
<li><a href="#history">History</a></li>
|
||||
<li><a href="#languages">Languages</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="#tabbed_browsing">Tabbed Browsing</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>
|
||||
|
||||
<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're not already viewing it, follow these steps:</p>
|
||||
|
||||
<ol>
|
||||
<li>Open the <span class="mac">&brandShortName;</span>
|
||||
<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>
|
||||
</ol>
|
||||
|
||||
<p>The Smart Browsing preferences panel allows you to better browse web pages
|
||||
using Internet Keywords, Location Bar Autocomplete and Domain Guessing.</p>
|
||||
<p>The Location Bar Preferences panel lets you fine-tune the behavior of the
|
||||
Location Bar.</p>
|
||||
|
||||
<ul>
|
||||
<li><strong>Internet Keywords</strong>:
|
||||
<li id="location_bar_autocomplete"><strong>Autocomplete</strong>:
|
||||
<ul>
|
||||
<li><strong>Enable Internet Keywords</strong>: Select this to enable fast
|
||||
access to services such as stock quotes, search, and other information
|
||||
from the Location bar.</li>
|
||||
<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:
|
||||
<li><strong>Autocomplete from your browsing history as you type</strong>:
|
||||
Select this to let &brandShortName; automatically show suggestions from
|
||||
your browsing history when you type in the Location Bar.
|
||||
<ul>
|
||||
<li><strong>Autocomplete best match as you type</strong>: As you
|
||||
<li><strong>Match only website's you've typed
|
||||
previously</strong>: Shows only websites that you'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
|
||||
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
|
||||
the Location Bar, &brandShortName; will show a drop-down list of
|
||||
matching visited web addresses.</li>
|
||||
<li><strong>Show internet search engine</strong>: Shows a drop-down
|
||||
list item allowing you to search the default search engine for
|
||||
words you enter.</li>
|
||||
<li><strong>Match only website you've typed previously</strong>:
|
||||
Shows only websites that you'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>
|
||||
</ul>
|
||||
</li>
|
||||
matching visited web addresses.
|
||||
<span class="unix"><strong>Note</strong>: If you have turned off
|
||||
<q>Autocomplete from your browsing history as you type</q>
|
||||
matching results from locations on your hard drive will still be
|
||||
shown in the drop-down list.</span></li>
|
||||
</ul></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><strong>Internet Search Engine</strong>:
|
||||
<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'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'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>
|
||||
</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'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>
|
||||
|
||||
<p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
|
||||
|
|
|
|||
|
|
@ -811,11 +811,6 @@
|
|||
<rdf:Description ID="intermediate_server_CA_certificates"
|
||||
nc:name="intermediate server CA certificates"
|
||||
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>
|
||||
</nc:subheadings>
|
||||
</rdf:Description>
|
||||
|
|
|
|||
|
|
@ -368,7 +368,6 @@
|
|||
Mode</a></li>
|
||||
<li><a href="#setting_search_preferences">Setting Search
|
||||
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="#using_find_as_you_type">Using Find-as-you-type</a></li>
|
||||
<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
|
||||
different.)
|
||||
|
||||
<p>The default search engine you choose in
|
||||
<a href="cs_nav_prefs_navigator.xhtml#smart_browsing">Preferences</a>
|
||||
is used. Search results for <q>baby doll</q> appear in both the
|
||||
browser window and in Sidebar. Click the links to visit web pages
|
||||
about baby dolls.</p>
|
||||
<p>The default search engine you choose in the
|
||||
<a href="cs_nav_prefs_navigator.xhtml#internet_search">Internet
|
||||
Search Preferences</a> is used. Search results for <q>baby doll</q>
|
||||
appear in both the browser window and in Sidebar. Click the links to
|
||||
visit web pages about baby dolls.</p>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
|
|
@ -417,8 +416,15 @@
|
|||
tab until you do a new search. You don't have to click the Back button
|
||||
to retrieve the search results.</p>
|
||||
|
||||
<p>Note: You can also use <a href="#using_internet_keywords">Internet
|
||||
Keywords</a> to search from the Location Bar.</p>
|
||||
<p><strong>Note</strong>: In the <q>Unknown Locations</q> section of the
|
||||
<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>
|
||||
|
||||
|
|
@ -576,61 +582,6 @@
|
|||
|
||||
<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'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'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'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's stock ticker symbol, and press
|
||||
<kbd class="mac">Return</kbd><kbd class="noMac">Enter</kbd>.</p>
|
||||
|
||||
<p>If you don't know a company's stock ticker symbol, type the
|
||||
company'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>
|
||||
|
||||
<ol>
|
||||
|
|
@ -1217,8 +1168,8 @@
|
|||
<h2 id="finding_localized_version">Finding a &brandShortName; version in your
|
||||
own language</h2>
|
||||
|
||||
<p>If you're looking for a version of &brandShortName; in a language other than
|
||||
American English, you can download it from the
|
||||
<p>If you're looking for a version of &brandShortName; in a language other
|
||||
than American English, you can download it from the
|
||||
<a href="http://www.seamonkey-project.org/releases/">SeaMonkey
|
||||
Project Releases</a> page.</p>
|
||||
|
||||
|
|
@ -1475,7 +1426,7 @@
|
|||
<li>In the File Bookmark dialog, look the Location field. Replace the
|
||||
dummy string (e.g. <tt>ILoveMozilla</tt>) with <kbd>%s</kbd>.
|
||||
For example, the location might become
|
||||
<kbd>http://www.google.com/search?q=<strong>%s</strong>&btnI=I'mFeelingLucky</kbd>.</li>
|
||||
<kbd>http://www.google.com/search?q=<strong>%s</strong>&btnI=I'mFeelingLucky</kbd>.</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>Close the dialog.</li>
|
||||
|
|
|
|||
|
|
@ -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-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-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-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>
|
||||
|
|
@ -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_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_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_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>
|
||||
|
|
@ -764,14 +763,6 @@
|
|||
</nc:subheadings>
|
||||
</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">
|
||||
<nc:subheadings>
|
||||
<rdf:Seq>
|
||||
|
|
|
|||
|
|
@ -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 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 autoComplete.label "Autocomplete">
|
||||
<!ENTITY enableAutoComplete.label "Autocomplete from your browsing history as you type">
|
||||
<!ENTITY enableAutoComplete.accesskey "A">
|
||||
<!ENTITY autoCompleteAutoFill.label "Automatically prefill the best match">
|
||||
<!ENTITY autoCompleteAutoFill.accesskey "u">
|
||||
<!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 autocompletePreview.label "Preview">
|
||||
<!ENTITY autoCompleteMatchOnlyTyped.accesskey "M">
|
||||
|
||||
<!ENTITY domainGuessingHeader.label "Domain Guessing">
|
||||
<!ENTITY domainGuessingEnabled.label "Automatically add "www." and ".com" to the location if a web page isn't found">
|
||||
<!ENTITY domainGuessingEnabled.accesskey "u">
|
||||
<!ENTITY searchEngine.label "Internet Search Engine">
|
||||
<!ENTITY showSearchEngine.label "Show default search engine">
|
||||
<!ENTITY showSearchEngine.accesskey "e">
|
||||
|
||||
<!ENTITY unknownLocations.label "Unknown Locations">
|
||||
<!ENTITY domainGuessing.label "Add "www." and ".com" 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">
|
||||
|
|
|
|||
|
|
@ -10,8 +10,7 @@
|
|||
<!ENTITY bidi.label "Bidi Options">
|
||||
<!ENTITY languages.label "Languages">
|
||||
<!ENTITY applications.label "Helper Applications">
|
||||
<!--LOCALIZATION NOTE (smartBrowse.label): DONT_TRANSLATE -->
|
||||
<!ENTITY smartBrowse.label "Smart Browsing">
|
||||
<!ENTITY locationBar.label "Location Bar">
|
||||
<!ENTITY tabWindows.label "Tabbed Browsing">
|
||||
<!ENTITY compose.label "Composer">
|
||||
<!ENTITY editing.label "New Page Settings">
|
||||
|
|
|
|||
|
|
@ -132,10 +132,6 @@
|
|||
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/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/prefutilities.properties (%chrome/common/pref/prefutilities.properties)
|
||||
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-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-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-navigator.dtd (%chrome/common/pref/pref-navigator.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-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-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-tabs.dtd (%chrome/common/pref/pref-tabs.dtd)
|
||||
locale/@AB_CD@/communicator/pref/pref-winhooks.dtd (%chrome/common/pref/pref-winhooks.dtd)
|
||||
|
|
|
|||
|
|
@ -1124,7 +1124,7 @@
|
|||
<!-- -->
|
||||
<method name="openResultPopup">
|
||||
<body><![CDATA[
|
||||
if (!this.mMenuOpen && this.showPopup && this.focused &&
|
||||
if (!this.mMenuOpen && this.focused &&
|
||||
(this.getResultCount("") >= this.minResultsForPopup
|
||||
|| this.mFailureItems)) {
|
||||
var w = this.boxObject.width;
|
||||
|
|
@ -1151,7 +1151,7 @@
|
|||
<parameter name="aSessionName"/>
|
||||
<parameter name="aResults"/>
|
||||
<body><![CDATA[
|
||||
if (this.focused) {
|
||||
if (this.focused && this.showPopup) {
|
||||
this.view.addResults(aResults);
|
||||
this.resultsPopup.adjustHeight();
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче