552 + customizable="true" |
552 + customizable="true" |
553 + mode="icons" |
553 + mode="icons" |
554 + iconsize="small" |
554 + iconsize="small" |
555 + aria-label="&tabsToolbar.label;" |
555 + aria-label="&tabsToolbar.label;" |
556 + context="toolbar-context-menu" |
556 + context="toolbar-context-menu" |
557 + defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton" |
557 + defaultset="tabbrowser-tabs,new-tab-button,alltabs-button" |
558 + collapsed="true"> |
558 + collapsed="true"> |
559 + |
559 + |
560 +#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT) |
560 +#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT) |
561 + <hbox id="private-browsing-indicator" |
561 + <hbox id="private-browsing-indicator" |
562 + skipintoolbarset="true"/> |
562 + skipintoolbarset="true"/> |
603 + observes="tabviewGroupsNumber"/> |
603 + observes="tabviewGroupsNumber"/> |
604 + <menuseparator id="alltabs-popup-separator"/> |
604 + <menuseparator id="alltabs-popup-separator"/> |
605 + </menupopup> |
605 + </menupopup> |
606 + </toolbarbutton> |
606 + </toolbarbutton> |
607 + |
607 + |
608 + <toolbarbutton id="tabs-closebutton" |
|
609 + class="close-button tabs-closebutton close-icon" |
|
610 + command="cmd_close" |
|
611 + label="&closeTab.label;" |
|
612 + cui-areatype="toolbar" |
|
613 + tooltiptext="&closeTab.label;"/> |
|
614 + |
|
615 +#if !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_QT) |
608 +#if !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_QT) |
616 + <hbox class="private-browsing-indicator" skipintoolbarset="true"/> |
609 + <hbox class="private-browsing-indicator" skipintoolbarset="true"/> |
617 +#endif |
610 +#endif |
618 +#ifdef CAN_DRAW_IN_TITLEBAR |
611 +#ifdef CAN_DRAW_IN_TITLEBAR |
619 + <hbox class="titlebar-placeholder" type="caption-buttons" |
612 + <hbox class="titlebar-placeholder" type="caption-buttons" |
649 + overflowpanel="widget-overflow" |
642 + overflowpanel="widget-overflow" |
650 + context="toolbar-context-menu"> |
643 + context="toolbar-context-menu"> |
651 + |
644 + |
652 + <hbox id="nav-bar-customization-target" flex="1"> |
645 + <hbox id="nav-bar-customization-target" flex="1"> |
653 + <toolbaritem id="urlbar-container" flex="400" persist="width" |
646 + <toolbaritem id="urlbar-container" flex="400" persist="width" |
654 + forwarddisabled="true" title="&locationItem.title;" removable="false" |
647 + title="&locationItem.title;" removable="false" |
655 + cui-areatype="toolbar" |
648 + cui-areatype="toolbar" |
656 + class="chromeclass-location" overflows="false"> |
649 + class="chromeclass-location" overflows="false"> |
657 + <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
650 + <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
658 + label="&backCmd.label;" |
651 + label="&backCmd.label;" |
659 + command="Browser:BackOrBackDuplicate" |
652 + command="Browser:BackOrBackDuplicate" |
660 + cui-areatype="toolbar" |
653 + cui-areatype="toolbar" |
661 + onclick="checkForMiddleClick(this, event);" |
654 + onclick="checkForMiddleClick(this, event);" |
662 + tooltip="back-button-tooltip" |
655 + tooltip="back-button-tooltip" |
663 + context="backForwardMenu"/> |
656 + context="backForwardMenu"/> |
664 + <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
657 + <hbox id="urlbar-wrapper" flex="1"> |
665 + label="&forwardCmd.label;" |
658 + <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
666 + command="Browser:ForwardOrForwardDuplicate" |
659 + label="&forwardCmd.label;" |
667 + cui-areatype="toolbar" |
660 + command="Browser:ForwardOrForwardDuplicate" |
668 + onclick="checkForMiddleClick(this, event);" |
661 + cui-areatype="toolbar" |
669 + tooltip="forward-button-tooltip" |
662 + onclick="checkForMiddleClick(this, event);" |
670 + context="backForwardMenu"/> |
663 + tooltip="forward-button-tooltip" |
671 + <dummyobservertarget hidden="true" |
664 + context="backForwardMenu"/> |
672 + onbroadcast="if (this.getAttribute('disabled') == 'true') |
|
673 + this.parentNode.setAttribute('forwarddisabled', 'true'); |
|
674 + else |
|
675 + this.parentNode.removeAttribute('forwarddisabled');"> |
|
676 + <observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/> |
|
677 + </dummyobservertarget> |
|
678 + <hbox id="urlbar-wrapper" flex="1" align="center"> |
|
679 + <textbox id="urlbar" flex="1" |
665 + <textbox id="urlbar" flex="1" |
680 + placeholder="&urlbar.placeholder2;" |
666 + placeholder="&urlbar.placeholder2;" |
681 + type="autocomplete" |
667 + type="autocomplete" |
682 + autocompletesearch="urlinline history" |
668 + autocompletesearch="urlinline history" |
683 + autocompletesearchparam="enable-actions" |
669 + autocompletesearchparam="enable-actions" |
711 + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
697 + <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"/> |
698 + <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"/> |
699 + <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon" role="button"/> |
714 + <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/> |
700 + <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/> |
715 + <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/> |
701 + <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/> |
|
702 + <image id="translate-notification-icon" class="notification-anchor-icon" role="button"/> |
|
703 + <image id="translated-notification-icon" class="notification-anchor-icon" role="button"/> |
716 + </box> |
704 + </box> |
717 + <!-- Use onclick instead of normal popup= syntax since the popup |
705 + <!-- Use onclick instead of normal popup= syntax since the popup |
718 + code fires onmousedown, and hence eats our favicon drag events. |
706 + code fires onmousedown, and hence eats our favicon drag events. |
719 + We only add the identity-box button to the tab order when the location bar |
707 + We only add the identity-box button to the tab order when the location bar |
720 + has focus, otherwise pressing F6 focuses it instead of the location bar --> |
708 + has focus, otherwise pressing F6 focuses it instead of the location bar --> |
808 + label="&viewBookmarksSidebar2.label;" |
796 + label="&viewBookmarksSidebar2.label;" |
809 + type="checkbox" |
797 + type="checkbox" |
810 + oncommand="toggleSidebar('viewBookmarksSidebar');"> |
798 + oncommand="toggleSidebar('viewBookmarksSidebar');"> |
811 + <observes element="viewBookmarksSidebar" attribute="checked"/> |
799 + <observes element="viewBookmarksSidebar" attribute="checked"/> |
812 + </menuitem> |
800 + </menuitem> |
|
801 + <!-- NB: temporary solution for bug 985024, this should go away soon. --> |
|
802 + <menuitem id="BMB_bookmarksShowAllTop" |
|
803 + class="menuitem-iconic subviewbutton" |
|
804 + label="&showAllBookmarks2.label;" |
|
805 + command="Browser:ShowAllBookmarks" |
|
806 + key="manBookmarkKb"/> |
813 + <menuseparator/> |
807 + <menuseparator/> |
814 + <menuitem id="BMB_subscribeToPageMenuitem" |
808 + <menuitem id="BMB_subscribeToPageMenuitem" |
815 +#ifndef XP_MACOSX |
809 +#ifndef XP_MACOSX |
816 + class="menuitem-iconic subviewbutton" |
810 + class="menuitem-iconic subviewbutton" |
817 +#else |
811 +#else |
959 + defaultset="personal-bookmarks" |
953 + defaultset="personal-bookmarks" |
960 + toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;" |
954 + toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;" |
961 + collapsed="true" |
955 + collapsed="true" |
962 + customizable="true"> |
956 + customizable="true"> |
963 + <toolbaritem id="personal-bookmarks" |
957 + <toolbaritem id="personal-bookmarks" |
964 + flex="1" |
|
965 + title="&bookmarksToolbarItem.label;" |
958 + title="&bookmarksToolbarItem.label;" |
966 + cui-areatype="toolbar" |
959 + cui-areatype="toolbar" |
967 + removable="true"> |
960 + removable="true"> |
968 + <toolbarbutton id="bookmarks-toolbar-placeholder" |
961 + <toolbarbutton id="bookmarks-toolbar-placeholder" |
969 + class="toolbarbutton-1" |
962 + class="toolbarbutton-1" |
1062 + <vbox id="browser-border-start" hidden="true" layer="true"/> |
1055 + <vbox id="browser-border-start" hidden="true" layer="true"/> |
1063 + <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome"> |
1056 + <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome"> |
1064 + <sidebarheader id="sidebar-header" align="center"> |
1057 + <sidebarheader id="sidebar-header" align="center"> |
1065 + <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/> |
1058 + <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/> |
1066 + <image id="sidebar-throbber"/> |
1059 + <image id="sidebar-throbber"/> |
1067 + <toolbarbutton class="tabs-closebutton close-icon" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/> |
1060 + <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/> |
1068 + </sidebarheader> |
1061 + </sidebarheader> |
1069 + <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true" |
1062 + <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true" |
1070 + style="min-width: 14em; width: 18em; max-width: 36em;"/> |
1063 + style="min-width: 14em; width: 18em; max-width: 36em;"/> |
1071 + </vbox> |
1064 + </vbox> |
1072 + |
1065 + |
1189 + </toolbar> |
1182 + </toolbar> |
1190 + </vbox> |
1183 + </vbox> |
1191 + |
1184 + |
1192 + <svg:svg height="0"> |
1185 + <svg:svg height="0"> |
1193 +#include tab-shape.inc.svg |
1186 +#include tab-shape.inc.svg |
1194 + |
1187 + <svg:clipPath id="urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse"> |
1195 +#ifndef XP_MACOSX |
1188 +#ifndef XP_MACOSX |
1196 + <svg:clipPath id="keyhole-forward-clip-path" clipPathUnits="objectBoundingBox"> |
1189 + <svg:path d="m 1,-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"/> |
1197 + <svg:path d="m 0,0 c .3,.25 .3,.75, 0,1 l 1,0 0,-1 z"/> |
1190 +#else |
|
1191 + <svg:path d="M -11,-5 a 16 16 0 0 1 0,34 l 10000,0 l 0,-34 l -10000,0 z"/> |
|
1192 +#endif |
1198 + </svg:clipPath> |
1193 + </svg:clipPath> |
1199 + <svg:clipPath id="urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse"> |
|
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"/> |
|
1201 + </svg:clipPath> |
|
1202 +#else |
|
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"/> |
|
1205 + </svg:clipPath> |
|
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"/> |
|
1208 + </svg:clipPath> |
|
1209 +#endif |
|
1210 + </svg:svg> |
1194 + </svg:svg> |
1211 + |
1195 + |
1212 +</vbox> |
1196 +</vbox> |
1213 +# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck. |
1197 +# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck. |
1214 +# Introducing the iframe dynamically, as needed, was found to be better than |
1198 +# Introducing the iframe dynamically, as needed, was found to be better than |
1217 + |
1201 + |
1218 +</window> |
1202 +</window> |
1219 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1203 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1220 --- a/browser/base/jar.mn |
1204 --- a/browser/base/jar.mn |
1221 +++ b/browser/base/jar.mn |
1205 +++ b/browser/base/jar.mn |
1222 @@ -66,16 +66,18 @@ browser.jar: |
1206 @@ -65,16 +65,18 @@ browser.jar: |
1223 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1207 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1224 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1208 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1225 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
1209 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
1226 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1210 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1227 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1211 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1231 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1215 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1232 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1216 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1233 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1217 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1234 * content/browser/chatWindow.xul (content/chatWindow.xul) |
1218 * content/browser/chatWindow.xul (content/chatWindow.xul) |
1235 content/browser/content.js (content/content.js) |
1219 content/browser/content.js (content/content.js) |
|
1220 content/browser/fonts/ClearSans-Regular.woff (content/fonts/ClearSans-Regular.woff) |
|
1221 content/browser/fonts/FiraSans-Regular.woff (content/fonts/FiraSans-Regular.woff) |
|
1222 content/browser/fonts/FiraSans-Light.woff (content/fonts/FiraSans-Light.woff) |
1236 content/browser/newtab/newTab.xul (content/newtab/newTab.xul) |
1223 content/browser/newtab/newTab.xul (content/newtab/newTab.xul) |
1237 * content/browser/newtab/newTab.js (content/newtab/newTab.js) |
1224 * content/browser/newtab/newTab.js (content/newtab/newTab.js) |
1238 content/browser/newtab/newTab.css (content/newtab/newTab.css) |
|
1239 content/browser/newtab/preloaderContent.js (content/newtab/preloaderContent.js) |
|
1240 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
|
1241 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1225 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1242 --- a/browser/components/build/nsModule.cpp |
1226 --- a/browser/components/build/nsModule.cpp |
1243 +++ b/browser/components/build/nsModule.cpp |
1227 +++ b/browser/components/build/nsModule.cpp |
1244 @@ -8,17 +8,17 @@ |
1228 @@ -8,17 +8,17 @@ |
1245 #include "nsBrowserCompsCID.h" |
1229 #include "nsBrowserCompsCID.h" |
1299 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1283 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1300 #endif |
1284 #endif |
1301 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1285 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1302 --- a/browser/components/preferences/advanced.js |
1286 --- a/browser/components/preferences/advanced.js |
1303 +++ b/browser/components/preferences/advanced.js |
1287 +++ b/browser/components/preferences/advanced.js |
1304 @@ -24,16 +24,22 @@ var gAdvancedPane = { |
1288 @@ -25,16 +25,22 @@ var gAdvancedPane = { |
1305 if (extraArgs && extraArgs["advancedTab"]){ |
1289 if (extraArgs && extraArgs["advancedTab"]){ |
1306 advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]); |
1290 advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]); |
1307 } else { |
1291 } else { |
1308 var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex"); |
1292 var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex"); |
1309 if (preference.value !== null) |
1293 if (preference.value !== null) |
1322 // In Windows 8 we launch the control panel since it's the only |
1306 // In Windows 8 we launch the control panel since it's the only |
1323 // way to get all file type association prefs. So we don't know |
1307 // way to get all file type association prefs. So we don't know |
1324 // when the user will select the default. We refresh here periodically |
1308 // when the user will select the default. We refresh here periodically |
1325 // in case the default changes. On other Windows OS's defaults can also |
1309 // in case the default changes. On other Windows OS's defaults can also |
1326 // be set while the prefs are open. |
1310 // be set while the prefs are open. |
1327 @@ -903,14 +909,25 @@ var gAdvancedPane = { |
1311 @@ -884,14 +890,25 @@ var gAdvancedPane = { |
1328 * Set browser as the operating system default browser. |
1312 * Set browser as the operating system default browser. |
1329 */ |
1313 */ |
1330 setDefaultBrowser: function() |
1314 setDefaultBrowser: function() |
1331 { |
1315 { |
1332 let shellSvc = getShellService(); |
1316 let shellSvc = getShellService(); |
1799 + |
1783 + |
1800 +#endif // nsunixshellservice_h____ |
1784 +#endif // nsunixshellservice_h____ |
1801 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1785 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1802 --- a/browser/installer/package-manifest.in |
1786 --- a/browser/installer/package-manifest.in |
1803 +++ b/browser/installer/package-manifest.in |
1787 +++ b/browser/installer/package-manifest.in |
1804 @@ -641,19 +641,21 @@ |
1788 @@ -643,19 +643,21 @@ |
1805 @BINPATH@/defaults/autoconfig/prefcalls.js |
1789 @BINPATH@/defaults/autoconfig/prefcalls.js |
1806 @BINPATH@/browser/defaults/profile/prefs.js |
1790 @BINPATH@/browser/defaults/profile/prefs.js |
1807 |
1791 |
1808 #ifndef LIBXUL_SDK |
1792 #ifndef LIBXUL_SDK |
1809 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1793 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |