From 464e29230eeb8c25dfb064f14239b1288c85332b Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 2 Feb 2018 07:11:37 -0500 Subject: Issue N/A - Restore the Toolkit Error Console - Part 1: Toolkit --- browser/installer/package-manifest.in | 2 + toolkit/components/console/content/console.css | 74 +++ toolkit/components/console/content/console.js | 111 +++++ toolkit/components/console/content/console.xul | 101 ++++ .../components/console/content/consoleBindings.xml | 547 +++++++++++++++++++++ toolkit/components/console/jar.mn | 9 + toolkit/components/console/jsconsole-clhandler.js | 40 ++ .../console/jsconsole-clhandler.manifest | 3 + toolkit/components/console/moz.build | 14 + toolkit/components/console/tests/chrome.ini | 3 + toolkit/components/console/tests/test_hugeURIs.xul | 64 +++ toolkit/components/moz.build | 1 + toolkit/locales/jar.mn | 2 + .../linux/global/console/console-toolbar.png | Bin 0 -> 659 bytes toolkit/themes/linux/global/console/console.css | 156 ++++++ toolkit/themes/linux/global/console/console.png | Bin 0 -> 516 bytes toolkit/themes/linux/global/jar.mn | 4 + .../osx/global/console/console-error-caret.gif | Bin 0 -> 55 bytes .../osx/global/console/console-error-dash.gif | Bin 0 -> 48 bytes toolkit/themes/osx/global/console/console.css | 165 +++++++ toolkit/themes/osx/global/jar.mn | 3 + .../windows/global/console/console-error-caret.gif | Bin 0 -> 55 bytes .../windows/global/console/console-error-dash.gif | Bin 0 -> 48 bytes .../windows/global/console/console-toolbar.png | Bin 0 -> 5787 bytes toolkit/themes/windows/global/console/console.css | 218 ++++++++ .../themes/windows/global/console/itemSelected.png | Bin 0 -> 459 bytes toolkit/themes/windows/global/jar.mn | 5 + 27 files changed, 1522 insertions(+) create mode 100644 toolkit/components/console/content/console.css create mode 100644 toolkit/components/console/content/console.js create mode 100644 toolkit/components/console/content/console.xul create mode 100644 toolkit/components/console/content/consoleBindings.xml create mode 100644 toolkit/components/console/jar.mn create mode 100644 toolkit/components/console/jsconsole-clhandler.js create mode 100644 toolkit/components/console/jsconsole-clhandler.manifest create mode 100644 toolkit/components/console/moz.build create mode 100644 toolkit/components/console/tests/chrome.ini create mode 100644 toolkit/components/console/tests/test_hugeURIs.xul create mode 100644 toolkit/themes/linux/global/console/console-toolbar.png create mode 100644 toolkit/themes/linux/global/console/console.css create mode 100644 toolkit/themes/linux/global/console/console.png create mode 100644 toolkit/themes/osx/global/console/console-error-caret.gif create mode 100644 toolkit/themes/osx/global/console/console-error-dash.gif create mode 100644 toolkit/themes/osx/global/console/console.css create mode 100644 toolkit/themes/windows/global/console/console-error-caret.gif create mode 100644 toolkit/themes/windows/global/console/console-error-dash.gif create mode 100644 toolkit/themes/windows/global/console/console-toolbar.png create mode 100644 toolkit/themes/windows/global/console/console.css create mode 100644 toolkit/themes/windows/global/console/itemSelected.png diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 6e5001714..b24f828e4 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -382,6 +382,8 @@ @RESPATH@/components/DownloadLegacy.js @RESPATH@/components/BrowserPageThumbs.manifest @RESPATH@/components/crashmonitor.manifest +@RESPATH@/components/jsconsole-clhandler.manifest +@RESPATH@/components/jsconsole-clhandler.js @RESPATH@/components/nsCrashMonitor.js @RESPATH@/components/SiteSpecificUserAgent.js @RESPATH@/components/SiteSpecificUserAgent.manifest diff --git a/toolkit/components/console/content/console.css b/toolkit/components/console/content/console.css new file mode 100644 index 000000000..e05f13c3e --- /dev/null +++ b/toolkit/components/console/content/console.css @@ -0,0 +1,74 @@ +/* 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/. */ + + +.console-box { + -moz-binding: url("chrome://global/content/consoleBindings.xml#console-box"); + overflow: auto; +} + +.console-rows { + -moz-user-focus: normal; +} + +.console-row[type="error"], +.console-row[type="warning"] { + -moz-binding: url("chrome://global/content/consoleBindings.xml#error"); +} + +.console-row[type="message"] { + -moz-binding: url("chrome://global/content/consoleBindings.xml#message"); +} + +.console-msg-text, +.console-error-msg { + white-space: pre-wrap; +} + +.console-error-source { + -moz-binding: url("chrome://global/content/consoleBindings.xml#console-error-source"); +} + +.console-dots { + width: 1px; +} + +/* :::::::::: hiding and showing of rows for each mode :::::::::: */ + +.console-box[mode="Warnings"] > .console-box-internal > .console-rows + > .console-row[type="error"], +.console-box[mode="Messages"] > .console-box-internal > .console-rows + > .console-row[type="error"] +{ + display: none; +} + +.console-box[mode="Errors"] > .console-box-internal > .console-rows + > .console-row[type="warning"], +.console-box[mode="Messages"] > .console-box-internal > .console-rows + > .console-row[type="warning"] +{ + display: none; +} + +.console-box[mode="Errors"] > .console-box-internal > .console-rows + > .console-row[type="message"], +.console-box[mode="Warnings"] > .console-box-internal > .console-rows + > .console-row[type="message"] +{ + display: none; +} + +.filtered-by-string { + display: none; +} + +/* If line number is 0, hide the line number section */ +.lineNumberRow[line="0"] { + display: none; +} + +#TextboxEval { + direction: ltr; +} diff --git a/toolkit/components/console/content/console.js b/toolkit/components/console/content/console.js new file mode 100644 index 000000000..ad6802607 --- /dev/null +++ b/toolkit/components/console/content/console.js @@ -0,0 +1,111 @@ +// -*- indent-tabs-mode: nil; js-indent-level: 2 -*- + +/* 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/. */ + +Components.utils.import("resource://gre/modules/Services.jsm"); + +var gConsole, gConsoleBundle, gTextBoxEval, gEvaluator, gCodeToEvaluate; +var gFilter; + +/* :::::::: Console Initialization ::::::::::::::: */ + +window.onload = function() +{ + gConsole = document.getElementById("ConsoleBox"); + gConsoleBundle = document.getElementById("ConsoleBundle"); + gTextBoxEval = document.getElementById("TextboxEval"); + gEvaluator = document.getElementById("Evaluator"); + gFilter = document.getElementById("Filter"); + + updateSortCommand(gConsole.sortOrder); + updateModeCommand(gConsole.mode); + + gEvaluator.addEventListener("load", loadOrDisplayResult, true); +} + +/* :::::::: Console UI Functions ::::::::::::::: */ + +function changeFilter() +{ + gConsole.filter = gFilter.value; + + document.persist("ConsoleBox", "filter"); +} + +function changeMode(aMode) +{ + switch (aMode) { + case "Errors": + case "Warnings": + case "Messages": + gConsole.mode = aMode; + break; + case "All": + gConsole.mode = null; + } + + document.persist("ConsoleBox", "mode"); +} + +function clearConsole() +{ + gConsole.clear(); +} + +function changeSortOrder(aOrder) +{ + updateSortCommand(gConsole.sortOrder = aOrder); +} + +function updateSortCommand(aOrder) +{ + var orderString = aOrder == 'reverse' ? "Descend" : "Ascend"; + var bc = document.getElementById("Console:sort"+orderString); + bc.setAttribute("checked", true); + + orderString = aOrder == 'reverse' ? "Ascend" : "Descend"; + bc = document.getElementById("Console:sort"+orderString); + bc.setAttribute("checked", false); +} + +function updateModeCommand(aMode) +{ + /* aMode can end up invalid if it set by an extension that replaces */ + /* mode and then it is uninstalled or disabled */ + var bc = document.getElementById("Console:mode" + aMode) || + document.getElementById("Console:modeAll"); + bc.setAttribute("checked", true); +} + +function onEvalKeyPress(aEvent) +{ + if (aEvent.keyCode == 13) + evaluateTypein(); +} + +function evaluateTypein() +{ + gCodeToEvaluate = gTextBoxEval.value; + // reset the iframe first; the code will be evaluated in loadOrDisplayResult + // below, once about:blank has completed loading (see bug 385092) + gEvaluator.contentWindow.location = "about:blank"; +} + +function loadOrDisplayResult() +{ + if (gCodeToEvaluate) { + gEvaluator.contentWindow.location = "javascript: " + + gCodeToEvaluate.replace(/%/g, "%25"); + gCodeToEvaluate = ""; + return; + } + + var resultRange = gEvaluator.contentDocument.createRange(); + resultRange.selectNode(gEvaluator.contentDocument.documentElement); + var result = resultRange.toString(); + if (result) + Services.console.logStringMessage(result); + // or could use appendMessage which doesn't persist +} diff --git a/toolkit/components/console/content/console.xul b/toolkit/components/console/content/console.xul new file mode 100644 index 000000000..0abd0a981 --- /dev/null +++ b/toolkit/components/console/content/console.xul @@ -0,0 +1,101 @@ + + + + + + + + + + %console; +]> + + + + + diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build index 74f3ad7f8..509332800 100644 --- a/toolkit/components/moz.build +++ b/toolkit/components/moz.build @@ -18,6 +18,7 @@ DIRS += [ 'apppicker', 'asyncshutdown', 'commandlines', + 'console', 'contentprefs', 'contextualidentity', 'cookie', diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn index 32add622b..c28cf6f49 100644 --- a/toolkit/locales/jar.mn +++ b/toolkit/locales/jar.mn @@ -33,6 +33,8 @@ locale/@AB_CD@/global/config.dtd (%chrome/global/config.dtd) locale/@AB_CD@/global/config.properties (%chrome/global/config.properties) locale/@AB_CD@/global/contentAreaCommands.properties (%chrome/global/contentAreaCommands.properties) + locale/@AB_CD@/global/console.dtd (%chrome/global/console.dtd) + locale/@AB_CD@/global/console.properties (%chrome/global/console.properties) #ifndef MOZ_FENNEC locale/@AB_CD@/global/customizeToolbar.dtd (%chrome/global/customizeToolbar.dtd) locale/@AB_CD@/global/customizeToolbar.properties (%chrome/global/customizeToolbar.properties) diff --git a/toolkit/themes/linux/global/console/console-toolbar.png b/toolkit/themes/linux/global/console/console-toolbar.png new file mode 100644 index 000000000..05277b650 Binary files /dev/null and b/toolkit/themes/linux/global/console/console-toolbar.png differ diff --git a/toolkit/themes/linux/global/console/console.css b/toolkit/themes/linux/global/console/console.css new file mode 100644 index 000000000..7c900376d --- /dev/null +++ b/toolkit/themes/linux/global/console/console.css @@ -0,0 +1,156 @@ +/* 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/. */ + +/* ===== console.css ==================================================== + == Styles used by the Error Console window. + ====================================================================== */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +.console-box { + background-color: -moz-Field; + color: -moz-FieldText; +} + +/* ::::: console rows ::::: */ + +.console-row { + border-bottom: 1px dotted threedshadow; + padding: 4px 0px; +} + +.console-row-icon { + padding: 4px; + -moz-padding-start: 5px; + -moz-box-align: start !important; +} + +.console-row-msg > label:first-child, +.console-row-file > label:first-child { + display: none; +} + +.console-time { + font-weight: normal !important; +} + +.console-icon { + list-style-image: inherit; +} + +.console-error-msg { + margin-bottom: 2px; +} + +/* ..... error rows ..... */ + +.console-row-code { + padding-top: 3px; + padding-bottom: 3px; + -moz-padding-start: 3px; + -moz-padding-end: 0px; + color: #0000BB; + font-size: larger; +} + +.console-dots, +.console-caret { + height: 9px; +} + +.console-dots { + background: url("chrome://global/skin/console/console-error-dash.gif") repeat-x top; +} + +.console-caret { + width: 7px; + background: url("chrome://global/skin/console/console-error-caret.gif") no-repeat top; +} + +/* ..... message rows ..... */ + +.console-row[type="message"] { + font-family: monospace; +} + +/* ..... selected state ..... */ + +.console-row[selected="true"] { + background-image: url("chrome://global/skin/console/itemSelected.png"); +} + +.console-row-code[selected="true"], +.console-row-content[selected="true"] > .console-row-file > .console-error-source > .text-link { + color: inherit !important; +} + +/* ::::: icons ::::: */ + +.console-row[type="error"], +.console-row[type="exception"] { + list-style-image: url("moz-icon://stock/gtk-dialog-error?size=menu"); +} + +.console-row[type="error"] .console-row-msg, +.console-row[type="exception"] .console-row-msg { + font-weight: bold; +} + +.console-row[type="warning"] { + list-style-image: url("moz-icon://stock/gtk-dialog-warning?size=menu"); +} + +.console-row[type="message"] { + list-style-image: url("moz-icon://stock/gtk-dialog-info?size=menu"); +} + +/* ::::: toolbars ::::: */ + +#TextboxEval { + margin: 2px !important; +} + +#ButtonEval { + margin-top: 2px !important; + margin-bottom: 2px !important; + -moz-margin-start: 0px !important; + -moz-margin-end: 2px !important; +} + +/* Toolbar icons */ + +toolbar#ToolbarMode toolbarbutton { + -moz-box-orient: horizontal; +} + +#Console\:modeAll { + list-style-image: url("chrome://global/skin/console/console-toolbar.png"); +} + +#Console\:modeErrors { + list-style-image: url("moz-icon://stock/gtk-dialog-error?size=toolbar"); +} + +#Console\:modeWarnings { + list-style-image: url("moz-icon://stock/gtk-dialog-warning?size=toolbar"); +} + +#Console\:modeMessages { + list-style-image: url("moz-icon://stock/gtk-dialog-info?size=toolbar"); +} + +#Console\:clear { + list-style-image: url("moz-icon://stock/gtk-clear?size=toolbar"); +} + +toolbar#ToolbarMode .toolbarbutton-text { + -moz-padding-end: 4px; +} + +/* ::::: Fix Error Console toolbar button text spacing ::::: */ + +.toolbarbutton-text { + -moz-padding-start: 0px; + -moz-padding-end: 5px; +} diff --git a/toolkit/themes/linux/global/console/console.png b/toolkit/themes/linux/global/console/console.png new file mode 100644 index 000000000..c1be13b6d Binary files /dev/null and b/toolkit/themes/linux/global/console/console.png differ diff --git a/toolkit/themes/linux/global/jar.mn b/toolkit/themes/linux/global/jar.mn index e67ea020e..5bde219fd 100644 --- a/toolkit/themes/linux/global/jar.mn +++ b/toolkit/themes/linux/global/jar.mn @@ -51,3 +51,7 @@ toolkit.jar: skin/classic/global/toolbar/spring.png (toolbar/spring.png) skin/classic/global/tree/twisty-clsd.png (tree/twisty-clsd.png) skin/classic/global/tree/twisty-open.png (tree/twisty-open.png) + + skin/classic/global/console/console.css (console/console.css) + skin/classic/global/console/console.png (console/console.png) + skin/classic/global/console/console-toolbar.png (console/console-toolbar.png) diff --git a/toolkit/themes/osx/global/console/console-error-caret.gif b/toolkit/themes/osx/global/console/console-error-caret.gif new file mode 100644 index 000000000..a8f30f926 Binary files /dev/null and b/toolkit/themes/osx/global/console/console-error-caret.gif differ diff --git a/toolkit/themes/osx/global/console/console-error-dash.gif b/toolkit/themes/osx/global/console/console-error-dash.gif new file mode 100644 index 000000000..74679a25e Binary files /dev/null and b/toolkit/themes/osx/global/console/console-error-dash.gif differ diff --git a/toolkit/themes/osx/global/console/console.css b/toolkit/themes/osx/global/console/console.css new file mode 100644 index 000000000..f18f6f680 --- /dev/null +++ b/toolkit/themes/osx/global/console/console.css @@ -0,0 +1,165 @@ +/* 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/. */ + +/* ===== console.css ==================================================== + == Styles used by the Error Console window. + ======================================================================= */ + +/* View buttons */ +@import "chrome://global/skin/viewbuttons.css"; + +%include ../shared.inc +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +.console-box { + background-color: -moz-Field; + color: -moz-FieldText; + overflow: auto; +} + +/* ::::: console rows ::::: */ + +.console-row { + border-bottom: 1px solid #A3A3A3; + padding: 4px; +} + +.console-row-file { + color: #505050; +} + +.console-row-msg > label:first-child { + font-weight: bold; +} + +.console-row-msg > label, .comsole-row-msg > description, .console-error-msg, .console-row-file, .console-row-code { + margin: 2px; +} + +.console-row-file > label { + margin: 0; +} + +.console-msg-text { + white-space: pre-wrap !important; +} +.console-icon { + list-style-image: inherit; + padding-right: 6px; + padding-left: 6px; +} + +/* ..... error rows ..... */ + +.console-row-code { + color: #0000BB; + font-size: larger; +} + +.console-dots, +.console-caret { + height: 9px; +} + +.console-dots { + background: url("chrome://global/skin/console/console-error-dash.gif") repeat-x top; +} + +.console-caret { + width: 7px; + background: url("chrome://global/skin/console/console-error-caret.gif") no-repeat top; +} + +/* ..... message rows ..... */ + +.console-row[type="message"] { + font-family: monospace; +} + +/* ..... selected state ..... */ + +.console-row[selected="true"] { + background-color: #3D80DF !important; + color: #FFF; +} + +.console-row-code[selected="true"], +.console-row-content[selected="true"] > .console-row-file, +.console-row-content[selected="true"] > .console-row-file > .console-error-source > .text-link { + color: #FFF !important; +} + +/* ::::: row colors ::::: */ + +.console-row[type="error"], +.console-row[type="exception"] { + background-color: #FFD0DC; +} + +.console-row[type="warning"] { + background-color: #F8F3CC; +} + +.console-row[type="message"] { + background-color: #D3EDFF; +} + +/* ::::: toolbars ::::: */ + +#ToolbarEval { + -moz-appearance: none; + background: @scopeBarBackground@; + border-bottom: @scopeBarSeparatorBorder@; + padding: 2px; +} + +#ToolbarEval > label { + font-weight: bold; + color: @scopeBarTitleColor@; +} + +#TextfieldEval { + margin: 2px !important; +} + +#ButtonEval { + margin: 0 4px; + padding: 1px 10px; + -moz-appearance: none; + border-radius: 10000px; + border: @roundButtonBorder@; + background: @roundButtonBackground@; + box-shadow: @roundButtonShadow@; +} + +#ButtonEval:hover:active { + text-shadow: @loweredShadow@; + background: @roundButtonPressedBackground@; + box-shadow: @roundButtonPressedShadow@; +} + +toolbarseparator { + min-height: 1em; + background-image: none; +} + +/* Toolbar icons */ + +#ToolbarMode { + -moz-box-pack: center; +} + +#ToolbarMode toolbarbutton > .toolbarbutton-icon { + display: none; +} + +#Console\:clear { + -moz-box-orient: vertical; + -moz-box-align: center; + -moz-appearance: toolbarbutton; + font: menu; + text-shadow: @loweredShadow@; + margin: 4px 0 9px; + padding: 0 1px; +} diff --git a/toolkit/themes/osx/global/jar.mn b/toolkit/themes/osx/global/jar.mn index def597650..e979d4a8c 100644 --- a/toolkit/themes/osx/global/jar.mn +++ b/toolkit/themes/osx/global/jar.mn @@ -73,6 +73,9 @@ toolkit.jar: skin/classic/global/arrow/panelarrow-vertical@2x.png (arrow/panelarrow-vertical@2x.png) skin/classic/global/checkbox/cbox-check.gif (checkbox/cbox-check.gif) skin/classic/global/checkbox/cbox-check-dis.gif (checkbox/cbox-check-dis.gif) + skin/classic/global/console/console-error-caret.gif (console/console-error-caret.gif) + skin/classic/global/console/console-error-dash.gif (console/console-error-dash.gif) +* skin/classic/global/console/console.css (console/console.css) skin/classic/global/dirListing/dirListing.css (dirListing/dirListing.css) skin/classic/global/dirListing/folder.png (dirListing/folder.png) skin/classic/global/dirListing/remote.png (dirListing/remote.png) diff --git a/toolkit/themes/windows/global/console/console-error-caret.gif b/toolkit/themes/windows/global/console/console-error-caret.gif new file mode 100644 index 000000000..a8f30f926 Binary files /dev/null and b/toolkit/themes/windows/global/console/console-error-caret.gif differ diff --git a/toolkit/themes/windows/global/console/console-error-dash.gif b/toolkit/themes/windows/global/console/console-error-dash.gif new file mode 100644 index 000000000..74679a25e Binary files /dev/null and b/toolkit/themes/windows/global/console/console-error-dash.gif differ diff --git a/toolkit/themes/windows/global/console/console-toolbar.png b/toolkit/themes/windows/global/console/console-toolbar.png new file mode 100644 index 000000000..fc681f926 Binary files /dev/null and b/toolkit/themes/windows/global/console/console-toolbar.png differ diff --git a/toolkit/themes/windows/global/console/console.css b/toolkit/themes/windows/global/console/console.css new file mode 100644 index 000000000..d918fb73c --- /dev/null +++ b/toolkit/themes/windows/global/console/console.css @@ -0,0 +1,218 @@ +/* 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/. */ + +/* ===== console.css ==================================================== + == Styles used by the Error Console window. + ====================================================================== */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +.console-box { + background-color: -moz-Field; + color: -moz-FieldText; +} + +/* ::::: console rows ::::: */ + +.console-row { + border-bottom: 1px solid ThreeDLightShadow; + padding: 4px 0px; +} + +.console-row-icon { + padding: 4px; + -moz-padding-start: 5px; + -moz-box-align: start !important; +} + +.console-row-msg > label:first-child, +.console-row-file > label:first-child { + display: none; +} + +.console-time { + font-weight: normal !important; +} + +.console-icon { + list-style-image: inherit; +} + +.console-error-msg { + margin-bottom: 2px; +} + +/* ..... error rows ..... */ + +.console-row-code { + padding-top: 3px; + padding-bottom: 3px; + -moz-padding-start: 3px; + -moz-padding-end: 0px; + color: #0000BB; + font-size: larger; +} + +.console-dots, +.console-caret { + height: 9px; +} + +.console-dots { + background: url("chrome://global/skin/console/console-error-dash.gif") repeat-x top; +} + +.console-caret { + width: 7px; + background: url("chrome://global/skin/console/console-error-caret.gif") no-repeat top; +} + +/* ..... message rows ..... */ + +.console-row[type="message"] { + font-family: monospace; +} + +/* ..... selected state ..... */ + +.console-row[selected="true"] { + background-image: url("chrome://global/skin/console/itemSelected.png"); +} + +.console-row-code[selected="true"], +.console-row-content[selected="true"] > .console-row-file > .console-error-source > .text-link { + color: inherit !important; +} + +/* ::::: icons ::::: */ + +.console-row[type="error"], +.console-row[type="exception"] { + list-style-image: url("chrome://global/skin/icons/error-16.png"); +} + +.console-row[type="error"] .console-row-msg, +.console-row[type="exception"] .console-row-msg { + font-weight: bold; +} + +.console-row[type="warning"] { + list-style-image: url("chrome://global/skin/icons/warning-16.png"); +} + +.console-row[type="message"] { + list-style-image: url("chrome://global/skin/icons/information-16.png"); +} + +/* ::::: toolbars ::::: */ + +#TextboxEval { + margin: 2px !important; +} + +#ButtonEval { + margin-top: 2px !important; + margin-bottom: 2px !important; + -moz-margin-start: 0px !important; + -moz-margin-end: 2px !important; +} + +toolbarseparator { + min-height: 1em; +} + +/* Toolbar icons */ + +#ToolbarMode toolbarbutton { + min-width: 57px; + padding: 4px !important; +} + +toolbar#ToolbarMode toolbarbutton:active, +toolbar#ToolbarMode toolbarbutton[checked="true"] { + -moz-padding-start: 5px !important; + -moz-padding-end: 3px !important; +} + + +toolbar#ToolbarMode toolbarbutton { + list-style-image: url("chrome://global/skin/console/console-toolbar.png"); + -moz-box-orient: horizontal; + padding: 4px !important; +} + +#Console\:modeAll { + -moz-image-region: rect(0px 24px 24px 0px); +} + +#Console\:modeAll { + -moz-image-region: rect(0px 24px 24px 0px); +} + +#Console\:modeAll:hover, +#Console\:modeAll[checked="true"] { + -moz-image-region: rect(24px 24px 48px 0px); +} + +#Console\:modeErrors { + -moz-image-region: rect(0px 96px 24px 72px); +} + +#Console\:modeErrors:hover, +#Console\:modeErrors[checked="true"] { + -moz-image-region: rect(24px 96px 48px 72px); +} + +#Console\:modeWarnings { + -moz-image-region: rect(0px 72px 24px 48px); +} + +#Console\:modeWarnings:hover, +#Console\:modeWarnings[checked="true"] { + -moz-image-region: rect(24px 72px 48px 48px); +} + +#Console\:modeMessages { + -moz-image-region: rect(0px 48px 24px 24px); +} + +#Console\:modeMessages:hover, +#Console\:modeMessages[checked="true"] { + -moz-image-region: rect(24px 48px 48px 24px); +} + +#Console\:clear { + -moz-image-region: rect(0px 120px 24px 96px); +} + +#Console\:clear:hover, +#Console\:clear[checked="true"] { + -moz-image-region: rect(24px 120px 48px 96px); +} + +toolbar#ToolbarMode .toolbarbutton-icon { + padding: 2px 0 !important; +} + +toolbar#ToolbarMode .toolbarbutton-text { + -moz-padding-end: 4px; +} + + +/* ::::: Fix Error Console toolbar button text spacing ::::: */ + +.toolbarbutton-text { + -moz-padding-start: 0px; + -moz-padding-end: 5px; +} + +%ifdef XP_WIN +#ToolbarMode { + -moz-appearance: -moz-win-browsertabbar-toolbox; +} + +#ToolbarEval { + -moz-appearance: toolbox; +} +%endif diff --git a/toolkit/themes/windows/global/console/itemSelected.png b/toolkit/themes/windows/global/console/itemSelected.png new file mode 100644 index 000000000..964cd6acc Binary files /dev/null and b/toolkit/themes/windows/global/console/itemSelected.png differ diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn index c3ad17af1..48613e794 100644 --- a/toolkit/themes/windows/global/jar.mn +++ b/toolkit/themes/windows/global/jar.mn @@ -20,6 +20,11 @@ toolkit.jar: #endif skin/classic/global/colorpicker.css skin/classic/global/commonDialog.css +* skin/classic/global/console/console.css (console/console.css) + skin/classic/global/console/console-toolbar.png (console/console-toolbar.png) + skin/classic/global/console/console-error-caret.gif (console/console-error-caret.gif) + skin/classic/global/console/console-error-dash.gif (console/console-error-dash.gif) + skin/classic/global/console/itemSelected.png (console/itemSelected.png) skin/classic/global/findBar.css * skin/classic/global/global.css skin/classic/global/listbox.css -- cgit v1.2.3