diff --git a/mozilla/calendar/resources/skin/classic/calendar.css b/mozilla/calendar/resources/skin/classic/calendar.css index 592d09bc50e..17b79eb80fe 100644 --- a/mozilla/calendar/resources/skin/classic/calendar.css +++ b/mozilla/calendar/resources/skin/classic/calendar.css @@ -25,6 +25,7 @@ * ArentJan Banck * Eric Belhaire * Mark Swaffer + * Karsten Düsterloh * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -40,6 +41,8 @@ * * ***** END LICENSE BLOCK ***** */ +@import url("chrome://communicator/skin/"); + /*-------------------------------------------------------------------- * MAIN view deck - contains nav buttons and views *-------------------------------------------------------------------*/ diff --git a/mozilla/calendar/resources/skin/modern/calendar.css b/mozilla/calendar/resources/skin/modern/calendar.css index bc1df2e6a13..8b8535f645b 100644 --- a/mozilla/calendar/resources/skin/modern/calendar.css +++ b/mozilla/calendar/resources/skin/modern/calendar.css @@ -25,6 +25,7 @@ * ArentJan Banck * Mark Swaffer * Eric Belhaire + * Karsten Düsterloh * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -40,6 +41,8 @@ * * ***** END LICENSE BLOCK ***** */ +@import url("chrome://communicator/skin/"); + #view-deck { background: #FFFFFF; padding: 0px; diff --git a/mozilla/suite/common/bindings/toolbar.xml b/mozilla/suite/common/bindings/toolbar.xml index e5400abda99..acb84f98a25 100644 --- a/mozilla/suite/common/bindings/toolbar.xml +++ b/mozilla/suite/common/bindings/toolbar.xml @@ -1,30 +1,72 @@ + + - - - - - - - - - - - - + - + @@ -34,7 +76,6 @@ - @@ -50,7 +91,7 @@ ]]> - + @@ -61,13 +102,13 @@ var collapsedTray = document.getAnonymousElementByAttribute(this, "tbattr", "collapsed-tray"); var collapsedToolbar = document.getElementById("moz_tb_collapsed_" + toolbar.id); collapsedTray.removeChild(collapsedToolbar); - if (!collapsedTray.hasChildNodes()) + if (!collapsedTray.hasChildNodes()) document.getAnonymousElementByAttribute(this, "tbattr", "collapsed-tray-holder").setAttribute("moz-collapsed", "true"); document.persist(toolbar.id, "moz-collapsed"); ]]> - + @@ -84,7 +125,7 @@ collapsedGrippy.setAttribute("style", styleString); collapsedGrippy.setAttribute("tooltiptext", aToolbar.getAttribute("grippytooltiptext")); collapsedGrippy.setAttribute("id", "moz_tb_collapsed_" + aToolbar.id); - collapsedGrippy.setAttribute("moz_grippy_collapsed", "true"); + collapsedGrippy.setAttribute("moz_grippy_collapsed", "true"); collapsedGrippy.setAttribute("tbgrippy-collapsed", "true"); var collapsedTrayHolder = document.getAnonymousElementByAttribute(this, "tbattr", "collapsed-tray-holder"); if (collapsedTrayHolder.getAttribute("moz-collapsed") == "true") @@ -96,52 +137,43 @@ catch (e) { throw e; } - ]]> + ]]> - - - - return (this.hasAttribute("deferattached") ? "true" : "false"); - - - if (val) - this.setAttribute("deferattached", "true"); - else - this.removeAttribute("deferattached"); - return val; - - - - + - - - + + + + - - - - + + this.prefs.removeObserver(this.domain, this); + + "browser.chrome.toolbar_style" @@ -180,24 +212,10 @@ ]]> - - - this.prefs.addObserver(this.domain, this, false); - if (this.prefs.getIntPref(this.domain) != 2) - this.observe(this.prefs, "nsPref:changed", this.domain); - - - - this.prefs.removeObserver(this.domain, this); - - - - - - + @@ -205,17 +223,7 @@ - - - - - - - - + - + - + - - + + - + - - - + diff --git a/mozilla/suite/common/jar.mn b/mozilla/suite/common/jar.mn index b520e926649..e381084d106 100644 --- a/mozilla/suite/common/jar.mn +++ b/mozilla/suite/common/jar.mn @@ -75,3 +75,4 @@ comm.jar: content/communicator/pref/platformPrefOverlay.xul (pref/unix/platformPrefOverlay.xul) #endif #endif + content/communicator/bindings/toolbar.xml (bindings/toolbar.xml) diff --git a/mozilla/themes/classic/communicator/communicator.css b/mozilla/themes/classic/communicator/communicator.css index dd93cfc5555..776c5883e78 100644 --- a/mozilla/themes/classic/communicator/communicator.css +++ b/mozilla/themes/classic/communicator/communicator.css @@ -48,7 +48,7 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); .toolbar-primary { - -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-primary"); + -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary"); } /* ::::: online/offline icons ::::: */ diff --git a/mozilla/themes/modern/communicator/toolbar/toolbarBindings.xml b/mozilla/themes/modern/communicator/toolbar/toolbarBindings.xml index 611214e8262..a7ae2ddaf29 100644 --- a/mozilla/themes/modern/communicator/toolbar/toolbarBindings.xml +++ b/mozilla/themes/modern/communicator/toolbar/toolbarBindings.xml @@ -1,12 +1,55 @@ + + + extends="chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary"> @@ -20,7 +63,7 @@ + extends="chrome://communicator/content/bindings/toolbar.xml#toolbargrippy"> diff --git a/mozilla/xpfe/communicator/resources/content/communicator.css b/mozilla/xpfe/communicator/resources/content/communicator.css index a4940d993b8..d153fc22065 100644 --- a/mozilla/xpfe/communicator/resources/content/communicator.css +++ b/mozilla/xpfe/communicator/resources/content/communicator.css @@ -20,6 +20,7 @@ * * Contributor(s): * Samir Gehani + * Karsten Düsterloh * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -42,3 +43,42 @@ toolbar[printpreview="true"] { -moz-binding: url("chrome://communicator/content/printPreviewBindings.xml#printpreviewtoolbar"); } + + +/* With the move to the new toolkit, SeaMonkey needs to overwrite certain bindings + * if it wants to keep its distinctive likeness. The now hidden new toolkit bindings + * will stay accessible via a set xpfe="false" attribute, though, where necessary. + */ + +/******* toolkit access layer *******/ +/* These rules' content needs to be a verbatim copy of those in toolkit's xul.css! */ +toolbox[xpfe="false"] { + -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbox"); + -moz-box-orient: vertical; +} + +toolbar[xpfe="false"] { + -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar"); +} + +menubar[xpfe="false"] { + -moz-binding: url("chrome://global/content/bindings/toolbar.xml#menubar"); +} + +/******* SeaMonkey XPFE *******/ +/* These bindings reflect SeaMonkey XPFE, modulo new toolkit features. */ +toolbox { + -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbox"); +} + +toolbar { + -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar"); +} + +toolbargrippy { + -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#toolbargrippy"); +} + +menubar { + -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippymenubar"); +} \ No newline at end of file diff --git a/mozilla/xpfe/global/jar.mn b/mozilla/xpfe/global/jar.mn index 335e8b52a82..fbeddef91a1 100644 --- a/mozilla/xpfe/global/jar.mn +++ b/mozilla/xpfe/global/jar.mn @@ -61,7 +61,7 @@ toolkit.jar: content/global/bindings/tabbrowser.xml (resources/content/bindings/tabbrowser.xml) content/global/bindings/text.xml (resources/content/bindings/text.xml) content/global/bindings/textbox.xml (resources/content/bindings/textbox.xml) - content/global/bindings/toolbar.xml (resources/content/bindings/toolbar.xml) +* content/global/bindings/toolbar.xml (/toolkit/content/widgets/toolbar.xml) content/global/bindings/toolbarbutton.xml (resources/content/bindings/toolbarbutton.xml) content/global/bindings/tree.xml (resources/content/bindings/tree.xml) content/global/bindings/wizard.xml (resources/content/bindings/wizard.xml) diff --git a/mozilla/xpfe/global/resources/content/bindings/toolbar.xml b/mozilla/xpfe/global/resources/content/bindings/toolbar.xml index e5400abda99..23103c12a4d 100644 --- a/mozilla/xpfe/global/resources/content/bindings/toolbar.xml +++ b/mozilla/xpfe/global/resources/content/bindings/toolbar.xml @@ -1,5 +1,15 @@ + +