mozilla: comparison firefox-kde.patch

equal deleted inserted replaced

-:4c248180e576
+:840132a4a9b3
 # HG changeset patch
-# Parent  18632e53d0b0c4c03f254ca2dbbeac8f48ec6f5c
+# User msirringhaus@suse.de
+# Date 1559300151 -7200
+#      Fri May 31 12:55:51 2019 +0200
+# Node ID 54d41b0033b8d649d842a1f862c6fed8b9874dec
+# Parent  428161c3b9599083e1b8710eda1760f1f707ab11
+How to apply this patch:
+1. Import and apply it
+2. cp browser/base/content/browser.xul browser/base/content/browser-kde.xul
+3. Find editBookmarkPanelDoneButton
+4. Replace #ifndef with #ifdef in the line above (this hanges the button order from Gnome-style to KDE-style)
+5. hg qrefresh
-diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
+diff -r 428161c3b959 -r 54d41b0033b8 browser/base/content/browser-kde.xul
-new file mode 100644
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
---- /dev/null
++++ b/browser/base/content/browser-kde.xul	Fri May 31 12:55:51 2019 +0200
-+++ b/browser/base/content/browser-kde.xul
+@@ -0,0 +1,1375 @@
-@@ -0,0 +1,1404 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
 +#
 +# This Source Code Form is subject to the terms of the Mozilla Public
 +<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/downloads/downloads.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/searchbar.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css" type="text/css"?>
-+<?xml-stylesheet href="chrome://browser/skin/compacttheme.css" type="text/css" alternate="yes" title="Light/Dark"?>
 +
 +# All DTD information is stored in a separate file so that it can be shared by
 +# hiddenWindow.xul.
 +<!DOCTYPE window [
 +#include browser-doctype.inc
 +# All JS files which are needed by browser.xul and other top level windows to
 +# support MacOS specific features *must* go into the global-scripts.inc file so
 +# that they can be shared with macWindow.inc.xul.
 +#include global-scripts.inc
 +
-+<script type="application/javascript">
++<script>
 +  Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", this);
 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-captivePortal.js", this);
-+  Services.scriptloader.loadSubScript("chrome://browser/content/browser-compacttheme.js", this);
 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-contentblocking.js", this);
 +#ifdef MOZ_DATA_REPORTING
 +  Services.scriptloader.loadSubScript("chrome://browser/content/browser-data-submission-info-bar.js", this);
 +#endif
 +#ifndef MOZILLA_OFFICIAL
 +
 +  <popupset id="mainPopupSet">
 +    <menupopup id="tabContextMenu"
 +               onpopupshowing="if (event.target == this) TabContextMenu.updateContextMenu(this);"
 +               onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;">
-+      <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;"
++      <menuitem id="context_reloadTab" data-lazy-l10n-id="reload-tab"
 +                oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/>
-+      <menuitem id="context_reloadSelectedTabs" label="&reloadTabs.label;" hidden="true"
++      <menuitem id="context_reloadSelectedTabs" data-lazy-l10n-id="reload-tabs" hidden="true"
-+                accesskey="&reloadTabs.accesskey;"
 +                oncommand="gBrowser.reloadMultiSelectedTabs();"/>
 +      <menuitem id="context_toggleMuteTab" oncommand="TabContextMenu.contextTab.toggleMuteAudio();"/>
 +      <menuitem id="context_toggleMuteSelectedTabs" hidden="true"
 +                oncommand="gBrowser.toggleMuteAudioOnMultiSelectedTabs(TabContextMenu.contextTab);"/>
-+      <menuitem id="context_pinTab" label="&pinTab.label;"
++      <menuitem id="context_pinTab" data-lazy-l10n-id="pin-tab"
-+                accesskey="&pinTab.accesskey;"
 +                oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/>
-+      <menuitem id="context_unpinTab" label="&unpinTab.label;" hidden="true"
++      <menuitem id="context_unpinTab" data-lazy-l10n-id="unpin-tab" hidden="true"
-+                accesskey="&unpinTab.accesskey;"
 +                oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/>
-+      <menuitem id="context_pinSelectedTabs" label="&pinSelectedTabs.label;" hidden="true"
++      <menuitem id="context_pinSelectedTabs" data-lazy-l10n-id="pin-selected-tabs" hidden="true"
-+                accesskey="&pinSelectedTabs.accesskey;"
 +                oncommand="gBrowser.pinMultiSelectedTabs();"/>
-+      <menuitem id="context_unpinSelectedTabs" label="&unpinSelectedTabs.label;" hidden="true"
++      <menuitem id="context_unpinSelectedTabs" data-lazy-l10n-id="unpin-selected-tabs" hidden="true"
-+                accesskey="&unpinSelectedTabs.accesskey;"
 +                oncommand="gBrowser.unpinMultiSelectedTabs();"/>
-+      <menuitem id="context_duplicateTab" label="&duplicateTab.label;"
++      <menuitem id="context_duplicateTab" data-lazy-l10n-id="duplicate-tab"
-+                accesskey="&duplicateTab.accesskey;"
 +                oncommand="duplicateTabIn(TabContextMenu.contextTab, 'tab');"/>
-+      <menuitem id="context_duplicateTabs" label="&duplicateTabs.label;"
++      <menuitem id="context_duplicateTabs" data-lazy-l10n-id="duplicate-tabs"
-+                accesskey="&duplicateTabs.accesskey;"
 +                oncommand="TabContextMenu.duplicateSelectedTabs();"/>
 +      <menuseparator/>
-+      <menuitem id="context_selectAllTabs" label="&selectAllTabs.label;" accesskey="&selectAllTabs.accesskey;"
++      <menuitem id="context_selectAllTabs" data-lazy-l10n-id="select-all-tabs"
 +                oncommand="gBrowser.selectAllTabs();"/>
 +      <menuitem id="context_bookmarkSelectedTabs"
 +                hidden="true"
-+                label="&bookmarkSelectedTabs.label;"
++                data-lazy-l10n-id="bookmark-selected-tabs"
-+                accesskey="&bookmarkSelectedTabs.accesskey;"
 +                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"/>
 +      <menuitem id="context_bookmarkTab"
-+                label="&bookmarkTab.label;"
++                data-lazy-l10n-id="bookmark-tab"
-+                accesskey="&bookmarkTab.accesskey;"
 +                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.getUniquePages([TabContextMenu.contextTab]));"/>
 +      <menu id="context_reopenInContainer"
-+            label="&reopenInContainer.label;"
++            data-lazy-l10n-id="reopen-in-container"
-+            accesskey="&reopenInContainer.accesskey;"
 +            hidden="true">
 +        <menupopup oncommand="TabContextMenu.reopenInContainer(event);"
 +                   onpopupshowing="TabContextMenu.createReopenInContainerMenu(event);"/>
 +      </menu>
-+      <menu id="context_moveTabOptions"
++      <menu id="context_moveTabOptions">
-+            multiselectcontextlabel="&moveSelectedTabOptions.label;"
-+            multiselectcontextaccesskey="&moveSelectedTabOptions.accesskey;"
-+            nonmultiselectcontextlabel="&moveTabOptions.label;"
-+            nonmultiselectcontextaccesskey="&moveTabOptions.accesskey;">
 +        <menupopup id="moveTabOptionsMenu">
 +          <menuitem id="context_moveToStart"
-+                    label="&moveToStart.label;"
++                    data-lazy-l10n-id="move-to-start"
-+                    accesskey="&moveToStart.accesskey;"
 +                    tbattr="tabbrowser-multiple"
 +                    oncommand="gBrowser.moveTabsToStart(TabContextMenu.contextTab);"/>
 +          <menuitem id="context_moveToEnd"
-+                    label="&moveToEnd.label;"
++                    data-lazy-l10n-id="move-to-end"
-+                    accesskey="&moveToEnd.accesskey;"
 +                    tbattr="tabbrowser-multiple"
 +                    oncommand="gBrowser.moveTabsToEnd(TabContextMenu.contextTab);"/>
