1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent ae5fa7b97ee57df54434bebc6dbda400b7525340 |
2 # Parent 1426724b00dc9de228bf0ead1facc1f8fe5d68cf |
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,1272 @@ |
8 @@ -0,0 +1,1276 @@ |
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 |
293 + </panel> |
293 + </panel> |
294 + |
294 + |
295 + <panel id="social-share-panel" |
295 + <panel id="social-share-panel" |
296 + class="social-panel" |
296 + class="social-panel" |
297 + type="arrow" |
297 + type="arrow" |
298 + orient="horizontal" |
298 + orient="vertical" |
299 + onpopupshowing="SocialShare.onShowing()" |
299 + onpopupshowing="SocialShare.onShowing()" |
300 + onpopuphidden="SocialShare.onHidden()" |
300 + onpopuphidden="SocialShare.onHidden()" |
301 + hidden="true"> |
301 + hidden="true"> |
302 + <vbox class="social-share-toolbar"> |
302 + <hbox class="social-share-toolbar"> |
303 + <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1"> |
303 + <toolbarbutton id="manage-share-providers" class="toolbarbutton share-provider-button" |
|
304 + tooltiptext="&social.addons.label;" |
|
305 + oncommand="BrowserOpenAddonsMgr('addons://list/service'); |
|
306 + this.parentNode.parentNode.hidePopup();"/> |
|
307 + <arrowscrollbox id="social-share-provider-buttons" orient="horizontal" flex="1" pack="end"> |
304 + <toolbarbutton id="add-share-provider" class="toolbarbutton share-provider-button" type="radio" |
308 + <toolbarbutton id="add-share-provider" class="toolbarbutton share-provider-button" type="radio" |
305 + group="share-providers" tooltiptext="&findShareServices.label;" |
309 + group="share-providers" tooltiptext="&findShareServices.label;" |
306 + oncommand="SocialShare.showDirectory()"/> |
310 + oncommand="SocialShare.showDirectory()"/> |
307 + </arrowscrollbox> |
311 + </arrowscrollbox> |
308 + </vbox> |
312 + </hbox> |
|
313 + <hbox id="share-container" flex="1"/> |
309 + </panel> |
314 + </panel> |
310 + |
315 + |
311 + <panel id="social-notification-panel" |
316 + <panel id="social-notification-panel" |
312 + class="social-panel" |
317 + class="social-panel" |
313 + type="arrow" |
318 + type="arrow" |
726 + CAVEAT EMPTOR |
730 + CAVEAT EMPTOR |
727 + Should you need to add items to the toolbar here, make sure to also add them |
731 + Should you need to add items to the toolbar here, make sure to also add them |
728 + to the default placements of buttons in CustomizableUI.jsm, so the |
732 + to the default placements of buttons in CustomizableUI.jsm, so the |
729 + customization code doesn't get confused. |
733 + customization code doesn't get confused. |
730 + --> |
734 + --> |
731 + <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" |
735 + <toolbar id="nav-bar" |
732 + aria-label="&navbarCmd.label;" |
736 + aria-label="&navbarCmd.label;" |
733 + fullscreentoolbar="true" mode="icons" customizable="true" |
737 + fullscreentoolbar="true" mode="icons" customizable="true" |
734 + iconsize="small" |
738 + iconsize="small" |
735 +#ifdef MOZ_DEV_EDITION |
739 +#ifdef MOZ_DEV_EDITION |
736 + defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button,loop-button" |
740 + defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button,loop-button" |
1298 default="true" |
1302 default="true" |
1299 oncommand="StarUI.panel.hidePopup();"/> |
1303 oncommand="StarUI.panel.hidePopup();"/> |
1300 <button id="editBookmarkPanelDeleteButton" |
1304 <button id="editBookmarkPanelDeleteButton" |
1301 class="editBookmarkPanelBottomButton" |
1305 class="editBookmarkPanelBottomButton" |
1302 label="&editBookmark.cancel.label;" |
1306 label="&editBookmark.cancel.label;" |
1303 @@ -1198,17 +1198,17 @@ |
1307 @@ -1202,17 +1202,17 @@ |
1304 |
1308 |
1305 <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1309 <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1306 <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
1310 <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
1307 <vbox id="full-screen-warning-message" align="center"> |
1311 <vbox id="full-screen-warning-message" align="center"> |
1308 <description id="full-screen-domain-text"/> |
1312 <description id="full-screen-domain-text"/> |
1334 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1338 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1335 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1339 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1336 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1340 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1337 * content/browser/chatWindow.xul (content/chatWindow.xul) |
1341 * content/browser/chatWindow.xul (content/chatWindow.xul) |
1338 content/browser/content.js (content/content.js) |
1342 content/browser/content.js (content/content.js) |
1339 content/browser/content-UITour.js (content/content-UITour.js) |
|
1340 content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg) |
1343 content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg) |
1341 content/browser/defaultthemes/1.header.jpg (content/defaultthemes/1.header.jpg) |
1344 content/browser/defaultthemes/1.header.jpg (content/defaultthemes/1.header.jpg) |
1342 content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg) |
1345 content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg) |
1343 content/browser/defaultthemes/1.preview.jpg (content/defaultthemes/1.preview.jpg) |
1346 content/browser/defaultthemes/1.preview.jpg (content/defaultthemes/1.preview.jpg) |
|
1347 content/browser/defaultthemes/2.footer.jpg (content/defaultthemes/2.footer.jpg) |
1344 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1348 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1345 --- a/browser/components/build/nsModule.cpp |
1349 --- a/browser/components/build/nsModule.cpp |
1346 +++ b/browser/components/build/nsModule.cpp |
1350 +++ b/browser/components/build/nsModule.cpp |
1347 @@ -8,17 +8,17 @@ |
1351 @@ -8,17 +8,17 @@ |
1348 #include "nsBrowserCompsCID.h" |
1352 #include "nsBrowserCompsCID.h" |
1425 // In Windows 8 we launch the control panel since it's the only |
1429 // In Windows 8 we launch the control panel since it's the only |
1426 // way to get all file type association prefs. So we don't know |
1430 // way to get all file type association prefs. So we don't know |
1427 // when the user will select the default. We refresh here periodically |
1431 // when the user will select the default. We refresh here periodically |
1428 // in case the default changes. On other Windows OS's defaults can also |
1432 // in case the default changes. On other Windows OS's defaults can also |
1429 // be set while the prefs are open. |
1433 // be set while the prefs are open. |
1430 @@ -572,16 +578,27 @@ var gMainPane = { |
1434 @@ -549,16 +555,27 @@ var gMainPane = { |
1431 */ |
1435 */ |
1432 setDefaultBrowser: function() |
1436 setDefaultBrowser: function() |
1433 { |
1437 { |
1434 let shellSvc = getShellService(); |
1438 let shellSvc = getShellService(); |
1435 if (!shellSvc) |
1439 if (!shellSvc) |
1893 + |
1897 + |
1894 +#endif // nsunixshellservice_h____ |
1898 +#endif // nsunixshellservice_h____ |
1895 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1899 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1896 --- a/browser/installer/package-manifest.in |
1900 --- a/browser/installer/package-manifest.in |
1897 +++ b/browser/installer/package-manifest.in |
1901 +++ b/browser/installer/package-manifest.in |
1898 @@ -689,19 +689,21 @@ |
1902 @@ -688,19 +688,21 @@ |
1899 @RESPATH@/defaults/autoconfig/prefcalls.js |
1903 @RESPATH@/defaults/autoconfig/prefcalls.js |
1900 @RESPATH@/browser/defaults/profile/prefs.js |
1904 @RESPATH@/browser/defaults/profile/prefs.js |
1901 |
1905 |
1902 #ifndef LIBXUL_SDK |
1906 #ifndef LIBXUL_SDK |
1903 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1907 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |