Bug 329045 - Firefox 2.0 Extension Manager user interface update (browser). r=mconnor
git-svn-id: svn://10.0.0.236/trunk@195509 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -54,10 +54,10 @@ pref("general.startup.browser", true);
|
||||
pref("browser.chromeURL","chrome://browser/content/");
|
||||
pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul");
|
||||
pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul");
|
||||
pref("xpinstall.dialog.progress.skin", "chrome://mozapps/content/extensions/extensions.xul?type=themes");
|
||||
pref("xpinstall.dialog.progress.chrome", "chrome://mozapps/content/extensions/extensions.xul?type=extensions");
|
||||
pref("xpinstall.dialog.progress.type.skin", "Extension:Manager-themes");
|
||||
pref("xpinstall.dialog.progress.type.chrome", "Extension:Manager-extensions");
|
||||
pref("xpinstall.dialog.progress.skin", "chrome://mozapps/content/extensions/extensions.xul?view=installs");
|
||||
pref("xpinstall.dialog.progress.chrome", "chrome://mozapps/content/extensions/extensions.xul?view=installs");
|
||||
pref("xpinstall.dialog.progress.type.skin", "Extension:Manager");
|
||||
pref("xpinstall.dialog.progress.type.chrome", "Extension:Manager");
|
||||
|
||||
// Developers can set this to |true| if they are constantly changing files in their
|
||||
// extensions directory so that the extension system does not constantly think that
|
||||
|
||||
@@ -474,10 +474,8 @@
|
||||
<menuseparator/>
|
||||
<menuitem label="&downloads.label;" accesskey="&downloads.accesskey;"
|
||||
key="key_openDownloads" command="Tools:Downloads"/>
|
||||
<menuitem label="&extensions.label;" accesskey="&extensions.accesskey;"
|
||||
command="Tools:Extensions"/>
|
||||
<menuitem label="&themes.label;" accesskey="&themes.accesskey;"
|
||||
command="Tools:Themes"/>
|
||||
<menuitem label="&addons.label;" accesskey="&addons.accesskey;"
|
||||
command="Tools:Addons"/>
|
||||
<menuseparator id="devToolsSeparator"/>
|
||||
<menuitem id="javascriptConsole"
|
||||
label="&javaScriptConsoleCmd.label;" accesskey="&javaScriptConsoleCmd.accesskey;"
|
||||
|
||||
@@ -168,8 +168,7 @@
|
||||
<command id="Tools:Downloads" oncommand="toOpenWindowByType('Download:Manager',
|
||||
'chrome://mozapps/content/downloads/downloads.xul',
|
||||
'chrome,dialog=no,resizable');"/>
|
||||
<command id="Tools:Extensions" oncommand="BrowserOpenExtensions('extensions');"/>
|
||||
<command id="Tools:Themes" oncommand="BrowserOpenExtensions('themes');"/>
|
||||
<command id="Tools:Addons" oncommand="BrowserOpenAddonsMgr();"/>
|
||||
<command id="Tools:Sanitize" oncommand="gBrowserGlue.sanitize(window || null);"/>
|
||||
#ifdef MOZ_PLACES
|
||||
#include ../../components/places/content/commands.inc
|
||||
|
||||
@@ -5790,29 +5790,20 @@ var MailIntegration = {
|
||||
}
|
||||
};
|
||||
|
||||
function BrowserOpenExtensions(aOpenMode)
|
||||
function BrowserOpenAddonsMgr()
|
||||
{
|
||||
const EMTYPE = "Extension:Manager";
|
||||
|
||||
var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
|
||||
.getService(Components.interfaces.nsIWindowMediator);
|
||||
var needToOpen = true;
|
||||
var windowType = EMTYPE + "-" + aOpenMode;
|
||||
var windows = wm.getEnumerator(windowType);
|
||||
while (windows.hasMoreElements()) {
|
||||
var theEM = windows.getNext().QueryInterface(Components.interfaces.nsIDOMWindowInternal);
|
||||
if (theEM.document.documentElement.getAttribute("windowtype") == windowType) {
|
||||
theEM.focus();
|
||||
needToOpen = false;
|
||||
break;
|
||||
}
|
||||
var theEM = wm.getMostRecentWindow(EMTYPE);
|
||||
if (theEM) {
|
||||
theEM.focus();
|
||||
return;
|
||||
}
|
||||
|
||||
if (needToOpen) {
|
||||
const EMURL = "chrome://mozapps/content/extensions/extensions.xul?type=" + aOpenMode;
|
||||
const EMFEATURES = "chrome,dialog=no,resizable";
|
||||
window.openDialog(EMURL, "", EMFEATURES);
|
||||
}
|
||||
const EMURL = "chrome://mozapps/content/extensions/extensions.xul";
|
||||
const EMFEATURES = "chrome,menubar,extra-chrome,toolbar,dialog=no,resizable";
|
||||
window.openDialog(EMURL, "", EMFEATURES);
|
||||
}
|
||||
|
||||
function escapeNameValuePair(aName, aValue, aIsFormUrlEncoded)
|
||||
|
||||
@@ -123,12 +123,9 @@
|
||||
<!ENTITY downloads.accesskey "D">
|
||||
<!ENTITY downloads.commandkey "j">
|
||||
<!ENTITY downloadsUnix.commandkey "y">
|
||||
<!ENTITY extensions.label "Extensions">
|
||||
<!ENTITY extensions.tooltip "Show and Manage installed Extensions">
|
||||
<!ENTITY extensions.accesskey "E">
|
||||
<!ENTITY themes.label "Themes">
|
||||
<!ENTITY themes.tooltip "Change the Theme">
|
||||
<!ENTITY themes.accesskey "T">
|
||||
<!ENTITY addons.label "Addons">
|
||||
<!ENTITY addons.tooltip "Show and Manage installed Addons">
|
||||
<!ENTITY addons.accesskey "A">
|
||||
|
||||
<!ENTITY javaConsoleCmd.label "Java Console">
|
||||
<!ENTITY javaConsoleCmd.accesskey "J">
|
||||
|
||||
Reference in New Issue
Block a user