--- a/firefox-kde.patch Sat Aug 22 09:17:03 2015 +0200
+++ b/firefox-kde.patch Sun Aug 23 15:29:44 2015 +0200
@@ -1,11 +1,11 @@
# HG changeset patch
-# Parent c6048238765dab77cd0c9a45e7afb1157316938b
+# Parent 8d1e0e3997402b94742eded6477abed4b559f373
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,1314 @@
+@@ -0,0 +1,1264 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -17,6 +17,7 @@
+<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?>
++<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUIOverlay.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/browser-lightweightTheme.css" type="text/css"?>
@@ -159,7 +160,11 @@
+ 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"/>
++ <menupopup rolluponmousewheel="true"
++#ifdef XP_WIN
++ consumeoutsideclicks="false"
++#endif
++ />
+ </menulist>
+
+ <!-- for invalid form error message -->
@@ -414,67 +419,6 @@
+
+ <menupopup id="placesContext"/>
+
-+ <!-- Popup for site identity information -->
-+ <panel id="identity-popup"
-+ type="arrow"
-+ hidden="true"
-+ noautofocus="true"
-+ onpopupshown="if (event.target == this)
-+ gIdentityHandler.onPopupShown(event);"
-+ orient="vertical"
-+ level="top">
-+ <hbox id="identity-popup-container" align="top">
-+ <image id="identity-popup-icon"/>
-+ <vbox id="identity-popup-content-box">
-+ <label id="identity-popup-brandName"
-+ class="identity-popup-label"
-+ value="&brandFullName;"/>
-+ <label id="identity-popup-chromeLabel"
-+ class="identity-popup-label"/>
-+ <label id="identity-popup-connectedToLabel"
-+ class="identity-popup-label"
-+ value="&identity.connectedTo;"/>
-+ <label id="identity-popup-connectedToLabel2"
-+ class="identity-popup-label"
-+ value="&identity.unverifiedsite2;"/>
-+ <description id="identity-popup-content-host"
-+ class="identity-popup-description"/>
-+ <label id="identity-popup-runByLabel"
-+ class="identity-popup-label"
-+ value="&identity.runBy;"/>
-+ <description id="identity-popup-content-owner"
-+ class="identity-popup-description"/>
-+ <description id="identity-popup-content-supplemental"
-+ class="identity-popup-description"/>
-+ <description id="identity-popup-content-verifier"
-+ class="identity-popup-description"/>
-+ <hbox id="identity-popup-encryption" flex="1">
-+ <vbox>
-+ <image id="identity-popup-encryption-icon"/>
-+ </vbox>
-+ <description id="identity-popup-encryption-label" flex="1"
-+ class="identity-popup-description"/>
-+ </hbox>
-+ <vbox id="identity-popup-permissions">
-+ <separator class="thin"/>
-+ <label class="identity-popup-label header"
-+ value="&identity.permissions;"/>
-+ <vbox id="identity-popup-permission-list" class="indent"/>
-+ </vbox>
-+ </vbox>
-+ </hbox>
-+ <!-- Footer button to open security page info -->
-+ <hbox id="identity-popup-button-container" align="center">
-+ <button id="identity-popup-help-icon"
-+ oncommand="gIdentityHandler.handleHelpCommand(event);"
-+ tooltiptext="&identity.help.tooltip;"/>
-+ <spacer flex="1"/>
-+ <button id="identity-popup-more-info-button"
-+ label="&identity.moreInfoLinkText;"
-+ oncommand="gIdentityHandler.handleMoreInfoClick(event);"/>
-+ </hbox>
-+ </panel>
-+
+ <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" norestorefocus="true" level="top">
+ <hbox>
+ <button class="ctrlTab-preview" flex="1"/>
@@ -557,6 +501,7 @@
+#include popup-notifications.inc
+
+#include ../../components/customizableui/content/panelUI.inc.xul
++#include ../../components/controlcenter/content/panel.inc.xul
+
+ <hbox id="downloads-animation-container" mousethrough="always">
+ <vbox id="downloads-notification-anchor">
@@ -791,6 +736,7 @@
+ <image id="push-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
++ <image id="login-fill-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
@@ -883,6 +829,8 @@
+ ondrop="PlacesMenuDNDHandler.onDrop(event);"
+ cui-areatype="toolbar"
+ oncommand="BookmarkingUI.onCommand(event);">
++ <observes element="bookmarkThisPageBroadcaster" attribute="starred"/>
++ <observes element="bookmarkThisPageBroadcaster" attribute="buttontooltiptext"/>
+ <menupopup id="BMB_bookmarksPopup"
+ class="cui-widget-panel cui-widget-panelview cui-widget-panelWithFooter PanelUI-subView"
+ placespopup="true"
@@ -1230,6 +1178,8 @@
+ <browser id="social-sidebar-browser"
+ type="content"
+ context="contentAreaContextMenu"
++ message="true"
++ messagemanagergroup="social"
+ disableglobalhistory="true"
+ tooltip="aHTMLTooltip"
+ popupnotificationanchor="social-sidebar-favico"
@@ -1323,7 +1273,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
-@@ -179,17 +179,17 @@
+@@ -184,17 +184,17 @@
class="editBookmarkPanelHeaderButton"
oncommand="StarUI.removeBookmarkButtonCommand();"
accesskey="&editBookmark.removeBookmark.accessKey;"/>
@@ -1342,7 +1292,7 @@
<button id="editBookmarkPanelDeleteButton"
class="editBookmarkPanelBottomButton"
label="&editBookmark.cancel.label;"
-@@ -1235,17 +1235,17 @@
+@@ -1185,17 +1185,17 @@
<hbox id="full-screen-warning-container" hidden="true" fadeout="true">
<hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
@@ -1375,14 +1325,14 @@
* 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-pocket-en-US.properties (content/browser-pocket-en-US.properties)
- content/browser/browser-pocket.dtd (content/browser-pocket.dtd)
- content/browser/browser-pocket-de.properties (content/browser-pocket-de.properties)
- content/browser/browser-pocket-es-ES.properties (content/browser-pocket-es-ES.properties)
- content/browser/browser-pocket-ja.properties (content/browser-pocket-ja.properties)
- content/browser/browser-pocket-ru.properties (content/browser-pocket-ru.properties)
* content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml)
* content/browser/chatWindow.xul (content/chatWindow.xul)
+ content/browser/tab-content.js (content/tab-content.js)
+ content/browser/content.js (content/content.js)
+ content/browser/social-content.js (content/social-content.js)
+ content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg)
+ content/browser/defaultthemes/1.header.jpg (content/defaultthemes/1.header.jpg)
+ content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg)
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
@@ -1469,7 +1419,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.
-@@ -524,16 +530,27 @@ var gMainPane = {
+@@ -527,16 +533,27 @@ var gMainPane = {
*/
setDefaultBrowser: function()
{