Skip to content

Commit

Permalink
Issue 3556: Fx4 'Add-on Bar' always displays on restart with fbug ena…
Browse files Browse the repository at this point in the history
  • Loading branch information
janodvarko committed Dec 21, 2010
1 parent 180eacc commit 4abc0bc
Show file tree
Hide file tree
Showing 7 changed files with 134 additions and 63 deletions.
7 changes: 3 additions & 4 deletions extension/chrome.manifest
Expand Up @@ -41,8 +41,7 @@ locale firebug vi locale/vi/
locale firebug zh-CN locale/zh-CN/
locale firebug zh-TW locale/zh-TW/

overlay chrome://browser/content/browser.xul chrome://firebug/content/browserOverlay.xul
overlay chrome://global/content/customizeToolbar.xul chrome://firebug/content/customizeToolbarOverlay.xul
overlay chrome://mozapps/content/extensions/about.xul chrome://firebug/content/aboutOverlay.xul

overlay chrome://browser/content/browser.xul chrome://firebug/content/browserOverlay.xul
overlay chrome://global/content/customizeToolbar.xul chrome://firebug/content/start-button/customizeToolbarOverlay.xul
overlay chrome://mozapps/content/extensions/about.xul chrome://firebug/content/aboutOverlay.xul
overlay chrome://navigator/content/navigator.xul chrome://firebug/content/browserOverlay.xul
46 changes: 1 addition & 45 deletions extension/content/firebug/browserOverlay.xul
@@ -1,10 +1,8 @@
<?xml version="1.0"?>


<?xul-overlay href="chrome://firebug/content/firebugOverlay.xul"?>
<?xul-overlay href="chrome://firebug/content/external/editorsOverlay.xul"?>


<?xul-overlay href="chrome://firebug/content/start-button/startButtonOverlay.xul"?>

<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

Expand Down Expand Up @@ -66,7 +64,6 @@

<!-- Firefox page context menu -->
<menupopup id="contentAreaContextMenu">

<menuseparator/>
<menuitem id="menu_firebugInspect" label="firebug.InspectElement"
class="menuitem-iconic" image="chrome://firebug/skin/Templarian_inspector.png"
Expand Down Expand Up @@ -103,52 +100,11 @@
</menu>
</menupopup>

<!-- Buttons for Firefox Customize Toolbar dialog -->
<toolbarpalette id="BrowserToolbarPalette">
<toolbarbutton id="inspector-button" label="firebug.Inspect"
class="toolbarbutton-1 chromeclass-toolbar-additional"
observes="cmd_toggleInspecting" tooltiptext="firebug.InspectElement"/>
<toolbarbutton id="firebug-button" label="firebug.Firebug"
class="toolbarbutton-1 chromeclass-toolbar-additional"
observes="cmd_toggleDetachFirebug" tooltiptext="firebug.DetachFirebug"/>
</toolbarpalette>

<!-- Firebug panel -->
<vbox id="appcontent">
<splitter id="fbContentSplitter" collapsed="true"/>
<vbox id="fbContentBox" collapsed="true" persist="height">
</vbox>
</vbox>

<!-- Extend Firefox status bar -->
<statusbar id="status-bar">
<statusbarpanel id="fbStatusBar" context="fbStatusContextMenu" role="button"
aria-labelledby="fbStatusPrefix fbStatusText" aria-describedby="fbStatusIcon"
onmouseup="Firebug.onClickStatusIcon(Firebug.currentContext, event);"
tooltiptext="Firebug">
<image id="fbStatusIcon" />
<label id="fbStatusPrefix" collapsed="true" />
<label id="fbStatusText" onmouseup="Firebug.onClickStatusText(Firebug.currentContext, event);" />
</statusbarpanel>

<!-- Context menu -->
<menupopup id="fbStatusContextMenu" onpopupshowing="FirebugChrome.onOptionsShowing(this)">
<menuitem id="menu_detachFirebugContext" label="firebug.DetachFirebug"
command="cmd_toggleDetachFirebug"
type="checkbox" key="key_detachFirebug"/>
<menuseparator/>
<menuitem id="menu_ClearConsole" label="firebug.ClearConsole"
command="cmd_clearConsole" key="key_clearConsole"/>
<menuseparator/>
<menuitem id="menu_enablePanels" label="firebug.menu.Enable All Panels"
command="cmd_enablePanels"/>
<menuitem id="menu_disablePanels" label="firebug.menu.Disable All Panels"
command="cmd_disablePanels"/>
<menuseparator/>
<menuitem id="menu_AllOn" type="checkbox" label="On for all web pages"
command="cmd_allOn"/>
<menuitem id="menu_clearActivationList" label="firebug.menu.Clear Activation List"
command="cmd_clearActivationList"/>
</menupopup>
</statusbar>
</overlay>
1 change: 0 additions & 1 deletion extension/content/firebug/firebugOverlay.xul
Expand Up @@ -10,7 +10,6 @@
<!-- Support for tracing. Only available in X version -->
<?xul-overlay href="chrome://firebug/content/traceOverlay.xul"?> <!-- /*@explore*/ -->


<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml">

Expand Down
Expand Up @@ -3,5 +3,5 @@
<?xml-stylesheet href="chrome://firebug/content/firebug.css"?>

<overlay id="FirebugOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
</overlay>
34 changes: 34 additions & 0 deletions extension/content/firebug/start-button/startButtonOverlay.js
@@ -0,0 +1,34 @@
/* See license.txt for terms of usage */

FBL.ns(function() { with (FBL) {

// ********************************************************************************************* //
// Constants

var popup = $("fbStatusContextMenu");
var firebugButton = $("firebug-button");

// ********************************************************************************************* //
// Module Implementation

Firebug.StartButton = extend(Firebug.Module,
{
initializeUI: function()
{
Firebug.Module.initializeUI.apply(this, arguments);

firebugButton.appendChild(popup.cloneNode(true));
},

shutdown: function()
{
},
});

// ********************************************************************************************* //
// Registration

Firebug.registerModule(Firebug.StartButton);

// ********************************************************************************************* //
}});
75 changes: 75 additions & 0 deletions extension/content/firebug/start-button/startButtonOverlay.xul
@@ -0,0 +1,75 @@
<?xml version="1.0"?>

<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/x-javascript" src="chrome://firebug/content/start-button/startButtonOverlay.js"/>

<popupset id="mainPopupSet">

<!-- Popup menu shared by the Status bar icon and Firebug button (the toolbar button
available in Customizable Toolbar dialog, see below) -->
<menupopup id="fbStatusContextMenu"
onpopupshowing="FirebugChrome.onOptionsShowing(this)">
<menuitem
id="menu_detachFirebugContext"
label="firebug.DetachFirebug"
command="cmd_toggleDetachFirebug"
type="checkbox" key="key_detachFirebug"/>
<menuseparator/>
<menuitem
id="menu_ClearConsole"
label="firebug.ClearConsole"
command="cmd_clearConsole"
key="key_clearConsole"/>
<menuseparator/>
<menuitem
id="menu_enablePanels"
label="firebug.menu.Enable All Panels"
command="cmd_enablePanels"/>
<menuitem
id="menu_disablePanels"
label="firebug.menu.Disable All Panels"
command="cmd_disablePanels"/>
<menuseparator/>
<menuitem
id="menu_AllOn"
type="checkbox"
label="On for all web pages"
command="cmd_allOn"/>
<menuitem
id="menu_clearActivationList"
label="firebug.menu.Clear Activation List"
command="cmd_clearActivationList"/>
</menupopup>
</popupset>

<!-- Buttons for Firefox Customize Toolbar dialog -->
<toolbarpalette id="BrowserToolbarPalette">

<!-- DOM Inspector -->
<toolbarbutton id="inspector-button" label="firebug.Inspect"
class="toolbarbutton-1 chromeclass-toolbar-additional"
observes="cmd_toggleInspecting" tooltiptext="firebug.InspectElement"/>

