| changeset 650 | e8c83b144fd1 |
| parent 642 | b30da62025bc |
| child 653 | 38c67b6b2f37 |
| 649:de1740022f78 | 650:e8c83b144fd1 |
|---|---|
1 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul |
1 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul |
2 new file mode 100644 |
2 new file mode 100644 |
3 --- /dev/null |
3 --- /dev/null |
4 +++ b/browser/base/content/browser-kde.xul |
4 +++ b/browser/base/content/browser-kde.xul |
5 @@ -0,0 +1,1216 @@ |
5 @@ -0,0 +1,1225 @@ |
6 +#filter substitution |
6 +#filter substitution |
7 +<?xml version="1.0"?> |
7 +<?xml version="1.0"?> |
8 +# -*- Mode: HTML -*- |
8 +# -*- Mode: HTML -*- |
9 +# |
9 +# |
10 +# This Source Code Form is subject to the terms of the Mozilla Public |
10 +# This Source Code Form is subject to the terms of the Mozilla Public |
117 + of this menupopup --> |
117 + of this menupopup --> |
118 + <menupopup id="backForwardMenu" |
118 + <menupopup id="backForwardMenu" |
119 + onpopupshowing="return FillHistoryMenu(event.target);" |
119 + onpopupshowing="return FillHistoryMenu(event.target);" |
120 + oncommand="gotoHistoryIndex(event); event.stopPropagation();" |
120 + oncommand="gotoHistoryIndex(event); event.stopPropagation();" |
121 + onclick="checkForMiddleClick(this, event);"/> |
121 + onclick="checkForMiddleClick(this, event);"/> |
122 + <tooltip id="aHTMLTooltip" onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);"/> |
122 + <tooltip id="aHTMLTooltip" page="true"/> |
123 + |
123 + |
124 + <!-- for search and content formfill/pw manager --> |
124 + <!-- for search and content formfill/pw manager --> |
125 + <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/> |
125 + <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/> |
126 + |
126 + |
127 + <!-- for url bar autocomplete --> |
127 + <!-- for url bar autocomplete --> |
453 + <separator class="thin"/> |
453 + <separator class="thin"/> |
454 + <label id="geolocation-learnmore-link" class="text-link"/> |
454 + <label id="geolocation-learnmore-link" class="text-link"/> |
455 + </popupnotificationcontent> |
455 + </popupnotificationcontent> |
456 + </popupnotification> |
456 + </popupnotification> |
457 + |
457 + |
458 + <popupnotification id="pointerLock-notification" hidden="true"> |
|
459 + <popupnotificationcontent orient="vertical" align="start"> |
|
460 + <separator class="thin"/> |
|
461 + <label id="pointerLock-cancel" value="&pointerLock.notification.message;"/> |
|
462 + </popupnotificationcontent> |
|
463 + </popupnotification> |
|
464 + |
|
458 + <popupnotification id="mixed-content-blocked-notification" hidden="true"> |
465 + <popupnotification id="mixed-content-blocked-notification" hidden="true"> |
459 + <popupnotificationcontent orient="vertical" align="start"> |
466 + <popupnotificationcontent orient="vertical" align="start"> |
460 + <separator/> |
467 + <separator/> |
461 + <description id="mixed-content-blocked-moreinfo">&mixedContentBlocked.moreinfo;</description> |
468 + <description id="mixed-content-blocked-moreinfo">&mixedContentBlocked.moreinfo;</description> |
462 + <separator/> |
469 + <separator/> |
578 + <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/> |
585 + <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/> |
579 + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> |
586 + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> |
580 + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
587 + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
581 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> |
588 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> |
582 + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
589 + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
590 + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/> |
|
583 + <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
591 + <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
584 + <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> |
592 + <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> |
585 + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
593 + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
586 + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
594 + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
595 + <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/> |
|
587 + </box> |
596 + </box> |
588 + <!-- Use onclick instead of normal popup= syntax since the popup |
597 + <!-- Use onclick instead of normal popup= syntax since the popup |
589 + code fires onmousedown, and hence eats our favicon drag events. |
598 + code fires onmousedown, and hence eats our favicon drag events. |
590 + We only add the identity-box button to the tab order when the location bar |
599 + We only add the identity-box button to the tab order when the location bar |
591 + has focus, otherwise pressing F6 focuses it instead of the location bar --> |
600 + has focus, otherwise pressing F6 focuses it instead of the location bar --> |
715 + type="checkbox" |
724 + type="checkbox" |
716 + autocheck="false" |
725 + autocheck="false" |
717 + command="Social:ToggleNotifications" |
726 + command="Social:ToggleNotifications" |
718 + label="&social.toggleNotifications.label;" |
727 + label="&social.toggleNotifications.label;" |
719 + accesskey="&social.toggleNotifications.accesskey;"/> |
728 + accesskey="&social.toggleNotifications.accesskey;"/> |
729 + <menuitem class="social-toggle-menuitem" command="Social:Toggle"/> |
|
720 + <menuseparator class="social-statusarea-separator"/> |
730 + <menuseparator class="social-statusarea-separator"/> |
721 + <menuseparator class="social-provider-menu" hidden="true"/> |
731 + <menuseparator class="social-provider-menu" hidden="true"/> |
722 + <menuitem class="social-toggle-menuitem" command="Social:Toggle"/> |
732 + <menuitem class="social-addons-menuitem" command="Social:Addons" |
723 + <menuitem class="social-remove-menuitem" command="Social:Remove"/> |
733 + label="&social.addons.label;"/> |
724 + </menupopup> |
734 + </menupopup> |
725 + </toolbarbutton> |
735 + </toolbarbutton> |
726 + </toolbaritem> |
736 + </toolbaritem> |
727 + |
737 + |
728 + <toolbaritem id="bookmarks-menu-button-container" |
738 + <toolbaritem id="bookmarks-menu-button-container" |
959 +#endif |
969 +#endif |
960 + </toolbar> |
970 + </toolbar> |
961 + |
971 + |
962 + <toolbarpalette id="BrowserToolbarPalette"> |
972 + <toolbarpalette id="BrowserToolbarPalette"> |
963 + |
973 + |
964 +# Update primaryToolbarButtons in browser/themes/browserShared.inc when adding |
974 +# Update primaryToolbarButtons in browser/themes/shared/browser.inc when adding |
965 +# or removing default items with the toolbarbutton-1 class. |
975 +# or removing default items with the toolbarbutton-1 class. |
966 + |
976 + |
967 + <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
977 + <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
968 + label="&printButton.label;" command="cmd_print" |
978 + label="&printButton.label;" command="cmd_print" |
969 + tooltiptext="&printButton.tooltip;"/> |
979 + tooltiptext="&printButton.tooltip;"/> |
1086 + <vbox id="appcontent" flex="1"> |
1096 + <vbox id="appcontent" flex="1"> |
1087 + <tabbrowser id="content" disablehistory="true" |
1097 + <tabbrowser id="content" disablehistory="true" |
1088 + flex="1" contenttooltip="aHTMLTooltip" |
1098 + flex="1" contenttooltip="aHTMLTooltip" |
1089 + tabcontainer="tabbrowser-tabs" |
1099 + tabcontainer="tabbrowser-tabs" |
1090 + contentcontextmenu="contentAreaContextMenu" |
1100 + contentcontextmenu="contentAreaContextMenu" |
1091 + autocompletepopup="PopupAutoComplete" |
1101 + autocompletepopup="PopupAutoComplete"/> |
1092 + onclick="contentAreaClick(event, false);"/> |
|
1093 + <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/> |
1102 + <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/> |
1094 + <statuspanel id="statusbar-display" inactive="true"/> |
1103 + <statuspanel id="statusbar-display" inactive="true"/> |
1095 + </vbox> |
1104 + </vbox> |
1096 + <splitter id="social-sidebar-splitter" |
1105 + <splitter id="social-sidebar-splitter" |
1097 + class="chromeclass-extrachrome sidebar-splitter" |
1106 + class="chromeclass-extrachrome sidebar-splitter" |
1102 + persist="width"> |
1111 + persist="width"> |
1103 + <browser id="social-sidebar-browser" |
1112 + <browser id="social-sidebar-browser" |
1104 + type="content" |
1113 + type="content" |
1105 + context="contentAreaContextMenu" |
1114 + context="contentAreaContextMenu" |
1106 + disableglobalhistory="true" |
1115 + disableglobalhistory="true" |
1107 + tooltip="aHTMLTooltip" |
1116 + tooltip="aHTMLTooltip" |
1108 + flex="1" |
1117 + flex="1" |
1109 + style="min-width: 14em; width: 18em; max-width: 36em;"/> |
1118 + style="min-width: 14em; width: 18em; max-width: 36em;"/> |
1110 + </vbox> |
1119 + </vbox> |
1111 + <vbox id="browser-border-end" hidden="true" layer="true"/> |
1120 + <vbox id="browser-border-end" hidden="true" layer="true"/> |
1112 + </hbox> |
1121 + </hbox> |
1179 + </toolbar> |
1188 + </toolbar> |
1180 + </vbox> |
1189 + </vbox> |
1181 + |
1190 + |
1182 +#ifndef XP_UNIX |
1191 +#ifndef XP_UNIX |
1183 + <svg:svg height="0"> |
1192 + <svg:svg height="0"> |
1184 + <svg:clipPath id="winstripe-keyhole-forward-clip-path" clipPathUnits="objectBoundingBox"> |
1193 + <svg:clipPath id="windows-keyhole-forward-clip-path" clipPathUnits="objectBoundingBox"> |
1185 + <svg:path d="M 0,0 C 0.16,0.11 0.28,0.29 0.28,0.5 0.28,0.71 0.16,0.89 0,1 L 1,1 1,0 0,0 z"/> |
1194 + <svg:path d="M 0,0 C 0.16,0.11 0.28,0.29 0.28,0.5 0.28,0.71 0.16,0.89 0,1 L 1,1 1,0 0,0 z"/> |
1186 + </svg:clipPath> |
1195 + </svg:clipPath> |
1187 + <svg:clipPath id="winstripe-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse"> |
1196 + <svg:clipPath id="windows-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse"> |
1188 + <svg:path d="M 0,0 0,7.8 C 2.5,11 4,14 4,18 4,22 2.5,25 0,28 l 0,22 10000,0 0,-50 L 0,0 z"/> |
1197 + <svg:path d="M 0,0 0,7.8 C 2.5,11 4,14 4,18 4,22 2.5,25 0,28 l 0,22 10000,0 0,-50 L 0,0 z"/> |
1189 + </svg:clipPath> |
1198 + </svg:clipPath> |
1190 + </svg:svg> |
1199 + </svg:svg> |
1191 +#endif |
1200 +#endif |
1192 +#ifdef XP_MACOSX |
1201 +#ifdef XP_MACOSX |
1193 + <svg:svg height="0"> |
1202 + <svg:svg height="0"> |
1194 + <svg:clipPath id="pinstripe-keyhole-forward-clip-path" clipPathUnits="objectBoundingBox"> |
1203 + <svg:clipPath id="osx-keyhole-forward-clip-path" clipPathUnits="objectBoundingBox"> |
1195 + <svg:path d="M 0,0 C 0.15,0.12 0.25,0.3 0.25,0.5 0.25,0.7 0.15,0.88 0,1 L 1,1 1,0 0,0 z"/> |
1204 + <svg:path d="M 0,0 C 0.15,0.12 0.25,0.3 0.25,0.5 0.25,0.7 0.15,0.88 0,1 L 1,1 1,0 0,0 z"/> |
1196 + </svg:clipPath> |
1205 + </svg:clipPath> |
1197 + <svg:clipPath id="pinstripe-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse"> |
1206 + <svg:clipPath id="osx-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse"> |
1198 + <svg:path d="m 0,-5 0,4.03 C 3.6,1.8 6,6.1 6,11 6,16 3.6,20 0,23 l 0,27 10000,0 0,-55 L 0,-5 z"/> |
1207 + <svg:path d="m 0,-5 0,4.03 C 3.6,1.8 6,6.1 6,11 6,16 3.6,20 0,23 l 0,27 10000,0 0,-55 L 0,-5 z"/> |
1199 + </svg:clipPath> |
1208 + </svg:clipPath> |
1200 + <svg:clipPath id="pinstripe-tab-ontop-left-curve-clip-path" clipPathUnits="userSpaceOnUse"> |
1209 + <svg:clipPath id="osx-tab-ontop-left-curve-clip-path" clipPathUnits="userSpaceOnUse"> |
1201 + <svg:path d="M 9,0 C 7.3,0 6,1.3 6,3 l 0,14 c 0,3 -2.2,5 -5,5 l -1,0 0,1 12,0 0,-1 0,-19 0,-3 -3,0 z"/> |
1210 + <svg:path d="M 9,0 C 7.3,0 6,1.3 6,3 l 0,14 c 0,3 -2.2,5 -5,5 l -1,0 0,1 12,0 0,-1 0,-19 0,-3 -3,0 z"/> |
1202 + </svg:clipPath> |
1211 + </svg:clipPath> |
1203 + <svg:clipPath id="pinstripe-tab-ontop-right-curve-clip-path" clipPathUnits="userSpaceOnUse"> |
1212 + <svg:clipPath id="osx-tab-ontop-right-curve-clip-path" clipPathUnits="userSpaceOnUse"> |
1204 + <svg:path d="m 0,0 0,3 0,19 0,1 12,0 0,-1 -1,0 C 8.2,22 6,20 6,17 L 6,3 C 6,1.3 4.7,0 3,0 L 0,0 z"/> |
1213 + <svg:path d="m 0,0 0,3 0,19 0,1 12,0 0,-1 -1,0 C 8.2,22 6,20 6,17 L 6,3 C 6,1.3 4.7,0 3,0 L 0,0 z"/> |
1205 + </svg:clipPath> |
1214 + </svg:clipPath> |
1206 + <svg:clipPath id="pinstripe-tab-onbottom-left-curve-clip-path" clipPathUnits="userSpaceOnUse"> |
1215 + <svg:clipPath id="osx-tab-onbottom-left-curve-clip-path" clipPathUnits="userSpaceOnUse"> |
1207 + <svg:path d="m 0,0 0,1 1,0 c 2.8,0 5,2.2 5,5 l 0,14 c 0,2 1.3,3 3,3 l 3,0 0,-3 L 12,1 12,0 0,0 z"/> |
1216 + <svg:path d="m 0,0 0,1 1,0 c 2.8,0 5,2.2 5,5 l 0,14 c 0,2 1.3,3 3,3 l 3,0 0,-3 L 12,1 12,0 0,0 z"/> |
1208 + </svg:clipPath> |
1217 + </svg:clipPath> |
1209 + <svg:clipPath id="pinstripe-tab-onbottom-right-curve-clip-path" clipPathUnits="userSpaceOnUse"> |
1218 + <svg:clipPath id="osx-tab-onbottom-right-curve-clip-path" clipPathUnits="userSpaceOnUse"> |
1210 + <svg:path d="m 0,0 0,1 0,19 0,3 3,0 c 1.7,0 3,-1 3,-3 L 6,6 C 6,3.2 8.2,1 11,1 L 12,1 12,0 0,0 z"/> |
1219 + <svg:path d="m 0,0 0,1 0,19 0,3 3,0 c 1.7,0 3,-1 3,-3 L 6,6 C 6,3.2 8.2,1 11,1 L 12,1 12,0 0,0 z"/> |
1211 + </svg:clipPath> |
1220 + </svg:clipPath> |
1212 + </svg:svg> |
1221 + </svg:svg> |
1213 +#endif |
1222 +#endif |
1214 + |
1223 + |
1354 #endif |
1363 #endif |
1355 }; |
1364 }; |
1356 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in |
1365 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in |
1357 --- a/browser/components/shell/src/Makefile.in |
1366 --- a/browser/components/shell/src/Makefile.in |
1358 +++ b/browser/components/shell/src/Makefile.in |
1367 +++ b/browser/components/shell/src/Makefile.in |
1359 @@ -17,17 +17,18 @@ USE_STATIC_LIBS = 1 |
1368 @@ -15,17 +15,18 @@ USE_STATIC_LIBS = 1 |
1360 |
1369 |
1361 ifeq ($(OS_ARCH),WINNT) |
1370 ifeq ($(OS_ARCH),WINNT) |
1362 CPPSRCS = nsWindowsShellService.cpp |
1371 CPPSRCS = nsWindowsShellService.cpp |
1363 else |
1372 else |
1364 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) |
1373 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) |
1787 + |
1796 + |
1788 +#endif // nsunixshellservice_h____ |
1797 +#endif // nsunixshellservice_h____ |
1789 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1798 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1790 --- a/browser/installer/package-manifest.in |
1799 --- a/browser/installer/package-manifest.in |
1791 +++ b/browser/installer/package-manifest.in |
1800 +++ b/browser/installer/package-manifest.in |
1792 @@ -588,19 +588,21 @@ |
1801 @@ -602,19 +602,21 @@ |
1793 @BINPATH@/defaults/autoconfig/prefcalls.js |
1802 @BINPATH@/defaults/autoconfig/prefcalls.js |
1794 @BINPATH@/browser/defaults/profile/prefs.js |
1803 @BINPATH@/browser/defaults/profile/prefs.js |
1795 |
1804 |
1796 #ifndef LIBXUL_SDK |
1805 #ifndef LIBXUL_SDK |
1797 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1806 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |