mozilla: comparison firefox-kde.patch

equal deleted inserted replaced

-:b61e849fe451
+:9ae2b79d3bb1
 # HG changeset patch
-# Parent  2cb2f829aabd7e3efaa973a0a8cf99aca9605bdc
+# Parent  2cae514c05c8836ca5b69884d3a07998a5d53e8b
 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,1200 @@
+@@ -0,0 +1,1119 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
 +#
 +# This Source Code Form is subject to the terms of the Mozilla Public
 +    <panel type="autocomplete-richlistbox"
 +           id="PopupAutoCompleteRichResult"
 +           noautofocus="true"
 +           hidden="true"
 +           flip="none"
-+           level="parent">
++           level="parent"/>
-+#ifdef NIGHTLY_BUILD
-+      <hbox id="urlbar-search-footer" flex="1" align="stretch" pack="end">
-+        <button id="urlbar-search-settings" label="&changeSearchSettings.button;"
-+                oncommand="BrowserUITelemetry.countSearchSettingsEvent('urlbar'); openPreferences('paneSearch')"/>
-+      </hbox>
-+#endif
-+    </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"
++                 activateontab="true" position="after_start"
 +#ifdef XP_WIN
 +                 consumeoutsideclicks="false" ignorekeys="handled"
 +#endif
 +        />
 +    </menulist>
 +    <panel id="editBookmarkPanel"
 +           type="arrow"
 +           orient="vertical"
 +           ignorekeys="true"
 +           hidden="true"
++           tabspecific="true"
 +           onpopupshown="StarUI.panelShown(event);"
 +           aria-labelledby="editBookmarkPanelTitle">
 +      <row id="editBookmarkPanelHeader" align="center" hidden="true">
 +        <vbox align="center">
 +          <image id="editBookmarkPanelStarIcon"/>
 +                         oncommand="SocialShare.showDirectory()"/>
 +        </arrowscrollbox>
 +      </hbox>
 +      <hbox id="share-container" flex="1"/>
 +    </panel>
-+
-+    <panel id="social-notification-panel"
-+           class="social-panel"
-+           type="arrow"
-+           hidden="true"
-+           noautofocus="true"/>
-+    <panel id="social-flyout-panel"
-+           class="social-panel"
-+           onpopupshown="SocialFlyout.onShown()"
-+           onpopuphidden="SocialFlyout.onHidden()"
-+           side="right"
-+           type="arrow"
-+           hidden="true"
-+           flip="slide"
-+           rolluponmousewheel="true"
-+           noautofocus="true"
-+           position="topcenter topright"/>
 +
 +    <menupopup id="toolbar-context-menu"
 +               onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));">
 +      <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
 +                accesskey="&customizeMenu.moveToPanel.accesskey;"
 +                   onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
 +                   ondragstart="gIdentityHandler.onDragStart(event);">
 +                <image id="identity-icon"
 +                       consumeanchor="identity-box"
 +                       onclick="PageProxyClickHandler(event);"/>
-+                <box id="blocked-permissions-container" align="center" tooltiptext="">
++                <image id="sharing-icon" mousethrough="always"/>
-+                  <image data-permission-id="geo" class="notification-anchor-icon geo-icon blocked" role="button"
++                <box id="blocked-permissions-container" align="center">
-+                         aria-label="&urlbar.geolocationNotificationAnchor.label;"/>
++                  <image data-permission-id="geo" class="blocked-permission-icon geo-icon" role="button"
-+                  <image data-permission-id="desktop-notification" class="notification-anchor-icon desktop-notification-icon blocked" role="button"
++                         tooltiptext="&urlbar.geolocationBlocked.tooltip;"/>
-+                         aria-label="&urlbar.webNotsNotificationAnchor3.label;"/>
++                  <image data-permission-id="desktop-notification" class="blocked-permission-icon desktop-notification-icon" role="button"
-+                  <image data-permission-id="camera" class="notification-anchor-icon camera-icon blocked" role="button"
++                         tooltiptext="&urlbar.webNotificationsBlocked.tooltip;"/>
-+                         aria-label="&urlbar.webRTCShareDevicesNotificationAnchor.label;"/>
++                  <image data-permission-id="camera" class="blocked-permission-icon camera-icon" role="button"
-+                  <image data-permission-id="indexedDB" class="notification-anchor-icon indexedDB-icon blocked" role="button"
++                         tooltiptext="&urlbar.cameraBlocked.tooltip;"/>
-+                         aria-label="&urlbar.indexedDBNotificationAnchor.label;"/>
++                  <image data-permission-id="indexedDB" class="blocked-permission-icon indexedDB-icon" role="button"
-+                  <image data-permission-id="microphone" class="notification-anchor-icon microphone-icon blocked" role="button"
++                         tooltiptext="&urlbar.indexedDBBlocked.tooltip;"/>
-+                         aria-label="&urlbar.webRTCShareMicrophoneNotificationAnchor.label;"/>
++                  <image data-permission-id="microphone" class="blocked-permission-icon microphone-icon" role="button"
-+                  <image data-permission-id="screen" class="notification-anchor-icon screen-icon blocked" role="button"
++                         tooltiptext="&urlbar.microphoneBlocked.tooltip;"/>
-+                         aria-label="&urlbar.webRTCShareScreenNotificationAnchor.label;"/>
++                  <image data-permission-id="screen" class="blocked-permission-icon screen-icon" role="button"
-+                  <image data-permission-id="pointerLock" class="notification-anchor-icon pointerLock-icon blocked" role="button"
++                         tooltiptext="&urlbar.screenBlocked.tooltip;"/>
-+                         aria-label="&urlbar.pointerLockNotificationAnchor.label;"/>
 +                </box>
 +                <box id="notification-popup-box"
 +                     hidden="true"
