15 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. |
15 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. |
16 + |
16 + |
17 +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> |
17 +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> |
18 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> |
18 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> |
19 +<?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?> |
19 +<?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?> |
|
20 +<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?> |
20 +<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUIOverlay.css" type="text/css"?> |
21 +<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUIOverlay.css" type="text/css"?> |
21 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> |
22 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> |
22 +<?xml-stylesheet href="chrome://browser/skin/browser-lightweightTheme.css" type="text/css"?> |
23 +<?xml-stylesheet href="chrome://browser/skin/browser-lightweightTheme.css" type="text/css"?> |
23 + |
24 + |
24 +<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?> |
25 +<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?> |
157 + <!-- for select dropdowns. The menupopup is what shows the list of options, |
158 + <!-- for select dropdowns. The menupopup is what shows the list of options, |
158 + and the popuponly menulist makes things like the menuactive attributes |
159 + and the popuponly menulist makes things like the menuactive attributes |
159 + work correctly on the menupopup. ContentSelectDropdown expects the |
160 + work correctly on the menupopup. ContentSelectDropdown expects the |
160 + popuponly menulist to be its immediate parent. --> |
161 + popuponly menulist to be its immediate parent. --> |
161 + <menulist popuponly="true" id="ContentSelectDropdown" hidden="true"> |
162 + <menulist popuponly="true" id="ContentSelectDropdown" hidden="true"> |
162 + <menupopup rolluponmousewheel="true"/> |
163 + <menupopup rolluponmousewheel="true" |
|
164 +#ifdef XP_WIN |
|
165 + consumeoutsideclicks="false" |
|
166 +#endif |
|
167 + /> |
163 + </menulist> |
168 + </menulist> |
164 + |
169 + |
165 + <!-- for invalid form error message --> |
170 + <!-- for invalid form error message --> |
166 + <panel id="invalid-form-popup" type="arrow" orient="vertical" noautofocus="true" hidden="true" level="parent"> |
171 + <panel id="invalid-form-popup" type="arrow" orient="vertical" noautofocus="true" hidden="true" level="parent"> |
167 + <description/> |
172 + <description/> |
412 +#include browser-context.inc |
417 +#include browser-context.inc |
413 + </menupopup> |
418 + </menupopup> |
414 + |
419 + |
415 + <menupopup id="placesContext"/> |
420 + <menupopup id="placesContext"/> |
416 + |
421 + |
417 + <!-- Popup for site identity information --> |
|
418 + <panel id="identity-popup" |
|
419 + type="arrow" |
|
420 + hidden="true" |
|
421 + noautofocus="true" |
|
422 + onpopupshown="if (event.target == this) |
|
423 + gIdentityHandler.onPopupShown(event);" |
|
424 + orient="vertical" |
|
425 + level="top"> |
|
426 + <hbox id="identity-popup-container" align="top"> |
|
427 + <image id="identity-popup-icon"/> |
|
428 + <vbox id="identity-popup-content-box"> |
|
429 + <label id="identity-popup-brandName" |
|
430 + class="identity-popup-label" |
|
431 + value="&brandFullName;"/> |
|
432 + <label id="identity-popup-chromeLabel" |
|
433 + class="identity-popup-label"/> |
|
434 + <label id="identity-popup-connectedToLabel" |
|
435 + class="identity-popup-label" |
|
436 + value="&identity.connectedTo;"/> |
|
437 + <label id="identity-popup-connectedToLabel2" |
|
438 + class="identity-popup-label" |
|
439 + value="&identity.unverifiedsite2;"/> |
|
440 + <description id="identity-popup-content-host" |
|
441 + class="identity-popup-description"/> |
|
442 + <label id="identity-popup-runByLabel" |
|
443 + class="identity-popup-label" |
|
444 + value="&identity.runBy;"/> |
|
445 + <description id="identity-popup-content-owner" |
|
446 + class="identity-popup-description"/> |
|
447 + <description id="identity-popup-content-supplemental" |
|
448 + class="identity-popup-description"/> |
|
449 + <description id="identity-popup-content-verifier" |
|
450 + class="identity-popup-description"/> |
|
451 + <hbox id="identity-popup-encryption" flex="1"> |
|
452 + <vbox> |
|
453 + <image id="identity-popup-encryption-icon"/> |
|
454 + </vbox> |
|
455 + <description id="identity-popup-encryption-label" flex="1" |
|
456 + class="identity-popup-description"/> |
|
457 + </hbox> |
|
458 + <vbox id="identity-popup-permissions"> |
|
459 + <separator class="thin"/> |
|
460 + <label class="identity-popup-label header" |
|
461 + value="&identity.permissions;"/> |
|
462 + <vbox id="identity-popup-permission-list" class="indent"/> |
|
463 + </vbox> |
|
464 + </vbox> |
|
465 + </hbox> |
|
466 + <!-- Footer button to open security page info --> |
|
467 + <hbox id="identity-popup-button-container" align="center"> |
|
468 + <button id="identity-popup-help-icon" |
|
469 + oncommand="gIdentityHandler.handleHelpCommand(event);" |
|
470 + tooltiptext="&identity.help.tooltip;"/> |
|
471 + <spacer flex="1"/> |
|
472 + <button id="identity-popup-more-info-button" |
|
473 + label="&identity.moreInfoLinkText;" |
|
474 + oncommand="gIdentityHandler.handleMoreInfoClick(event);"/> |
|
475 + </hbox> |
|
476 + </panel> |
|
477 + |
|
478 + <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" norestorefocus="true" level="top"> |
422 + <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" norestorefocus="true" level="top"> |
479 + <hbox> |
423 + <hbox> |
480 + <button class="ctrlTab-preview" flex="1"/> |
424 + <button class="ctrlTab-preview" flex="1"/> |
481 + <button class="ctrlTab-preview" flex="1"/> |
425 + <button class="ctrlTab-preview" flex="1"/> |
482 + <button class="ctrlTab-preview" flex="1"/> |
426 + <button class="ctrlTab-preview" flex="1"/> |
789 + <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/> |
734 + <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/> |
790 + <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/> |
735 + <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/> |
791 + <image id="push-notification-icon" class="notification-anchor-icon" role="button"/> |
736 + <image id="push-notification-icon" class="notification-anchor-icon" role="button"/> |
792 + <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/> |
737 + <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/> |
793 + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> |
738 + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> |
|
739 + <image id="login-fill-notification-icon" class="notification-anchor-icon" role="button"/> |
794 + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
740 + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
795 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> |
741 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> |
796 + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
742 + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
797 + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/> |
743 + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/> |
798 + <image id="bad-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> |
744 + <image id="bad-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> |
881 + ondragover="PlacesMenuDNDHandler.onDragOver(event);" |
827 + ondragover="PlacesMenuDNDHandler.onDragOver(event);" |
882 + ondragleave="PlacesMenuDNDHandler.onDragLeave(event);" |
828 + ondragleave="PlacesMenuDNDHandler.onDragLeave(event);" |
883 + ondrop="PlacesMenuDNDHandler.onDrop(event);" |
829 + ondrop="PlacesMenuDNDHandler.onDrop(event);" |
884 + cui-areatype="toolbar" |
830 + cui-areatype="toolbar" |
885 + oncommand="BookmarkingUI.onCommand(event);"> |
831 + oncommand="BookmarkingUI.onCommand(event);"> |
|
832 + <observes element="bookmarkThisPageBroadcaster" attribute="starred"/> |
|
833 + <observes element="bookmarkThisPageBroadcaster" attribute="buttontooltiptext"/> |
886 + <menupopup id="BMB_bookmarksPopup" |
834 + <menupopup id="BMB_bookmarksPopup" |
887 + class="cui-widget-panel cui-widget-panelview cui-widget-panelWithFooter PanelUI-subView" |
835 + class="cui-widget-panel cui-widget-panelview cui-widget-panelWithFooter PanelUI-subView" |
888 + placespopup="true" |
836 + placespopup="true" |
889 + context="placesContext" |
837 + context="placesContext" |
890 + openInTabs="children" |
838 + openInTabs="children" |
1228 + </sidebarheader> |
1176 + </sidebarheader> |
1229 + |
1177 + |
1230 + <browser id="social-sidebar-browser" |
1178 + <browser id="social-sidebar-browser" |
1231 + type="content" |
1179 + type="content" |
1232 + context="contentAreaContextMenu" |
1180 + context="contentAreaContextMenu" |
|
1181 + message="true" |
|
1182 + messagemanagergroup="social" |
1233 + disableglobalhistory="true" |
1183 + disableglobalhistory="true" |
1234 + tooltip="aHTMLTooltip" |
1184 + tooltip="aHTMLTooltip" |
1235 + popupnotificationanchor="social-sidebar-favico" |
1185 + popupnotificationanchor="social-sidebar-favico" |
1236 + flex="1" |
1186 + flex="1" |
1237 + style="min-width: 14em; width: 18em; max-width: 36em;"/> |
1187 + style="min-width: 14em; width: 18em; max-width: 36em;"/> |
1321 + |
1271 + |
1322 +</window> |
1272 +</window> |
1323 diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul |
1273 diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul |
1324 --- a/browser/base/content/browser.xul |
1274 --- a/browser/base/content/browser.xul |
1325 +++ b/browser/base/content/browser.xul |
1275 +++ b/browser/base/content/browser.xul |
1326 @@ -179,17 +179,17 @@ |
1276 @@ -184,17 +184,17 @@ |
1327 class="editBookmarkPanelHeaderButton" |
1277 class="editBookmarkPanelHeaderButton" |
1328 oncommand="StarUI.removeBookmarkButtonCommand();" |
1278 oncommand="StarUI.removeBookmarkButtonCommand();" |
1329 accesskey="&editBookmark.removeBookmark.accessKey;"/> |
1279 accesskey="&editBookmark.removeBookmark.accessKey;"/> |
1330 </hbox> |
1280 </hbox> |
1331 </vbox> |
1281 </vbox> |
1340 default="true" |
1290 default="true" |
1341 oncommand="StarUI.panel.hidePopup();"/> |
1291 oncommand="StarUI.panel.hidePopup();"/> |
1342 <button id="editBookmarkPanelDeleteButton" |
1292 <button id="editBookmarkPanelDeleteButton" |
1343 class="editBookmarkPanelBottomButton" |
1293 class="editBookmarkPanelBottomButton" |
1344 label="&editBookmark.cancel.label;" |
1294 label="&editBookmark.cancel.label;" |
1345 @@ -1235,17 +1235,17 @@ |
1295 @@ -1185,17 +1185,17 @@ |
1346 |
1296 |
1347 <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1297 <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1348 <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
1298 <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
1349 <vbox id="full-screen-warning-message" align="center"> |
1299 <vbox id="full-screen-warning-message" align="center"> |
1350 <description id="full-screen-domain-text"/> |
1300 <description id="full-screen-domain-text"/> |
1373 * content/browser/browser.css (content/browser.css) |
1323 * content/browser/browser.css (content/browser.css) |
1374 * content/browser/browser.js (content/browser.js) |
1324 * content/browser/browser.js (content/browser.js) |
1375 * content/browser/browser.xul (content/browser.xul) |
1325 * content/browser/browser.xul (content/browser.xul) |
1376 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1326 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1377 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1327 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1378 content/browser/browser-pocket-en-US.properties (content/browser-pocket-en-US.properties) |
|
1379 content/browser/browser-pocket.dtd (content/browser-pocket.dtd) |
|
1380 content/browser/browser-pocket-de.properties (content/browser-pocket-de.properties) |
|
1381 content/browser/browser-pocket-es-ES.properties (content/browser-pocket-es-ES.properties) |
|
1382 content/browser/browser-pocket-ja.properties (content/browser-pocket-ja.properties) |
|
1383 content/browser/browser-pocket-ru.properties (content/browser-pocket-ru.properties) |
|
1384 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1328 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1385 * content/browser/chatWindow.xul (content/chatWindow.xul) |
1329 * content/browser/chatWindow.xul (content/chatWindow.xul) |
|
1330 content/browser/tab-content.js (content/tab-content.js) |
|
1331 content/browser/content.js (content/content.js) |
|
1332 content/browser/social-content.js (content/social-content.js) |
|
1333 content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg) |
|
1334 content/browser/defaultthemes/1.header.jpg (content/defaultthemes/1.header.jpg) |
|
1335 content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg) |
1386 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1336 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1387 --- a/browser/components/build/nsModule.cpp |
1337 --- a/browser/components/build/nsModule.cpp |
1388 +++ b/browser/components/build/nsModule.cpp |
1338 +++ b/browser/components/build/nsModule.cpp |
1389 @@ -8,17 +8,17 @@ |
1339 @@ -8,17 +8,17 @@ |
1390 #include "nsBrowserCompsCID.h" |
1340 #include "nsBrowserCompsCID.h" |
1467 // In Windows 8 we launch the control panel since it's the only |
1417 // In Windows 8 we launch the control panel since it's the only |
1468 // way to get all file type association prefs. So we don't know |
1418 // way to get all file type association prefs. So we don't know |
1469 // when the user will select the default. We refresh here periodically |
1419 // when the user will select the default. We refresh here periodically |
1470 // in case the default changes. On other Windows OS's defaults can also |
1420 // in case the default changes. On other Windows OS's defaults can also |
1471 // be set while the prefs are open. |
1421 // be set while the prefs are open. |
1472 @@ -524,16 +530,27 @@ var gMainPane = { |
1422 @@ -527,16 +533,27 @@ var gMainPane = { |
1473 */ |
1423 */ |
1474 setDefaultBrowser: function() |
1424 setDefaultBrowser: function() |
1475 { |
1425 { |
1476 let shellSvc = getShellService(); |
1426 let shellSvc = getShellService(); |
1477 if (!shellSvc) |
1427 if (!shellSvc) |