author | Paul Rouget <paul@mozilla.com> |
Mon, 23 Jun 2014 17:36:11 +0800 | |
changeset 190167 | 7e72de243a5a2969aecf9801daf84c3eca9fad8f |
parent 189841 | 1696574aa6114903b888ea54e060135a3fa4342c |
child 190168 | 49bf0766bca8ab93c850cd4c2607fb638338a93a |
push id | 27002 |
push user | kwierso@gmail.com |
push date | Tue, 24 Jun 2014 00:56:44 +0000 |
treeherder | mozilla-central@fa6a7a2f476c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | dcamp |
bugs | 1028014 |
milestone | 33.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc @@ -498,16 +498,19 @@ accesskey="&devToolboxMenuItem.accesskey;"/> <menuseparator id="menu_devtools_separator"/> <menuitem id="menu_devToolbar" observes="devtoolsMenuBroadcaster_DevToolbar" accesskey="&devToolbarMenu.accesskey;"/> <menuitem id="menu_devAppMgr" observes="devtoolsMenuBroadcaster_DevAppMgr" accesskey="&devAppMgrMenu.accesskey;"/> + <menuitem id="menu_webide" + observes="devtoolsMenuBroadcaster_webide" + accesskey="&webide.accesskey;"/> <menuitem id="menu_browserToolbox" observes="devtoolsMenuBroadcaster_BrowserToolbox" accesskey="&browserToolboxMenu.accesskey;"/> <menuitem id="menu_browserConsole" observes="devtoolsMenuBroadcaster_BrowserConsole" accesskey="&browserConsoleCmd.accesskey;"/> <menuitem id="menu_responsiveUI" observes="devtoolsMenuBroadcaster_ResponsiveUI"
--- a/browser/base/content/browser-sets.inc +++ b/browser/base/content/browser-sets.inc @@ -93,16 +93,17 @@ <command id="Browser:RestoreLastSession" oncommand="restoreLastSession();" disabled="true"/> <command id="Tools:Search" oncommand="BrowserSearch.webSearch();"/> <command id="Tools:Downloads" oncommand="BrowserDownloadsUI();"/> <command id="Tools:DevToolbox" oncommand="gDevToolsBrowser.toggleToolboxCommand(gBrowser);"/> <command id="Tools:DevToolbar" oncommand="DeveloperToolbar.toggle();" disabled="true" hidden="true"/> <command id="Tools:DevToolbarFocus" oncommand="DeveloperToolbar.focusToggle();" disabled="true"/> <command id="Tools:DevAppMgr" oncommand="gDevToolsBrowser.openAppManager(gBrowser);" disabled="true" hidden="true"/> + <command id="Tools:WebIDE" oncommand="gDevToolsBrowser.openWebIDE();" disabled="true" hidden="true"/> <command id="Tools:BrowserToolbox" oncommand="BrowserToolboxProcess.init();" disabled="true" hidden="true"/> <command id="Tools:BrowserConsole" oncommand="HUDService.toggleBrowserConsole();"/> <command id="Tools:Scratchpad" oncommand="Scratchpad.openScratchpad();"/> <command id="Tools:ResponsiveUI" oncommand="ResponsiveUI.toggle();"/> <command id="Tools:Eyedropper" oncommand="openEyedropper();"/> <command id="Tools:Addons" oncommand="BrowserOpenAddonsMgr();"/> <command id="Tools:ErrorConsole" oncommand="toJavaScriptConsole()" disabled="true" hidden="true"/> <command id="Tools:DevToolsConnect" oncommand="gDevToolsBrowser.openConnectScreen(gBrowser)" disabled="true" hidden="true"/> @@ -193,16 +194,19 @@ <broadcaster id="devtoolsMenuBroadcaster_DevToolbar" label="&devToolbarMenu.label;" type="checkbox" autocheck="false" command="Tools:DevToolbar" key="key_devToolbar"/> <broadcaster id="devtoolsMenuBroadcaster_DevAppMgr" label="&devAppMgrMenu.label;" command="Tools:DevAppMgr"/> + <broadcaster id="devtoolsMenuBroadcaster_webide" + label="&webide.label;" + command="Tools:WebIDE"/> <broadcaster id="devtoolsMenuBroadcaster_BrowserToolbox" label="&browserToolboxMenu.label;" command="Tools:BrowserToolbox"/> <broadcaster id="devtoolsMenuBroadcaster_BrowserConsole" label="&browserConsoleCmd.label;" key="key_browserConsole" command="Tools:BrowserConsole"/> <broadcaster id="devtoolsMenuBroadcaster_Scratchpad"
--- a/browser/devtools/framework/gDevTools.jsm +++ b/browser/devtools/framework/gDevTools.jsm @@ -427,19 +427,23 @@ let gDevToolsBrowser = { focusEl.removeAttribute("disabled"); } else { focusEl.setAttribute("disabled", "true"); } if (devToolbarEnabled && Services.prefs.getBoolPref("devtools.toolbar.visible")) { win.DeveloperToolbar.show(false); } + // Enable WebIDE? + let webIDEEnabled = Services.prefs.getBoolPref("devtools.webide.enabled"); + toggleCmd("Tools:WebIDE", webIDEEnabled); + // Enable App Manager? let appMgrEnabled = Services.prefs.getBoolPref("devtools.appmanager.enabled"); - toggleCmd("Tools:DevAppMgr", appMgrEnabled); + toggleCmd("Tools:DevAppMgr", !webIDEEnabled && appMgrEnabled); // Enable Browser Toolbox? let chromeEnabled = Services.prefs.getBoolPref("devtools.chrome.enabled"); let devtoolsRemoteEnabled = Services.prefs.getBoolPref("devtools.debugger.remote-enabled"); let remoteEnabled = chromeEnabled && devtoolsRemoteEnabled && Services.prefs.getBoolPref("devtools.debugger.chrome-enabled"); toggleCmd("Tools:BrowserToolbox", remoteEnabled); @@ -517,26 +521,29 @@ let gDevToolsBrowser = { openConnectScreen: function(gBrowser) { gBrowser.selectedTab = gBrowser.addTab("chrome://browser/content/devtools/connect.xhtml"); }, /** * Open the App Manager */ openAppManager: function(gBrowser) { - if (Services.prefs.getBoolPref("devtools.webide.enabled")) { - let win = Services.wm.getMostRecentWindow("devtools:webide"); - if (win) { - win.focus(); - } else { - let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].getService(Ci.nsIWindowWatcher); - ww.openWindow(null, "chrome://webide/content/", "webide", "chrome,centerscreen,resizable", null); - } + gBrowser.selectedTab = gBrowser.addTab("about:app-manager"); + }, + + /** + * Open WebIDE + */ + openWebIDE: function() { + let win = Services.wm.getMostRecentWindow("devtools:webide"); + if (win) { + win.focus(); } else { - gBrowser.selectedTab = gBrowser.addTab("about:app-manager"); + let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].getService(Ci.nsIWindowWatcher); + ww.openWindow(null, "chrome://webide/content/", "webide", "chrome,centerscreen,resizable", null); } }, /** * Add this DevTools's presence to a browser window's document * * @param {XULDocument} doc * The document to which menuitems and handlers are to be added
--- a/browser/devtools/webide/locales/en-US/webide.dtd +++ b/browser/devtools/webide/locales/en-US/webide.dtd @@ -1,13 +1,13 @@ <!-- This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<!ENTITY windowTitle "Firefox App Manager"> +<!ENTITY windowTitle "Firefox WebIDE"> <!ENTITY projectMenu_label "Project"> <!ENTITY projectMenu_accesskey "P"> <!ENTITY projectMenu_newApp_label "New App…"> <!ENTITY projectMenu_newApp_accesskey "N"> <!ENTITY projectMenu_importPackagedApp_label "Open Packaged App…"> <!ENTITY projectMenu_importPackagedApp_accesskey "P"> <!ENTITY projectMenu_importHostedApp_label "Open Hosted App…">
--- a/browser/devtools/webide/locales/en-US/webide.properties +++ b/browser/devtools/webide/locales/en-US/webide.properties @@ -1,14 +1,14 @@ # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -title_noApp=Firefox App Manager -title_app=Firefox App Manager: %S +title_noApp=Firefox WebIDE +title_app=Firefox WebIDE: %S runtimeButton_label=Select Runtime projectButton_label=Open App local_runtime=Local Runtime remote_runtime=Remote Runtime remote_runtime_promptTitle=Remote Runtime remote_runtime_promptMessage=hostname:port
--- a/browser/locales/en-US/chrome/browser/browser.dtd +++ b/browser/locales/en-US/chrome/browser/browser.dtd @@ -254,16 +254,18 @@ These should match what Safari and other <!ENTITY browserToolboxMenu.label "Browser Toolbox"> <!ENTITY browserToolboxMenu.accesskey "e"> <!ENTITY devToolbarCloseButton.tooltiptext "Close Developer Toolbar"> <!ENTITY devToolbarMenu.label "Developer Toolbar"> <!ENTITY devToolbarMenu.accesskey "v"> <!ENTITY devAppMgrMenu.label "App Manager"> <!ENTITY devAppMgrMenu.accesskey "A"> +<!ENTITY webide.label "WebIDE"> +<!ENTITY webide.accesskey "W"> <!ENTITY devToolbar.keycode "VK_F2"> <!ENTITY devToolbar.keytext "F2"> <!ENTITY devToolboxMenuItem.label "Toggle Tools"> <!ENTITY devToolboxMenuItem.accesskey "T"> <!ENTITY devToolboxMenuItem.keytext "I"> <!ENTITY devToolbarToolsButton.tooltip "Toggle developer tools"> <!ENTITY devToolbarOtherToolsButton.label "More Tools">