1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 3fedb882f767b2e4ff72ef972a9cce4c5d1af4af |
2 # Parent 77c3bdc27160dfa96aa4b3288c7f12a72f273967 |
3 |
3 |
4 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul |
4 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul |
5 new file mode 100644 |
5 new file mode 100644 |
6 --- /dev/null |
6 --- /dev/null |
7 +++ b/browser/base/content/browser-kde.xul |
7 +++ b/browser/base/content/browser-kde.xul |
8 @@ -0,0 +1,1222 @@ |
8 @@ -0,0 +1,1250 @@ |
9 +#filter substitution |
9 +#filter substitution |
10 +<?xml version="1.0"?> |
10 +<?xml version="1.0"?> |
11 +# -*- Mode: HTML -*- |
11 +# -*- Mode: HTML -*- |
12 +# |
12 +# |
13 +# This Source Code Form is subject to the terms of the Mozilla Public |
13 +# This Source Code Form is subject to the terms of the Mozilla Public |
14 +# License, v. 2.0. If a copy of the MPL was not distributed with this |
14 +# License, v. 2.0. If a copy of the MPL was not distributed with this |
15 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. |
15 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. |
16 + |
16 + |
17 +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> |
17 +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> |
18 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> |
18 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> |
19 +<?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?> |
19 +<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?> |
20 +<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?> |
20 +<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?> |
21 +<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUIOverlay.css" type="text/css"?> |
21 +<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUIOverlay.css" type="text/css"?> |
22 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> |
22 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> |
23 +<?xml-stylesheet href="chrome://browser/skin/browser-lightweightTheme.css" type="text/css"?> |
23 +<?xml-stylesheet href="chrome://browser/skin/browser-lightweightTheme.css" type="text/css"?> |
24 + |
24 + |
716 + ontextreverted="return this.handleRevert();" |
717 + ontextreverted="return this.handleRevert();" |
717 + pageproxystate="invalid" |
718 + pageproxystate="invalid" |
718 + onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'" |
719 + onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'" |
719 + onblur="setTimeout(() => { document.getElementById('identity-box').style.MozUserFocus = ''; }, 0);"> |
720 + onblur="setTimeout(() => { document.getElementById('identity-box').style.MozUserFocus = ''; }, 0);"> |
720 + <box id="notification-popup-box" hidden="true" align="center"> |
721 + <box id="notification-popup-box" hidden="true" align="center"> |
721 + <image id="default-notification-icon" class="notification-anchor-icon" role="button"/> |
722 + <image id="default-notification-icon" class="notification-anchor-icon" role="button" |
|
723 + aria-label="&urlbar.defaultNotificationAnchor.label;"/> |
|
724 + <!-- NB: the identity-notification-icon is used for persona-based auth and preffed |
|
725 + off by default. It hasn't been updated for some time and liable to being |
|
726 + removed.--> |
722 + <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/> |
727 + <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/> |
723 + <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/> |
728 + <image id="geo-notification-icon" class="notification-anchor-icon" role="button" |
724 + <image id="push-notification-icon" class="notification-anchor-icon" role="button"/> |
729 + aria-label="&urlbar.geolocationNotificationAnchor.label;"/> |
725 + <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/> |
730 + <image id="addons-notification-icon" class="notification-anchor-icon" role="button" |
726 + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> |
731 + aria-label="&urlbar.addonsNotificationAnchor.label;"/> |
727 + <image id="login-fill-notification-icon" class="notification-anchor-icon" role="button"/> |
732 + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button" |
728 + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
733 + aria-label="&urlbar.indexedDBNotificationAnchor.label;"/> |
729 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> |
734 + <image id="login-fill-notification-icon" class="notification-anchor-icon" role="button" |
730 + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
735 + aria-label="&urlbar.loginFillNotificationAnchor.label;"/> |
731 + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/> |
736 + <image id="password-notification-icon" class="notification-anchor-icon" role="button" |
732 + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
737 + aria-label="&urlbar.passwordNotificationAnchor.label;"/> |
733 + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
738 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button" |
734 + <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon" role="button"/> |
739 + aria-label="&urlbar.webappsNotificationAnchor.label;"/> |
735 + <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon" role="button"/> |
740 + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button" |
736 + <image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon" role="button"/> |
741 + aria-label="&urlbar.pluginsNotificationAnchor.label;"/> |
737 + <image id="webRTC-sharingScreen-notification-icon" class="notification-anchor-icon" role="button"/> |
742 + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button" |
738 + <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/> |
743 + aria-label="&urlbar.webNotsNotificationAnchor.label;"/> |
739 + <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/> |
744 + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button" |
740 + <image id="translate-notification-icon" class="notification-anchor-icon" role="button"/> |
745 + aria-label="&urlbar.webRTCShareDevicesNotificationAnchor.label;"/> |
741 + <image id="translated-notification-icon" class="notification-anchor-icon" role="button"/> |
746 + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button" |
742 + <image id="eme-notification-icon" class="notification-anchor-icon" role="button"/> |
747 + aria-label="&urlbar.webRTCSharingDevicesNotificationAnchor.label;"/> |
|
748 + <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon" role="button" |
|
749 + aria-label="&urlbar.webRTCShareMicrophoneNotificationAnchor.label;"/> |
|
750 + <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon" role="button" |
|
751 + aria-label="&urlbar.webRTCSharingMicrophoneNotificationAnchor.label;"/> |
|
752 + <image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon" role="button" |
|
753 + aria-label="&urlbar.webRTCShareScreenNotificationAnchor.label;"/> |
|
754 + <image id="webRTC-sharingScreen-notification-icon" class="notification-anchor-icon" role="button" |
|
755 + aria-label="&urlbar.webRTCSharingScreenNotificationAnchor.label;"/> |
|
756 + <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button" |
|
757 + aria-label="&urlbar.pointerLockNotificationAnchor.label;"/> |
|
758 + <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button" |
|
759 + aria-label="&urlbar.servicesNotificationAnchor.label;"/> |
|
760 + <image id="translate-notification-icon" class="notification-anchor-icon" role="button" |
|
761 + aria-label="&urlbar.translateNotificationAnchor.label;"/> |
|
762 + <image id="translated-notification-icon" class="notification-anchor-icon" role="button" |
|
763 + aria-label="&urlbar.translatedNotificationAnchor.label;"/> |
|
764 + <image id="eme-notification-icon" class="notification-anchor-icon" role="button" |
|
765 + aria-label="&urlbar.emeNotificationAnchor.label;"/> |
743 + </box> |
766 + </box> |
744 + <!-- Use onclick instead of normal popup= syntax since the popup |
767 + <!-- Use onclick instead of normal popup= syntax since the popup |
745 + code fires onmousedown, and hence eats our favicon drag events. |
768 + code fires onmousedown, and hence eats our favicon drag events. |
746 + We only add the identity-box button to the tab order when the location bar |
769 + We only add the identity-box button to the tab order when the location bar |
747 + has focus, otherwise pressing F6 focuses it instead of the location bar --> |
770 + has focus, otherwise pressing F6 focuses it instead of the location bar --> |
748 + <box id="identity-box" role="button" |
771 + <box id="identity-box" role="button" |
749 + align="center" |
772 + align="center" |
|
773 + aria-label="&urlbar.viewSiteInfo.label;" |
750 + onclick="gIdentityHandler.handleIdentityButtonEvent(event);" |
774 + onclick="gIdentityHandler.handleIdentityButtonEvent(event);" |
751 + onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);" |
775 + onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);" |
752 + ondragstart="gIdentityHandler.onDragStart(event);"> |
776 + ondragstart="gIdentityHandler.onDragStart(event);"> |
753 + <hbox id="identity-icons" |
777 + <hbox id="identity-icons" |
754 + consumeanchor="identity-box"> |
778 + consumeanchor="identity-box"> |
1765 + |
1793 + |
1766 +#endif // nsunixshellservice_h____ |
1794 +#endif // nsunixshellservice_h____ |
1767 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1795 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1768 --- a/browser/installer/package-manifest.in |
1796 --- a/browser/installer/package-manifest.in |
1769 +++ b/browser/installer/package-manifest.in |
1797 +++ b/browser/installer/package-manifest.in |
1770 @@ -699,19 +699,21 @@ |
1798 @@ -709,16 +709,17 @@ |
|
1799 @RESPATH@/defaults/autoconfig/prefcalls.js |
1771 @RESPATH@/browser/defaults/profile/prefs.js |
1800 @RESPATH@/browser/defaults/profile/prefs.js |
1772 @RESPATH@/browser/defaults/permissions |
1801 @RESPATH@/browser/defaults/permissions |
1773 |
1802 |
1774 #ifndef LIBXUL_SDK |
|
1775 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1803 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1776 ; Technically this is an app pref file, but we are keeping it in the original |
1804 ; Technically this is an app pref file, but we are keeping it in the original |
1777 ; gre location for now. |
1805 ; gre location for now. |
1778 @RESPATH@/defaults/pref/channel-prefs.js |
1806 @RESPATH@/defaults/pref/channel-prefs.js |
1779 +@BINPATH@/defaults/pref/kde.js |
1807 +@BINPATH@/defaults/pref/kde.js |
1780 #else |
|
1781 ; For Fx-on-xr, channel-prefs lives with the app preferences. (Bug 762588) |
|
1782 @RESPATH@/@PREF_DIR@/channel-prefs.js |
|
1783 +@BINPATH@/@PREF_DIR@/kde.js |
|
1784 #endif |
|
1785 |
1808 |
1786 ; Services (gre) prefs |
1809 ; Services (gre) prefs |
1787 #ifdef MOZ_SERVICES_NOTIFICATIONS |
1810 #ifdef MOZ_SERVICES_NOTIFICATIONS |
1788 @RESPATH@/defaults/pref/services-notifications.js |
1811 @RESPATH@/defaults/pref/services-notifications.js |
1789 #endif |
1812 #endif |
1790 #ifdef MOZ_SERVICES_SYNC |
1813 #ifdef MOZ_SERVICES_SYNC |
1791 @RESPATH@/defaults/pref/services-sync.js |
1814 @RESPATH@/defaults/pref/services-sync.js |
|
1815 #endif |