mozilla: comparison firefox-kde.patch

equal deleted inserted replaced

-:12530a091878
+:a1f740acf68e
 # HG changeset patch
-# Parent  ae5fa7b97ee57df54434bebc6dbda400b7525340
+# Parent  1426724b00dc9de228bf0ead1facc1f8fe5d68cf
 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,1272 @@
+@@ -0,0 +1,1276 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
 +#
 +# This Source Code Form is subject to the terms of the Mozilla Public
 +    </panel>
 +
 +    <panel id="social-share-panel"
 +           class="social-panel"
 +           type="arrow"
-+           orient="horizontal"
++           orient="vertical"
 +           onpopupshowing="SocialShare.onShowing()"
 +           onpopuphidden="SocialShare.onHidden()"
 +           hidden="true">
-+      <vbox class="social-share-toolbar">
++      <hbox class="social-share-toolbar">
-+        <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1">
++        <toolbarbutton id="manage-share-providers" class="toolbarbutton share-provider-button"
++                       tooltiptext="&social.addons.label;"
++                       oncommand="BrowserOpenAddonsMgr('addons://list/service');
++                                  this.parentNode.parentNode.hidePopup();"/>
++        <arrowscrollbox id="social-share-provider-buttons" orient="horizontal" flex="1" pack="end">
 +          <toolbarbutton id="add-share-provider" class="toolbarbutton share-provider-button" type="radio"
 +                         group="share-providers" tooltiptext="&findShareServices.label;"
 +                         oncommand="SocialShare.showDirectory()"/>
 +        </arrowscrollbox>
-+      </vbox>
++      </hbox>
++      <hbox id="share-container" flex="1"/>
 +    </panel>
 +
 +    <panel id="social-notification-panel"
 +           class="social-panel"
 +           type="arrow"
 +#endif
 +#endif
 +    </toolbar>
 +
 +    <toolbar id="TabsToolbar"
-+             class="toolbar-primary"
 +             fullscreentoolbar="true"
 +             customizable="true"
 +             mode="icons"
 +             iconsize="small"
 +             aria-label="&tabsToolbar.label;"
 +           CAVEAT EMPTOR
 +           Should you need to add items to the toolbar here, make sure to also add them
 +           to the default placements of buttons in CustomizableUI.jsm, so the
 +           customization code doesn't get confused.
 +      -->
-+    <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
++    <toolbar id="nav-bar"
 +             aria-label="&navbarCmd.label;"
 +             fullscreentoolbar="true" mode="icons" customizable="true"
 +             iconsize="small"
 +#ifdef MOZ_DEV_EDITION
 +             defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button,loop-button"
 default="true"
 oncommand="StarUI.panel.hidePopup();"/>
 <button id="editBookmarkPanelDeleteButton"
 class="editBookmarkPanelBottomButton"
 label="&editBookmark.cancel.label;"
-@@ -1198,17 +1198,17 @@
+@@ -1202,17 +1202,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"/>
 +*       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-tabPreviews.xml       (content/browser-tabPreviews.xml)
 *       content/browser/chatWindow.xul                (content/chatWindow.xul)
 content/browser/content.js                    (content/content.js)
-content/browser/content-UITour.js             (content/content-UITour.js)
 content/browser/defaultthemes/1.footer.jpg    (content/defaultthemes/1.footer.jpg)
 content/browser/defaultthemes/1.header.jpg    (content/defaultthemes/1.header.jpg)
 content/browser/defaultthemes/1.icon.jpg      (content/defaultthemes/1.icon.jpg)
 content/browser/defaultthemes/1.preview.jpg   (content/defaultthemes/1.preview.jpg)
+content/browser/defaultthemes/2.footer.jpg    (content/defaultthemes/2.footer.jpg)
 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
 --- a/browser/components/build/nsModule.cpp
 +++ b/browser/components/build/nsModule.cpp
 @@ -8,17 +8,17 @@
 #include "nsBrowserCompsCID.h"
 // 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.
-@@ -572,16 +578,27 @@ var gMainPane = {
+@@ -549,16 +555,27 @@ var gMainPane = {
 */
 setDefaultBrowser: function()
 {
 let shellSvc = getShellService();
 if (!shellSvc)
 +
 +#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
-@@ -689,19 +689,21 @@
+@@ -688,19 +688,21 @@
 @RESPATH@/defaults/autoconfig/prefcalls.js
 @RESPATH@/browser/defaults/profile/prefs.js
 #ifndef LIBXUL_SDK
 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)

changeset 837	a1f740acf68e
parent 828	59013b3a51f5
child 841	d8a3e976dfba