-+                     tooltiptext=""
 +                     onmouseover="document.getElementById('identity-icon').classList.add('no-hover');"
 +                     onmouseout="document.getElementById('identity-icon').classList.remove('no-hover');"
 +                     align="center">
 +                  <image id="default-notification-icon" class="notification-anchor-icon" role="button"
-+                         aria-label="&urlbar.defaultNotificationAnchor.label;"/>
++                         tooltiptext="&urlbar.defaultNotificationAnchor.tooltip;"/>
 +                  <image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button"
-+                         aria-label="&urlbar.geolocationNotificationAnchor.label;"/>
++                         tooltiptext="&urlbar.geolocationNotificationAnchor.tooltip;"/>
 +                  <image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button"
-+                         aria-label="&urlbar.addonsNotificationAnchor.label;"/>
++                         tooltiptext="&urlbar.addonsNotificationAnchor.tooltip;"/>
 +                  <image id="indexedDB-notification-icon" class="notification-anchor-icon indexedDB-icon" role="button"
-+                         aria-label="&urlbar.indexedDBNotificationAnchor.label;"/>
++                         tooltiptext="&urlbar.indexedDBNotificationAnchor.tooltip;"/>
-+                  <image id="login-fill-notification-icon" class="notification-anchor-icon login-icon" role="button"
-+                         aria-label="&urlbar.loginFillNotificationAnchor.label;"/>
 +                  <image id="password-notification-icon" class="notification-anchor-icon login-icon" role="button"
-+                         aria-label="&urlbar.passwordNotificationAnchor.label;"/>
++                         tooltiptext="&urlbar.passwordNotificationAnchor.tooltip;"/>
 +                  <image id="plugins-notification-icon" class="notification-anchor-icon plugin-icon" role="button"
-+                         aria-label="&urlbar.pluginsNotificationAnchor.label;"/>
++                         tooltiptext="&urlbar.pluginsNotificationAnchor.tooltip;"/>
 +                  <image id="web-notifications-notification-icon" class="notification-anchor-icon desktop-notification-icon" role="button"
-+                         aria-label="&urlbar.webNotsNotificationAnchor3.label;"/>
++                         tooltiptext="&urlbar.webNotificationAnchor.tooltip;"/>
 +                  <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon camera-icon" role="button"
-+                         aria-label="&urlbar.webRTCShareDevicesNotificationAnchor.label;"/>
++                         tooltiptext="&urlbar.webRTCShareDevicesNotificationAnchor.tooltip;"/>
-+                  <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon camera-icon in-use" role="button"
-+                         aria-label="&urlbar.webRTCSharingDevicesNotificationAnchor.label;"/>
 +                  <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon microphone-icon" role="button"
-+                         aria-label="&urlbar.webRTCShareMicrophoneNotificationAnchor.label;"/>
++                         tooltiptext="&urlbar.webRTCShareMicrophoneNotificationAnchor.tooltip;"/>
-+                  <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon microphone-icon in-use" role="button"
-+                         aria-label="&urlbar.webRTCSharingMicrophoneNotificationAnchor.label;"/>
 +                  <image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon screen-icon" role="button"
-+                         aria-label="&urlbar.webRTCShareScreenNotificationAnchor.label;"/>
++                         tooltiptext="&urlbar.webRTCShareScreenNotificationAnchor.tooltip;"/>
-+                  <image id="webRTC-sharingScreen-notification-icon" class="notification-anchor-icon screen-icon in-use" role="button"
-+                         aria-label="&urlbar.webRTCSharingScreenNotificationAnchor.label;"/>
-+                  <image id="pointerLock-notification-icon" class="notification-anchor-icon pointerLock-icon" role="button"
-+                         aria-label="&urlbar.pointerLockNotificationAnchor.label;"/>
 +                  <image id="servicesInstall-notification-icon" class="notification-anchor-icon service-icon" role="button"
-+                         aria-label="&urlbar.servicesNotificationAnchor.label;"/>
++                         tooltiptext="&urlbar.servicesNotificationAnchor.tooltip;"/>
 +                  <image id="translate-notification-icon" class="notification-anchor-icon translation-icon" role="button"
-+                         aria-label="&urlbar.translateNotificationAnchor.label;"/>
++                         tooltiptext="&urlbar.translateNotificationAnchor.tooltip;"/>
 +                  <image id="translated-notification-icon" class="notification-anchor-icon translation-icon in-use" role="button"
-+                         aria-label="&urlbar.translatedNotificationAnchor.label;"/>
++                         tooltiptext="&urlbar.translatedNotificationAnchor.tooltip;"/>
 +                  <image id="eme-notification-icon" class="notification-anchor-icon drm-icon" role="button"
-+                         aria-label="&urlbar.emeNotificationAnchor.label;"/>
++                         tooltiptext="&urlbar.emeNotificationAnchor.tooltip;"/>
 +                </box>
 +                <image id="tracking-protection-icon"/>
 +                <image id="connection-icon"/>
 +                <hbox id="identity-icon-labels">
 +                  <label id="identity-icon-label" class="plain" flex="1"/>
 +                       onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
 +                <image id="reader-mode-button"
 +                       class="urlbar-icon"
 +                       hidden="true"
 +                       onclick="ReaderParent.buttonClick(event);"/>
++                <toolbarbutton id="urlbar-zoom-button"
++                       onclick="FullZoom.reset();"
++                       tooltiptext="&urlbar.zoomReset.tooltip;"
++                       hidden="true"/>
 +              </hbox>
 +              <hbox id="userContext-icons" hidden="true">
 +                <label id="userContext-label"/>
 +                <image id="userContext-indicator"/>
 +              </hbox>
 +        <sidebarheader id="sidebar-header" align="center">
 +          <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
 +          <image id="sidebar-throbber"/>
 +          <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="SidebarUI.hide();"/>
 +        </sidebarheader>
-+        <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
++        <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true" disablefullscreen="true"
 +                  style="min-width: 14em; width: 18em; max-width: 36em;" tooltip="aHTMLTooltip"/>
 +      </vbox>
 +
 +      <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
 +      <vbox id="appcontent" flex="1">
 +                    flex="1" contenttooltip="aHTMLTooltip"
 +                    tabcontainer="tabbrowser-tabs"
 +                    contentcontextmenu="contentAreaContextMenu"
 +                    autocompletepopup="PopupAutoComplete"
 +                    selectmenulist="ContentSelectDropdown"/>
-+        <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/>
-+      </vbox>
-+      <splitter id="social-sidebar-splitter"
-+                class="chromeclass-extrachrome sidebar-splitter"
-+                observes="socialSidebarBroadcaster"/>
-+      <vbox id="social-sidebar-box"
-+            class="chromeclass-extrachrome"
-+            observes="socialSidebarBroadcaster"
-+            persist="width">
-+
-+        <sidebarheader id="social-sidebar-header" class="sidebar-header" align="center">
-+          <image id="social-sidebar-favico"/>
-+          <label id="social-sidebar-title" class="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
-+          <toolbarbutton id="social-sidebar-button"
-+                         class="toolbarbutton-1"
-+                         type="menu">
-+            <menupopup id="social-statusarea-popup" position="after_end">
-+              <menuitem class="social-toggle-sidebar-menuitem"
-+                        type="checkbox"
-+                        autocheck="false"
-+                        command="Social:ToggleSidebar"
-+                        label="&social.toggleSidebar.label;"
-+                        accesskey="&social.toggleSidebar.accesskey;"/>
-+              <menuitem class="social-toggle-notifications-menuitem"
-+                        type="checkbox"
-+                        autocheck="false"
-+                        command="Social:ToggleNotifications"
-+                        label="&social.toggleNotifications.label;"
-+                        accesskey="&social.toggleNotifications.accesskey;"/>
-+              <menuseparator/>
-+              <menuseparator class="social-provider-menu" hidden="true"/>
-+              <menuitem class="social-addons-menuitem" command="Social:Addons"
-+                        label="&social.addons.label;"/>
-+              <menuitem label="&social.learnMore.label;"
-+                        accesskey="&social.learnMore.accesskey;"
-+                        oncommand="SocialUI.showLearnMore();"/>
-+            </menupopup>
-+          </toolbarbutton>
-+        </sidebarheader>
-+
-+        <browser id="social-sidebar-browser"
-+                 type="content"
-+                 context="contentAreaContextMenu"
-+                 message="true"
-+                 messagemanagergroup="social"
-+                 disableglobalhistory="true"
-+                 tooltip="aHTMLTooltip"
-+                 popupnotificationanchor="social-sidebar-favico"
-+                 flex="1"
-+                 style="min-width: 14em; width: 18em; max-width: 36em;"/>
 +      </vbox>
 +      <vbox id="browser-border-end" hidden="true" layer="true"/>
 +    </hbox>
 +#include ../../components/customizableui/content/customizeMode.inc.xul
 +  </deck>
 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor },
 #endif
 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
