60 +# Ehsan Akhgari <ehsan.akhgari@gmail.com> |
60 +# Ehsan Akhgari <ehsan.akhgari@gmail.com> |
61 +# Robert Strong <robert.bugzilla@gmail.com> |
61 +# Robert Strong <robert.bugzilla@gmail.com> |
62 +# Rob Campbell <rcampbell@mozilla.com> |
62 +# Rob Campbell <rcampbell@mozilla.com> |
63 +# Patrick Walton <pcwalton@mozilla.com> |
63 +# Patrick Walton <pcwalton@mozilla.com> |
64 +# David Dahl <ddahl@mozilla.com> |
64 +# David Dahl <ddahl@mozilla.com> |
|
65 +# Frank Yan <fyan@mozilla.com> |
65 +# |
66 +# |
66 +# Alternatively, the contents of this file may be used under the terms of |
67 +# Alternatively, the contents of this file may be used under the terms of |
67 +# either the GNU General Public License Version 2 or later (the "GPL"), or |
68 +# either the GNU General Public License Version 2 or later (the "GPL"), or |
68 +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
69 +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
69 +# in which case the provisions of the GPL or the LGPL are applicable instead |
70 +# in which case the provisions of the GPL or the LGPL are applicable instead |
77 +# |
78 +# |
78 +# ***** END LICENSE BLOCK ***** |
79 +# ***** END LICENSE BLOCK ***** |
79 + |
80 + |
80 +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> |
81 +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> |
81 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> |
82 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> |
|
83 +<?xml-stylesheet href="chrome://global/skin/webConsole.css" type="text/css"?> |
82 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> |
84 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> |
83 + |
85 + |
84 +<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?> |
86 +<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?> |
85 +<?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?> |
87 +<?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?> |
86 +<?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?> |
88 +<?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?> |
112 + lightweightthemes="true" |
114 + lightweightthemes="true" |
113 + lightweightthemesfooter="browser-bottombox" |
115 + lightweightthemesfooter="browser-bottombox" |
114 + windowtype="navigator:browser" |
116 + windowtype="navigator:browser" |
115 + screenX="4" screenY="4" |
117 + screenX="4" screenY="4" |
116 + browsingmode="normal" |
118 + browsingmode="normal" |
117 + persist="screenX screenY width height sizemode"> |
119 + persist="screenX screenY width height sizemode"> |
118 + |
120 + |
119 +# All JS files which are not content (only) dependent that browser.xul |
121 +# All JS files which are not content (only) dependent that browser.xul |
120 +# wishes to include *must* go into the global-scripts.inc file |
122 +# wishes to include *must* go into the global-scripts.inc file |
121 +# so that they can be shared by macBrowserOverlay.xul. |
123 +# so that they can be shared by macBrowserOverlay.xul. |
122 +#include global-scripts.inc |
124 +#include global-scripts.inc |
137 + <menupopup id="tabContextMenu" |
139 + <menupopup id="tabContextMenu" |
138 + onpopupshowing="if (event.target == this) TabContextMenu.updateContextMenu(this);" |
140 + onpopupshowing="if (event.target == this) TabContextMenu.updateContextMenu(this);" |
139 + onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;"> |
141 + onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;"> |
140 + <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;" |
142 + <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;" |
141 + oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/> |
143 + oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/> |
142 + <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;" |
|
143 + tbattr="tabbrowser-multiple" |
|
144 + oncommand="gBrowser.reloadAllTabs();"/> |
|
145 + <menuseparator/> |
144 + <menuseparator/> |
146 + <menuitem id="context_pinTab" label="&pinAppTab.label;" |
145 + <menuitem id="context_pinTab" label="&pinAppTab.label;" |
147 + accesskey="&pinAppTab.accesskey;" |
146 + accesskey="&pinAppTab.accesskey;" |
148 + oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/> |
147 + oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/> |
149 + <menuitem id="context_unpinTab" label="&unpinAppTab.label;" hidden="true" |
148 + <menuitem id="context_unpinTab" label="&unpinAppTab.label;" hidden="true" |
152 + <menu id="context_tabViewMenu" label="&moveToGroup.label;" |
151 + <menu id="context_tabViewMenu" label="&moveToGroup.label;" |
153 + accesskey="&moveToGroup.accesskey;"> |
152 + accesskey="&moveToGroup.accesskey;"> |
154 + <menupopup id="context_tabViewMenuPopup" |
153 + <menupopup id="context_tabViewMenuPopup" |
155 + onpopupshowing="if (event.target == this) TabView.updateContextMenu(TabContextMenu.contextTab, this);"> |
154 + onpopupshowing="if (event.target == this) TabView.updateContextMenu(TabContextMenu.contextTab, this);"> |
156 + <menuseparator id="context_tabViewNamedGroups" hidden="true"/> |
155 + <menuseparator id="context_tabViewNamedGroups" hidden="true"/> |
157 + <menuitem label="&moveToNewGroup.label;" |
156 + <menuitem id="context_tabViewNewGroup" label="&moveToNewGroup.label;" |
158 + oncommand="TabView.moveTabTo(TabContextMenu.contextTab, null);"/> |
157 + oncommand="TabView.moveTabTo(TabContextMenu.contextTab, null);"/> |
159 + </menupopup> |
158 + </menupopup> |
160 + </menu> |
159 + </menu> |
161 + <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;" |
160 + <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;" |
162 + accesskey="&moveToNewWindow.accesskey;" |
161 + accesskey="&moveToNewWindow.accesskey;" |
163 + tbattr="tabbrowser-multiple" |
162 + tbattr="tabbrowser-multiple" |
164 + oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/> |
163 + oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/> |
165 + <menuseparator/> |
164 + <menuseparator/> |
|
165 + <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;" |
|
166 + tbattr="tabbrowser-multiple" |
|
167 + oncommand="gBrowser.reloadAllTabs();"/> |
166 + <menuitem id="context_bookmarkAllTabs" |
168 + <menuitem id="context_bookmarkAllTabs" |
167 + label="&bookmarkAllTabs.label;" |
169 + label="&bookmarkAllTabs.label;" |
168 + accesskey="&bookmarkAllTabs.accesskey;" |
170 + accesskey="&bookmarkAllTabs.accesskey;" |
169 + command="Browser:BookmarkAllTabs"/> |
171 + command="Browser:BookmarkAllTabs"/> |
170 + <menuseparator/> |
|
171 + <menuitem id="context_closeOtherTabs" label="&closeOtherTabs.label;" accesskey="&closeOtherTabs.accesskey;" |
172 + <menuitem id="context_closeOtherTabs" label="&closeOtherTabs.label;" accesskey="&closeOtherTabs.accesskey;" |
172 + oncommand="gBrowser.removeAllTabsBut(TabContextMenu.contextTab);"/> |
173 + oncommand="gBrowser.removeAllTabsBut(TabContextMenu.contextTab);"/> |
|
174 + <menuseparator/> |
173 + <menuitem id="context_undoCloseTab" |
175 + <menuitem id="context_undoCloseTab" |
174 + label="&undoCloseTab.label;" |
176 + label="&undoCloseTab.label;" |
175 + accesskey="&undoCloseTab.accesskey;" |
177 + accesskey="&undoCloseTab.accesskey;" |
176 + observes="History:UndoCloseTab"/> |
178 + observes="History:UndoCloseTab"/> |
177 + <menuitem id="context_closeTab" label="&closeTab.label;" accesskey="&closeTab.accesskey;" |
179 + <menuitem id="context_closeTab" label="&closeTab.label;" accesskey="&closeTab.accesskey;" |
191 + |
193 + |
192 + <!-- for url bar autocomplete --> |
194 + <!-- for url bar autocomplete --> |
193 + <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/> |
195 + <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/> |
194 + |
196 + |
195 + <!-- for invalid form error message --> |
197 + <!-- for invalid form error message --> |
196 + <panel id="invalid-form-popup" noautofocus="true" hidden="true" level="parent"> |
198 + <panel id="invalid-form-popup" type="arrow" orient="vertical" noautofocus="true" hidden="true" level="parent"> |
197 + <description/> |
199 + <description/> |
198 + </panel> |
200 + </panel> |
199 + |
201 + |
200 + <panel id="editBookmarkPanel" |
202 + <panel id="editBookmarkPanel" |
|
203 + type="arrow" |
201 + orient="vertical" |
204 + orient="vertical" |
202 + ignorekeys="true" |
205 + ignorekeys="true" |
203 + hidden="true" |
206 + hidden="true" |
204 + onpopupshown="StarUI.panelShown(event);" |
207 + onpopupshown="StarUI.panelShown(event);" |
205 + aria-labelledby="editBookmarkPanelTitle"> |
208 + aria-labelledby="editBookmarkPanelTitle"> |
323 + <menuitem command="cmd_CustomizeToolbars" |
326 + <menuitem command="cmd_CustomizeToolbars" |
324 + label="&viewCustomizeToolbar.label;" |
327 + label="&viewCustomizeToolbar.label;" |
325 + accesskey="&viewCustomizeToolbar.accesskey;"/> |
328 + accesskey="&viewCustomizeToolbar.accesskey;"/> |
326 + </menupopup> |
329 + </menupopup> |
327 + |
330 + |
328 + <menupopup id="blockedPopupOptions" |
331 + <menupopup id="blockedPopupOptions" |
329 + onpopupshowing="gPopupBlockerObserver.fillPopupList(event);"> |
332 + onpopupshowing="gPopupBlockerObserver.fillPopupList(event);"> |
330 + <menuitem observes="blockedPopupAllowSite"/> |
333 + <menuitem observes="blockedPopupAllowSite"/> |
331 + <menuitem observes="blockedPopupEditSettings"/> |
334 + <menuitem observes="blockedPopupEditSettings"/> |
332 + <menuitem observes="blockedPopupDontShowMessage"/> |
335 + <menuitem observes="blockedPopupDontShowMessage"/> |
333 + <menuseparator observes="blockedPopupsSeparator"/> |
336 + <menuseparator observes="blockedPopupsSeparator"/> |
355 +#include browser-context.inc |
358 +#include browser-context.inc |
356 + </menupopup> |
359 + </menupopup> |
357 + |
360 + |
358 + <menupopup id="placesContext"/> |
361 + <menupopup id="placesContext"/> |
359 + |
362 + |
360 + <panel id="notification-popup" type="arrow" position="after_start" noautofocus="true" hidden="true"/> |
363 + <panel id="notification-popup" type="arrow" position="after_start" |
|
364 + hidden="true" orient="vertical"/> |
361 + |
365 + |
362 + <!-- Popup for site identity information --> |
366 + <!-- Popup for site identity information --> |
363 + <panel id="identity-popup" position="after_start" hidden="true" noautofocus="true" |
367 + <panel id="identity-popup" |
|
368 + type="arrow" |
|
369 + hidden="true" |
|
370 + noautofocus="true" |
364 + onpopupshown="document.getElementById('identity-popup-more-info-button').focus();" |
371 + onpopupshown="document.getElementById('identity-popup-more-info-button').focus();" |
365 + level="top"> |
372 + level="top"> |
366 + <hbox id="identity-popup-container" align="top"> |
373 + <hbox id="identity-popup-container" align="top"> |
367 + <image id="identity-popup-icon"/> |
374 + <image id="identity-popup-icon"/> |
368 + <vbox id="identity-popup-content-box"> |
375 + <vbox id="identity-popup-content-box"> |
453 + </panel> |
460 + </panel> |
454 + |
461 + |
455 + <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/> |
462 + <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/> |
456 + </popupset> |
463 + </popupset> |
457 + |
464 + |
458 +#ifdef MENUBAR_CAN_AUTOHIDE |
465 +#ifdef CAN_DRAW_IN_TITLEBAR |
459 + <vbox id="titlebar"> |
466 +<vbox id="titlebar"> |
460 + <hbox id="titlebar-content"> |
467 + <hbox id="titlebar-content"> |
461 + <hbox id="appmenu-button-container" align="start"> |
468 + <hbox id="appmenu-button-container"> |
462 + <button id="appmenu-button" |
469 + <button id="appmenu-button" |
463 + type="menu" |
470 + type="menu" |
464 +#ifdef XP_WIN |
471 + label="&brandShortName;" |
465 + label="&brandShortName;" |
472 + style="-moz-user-focus: ignore;"> |
466 +#else |
|
467 + label="&appMenuButton.label;" |
|
468 +#endif |
|
469 + style="-moz-user-focus: ignore;"> |
|
470 +#include browser-appmenu.inc |
473 +#include browser-appmenu.inc |
471 + </button> |
474 + </button> |
|
475 + </hbox> |
|
476 + <spacer id="titlebar-spacer" flex="1"/> |
|
477 + <hbox id="titlebar-buttonbox-container" align="start"> |
|
478 + <hbox id="titlebar-buttonbox"> |
|
479 + <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/> |
|
480 + <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/> |
|
481 + <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/> |
|
482 + </hbox> |
|
483 + </hbox> |
472 + </hbox> |
484 + </hbox> |
473 + <spacer id="titlebar-spacer" flex="1"/> |
485 +</vbox> |
474 + <hbox id="titlebar-buttonbox"> |
|
475 + <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/> |
|
476 + <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/> |
|
477 + <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/> |
|
478 + </hbox> |
|
479 + </hbox> |
|
480 + </vbox> |
|
481 +#endif |
486 +#endif |
482 + |
487 + |
483 +<deck flex="1" id="tab-view-deck"> |
488 +<deck flex="1" id="tab-view-deck"> |
484 +<vbox flex="1"> |
489 +<vbox flex="1"> |
485 + |
490 + |
499 + toolbarname="&menubarCmd.label;" |
504 + toolbarname="&menubarCmd.label;" |
500 + accesskey="&menubarCmd.accesskey;" |
505 + accesskey="&menubarCmd.accesskey;" |
501 +#endif |
506 +#endif |
502 + context="toolbar-context-menu"> |
507 + context="toolbar-context-menu"> |
503 + <toolbaritem id="menubar-items" align="center"> |
508 + <toolbaritem id="menubar-items" align="center"> |
504 +# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by |
509 +# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by |
505 +# hiddenWindow.xul. |
510 +# hiddenWindow.xul. |
506 +#include browser-menubar.inc |
511 +#include browser-menubar.inc |
507 + </toolbaritem> |
512 + </toolbaritem> |
508 + </toolbar> |
513 + </toolbar> |
509 + |
514 + |
510 + <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" |
515 + <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" |
511 + toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" |
516 + toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" |
512 + fullscreentoolbar="true" mode="icons" customizable="true" |
517 + fullscreentoolbar="true" mode="icons" customizable="true" |
513 +#ifdef WINCE |
518 +#ifdef WINCE |
514 + iconsize="small" defaulticonsize="small" |
519 + iconsize="small" defaulticonsize="small" |
515 + defaultset="unified-back-forward-button,home-button,urlbar-container,reload-button,stop-button,search-container,bookmarks-menu-button-container,navigator-throbber,fullscreenflex,window-controls" |
520 + defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,navigator-throbber,fullscreenflex,window-controls" |
516 +#else |
521 +#else |
517 + iconsize="large" |
522 + iconsize="large" |
518 + defaultset="unified-back-forward-button,home-button,urlbar-container,reload-button,stop-button,search-container,bookmarks-menu-button-container,fullscreenflex,window-controls" |
523 + defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,home-button,bookmarks-menu-button-container,fullscreenflex,window-controls" |
519 +#endif |
524 +#endif |
520 + context="toolbar-context-menu"> |
525 + context="toolbar-context-menu"> |
521 + |
526 + |
522 + <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional" |
527 + <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional" |
523 + context="backForwardMenu" removable="true" |
528 + context="backForwardMenu" removable="true" |
531 + label="&forwardCmd.label;" |
536 + label="&forwardCmd.label;" |
532 + command="Browser:ForwardOrForwardDuplicate" |
537 + command="Browser:ForwardOrForwardDuplicate" |
533 + onclick="checkForMiddleClick(this, event);" |
538 + onclick="checkForMiddleClick(this, event);" |
534 + tooltiptext="&forwardButton.tooltip;"/> |
539 + tooltiptext="&forwardButton.tooltip;"/> |
535 + </toolbaritem> |
540 + </toolbaritem> |
536 + |
|
537 + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
538 + persist="class" removable="true" |
|
539 + label="&homeButton.label;" |
|
540 + ondragover="homeButtonObserver.onDragOver(event)" |
|
541 + ondragenter="homeButtonObserver.onDragOver(event)" |
|
542 + ondrop="homeButtonObserver.onDrop(event)" |
|
543 + ondragleave="homeButtonObserver.onDragLeave(event)" |
|
544 + onclick="BrowserGoHome(event);" |
|
545 + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> |
|
546 + |
541 + |
547 + <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true" |
542 + <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true" |
548 + title="&locationItem.title;" class="chromeclass-location" removable="true"> |
543 + title="&locationItem.title;" class="chromeclass-location" removable="true"> |
549 + <textbox id="urlbar" flex="1" |
544 + <textbox id="urlbar" flex="1" |
550 + placeholder="&urlbar.placeholder;" |
545 + placeholder="&urlbar.placeholder;" |
604 + class="urlbar-icon" |
599 + class="urlbar-icon" |
605 + tooltiptext="&goEndCap.tooltip;" |
600 + tooltiptext="&goEndCap.tooltip;" |
606 + onclick="gURLBar.handleCommand(event);"/> |
601 + onclick="gURLBar.handleCommand(event);"/> |
607 + </hbox> |
602 + </hbox> |
608 + <toolbarbutton id="urlbar-go-button" |
603 + <toolbarbutton id="urlbar-go-button" |
|
604 + class="chromeclass-toolbar-additional" |
609 + onclick="gURLBar.handleCommand(event);" |
605 + onclick="gURLBar.handleCommand(event);" |
610 + tooltiptext="&goEndCap.tooltip;"/> |
606 + tooltiptext="&goEndCap.tooltip;"/> |
611 + <toolbarbutton id="urlbar-reload-button" |
607 + <toolbarbutton id="urlbar-reload-button" |
|
608 + class="chromeclass-toolbar-additional" |
612 + command="Browser:ReloadOrDuplicate" |
609 + command="Browser:ReloadOrDuplicate" |
613 + onclick="checkForMiddleClick(this, event);" |
610 + onclick="checkForMiddleClick(this, event);" |
614 + tooltiptext="&reloadButton.tooltip;"/> |
611 + tooltiptext="&reloadButton.tooltip;"/> |
615 + <toolbarbutton id="urlbar-stop-button" |
612 + <toolbarbutton id="urlbar-stop-button" |
|
613 + class="chromeclass-toolbar-additional" |
616 + command="Browser:Stop" |
614 + command="Browser:Stop" |
617 + tooltiptext="&stopButton.tooltip;"/> |
615 + tooltiptext="&stopButton.tooltip;"/> |
618 + </textbox> |
616 + </textbox> |
619 + </toolbaritem> |
617 + </toolbaritem> |
620 + |
618 + |
632 + <toolbaritem id="search-container" title="&searchItem.title;" |
630 + <toolbaritem id="search-container" title="&searchItem.title;" |
633 + align="center" class="chromeclass-toolbar-additional" |
631 + align="center" class="chromeclass-toolbar-additional" |
634 + flex="100" persist="width" removable="true"> |
632 + flex="100" persist="width" removable="true"> |
635 + <searchbar id="searchbar" flex="1"/> |
633 + <searchbar id="searchbar" flex="1"/> |
636 + </toolbaritem> |
634 + </toolbaritem> |
|
635 + |
|
636 + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
637 + persist="class" removable="true" |
|
638 + label="&homeButton.label;" |
|
639 + ondragover="homeButtonObserver.onDragOver(event)" |
|
640 + ondragenter="homeButtonObserver.onDragOver(event)" |
|
641 + ondrop="homeButtonObserver.onDrop(event)" |
|
642 + ondragexit="homeButtonObserver.onDragExit(event)" |
|
643 + onclick="BrowserGoHome(event);" |
|
644 + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> |
637 + |
645 + |
638 + <toolbaritem id="bookmarks-menu-button-container" |
646 + <toolbaritem id="bookmarks-menu-button-container" |
639 + class="chromeclass-toolbar-additional" |
647 + class="chromeclass-toolbar-additional" |
640 + removable="true" |
648 + removable="true" |
641 + title="&bookmarksMenuButton.label;"> |
649 + title="&bookmarksMenuButton.label;"> |
644 + class="toolbarbutton-1" |
652 + class="toolbarbutton-1" |
645 + label="&bookmarksMenuButton.label;" |
653 + label="&bookmarksMenuButton.label;" |
646 + tooltiptext="&bookmarksMenuButton.tooltip;" |
654 + tooltiptext="&bookmarksMenuButton.tooltip;" |
647 + ondragenter="PlacesMenuDNDHandler.onDragEnter(event);" |
655 + ondragenter="PlacesMenuDNDHandler.onDragEnter(event);" |
648 + ondragover="PlacesMenuDNDHandler.onDragOver(event);" |
656 + ondragover="PlacesMenuDNDHandler.onDragOver(event);" |
649 + ondragleave="PlacesMenuDNDHandler.onDragLeave(event);" |
657 + ondragexit="PlacesMenuDNDHandler.onDragExit(event);" |
650 + ondrop="PlacesMenuDNDHandler.onDrop(event);"> |
658 + ondrop="PlacesMenuDNDHandler.onDrop(event);"> |
651 + <menupopup id="BMB_bookmarksPopup" |
659 + <menupopup id="BMB_bookmarksPopup" |
652 + placespopup="true" |
660 + placespopup="true" |
653 + context="placesContext" |
661 + context="placesContext" |
654 + openInTabs="children" |
662 + openInTabs="children" |
664 + type="checkbox" |
672 + type="checkbox" |
665 + oncommand="onViewToolbarCommand(event)" |
673 + oncommand="onViewToolbarCommand(event)" |
666 + label="&viewBookmarksToolbar.label;"/> |
674 + label="&viewBookmarksToolbar.label;"/> |
667 + <menuseparator/> |
675 + <menuseparator/> |
668 + <menuitem id="BMB_bookmarksShowAll" |
676 + <menuitem id="BMB_bookmarksShowAll" |
669 + label="&showAllBookmarks.label;" |
677 + label="&showAllBookmarks2.label;" |
670 + command="Browser:ShowAllBookmarks" |
678 + command="Browser:ShowAllBookmarks" |
671 + key="manBookmarkKb"/> |
679 + key="manBookmarkKb"/> |
672 + <menuseparator/> |
680 + <menuseparator/> |
673 + <menuitem id="BMB_bookmarkThisPage" |
681 + <menuitem id="BMB_bookmarkThisPage" |
674 +#ifndef XP_MACOSX |
682 +#ifndef XP_MACOSX |
676 +#endif |
684 +#endif |
677 + label="&bookmarkThisPageCmd.label;" |
685 + label="&bookmarkThisPageCmd.label;" |
678 + command="Browser:AddBookmarkAs" |
686 + command="Browser:AddBookmarkAs" |
679 + key="addBookmarkAsKb"/> |
687 + key="addBookmarkAsKb"/> |
680 + <menuitem id="BMB_subscribeToPageMenuitem" |
688 + <menuitem id="BMB_subscribeToPageMenuitem" |
|
689 +#ifndef XP_MACOSX |
|
690 + class="menuitem-iconic" |
|
691 +#endif |
681 + label="&subscribeToPageMenuitem.label;" |
692 + label="&subscribeToPageMenuitem.label;" |
682 + oncommand="return FeedHandler.subscribeToFeed(null, event);" |
693 + oncommand="return FeedHandler.subscribeToFeed(null, event);" |
683 + onclick="checkForMiddleClick(this, event);" |
694 + onclick="checkForMiddleClick(this, event);" |
684 + observes="singleFeedMenuitemState"/> |
695 + observes="singleFeedMenuitemState"/> |
685 + <menu id="BMB_subscribeToPageMenupopup" |
696 + <menu id="BMB_subscribeToPageMenupopup" |
|
697 +#ifndef XP_MACOSX |
|
698 + class="menu-iconic" |
|
699 +#endif |
686 + label="&subscribeToPageMenupopup.label;" |
700 + label="&subscribeToPageMenupopup.label;" |
687 + observes="multipleFeedsMenuState"> |
701 + observes="multipleFeedsMenuState"> |
688 + <menupopup id="BMB_subscribeToPageSubmenuMenupopup" |
702 + <menupopup id="BMB_subscribeToPageSubmenuMenupopup" |
689 + onpopupshowing="return FeedHandler.buildFeedList(event.target);" |
703 + onpopupshowing="return FeedHandler.buildFeedList(event.target);" |
690 + oncommand="return FeedHandler.subscribeToFeed(null, event);" |
704 + oncommand="return FeedHandler.subscribeToFeed(null, event);" |
778 + </hbox> |
792 + </hbox> |
779 + </hbox> |
793 + </hbox> |
780 + </toolbaritem> |
794 + </toolbaritem> |
781 + </toolbar> |
795 + </toolbar> |
782 + |
796 + |
|
797 +#ifdef MENUBAR_CAN_AUTOHIDE |
|
798 +#ifndef CAN_DRAW_IN_TITLEBAR |
|
799 +#define APPMENU_ON_TABBAR |
|
800 +#endif |
|
801 +#endif |
|
802 + |
|
803 + |
783 + <toolbar id="TabsToolbar" |
804 + <toolbar id="TabsToolbar" |
784 + fullscreentoolbar="true" |
805 + fullscreentoolbar="true" |
785 + customizable="true" |
806 + customizable="true" |
786 + mode="icons" lockmode="true" |
807 + mode="icons" lockmode="true" |
787 + iconsize="small" defaulticonsize="small" lockiconsize="true" |
808 + iconsize="small" defaulticonsize="small" lockiconsize="true" |
788 + aria-label="&tabsToolbar.label;" |
809 + aria-label="&tabsToolbar.label;" |
789 + context="toolbar-context-menu" |
810 + context="toolbar-context-menu" |
|
811 +#ifdef APPMENU_ON_TABBAR |
|
812 + defaultset="appmenu-toolbar-button,tabbrowser-tabs,new-tab-button,alltabs-button,tabview-button,tabs-closebutton" |
|
813 +#else |
790 + defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabview-button,tabs-closebutton" |
814 + defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabview-button,tabs-closebutton" |
|
815 +#endif |
791 + collapsed="true"> |
816 + collapsed="true"> |
|
817 + |
|
818 +#ifdef APPMENU_ON_TABBAR |
|
819 + <toolbarbutton id="appmenu-toolbar-button" |
|
820 + class="chromeclass-toolbar-additional" |
|
821 + type="menu" |
|
822 + label="&brandShortName;" |
|
823 + tooltiptext="&appMenuButton.tooltip;"> |
|
824 +#include browser-appmenu.inc |
|
825 + </toolbarbutton> |
|
826 +#endif |
792 + |
827 + |
793 + <tabs id="tabbrowser-tabs" |
828 + <tabs id="tabbrowser-tabs" |
794 + class="tabbrowser-tabs" |
829 + class="tabbrowser-tabs" |
795 + tabbrowser="content" |
830 + tabbrowser="content" |
796 + flex="1" |
831 + flex="1" |
806 + onclick="checkForMiddleClick(this, event);" |
841 + onclick="checkForMiddleClick(this, event);" |
807 + tooltiptext="&newTabButton.tooltip;" |
842 + tooltiptext="&newTabButton.tooltip;" |
808 + ondrop="newTabButtonObserver.onDrop(event)" |
843 + ondrop="newTabButtonObserver.onDrop(event)" |
809 + ondragover="newTabButtonObserver.onDragOver(event)" |
844 + ondragover="newTabButtonObserver.onDragOver(event)" |
810 + ondragenter="newTabButtonObserver.onDragOver(event)" |
845 + ondragenter="newTabButtonObserver.onDragOver(event)" |
811 + ondragleave="newTabButtonObserver.onDragLeave(event)" |
846 + ondragexit="newTabButtonObserver.onDragExit(event)" |
812 + removable="true"/> |
847 + removable="true"/> |
813 + |
848 + |
814 + <toolbarbutton id="alltabs-button" |
849 + <toolbarbutton id="alltabs-button" |
815 + class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button" |
850 + class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button" |
816 + type="menu" |
851 + type="menu" |
853 + <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
888 + <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
854 + observes="Tools:Downloads" |
889 + observes="Tools:Downloads" |
855 + ondrop="DownloadsButtonDNDObserver.onDrop(event)" |
890 + ondrop="DownloadsButtonDNDObserver.onDrop(event)" |
856 + ondragover="DownloadsButtonDNDObserver.onDragOver(event)" |
891 + ondragover="DownloadsButtonDNDObserver.onDragOver(event)" |
857 + ondragenter="DownloadsButtonDNDObserver.onDragOver(event)" |
892 + ondragenter="DownloadsButtonDNDObserver.onDragOver(event)" |
858 + ondragleave="DownloadsButtonDNDObserver.onDragLeave(event)" |
893 + ondragexit="DownloadsButtonDNDObserver.onDragExit(event)" |
859 + label="&downloads.label;" |
894 + label="&downloads.label;" |
860 + tooltiptext="&downloads.tooltip;"/> |
895 + tooltiptext="&downloads.tooltip;"/> |
861 + |
896 + |
862 + <toolbarbutton id="history-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
897 + <toolbarbutton id="history-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
863 + observes="viewHistorySidebar" label="&historyButton.label;" |
898 + observes="viewHistorySidebar" label="&historyButton.label;" |
867 + observes="viewBookmarksSidebar" |
902 + observes="viewBookmarksSidebar" |
868 + tooltiptext="&bookmarksButton.tooltip;" |
903 + tooltiptext="&bookmarksButton.tooltip;" |
869 + ondrop="bookmarksButtonObserver.onDrop(event)" |
904 + ondrop="bookmarksButtonObserver.onDrop(event)" |
870 + ondragover="bookmarksButtonObserver.onDragOver(event)" |
905 + ondragover="bookmarksButtonObserver.onDragOver(event)" |
871 + ondragenter="bookmarksButtonObserver.onDragOver(event)" |
906 + ondragenter="bookmarksButtonObserver.onDragOver(event)" |
872 + ondragleave="bookmarksButtonObserver.onDragLeave(event)"/> |
907 + ondragexit="bookmarksButtonObserver.onDragExit(event)"/> |
873 + |
908 + |
874 + <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
909 + <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
875 + label="&newNavigatorCmd.label;" |
910 + label="&newNavigatorCmd.label;" |
876 + command="key_newNavigator" |
911 + command="key_newNavigator" |
877 + tooltiptext="&newWindowButton.tooltip;" |
912 + tooltiptext="&newWindowButton.tooltip;" |
878 + ondrop="newWindowButtonObserver.onDrop(event)" |
913 + ondrop="newWindowButtonObserver.onDrop(event)" |
879 + ondragover="newWindowButtonObserver.onDragOver(event)" |
914 + ondragover="newWindowButtonObserver.onDragOver(event)" |
880 + ondragenter="newWindowButtonObserver.onDragOver(event)" |
915 + ondragenter="newWindowButtonObserver.onDragOver(event)" |
881 + ondragleave="newWindowButtonObserver.onDragLeave(event)"/> |
916 + ondragexit="newWindowButtonObserver.onDragExit(event)"/> |
882 + |
917 + |
883 + <toolbarbutton id="cut-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
918 + <toolbarbutton id="cut-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
884 + label="&cutCmd.label;" |
919 + label="&cutCmd.label;" |
885 + command="cmd_cut" |
920 + command="cmd_cut" |
886 + tooltiptext="&cutButton.tooltip;"/> |
921 + tooltiptext="&cutButton.tooltip;"/> |
933 + </toolbarbutton> |
968 + </toolbarbutton> |
934 + </toolbarpalette> |
969 + </toolbarpalette> |
935 + </toolbox> |
970 + </toolbox> |
936 + |
971 + |
937 + <hbox flex="1" id="browser"> |
972 + <hbox flex="1" id="browser"> |
|
973 + <vbox id="browser-border-start" hidden="true" layer="true"/> |
938 + <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome"> |
974 + <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome"> |
939 + <sidebarheader id="sidebar-header" align="center"> |
975 + <sidebarheader id="sidebar-header" align="center"> |
940 + <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/> |
976 + <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/> |
941 + <image id="sidebar-throbber"/> |
977 + <image id="sidebar-throbber"/> |
942 + <toolbarbutton class="tabs-closebutton" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/> |
978 + <toolbarbutton class="tabs-closebutton" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/> |
952 + tabcontainer="tabbrowser-tabs" |
988 + tabcontainer="tabbrowser-tabs" |
953 + contentcontextmenu="contentAreaContextMenu" |
989 + contentcontextmenu="contentAreaContextMenu" |
954 + autocompletepopup="PopupAutoComplete" |
990 + autocompletepopup="PopupAutoComplete" |
955 + onclick="return contentAreaClick(event, false);"/> |
991 + onclick="return contentAreaClick(event, false);"/> |
956 + </vbox> |
992 + </vbox> |
|
993 + <vbox id="browser-border-end" hidden="true" layer="true"/> |
957 + </hbox> |
994 + </hbox> |
958 + |
995 + |
959 + <vbox id="browser-bottombox" layer="true"> |
996 + <vbox id="browser-bottombox" layer="true"> |
960 + <toolbar id="addon-bar" |
997 + <toolbar id="addon-bar" |
961 + toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;" |
998 + toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;" |
962 + collapsed="true" |
999 + collapsed="true" |
963 + class="toolbar-primary chromeclass-toolbar" |
1000 + class="toolbar-primary chromeclass-toolbar" |
964 + context="toolbar-context-menu" toolboxid="navigator-toolbox" |
1001 + context="toolbar-context-menu" toolboxid="navigator-toolbox" |
965 + mode="icons" iconsize="small" defaulticonsize="small" |
1002 + mode="icons" iconsize="small" defaulticonsize="small" |
966 + lockiconsize="true" |
1003 + lockiconsize="true" |
967 + customizable="true" align="right"> |
1004 + defaultset="addonbar-closebutton,spring,status-bar" |
|
1005 + customizable="true"> |
|
1006 + <toolbarbutton id="addonbar-closebutton" |
|
1007 + tooltiptext="&addonBarCloseButton.tooltip;" |
|
1008 + oncommand="setToolbarVisibility(this.parentNode, false);"/> |
968 + <statusbar id="status-bar"/> |
1009 + <statusbar id="status-bar"/> |
969 + </toolbar> |
1010 + </toolbar> |
970 + </vbox> |
1011 + </vbox> |
971 + |
1012 + |
972 +#ifndef XP_UNIX |
1013 +#ifndef XP_UNIX |
976 + <svg:circle cx="-0.46" cy="0.5" r="0.63"/> |
1017 + <svg:circle cx="-0.46" cy="0.5" r="0.63"/> |
977 + </svg:mask> |
1018 + </svg:mask> |
978 + <svg:mask id="winstripe-keyhole-forward-mask-hover" maskContentUnits="objectBoundingBox"> |
1019 + <svg:mask id="winstripe-keyhole-forward-mask-hover" maskContentUnits="objectBoundingBox"> |
979 + <svg:rect x="0" y="0" width="1" height="1" fill="white"/> |
1020 + <svg:rect x="0" y="0" width="1" height="1" fill="white"/> |
980 + <svg:circle cx="-0.35" cy="0.5" r="0.58"/> |
1021 + <svg:circle cx="-0.35" cy="0.5" r="0.58"/> |
|
1022 + </svg:mask> |
|
1023 + </svg:svg> |
|
1024 +#endif |
|
1025 +#ifdef XP_MACOSX |
|
1026 + <svg:svg height="0"> |
|
1027 + <svg:mask id="pinstripe-tab-ontop-left-curve-mask" maskContentUnits="userSpaceOnUse"> |
|
1028 + <svg:circle cx="9" cy="3" r="3" fill="white"/> |
|
1029 + <svg:rect x="9" y="0" width="3" height="3" fill="white"/> |
|
1030 + <svg:rect x="6" y="3" width="6" height="19" fill="white"/> |
|
1031 + <svg:rect x="1" y="17" width="5" height="5" fill="white"/> |
|
1032 + <svg:circle cx="1" cy="17" r="5"/> |
|
1033 + <svg:rect x="0" y="22" width="12" height="1" fill="white"/> |
|
1034 + </svg:mask> |
|
1035 + <svg:mask id="pinstripe-tab-ontop-right-curve-mask" maskContentUnits="userSpaceOnUse"> |
|
1036 + <svg:circle cx="3" cy="3" r="3" fill="white"/> |
|
1037 + <svg:rect x="0" y="0" width="3" height="3" fill="white"/> |
|
1038 + <svg:rect x="0" y="3" width="6" height="19" fill="white"/> |
|
1039 + <svg:rect x="6" y="17" width="5" height="5" fill="white"/> |
|
1040 + <svg:circle cx="11" cy="17" r="5"/> |
|
1041 + <svg:rect x="0" y="22" width="12" height="1" fill="white"/> |
|
1042 + </svg:mask> |
|
1043 + <svg:mask id="pinstripe-tab-onbottom-left-curve-mask" maskContentUnits="userSpaceOnUse"> |
|
1044 + <svg:circle cx="9" cy="20" r="3" fill="white"/> |
|
1045 + <svg:rect x="9" y="20" width="3" height="3" fill="white"/> |
|
1046 + <svg:rect x="6" y="1" width="6" height="19" fill="white"/> |
|
1047 + <svg:rect x="1" y="1" width="5" height="5" fill="white"/> |
|
1048 + <svg:circle cx="1" cy="6" r="5"/> |
|
1049 + <svg:rect x="0" y="0" width="12" height="1" fill="white"/> |
|
1050 + </svg:mask> |
|
1051 + <svg:mask id="pinstripe-tab-onbottom-right-curve-mask" maskContentUnits="userSpaceOnUse"> |
|
1052 + <svg:circle cx="3" cy="20" r="3" fill="white"/> |
|
1053 + <svg:rect x="0" y="20" width="3" height="3" fill="white"/> |
|
1054 + <svg:rect x="0" y="1" width="6" height="19" fill="white"/> |
|
1055 + <svg:rect x="6" y="1" width="5" height="5" fill="white"/> |
|
1056 + <svg:circle cx="11" cy="6" r="5"/> |
|
1057 + <svg:rect x="0" y="0" width="12" height="1" fill="white"/> |
981 + </svg:mask> |
1058 + </svg:mask> |
982 + </svg:svg> |
1059 + </svg:svg> |
983 +#endif |
1060 +#endif |
984 + |
1061 + |
985 +</vbox> |
1062 +</vbox> |
1464 + |
1541 + |
1465 +#endif // nsunixshellservice_h____ |
1542 +#endif // nsunixshellservice_h____ |
1466 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1543 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1467 --- a/browser/installer/package-manifest.in |
1544 --- a/browser/installer/package-manifest.in |
1468 +++ b/browser/installer/package-manifest.in |
1545 +++ b/browser/installer/package-manifest.in |
1469 @@ -432,16 +432,17 @@ |
1546 @@ -441,16 +441,17 @@ |
1470 #endif |
1547 #endif |
1471 #endif |
1548 #endif |
1472 |
1549 |
1473 ; [Default Preferences] |
1550 ; [Default Preferences] |
1474 ; All the pref files must be part of base to prevent migration bugs |
1551 ; All the pref files must be part of base to prevent migration bugs |