12 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. |
12 +# file, You can obtain one at http://mozilla.org/MPL/2.0/. |
13 + |
13 + |
14 +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> |
14 +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> |
15 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> |
15 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> |
16 +<?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?> |
16 +<?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?> |
17 +<?xml-stylesheet href="chrome://browser/skin/devtools/webconsole.css" type="text/css"?> |
|
18 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> |
17 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> |
19 + |
18 + |
20 +<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?> |
19 +<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?> |
21 +<?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?> |
20 +<?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?> |
22 +<?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?> |
21 +<?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?> |
58 +# wishes to include *must* go into the global-scripts.inc file |
57 +# wishes to include *must* go into the global-scripts.inc file |
59 +# so that they can be shared by macBrowserOverlay.xul. |
58 +# so that they can be shared by macBrowserOverlay.xul. |
60 +#include global-scripts.inc |
59 +#include global-scripts.inc |
61 +<script type="application/javascript" src="chrome://browser/content/nsContextMenu.js"/> |
60 +<script type="application/javascript" src="chrome://browser/content/nsContextMenu.js"/> |
62 + |
61 + |
63 +#ifdef MOZ_SAFE_BROWSING |
|
64 +<script type="application/javascript" src="chrome://browser/content/safebrowsing/sb-loader.js"/> |
|
65 +#endif |
|
66 +<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/> |
62 +<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/> |
67 + |
63 + |
68 +<script type="application/javascript" src="chrome://browser/content/places/editBookmarkOverlay.js"/> |
64 +<script type="application/javascript" src="chrome://browser/content/places/editBookmarkOverlay.js"/> |
69 + |
65 + |
70 +# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the |
66 +# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the |
185 + oncommand="StarUI.panel.hidePopup();"/> |
181 + oncommand="StarUI.panel.hidePopup();"/> |
186 +#endif |
182 +#endif |
187 + </hbox> |
183 + </hbox> |
188 + </panel> |
184 + </panel> |
189 + |
185 + |
|
186 + <panel id="socialActivatedNotification" |
|
187 + type="arrow" |
|
188 + hidden="true" |
|
189 + consumeoutsideclicks="true" |
|
190 + align="start" |
|
191 + role="alert"> |
|
192 + <hbox flex="1"> |
|
193 + <image src="chrome://browser/content/social-icon.png" class="popup-notification-icon"/> |
|
194 + <vbox flex="1"> |
|
195 + <description id="social-activation-message" class="popup-notification-description"/> |
|
196 + <spacer flex="1"/> |
|
197 + <hbox pack="end" align="center" class="popup-notification-button-container"> |
|
198 +#ifdef XP_UNIX |
|
199 + <button id="social-undoactivation-button" |
|
200 + label="&social.activated.undobutton.label;" |
|
201 + accesskey="&social.activated.undobutton.accesskey;" |
|
202 + onclick="SocialUI.undoActivation();"/> |
|
203 + <button default="true" |
|
204 + autofocus="autofocus" |
|
205 + label="&social.ok.label;" |
|
206 + accesskey="&social.ok.accesskey;" |
|
207 + oncommand="SocialUI.notificationPanel.hidePopup();"/> |
|
208 +#else |
|
209 + <button default="true" |
|
210 + autofocus="autofocus" |
|
211 + label="&social.ok.label;" |
|
212 + accesskey="&social.ok.accesskey;" |
|
213 + oncommand="SocialUI.notificationPanel.hidePopup();"/> |
|
214 + <button id="social-undoactivation-button" |
|
215 + label="&social.activated.undobutton.label;" |
|
216 + accesskey="&social.activated.undobutton.accesskey;" |
|
217 + onclick="SocialUI.undoActivation();"/> |
|
218 +#endif |
|
219 + </hbox> |
|
220 + </vbox> |
|
221 + </hbox> |
|
222 + </panel> |
|
223 + |
190 + <panel id="editSharePopup" |
224 + <panel id="editSharePopup" |
191 + type="arrow" |
225 + type="arrow" |
192 + orient="vertical" |
226 + orient="vertical" |
193 + ignorekeys="true" |
227 + ignorekeys="true" |
194 + hidden="true" |
228 + hidden="true" |
195 + onpopupshown="SocialShareButton.panelShown(event);" |
229 + onpopupshown="SocialShareButton.panelShown(event);" |
196 + consumeoutsideclicks="true" |
230 + consumeoutsideclicks="true" |
197 + level="top"> |
231 + level="top"> |
|
232 + <row id="editSharePopupHeader" align="center"> |
|
233 + <vbox align="center"> |
|
234 + <image id="socialUserPortrait" onclick="SocialUI.showProfile();" |
|
235 + aria-label="&social.sharePopup.portrait.arialabel;"/> |
|
236 + </vbox> |
|
237 + <vbox id="editSharePopupText"> |
|
238 + <button id="socialUserDisplayName" |
|
239 + oncommand="SocialUI.showProfile();"/> |
|
240 + <spacer flex="1"/> |
|
241 + <label id="socialUserRecommendedText" |
|
242 + value="&social.sharePopup.shared.label;"/> |
|
243 + </vbox> |
|
244 + </row> |
198 + <hbox id="editSharePopupBottomButtons" pack="end"> |
245 + <hbox id="editSharePopupBottomButtons" pack="end"> |
199 +#ifdef XP_UNIX |
246 +#ifdef XP_UNIX |
200 + <button id="editSharePopupUndoButton" |
247 + <button id="editSharePopupUndoButton" |
201 + class="editSharePopupBottomButton" |
248 + class="editSharePopupBottomButton" |
202 + label="&social.sharePopup.undo.label;" |
249 + label="&social.sharePopup.undo.label;" |
204 + command="Social:UnsharePage"/> |
251 + command="Social:UnsharePage"/> |
205 + <button id="editSharePopupOkButton" |
252 + <button id="editSharePopupOkButton" |
206 + class="editSharePopupBottomButton" |
253 + class="editSharePopupBottomButton" |
207 + default="true" |
254 + default="true" |
208 + autofocus="autofocus" |
255 + autofocus="autofocus" |
209 + label="&social.sharePopup.ok.label;" |
256 + label="&social.ok.label;" |
210 + accesskey="&social.sharePopup.ok.accesskey;" |
257 + accesskey="&social.ok.accesskey;" |
211 + oncommand="SocialShareButton.dismissSharePopup();"/> |
258 + oncommand="SocialShareButton.dismissSharePopup();"/> |
212 +#else |
259 +#else |
213 + <button id="editSharePopupOkButton" |
260 + <button id="editSharePopupOkButton" |
214 + class="editSharePopupBottomButton" |
261 + class="editSharePopupBottomButton" |
215 + default="true" |
262 + default="true" |
216 + autofocus="autofocus" |
263 + autofocus="autofocus" |
217 + label="&social.sharePopup.ok.label;" |
264 + label="&social.ok.label;" |
218 + accesskey="&social.sharePopup.ok.accesskey;" |
265 + accesskey="&social.ok.accesskey;" |
219 + oncommand="SocialShareButton.dismissSharePopup();"/> |
266 + oncommand="SocialShareButton.dismissSharePopup();"/> |
220 + <button id="editSharePopupUndoButton" |
267 + <button id="editSharePopupUndoButton" |
221 + class="editSharePopupBottomButton" |
268 + class="editSharePopupBottomButton" |
222 + label="&social.sharePopup.undo.label;" |
269 + label="&social.sharePopup.undo.label;" |
223 + accesskey="&social.sharePopup.undo.accesskey;" |
270 + accesskey="&social.sharePopup.undo.accesskey;" |
225 +#endif |
272 +#endif |
226 + </hbox> |
273 + </hbox> |
227 + </panel> |
274 + </panel> |
228 + |
275 + |
229 + <panel id="social-notification-panel" type="arrow" hidden="true" noautofocus="true"> |
276 + <panel id="social-notification-panel" type="arrow" hidden="true" noautofocus="true"> |
230 + <browser id="social-notification-browser" type="content" flex="1"/> |
277 + <box id="social-notification-box" flex="1"></box> |
231 + </panel> |
278 + </panel> |
|
279 + <panel id="social-flyout-panel" |
|
280 + onpopupshown="SocialFlyout.onShown()" |
|
281 + onpopuphidden="SocialFlyout.onHidden()" |
|
282 + side="right" |
|
283 + type="arrow" |
|
284 + hidden="true" |
|
285 + noautofocus="true" |
|
286 + position="topcenter topright"/> |
232 + |
287 + |
233 + <menupopup id="inspector-node-popup"> |
288 + <menupopup id="inspector-node-popup"> |
234 + <menuitem id="inspectorHTMLCopyInner" |
289 + <menuitem id="inspectorHTMLCopyInner" |
235 + label="&inspectorHTMLCopyInner.label;" |
290 + label="&inspectorHTMLCopyInner.label;" |
236 + accesskey="&inspectorHTMLCopyInner.accesskey;" |
291 + accesskey="&inspectorHTMLCopyInner.accesskey;" |
520 + pageproxystate="invalid" |
575 + pageproxystate="invalid" |
521 + onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'" |
576 + onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'" |
522 + onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);"> |
577 + onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);"> |
523 + <box id="notification-popup-box" hidden="true" align="center"> |
578 + <box id="notification-popup-box" hidden="true" align="center"> |
524 + <image id="default-notification-icon" class="notification-anchor-icon" role="button"/> |
579 + <image id="default-notification-icon" class="notification-anchor-icon" role="button"/> |
|
580 + <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/> |
525 + <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/> |
581 + <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/> |
526 + <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/> |
582 + <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/> |
527 + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> |
583 + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> |
528 + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
584 + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
529 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> |
585 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> |
614 + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> |
670 + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> |
615 + |
671 + |
616 + <toolbaritem id="social-toolbar-button" |
672 + <toolbaritem id="social-toolbar-button" |
617 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
673 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
618 + removable="false" |
674 + removable="false" |
|
675 + pack="center" |
619 + title="&socialToolbar.title;" |
676 + title="&socialToolbar.title;" |
620 + hidden="true"> |
677 + hidden="true"> |
621 + <hbox id="social-toolbar-button-box" class="social-statusarea-container"> |
678 + <hbox id="social-toolbar-button-box" class="social-statusarea-container"> |
622 + <button id="social-provider-image" type="menu"> |
679 + <button id="social-provider-image" type="menu"> |
623 + <menupopup id="social-statusarea-popup"> |
680 + <menupopup id="social-statusarea-popup"> |
628 + value="&social.notLoggedIn.label;"/> |
685 + value="&social.notLoggedIn.label;"/> |
629 + <button id="social-statusarea-username" |
686 + <button id="social-statusarea-username" |
630 + oncommand="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();"/> |
687 + oncommand="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();"/> |
631 + </vbox> |
688 + </vbox> |
632 + </hbox> |
689 + </hbox> |
|
690 + <menuitem id="social-toggle-sidebar-menuitem" |
|
691 + type="checkbox" |
|
692 + autocheck="false" |
|
693 + command="Social:ToggleSidebar" |
|
694 + label="&social.toggleSidebar.label;" |
|
695 + accesskey="&social.toggleSidebar.accesskey;"/> |
633 + </menupopup> |
696 + </menupopup> |
634 + </button> |
697 + </button> |
635 + <hbox id="social-status-iconbox" flex="1"> |
698 + <hbox id="social-status-iconbox" flex="1"> |
636 + <box class="social-notification-icon-container" collapsed="true" |
|
637 + onclick="SocialToolbar.showAmbientPopup(this);"> |
|
638 + <image class="social-notification-icon-image"/> |
|
639 + <box class="social-notification-icon-counter" collapsed="true"/> |
|
640 + </box> |
|
641 + <box class="social-notification-icon-container" collapsed="true" |
|
642 + onclick="SocialToolbar.showAmbientPopup(this);"> |
|
643 + <image class="social-notification-icon-image"/> |
|
644 + <box class="social-notification-icon-counter" collapsed="true"/> |
|
645 + </box> |
|
646 + <box class="social-notification-icon-container" collapsed="true" |
|
647 + onclick="SocialToolbar.showAmbientPopup(this);"> |
|
648 + <image class="social-notification-icon-image"/> |
|
649 + <box class="social-notification-icon-counter" collapsed="true"/> |
|
650 + </box> |
|
651 + </hbox> |
699 + </hbox> |
652 + </hbox> |
700 + </hbox> |
653 + </toolbaritem> |
701 + </toolbaritem> |
654 + |
702 + |
655 + <toolbaritem id="bookmarks-menu-button-container" |
703 + <toolbaritem id="bookmarks-menu-button-container" |
735 + class="menuitem-iconic"/> |
783 + class="menuitem-iconic"/> |
736 + </menupopup> |
784 + </menupopup> |
737 + </toolbarbutton> |
785 + </toolbarbutton> |
738 + </toolbaritem> |
786 + </toolbaritem> |
739 + |
787 + |
740 + <hbox id="window-controls" hidden="true" fullscreencontrol="true" pack="end"> |
788 + <hbox id="window-controls" hidden="true" pack="end"> |
741 + <toolbarbutton id="minimize-button" |
789 + <toolbarbutton id="minimize-button" |
742 + tooltiptext="&fullScreenMinimize.tooltip;" |
790 + tooltiptext="&fullScreenMinimize.tooltip;" |
743 + oncommand="window.minimize();"/> |
791 + oncommand="window.minimize();"/> |
744 + |
792 + |
745 + <toolbarbutton id="restore-button" |
793 + <toolbarbutton id="restore-button" |
893 + <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
941 + <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
894 + label="&printButton.label;" command="cmd_print" |
942 + label="&printButton.label;" command="cmd_print" |
895 + tooltiptext="&printButton.tooltip;"/> |
943 + tooltiptext="&printButton.tooltip;"/> |
896 + |
944 + |
897 + <!-- This is a placeholder for the Downloads Indicator. It is visible |
945 + <!-- This is a placeholder for the Downloads Indicator. It is visible |
898 + only during the customization of the toolbar or in the palette, and |
946 + during the customization of the toolbar, in the palette, and before |
899 + is replaced when customization is done. --> |
947 + the Downloads Indicator overlay is loaded. --> |
900 + <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
948 + <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
901 + observes="Tools:Downloads" |
949 + oncommand="DownloadsIndicatorView.onCommand(event);" |
902 + ondrop="DownloadsButtonDNDObserver.onDrop(event)" |
950 + ondrop="DownloadsIndicatorView.onDrop(event);" |
903 + ondragover="DownloadsButtonDNDObserver.onDragOver(event)" |
951 + ondragover="DownloadsIndicatorView.onDragOver(event);" |
904 + ondragenter="DownloadsButtonDNDObserver.onDragOver(event)" |
952 + ondragenter="DownloadsIndicatorView.onDragOver(event);" |
905 + ondragexit="DownloadsButtonDNDObserver.onDragExit(event)" |
953 + ondragleave="DownloadsIndicatorView.onDragLeave(event);" |
906 + label="&downloads.label;" |
954 + label="&downloads.label;" |
907 + tooltiptext="&downloads.tooltip;"/> |
955 + tooltiptext="&downloads.tooltip;"/> |
908 + |
956 + |
909 + <toolbarbutton id="history-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
957 + <toolbarbutton id="history-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
910 + observes="viewHistorySidebar" label="&historyButton.label;" |
958 + observes="viewHistorySidebar" label="&historyButton.label;" |
1004 + </sidebarheader> |
1052 + </sidebarheader> |
1005 + <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true" |
1053 + <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true" |
1006 + style="min-width: 14em; width: 18em; max-width: 36em;"/> |
1054 + style="min-width: 14em; width: 18em; max-width: 36em;"/> |
1007 + </vbox> |
1055 + </vbox> |
1008 + |
1056 + |
1009 + <splitter id="sidebar-splitter" class="chromeclass-extrachrome" hidden="true"/> |
1057 + <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/> |
1010 + <vbox id="appcontent" flex="1"> |
1058 + <vbox id="appcontent" flex="1"> |
1011 + <tabbrowser id="content" disablehistory="true" |
1059 + <tabbrowser id="content" disablehistory="true" |
1012 + flex="1" contenttooltip="aHTMLTooltip" |
1060 + flex="1" contenttooltip="aHTMLTooltip" |
1013 + tabcontainer="tabbrowser-tabs" |
1061 + tabcontainer="tabbrowser-tabs" |
1014 + contentcontextmenu="contentAreaContextMenu" |
1062 + contentcontextmenu="contentAreaContextMenu" |
1015 + autocompletepopup="PopupAutoComplete" |
1063 + autocompletepopup="PopupAutoComplete" |
1016 + onclick="contentAreaClick(event, false);"/> |
1064 + onclick="contentAreaClick(event, false);"/> |
|
1065 + <chatbar id="pinnedchats" layer="true" mousethrough="always"/> |
1017 + <statuspanel id="statusbar-display" inactive="true"/> |
1066 + <statuspanel id="statusbar-display" inactive="true"/> |
1018 + </vbox> |
1067 + </vbox> |
1019 + <splitter id="devtools-side-splitter" hidden="true"/> |
1068 + <splitter id="devtools-side-splitter" hidden="true"/> |
1020 + <vbox id="devtools-sidebar-box" hidden="true" |
1069 + <vbox id="devtools-sidebar-box" hidden="true" |
1021 + style="min-width: 18em; width: 22em; max-width: 42em;" persist="width"> |
1070 + style="min-width: 18em; width: 22em; max-width: 42em;" persist="width"> |
1022 + <toolbar id="devtools-sidebar-toolbar" |
1071 + <toolbar id="devtools-sidebar-toolbar" |
1023 + class="devtools-toolbar" |
1072 + class="devtools-toolbar" |
1024 + nowindowdrag="true"/> |
1073 + nowindowdrag="true"/> |
1025 + <deck id="devtools-sidebar-deck" flex="1"/> |
1074 + <deck id="devtools-sidebar-deck" flex="1"/> |
|
1075 + </vbox> |
|
1076 + <splitter id="social-sidebar-splitter" |
|
1077 + class="chromeclass-extrachrome sidebar-splitter" |
|
1078 + observes="socialSidebarBroadcaster"/> |
|
1079 + <vbox id="social-sidebar-box" |
|
1080 + class="chromeclass-extrachrome" |
|
1081 + observes="socialSidebarBroadcaster"> |
|
1082 + <browser id="social-sidebar-browser" |
|
1083 + type="content" |
|
1084 + disableglobalhistory="true" |
|
1085 + flex="1" |
|
1086 + style="min-width: 14em; width: 18em; max-width: 36em;"/> |
1026 + </vbox> |
1087 + </vbox> |
1027 + <vbox id="browser-border-end" hidden="true" layer="true"/> |
1088 + <vbox id="browser-border-end" hidden="true" layer="true"/> |
1028 + </hbox> |
1089 + </hbox> |
1029 + |
1090 + |
1030 + <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1091 + <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1057 + <toolbarbutton id="highlighter-closebutton" |
1118 + <toolbarbutton id="highlighter-closebutton" |
1058 + class="devtools-closebutton" |
1119 + class="devtools-closebutton" |
1059 + oncommand="InspectorUI.closeInspectorUI(false);" |
1120 + oncommand="InspectorUI.closeInspectorUI(false);" |
1060 + tooltiptext="&inspectCloseButton.tooltiptext;"/> |
1121 + tooltiptext="&inspectCloseButton.tooltiptext;"/> |
1061 +#endif |
1122 +#endif |
1062 + <toolbarbutton id="inspector-option-toolbarbutton" |
|
1063 + type="menu" |
|
1064 + tabindex="0" |
|
1065 + tooltiptext="&inspectOptionButton.tooltiptext;"> |
|
1066 + <menupopup id="inspector-option-popup" |
|
1067 + position="before_start"> |
|
1068 + <menuitem id="inspectorToggleVeil" |
|
1069 + type="checkbox" |
|
1070 + label="&inspectorToggleVeil.label;" |
|
1071 + accesskey="&inspectorToggleVeil.accesskey;" |
|
1072 + command="Inspector:ToggleVeil"/> |
|
1073 + <menuitem id="inspectorToggleInfobar" |
|
1074 + type="checkbox" |
|
1075 + label="&inspectorToggleInfobar.label;" |
|
1076 + accesskey="&inspectorToggleInfobar.accesskey;" |
|
1077 + command="Inspector:ToggleInfobar"/> |
|
1078 + </menupopup> |
|
1079 + </toolbarbutton> |
|
1080 + <toolbarbutton id="inspector-inspect-toolbutton" |
1123 + <toolbarbutton id="inspector-inspect-toolbutton" |
1081 + class="devtools-toolbarbutton" |
1124 + class="devtools-toolbarbutton" |
1082 + command="Inspector:Inspect"/> |
1125 + command="Inspector:Inspect"/> |
1083 + <toolbarbutton id="inspector-treepanel-toolbutton" |
1126 + <toolbarbutton id="inspector-treepanel-toolbutton" |
1084 + class="devtools-toolbarbutton" |
1127 + class="devtools-toolbarbutton" |
1128 + </hbox> |
1171 + </hbox> |
1129 + <hbox class="gclitoolbar-complete-node"/> |
1172 + <hbox class="gclitoolbar-complete-node"/> |
1130 + <textbox class="gclitoolbar-input-node" rows="1"/> |
1173 + <textbox class="gclitoolbar-input-node" rows="1"/> |
1131 + </stack> |
1174 + </stack> |
1132 + <toolbarbutton id="developer-toolbar-webconsole" |
1175 + <toolbarbutton id="developer-toolbar-webconsole" |
1133 + label="&webConsoleButton.label;" |
|
1134 + class="developer-toolbar-button" |
1176 + class="developer-toolbar-button" |
1135 + command="Tools:WebConsole"/> |
1177 + observes="devtoolsMenuBroadcaster_WebConsole"/> |
1136 + <toolbarbutton id="developer-toolbar-inspector" |
1178 + <toolbarbutton id="developer-toolbar-inspector" |
1137 + label="&inspectorButton.label;" |
|
1138 + class="developer-toolbar-button" |
1179 + class="developer-toolbar-button" |
1139 + hidden="true" |
1180 + observes="devtoolsMenuBroadcaster_Inspect"/> |
1140 + command="Tools:Inspect"/> |
|
1141 + <toolbarbutton id="developer-toolbar-styleeditor" |
1181 + <toolbarbutton id="developer-toolbar-styleeditor" |
1142 + label="&styleeditor.label;" |
|
1143 + class="developer-toolbar-button" |
1182 + class="developer-toolbar-button" |
1144 + hidden="true" |
1183 + observes="devtoolsMenuBroadcaster_StyleEditor"/> |
1145 + command="Tools:StyleEditor"/> |
|
1146 + <toolbarbutton id="developer-toolbar-debugger" |
1184 + <toolbarbutton id="developer-toolbar-debugger" |
1147 + label="&debuggerMenu.label2;" |
|
1148 + class="developer-toolbar-button" |
1185 + class="developer-toolbar-button" |
1149 + hidden="true" |
1186 + observes="devtoolsMenuBroadcaster_Debugger"/> |
1150 + command="Tools:Debugger"/> |
1187 + <toolbarbutton id="developer-toolbar-other-tools" |
|
1188 + type="menu" |
|
1189 + class="developer-toolbar-button" |
|
1190 + label="&devToolbarOtherToolsButton.label;"> |
|
1191 + <menupopup position="before_end"> |
|
1192 + <menuitem observes="devtoolsMenuBroadcaster_DevToolbar"/> |
|
1193 + <menuitem observes="devtoolsMenuBroadcaster_ResponsiveUI"/> |
|
1194 + <menuitem observes="devtoolsMenuBroadcaster_RemoteDebugger"/> |
|
1195 + <menuitem observes="devtoolsMenuBroadcaster_ChromeDebugger"/> |
|
1196 + <menuitem observes="devtoolsMenuBroadcaster_Scratchpad"/> |
|
1197 + <menuitem observes="devtoolsMenuBroadcaster_StyleEditor"/> |
|
1198 + <menuitem observes="devtoolsMenuBroadcaster_PageSource"/> |
|
1199 + <menuitem observes="devtoolsMenuBroadcaster_ErrorConsole"/> |
|
1200 + <menuseparator/> |
|
1201 + <menuitem observes="devtoolsMenuBroadcaster_GetMoreTools"/> |
|
1202 + </menupopup> |
|
1203 + </toolbarbutton> |
|
1204 + |
1151 +#ifndef XP_MACOSX |
1205 +#ifndef XP_MACOSX |
1152 + <toolbarbutton id="developer-toolbar-closebutton" |
1206 + <toolbarbutton id="developer-toolbar-closebutton" |
1153 + class="devtools-closebutton" |
1207 + class="devtools-closebutton" |
1154 + oncommand="DeveloperToolbar.hide();" |
1208 + oncommand="DeveloperToolbar.hide();" |
1155 + tooltiptext="&devToolbarCloseButton.tooltiptext;"/> |
1209 + tooltiptext="&devToolbarCloseButton.tooltiptext;"/> |
1226 * content/browser/browser.js (content/browser.js) |
1280 * content/browser/browser.js (content/browser.js) |
1227 * content/browser/browser.xul (content/browser.xul) |
1281 * content/browser/browser.xul (content/browser.xul) |
1228 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1282 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1229 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1283 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1230 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1284 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1231 * content/browser/content.js (content/content.js) |
1285 content/browser/content.js (content/content.js) |
1232 * content/browser/newtab/newTab.xul (content/newtab/newTab.xul) |
1286 content/browser/newtab/newTab.xul (content/newtab/newTab.xul) |
1233 * content/browser/newtab/newTab.js (content/newtab/newTab.js) |
1287 * content/browser/newtab/newTab.js (content/newtab/newTab.js) |
1234 content/browser/newtab/newTab.css (content/newtab/newTab.css) |
1288 content/browser/newtab/newTab.css (content/newtab/newTab.css) |
1235 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1289 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1236 * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1290 * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1237 * content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) |
1291 content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) |
1238 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1292 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1239 --- a/browser/components/build/nsModule.cpp |
1293 --- a/browser/components/build/nsModule.cpp |
1240 +++ b/browser/components/build/nsModule.cpp |
1294 +++ b/browser/components/build/nsModule.cpp |
1241 @@ -8,17 +8,17 @@ |
1295 @@ -8,17 +8,17 @@ |
1242 #include "nsBrowserCompsCID.h" |
1296 #include "nsBrowserCompsCID.h" |
1809 + |
1863 + |
1810 +#endif // nsunixshellservice_h____ |
1864 +#endif // nsunixshellservice_h____ |
1811 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1865 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1812 --- a/browser/installer/package-manifest.in |
1866 --- a/browser/installer/package-manifest.in |
1813 +++ b/browser/installer/package-manifest.in |
1867 +++ b/browser/installer/package-manifest.in |
1814 @@ -558,18 +558,20 @@ |
1868 @@ -559,18 +559,20 @@ |
1815 @BINPATH@/@PREF_DIR@/services-sync.js |
1869 @BINPATH@/@PREF_DIR@/services-sync.js |
1816 #endif |
1870 #endif |
1817 @BINPATH@/greprefs.js |
1871 @BINPATH@/greprefs.js |
1818 @BINPATH@/defaults/autoconfig/platform.js |
1872 @BINPATH@/defaults/autoconfig/platform.js |
1819 @BINPATH@/defaults/autoconfig/prefcalls.js |
1873 @BINPATH@/defaults/autoconfig/prefcalls.js |