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

Bug 335618 (Calendar only) - Extension/Theme Manager changes. r=mvl

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@195590 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rob_strong%exchangecode.com
2006-04-27 20:20:36 +00:00
parent 7db3ca0b7f
commit 7f7ca5a5ee
5 changed files with 19 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/calendar/resources/content/applicationUtil.js
View File

@@ -137,29 +137,20 @@ function goToggleToolbar(id, elementID)
}
function goOpenExtensions(aOpenMode)
function goOpenAddons()
{
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);
}

7
mozilla/calendar/resources/locale/en-US/menuOverlay.dtd
View File

@@ -168,11 +168,8 @@
<!ENTITY calendar.fullscreen.label "Full Screen">
<!ENTITY calendar.fullscreen.accesskey "F">
<!ENTITY calendar.extensions.label "Extensions">
<!ENTITY calendar.extensions.accesskey "E">
<!ENTITY calendar.themes.label "Themes">
<!ENTITY calendar.themes.accesskey "T">
<!ENTITY calendar.addons.label "Addons">
<!ENTITY calendar.addons.accesskey "d">
<!ENTITY goMenu.label "Go">
<!ENTITY goMenu.accesskey "G">

8
mozilla/calendar/sunbird/app/profile/sunbird.js
View File

@@ -45,10 +45,10 @@ pref("toolkit.defaultChromeURI","chrome://calendar/content/");
pref("browser.hiddenWindowChromeURL", "chrome://calendar/content/hiddenWindow.xul");
pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul");
pref("xpinstall.dialog.progress", "chrome://mozapps/content/downloads/downloads.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");
#expand pref("app.extensions.version", "__APP_VERSION__");

12
mozilla/calendar/sunbird/base/content/calendar-menubar.inc
View File

@@ -353,14 +353,10 @@
# accesskey="&calendar.wizard.accesskey;"
# observes="wizard_command"/>
# <menuseparator/>
<menuitem id="extensionsManager"
label="&calendar.extensions.label;"
accesskey="&calendar.extensions.accesskey;"
command="Tools:Extensions"/>
<menuitem id="themesManager"
label="&calendar.themes.label;"
accesskey="&calendar.themes.accesskey;"
command="Tools:Themes"/>
<menuitem id="addonsManager"
label="&calendar.addons.label;"
accesskey="&calendar.addons.accesskey;"
command="Tools:Addons"/>
<menuseparator id="devToolsSeparator"/>
<menuitem id="javascriptConsole"
label="&javaScriptConsoleCmd.label;"

3
mozilla/calendar/sunbird/base/content/calendar-sets.inc
View File

@@ -105,8 +105,7 @@
<command id="cmd_showStatusBar" oncommand="goToggleToolbar('status-bar', 'menu_showStatusBar');"/>
<command id="cmd_showTaskBox" oncommand="goToggleToolbar('taskBox', 'menu_showTaskBox');"/>
<command id="Tools:Extensions" oncommand="goOpenExtensions('extensions');"/>
<command id="Tools:Themes" oncommand="goOpenExtensions('themes');"/>
<command id="Tools:Addons" oncommand="goOpenAddons();"/>
#ifdef XP_MACOSX
<command id="minimizeWindowCmd" oncommand="window.minimize();"/>