fix KDE's browser.xul
authorWolfgang Rosenauer <wr@rosenauer.org>
Mon, 11 Jun 2012 20:22:53 +0200
changeset 479 56e16f4cce54
parent 478 868845c53bd4
child 483 6a8f38a81faf
fix KDE's browser.xul
firefox-kde.patch
--- a/firefox-kde.patch	Mon Jun 11 20:16:11 2012 +0200
+++ b/firefox-kde.patch	Mon Jun 11 20:22:53 2012 +0200
@@ -2,62 +2,14 @@
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1116 @@
+@@ -0,0 +1,1126 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
 +#
-+# ***** BEGIN LICENSE BLOCK *****
-+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+#
-+# The contents of this file are subject to the Mozilla Public License Version
-+# 1.1 (the "License"); you may not use this file except in compliance with
-+# the License. You may obtain a copy of the License at
-+# http://www.mozilla.org/MPL/
-+#
-+# Software distributed under the License is distributed on an "AS IS" basis,
-+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+# for the specific language governing rights and limitations under the
-+# License.
-+#
-+# The Original Code is Mozilla Communicator client code, released
-+# March 31, 1998.
-+#
-+# The Initial Developer of the Original Code is
-+# Netscape Communications Corporation.
-+# Portions created by the Initial Developer are Copyright (C) 1998-2000
-+# the Initial Developer. All Rights Reserved.
-+#
-+# Contributor(s):
-+#   Blake Ross <blake@cs.stanford.edu>
-+#   David Hyatt <hyatt@mozilla.org>
-+#   Joe Hewitt <hewitt@netscape.com>
-+#   Pierre Chanial <chanial@noos.fr>
-+#   Dean Tessman <dean_tessman@hotmail.com>
-+#   Johnathan Nightingale <johnath@mozilla.com>
-+#   Dão Gottwald <dao@mozilla.com>
-+#   Ehsan Akhgari <ehsan.akhgari@gmail.com>
-+#   Robert Strong <robert.bugzilla@gmail.com>
-+#   Rob Campbell <rcampbell@mozilla.com>
-+#   Patrick Walton <pcwalton@mozilla.com>
-+#   David Dahl <ddahl@mozilla.com>
-+#   Frank Yan <fyan@mozilla.com>
-+#   Victor Porof <vporof@mozilla.com>
-+#   Paul Rouget <paul@mozilla.com>
-+#
-+# 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
-+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+# in which case the provisions of the GPL or the LGPL are applicable instead
-+# of those above. If you wish to allow use of your version of this file only
-+# under the terms of either the GPL or the LGPL, and not to allow others to
-+# use your version of this file under the terms of the MPL, indicate your
-+# decision by deleting the provisions above and replace them with the notice
-+# and other provisions required by the GPL or the LGPL. If you do not delete
-+# the provisions above, a recipient may use your version of this file under
-+# the terms of any one of the MPL, the GPL or the LGPL.
-+#
-+# ***** END LICENSE BLOCK *****
++# 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/.
 +
 +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
@@ -99,6 +51,7 @@
 +        macanimationtype="document"
 +        screenX="4" screenY="4"
 +        browsingmode="normal"
++        fullscreenbutton="true"
 +        persist="screenX screenY width height sizemode">
 +
 +# All JS files which are not content (only) dependent that browser.xul
@@ -256,7 +209,6 @@
 +                type="checkbox"
 +                label="&viewTabsOnTop.label;"
 +                accesskey="&viewTabsOnTop.accesskey;"/>
-+      <menuseparator/>
 +      <menuitem command="cmd_CustomizeToolbars"
 +                label="&viewCustomizeToolbar.label;"
 +                accesskey="&viewCustomizeToolbar.accesskey;"/>
@@ -413,7 +365,7 @@
 +      <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/>
 +#endif
 +    </tooltip>
-+  
++
 +    <tooltip id="forward-button-tooltip">
 +      <label class="tooltip-label" value="&forwardButton.tooltip;"/>
 +#ifdef XP_MACOSX
@@ -533,6 +485,7 @@
 +            <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
 +            <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
 +            <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
++            <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
 +          </box>
 +          <!-- Use onclick instead of normal popup= syntax since the popup
 +               code fires onmousedown, and hence eats our favicon drag events.
@@ -545,9 +498,8 @@
 +            <hbox id="identity-box-inner" align="center">
 +              <hbox id="page-proxy-stack"
 +                    onclick="PageProxyClickHandler(event);">
