mozilla: comparison firefox-kde.patch

equal deleted inserted replaced

-:ff9e20146e8b
+:66115255ad6f
 # HG changeset patch
-# Parent  2cae514c05c8836ca5b69884d3a07998a5d53e8b
+# Parent  e4b8399bc2706a7b5331407b232bc8845aea7f2e
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1119 @@
+@@ -0,0 +1,1133 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
 +#
 +# This Source Code Form is subject to the terms of the Mozilla Public
 +               onclick="checkForMiddleClick(this, event);"/>
 +    <tooltip id="aHTMLTooltip" page="true"/>
 +    <tooltip id="remoteBrowserTooltip"/>
 +
 +    <!-- for search and content formfill/pw manager -->
-+    <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/>
++
++    <panel type="autocomplete-richlistbox"
++           id="PopupAutoComplete"
++           noautofocus="true"
++           hidden="true"
++           norolluponanchor="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"
 +           flip="none"
-+           level="parent"/>
++           level="parent"
++           overflowpadding="30" />
++
++    <panel id="DateTimePickerPanel"
++           type="arrow"
++           hidden="true"
++           orient="vertical"
++           noautofocus="true"
++           consumeoutsideclicks="false"
++           level="parent">
++      <iframe id="dateTimePopupFrame"/>
++    </panel>
 +
 +    <!-- for select dropdowns. The menupopup is what shows the list of options,
 +         and the popuponly menulist makes things like the menuactive attributes
 +         work correctly on the menupopup. ContentSelectDropdown expects the
 +         popuponly menulist to be its immediate parent. -->
 +    <menulist popuponly="true" id="ContentSelectDropdown" hidden="true">
 +      <menupopup rolluponmousewheel="true"
 +                 activateontab="true" position="after_start"
 +#ifdef XP_WIN
-+                 consumeoutsideclicks="false" ignorekeys="handled"
++                 consumeoutsideclicks="false" ignorekeys="shortcuts"
 +#endif
 +        />
 +    </menulist>
 +
 +    <!-- for invalid form error message -->
 +           orient="vertical"
 +           onpopupshowing="SocialShare.onShowing()"
 +           onpopuphidden="SocialShare.onHidden()"
 +           hidden="true">
 +      <hbox class="social-share-toolbar">
-+        <toolbarbutton id="manage-share-providers" class="toolbarbutton share-provider-button"
++        <toolbarbutton id="manage-share-providers" class="share-provider-button"
 +                       tooltiptext="&social.addons.label;"
 +                       oncommand="BrowserOpenAddonsMgr('addons://list/service');
 +                                  this.parentNode.parentNode.hidePopup();"/>
 +        <arrowscrollbox id="social-share-provider-buttons" orient="horizontal" flex="1" pack="end">
-+          <toolbarbutton id="add-share-provider" class="toolbarbutton share-provider-button" type="radio"
++          <toolbarbutton id="add-share-provider" class="share-provider-button" type="radio"
 +                         group="share-providers" tooltiptext="&findShareServices.label;"
 +                         oncommand="SocialShare.showDirectory()"/>
 +        </arrowscrollbox>
 +      </hbox>
 +      <hbox id="share-container" flex="1"/>
 +                     enablehistory="true"
 +                     maxrows="10"
 +                     newlines="stripsurroundingwhitespace"
 +                     ontextentered="this.handleCommand(param);"
 +                     ontextreverted="return this.handleRevert();"
-+                     pageproxystate="invalid"
++                     pageproxystate="invalid">
-+                     onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
-+                     onblur="setTimeout(() => { document.getElementById('identity-box').style.MozUserFocus = ''; }, 0);">
 +              <!-- Use onclick instead of normal popup= syntax since the popup
-+                   code fires onmousedown, and hence eats our favicon drag events.
++                   code fires onmousedown, and hence eats our favicon drag events. -->
-+                   We only add the identity-box button to the tab order when the location bar
-+                   has focus, otherwise pressing F6 focuses it instead of the location bar -->
 +              <box id="identity-box" role="button"
 +                   align="center"
 +                   aria-label="&urlbar.viewSiteInfo.label;"
 +                   onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
 +                   onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
 +                  <label id="identity-icon-label" class="plain" flex="1"/>
 +                  <label id="identity-icon-country-label" class="plain"/>
 +                </hbox>
 +              </box>
 +              <box id="urlbar-display-box" align="center">
