# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1317981563 -7200
# Node ID f467ac3aff09a85e90124364f37c8bc49b4195a2
# Parent  fcf304737c81ddf6768ad45d75d5547355bdfc00
sync KDE's browser.xul

diff -r fcf304737c81 -r f467ac3aff09 firefox-kde.patch
--- a/firefox-kde.patch	Fri Oct 07 11:59:04 2011 +0200
+++ b/firefox-kde.patch	Fri Oct 07 11:59:23 2011 +0200
@@ -2,7 +2,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1038 @@
+@@ -0,0 +1,1055 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -239,14 +239,6 @@
 +           close="true"
 +           onpopuphiding="InspectorUI.closeInspectorUI();"
 +           label="&inspectPanelTitle.label;">
-+      <toolbar id="inspector-toolbar"
-+               nowindowdrag="true">
-+        <toolbarbutton id="inspector-inspect-toolbutton"
-+                       label="&inspectButton.label;"
-+                       accesskey="&inspectButton.accesskey;"
-+                       class="toolbarbutton-text"
-+                       command="Inspector:Inspect"/>
-+      </toolbar>
 +      <hbox id="tree-panel-resizer-box" align="end">
 +        <spacer flex="1" />
 +        <resizer dir="bottomend" />
@@ -286,10 +278,10 @@
 +                oncommand="BrowserFullScreen();"/>
 +    </menupopup>
 +
-+    <menupopup id="contentAreaContextMenu"
++    <menupopup id="contentAreaContextMenu" pagemenu="start"
 +               onpopupshowing="if (event.target != this)
 +                                 return true;
-+                               gContextMenu = new nsContextMenu(this, gBrowser);
++                               gContextMenu = new nsContextMenu(this, gBrowser, event.shiftKey);
 +                               if (gContextMenu.shouldDisplay)
 +                                 updateEditUIVisibility();
 +                               return gContextMenu.shouldDisplay;"
@@ -404,6 +396,24 @@
 +    </panel>
 +
 +    <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/>
++
++    <tooltip id="back-button-tooltip">
++      <label value="&backButton.tooltip;"/>
++#ifdef XP_MACOSX
++      <label value="&backForwardButtonMenuMac.tooltip;"/>
++#else
++      <label value="&backForwardButtonMenu.tooltip;"/>
++#endif
++    </tooltip>
++  
++    <tooltip id="forward-button-tooltip">
++      <label value="&forwardButton.tooltip;"/>
++#ifdef XP_MACOSX
++      <label value="&backForwardButtonMenuMac.tooltip;"/>
++#else
++      <label value="&backForwardButtonMenu.tooltip;"/>
++#endif
++    </tooltip>
 +  </popupset>
 +
 +#ifdef CAN_DRAW_IN_TITLEBAR
@@ -473,12 +483,12 @@
 +                       label="&backCmd.label;"
 +                       command="Browser:BackOrBackDuplicate"
 +                       onclick="checkForMiddleClick(this, event);"
-+                       tooltiptext="&backButton.tooltip;"/>
++                       tooltip="back-button-tooltip"/>
 +        <toolbarbutton id="forward-button" class="toolbarbutton-1"
 +                       label="&forwardCmd.label;"
 +                       command="Browser:ForwardOrForwardDuplicate"
 +                       onclick="checkForMiddleClick(this, event);"
-+                       tooltiptext="&forwardButton.tooltip;"/>
++                       tooltip="forward-button-tooltip"/>
 +      </toolbaritem>
 +
 +      <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
@@ -958,6 +968,19 @@
 +  </hbox>
 +
 +  <vbox id="browser-bottombox" layer="true">
++    <toolbar id="inspector-toolbar"
++             nowindowdrag="true"
++             hidden="true">
++      <toolbarbutton id="inspector-inspect-toolbutton"
++                     label="&inspectButton.label;"
++                     accesskey="&inspectButton.accesskey;"
++                     class="toolbarbutton-text"
++                     command="Inspector:Inspect"/>
++      <toolbarseparator />
++      <hbox id="inspector-tools">
++        <!-- registered tools go here -->
++      </hbox>
++    </toolbar>
 +    <toolbar id="addon-bar"
 +             toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;"
 +             collapsed="true"
@@ -991,7 +1014,7 @@
 +  <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.46" cy="0.48" r="0.65"/>
++      <svg:circle cx="-0.41" cy="0.5" r="0.65"/>
 +    </svg:mask>
 +    <svg:mask id="pinstripe-tab-ontop-left-curve-mask" maskContentUnits="userSpaceOnUse">
 +      <svg:circle cx="9" cy="3" r="3" fill="white"/>
@@ -1029,12 +1052,6 @@
 +#endif
 +
 +</vbox>
-+# <iframe id="highlighter-frame"
-+#   transparent="true"
-+#   type="content"
-+#   src="chrome://content/base/highlighter.html"/> is dynamically appended as
-+#     the last child of #tab-view-deck, only when it is needed, for minimal
-+#     performance impact.
 +# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck.
 +#     Introducing the iframe dynamically, as needed, was found to be better than
 +#     starting with an empty iframe here in browser.xul from a Ts standpoint.