<!-- Firebug button -->
<toolbarbutton id="firebug-button" label="firebug.Firebug"
class="toolbarbutton-1 chromeclass-toolbar-additional"
observes="cmd_toggleFirebug" tooltiptext="firebug.ShowFirebug"
type="menu-button" contextmenu="fbStatusContextMenu">
<!-- menu fbStatusContextMenu is cloned here -->
</toolbarbutton>
</toolbarpalette>

<!-- Extend Firefox status bar -->
<statusbar id="status-bar">
<statusbarpanel id="fbStatusBar" context="fbStatusContextMenu" role="button"
aria-labelledby="fbStatusPrefix fbStatusText" aria-describedby="fbStatusIcon"
onmouseup="Firebug.onClickStatusIcon(Firebug.currentContext, event);"
tooltiptext="Firebug">
<image id="fbStatusIcon" />
<label id="fbStatusPrefix" collapsed="true" />
<label id="fbStatusText"
onmouseup="Firebug.onClickStatusText(Firebug.currentContext, event);" />
</statusbarpanel>
</statusbar>

</overlay>
32 changes: 20 additions & 12 deletions extension/skin/classic/firebug.css
@@ -1,6 +1,8 @@
/* See license.txt for terms of usage */

/*************************************************************************************************/
/* overrides to revert personas. see http://code.google.com/p/fbug/issues/detail?id=2704 */

#fbContentBox:-moz-lwtheme {
background-color: -moz-dialog;
color: -moz-dialogtext;
Expand All @@ -13,15 +15,10 @@
#fbContentBox:-moz-lwtheme toolbar {
-moz-appearance: toolbar;
}

/* end overrides */

#inspector-button {
list-style-image: url(chrome://firebug/skin/inspect.png);
}

#inspector-button[disabled="true"] {
list-style-image: url(chrome://firebug/skin/inspectDisabled.png);
}
/*************************************************************************************************/

#fbInspectButton {
margin-bottom: 1px;
Expand Down Expand Up @@ -51,14 +48,25 @@
-moz-padding-end: 2px;
}

/*************************************************************************************************/
/* Customizable Dialog Toolbar Buttons */

#inspector-button {
list-style-image: url(chrome://firebug/skin/inspect.png);
}

#inspector-button[disabled="true"] {
list-style-image: url(chrome://firebug/skin/inspectDisabled.png);
}

toolbar[iconsize="small"] #inspector-button > .toolbarbutton-icon {
list-style-image: url(chrome://firebug/skin/inspectSmall.png);
width: 16px;
height: 16px;
}

#firebug-button {
list-style-image: url(chrome://firebug/skin/firebug24.png);
list-style-image: url(chrome://firebug/skin/firebug24.png);
}

toolbar[iconsize="small"] #firebug-button > .toolbarbutton-icon {
Expand All @@ -67,7 +75,7 @@ toolbar[iconsize="small"] #firebug-button > .toolbarbutton-icon {
height: 16px;
}

/********************************************************************************************/
/*************************************************************************************************/

#fbCommandArrow {
margin: 2px 0 2px 7px;
Expand Down Expand Up @@ -125,7 +133,7 @@ toolbar[iconsize="small"] #firebug-button > .toolbarbutton-icon {
width: auto;
}

/********************************************************************************************/
/*************************************************************************************************/

#fbStatusBar {
min-width: 26px;
Expand Down Expand Up @@ -381,7 +389,7 @@ menupopup[chromedir="rtl"] > .navigationHistoryMenuItemBack {
list-style-image: url(chrome://firebug/skin/breakErrorsOn.png);
}

/********************************************************************************/
/*************************************************************************************************/

/* default is disabled */
.fbBreakOnImage {
Expand Down Expand Up @@ -502,7 +510,7 @@ menupopup[chromedir="rtl"] > .navigationHistoryMenuItemBack {
font-weight: bold;
}

/************************************************************************************************/
/*************************************************************************************************/
/* Scrollable TabBar + TabList */

/* Collision with CuteButtons - Crystal SVG 0.2.5, see 3374 */
Expand Down

0 comments on commit 4abc0bc

Please sign in to comment.