-@@ -23,16 +23,22 @@ var gMainPane = {
+@@ -33,16 +33,22 @@ var gMainPane = {
-init: function ()
+if (AppConstants.platform == "win") {
-{
+// In Windows 8 we launch the control panel since it's the only
-function setEventListener(aId, aEventType, aCallback)
+// way to get all file type association prefs. So we don't know
-{
+// when the user will select the default.  We refresh here periodically
-document.getElementById(aId)
+// in case the default changes. On other Windows OS's defaults can also
-.addEventListener(aEventType, aCallback.bind(gMainPane));
+// be set while the prefs are open.
-}
+window.setInterval(this.updateSetDefaultBrowser.bind(this), 1000);
+}
++
 +    var env = Components.classes["@mozilla.org/process/environment;1"]
 +                          .getService(Components.interfaces.nsIEnvironment);
 +    var kde_session = 0;
 +    if (env.get('KDE_FULL_SESSION') == "true")
 +        kde_session = 1;
-+
-#ifdef HAVE_SHELL_SERVICE
-this.updateSetDefaultBrowser();
-#ifdef XP_WIN
-// In Windows 8 we launch the control panel since it's the only
-// way to get all file type association prefs. So we don't know
-// 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.
-@@ -703,16 +709,27 @@ var gMainPane = {
-let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser");
-alwaysCheckPref.value = true;
-let shellSvc = getShellService();
-if (!shellSvc)
-return;
-try {
-shellSvc.setDefaultBrowser(true, false);
-+      if (kde_session == 1) {
-+        var shellObj = Components.classes["@mozilla.org/file/local;1"]
-+          .createInstance(Components.interfaces.nsILocalFile);
-+        shellObj.initWithPath("/usr/bin/kwriteconfig");
-+        var process = Components.classes["@mozilla.org/process/util;1"]
-+          .createInstance(Components.interfaces.nsIProcess);
-+        process.init(shellObj);
-+        var args = ["--file", "kdeglobals", "--group", "General", "--key",
-+            "BrowserApplication", "firefox"];
-+        process.run(false, args, args.length);
-+      }
-} catch (ex) {
-Cu.reportError(ex);
-return;
 }
-let selectedIndex = shellSvc.isDefaultBrowser(false, true) ? 1 : 0;
+// set up the "use current page" label-changing listener
-document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
+this._updateUseCurrentButton();
-}
+window.addEventListener("focus", this._updateUseCurrentButton.bind(this), false);
+this.updateBrowserStartupLastSession();
+@@ -704,16 +710,27 @@ var gMainPane = {
+let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser");
+alwaysCheckPref.value = true;
+let shellSvc = getShellService();
+if (!shellSvc)
+return;
+try {
+shellSvc.setDefaultBrowser(true, false);
++        if (kde_session == 1) {
++          var shellObj = Components.classes["@mozilla.org/file/local;1"]
++            .createInstance(Components.interfaces.nsILocalFile);
++          shellObj.initWithPath("/usr/bin/kwriteconfig");
++          var process = Components.classes["@mozilla.org/process/util;1"]
++            .createInstance(Components.interfaces.nsIProcess);
++          process.init(shellObj);
++          var args = ["--file", "kdeglobals", "--group", "General", "--key",
++              "BrowserApplication", "firefox"];
++          process.run(false, args, args.length);
++        }
+} catch (ex) {
+Cu.reportError(ex);
+return;
+}
+let selectedIndex = shellSvc.isDefaultBrowser(false, true) ? 1 : 0;
+document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
+}
 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
 @@ -34,16 +34,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 ]
 +
 +#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
-@@ -674,16 +674,17 @@
+@@ -675,16 +675,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 935	9ae2b79d3bb1
parent 932	a58cc7936ce7
child 942	66115255ad6f