firefox-kde.patch
changeset 748 72ba5129e5fd
parent 739 e178ad08fed6
child 753 f3bf114c6639
--- a/firefox-kde.patch	Thu Jun 12 22:59:33 2014 +0200
+++ b/firefox-kde.patch	Wed Jul 09 14:56:22 2014 +0200
@@ -2,7 +2,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1197 @@
+@@ -0,0 +1,1205 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -106,6 +106,12 @@
 +                accesskey="&moveToNewWindow.accesskey;"
 +                tbattr="tabbrowser-multiple"
 +                oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/>
++#ifdef E10S_TESTING_ONLY
++      <menuitem id="context_openNonRemoteWindow" label="Open in new non-e10s window"
++                tbattr="tabbrowser-remote"
++                hidden="true"
++                oncommand="gBrowser.openNonRemoteWindow(TabContextMenu.contextTab);"/>
++#endif
 +      <menuseparator/>
 +      <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;"
 +                tbattr="tabbrowser-multiple-visible"
@@ -245,7 +251,7 @@
 +           onpopuphidden="SocialShare.onHidden()"
 +           hidden="true">
 +      <vbox class="social-share-toolbar">
-+        <vbox id="social-share-provider-buttons" flex="1"/>
++        <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1"/>
 +      </vbox>
 +    </panel>
 +
@@ -311,7 +317,7 @@
 +                oncommand="BrowserFullScreen();"/>
 +    </menupopup>
 +
-+    <menupopup id="contentAreaContextMenu" pagemenu="start"
++    <menupopup id="contentAreaContextMenu" pagemenu="#page-menu-separator"
 +               onpopupshowing="if (event.target != this)
 +                                 return true;
 +                               gContextMenu = new nsContextMenu(this, event.shiftKey);
@@ -578,7 +584,7 @@
 +                     label="&tabCmd.label;"
 +                     command="cmd_newNavigatorTab"
 +                     onclick="checkForMiddleClick(this, event);"
-+                     tooltiptext="&newTabButton.tooltip;"
++                     tooltip="dynamic-shortcut-tooltip"
 +                     ondrop="newTabButtonObserver.onDrop(event)"
 +                     ondragover="newTabButtonObserver.onDragOver(event)"
 +                     ondragenter="newTabButtonObserver.onDragOver(event)"
@@ -874,6 +880,7 @@
 +             during the customization of the toolbar, in the palette, and before
 +             the Downloads Indicator overlay is loaded. -->
 +        <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++                       key="key_openDownloads"
 +                       oncommand="DownloadsIndicatorView.onCommand(event);"
 +                       ondrop="DownloadsIndicatorView.onDrop(event);"
 +                       ondragover="DownloadsIndicatorView.onDragOver(event);"
@@ -881,7 +888,7 @@
 +                       label="&downloads.label;"
 +                       removable="true"
 +                       cui-areatype="toolbar"
-+                       tooltiptext="&downloads.tooltip;"/>
++                       tooltip="dynamic-shortcut-tooltip"/>
 +
 +        <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
 +                       persist="class" removable="true"
@@ -890,6 +897,7 @@
 +                       ondragenter="homeButtonObserver.onDragOver(event)"
 +                       ondrop="homeButtonObserver.onDrop(event)"
 +                       ondragexit="homeButtonObserver.onDragExit(event)"
++                       key="goHome"
 +                       onclick="BrowserGoHome(event);"
 +                       cui-areatype="toolbar"
 +                       aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
@@ -897,11 +905,10 @@
 +
 +        <toolbarbutton id="social-share-button"
 +                       class="toolbarbutton-1 chromeclass-toolbar-additional"
-+                       hidden="true"
-+                       overflows="false"
 +                       label="&sharePageCmd.label;"
 +                       tooltiptext="&sharePageCmd.label;"
 +                       cui-areatype="toolbar"
++                       removable="true"
 +                       command="Social:SharePage"/>
 +      </hbox>
 +
@@ -1011,9 +1018,11 @@
 +
 +      <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
 +#ifdef XP_MACOSX
-+                     command="cmd_print" tooltip="dynamic-shortcut-tooltip"
++                     command="cmd_print"
++                     tooltip="dynamic-shortcut-tooltip"
 +#else
-+                     command="cmd_printPreview" tooltiptext="&printButton.tooltip;"
++                     command="cmd_printPreview"
++                     tooltiptext="&printButton.tooltip;"
 +#endif
 +                     label="&printButton.label;"/>
 +
@@ -1070,8 +1079,7 @@
 +                    tabcontainer="tabbrowser-tabs"
 +                    contentcontextmenu="contentAreaContextMenu"
 +                    autocompletepopup="PopupAutoComplete"
-+                    selectpopup="ContentSelectDropdown"
-+                    onclick="contentAreaClick(event, false);"/>
++                    selectpopup="ContentSelectDropdown"/>
 +        <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/>
 +      </vbox>
 +      <splitter id="social-sidebar-splitter"
@@ -1203,7 +1211,7 @@
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -65,16 +65,18 @@ browser.jar:
+@@ -70,16 +70,18 @@ browser.jar:
          content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
          content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
          content/browser/aboutSocialError.xhtml        (content/aboutSocialError.xhtml)
@@ -1217,11 +1225,11 @@
  *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
  *       content/browser/chatWindow.xul                (content/chatWindow.xul)
          content/browser/content.js                    (content/content.js)
-         content/browser/fonts/ClearSans-Regular.woff  (content/fonts/ClearSans-Regular.woff)
-         content/browser/fonts/FiraSans-Regular.woff   (content/fonts/FiraSans-Regular.woff)
-         content/browser/fonts/FiraSans-Light.woff     (content/fonts/FiraSans-Light.woff)
          content/browser/newtab/newTab.xul             (content/newtab/newTab.xul)
  *       content/browser/newtab/newTab.js              (content/newtab/newTab.js)
+         content/browser/newtab/newTab.css             (content/newtab/newTab.css)
+ *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
+         content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
 --- a/browser/components/build/nsModule.cpp
 +++ b/browser/components/build/nsModule.cpp
@@ -1308,7 +1316,7 @@
      // when the user will select the default.  We refresh here periodically
      // in case the default changes.  On other Windows OS's defaults can also
      // be set while the prefs are open.
-@@ -884,14 +890,25 @@ var gAdvancedPane = {
+@@ -875,14 +881,25 @@ var gAdvancedPane = {
     * Set browser as the operating system default browser.
     */
    setDefaultBrowser: function()
@@ -1790,7 +1798,7 @@
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -643,19 +643,21 @@
+@@ -666,19 +666,21 @@
  @BINPATH@/defaults/autoconfig/prefcalls.js
  @BINPATH@/browser/defaults/profile/prefs.js