-+                <image id="page-proxy-favicon" validate="never"
-+                       pageproxystate="invalid"
-+                       onerror="this.removeAttribute('src');"/>
++                <image id="page-proxy-favicon"
++                       pageproxystate="invalid"/>
 +              </hbox>
 +              <hbox id="identity-icon-labels">
 +                <label id="identity-icon-label" class="plain" flex="1"/>
@@ -858,6 +810,9 @@
 +                     label="&printButton.label;" command="cmd_print"
 +                     tooltiptext="&printButton.tooltip;"/>
 +
++      <!-- This is a placeholder for the Downloads Indicator.  It is visible
++           only during the customization of the toolbar or in the palette, and
++           is replaced when customization is done. -->
 +      <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
 +                     observes="Tools:Downloads"
 +                     ondrop="DownloadsButtonDNDObserver.onDrop(event)"
@@ -990,9 +945,22 @@
 +
 +  <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
 +    <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
-+      <hbox id="full-screen-warning-message">
-+        <description id="full-screen-warning-text" value="&domFullScreenWarning.label;"></description>
-+      </hbox>
++      <vbox id="full-screen-warning-message" align="center">
++        <description id="full-screen-domain-text"/>
++        <description class="full-screen-description" value="&fullscreenExitHint.value;"/>
++        <vbox id="full-screen-approval-pane" align="center">
++          <description class="full-screen-description" value="&fullscreenApproval.value;"/>
++          <hbox>
++            <button label="&fullscreenAllowButton.label;"
++                    oncommand="FullScreen.setFullscreenAllowed(true);"
++                    class="full-screen-approval-button"/>
++            <button label="&fullscreenExitButton.label;"
++                    oncommand="FullScreen.setFullscreenAllowed(false);"
++                    class="full-screen-approval-button"/>
++          </hbox>
++          <checkbox id="full-screen-remember-decision"/>
++        </vbox>
++      </vbox>
 +    </hbox>
 +  </hbox>
 +
@@ -1003,17 +971,36 @@
 +             hidden="true">
 +#ifdef XP_MACOSX
 +      <toolbarbutton id="highlighter-closebutton"
++                     class="devtools-closebutton"
 +                     oncommand="InspectorUI.closeInspectorUI(false);"
 +                     tooltiptext="&inspectCloseButton.tooltiptext;"/>
 +#endif
++      <toolbarbutton id="inspector-option-toolbarbutton"
++                     type="menu"
++                     tabindex="0"
++                     tooltiptext="&inspectOptionButton.tooltiptext;">
++        <menupopup id="inspector-option-popup"
++                   position="before_start">
++          <menuitem id="inspectorToggleVeil"
++                    type="checkbox"
++                    label="&inspectorToggleVeil.label;"
++                    accesskey="&inspectorToggleVeil.accesskey;"
++                    command="Inspector:ToggleVeil"/>
++          <menuitem id="inspectorToggleInfobar"
++                    type="checkbox"
++                    label="&inspectorToggleInfobar.label;"
++                    accesskey="&inspectorToggleInfobar.accesskey;"
++                    command="Inspector:ToggleInfobar"/>
++        </menupopup>
++      </toolbarbutton>
 +      <toolbarbutton id="inspector-inspect-toolbutton"
 +                     class="devtools-toolbarbutton"
 +                     command="Inspector:Inspect"/>
 +      <toolbarbutton id="inspector-treepanel-toolbutton"
 +                     class="devtools-toolbarbutton"
-+                     label="&htmlPanel.label;"
-+                     accesskey="&htmlPanel.accesskey;"
-+                     tooltiptext="&htmlPanel.tooltiptext;"
++                     tabindex="0"
++                     aria-label="&markupButton.arialabel;"
++                     accesskey="&markupButton.accesskey;"
 +                     command="Inspector:HTMLPanel"/>
 +      <arrowscrollbox id="inspector-breadcrumbs"
 +                      flex="1" orient="horizontal"
@@ -1024,20 +1011,67 @@
 +                       hidden="true"
 +                       label="&inspect3DViewButton.label;"
 +                       accesskey="&inspect3DViewButton.accesskey;"
++                       tabindex="0"
 +                       command="Inspector:Tilt"/>
 +        <toolbarbutton id="inspector-style-button"
 +                       class="devtools-toolbarbutton"
 +                       label="&inspectStyleButton.label;"
 +                       accesskey="&inspectStyleButton.accesskey;"
++                       tabindex="0"
 +                       command="Inspector:Sidebar"/>
 +        <!-- registered tools go here -->
 +      </hbox>
 +#ifndef XP_MACOSX
 +      <toolbarbutton id="highlighter-closebutton"
++                     class="devtools-closebutton"
 +                     oncommand="InspectorUI.closeInspectorUI(false);"
 +                     tooltiptext="&inspectCloseButton.tooltiptext;"/>
 +#endif
 +    </toolbar>
++
++    <toolbar id="developer-toolbar"
++             class="devtools-toolbar"
++             hidden="true">
++#ifdef XP_MACOSX
++          <toolbarbutton id="developer-toolbar-closebutton"
++                         class="devtools-closebutton"
++                         oncommand="DeveloperToolbar.hide();"
++                         tooltiptext="&devToolbarCloseButton.tooltiptext;"/>
++#endif
++          <stack class="gclitoolbar-stack-node" flex="1">
++            <hbox class="gclitoolbar-prompt">
++              <label class="gclitoolbar-prompt-label">&#187;</label>
++            </hbox>
++            <hbox class="gclitoolbar-complete-node"/>
++            <textbox class="gclitoolbar-input-node" rows="1"/>
++          </stack>
++          <toolbarbutton id="developer-toolbar-webconsole"
++                         label="&webConsoleButton.label;"
++                         class="devtools-toolbarbutton"
++                         command="Tools:WebConsole"/>
++          <toolbarbutton id="developer-toolbar-inspector"
++                         label="&inspectorButton.label;"
++                         class="devtools-toolbarbutton"
++                         hidden="true"
++                         command="Tools:Inspect"/>
++          <toolbarbutton id="developer-toolbar-responsiveui"
++                         label="&responsiveUI.label;"
++                         class="devtools-toolbarbutton"
++                         hidden="true"
++                         command="Tools:ResponsiveUI"/>
++          <toolbarbutton id="developer-toolbar-debugger"
++                         label="&scriptsButton.label;"
++                         class="devtools-toolbarbutton"
++                         hidden="true"
++                         command="Tools:Debugger"/>
++#ifndef XP_MACOSX
++          <toolbarbutton id="developer-toolbar-closebutton"
++                         class="devtools-closebutton"
++                         oncommand="DeveloperToolbar.hide();"
++                         tooltiptext="&devToolbarCloseButton.tooltiptext;"/>
++#endif
++   </toolbar>
++
 +    <toolbar id="addon-bar"
 +             toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;"
 +             collapsed="true"
@@ -1057,58 +1091,34 @@
 +
 +#ifndef XP_UNIX
 +  <svg:svg height="0">
-+    <svg:mask id="winstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox">
-+      <svg:rect x="0" y="0" width="1" height="1" fill="white"/>
-+      <svg:circle cx="-0.34" cy="0.5" r="0.61"/>
-+    </svg:mask>
-+    <svg:mask id="winstripe-urlbar-back-button-mask" maskContentUnits="userSpaceOnUse">
-+      <svg:rect x="0" y="0" width="10000" height="50" fill="white"/>
-+      <svg:circle cx="-11" cy="13" r="15"/>
-+    </svg:mask>
++    <svg:clipPath id="winstripe-keyhole-forward-clip-path" clipPathUnits="objectBoundingBox">
++      <svg:path d="M 0,0 C 0.16,0.11 0.28,0.29 0.28,0.5 0.28,0.71 0.16,0.89 0,1 L 1,1 1,0 0,0 z"/>
++    </svg:clipPath>
++    <svg:clipPath id="winstripe-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
++      <svg:path d="M 0,0 0,7.8 C 2.5,11 4,14 4,18 4,22 2.5,25 0,28 l 0,22 10000,0 0,-50 L 0,0 z"/>
++    </svg:clipPath>
 +  </svg:svg>
 +#endif
 +#ifdef XP_MACOSX
 +  <svg:svg height="0">
-+    <svg:mask id="pinstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox">
-+      <svg:rect x="0" y="0" width="1" height="1" fill="white"/>
-+      <svg:circle cx="-0.41" cy="0.5" r="0.65"/>
-+    </svg:mask>
-+    <svg:mask id="pinstripe-urlbar-back-button-mask" maskContentUnits="userSpaceOnUse">
-+      <svg:rect x="0" y="-5" width="10000" height="55" fill="white"/>
-+      <svg:circle cx="-9" cy="11" r="15"/>
-+    </svg:mask>
-+    <svg:mask id="pinstripe-tab-ontop-left-curve-mask" maskContentUnits="userSpaceOnUse">
-+      <svg:circle cx="9" cy="3" r="3" fill="white"/>
-+      <svg:rect x="9" y="0" width="3" height="3" fill="white"/>
-+      <svg:rect x="6" y="3" width="6" height="19" fill="white"/>
-+      <svg:rect x="1" y="17" width="5" height="5" fill="white"/>
-+      <svg:circle cx="1" cy="17" r="5"/>
-+      <svg:rect x="0" y="22" width="12" height="1" fill="white"/>
-+    </svg:mask>
-+    <svg:mask id="pinstripe-tab-ontop-right-curve-mask" maskContentUnits="userSpaceOnUse">
-+      <svg:circle cx="3" cy="3" r="3" fill="white"/>
-+      <svg:rect x="0" y="0" width="3" height="3" fill="white"/>
-+      <svg:rect x="0" y="3" width="6" height="19" fill="white"/>
-+      <svg:rect x="6" y="17" width="5" height="5" fill="white"/>
-+      <svg:circle cx="11" cy="17" r="5"/>
-+      <svg:rect x="0" y="22" width="12" height="1" fill="white"/>
-+    </svg:mask>
-+    <svg:mask id="pinstripe-tab-onbottom-left-curve-mask" maskContentUnits="userSpaceOnUse">
-+      <svg:circle cx="9" cy="20" r="3" fill="white"/>
-+      <svg:rect x="9" y="20" width="3" height="3" fill="white"/>
-+      <svg:rect x="6" y="1" width="6" height="19" fill="white"/>
-+      <svg:rect x="1" y="1" width="5" height="5" fill="white"/>
-+      <svg:circle cx="1" cy="6" r="5"/>
-+      <svg:rect x="0" y="0" width="12" height="1" fill="white"/>
-+    </svg:mask>
-+    <svg:mask id="pinstripe-tab-onbottom-right-curve-mask" maskContentUnits="userSpaceOnUse">
-+      <svg:circle cx="3" cy="20" r="3" fill="white"/>
-+      <svg:rect x="0" y="20" width="3" height="3" fill="white"/>
-+      <svg:rect x="0" y="1" width="6" height="19" fill="white"/>
-+      <svg:rect x="6" y="1" width="5" height="5" fill="white"/>
-+      <svg:circle cx="11" cy="6" r="5"/>
-+      <svg:rect x="0" y="0" width="12" height="1" fill="white"/>
-+    </svg:mask>
++    <svg:clipPath id="pinstripe-keyhole-forward-clip-path" clipPathUnits="objectBoundingBox">
++      <svg:path d="M 0,0 C 0.15,0.12 0.25,0.3 0.25,0.5 0.25,0.7 0.15,0.88 0,1 L 1,1 1,0 0,0 z"/>
++    </svg:clipPath>
++    <svg:clipPath id="pinstripe-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
++      <svg:path d="m 0,-5 0,4.03 C 3.6,1.8 6,6.1 6,11 6,16 3.6,20 0,23 l 0,27 10000,0 0,-55 L 0,-5 z"/>
++    </svg:clipPath>
++    <svg:clipPath id="pinstripe-tab-ontop-left-curve-clip-path" clipPathUnits="userSpaceOnUse">
++      <svg:path d="M 9,0 C 7.3,0 6,1.3 6,3 l 0,14 c 0,3 -2.2,5 -5,5 l -1,0 0,1 12,0 0,-1 0,-19 0,-3 -3,0 z"/>
++    </svg:clipPath>
++    <svg:clipPath id="pinstripe-tab-ontop-right-curve-clip-path" clipPathUnits="userSpaceOnUse">
++      <svg:path d="m 0,0 0,3 0,19 0,1 12,0 0,-1 -1,0 C 8.2,22 6,20 6,17 L 6,3 C 6,1.3 4.7,0 3,0 L 0,0 z"/>
++    </svg:clipPath>
++    <svg:clipPath id="pinstripe-tab-onbottom-left-curve-clip-path" clipPathUnits="userSpaceOnUse">
++      <svg:path d="m 0,0 0,1 1,0 c 2.8,0 5,2.2 5,5 l 0,14 c 0,2 1.3,3 3,3 l 3,0 0,-3 L 12,1 12,0 0,0 z"/>
++    </svg:clipPath>
++    <svg:clipPath id="pinstripe-tab-onbottom-right-curve-clip-path" clipPathUnits="userSpaceOnUse">
++      <svg:path d="m 0,0 0,1 0,19 0,3 3,0 c 1.7,0 3,-1 3,-3 L 6,6 C 6,3.2 8.2,1 11,1 L 12,1 12,0 0,0 z"/>
++    </svg:clipPath>
 +  </svg:svg>
 +#endif
 +