409 + flip="slide"> |
409 + flip="slide"> |
410 + <hbox class="sync-panel-outer"> |
410 + <hbox class="sync-panel-outer"> |
411 + <image class="sync-panel-icon"/> |
411 + <image class="sync-panel-icon"/> |
412 + <vbox class="sync-panel-inner"> |
412 + <vbox class="sync-panel-inner"> |
413 + <description id="sync-start-panel-title" |
413 + <description id="sync-start-panel-title" |
414 + value="&syncStartPanel.heading;"/> |
414 + value="&syncStartPanel2.heading;"/> |
415 + <description id="sync-start-panel-subtitle"> |
415 + <description id="sync-start-panel-subtitle" |
416 +#ifdef XP_UNIX |
416 + value="&syncStartPanel2.subTitle;"/> |
417 + &syncStartPanel.subTitleUnix; |
|
418 +#else |
|
419 + &syncStartPanel.subTitle; |
|
420 +#endif |
|
421 + </description> |
|
422 + </vbox> |
417 + </vbox> |
423 + </hbox> |
418 + </hbox> |
424 + </panel> |
419 + </panel> |
425 + |
420 + |
426 + <!-- Sync Error Panel --> |
421 + <!-- Sync Error Panel --> |
506 + <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/> |
501 + <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/> |
507 + <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/> |
502 + <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/> |
508 + </hbox> |
503 + </hbox> |
509 + </hbox> |
504 + </hbox> |
510 +#ifdef XP_MACOSX |
505 +#ifdef XP_MACOSX |
511 + <hbox id="titlebar-fullscreen-button"/> |
506 + <!-- OS X does not natively support RTL for its titlebar items, so we prevent this secondary |
|
507 + buttonbox from reversing order in RTL by forcing an LTR direction. --> |
|
508 + <hbox id="titlebar-secondary-buttonbox" dir="ltr"> |
|
509 + <hbox class="private-browsing-indicator"/> |
|
510 + <hbox id="titlebar-fullscreen-button"/> |
|
511 + </hbox> |
512 +#endif |
512 +#endif |
513 + </hbox> |
513 + </hbox> |
514 +</vbox> |
514 +</vbox> |
515 +#endif |
515 +#endif |
516 + |
516 + |
610 + command="cmd_close" |
610 + command="cmd_close" |
611 + label="&closeTab.label;" |
611 + label="&closeTab.label;" |
612 + cui-areatype="toolbar" |
612 + cui-areatype="toolbar" |
613 + tooltiptext="&closeTab.label;"/> |
613 + tooltiptext="&closeTab.label;"/> |
614 + |
614 + |
615 +#ifdef XP_WIN |
615 +#if !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_QT) |
616 + <hbox class="private-browsing-indicator" skipintoolbarset="true" ordinal="1000"/> |
616 + <hbox class="private-browsing-indicator" skipintoolbarset="true"/> |
617 +#endif |
617 +#endif |
618 +#ifdef CAN_DRAW_IN_TITLEBAR |
618 +#ifdef CAN_DRAW_IN_TITLEBAR |
619 + <hbox class="titlebar-placeholder" type="caption-buttons" |
619 + <hbox class="titlebar-placeholder" type="caption-buttons" |
620 + id="titlebar-placeholder-on-TabsToolbar-for-captions-buttons" persist="width" |
620 + id="titlebar-placeholder-on-TabsToolbar-for-captions-buttons" persist="width" |
621 +#ifndef XP_MACOSX |
621 +#ifndef XP_MACOSX |
707 + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/> |
707 + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/> |
708 + <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/> |
708 + <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/> |
709 + <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> |
709 + <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> |
710 + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
710 + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
711 + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
711 + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
|
712 + <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon" role="button"/> |
|
713 + <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon" role="button"/> |
712 + <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/> |
714 + <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/> |
713 + <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/> |
715 + <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/> |
714 + </box> |
716 + </box> |
715 + <!-- Use onclick instead of normal popup= syntax since the popup |
717 + <!-- Use onclick instead of normal popup= syntax since the popup |
716 + code fires onmousedown, and hence eats our favicon drag events. |
718 + code fires onmousedown, and hence eats our favicon drag events. |
1104 + type="checkbox" |
1106 + type="checkbox" |
1105 + autocheck="false" |
1107 + autocheck="false" |
1106 + command="Social:ToggleNotifications" |
1108 + command="Social:ToggleNotifications" |
1107 + label="&social.toggleNotifications.label;" |
1109 + label="&social.toggleNotifications.label;" |
1108 + accesskey="&social.toggleNotifications.accesskey;"/> |
1110 + accesskey="&social.toggleNotifications.accesskey;"/> |
1109 + <menuitem class="social-toggle-menuitem" command="Social:Toggle"/> |
|
1110 + <menuseparator/> |
1111 + <menuseparator/> |
1111 + <menuseparator class="social-provider-menu" hidden="true"/> |
1112 + <menuseparator class="social-provider-menu" hidden="true"/> |
1112 + <menuitem class="social-addons-menuitem" command="Social:Addons" |
1113 + <menuitem class="social-addons-menuitem" command="Social:Addons" |
1113 + label="&social.addons.label;"/> |
1114 + label="&social.addons.label;"/> |
1114 + <menuitem label="&social.learnMore.label;" |
1115 + <menuitem label="&social.learnMore.label;" |
1189 + </vbox> |
1190 + </vbox> |
1190 + |
1191 + |
1191 + <svg:svg height="0"> |
1192 + <svg:svg height="0"> |
1192 +#include tab-shape.inc.svg |
1193 +#include tab-shape.inc.svg |
1193 + |
1194 + |
1194 +#ifndef XP_UNIX |
1195 +#ifndef XP_MACOSX |
1195 + <svg:clipPath id="windows-keyhole-forward-clip-path" clipPathUnits="userSpaceOnUse"> |
1196 + <svg:clipPath id="keyhole-forward-clip-path" clipPathUnits="objectBoundingBox"> |
1196 + <svg:path d="M 0,0 a 16 16 0 0 1 0,24 l 10000,0 l 0,-24 l -10000,0 z"/> |
1197 + <svg:path d="m 0,0 c .3,.25 .3,.75, 0,1 l 1,0 0,-1 z"/> |
1197 + </svg:clipPath> |
1198 + </svg:clipPath> |
1198 + <svg:clipPath id="windows-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse"> |
1199 + <svg:clipPath id="urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse"> |
1199 + <svg:path d="M -1,1 a 16 16 0 0 1 0,24 l 10000,0 l 0,-24 l -10000,0 z"/> |
1200 + <svg:path d="m 0,-5 l 0,7.8 c 2.5,3.2 4,6.2 4,10.2 c 0,4 -1.5,7 -4,10 l 0,22l10000,0 l 0,-50 l -10000,0 z"/> |
1200 + </svg:clipPath> |
1201 + </svg:clipPath> |
1201 +#endif |
1202 +#else |
1202 +#ifdef XP_MACOSX |
|
1203 + <svg:clipPath id="osx-keyhole-forward-clip-path" clipPathUnits="userSpaceOnUse"> |
1203 + <svg:clipPath id="osx-keyhole-forward-clip-path" clipPathUnits="userSpaceOnUse"> |
1204 + <svg:path d="M 0,0 a 16 16 0 0 1 0,24 l 10000,0 l 0,-24 l -10000,0 z"/> |
1204 + <svg:path d="M 0,0 a 16 16 0 0 1 0,24 l 10000,0 l 0,-24 l -10000,0 z"/> |
1205 + </svg:clipPath> |
1205 + </svg:clipPath> |
1206 + <svg:clipPath id="osx-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse"> |
1206 + <svg:clipPath id="osx-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse"> |
1207 + <svg:path d="M -12,-5 a 16 16 0 0 1 0,34 l 10000,0 l 0,-34 l -10000,0 z"/> |
1207 + <svg:path d="M -12,-5 a 16 16 0 0 1 0,34 l 10000,0 l 0,-34 l -10000,0 z"/> |
1799 + |
1799 + |
1800 +#endif // nsunixshellservice_h____ |
1800 +#endif // nsunixshellservice_h____ |
1801 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1801 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1802 --- a/browser/installer/package-manifest.in |
1802 --- a/browser/installer/package-manifest.in |
1803 +++ b/browser/installer/package-manifest.in |
1803 +++ b/browser/installer/package-manifest.in |
1804 @@ -654,19 +654,21 @@ |
1804 @@ -641,19 +641,21 @@ |
1805 @BINPATH@/defaults/autoconfig/prefcalls.js |
1805 @BINPATH@/defaults/autoconfig/prefcalls.js |
1806 @BINPATH@/browser/defaults/profile/prefs.js |
1806 @BINPATH@/browser/defaults/profile/prefs.js |
1807 |
1807 |
1808 #ifndef LIBXUL_SDK |
1808 #ifndef LIBXUL_SDK |
1809 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1809 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |