firefox-kde.patch
changeset 226 6bf3bb4c115e
parent 223 4555a5d0d661
child 229 298263f797be
--- a/firefox-kde.patch	Fri Jan 28 18:06:54 2011 +0100
+++ b/firefox-kde.patch	Thu Feb 03 10:42:10 2011 +0100
@@ -23,7 +23,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1062 @@
+@@ -0,0 +1,1066 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -597,7 +597,9 @@
 +              </hbox>
 +            </hbox>
 +          </box>
-+          <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
++          <box id="urlbar-display-box" align="center">
++            <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
++          </box>
 +          <hbox id="urlbar-icons">
 +            <image id="page-report-button"
 +                   class="urlbar-icon"
@@ -673,8 +675,8 @@
 +                     placespopup="true"
 +                     context="placesContext"
 +                     openInTabs="children"
-+                     oncommand="BookmarksEventHandler.onCommand(event);"
-+                     onclick="BookmarksEventHandler.onClick(event);"
++                     oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);"
++                     onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
 +                     onpopupshowing="BookmarksMenuButton.onPopupShowing(event);
 +                                     if (!this.parentNode._placesView)
 +                                       new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');"
@@ -773,8 +775,8 @@
 +        <hbox flex="1"
 +              id="PlacesToolbar"
 +              context="placesContext"
-+              onclick="BookmarksEventHandler.onClick(event);"
-+              oncommand="BookmarksEventHandler.onCommand(event);"
++              onclick="BookmarksEventHandler.onClick(event, this._placesView);"
++              oncommand="BookmarksEventHandler.onCommand(event, this._placesView);"
 +              tooltip="bhTooltip"
 +              popupsinherittooltip="true">
 +          <toolbarbutton class="bookmark-item bookmarks-toolbar-customize"
@@ -1005,6 +1007,7 @@
 +                  contentcontextmenu="contentAreaContextMenu"
 +                  autocompletepopup="PopupAutoComplete"
 +                  onclick="return contentAreaClick(event, false);"/>
++      <statuspanel id="statusbar-display" label=""/>
 +    </vbox>
 +    <vbox id="browser-border-end" hidden="true" layer="true"/>
 +  </hbox>
@@ -1018,7 +1021,8 @@
 +             mode="icons" iconsize="small" defaulticonsize="small"
 +             lockiconsize="true"
 +             defaultset="addonbar-closebutton,spring,status-bar"
-+             customizable="true">
++             customizable="true"
++             key="key_toggleAddonBar">
 +      <toolbarbutton id="addonbar-closebutton"
 +                     tooltiptext="&addonBarCloseButton.tooltip;"
 +                     oncommand="setToolbarVisibility(this.parentNode, false);"/>
@@ -1089,10 +1093,10 @@
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -20,16 +20,18 @@ browser.jar:
- *       content/browser/aboutHome.xhtml               (content/aboutHome.xhtml)
- *       content/browser/aboutHome.js                  (content/aboutHome.js)
+@@ -22,16 +22,18 @@ browser.jar:
  *       content/browser/aboutHome.css                 (content/aboutHome.css)
+         content/browser/aboutHome-restore-icon.png    (content/aboutHome-restore-icon.png)
+         content/browser/aboutHome-restore-icon-rtl.png (content/aboutHome-restore-icon-rtl.png)
          content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
          content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
  *       content/browser/browser.css                   (content/browser.css)