25 +#include browser-doctype.inc |
25 +#include browser-doctype.inc |
26 + |
26 + |
27 +<window id="main-window" |
27 +<window id="main-window" |
28 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
28 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" |
29 + xmlns:svg="http://www.w3.org/2000/svg" |
29 + xmlns:svg="http://www.w3.org/2000/svg" |
|
30 + xmlns:html="http://www.w3.org/1999/xhtml" |
30 + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" |
31 + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" |
31 + onload="gBrowserInit.onLoad()" onunload="gBrowserInit.onUnload()" onclose="return WindowIsClosing();" |
32 + onload="gBrowserInit.onLoad()" onunload="gBrowserInit.onUnload()" onclose="return WindowIsClosing();" |
32 + title="&mainWindow.title;@PRE_RELEASE_SUFFIX@" |
33 + title="&mainWindow.title;@PRE_RELEASE_SUFFIX@" |
33 + title_normal="&mainWindow.title;@PRE_RELEASE_SUFFIX@" |
34 + title_normal="&mainWindow.title;@PRE_RELEASE_SUFFIX@" |
34 +#ifdef XP_MACOSX |
35 +#ifdef XP_MACOSX |
184 + default="true" |
185 + default="true" |
185 + oncommand="StarUI.panel.hidePopup();"/> |
186 + oncommand="StarUI.panel.hidePopup();"/> |
186 +#endif |
187 +#endif |
187 + </hbox> |
188 + </hbox> |
188 + </panel> |
189 + </panel> |
|
190 + |
|
191 + <!-- UI tour experience --> |
|
192 + <panel id="UITourTooltip" |
|
193 + type="arrow" |
|
194 + hidden="true" |
|
195 + consumeoutsideclicks="false" |
|
196 + noautofocus="true" |
|
197 + align="start" |
|
198 + orient="vertical" |
|
199 + role="alert"> |
|
200 + <label id="UITourTooltipTitle" flex="1"/> |
|
201 + <description id="UITourTooltipDescription" flex="1"/> |
|
202 + </panel> |
|
203 + <html:div id="UITourHighlightContainer" style="position:relative"> |
|
204 + <html:div id="UITourHighlight"></html:div> |
|
205 + </html:div> |
189 + |
206 + |
190 + <panel id="socialActivatedNotification" |
207 + <panel id="socialActivatedNotification" |
191 + type="arrow" |
208 + type="arrow" |
192 + hidden="true" |
209 + hidden="true" |
193 + consumeoutsideclicks="true" |
210 + consumeoutsideclicks="true" |
344 + <vbox id="identity-popup-permission-list" class="indent"/> |
361 + <vbox id="identity-popup-permission-list" class="indent"/> |
345 + </vbox> |
362 + </vbox> |
346 + </vbox> |
363 + </vbox> |
347 + </hbox> |
364 + </hbox> |
348 + <!-- Footer button to open security page info --> |
365 + <!-- Footer button to open security page info --> |
349 + <hbox id="identity-popup-button-container" pack="end"> |
366 + <hbox id="identity-popup-button-container" align="center"> |
|
367 + <button id="identity-popup-help-icon" |
|
368 + oncommand="gIdentityHandler.handleHelpCommand(event);" |
|
369 + tooltiptext="&identity.help.tooltip;"/> |
|
370 + <spacer flex="1"/> |
350 + <button id="identity-popup-more-info-button" |
371 + <button id="identity-popup-more-info-button" |
351 + label="&identity.moreInfoLinkText;" |
372 + label="&identity.moreInfoLinkText;" |
352 + oncommand="gIdentityHandler.handleMoreInfoClick(event);"/> |
373 + oncommand="gIdentityHandler.handleMoreInfoClick(event);"/> |
353 + </hbox> |
374 + </hbox> |
354 + </panel> |
375 + </panel> |
394 +#endif |
415 +#endif |
395 + </tooltip> |
416 + </tooltip> |
396 + |
417 + |
397 +#include popup-notifications.inc |
418 +#include popup-notifications.inc |
398 + |
419 + |
|
420 + <hbox id="downloads-animation-container" mousethrough="always"> |
|
421 + <vbox id="downloads-notification-anchor"> |
|
422 + <vbox id="downloads-indicator-notification"/> |
|
423 + </vbox> |
|
424 + </hbox> |
399 + </popupset> |
425 + </popupset> |
400 + |
426 + |
401 +#ifdef CAN_DRAW_IN_TITLEBAR |
427 +#ifdef CAN_DRAW_IN_TITLEBAR |
402 +<vbox id="titlebar"> |
428 +<vbox id="titlebar"> |
403 + <hbox id="titlebar-content"> |
429 + <hbox id="titlebar-content"> |
545 + hidden="true" |
571 + hidden="true" |
546 + tooltiptext="&pageReportIcon.tooltip;" |
572 + tooltiptext="&pageReportIcon.tooltip;" |
547 + onclick="gPopupBlockerObserver.onReportButtonClick(event);"/> |
573 + onclick="gPopupBlockerObserver.onReportButtonClick(event);"/> |
548 + <image id="star-button" |
574 + <image id="star-button" |
549 + class="urlbar-icon" |
575 + class="urlbar-icon" |
550 + onclick="BookmarkingUI.onCommand(event);"/> |
576 + onclick="if (event.button === 0) BookmarkingUI.onCommand(event);"/> |
551 + <image id="go-button" |
577 + <image id="go-button" |
552 + class="urlbar-icon" |
578 + class="urlbar-icon" |
553 + tooltiptext="&goEndCap.tooltip;" |
579 + tooltiptext="&goEndCap.tooltip;" |
554 + onclick="gURLBar.handleCommand(event);"/> |
580 + onclick="gURLBar.handleCommand(event);"/> |
555 + </hbox> |
581 + </hbox> |
1019 + style="min-width: 14em; width: 18em; max-width: 36em;"/> |
1045 + style="min-width: 14em; width: 18em; max-width: 36em;"/> |
1020 + </vbox> |
1046 + </vbox> |
1021 + |
1047 + |
1022 + <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/> |
1048 + <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/> |
1023 + <vbox id="appcontent" flex="1"> |
1049 + <vbox id="appcontent" flex="1"> |
1024 + <tabbrowser id="content" disablehistory="true" |
1050 + <tabbrowser id="content" |
1025 + flex="1" contenttooltip="aHTMLTooltip" |
1051 + flex="1" contenttooltip="aHTMLTooltip" |
1026 + tabcontainer="tabbrowser-tabs" |
1052 + tabcontainer="tabbrowser-tabs" |
1027 + contentcontextmenu="contentAreaContextMenu" |
1053 + contentcontextmenu="contentAreaContextMenu" |
1028 + autocompletepopup="PopupAutoComplete" |
1054 + autocompletepopup="PopupAutoComplete" |
1029 + selectpopup="ContentSelectDropdown"/> |
1055 + selectpopup="ContentSelectDropdown"/> |
1179 * content/browser/chatWindow.xul (content/chatWindow.xul) |
1205 * content/browser/chatWindow.xul (content/chatWindow.xul) |
1180 content/browser/content.js (content/content.js) |
1206 content/browser/content.js (content/content.js) |
1181 content/browser/newtab/newTab.xul (content/newtab/newTab.xul) |
1207 content/browser/newtab/newTab.xul (content/newtab/newTab.xul) |
1182 * content/browser/newtab/newTab.js (content/newtab/newTab.js) |
1208 * content/browser/newtab/newTab.js (content/newtab/newTab.js) |
1183 content/browser/newtab/newTab.css (content/newtab/newTab.css) |
1209 content/browser/newtab/newTab.css (content/newtab/newTab.css) |
|
1210 content/browser/newtab/preloaderContent.js (content/newtab/preloaderContent.js) |
1184 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1211 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1185 content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
|
1186 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1212 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1187 --- a/browser/components/build/nsModule.cpp |
1213 --- a/browser/components/build/nsModule.cpp |
1188 +++ b/browser/components/build/nsModule.cpp |
1214 +++ b/browser/components/build/nsModule.cpp |
1189 @@ -8,17 +8,17 @@ |
1215 @@ -8,17 +8,17 @@ |
1190 #include "nsBrowserCompsCID.h" |
1216 #include "nsBrowserCompsCID.h" |
1244 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1270 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1245 #endif |
1271 #endif |
1246 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1272 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1247 --- a/browser/components/preferences/advanced.js |
1273 --- a/browser/components/preferences/advanced.js |
1248 +++ b/browser/components/preferences/advanced.js |
1274 +++ b/browser/components/preferences/advanced.js |
1249 @@ -23,16 +23,22 @@ var gAdvancedPane = { |
1275 @@ -24,16 +24,22 @@ var gAdvancedPane = { |
1250 if (extraArgs && extraArgs["advancedTab"]){ |
1276 if (extraArgs && extraArgs["advancedTab"]){ |
1251 advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]); |
1277 advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]); |
1252 } else { |
1278 } else { |
1253 var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex"); |
1279 var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex"); |
1254 if (preference.value !== null) |
1280 if (preference.value !== null) |
1267 // In Windows 8 we launch the control panel since it's the only |
1293 // In Windows 8 we launch the control panel since it's the only |
1268 // way to get all file type association prefs. So we don't know |
1294 // way to get all file type association prefs. So we don't know |
1269 // when the user will select the default. We refresh here periodically |
1295 // when the user will select the default. We refresh here periodically |
1270 // in case the default changes. On other Windows OS's defaults can also |
1296 // in case the default changes. On other Windows OS's defaults can also |
1271 // be set while the prefs are open. |
1297 // be set while the prefs are open. |
1272 @@ -860,14 +866,25 @@ var gAdvancedPane = { |
1298 @@ -903,14 +909,25 @@ var gAdvancedPane = { |
1273 * Set browser as the operating system default browser. |
1299 * Set browser as the operating system default browser. |
1274 */ |
1300 */ |
1275 setDefaultBrowser: function() |
1301 setDefaultBrowser: function() |
1276 { |
1302 { |
1277 let shellSvc = getShellService(); |
1303 let shellSvc = getShellService(); |
1296 #endif |
1322 #endif |
1297 }; |
1323 }; |
1298 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in |
1324 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in |
1299 --- a/browser/components/shell/src/Makefile.in |
1325 --- a/browser/components/shell/src/Makefile.in |
1300 +++ b/browser/components/shell/src/Makefile.in |
1326 +++ b/browser/components/shell/src/Makefile.in |
1301 @@ -9,10 +9,12 @@ USE_STATIC_LIBS = 1 |
1327 @@ -8,10 +8,12 @@ USE_STATIC_LIBS = 1 |
1302 |
1328 |
1303 include $(topsrcdir)/config/rules.mk |
1329 include $(topsrcdir)/config/rules.mk |
1304 |
1330 |
1305 DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\" \ |
1331 DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\" \ |
1306 -DMOZ_APP_VERSION=\"$(MOZ_APP_VERSION)\" |
1332 -DMOZ_APP_VERSION=\"$(MOZ_APP_VERSION)\" |
1312 clobber:: |
1338 clobber:: |
1313 rm -f $(DIST)/lib/$(LIBRARY_NAME).lib |
1339 rm -f $(DIST)/lib/$(LIBRARY_NAME).lib |
1314 diff --git a/browser/components/shell/src/moz.build b/browser/components/shell/src/moz.build |
1340 diff --git a/browser/components/shell/src/moz.build b/browser/components/shell/src/moz.build |
1315 --- a/browser/components/shell/src/moz.build |
1341 --- a/browser/components/shell/src/moz.build |
1316 +++ b/browser/components/shell/src/moz.build |
1342 +++ b/browser/components/shell/src/moz.build |
1317 @@ -11,17 +11,19 @@ if CONFIG['OS_ARCH'] == 'WINNT': |
1343 @@ -12,16 +12,18 @@ if CONFIG['OS_ARCH'] == 'WINNT': |
1318 'nsWindowsShellService.cpp', |
|
1319 ] |
1344 ] |
1320 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': |
1345 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': |
1321 CPP_SOURCES += [ |
1346 SOURCES += [ |
1322 'nsMacShellService.cpp', |
1347 'nsMacShellService.cpp', |
1323 ] |
1348 ] |
1324 elif CONFIG['MOZ_WIDGET_GTK']: |
1349 elif CONFIG['MOZ_WIDGET_GTK']: |
1325 CPP_SOURCES += [ |
1350 SOURCES += [ |
1326 + 'nsUnixShellService.cpp', |
|
1327 'nsGNOMEShellService.cpp', |
1351 'nsGNOMEShellService.cpp', |
1328 + 'nsKDEShellService.cpp' |
1352 + 'nsKDEShellService.cpp', |
|
1353 + 'nsUnixShellService.cpp' |
1329 ] |
1354 ] |
1330 |
1355 |
1331 if CPP_SOURCES: |
1356 if SOURCES: |
1332 LIBRARY_NAME = 'shellservice_s' |
1357 LIBRARY_NAME = 'shellservice_s' |
1333 |
1358 |
1334 EXTRA_COMPONENTS += [ |
1359 EXTRA_COMPONENTS += [ |
1335 'nsSetDefaultBrowser.js', |
1360 'nsSetDefaultBrowser.js', |
1336 'nsSetDefaultBrowser.manifest', |
1361 'nsSetDefaultBrowser.manifest', |
1745 + |
1770 + |
1746 +#endif // nsunixshellservice_h____ |
1771 +#endif // nsunixshellservice_h____ |
1747 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1772 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1748 --- a/browser/installer/package-manifest.in |
1773 --- a/browser/installer/package-manifest.in |
1749 +++ b/browser/installer/package-manifest.in |
1774 +++ b/browser/installer/package-manifest.in |
1750 @@ -593,19 +593,21 @@ |
1775 @@ -613,19 +613,21 @@ |
1751 @BINPATH@/defaults/autoconfig/prefcalls.js |
1776 @BINPATH@/defaults/autoconfig/prefcalls.js |
1752 @BINPATH@/browser/defaults/profile/prefs.js |
1777 @BINPATH@/browser/defaults/profile/prefs.js |
1753 |
1778 |
1754 #ifndef LIBXUL_SDK |
1779 #ifndef LIBXUL_SDK |
1755 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1780 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |