firefox-kde.patch
branchfirefox35
changeset 817 8ee1122377bb
parent 816 5551f1ff7e1d
child 821 8732363b138a
--- a/firefox-kde.patch	Sat Dec 06 19:15:35 2014 +0100
+++ b/firefox-kde.patch	Thu Dec 11 21:39:01 2014 +0100
@@ -2,7 +2,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1224 @@
+@@ -0,0 +1,1272 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -145,6 +145,9 @@
 +    <!-- for search and content formfill/pw manager -->
 +    <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/>
 +
++    <!-- for search with one-off buttons -->
++    <panel type="autocomplete" id="PopupSearchAutoComplete" noautofocus="true" hidden="true"/>
++
 +    <!-- for url bar autocomplete -->
 +    <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
 +
@@ -242,6 +245,48 @@
 +           mousethrough="always">
 +      <box id="UITourHighlight"></box>
 +    </panel>
++    <!-- Used to highlight the new search experience -->
++    <panel id="SearchHighlight1"
++           class="SearchHighlight"
++           type="arrow"
++           hidden="true"
++           noautofocus="true"
++           noautohide="true"
++           orient="vertical"
++           align="stretch">
++      <label class="SearchHighlightTitle">One-Click Searches</label>
++      <description class="SearchHighlightText" flex="1">Search any of these sites instantly, without changing your default.</description>
++      <hbox class="SearchHighlightFooter" align="center">
++        <spacer class="dot filled"/>
++        <spacer class="dot"/>
++        <spacer flex="1"/>
++        <button label="Next"/>
++      </hbox>
++    </panel>
++    <panel id="SearchHighlight2"
++           class="SearchHighlight"
++           type="arrow"
++           hidden="true"
++           noautofocus="true"
++           noautohide="true"
++           orient="vertical"
++           align="stretch">
++      <label class="SearchHighlightTitle">Smart Suggestions</label>
++      <description class="SearchHighlightText" flex="1">Suggestions from your default search engine appear as you type.</description>
++      <hbox class="SearchHighlightFooter" align="center">
++        <spacer class="dot"/>
++        <spacer class="dot filled"/>
++        <spacer flex="1"/>
++        <button label="Thanks!"/>
++      </hbox>
++    </panel>
++
++    <panel id="abouthome-search-panel" orient="vertical" type="arrow" hidden="true">
++      <hbox id="abouthome-search-panel-manage" class="abouthome-search-panel-item"
++            onclick="openPreferences('paneSearch')">
++        <label>&cmd_engineManager.label;</label>
++      </hbox>
++    </panel>
 +
 +    <panel id="social-share-panel"
 +           class="social-panel"
@@ -251,7 +296,11 @@
 +           onpopuphidden="SocialShare.onHidden()"
 +           hidden="true">
 +      <vbox class="social-share-toolbar">
-+        <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1"/>
++        <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1">
++          <toolbarbutton id="add-share-provider" class="toolbarbutton share-provider-button" type="radio"
++                         group="share-providers" tooltiptext="&findShareServices.label;"
++                         oncommand="SocialShare.showDirectory()"/>
++        </arrowscrollbox>
 +      </vbox>
 +    </panel>
 +
@@ -501,6 +550,11 @@
 +#endif
 +    </tooltip>
 +
++    <tooltip id="share-button-tooltip" onpopupshowing="SocialShare.createTooltip(event);">
++      <label class="tooltip-label"/>
++      <label class="tooltip-label"/>
++    </tooltip>
++
 +#include popup-notifications.inc
 +
 +#include ../../components/customizableui/content/panelUI.inc.xul
@@ -674,7 +728,11 @@
 +             aria-label="&navbarCmd.label;"
 +             fullscreentoolbar="true" mode="icons" customizable="true"
 +             iconsize="small"
-+             defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,social-share-button,social-toolbar-item"
++#ifdef MOZ_DEV_EDITION
++             defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button,loop-button-throttled"
++#else
++             defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,loop-button-throttled"
++#endif
 +             customizationtarget="nav-bar-customization-target"
 +             overflowable="true"
 +             overflowbutton="nav-bar-overflow-button"
@@ -728,7 +786,6 @@
 +                <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
-+                <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="bad-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="bad-content-unblocked-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
@@ -761,7 +818,7 @@
 +                </hbox>
 +              </box>
 +              <box id="urlbar-display-box" align="center">
-+                <label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
++                <label class="urlbar-display urlbar-display-switchtab" value="&urlbar.switchToTab.label;"/>
 +              </box>
 +              <hbox id="urlbar-icons">
 +                <image id="page-report-button"
@@ -922,15 +979,6 @@
 +                       onclick="BrowserGoHome(event);"
 +                       cui-areatype="toolbar"
 +                       aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
-+
-+        <toolbarbutton id="social-share-button"
-+                       class="toolbarbutton-1 chromeclass-toolbar-additional"
-+                       label="&sharePageCmd.label;"
-+                       tooltiptext="&sharePageCmd.label;"
-+                       cui-areatype="toolbar"
-+                       removable="true"
-+                       hidden="true"
-+                       command="Social:SharePage"/>
 +      </hbox>
 +
 +      <toolbarbutton id="nav-bar-overflow-button"
@@ -1075,7 +1123,7 @@
 +    </toolbarpalette>
 +  </toolbox>
 +
-+  <hbox id="fullscr-toggler" collapsed="true"/>
++  <hbox id="fullscr-toggler" hidden="true"/>
 +
 +  <deck id="content-deck" flex="1">
 +    <hbox flex="1" id="browser">
@@ -1230,7 +1278,7 @@
 diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
 --- a/browser/base/content/browser.xul
 +++ b/browser/base/content/browser.xul
-@@ -171,17 +171,17 @@
+@@ -174,17 +174,17 @@
                      class="editBookmarkPanelHeaderButton"
                      oncommand="StarUI.removeBookmarkButtonCommand();"
                      accesskey="&editBookmark.removeBookmark.accessKey;"/>
@@ -1249,7 +1297,7 @@
          <button id="editBookmarkPanelDeleteButton"
                  class="editBookmarkPanelBottomButton"
                  label="&editBookmark.cancel.label;"
-@@ -1153,17 +1153,17 @@
+@@ -1198,17 +1198,17 @@
  
    <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
      <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
@@ -1844,7 +1892,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
-@@ -697,19 +697,21 @@
+@@ -698,19 +698,21 @@
  @BINPATH@/defaults/autoconfig/prefcalls.js
  @BINPATH@/browser/defaults/profile/prefs.js