Forced reload, stop button, ability to use bookmark keywords in Open Web Location dialog, persist window choice, .8 -> .9, moving things to more appropriate places (60498, 62078, 49773, others). r=timeless/jag sr=alecf
This commit is contained in:
Родитель
7665adb1ec
Коммит
7273675bec
|
@ -439,7 +439,7 @@ var nsOpenRemoteCommand =
|
|||
Use 0 and the default checkbox will be to load into an editor
|
||||
and loading into existing browser option is removed
|
||||
*/
|
||||
window.openDialog( "chrome://navigator/content/openLocation.xul", "_blank", "chrome,modal,titlebar", 0);
|
||||
window.openDialog( "chrome://communicator/content/openLocation.xul", "_blank", "chrome,modal,titlebar", 0);
|
||||
window._content.focus();
|
||||
}
|
||||
};
|
||||
|
|
|
@ -28,8 +28,6 @@ include <$(THEME_ROOT_DEPTH)\theme.mk>
|
|||
install::
|
||||
$(MAKE_INSTALL) navigator.dtd $(DIST)\bin\chrome\locales\$(THEME)\navigator\locale
|
||||
$(MAKE_INSTALL) navigator.properties $(DIST)\bin\chrome\locales\$(THEME)\navigator\locale
|
||||
$(MAKE_INSTALL) openLocation.dtd $(DIST)\bin\chrome\locales\$(THEME)\navigator\locale
|
||||
$(MAKE_INSTALL) openLocation.properties $(DIST)\bin\chrome\locales\$(THEME)\navigator\locale
|
||||
$(MAKE_INSTALL) viewSource.dtd $(DIST)\bin\chrome\locales\$(THEME)\navigator\locale
|
||||
|
||||
clobber::
|
||||
|
|
|
@ -28,7 +28,7 @@ pref("network.search.url","http://cgi.netscape.com/cgi-bin/url_search.cgi?search
|
|||
pref("keyword.URL", "http://keyword.netscape.com/keyword/");
|
||||
pref("keyword.enabled", true);
|
||||
pref("general.useragent.locale", "chrome://navigator/locale/navigator.properties");
|
||||
pref("general.useragent.misc", "0.8");
|
||||
pref("general.useragent.misc", "0.9");
|
||||
|
||||
pref("general.startup.browser", true);
|
||||
pref("general.startup.mail", false);
|
||||
|
@ -38,6 +38,7 @@ pref("general.startup.compose", false);
|
|||
pref("general.startup.addressbook", false);
|
||||
|
||||
pref("general.open_location.last_url", "");
|
||||
pref("general.open_location.last_window_choice", 0);
|
||||
|
||||
// 0 = blank, 1 = home (browser.startup.homepage), 2 = last
|
||||
pref("browser.startup.page", 1);
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
comm.jar:
|
||||
content/navigator/contents.rdf (resources/content/contents.rdf)
|
||||
content/navigator/openLocation.js (resources/content/openLocation.js)
|
||||
content/navigator/openLocation.xul (resources/content/openLocation.xul)
|
||||
content/navigator/viewsource.js (resources/content/viewsource.js)
|
||||
content/navigator/viewSource.xul (resources/content/viewSource.xul)
|
||||
content/navigator/pageInfo.js (resources/content/pageInfo.js)
|
||||
|
@ -16,8 +14,6 @@ comm.jar:
|
|||
|
||||
en-US.jar:
|
||||
locale/en-US/navigator/contents.rdf (resources/locale/en-US/contents.rdf)
|
||||
locale/en-US/navigator/openLocation.dtd (resources/locale/en-US/openLocation.dtd)
|
||||
locale/en-US/navigator/openLocation.properties (resources/locale/en-US/openLocation.properties)
|
||||
locale/en-US/navigator/viewSource.dtd (resources/locale/en-US/viewSource.dtd)
|
||||
locale/en-US/navigator/pageInfo.dtd (resources/locale/en-US/pageInfo.dtd)
|
||||
locale/en-US/navigator/navigator.dtd (resources/locale/en-US/navigator.dtd)
|
||||
|
|
|
@ -513,7 +513,7 @@ function Startup()
|
|||
|
||||
if (startPage)
|
||||
loadURI(startPage);
|
||||
|
||||
|
||||
// Perform default browser checking.
|
||||
checkForDefaultBrowser();
|
||||
}
|
||||
|
@ -603,16 +603,25 @@ function BrowserStop()
|
|||
getWebNavigation().stop();
|
||||
}
|
||||
|
||||
function BrowserReallyReload(event)
|
||||
function BrowserReload()
|
||||
{
|
||||
// Default is no flags.
|
||||
var reloadFlags = nsIWebNavigation.LOAD_FLAGS_NONE;
|
||||
// See if the event was a shift-click.
|
||||
if (event && event.shiftKey) {
|
||||
// Shift key means bypass proxy and cache.
|
||||
reloadFlags = nsIWebNavigation.LOAD_FLAGS_BYPASS_PROXY | nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE;
|
||||
try {
|
||||
getWebNavigation().reload(reloadFlags);
|
||||
}
|
||||
catch(ex) {
|
||||
}
|
||||
}
|
||||
|
||||
function BrowserReloadSkipCache()
|
||||
{
|
||||
// Bypass proxy and cache.
|
||||
var reloadFlags = nsIWebNavigation.LOAD_FLAGS_BYPASS_PROXY | nsIWebNavigation.LOAD_FLAGS_BYPASS_CACHE;
|
||||
try {
|
||||
getWebNavigation().reload(reloadFlags);
|
||||
}
|
||||
catch(ex) {
|
||||
}
|
||||
getWebNavigation().reload(reloadFlags);
|
||||
}
|
||||
|
||||
function BrowserHome()
|
||||
|
@ -760,7 +769,7 @@ function RevealSearchPanel()
|
|||
function BrowserOpenWindow()
|
||||
{
|
||||
//opens a window where users can select a web location to open
|
||||
openDialog("chrome://navigator/content/openLocation.xul", "_blank", "chrome,modal,titlebar", window);
|
||||
openDialog("chrome://communicator/content/openLocation.xul", "_blank", "chrome,modal,titlebar", window);
|
||||
}
|
||||
|
||||
/* Called from the openLocation dialog. This allows that dialog to instruct
|
||||
|
@ -890,10 +899,11 @@ function loadURI(uri)
|
|||
function BrowserLoadURL()
|
||||
{
|
||||
var url = gURLBar.value;
|
||||
loadShortcutOrURI(url);
|
||||
loadURI(getShortcutOrURI(url));
|
||||
_content.focus();
|
||||
}
|
||||
|
||||
function loadShortcutOrURI(url)
|
||||
function getShortcutOrURI(url)
|
||||
{
|
||||
// rjc: added support for URL shortcuts (3/30/1999)
|
||||
try {
|
||||
|
@ -923,11 +933,8 @@ function loadShortcutOrURI(url)
|
|||
url = shortcutURL;
|
||||
|
||||
} catch (ex) {
|
||||
// stifle any exceptions so we're sure to load the URL.
|
||||
}
|
||||
|
||||
loadURI(url);
|
||||
_content.focus();
|
||||
return url;
|
||||
}
|
||||
|
||||
function readFromClipboard()
|
||||
|
@ -992,10 +999,6 @@ function BrowserPageInfo()
|
|||
"chrome,dialog=no");
|
||||
}
|
||||
|
||||
function BrowserReload()
|
||||
{
|
||||
}
|
||||
|
||||
function hiddenWindowStartup()
|
||||
{
|
||||
// Disable menus which are not appropriate
|
||||
|
|
|
@ -87,7 +87,6 @@ Contributor(s): ______________________________________. -->
|
|||
|
||||
<!-- broadcasters are appended from the overlay -->
|
||||
<broadcasterset id="broadcasterset">
|
||||
<broadcaster id="canReload" oncommand="BrowserReallyReload(event);"/>
|
||||
<broadcaster id="canPrint"/>
|
||||
<broadcaster id="args" value=""/>
|
||||
<broadcaster id="cmd_pageSetup"/>
|
||||
|
@ -140,9 +139,9 @@ Contributor(s): ______________________________________. -->
|
|||
<menupopup context="" oncreate="BrowserForwardMenu(event);"/>
|
||||
</menubutton>
|
||||
|
||||
<button class="button-toolbar-1 top" id="reload-button" crop="right" observes="canReload" value="&reloadButton.label;"
|
||||
<button class="button-toolbar-1 top" id="reload-button" crop="right" oncommand="if (event.shiftKey) BrowserReloadSkipCache(); else BrowserReload();" value="&reloadButton.label;"
|
||||
tooltip="aTooltip" tooltiptext="&reloadButton.tooltip;"/>
|
||||
<button class="button-toolbar-1 top" id="stop-button" crop="right" observes="canStop" onclick="BrowserStop()" value="&stopButton.label;"
|
||||
<button class="button-toolbar-1 top" id="stop-button" crop="right" observes="canStop" oncommand="BrowserStop();" value="&stopButton.label;"
|
||||
tooltip="aTooltip" tooltiptext="&stopButton.tooltip;"/>
|
||||
</box>
|
||||
|
||||
|
@ -151,7 +150,7 @@ Contributor(s): ______________________________________. -->
|
|||
<box autostretch="never" valign="middle" flex="1" id="urlbar-container">
|
||||
<image id="page-proxy-button" ondraggesture="nsDragAndDrop.startDrag(event, proxyIconDNDObserver);"/>
|
||||
<textfield autocomplete="true" timeout="300" class="plain"
|
||||
searchSessionType="urlbar" id="urlbar" tooltip="aTooltip" tooltiptext="&locationBar.tooltip;"
|
||||
searchSessionType="urlbar,addrbook" id="urlbar" tooltip="aTooltip" tooltiptext="&locationBar.tooltip;"
|
||||
onclick="if (event.button==1) URLBarLeftClickHandler(event);"
|
||||
onblur="URLBarBlurHandler(event);"
|
||||
onkeypress="if( event.keyCode == 13 ) { addToUrlbarHistory(); BrowserLoadURL(); }" flex="1"/>
|
||||
|
@ -172,7 +171,7 @@ Contributor(s): ______________________________________. -->
|
|||
oncommand="OpenSearch('internet',false, document.getElementById('urlbar').value);"
|
||||
tooltip="aTooltip" tooltiptext="&searchButton.tooltip;"/>
|
||||
</box>
|
||||
|
||||
/* foo */
|
||||
<menubutton class="menubutton-dual toolbar top" id="print-button" persist="hidden" value="&printButton.label;"
|
||||
crop="right" buttonaction="BrowserPrint()" tooltip="aTooltip" buttontooltiptext="&printButton.tooltip;">
|
||||
<menupopup id="printMenu" popupalign="topright" popupanchor="bottomright">
|
||||
|
|
|
@ -68,8 +68,8 @@
|
|||
<key id="key_selectAll"/>
|
||||
|
||||
<!-- View Menu -->
|
||||
<key id="key_reload" key="&reloadCmd.commandkey;" observes="canReload" modifiers="accel"/>
|
||||
<key id="key_reallyReload" key="&reloadCmd.commandkey;" observes="canReload" modifiers="accel,shift"/>
|
||||
<key id="key_reload" key="&reloadCmd.commandkey;" oncommand="BrowserReload();" modifiers="accel"/>
|
||||
<key id="key_reallyReload" key="&reloadCmd.commandkey;" oncommand="BrowserReloadSkipCache();" modifiers="accel,shift"/>
|
||||
<key id="key_viewSource" key="&pageSourceCmd.commandkey;" observes="View:PageSource" modifiers="accel"/>
|
||||
<key id="key_viewInfo" key="&pageInfoCmd.commandkey;" observes="View:PageInfo" modifiers="accel"/>
|
||||
|
||||
|
@ -211,7 +211,7 @@
|
|||
</menupopup>
|
||||
</menu>
|
||||
<menuseparator />
|
||||
<menuitem id="menuitem-reload" accesskey="&reloadCmd.accesskey;" key="key_reload" value="&reloadCmd.label;" observes="canReload" />
|
||||
<menuitem id="menuitem-reload" accesskey="&reloadCmd.accesskey;" key="key_reload" value="&reloadCmd.label;" oncommand="BrowserReload();"/>
|
||||
<menuitem value="&showImagesCmd.label;" accesskey="&showImagesCmd.accesskey;" disabled="true" oncommand="BrowserReload();"/>
|
||||
<menuitem value="&stopCmd.label;" accesskey="&stopCmd.accesskey;" id="menuitem-stop" oncommand="BrowserStop();" key="key_stop"/>
|
||||
<menuseparator />
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
<key id="goForwardKbIE" keycode="VK_BACK" observes="Browser:Forward" modifiers="shift"/>
|
||||
|
||||
<!-- Supporting IE 'refresh' shortcut key -->
|
||||
<key id="reloadIE" keycode="VK_F5" observes="canReload"/>
|
||||
<key id="reloadIE" keycode="VK_F5" oncommand="BrowserReload();"/>
|
||||
|
||||
<key id="goHome" keycode="VK_HOME" observes="Browser:Home" modifiers="alt"/>
|
||||
</keyset>
|
||||
|
|
|
@ -82,7 +82,7 @@ function executeUrlBarHistoryCommand( aTarget )
|
|||
var value = aTarget.getAttribute("value");
|
||||
if (index != "nothing_available" && value)
|
||||
{
|
||||
loadShortcutOrURI(value);
|
||||
loadURI(getShortcutOrURI(value));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -15,7 +15,8 @@
|
|||
<key id="goForwardKbIE" keycode="VK_BACK" observes="Browser:Forward" modifiers="shift"/>
|
||||
|
||||
<!-- Supporting IE 'refresh' shortcut key -->
|
||||
<key id="reloadIE" keycode="VK_F5" observes="canReload"/>
|
||||
<key id="reloadIE" keycode="VK_F5" oncommand="BrowserReload();"/>
|
||||
<key id="forceReloadIE" keycode="VK_F5" modifiers="control" oncommand="BrowserReloadSkipCache();"/>
|
||||
|
||||
<key id="goHome" keycode="VK_HOME" observes="Browser:Home" modifiers="alt"/>
|
||||
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
navigator.dtd
|
||||
openLocation.dtd
|
||||
openLocation.properties
|
||||
viewSource.dtd
|
||||
pageInfo.dtd
|
||||
navigator.properties
|
||||
askViewZoom.dtd
|
|
@ -25,8 +25,6 @@ CHROME_DIR=locales\en-US
|
|||
CHROME_L10N_DIR=navigator\locale
|
||||
|
||||
CHROME_L10N = \
|
||||
.\openLocation.dtd \
|
||||
.\openLocation.properties \
|
||||
.\viewSource.dtd \
|
||||
.\pageInfo.dtd \
|
||||
.\navigator.dtd \
|
||||
|
|
|
@ -4,6 +4,8 @@ comm.jar:
|
|||
content/communicator/utilityOverlay.xul (resources/content/utilityOverlay.xul)
|
||||
content/communicator/utilityOverlay.js (resources/content/utilityOverlay.js)
|
||||
content/communicator/utilityOverlay.css (resources/content/utilityOverlay.css)
|
||||
content/communicator/openLocation.js (resources/content/openLocation.js)
|
||||
content/communicator/openLocation.xul (resources/content/openLocation.xul)
|
||||
content/communicator/taskbarOverlay.xul (resources/content/taskbarOverlay.xul)
|
||||
content/communicator/tasksOverlay.js (resources/content/tasksOverlay.js)
|
||||
content/communicator/tasksOverlay.xul (resources/content/tasksOverlay.xul)
|
||||
|
@ -28,6 +30,8 @@ en-US.jar:
|
|||
locale/en-US/communicator/contents.rdf (resources/locale/en-US/contents.rdf)
|
||||
locale/en-US/communicator/utilityOverlay.dtd (resources/locale/en-US/utilityOverlay.dtd)
|
||||
locale/en-US/communicator/utilityOverlay.properties (resources/locale/en-US/utilityOverlay.properties)
|
||||
locale/en-US/communicator/openLocation.dtd (resources/locale/en-US/openLocation.dtd)
|
||||
locale/en-US/communicator/openLocation.properties (resources/locale/en-US/openLocation.properties)
|
||||
locale/en-US/communicator/taskbar.rdf (resources/locale/en-US/taskbar.rdf)
|
||||
locale/en-US/communicator/tasksOverlay.dtd (resources/locale/en-US/tasksOverlay.dtd)
|
||||
locale/en-US/communicator/taskbarOverlay.dtd (resources/locale/en-US/taskbarOverlay.dtd)
|
||||
|
|
|
@ -166,7 +166,7 @@
|
|||
{
|
||||
var url = readFromClipboard();
|
||||
if (url) {
|
||||
loadShortcutOrURI(url);
|
||||
loadURI(getShortcutOrURI(url));
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
|
@ -169,7 +169,7 @@ var contentAreaDNDObserver = {
|
|||
|
||||
switch (document.firstChild.getAttribute('windowtype')) {
|
||||
case "navigator:browser":
|
||||
loadShortcutOrURI(url);
|
||||
loadURI(getShortcutOrURI(url));
|
||||
break;
|
||||
case "navigator:view-source":
|
||||
viewSource(url);
|
||||
|
|
|
@ -0,0 +1,148 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public
|
||||
* License Version 1.1 (the "License"); you may not use this file
|
||||
* except in compliance with the License. You may obtain a copy of
|
||||
* the License at http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS
|
||||
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
* implied. See the License for the specific language governing
|
||||
* rights and limitations under the License.
|
||||
*
|
||||
* The Original Code is Mozilla Communicator client code, released March
|
||||
* 31, 1998.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Netscape Communications
|
||||
* Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
* Rights Reserved.
|
||||
*
|
||||
* Contributor(s): Michael Lowe <michael.lowe@bigfoot.com>
|
||||
* Blake Ross <blakeross@telocity.com>
|
||||
*/
|
||||
|
||||
var browser;
|
||||
var dialog;
|
||||
var bundle;
|
||||
var pref = null;
|
||||
try {
|
||||
pref = Components.classes["@mozilla.org/preferences;1"]
|
||||
.getService(Components.interfaces.nsIPref);
|
||||
} catch (ex) {
|
||||
// not critical, remain silent
|
||||
}
|
||||
|
||||
function onLoad()
|
||||
{
|
||||
bundle = srGetStrBundle("chrome://communicator/locale/openLocation.properties");
|
||||
|
||||
dialog = new Object;
|
||||
dialog.input = document.getElementById("dialog.input");
|
||||
dialog.help = document.getElementById("dialog.help");
|
||||
dialog.open = document.getElementById("ok");
|
||||
dialog.openAppList = document.getElementById("openAppList");
|
||||
dialog.openTopWindow = document.getElementById("currentWindow");
|
||||
dialog.openEditWindow = document.getElementById("editWindow");
|
||||
|
||||
browser = window.arguments[0];
|
||||
if (!browser) {
|
||||
// No browser supplied - we are calling from Composer
|
||||
dialog.openAppList.selectedItem = dialog.openEditWindow;
|
||||
dialog.openTopWindow.setAttribute("disabled", "true");
|
||||
}
|
||||
else {
|
||||
dialog.openAppList.selectedItem = dialog.openTopWindow;
|
||||
}
|
||||
|
||||
// change OK button text to 'open'
|
||||
dialog.open.setAttribute("value", bundle.GetStringFromName("openButtonLabel"));
|
||||
|
||||
doSetOKCancel(open, 0, 0, 0);
|
||||
|
||||
dialog.input.focus();
|
||||
if (pref) {
|
||||
try {
|
||||
var data = pref.GetIntPref("general.open_location.last_window_choice");
|
||||
var element = dialog.openAppList.getElementsByAttribute("data", data)[0];
|
||||
if (element)
|
||||
dialog.openAppList.selectedItem = element;
|
||||
dialog.input.value = pref.CopyUnicharPref("general.open_location.last_url");
|
||||
}
|
||||
catch(ex) {
|
||||
}
|
||||
if (dialog.input.value)
|
||||
dialog.input.select(); // XXX should probably be done automatically
|
||||
}
|
||||
|
||||
doEnabling();
|
||||
}
|
||||
|
||||
function doEnabling()
|
||||
{
|
||||
dialog.open.disabled = !dialog.input.value;
|
||||
}
|
||||
|
||||
function open()
|
||||
{
|
||||
var url = browser.getShortcutOrURI(dialog.input.value);
|
||||
try {
|
||||
switch (dialog.openAppList.data) {
|
||||
case "0":
|
||||
browser.loadURI(url);
|
||||
break;
|
||||
case "1":
|
||||
window.opener.delayedOpenWindow(getBrowserURL(), "all,dialog=no", url);
|
||||
break;
|
||||
case "2":
|
||||
// editPage is in utilityOverlay.js (all editor openers with URL should use this)
|
||||
// 3rd param tells editPage to use "delayedOpenWindow"
|
||||
editPage(url, window.opener, true);
|
||||
break;
|
||||
}
|
||||
}
|
||||
catch(exception) {
|
||||
}
|
||||
|
||||
if (pref) {
|
||||
pref.SetUnicharPref("general.open_location.last_url", dialog.input.value);
|
||||
pref.SetIntPref("general.open_location.last_window_choice", dialog.openAppList.data);
|
||||
}
|
||||
|
||||
// Delay closing slightly to avoid timing bug on Linux.
|
||||
window.close();
|
||||
return false;
|
||||
}
|
||||
|
||||
function createInstance(contractid, iidName)
|
||||
{
|
||||
var iid = Components.interfaces[iidName];
|
||||
return Components.classes[contractid].createInstance(iid);
|
||||
}
|
||||
|
||||
const nsIFilePicker = Components.interfaces.nsIFilePicker;
|
||||
function onChooseFile()
|
||||
{
|
||||
try {
|
||||
var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
|
||||
fp.init(window, bundle.GetStringFromName("chooseFileDialogTitle"), nsIFilePicker.modeOpen);
|
||||
|
||||
if (dialog.openAppList.data == "2") {
|
||||
// When loading into Composer, direct user to prefer HTML files and text files,
|
||||
// so we call separately to control the order of the filter list
|
||||
fp.appendFilters(nsIFilePicker.filterHTML | nsIFilePicker.filterText);
|
||||
fp.appendFilters(nsIFilePicker.filterText);
|
||||
fp.appendFilters(nsIFilePicker.filterAll);
|
||||
}
|
||||
else {
|
||||
fp.appendFilters(nsIFilePicker.filterHTML | nsIFilePicker.filterText |
|
||||
nsIFilePicker.filterAll | nsIFilePicker.filterImages | nsIFilePicker.filterXML);
|
||||
}
|
||||
|
||||
if (fp.show() == nsIFilePicker.returnOK && fp.fileURL.spec && fp.fileURL.spec.length > 0)
|
||||
dialog.input.value = fp.fileURL.spec;
|
||||
}
|
||||
catch(ex) {
|
||||
}
|
||||
doEnabling();
|
||||
}
|
|
@ -0,0 +1,89 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<!--
|
||||
The contents of this file are subject to the Netscape Public
|
||||
License Version 1.1 (the "License"); you may not use this file
|
||||
except in compliance with the License. You may obtain a copy of
|
||||
the License at http://www.mozilla.org/NPL/
|
||||
|
||||
Software distributed under the License is distributed on an "AS
|
||||
IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
implied. See the License for the specific language governing
|
||||
rights and limitations under the License.
|
||||
|
||||
The Original Code is Mozilla Communicator client code, released
|
||||
March 31, 1998.
|
||||
|
||||
The Initial Developer of the Original Code is Netscape
|
||||
Communications Corporation. Portions created by Netscape are
|
||||
Copyright (C) 1998-1999 Netscape Communications Corporation. All
|
||||
Rights Reserved.
|
||||
|
||||
Contributor(s):
|
||||
Ben Goodger <ben@netscape.com>
|
||||
Michael Lowe <michael.lowe@bigfoot.com>
|
||||
|
||||
-->
|
||||
|
||||
<?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?>
|
||||
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
|
||||
|
||||
<!DOCTYPE window [
|
||||
<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
|
||||
%brandDTD;
|
||||
<!ENTITY % openDialogDTD SYSTEM "chrome://communicator/locale/openLocation.dtd" >
|
||||
%openDialogDTD;
|
||||
]>
|
||||
|
||||
<window id="openLocation"
|
||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
title="&caption.label;"
|
||||
onload="onLoad()"
|
||||
style="width: 40em;"
|
||||
class="dialog"
|
||||
align="vertical"
|
||||
persist="screenX screenY"
|
||||
screenX="24" screenY="24">
|
||||
|
||||
<script language="javascript" src="chrome://global/content/strres.js"/>
|
||||
<script language="javascript" src="chrome://global/content/globalOverlay.js"/>
|
||||
<script language="javascript" src="chrome://communicator/content/openLocation.js"/>
|
||||
<script language="javascript" src="chrome://communicator/content/utilityOverlay.js"/>
|
||||
|
||||
<keyset id="keyset"/>
|
||||
|
||||
<box>
|
||||
<box orient="vertical">
|
||||
<image class="question-icon"/>
|
||||
<spring flex="1"/>
|
||||
</box>
|
||||
<separator orient="vertical" class="thin"/>
|
||||
<box orient="vertical" flex="1">
|
||||
<html>&enter.label;</html>
|
||||
<separator class="thin"/>
|
||||
|
||||
<box autostretch="never">
|
||||
<textfield id="dialog.input" flex="1" oninput="doEnabling();"/>
|
||||
<button value="&chooseFile.label;" onclick="onChooseFile();"/>
|
||||
</box>
|
||||
<box autostretch="never" valign="center">
|
||||
<text class="label" value="&openWhere.label;"/>
|
||||
<menulist id="openAppList">
|
||||
<menupopup>
|
||||
<menuitem data="0" id="currentWindow" value="&topWindow.label;"/>
|
||||
<menuitem data="1" value="&newWindow.label;"/>
|
||||
<menuseparator/>
|
||||
<menuitem data="2" id="editWindow" value="&editNewWindow.label;"/>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
<spring flex="1"/>
|
||||
</box>
|
||||
</box>
|
||||
</box>
|
||||
|
||||
<separator/>
|
||||
|
||||
<box id="okCancelButtonsRight"/>
|
||||
|
||||
</window>
|
|
@ -1,3 +1,5 @@
|
|||
openLocation.dtd
|
||||
openLocation.properties
|
||||
utilityOverlay.dtd
|
||||
utilityOverlay.properties
|
||||
taskbar.rdf
|
||||
|
|
Загрузка…
Ссылка в новой задаче