1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 9f19902f8bcde21fa63172a85818fb11714878d8 |
2 # Parent 671a03875b1bfe82edbebfde64654ea3ffc98e34 |
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,1252 @@ |
8 @@ -0,0 +1,1248 @@ |
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 |
102 + oncommand="duplicateTabIn(TabContextMenu.contextTab, 'tab');"/> |
102 + oncommand="duplicateTabIn(TabContextMenu.contextTab, 'tab');"/> |
103 + <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;" |
103 + <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;" |
104 + accesskey="&moveToNewWindow.accesskey;" |
104 + accesskey="&moveToNewWindow.accesskey;" |
105 + tbattr="tabbrowser-multiple" |
105 + tbattr="tabbrowser-multiple" |
106 + oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/> |
106 + oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/> |
107 +#ifdef E10S_TESTING_ONLY |
|
108 + <menuitem id="context_openNonRemoteWindow" label="Open in new non-e10s window" |
|
109 + tbattr="tabbrowser-remote" |
|
110 + hidden="true" |
|
111 + oncommand="gBrowser.openNonRemoteWindow(TabContextMenu.contextTab);"/> |
|
112 +#endif |
|
113 + <menuseparator id="context_sendTabToDevice_separator"/> |
107 + <menuseparator id="context_sendTabToDevice_separator"/> |
114 + <menu id="context_sendTabToDevice" label="&sendTabToDevice.label;" |
108 + <menu id="context_sendTabToDevice" label="&sendTabToDevice.label;" |
115 + accesskey="&sendTabToDevice.accesskey;"> |
109 + accesskey="&sendTabToDevice.accesskey;"> |
116 + <menupopup id="context_sendTabToDevicePopupMenu" |
110 + <menupopup id="context_sendTabToDevicePopupMenu" |
117 + onpopupshowing="gSync.populateSendTabToDevicesMenu(event.target, TabContextMenu.contextTab.linkedBrowser.currentURI.spec, TabContextMenu.contextTab.linkedBrowser.contentTitle);"/> |
111 + onpopupshowing="gSync.populateSendTabToDevicesMenu(event.target, TabContextMenu.contextTab.linkedBrowser.currentURI.spec, TabContextMenu.contextTab.linkedBrowser.contentTitle);"/> |
433 + sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;"> |
427 + sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;"> |
434 + <photonpanelmultiview id="pageActionPanelMultiView" |
428 + <photonpanelmultiview id="pageActionPanelMultiView" |
435 + mainViewId="pageActionPanelMainView" |
429 + mainViewId="pageActionPanelMainView" |
436 + viewCacheId="appMenu-viewCache"> |
430 + viewCacheId="appMenu-viewCache"> |
437 + <panelview id="pageActionPanelMainView" |
431 + <panelview id="pageActionPanelMainView" |
438 + context="pageActionPanelContextMenu" |
432 + context="pageActionContextMenu" |
439 + oncontextmenu="BrowserPageActions.onContextMenu(event);" |
|
440 + class="PanelUI-subView"> |
433 + class="PanelUI-subView"> |
441 + <vbox class="panel-subview-body"/> |
434 + <vbox class="panel-subview-body"/> |
442 + </panelview> |
435 + </panelview> |
443 + </photonpanelmultiview> |
436 + </photonpanelmultiview> |
444 + </panel> |
437 + </panel> |
456 + <image id="pageActionFeedbackAnimatableImage"/> |
449 + <image id="pageActionFeedbackAnimatableImage"/> |
457 + </hbox> |
450 + </hbox> |
458 + <label id="pageActionFeedbackMessage"/> |
451 + <label id="pageActionFeedbackMessage"/> |
459 + </panel> |
452 + </panel> |
460 + |
453 + |
461 + <menupopup id="pageActionPanelContextMenu" |
454 + <menupopup id="pageActionContextMenu" |
462 + onpopupshowing="BrowserPageActions.onContextMenuShowing(event, this);"> |
455 + onpopupshowing="BrowserPageActions.onContextMenuShowing(event, this);"> |
463 + <menuitem id="pageActionPanelContextMenu-toggleUrlbar" |
456 + <menuitem class="pageActionContextMenuItem builtInUnpinned" |
464 + add-label="&pageAction.addToUrlbar.label;" |
|
465 + remove-label="&pageAction.removeFromUrlbar.label;" |
|
466 + label="&pageAction.addToUrlbar.label;" |
457 + label="&pageAction.addToUrlbar.label;" |
467 + oncommand="BrowserPageActions.toggleShownInUrlbarForContextAction();"/> |
458 + oncommand="BrowserPageActions.togglePinningForContextAction();"/> |
|
459 + <menuitem class="pageActionContextMenuItem builtInPinned" |
|
460 + label="&pageAction.removeFromUrlbar.label;" |
|
461 + oncommand="BrowserPageActions.togglePinningForContextAction();"/> |
|
462 + <menuitem class="pageActionContextMenuItem extensionUnpinned" |
|
463 + label="&pageAction.allowInUrlbar.label;" |
|
464 + oncommand="BrowserPageActions.togglePinningForContextAction();"/> |
|
465 + <menuitem class="pageActionContextMenuItem extensionPinned" |
|
466 + label="&pageAction.disallowInUrlbar.label;" |
|
467 + oncommand="BrowserPageActions.togglePinningForContextAction();"/> |
|
468 + <menuseparator class="pageActionContextMenuItem extensionPinned extensionUnpinned"/> |
|
469 + <menuitem class="pageActionContextMenuItem extensionPinned extensionUnpinned" |
|
470 + label="&pageAction.manageExtension.label;" |
|
471 + oncommand="BrowserPageActions.openAboutAddonsForContextAction();"/> |
468 + </menupopup> |
472 + </menupopup> |
469 + |
473 + |
470 + <!-- Bookmarks and history tooltip --> |
474 + <!-- Bookmarks and history tooltip --> |
471 + <tooltip id="bhTooltip"/> |
475 + <tooltip id="bhTooltip"/> |
472 + |
476 + |
640 + <hbox class="titlebar-placeholder" type="pre-tabs" |
644 + <hbox class="titlebar-placeholder" type="pre-tabs" |
641 + skipintoolbarset="true"/> |
645 + skipintoolbarset="true"/> |
642 +#endif |
646 +#endif |
643 + |
647 + |
644 + <tabs id="tabbrowser-tabs" |
648 + <tabs id="tabbrowser-tabs" |
645 + class="tabbrowser-tabs" |
|
646 + tabbrowser="content" |
649 + tabbrowser="content" |
647 + flex="1" |
650 + flex="1" |
648 + setfocus="false" |
651 + setfocus="false" |
649 + tooltip="tabbrowser-tab-tooltip" |
652 + tooltip="tabbrowser-tab-tooltip" |
650 + stopwatchid="FX_TAB_CLICK_MS"> |
653 + stopwatchid="FX_TAB_CLICK_MS"> |
785 + completeselectedindex="true" |
788 + completeselectedindex="true" |
786 + shrinkdelay="250" |
789 + shrinkdelay="250" |
787 + tabscrolling="true" |
790 + tabscrolling="true" |
788 + showcommentcolumn="true" |
791 + showcommentcolumn="true" |
789 + showimagecolumn="true" |
792 + showimagecolumn="true" |
790 + enablehistory="true" |
|
791 + newlines="stripsurroundingwhitespace" |
793 + newlines="stripsurroundingwhitespace" |
792 + ontextentered="this.handleCommand(param);" |
794 + ontextentered="this.handleCommand(param);" |
793 + ontextreverted="return this.handleRevert();" |
795 + ontextreverted="return this.handleRevert();" |
794 + pageproxystate="invalid"> |
796 + pageproxystate="invalid"> |
795 + <!-- Use onclick instead of normal popup= syntax since the popup |
797 + <!-- Use onclick instead of normal popup= syntax since the popup |
810 + tooltiptext="&urlbar.geolocationBlocked.tooltip;"/> |
812 + tooltiptext="&urlbar.geolocationBlocked.tooltip;"/> |
811 + <image data-permission-id="desktop-notification" class="blocked-permission-icon desktop-notification-icon" role="button" |
813 + <image data-permission-id="desktop-notification" class="blocked-permission-icon desktop-notification-icon" role="button" |
812 + tooltiptext="&urlbar.webNotificationsBlocked.tooltip;"/> |
814 + tooltiptext="&urlbar.webNotificationsBlocked.tooltip;"/> |
813 + <image data-permission-id="camera" class="blocked-permission-icon camera-icon" role="button" |
815 + <image data-permission-id="camera" class="blocked-permission-icon camera-icon" role="button" |
814 + tooltiptext="&urlbar.cameraBlocked.tooltip;"/> |
816 + tooltiptext="&urlbar.cameraBlocked.tooltip;"/> |
815 + <image data-permission-id="indexedDB" class="blocked-permission-icon indexedDB-icon" role="button" |
|
816 + tooltiptext="&urlbar.indexedDBBlocked.tooltip;"/> |
|
817 + <image data-permission-id="microphone" class="blocked-permission-icon microphone-icon" role="button" |
817 + <image data-permission-id="microphone" class="blocked-permission-icon microphone-icon" role="button" |
818 + tooltiptext="&urlbar.microphoneBlocked.tooltip;"/> |
818 + tooltiptext="&urlbar.microphoneBlocked.tooltip;"/> |
819 + <image data-permission-id="screen" class="blocked-permission-icon screen-icon" role="button" |
819 + <image data-permission-id="screen" class="blocked-permission-icon screen-icon" role="button" |
820 + tooltiptext="&urlbar.screenBlocked.tooltip;"/> |
820 + tooltiptext="&urlbar.screenBlocked.tooltip;"/> |
821 + <image data-permission-id="persistent-storage" class="blocked-permission-icon persistent-storage-icon" role="button" |
821 + <image data-permission-id="persistent-storage" class="blocked-permission-icon persistent-storage-icon" role="button" |
822 + tooltiptext="&urlbar.persistentStorageBlocked.tooltip;"/> |
822 + tooltiptext="&urlbar.persistentStorageBlocked.tooltip;"/> |
|
823 + <image data-permission-id="popup" class="blocked-permission-icon popup-icon" role="button" |
|
824 + tooltiptext="&urlbar.popupBlocked.tooltip;"/> |
823 + </box> |
825 + </box> |
824 + <box id="notification-popup-box" |
826 + <box id="notification-popup-box" |
825 + hidden="true" |
827 + hidden="true" |
826 + onmouseover="document.getElementById('identity-box').classList.add('no-hover');" |
828 + onmouseover="document.getElementById('identity-box').classList.add('no-hover');" |
827 + onmouseout="document.getElementById('identity-box').classList.remove('no-hover');" |
829 + onmouseout="document.getElementById('identity-box').classList.remove('no-hover');" |
830 + tooltiptext="&urlbar.defaultNotificationAnchor.tooltip;"/> |
832 + tooltiptext="&urlbar.defaultNotificationAnchor.tooltip;"/> |
831 + <image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button" |
833 + <image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button" |
832 + tooltiptext="&urlbar.geolocationNotificationAnchor.tooltip;"/> |
834 + tooltiptext="&urlbar.geolocationNotificationAnchor.tooltip;"/> |
833 + <image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button" |
835 + <image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button" |
834 + tooltiptext="&urlbar.addonsNotificationAnchor.tooltip;"/> |
836 + tooltiptext="&urlbar.addonsNotificationAnchor.tooltip;"/> |
|
837 + <image id="canvas-notification-icon" class="notification-anchor-icon" role="button" |
|
838 + tooltiptext="&urlbar.canvasNotificationAnchor.tooltip;"/> |
835 + <image id="indexedDB-notification-icon" class="notification-anchor-icon indexedDB-icon" role="button" |
839 + <image id="indexedDB-notification-icon" class="notification-anchor-icon indexedDB-icon" role="button" |
836 + tooltiptext="&urlbar.indexedDBNotificationAnchor.tooltip;"/> |
840 + tooltiptext="&urlbar.indexedDBNotificationAnchor.tooltip;"/> |
837 + <image id="password-notification-icon" class="notification-anchor-icon login-icon" role="button" |
841 + <image id="password-notification-icon" class="notification-anchor-icon login-icon" role="button" |
838 + tooltiptext="&urlbar.passwordNotificationAnchor.tooltip;"/> |
842 + tooltiptext="&urlbar.passwordNotificationAnchor.tooltip;"/> |
839 + <stack id="plugins-notification-icon" class="notification-anchor-icon" role="button" align="center" |
843 + <stack id="plugins-notification-icon" class="notification-anchor-icon" role="button" align="center" |
871 + </box> |
875 + </box> |
872 + <box id="urlbar-display-box" align="center"> |
876 + <box id="urlbar-display-box" align="center"> |
873 + <label id="switchtab" class="urlbar-display urlbar-display-switchtab" value="&urlbar.switchToTab.label;"/> |
877 + <label id="switchtab" class="urlbar-display urlbar-display-switchtab" value="&urlbar.switchToTab.label;"/> |
874 + <label id="extension" class="urlbar-display urlbar-display-extension" value="&urlbar.extension.label;"/> |
878 + <label id="extension" class="urlbar-display urlbar-display-extension" value="&urlbar.extension.label;"/> |
875 + </box> |
879 + </box> |
876 + <hbox id="page-action-buttons"> |
880 + <hbox id="page-action-buttons" context="pageActionContextMenu"> |
877 + <hbox id="userContext-icons" hidden="true"> |
881 + <hbox id="userContext-icons" hidden="true"> |
878 + <label id="userContext-label"/> |
882 + <label id="userContext-label"/> |
879 + <image id="userContext-indicator"/> |
883 + <image id="userContext-indicator"/> |
880 + </hbox> |
884 + </hbox> |
881 + <image id="page-report-button" |
|
882 + class="urlbar-icon urlbar-page-action" |
|
883 + role="button" |
|
884 + hidden="true" |
|
885 + tooltiptext="&pageReportIcon.tooltip;" |
|
886 + onmousedown="gPopupBlockerObserver.onReportButtonMousedown(event);"/> |
|
887 + <image id="reader-mode-button" |
885 + <image id="reader-mode-button" |
888 + class="urlbar-icon urlbar-page-action" |
886 + class="urlbar-icon urlbar-page-action" |
889 + role="button" |
887 + role="button" |
890 + hidden="true" |
888 + hidden="true" |
891 + onclick="ReaderParent.buttonClick(event);"/> |
889 + onclick="ReaderParent.buttonClick(event);"/> |
900 + tooltiptext="&pageActionButton.tooltip;" |
898 + tooltiptext="&pageActionButton.tooltip;" |
901 + onmousedown="BrowserPageActions.mainButtonClicked(event);"/> |
899 + onmousedown="BrowserPageActions.mainButtonClicked(event);"/> |
902 + <hbox id="star-button-box" |
900 + <hbox id="star-button-box" |
903 + hidden="true" |
901 + hidden="true" |
904 + class="urlbar-icon-wrapper urlbar-page-action" |
902 + class="urlbar-icon-wrapper urlbar-page-action" |
905 + context="pageActionPanelContextMenu" |
|
906 + oncontextmenu="BrowserPageActions.onContextMenu(event);" |
|
907 + onclick="BrowserPageActions.doCommandForAction(PageActions.actionForID('bookmark'), event, this);"> |
903 + onclick="BrowserPageActions.doCommandForAction(PageActions.actionForID('bookmark'), event, this);"> |
908 + <image id="star-button" |
904 + <image id="star-button" |
909 + class="urlbar-icon" |
905 + class="urlbar-icon" |
910 + role="button" |
906 + role="button" |
911 + observes="bookmarkThisPageBroadcaster"/> |
907 + observes="bookmarkThisPageBroadcaster"/> |
1259 + |
1255 + |
1260 +</window> |
1256 +</window> |
1261 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1257 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1262 --- a/browser/base/jar.mn |
1258 --- a/browser/base/jar.mn |
1263 +++ b/browser/base/jar.mn |
1259 +++ b/browser/base/jar.mn |
1264 @@ -58,16 +58,18 @@ browser.jar: |
1260 @@ -52,16 +52,18 @@ browser.jar: |
1265 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1261 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1266 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1262 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1267 content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) |
1263 content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) |
1268 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1264 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1269 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1265 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1341 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1337 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1342 #endif |
1338 #endif |
1343 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js |
1339 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js |
1344 --- a/browser/components/preferences/in-content/main.js |
1340 --- a/browser/components/preferences/in-content/main.js |
1345 +++ b/browser/components/preferences/in-content/main.js |
1341 +++ b/browser/components/preferences/in-content/main.js |
1346 @@ -203,16 +203,23 @@ var gMainPane = { |
1342 @@ -193,16 +193,23 @@ var gMainPane = { |
1347 this._backoffIndex++ : backoffTimes.length - 1]); |
1343 this._backoffIndex++ : backoffTimes.length - 1]); |
1348 }; |
1344 }; |
1349 |
1345 |
1350 window.setTimeout(() => { |
1346 window.setTimeout(() => { |
1351 window.requestIdleCallback(pollForDefaultBrowser); |
1347 window.requestIdleCallback(pollForDefaultBrowser); |
1365 let performanceSettingsLink = document.getElementById("performanceSettingsLearnMore"); |
1361 let performanceSettingsLink = document.getElementById("performanceSettingsLearnMore"); |
1366 let performanceSettingsUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "performance"; |
1362 let performanceSettingsUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "performance"; |
1367 performanceSettingsLink.setAttribute("href", performanceSettingsUrl); |
1363 performanceSettingsLink.setAttribute("href", performanceSettingsUrl); |
1368 |
1364 |
1369 this.updateDefaultPerformanceSettingsPref(); |
1365 this.updateDefaultPerformanceSettingsPref(); |
1370 @@ -952,16 +959,27 @@ var gMainPane = { |
1366 @@ -898,16 +905,27 @@ var gMainPane = { |
1371 // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser. |
1367 // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser. |
1372 this._backoffIndex = 0; |
1368 this._backoffIndex = 0; |
1373 |
1369 |
1374 let shellSvc = getShellService(); |
1370 let shellSvc = getShellService(); |
1375 if (!shellSvc) |
1371 if (!shellSvc) |
1709 + |
1705 + |
1710 +#endif // nsunixshellservice_h____ |
1706 +#endif // nsunixshellservice_h____ |
1711 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1707 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1712 --- a/browser/installer/package-manifest.in |
1708 --- a/browser/installer/package-manifest.in |
1713 +++ b/browser/installer/package-manifest.in |
1709 +++ b/browser/installer/package-manifest.in |
1714 @@ -666,16 +666,18 @@ |
1710 @@ -657,16 +657,18 @@ |
1715 @RESPATH@/browser/defaults/blocklists |
1711 @RESPATH@/browser/defaults/blocklists |
1716 @RESPATH@/browser/defaults/pinning |
1712 @RESPATH@/browser/defaults/pinning |
1717 |
1713 |
1718 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1714 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1719 ; Technically this is an app pref file, but we are keeping it in the original |
1715 ; Technically this is an app pref file, but we are keeping it in the original |