-+          <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;"
++          <menuitem id="context_openTabInWindow" data-lazy-l10n-id="move-to-new-window"
-+                    accesskey="&moveToNewWindow.accesskey;"
 +                    tbattr="tabbrowser-multiple"
 +                    oncommand="gBrowser.replaceTabsWithWindow(TabContextMenu.contextTab);"/>
 +        </menupopup>
 +      </menu>
 +      <menu id="context_sendTabToDevice"
 +            class="sync-ui-item">
 +        <menupopup id="context_sendTabToDevicePopupMenu"
 +                   onpopupshowing="gSync.populateSendTabToDevicesMenu(event.target, TabContextMenu.contextTab.linkedBrowser.currentURI.spec, TabContextMenu.contextTab.linkedBrowser.contentTitle, TabContextMenu.contextTab.multiselected);"/>
 +      </menu>
 +      <menuseparator/>
-+      <menuitem id="context_closeTabsToTheEnd" label="&closeTabsToTheEnd.label;" accesskey="&closeTabsToTheEnd.accesskey;"
++      <menuitem id="context_closeTabsToTheEnd" data-lazy-l10n-id="close-tabs-to-the-end"
 +                oncommand="gBrowser.removeTabsToTheEndFrom(TabContextMenu.contextTab, {animate: true});"/>
-+      <menuitem id="context_closeOtherTabs" label="&closeOtherTabs.label;" accesskey="&closeOtherTabs.accesskey;"
++      <menuitem id="context_closeOtherTabs" data-lazy-l10n-id="close-other-tabs"
 +                oncommand="gBrowser.removeAllTabsBut(TabContextMenu.contextTab);"/>
 +      <menuitem id="context_undoCloseTab"
-+                label="&undoCloseTab.label;"
++                data-lazy-l10n-id="undo-close-tab"
-+                accesskey="&undoCloseTab.accesskey;"
 +                observes="History:UndoCloseTab"/>
-+      <menuitem id="context_closeTab" label="&closeTab.label;" accesskey="&closeTab.accesskey;"
++      <menuitem id="context_closeTab" data-lazy-l10n-id="close-tab"
 +                oncommand="gBrowser.removeTab(TabContextMenu.contextTab, { animate: true });"/>
-+      <menuitem id="context_closeSelectedTabs" label="&closeTabs.label;"
++      <menuitem id="context_closeSelectedTabs" data-lazy-l10n-id="close-tabs"
-+                hidden="true" accesskey="&closeTabs.accesskey;"
++                hidden="true"
 +                oncommand="gBrowser.removeMultiSelectedTabs();"/>
 +    </menupopup>
 +
 +    <!-- bug 415444/582485: event.stopPropagation is here for the cloned version
 +         of this menupopup -->
 +           hidden="true"
 +           tabspecific="true"
 +           aria-labelledby="editBookmarkPanelTitle">
 +      <box class="panel-header">
 +        <label id="editBookmarkPanelTitle"/>
++        <toolbarbutton id="editBookmarkPanelInfoButton" oncommand="StarUI.toggleRecommendation();" >
++          <image/>
++        </toolbarbutton>
 +      </box>
-+      <html:div id="editBookmarkPanelFaviconContainer">
++      <html:div id="editBookmarkPanelInfoArea">
-+        <html:img id="editBookmarkPanelFavicon"/>
++        <html:div id="editBookmarkPanelRecommendation"></html:div>
++        <html:div id="editBookmarkPanelFaviconContainer">
++          <html:img id="editBookmarkPanelFavicon"/>
++        </html:div>
++        <html:div id="editBookmarkPanelImage"></html:div>
 +      </html:div>
-+      <box id="editBookmarkPanelImage"/>
 +#include ../../components/places/content/editBookmarkPanel.inc.xul
 +      <vbox id="editBookmarkPanelBottomContent"
 +            flex="1">
 +        <checkbox id="editBookmarkPanel_showForNewBookmarks"
 +                  label="&editBookmark.showForNewBookmarks.label;"
 +      <menuitem oncommand="ToolbarContextMenu.removeExtensionForContextAction(this.parentElement)"
 +                accesskey="&customizeMenu.removeExtension.accesskey;"
 +                label="&customizeMenu.removeExtension.label;"
 +                contexttype="toolbaritem"
 +                class="customize-context-removeExtension"/>
++      <menuitem oncommand="ToolbarContextMenu.reportExtensionForContextAction(this.parentElement, 'toolbar_context_menu')"
++                accesskey="&customizeMenu.reportExtension.accesskey;"
++                label="&customizeMenu.reportExtension.label;"
++                contexttype="toolbaritem"
++                class="customize-context-reportExtension"/>
 +      <menuseparator/>
 +      <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
 +                accesskey="&customizeMenu.pinToOverflowMenu.accesskey;"
 +                label="&customizeMenu.pinToOverflowMenu.label;"
 +                contexttype="toolbaritem"
 +                contexttype="toolbaritem"
 +                class="customize-context-removeFromToolbar"/>
 +      <menuitem id="toolbar-context-reloadSelectedTab"
 +                contexttype="tabbar"
 +                oncommand="gBrowser.reloadMultiSelectedTabs();"
-+                label="&toolbarContextMenu.reloadSelectedTab.label;"
++                data-lazy-l10n-id="toolbar-context-menu-reload-selected-tab"/>
-+                accesskey="&toolbarContextMenu.reloadSelectedTab.accesskey;"/>
 +      <menuitem id="toolbar-context-reloadSelectedTabs"
 +                contexttype="tabbar"
 +                oncommand="gBrowser.reloadMultiSelectedTabs();"
-+                label="&toolbarContextMenu.reloadSelectedTabs.label;"
++                data-lazy-l10n-id="toolbar-context-menu-reload-selected-tabs"/>
-+                accesskey="&toolbarContextMenu.reloadSelectedTabs.accesskey;"/>
 +      <menuitem id="toolbar-context-bookmarkSelectedTab"
 +                contexttype="tabbar"
 +                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"
-+                label="&toolbarContextMenu.bookmarkSelectedTab.label;"
++                data-lazy-l10n-id="toolbar-context-menu-bookmark-selected-tab"/>
-+                accesskey="&toolbarContextMenu.bookmarkSelectedTab.accesskey;"/>
 +      <menuitem id="toolbar-context-bookmarkSelectedTabs"
 +                contexttype="tabbar"
 +                oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"
-+                label="&toolbarContextMenu.bookmarkSelectedTabs.label;"
++                data-lazy-l10n-id="toolbar-context-menu-bookmark-selected-tabs"/>
-+                accesskey="&toolbarContextMenu.bookmarkSelectedTabs.accesskey;"/>
 +      <menuitem id="toolbar-context-selectAllTabs"
 +                contexttype="tabbar"
 +                oncommand="gBrowser.selectAllTabs();"
-+                label="&toolbarContextMenu.selectAllTabs.label;"
++                data-lazy-l10n-id="toolbar-context-menu-select-all-tabs"/>
-+                accesskey="&toolbarContextMenu.selectAllTabs.accesskey;"/>
 +      <menuitem id="toolbar-context-undoCloseTab"
 +                contexttype="tabbar"
-+                label="&toolbarContextMenu.undoCloseTab.label;"
++                data-lazy-l10n-id="toolbar-context-menu-undo-close-tab"
-+                accesskey="&toolbarContextMenu.undoCloseTab.accesskey;"
 +                observes="History:UndoCloseTab"/>
 +      <menuseparator/>
 +      <menuseparator id="viewToolbarsMenuSeparator"/>
 +      <!-- XXXgijs: we're using oncommand handler here to avoid the event being
 +                    redirected to the command element, thus preventing
 +    </tooltip>
 +
 +#include popup-notifications.inc
 +
 +#include ../../components/customizableui/content/panelUI.inc.xul
-+#include ../../components/controlcenter/content/panel.inc.xul
++#include ../../components/controlcenter/content/identityPanel.inc.xul
++#include ../../components/controlcenter/content/protectionsPanel.inc.xul
 +#include ../../components/downloads/content/downloadsPanel.inc.xul
 +#include browser-allTabsMenu.inc.xul
 +
 +    <hbox id="downloads-animation-container" mousethrough="always">
 +      <vbox id="downloads-notification-anchor" hidden="true">
 +
 +    <tooltip id="dynamic-shortcut-tooltip"
 +             onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/>
 +
 +    <menupopup id="SyncedTabsSidebarContext">
-+      <menuitem label="&syncedTabs.context.open.label;"
++      <menuitem data-lazy-l10n-id="synced-tabs-context-open"
-+                accesskey="&syncedTabs.context.open.accesskey;"
 +                id="syncedTabsOpenSelected" where="current"/>
-+      <menuitem label="&syncedTabs.context.openInNewTab.label;"
++      <menuitem data-lazy-l10n-id="synced-tabs-context-open-in-new-tab"
-+                accesskey="&syncedTabs.context.openInNewTab.accesskey;"
 +                id="syncedTabsOpenSelectedInTab" where="tab"/>
-+      <menuitem label="&syncedTabs.context.openInNewWindow.label;"
++      <menuitem data-lazy-l10n-id="synced-tabs-context-open-in-new-window"
-+                accesskey="&syncedTabs.context.openInNewWindow.accesskey;"
 +                id="syncedTabsOpenSelectedInWindow" where="window"/>
-+      <menuitem label="&syncedTabs.context.openInNewPrivateWindow.label;"
++      <menuitem data-lazy-l10n-id="synced-tabs-context-open-in-new-private-window"
-+                accesskey="&syncedTabs.context.openInNewPrivateWindow.accesskey;"
 +                id="syncedTabsOpenSelectedInPrivateWindow" where="window" private="true"/>
 +      <menuseparator/>
-+      <menuitem label="&syncedTabs.context.bookmarkSingleTab.label;"
++      <menuitem data-lazy-l10n-id="synced-tabs-context-bookmark-single-tab"
-+                accesskey="&syncedTabs.context.bookmarkSingleTab.accesskey;"
 +                id="syncedTabsBookmarkSelected"/>
-+      <menuitem label="&syncedTabs.context.copy.label;"
++      <menuitem data-lazy-l10n-id="synced-tabs-context-copy"
-+                accesskey="&syncedTabs.context.copy.accesskey;"
 +                id="syncedTabsCopySelected"/>
 +      <menuseparator/>
-+      <menuitem label="&syncedTabs.context.openAllInTabs.label;"
++      <menuitem data-lazy-l10n-id="synced-tabs-context-open-all-in-tabs"
-+                accesskey="&syncedTabs.context.openAllInTabs.accesskey;"
 +                id="syncedTabsOpenAllInTabs"/>
-+      <menuitem label="&syncedTabs.context.managedevices.label;"
++      <menuitem data-lazy-l10n-id="synced-tabs-context-manage-devices"
-+                accesskey="&syncedTabs.context.managedevices.accesskey;"
 +                id="syncedTabsManageDevices"
 +                oncommand="gSync.openDevicesManagementPage('syncedtabs-sidebar');"/>
 +      <menuitem label="&syncSyncNowItem.label;"
 +                accesskey="&syncSyncNowItem.accesskey;"
 +                id="syncedTabsRefresh"/>
 +      <menuitem label="&syncSyncNowItem.label;"
 +                accesskey="&syncSyncNowItem.accesskey;"
 +                id="syncedTabsRefreshFilter"/>
 +    </menupopup>
 +
-+    <hbox id="statuspanel" inactive="true" layer="true">
++    <hbox id="statuspanel" inactive="true" renderroot="content">
 +      <hbox id="statuspanel-inner">
 +        <label id="statuspanel-label"
 +               role="status"
 +               aria-live="off"
 +               flex="1"
 +            <toolbartabstop/>
 +            <textbox id="urlbar" flex="1"
 +                     placeholder="&urlbar.placeholder2;"
 +                     defaultPlaceholder="&urlbar.placeholder2;"
 +                     focused="true"
-+                     type="autocomplete"
-+                     quantumbar="false"
-+                     autocompletesearch="unifiedcomplete"
-+                     autocompletesearchparam="enable-actions"
-+                     autocompletepopup="PopupAutoCompleteRichResult"
-+                     completeselectedindex="true"
-+                     tabscrolling="true"
-+                     newlines="stripsurroundingwhitespace"
-+                     ontextentered="this.handleCommand(param);"
-+                     ontextreverted="return this.handleRevert();"
 +                     pageproxystate="invalid">
 +              <!-- Use onclick instead of normal popup= syntax since the popup
 +                   code fires onmousedown, and hence eats our favicon drag events. -->
 +              <box id="identity-box" role="button"
 +                   align="center"
 +                         tooltiptext="&urlbar.canvasBlocked.tooltip;"/>
 +                  <image data-permission-id="plugin:flash" class="blocked-permission-icon plugin-icon" role="button"
 +                         tooltiptext="&urlbar.flashPluginBlocked.tooltip;"/>
 +                  <image data-permission-id="midi" class="blocked-permission-icon midi-icon" role="button"
 +                         tooltiptext="&urlbar.midiBlocked.tooltip;"/>
++                  <image data-permission-id="install" class="blocked-permission-icon install-icon" role="button"
++                         tooltiptext="&urlbar.installBlocked.tooltip;"/>
 +                </box>
 +                <box id="notification-popup-box"
 +                     hidden="true"
 +                     onmouseover="document.getElementById('identity-box').classList.add('no-hover');"
 +                     onmouseout="document.getElementById('identity-box').classList.remove('no-hover');"
 +    </toolbarpalette>
 +  </toolbox>
 +
 +  <hbox id="fullscr-toggler" hidden="true"/>
 +
-+  <deck id="content-deck" flex="1">
++  <deck id="content-deck" flex="1" renderroot="content">
 +    <hbox flex="1" id="browser">
 +      <vbox id="browser-border-start" hidden="true" layer="true"/>
 +      <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
 +        <sidebarheader id="sidebar-header" align="center">
 +          <toolbarbutton id="sidebar-switcher-target" flex="1" class="tabbable">
 +                     flex="1" class="plain" selectedIndex="0"/>
 +        </tabbox>
 +      </vbox>
 +      <vbox id="browser-border-end" hidden="true" layer="true"/>
 +    </hbox>
++    <box id="customization-container" flex="1" hidden="true"><![CDATA[
 +#include ../../components/customizableui/content/customizeMode.inc.xul
++    ]]></box>
 +  </deck>
 +
-+  <html:div id="fullscreen-warning" class="pointerlockfswarning" hidden="true">
++  <html:div id="fullscreen-warning" class="pointerlockfswarning" hidden="true" renderroot="content">
 +    <html:div class="pointerlockfswarning-domain-text">
 +      &fullscreenWarning.beforeDomain.label;
 +      <html:span class="pointerlockfswarning-domain"/>
 +      &fullscreenWarning.afterDomain.label;
 +    </html:div>
 +            &exitDOMFullscreen.button;
 +#endif
 +    </html:button>
 +  </html:div>
 +
-+  <html:div id="pointerlock-warning" class="pointerlockfswarning" hidden="true">
++  <html:div id="pointerlock-warning" class="pointerlockfswarning" hidden="true" renderroot="content">
 +    <html:div class="pointerlockfswarning-domain-text">
 +      &pointerlockWarning.beforeDomain.label;
 +      <html:span class="pointerlockfswarning-domain"/>
 +      &pointerlockWarning.afterDomain.label;
 +    </html:div>
 +    <html:div class="pointerlockfswarning-generic-text">
 +      &pointerlockWarning.generic.label;
 +    </html:div>
 +  </html:div>
 +
-+  <vbox id="browser-bottombox" layer="true">
++  <vbox id="browser-bottombox" layer="true" renderroot="content">
 +    <!-- gNotificationBox will be added here lazily. -->
 +  </vbox>
-+
 +</window>
-diff --git a/browser/base/jar.mn b/browser/base/jar.mn
+diff -r 428161c3b959 -r 54d41b0033b8 browser/base/jar.mn
---- a/browser/base/jar.mn
+--- a/browser/base/jar.mn	Mon Jun 17 09:02:06 2019 +0200
-+++ b/browser/base/jar.mn
++++ b/browser/base/jar.mn	Fri May 31 12:55:51 2019 +0200
-@@ -28,16 +28,18 @@ browser.jar:
+@@ -33,6 +33,8 @@
-content/browser/aboutTabCrashed.js            (content/aboutTabCrashed.js)
+#else
-content/browser/aboutTabCrashed.xhtml         (content/aboutTabCrashed.xhtml)
+*       content/browser/browser.xul                   (content/browser.xul)
-*       content/browser/browser.css                   (content/browser.css)
-content/browser/browser.js                    (content/browser.js)
-#ifdef MOZ_BROWSER_XHTML
-*       content/browser/browser.xhtml                 (content/browser.xhtml)
 #endif
-*       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-allTabsMenu.js        (content/browser-allTabsMenu.js)
 content/browser/browser-captivePortal.js      (content/browser-captivePortal.js)
-content/browser/browser-ctrlTab.js            (content/browser-ctrlTab.js)
+diff -r 428161c3b959 -r 54d41b0033b8 browser/components/preferences/in-content/main.js
-content/browser/browser-customization.js      (content/browser-customization.js)
+--- a/browser/components/preferences/in-content/main.js	Mon Jun 17 09:02:06 2019 +0200
-content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js)
++++ b/browser/components/preferences/in-content/main.js	Fri May 31 12:55:51 2019 +0200
-content/browser/browser-compacttheme.js       (content/browser-compacttheme.js)
+@@ -294,6 +294,13 @@
-content/browser/browser-contentblocking.js    (content/browser-contentblocking.js)
-diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
---- a/browser/components/preferences/in-content/main.js
-+++ b/browser/components/preferences/in-content/main.js
-@@ -288,16 +288,23 @@ var gMainPane = {
-this._backoffIndex++ : backoffTimes.length - 1]);
-};
-window.setTimeout(() => {
-window.requestIdleCallback(pollForDefaultBrowser);
 }, backoffTimes[this._backoffIndex]);
 }
 +    var env = Components.classes["@mozilla.org/process/environment;1"]
 +      .getService(Components.interfaces.nsIEnvironment);
 +    }
 +
 this.initBrowserContainers();
 this.buildContentProcessCountMenuList();
-let performanceSettingsLink = document.getElementById("performanceSettingsLearnMore");
+@@ -983,6 +990,17 @@
-let performanceSettingsUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "performance";
-performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
-this.updateDefaultPerformanceSettingsPref();
-@@ -1025,16 +1032,27 @@ var gMainPane = {
-// Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser.
-this._backoffIndex = 0;
-let shellSvc = getShellService();
-if (!shellSvc)
 return;
 try {
 shellSvc.setDefaultBrowser(true, false);
 +        if (kde_session == 1) {
 +          var shellObj = Components.classes["@mozilla.org/file/local;1"]
 +          process.run(false, args, args.length);
 +        }
 } catch (ex) {
 Cu.reportError(ex);
 return;
-}
+diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/moz.build
+--- a/browser/components/shell/moz.build	Mon Jun 17 09:02:06 2019 +0200
-let selectedIndex = shellSvc.isDefaultBrowser(false, true) ? 1 : 0;
++++ b/browser/components/shell/moz.build	Fri May 31 12:55:51 2019 +0200
-document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
+@@ -33,6 +33,8 @@
-}
-diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
---- a/browser/components/shell/moz.build
-+++ b/browser/components/shell/moz.build
-@@ -29,16 +29,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
-]
-elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
-XPIDL_SOURCES += [
-'nsIGNOMEShellService.idl',
-]
 SOURCES += [
 'nsGNOMEShellService.cpp',
 +        'nsKDEShellService.cpp',
 +        'nsUnixShellService.cpp',
 ]
 elif CONFIG['OS_ARCH'] == 'WINNT':
 SOURCES += [
-'nsWindowsShellService.cpp',
+diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsKDEShellService.cpp
-]
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-LOCAL_INCLUDES += [
++++ b/browser/components/shell/nsKDEShellService.cpp	Fri May 31 12:55:51 2019 +0200
-'../../../other-licenses/nsis/Contrib/CityHash/cityhash',
-]
-diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp
-new file mode 100644
---- /dev/null
-+++ b/browser/components/shell/nsKDEShellService.cpp
 @@ -0,0 +1,150 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* This Source Code Form is subject to the terms of the Mozilla Public
 + * License, v. 2.0. If a copy of the MPL was not distributed with this
 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 +    uristr->SetData( aURI );
 +    command->AppendElement( uristr );
 +    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
 +}
 +
-diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/shell/nsKDEShellService.h
+diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsKDEShellService.h
-new file mode 100644
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
---- /dev/null
++++ b/browser/components/shell/nsKDEShellService.h	Fri May 31 12:55:51 2019 +0200
-+++ b/browser/components/shell/nsKDEShellService.h
 @@ -0,0 +1,32 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* This Source Code Form is subject to the terms of the Mozilla Public
 + * License, v. 2.0. If a copy of the MPL was not distributed with this
 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 +
 +  bool mCheckedThisSession;
 +};
 +
 +#endif // nskdeshellservice_h____
-diff --git a/browser/components/shell/nsUnixShellService.cpp b/browser/components/shell/nsUnixShellService.cpp
+diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsUnixShellService.cpp
-new file mode 100644
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
---- /dev/null
++++ b/browser/components/shell/nsUnixShellService.cpp	Fri May 31 12:55:51 2019 +0200
-+++ b/browser/components/shell/nsUnixShellService.cpp
 @@ -0,0 +1,22 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* This Source Code Form is subject to the terms of the Mozilla Public
 + * License, v. 2.0. If a copy of the MPL was not distributed with this
 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 +{
 +    if( nsKDEUtils::kdeSupport())
 +        return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
 +    return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
 +}
-diff --git a/browser/components/shell/nsUnixShellService.h b/browser/components/shell/nsUnixShellService.h
+diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsUnixShellService.h
-new file mode 100644
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
---- /dev/null
++++ b/browser/components/shell/nsUnixShellService.h	Fri May 31 12:55:51 2019 +0200
-+++ b/browser/components/shell/nsUnixShellService.h
 @@ -0,0 +1,15 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* This Source Code Form is subject to the terms of the Mozilla Public
 + * License, v. 2.0. If a copy of the MPL was not distributed with this
 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 +
 +NS_IMETHODIMP
 +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
 +
 +#endif // nsunixshellservice_h____
-diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
+diff -r 428161c3b959 -r 54d41b0033b8 browser/installer/package-manifest.in
---- a/browser/installer/package-manifest.in
+--- a/browser/installer/package-manifest.in	Mon Jun 17 09:02:06 2019 +0200
-+++ b/browser/installer/package-manifest.in
++++ b/browser/installer/package-manifest.in	Fri May 31 12:55:51 2019 +0200
-@@ -286,16 +286,18 @@
+@@ -299,6 +299,8 @@
-@RESPATH@/browser/defaults/settings/pinning
-@RESPATH@/browser/defaults/settings/main
-; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
-; Technically this is an app pref file, but we are keeping it in the original
 ; gre location for now.
 @RESPATH@/defaults/pref/channel-prefs.js
 +@RESPATH@/defaults/pref/kde.js
 +
 ; Services (gre) prefs
 @RESPATH@/defaults/pref/services-sync.js
-; [Layout Engine Resources]
-; Style Sheets, Graphics and other Resources used by the layout engine.
-@RESPATH@/res/EditorOverride.css
-@RESPATH@/res/contenteditable.css
-@RESPATH@/res/designmode.css

branch	firefox68
changeset 1097	840132a4a9b3
parent 1093	3942c205588b
child 1099	8a3c73e74e65