Bug 278377 - Add Window and Help menus to DOMi, this also fiex an issue where 'Promote Firefox' doesn't work on non-browser windows. r=mconnor
This commit is contained in:
mozilla.mano%sent.com
Родитель
bc87e38439
Коммит
7b400f89cb
|
|
@ -111,4 +111,8 @@
|
|||
keycode="&openHelp.commandkey;"/>
|
||||
#endif
|
||||
</keyset>
|
||||
|
||||
<stringbundleset id="stringbundleset">
|
||||
<stringbundle id="bundle_browser_region" src="chrome://browser-region/locale/region.properties"/>
|
||||
</stringbundleset>
|
||||
</overlay>
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@
|
|||
<stringbundle id="bundle_shell" src="chrome://browser/locale/shellservice.properties"/>
|
||||
<stringbundle id="bundle_browser" src="chrome://browser/locale/browser.properties"/>
|
||||
<stringbundle id="bundle_findBar" src="chrome://browser/locale/browser.properties"/>
|
||||
<stringbundle id="bundle_browser_region" src="chrome://browser-region/locale/region.properties"/>
|
||||
<stringbundle id="bundle_preferences" src="chrome://browser/locale/preferences/preferences.properties"/>
|
||||
</stringbundleset>
|
||||
|
||||
|
|
|
|||
|
|
@ -5659,16 +5659,6 @@ function updatePageFavIcon(aBrowser, aListener) {
|
|||
BookmarksUtils.loadFavIcon(uri.spec, aBrowser.mFavIconURL);
|
||||
}
|
||||
|
||||
function getUILink(item)
|
||||
{
|
||||
var regionBundle = document.getElementById("bundle_browser_region");
|
||||
|
||||
if (item == "promote")
|
||||
return regionBundle.getString("promoteURL");
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
function GetFrameDocumentsFromWindow(aWindow){
|
||||
if (aWindow.getComputedStyle(aWindow.document.body, "").direction == "ltr")
|
||||
aWindow.document.dir = "rtl";
|
||||
|
|
|
|||
|
|
@ -426,3 +426,13 @@ function openPreferences()
|
|||
openDialog("chrome://browser/content/preferences/preferences.xul",
|
||||
"Preferences", features);
|
||||
}
|
||||
|
||||
function getUILink(item)
|
||||
{
|
||||
var regionBundle = document.getElementById("bundle_browser_region");
|
||||
|
||||
if (item == "promote")
|
||||
return regionBundle.getString("promoteURL");
|
||||
|
||||
return "";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,6 +64,8 @@
|
|||
<script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarks.js"/>
|
||||
<script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarksManager.js"/>
|
||||
|
||||
<stringbundleset id="stringbundleset"/>
|
||||
|
||||
<commandset id="editMenuCommands"/>
|
||||
<commandset id="CommandUpdate_Bookmarks"
|
||||
events="focus,tree-select"
|
||||
|
|
|
|||
|
|
@ -1,87 +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 DOM Inspector.
|
||||
-
|
||||
- The Initial Developer of the Original Code is
|
||||
- Netscape Communications Corporation.
|
||||
- Portions created by the Initial Developer are Copyright (C) 2003
|
||||
- the Initial Developer. All Rights Reserved.
|
||||
-
|
||||
- Contributor(s):
|
||||
-
|
||||
- Alternatively, the contents of this file may be used under the terms of
|
||||
- either 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 LGPL or the GPL. 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 window [
|
||||
<!ENTITY % dtd1 SYSTEM "chrome://inspector/locale/inspector.dtd"> %dtd1;
|
||||
<!ENTITY % dtd2 SYSTEM "chrome://inspector/content/util.dtd"> %dtd2;
|
||||
<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd"> %browserDTD;
|
||||
]>
|
||||
|
||||
<?xul-overlay href="chrome://inspector/content/inspectorOverlay.xul"?>
|
||||
<?xul-overlay href="chrome://inspector/content/toolboxOverlay.xul"?>
|
||||
<?xul-overlay href="chrome://inspector/content/popupOverlay.xul"?>
|
||||
<?xul-overlay href="chrome://inspector/content/commandOverlay.xul"?>
|
||||
<?xul-overlay href="chrome://inspector/content/keysetOverlay.xul"?>
|
||||
<?xul-overlay href="chrome://inspector/content/statusbarOverlay.xul"?>
|
||||
|
||||
<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
|
||||
|
||||
<?xml-stylesheet href="chrome://inspector/skin/inspectorWindow.css"?>
|
||||
|
||||
<window id="winInspectorMain" title="&Inspector.title;"
|
||||
width="640" height="480"
|
||||
persist="screenX screenY width height maximized"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<popupset id="aTooltipSet"/>
|
||||
|
||||
<popupset id="ppsGlobalPopupset"/>
|
||||
<popupset id="ppsViewerPopupset"/>
|
||||
|
||||
<keyset id="ksGlobalKeyset"/>
|
||||
<commandset id="cmdsGlobalCommands"/>
|
||||
|
||||
<commandset id="tasksCommands">
|
||||
<command id="cmd_quit"/>
|
||||
</commandset>
|
||||
|
||||
<keyset id="tasksKeys">
|
||||
<key id="key_closeInspector" key="&closeCmd.key;" command="cmdClose"
|
||||
modifiers="accel"/>
|
||||
</keyset>
|
||||
|
||||
<toolbox id="tbxInsToolbox">
|
||||
<menubar id="mbrInspectorMain"/>
|
||||
<toolbar id="tbInspectorPrimary"/>
|
||||
</toolbox>
|
||||
|
||||
<vbox id="bxInspectorMain" flex="1"/>
|
||||
|
||||
<!--
|
||||
<statusbar id="status-bar"/>
|
||||
-->
|
||||
</window>
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
|
||||
<!DOCTYPE overlay [
|
||||
<!ENTITY % dtd1 SYSTEM "chrome://inspector/locale/inspector.dtd"> %dtd1;
|
||||
<!ENTITY % dtd2 SYSTEM "chrome://inspector/content/util.dtd"> %dtd2;
|
||||
]>
|
||||
|
||||
<overlay id="ovToolbox"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<popupset id="ppsGlobalPopupset"/>
|
||||
|
||||
<menubar id="mbrInspectorMain">
|
||||
|
||||
<menu id="mnFile" label="&mnFile.label;" accesskey="&mnFile.accesskey;">
|
||||
<menupopup id="menu_FilePopup"/>
|
||||
</menu>
|
||||
|
||||
<menu id="mnEdit" label="&mnEdit.label;" accesskey="&mnEdit.accesskey;">
|
||||
<menupopup id="mppEdit"/>
|
||||
</menu>
|
||||
|
||||
<menu id="mnSearch" label="&mnSearch.label;" accesskey="&mnSearch.accesskey;">
|
||||
<menupopup id="mppSearch"/>
|
||||
</menu>
|
||||
|
||||
<menu id="mnView" label="&mnView.label;" accesskey="&mnView.accesskey;">
|
||||
<menupopup id="mppView"/>
|
||||
</menu>
|
||||
|
||||
</menubar>
|
||||
|
||||
<toolbar id="tbInspectorPrimary" class="chromeclass-toolbar">
|
||||
|
||||
<hbox id="bxURLBar" flex="1">
|
||||
<toolbarbutton id="btnSelecting" type="checkbox" observes="cmd:selectByClick"
|
||||
tooltiptext="&btnSelecting.tooltip;"/>
|
||||
|
||||
<toolbarbutton id="btnFind" observes="cmd:find"
|
||||
tooltiptext="&btnFind.tooltip;"/>
|
||||
|
||||
<hbox id="bxURLBarContainer" flex="1">
|
||||
<hbox align="center" flex="1">
|
||||
<textbox id="tfURLBar" type="autocomplete" flex="1"
|
||||
searchSessions="history" timeout="50" maxrows="6"
|
||||
observes="cmdGotoURL">
|
||||
<image id="imgURLBarIcon"/>
|
||||
|
||||
</textbox>
|
||||
</hbox>
|
||||
|
||||
</hbox>
|
||||
|
||||
<toolbarbutton label="&btnInspect.label;" observes="cmdGotoURL"/>
|
||||
</hbox>
|
||||
|
||||
</toolbar>
|
||||
|
||||
</overlay>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
inspector.jar:
|
||||
*+ content/inspector/contents.rdf (content/contents.rdf)
|
||||
+ content/inspector/inspector.xul (content/inspector.xul)
|
||||
+ content/inspector/tasksOverlay.xul (content/tasksOverlay.xul)
|
||||
+ content/inspector/toolboxOverlay.xul (content/toolboxOverlay.xul)
|
||||
+ content/inspector/popupOverlay.xul (content/popupOverlay.xul)
|
||||
*+ locale/en-US/inspector/contents.rdf (locale/contents.rdf)
|
||||
+ locale/en-US/inspector/tasksOverlay.dtd (locale/tasksOverlay.dtd)
|
||||
+ icon.png (content/inspector.gif)
|
||||
Загрузка…
Ссылка в новой задаче