-+                <label class="urlbar-display urlbar-display-switchtab" value="&urlbar.switchToTab.label;"/>
++                <label id="switchtab" class="urlbar-display urlbar-display-switchtab" value="&urlbar.switchToTab.label;"/>
++                <label id="extension" class="urlbar-display urlbar-display-extension" value="&urlbar.extension.label;"/>
 +              </box>
 +              <hbox id="urlbar-icons">
 +                <image id="page-report-button"
 +                       class="urlbar-icon"
 +                       hidden="true"
 +                       tooltiptext="&pageReportIcon.tooltip;"
-+                       onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
++                       onmousedown="gPopupBlockerObserver.onReportButtonMousedown(event);"/>
 +                <image id="reader-mode-button"
 +                       class="urlbar-icon"
 +                       hidden="true"
 +                       onclick="ReaderParent.buttonClick(event);"/>
 +                <toolbarbutton id="urlbar-zoom-button"
 +        <tabbrowser id="content"
 +                    flex="1" contenttooltip="aHTMLTooltip"
 +                    tabcontainer="tabbrowser-tabs"
 +                    contentcontextmenu="contentAreaContextMenu"
 +                    autocompletepopup="PopupAutoComplete"
-+                    selectmenulist="ContentSelectDropdown"/>
++                    selectmenulist="ContentSelectDropdown"
++                    datetimepicker="DateTimePickerPanel"/>
 +      </vbox>
 +      <vbox id="browser-border-end" hidden="true" layer="true"/>
 +    </hbox>
 +#include ../../components/customizableui/content/customizeMode.inc.xul
 +  </deck>
 +
 +</window>
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -68,16 +68,18 @@ browser.jar:
+@@ -66,16 +66,18 @@ browser.jar:
+content/browser/aboutSocialError.xhtml        (content/aboutSocialError.xhtml)
+content/browser/aboutProviderDirectory.xhtml  (content/aboutProviderDirectory.xhtml)
 content/browser/aboutTabCrashed.css           (content/aboutTabCrashed.css)
 content/browser/aboutTabCrashed.js            (content/aboutTabCrashed.js)
 content/browser/aboutTabCrashed.xhtml         (content/aboutTabCrashed.xhtml)
-*       content/browser/aboutTabGroupsMigration.xhtml (content/aboutTabGroupsMigration.xhtml)
-content/browser/aboutTabGroupsMigration.js    (content/aboutTabGroupsMigration.js)
 *       content/browser/browser.css                   (content/browser.css)
 content/browser/browser.js                    (content/browser.js)
 *       content/browser/browser.xul                   (content/browser.xul)
 +*       content/browser/browser-kde.xul               (content/browser-kde.xul)
 +%       override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
 content/browser/browser-addons.js             (content/browser-addons.js)
+content/browser/browser-captivePortal.js      (content/browser-captivePortal.js)
 content/browser/browser-ctrlTab.js            (content/browser-ctrlTab.js)
 content/browser/browser-customization.js      (content/browser-customization.js)
 content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js)
 content/browser/browser-devedition.js         (content/browser-devedition.js)
 content/browser/browser-feeds.js              (content/browser-feeds.js)
 content/browser/browser-fullScreenAndPointerLock.js  (content/browser-fullScreenAndPointerLock.js)
-content/browser/browser-fullZoom.js           (content/browser-fullZoom.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
 @@ -8,17 +8,17 @@
 #include "nsBrowserCompsCID.h"
 +
 +#ifndef nskdeshellservice_h____
 +#define nskdeshellservice_h____
 +
 +#include "nsIGNOMEShellService.h"
-+#include "nsStringAPI.h"
++#include "nsString.h"
 +#include "mozilla/Attributes.h"
 +
 +class nsKDEShellService final : public nsIGNOMEShellService
 +{
 +public:
 +
 +#endif // nsunixshellservice_h____
 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
-@@ -675,16 +675,17 @@
+@@ -652,16 +652,17 @@
 @RESPATH@/greprefs.js
 @RESPATH@/defaults/autoconfig/prefcalls.js
 @RESPATH@/browser/defaults/permissions
 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)

changeset 942	66115255ad6f
parent 935	9ae2b79d3bb1
child 943	ace605efe50f