mozilla: comparison firefox-kde.patch

equal deleted inserted replaced

-:0955f22b3f4f
+:e0b23b7851e9
 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,1206 @@
+@@ -0,0 +1,1238 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
 +#
 +# This Source Code Form is subject to the terms of the Mozilla Public
 +          </hbox>
 +        </vbox>
 +      </row>
 +      <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
 +      <hbox id="editBookmarkPanelBottomButtons" pack="end">
-+#ifdef XP_UNIX
++#ifndef XP_UNIX
 +        <button id="editBookmarkPanelDoneButton"
 +                class="editBookmarkPanelBottomButton"
 +                label="&editBookmark.done.label;"
 +                default="true"
 +                oncommand="StarUI.panel.hidePopup();"/>
 +        </vbox>
 +      </hbox>
 +      <hbox id="UITourTooltipButtons" flex="1" align="center"/>
 +     </vbox>
 +    </panel>
 +    <!-- type="default" forces frames to be created so that the panel's size can be determined -->
 +    <panel id="UITourHighlightContainer"
 +           type="default"
 +           hidden="true"
 +           noautofocus="true"
 +           noautohide="true"
 +           flip="slide"
 +           rolluponmousewheel="true"
 +           noautofocus="true"
 +           position="topcenter topright"/>
 +
++    <panel id="loop-notification-panel"
++           class="loop-panel social-panel"
++           type="arrow"
++           hidden="true"
++           noautofocus="true"/>
++
++    <panel id="loop-panel"
++           class="loop-panel social-panel"
++           type="arrow"
++           orient="horizontal"
++           hidden="true"/>
++
 +    <menupopup id="toolbar-context-menu"
 +               onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));">
 +      <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
 +                accesskey="&customizeMenu.moveToPanel.accesskey;"
 +                label="&customizeMenu.moveToPanel.label;"
++                contexttype="toolbaritem"
 +                class="customize-context-moveToPanel"/>
 +      <menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)"
 +                accesskey="&customizeMenu.removeFromToolbar.accesskey;"
 +                label="&customizeMenu.removeFromToolbar.label;"
++                contexttype="toolbaritem"
 +                class="customize-context-removeFromToolbar"/>
++      <menuitem id="toolbar-context-reloadAllTabs"
++                class="toolbaritem-tabsmenu"
++                contexttype="tabbar"
++                oncommand="gBrowser.reloadAllTabs();"
++                label="&toolbarContextMenu.reloadAllTabs.label;"
++                accesskey="&toolbarContextMenu.reloadAllTabs.accesskey;"/>
++      <menuitem id="toolbar-context-bookmarkAllTabs"
++                class="toolbaritem-tabsmenu"
++                contexttype="tabbar"
++                command="Browser:BookmarkAllTabs"
++                label="&toolbarContextMenu.bookmarkAllTabs.label;"
++                accesskey="&toolbarContextMenu.bookmarkAllTabs.accesskey;"/>
++      <menuitem id="toolbar-context-undoCloseTab"
++                class="toolbaritem-tabsmenu"
++                contexttype="tabbar"
++                label="&toolbarContextMenu.undoCloseTab.label;"
++                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
 +                    listeners on the menupopup or further up the tree from
 +#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
 +             autohide="true"
 +#endif
 +#endif
 +             context="toolbar-context-menu">
-+      <toolbaritem id="menubar-items" align="center"
++      <toolbaritem id="menubar-items" align="center">
-+                   cui-areatype="toolbar">
 +# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by
 +# hiddenWindow.xul.
 +#include browser-menubar.inc
 +      </toolbaritem>
 +
 +            class="tabbrowser-tabs"
 +            tabbrowser="content"
 +            flex="1"
 +            setfocus="false"
 +            tooltip="tabbrowser-tab-tooltip"
-+            cui-areatype="toolbar"
 +            stopwatchid="FX_TAB_CLICK_MS">
 +        <tab class="tabbrowser-tab" selected="true" fadein="true"/>
 +      </tabs>
 +
 +      <toolbarbutton id="new-tab-button"
 +          <menuitem id="menu_tabview"
 +                    class="menuitem-iconic"
 +                    key="key_tabview"
 +                    label="&viewTabGroups.label;"
 +                    command="Browser:ToggleTabView"
-+                    cui-areatype="toolbar"
 +                    observes="tabviewGroupsNumber"/>
++          <menuitem id="alltabs_undoCloseTab"
++                    class="menuitem-iconic"
++                    key="key_undoCloseTab"
++                    label="&undoCloseTab.label;"
++                    observes="History:UndoCloseTab"/>
 +          <menuseparator id="alltabs-popup-separator"/>
 +        </menupopup>
 +      </toolbarbutton>
 +
 +#if !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_QT)
 +      -->
 +    <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
 +             aria-label="&navbarCmd.label;"
 +             fullscreentoolbar="true" mode="icons" customizable="true"
 +             iconsize="small"
-+             defaultset="urlbar-container,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,social-share-button,social-toolbar-item"
++             defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,loop-call-button,social-share-button,social-toolbar-item"
 +             customizationtarget="nav-bar-customization-target"
 +             overflowable="true"
 +             overflowbutton="nav-bar-overflow-button"
 +             overflowtarget="widget-overflow-list"
 +             overflowpanel="widget-overflow"
 +             context="toolbar-context-menu">
 +
 +      <hbox id="nav-bar-customization-target" flex="1">
 +        <toolbaritem id="urlbar-container" flex="400" persist="width"
 +                     title="&locationItem.title;" removable="false"
-+                     cui-areatype="toolbar"
 +                     class="chromeclass-location" overflows="false">
 +          <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
 +                         label="&backCmd.label;"
 +                         command="Browser:BackOrBackDuplicate"
-+                         cui-areatype="toolbar"
 +                         onclick="checkForMiddleClick(this, event);"
 +                         tooltip="back-button-tooltip"
 +                         context="backForwardMenu"/>
 +          <hbox id="urlbar-wrapper" flex="1">
 +            <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
 +                           label="&forwardCmd.label;"
 +                           command="Browser:ForwardOrForwardDuplicate"
-+                           cui-areatype="toolbar"
 +                           onclick="checkForMiddleClick(this, event);"
 +                           tooltip="forward-button-tooltip"
 +                           context="backForwardMenu"/>
 +            <textbox id="urlbar" flex="1"
 +                     placeholder="&urlbar.placeholder2;"
 +                <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon" role="button"/>
++                <image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon" role="button"/>
++                <image id="webRTC-sharingScreen-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="translate-notification-icon" class="notification-anchor-icon" role="button"/>
 +                <image id="translated-notification-icon" class="notification-anchor-icon" role="button"/>
 +              </box>
 +                   align="center"
 +                   onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
 +                   onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
 +                   ondragstart="gIdentityHandler.onDragStart(event);">
 +                <image id="page-proxy-favicon"
++                       consumeanchor="identity-box"
 +                       onclick="PageProxyClickHandler(event);"
 +                       pageproxystate="invalid"/>
 +                <hbox id="identity-icon-labels">
 +                  <label id="identity-icon-label" class="plain" flex="1"/>
 +                  <label id="identity-icon-country-label" class="plain"/>
 +                     align="center" class="chromeclass-toolbar-additional panel-wide-item"
 +                     cui-areatype="toolbar"
 +                     flex="100" persist="width" removable="true">
 +          <searchbar id="searchbar" flex="1"/>
 +        </toolbaritem>
-+
-+        <toolbarbutton id="webrtc-status-button"
-+                       class="toolbarbutton-1 chromeclass-toolbar-additional"
-+                       type="menu"
-+                       hidden="true"
-+                       orient="horizontal"
-+                       label="&webrtcIndicatorButton.label;"
-+                       tooltiptext="&webrtcIndicatorButton.tooltip;"
-+                       cui-areatype="toolbar"
-+                       overflows="false">
-+          <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
-+                     onpopuphiding="WebrtcIndicator.clearPopup(this);"
-+                     oncommand="WebrtcIndicator.menuCommand(event.target);"/>
-+        </toolbarbutton>
 +
 +        <toolbarbutton id="bookmarks-menu-button"
 +                       class="toolbarbutton-1 chromeclass-toolbar-additional"
 +                       persist="class"
 +                       removable="true"
 +                       key="goHome"
 +                       onclick="BrowserGoHome(event);"
 +                       cui-areatype="toolbar"
 +                       aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
 +
++        <!-- XXX Bug 1013989 will provide a label for the button -->
++        <!-- This uses badged to be compatible with the social api code it shares.
++             We may also want it to be badged in the future, for notification
++             purposes. -->
++        <toolbarbutton id="loop-call-button"
++                       class="toolbarbutton-1 chromeclass-toolbar-additional"
++                       persist="class"
++                       type="badged"
++                       removable="true"
++                       tooltiptext="&loopCallButton.tooltip;"
++                       oncommand="LoopUI.openCallPanel(event);"
++                       cui-areatype="toolbar"
++                       >
++        </toolbarbutton>
++
 +
 +        <toolbarbutton id="social-share-button"
 +                       class="toolbarbutton-1 chromeclass-toolbar-additional"
 +                       label="&sharePageCmd.label;"
 +                       tooltiptext="&sharePageCmd.label;"
 +                       command="Social:SharePage"/>
 +      </hbox>
 +
 +      <toolbarbutton id="nav-bar-overflow-button"
 +                     class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button"
-+                     cui-areatype="toolbar"
 +                     skipintoolbarset="true"
 +                     tooltiptext="&navbarOverflow.label;"/>
 +
 +      <toolbaritem id="PanelUI-button"
 +                   class="chromeclass-toolbar-additional"
-+                   cui-areatype="toolbar"
 +                   removable="false">
 +        <toolbarbutton id="PanelUI-menu-button"
 +                       class="toolbarbutton-1"
-+                       cui-areatype="toolbar"
++                       consumeanchor="PanelUI-button"
 +                       label="&brandShortName;"
 +                       tooltiptext="&appmenu.tooltip;"/>
 +      </toolbaritem>
 +
 +      <hbox id="window-controls" hidden="true" pack="end" skipintoolbarset="true"
 +        <toolbarbutton id="restore-button"
 +#ifdef XP_MACOSX
 +# Prior to 10.7 there wasn't a native fullscreen button so we use #restore-button
 +# to exit fullscreen and want it to behave like other toolbar buttons.
 +                       class="toolbarbutton-1"
-+                       cui-areatype="toolbar"
 +#endif
 +                       tooltiptext="&fullScreenRestore.tooltip;"
 +                       oncommand="BrowserFullScreen();"/>
 +
 +        <toolbarbutton id="close-button"
 +      <vbox id="full-screen-warning-message" align="center">
 +        <description id="full-screen-domain-text"/>
 +        <description class="full-screen-description" value="&fullscreenExitHint2.value;"/>
 +        <vbox id="full-screen-approval-pane" align="center">
 +          <hbox>
-+#ifndef XP_UNIX
++#ifdef XP_UNIX
 +            <button label="&fullscreenExitButton.label;"
 +                    oncommand="FullScreen.setFullscreenAllowed(false);"
 +                    class="full-screen-approval-button"/>
 +            <button label="&fullscreenAllowButton.label;"
 +                    oncommand="FullScreen.setFullscreenAllowed(true);"
 +#     Introducing the iframe dynamically, as needed, was found to be better than
 +#     starting with an empty iframe here in browser.xul from a Ts standpoint.
 +</deck>
 +
 +</window>
+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
+@@ -171,17 +171,17 @@
+class="editBookmarkPanelHeaderButton"
+oncommand="StarUI.removeBookmarkButtonCommand();"
+accesskey="&editBookmark.removeBookmark.accessKey;"/>
+</hbox>
+</vbox>
+</row>
+<vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
+<hbox id="editBookmarkPanelBottomButtons" pack="end">
+-#ifndef XP_UNIX
++#ifdef XP_UNIX
+<button id="editBookmarkPanelDoneButton"
+class="editBookmarkPanelBottomButton"
+label="&editBookmark.done.label;"
+default="true"
+oncommand="StarUI.panel.hidePopup();"/>
+<button id="editBookmarkPanelDeleteButton"
+class="editBookmarkPanelBottomButton"
+label="&editBookmark.cancel.label;"
+@@ -1164,17 +1164,17 @@
+<hbox id="full-screen-warning-container" hidden="true" fadeout="true">
+<hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
+<vbox id="full-screen-warning-message" align="center">
+<description id="full-screen-domain-text"/>
+<description class="full-screen-description" value="&fullscreenExitHint2.value;"/>
+<vbox id="full-screen-approval-pane" align="center">
+<hbox>
+-#ifdef XP_UNIX
++#ifndef XP_UNIX
+<button label="&fullscreenExitButton.label;"
+oncommand="FullScreen.setFullscreenAllowed(false);"
+class="full-screen-approval-button"/>
+<button label="&fullscreenAllowButton.label;"
+oncommand="FullScreen.setFullscreenAllowed(true);"
+class="full-screen-approval-button"/>
+#else
+<button label="&fullscreenAllowButton.label;"
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
 @@ -70,16 +70,18 @@ browser.jar:
 content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
 // 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.
-@@ -875,14 +881,25 @@ var gAdvancedPane = {
+@@ -889,14 +895,25 @@ var gAdvancedPane = {
 * Set browser as the operating system default browser.
 */
 setDefaultBrowser: function()
 {
 let shellSvc = getShellService();
 +
 +#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
-@@ -666,19 +666,21 @@
+@@ -658,19 +658,21 @@
 @BINPATH@/defaults/autoconfig/prefcalls.js
 @BINPATH@/browser/defaults/profile/prefs.js
 #ifndef LIBXUL_SDK
 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)

changeset 766	e0b23b7851e9
parent 753	f3bf114c6639
child 779	354c672efefa