109 + lightweightthemes="true" |
111 + lightweightthemes="true" |
110 + lightweightthemesfooter="browser-bottombox" |
112 + lightweightthemesfooter="browser-bottombox" |
111 + windowtype="navigator:browser" |
113 + windowtype="navigator:browser" |
112 + screenX="4" screenY="4" |
114 + screenX="4" screenY="4" |
113 + browsingmode="normal" |
115 + browsingmode="normal" |
114 + toggletoolbar="true" |
|
115 + persist="screenX screenY width height sizemode"> |
116 + persist="screenX screenY width height sizemode"> |
116 + |
117 + |
117 +# All JS files which are not content (only) dependent that browser.xul |
118 +# All JS files which are not content (only) dependent that browser.xul |
118 +# wishes to include *must* go into the global-scripts.inc file |
119 +# wishes to include *must* go into the global-scripts.inc file |
119 +# so that they can be shared by macBrowserOverlay.xul. |
120 +# so that they can be shared by macBrowserOverlay.xul. |
120 +#include global-scripts.inc |
121 +#include global-scripts.inc |
121 +<script type="application/x-javascript" src="chrome://browser/content/nsContextMenu.js"/> |
122 +<script type="application/javascript" src="chrome://browser/content/nsContextMenu.js"/> |
122 + |
123 + |
123 +#ifdef MOZ_SAFE_BROWSING |
124 +#ifdef MOZ_SAFE_BROWSING |
124 +<script type="application/x-javascript" src="chrome://browser/content/safebrowsing/sb-loader.js"/> |
125 +<script type="application/javascript" src="chrome://browser/content/safebrowsing/sb-loader.js"/> |
125 +#endif |
126 +#endif |
126 +<script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/> |
127 +<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/> |
127 + |
128 + |
128 +<script type="application/javascript" src="chrome://browser/content/places/editBookmarkOverlay.js"/> |
129 +<script type="application/javascript" src="chrome://browser/content/places/editBookmarkOverlay.js"/> |
129 + |
130 + |
130 +# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the |
131 +# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the |
131 +# browser-sets.inc file for sharing with hiddenWindow.xul. |
132 +# browser-sets.inc file for sharing with hiddenWindow.xul. |
132 +#include browser-sets.inc |
133 +#include browser-sets.inc |
133 + |
134 + |
134 + <popupset id="mainPopupSet"> |
135 + <popupset id="mainPopupSet"> |
|
136 + <menupopup id="tabContextMenu" |
|
137 + onpopupshowing="if (event.target == this) TabContextMenu.updateContextMenu(this);" |
|
138 + onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;"> |
|
139 + <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;" |
|
140 + oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/> |
|
141 + <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;" |
|
142 + tbattr="tabbrowser-multiple" |
|
143 + oncommand="gBrowser.reloadAllTabs();"/> |
|
144 + <menuseparator/> |
|
145 + <menuitem id="context_openTabInWindow" label="&openTabInNewWindow.label;" |
|
146 + accesskey="&openTabInNewWindow.accesskey;" |
|
147 + tbattr="tabbrowser-multiple" |
|
148 + oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/> |
|
149 + <menuitem id="context_pinTab" label="&pinTab.label;" |
|
150 + accesskey="&pinTab.accesskey;" |
|
151 + oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/> |
|
152 + <menuitem id="context_unpinTab" label="&unpinTab.label;" hidden="true" |
|
153 + accesskey="&unpinTab.accesskey;" |
|
154 + oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/> |
|
155 + <menuseparator/> |
|
156 + <menuitem id="context_bookmarkTab" |
|
157 + label="&bookmarkThisTab.label;" |
|
158 + accesskey="&bookmarkThisTab.accesskey;" |
|
159 + oncommand="BookmarkThisTab(TabContextMenu.contextTab);"/> |
|
160 + <menuitem id="context_bookmarkAllTabs" |
|
161 + label="&bookmarkAllTabs.label;" |
|
162 + accesskey="&bookmarkAllTabs.accesskey;" |
|
163 + command="Browser:BookmarkAllTabs"/> |
|
164 + <menuseparator/> |
|
165 + <menuitem id="context_closeOtherTabs" label="&closeOtherTabs.label;" accesskey="&closeOtherTabs.accesskey;" |
|
166 + oncommand="gBrowser.removeAllTabsBut(TabContextMenu.contextTab);"/> |
|
167 + <menuitem id="context_undoCloseTab" |
|
168 + label="&undoCloseTab.label;" |
|
169 + accesskey="&undoCloseTab.accesskey;" |
|
170 + observes="History:UndoCloseTab"/> |
|
171 + <menuitem id="context_closeTab" label="&closeTab.label;" accesskey="&closeTab.accesskey;" |
|
172 + oncommand="gBrowser.removeTab(TabContextMenu.contextTab, { animate: true });"/> |
|
173 + </menupopup> |
|
174 + |
135 + <menupopup id="backForwardMenu" |
175 + <menupopup id="backForwardMenu" |
136 + onpopupshowing="return FillHistoryMenu(event.target);" |
176 + onpopupshowing="return FillHistoryMenu(event.target);" |
137 + oncommand="gotoHistoryIndex(event);" |
177 + oncommand="gotoHistoryIndex(event);" |
138 + onclick="checkForMiddleClick(this, event);"/> |
178 + onclick="checkForMiddleClick(this, event);"/> |
139 + <tooltip id="aHTMLTooltip" onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);"/> |
179 + <tooltip id="aHTMLTooltip" onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);"/> |
198 + label="&editBookmark.done.label;" |
238 + label="&editBookmark.done.label;" |
199 + default="true" |
239 + default="true" |
200 + oncommand="StarUI.panel.hidePopup();"/> |
240 + oncommand="StarUI.panel.hidePopup();"/> |
201 +#else |
241 +#else |
202 + <button id="editBookmarkPanelDoneButton" |
242 + <button id="editBookmarkPanelDoneButton" |
|
243 + class="editBookmarkPanelBottomButton" |
203 + label="&editBookmark.done.label;" |
244 + label="&editBookmark.done.label;" |
204 + default="true" |
245 + default="true" |
205 + oncommand="StarUI.panel.hidePopup();"/> |
246 + oncommand="StarUI.panel.hidePopup();"/> |
206 + <button id="editBookmarkPanelDeleteButton" |
247 + <button id="editBookmarkPanelDeleteButton" |
|
248 + class="editBookmarkPanelBottomButton" |
207 + label="&editBookmark.cancel.label;" |
249 + label="&editBookmark.cancel.label;" |
208 + oncommand="StarUI.cancelButtonOnCommand();"/> |
250 + oncommand="StarUI.cancelButtonOnCommand();"/> |
209 +#endif |
251 +#endif |
210 + </hbox> |
252 + </hbox> |
211 + </panel> |
253 + </panel> |
212 + |
254 + |
213 + <popup id="toolbar-context-menu" |
255 + <panel id="highlighter-panel" |
214 + onpopupshowing="onViewToolbarsPopupShowing(event);"> |
256 + hidden="true" |
|
257 + ignorekeys="true" |
|
258 + noautofocus="true" |
|
259 + noautohide="true" |
|
260 + onclick="InspectorUI.stopInspecting();" |
|
261 + onmousemove="InspectorUI.highlighter.handleMouseMove(event);" |
|
262 + onMozMousePixelScroll="InspectorUI.highlighter.handlePixelScroll(event);"/> |
|
263 + |
|
264 + <panel id="inspector-panel" |
|
265 + orient="vertical" |
|
266 + hidden="true" |
|
267 + ignorekeys="true" |
|
268 + noautofocus="true" |
|
269 + noautohide="true" |
|
270 + level="top" |
|
271 + titlebar="normal" |
|
272 + label="&inspectPanelTitle.label;"> |
|
273 + <toolbar id="inspector-toolbar" |
|
274 + nowindowdrag="true"> |
|
275 + <toolbarbutton id="inspector-inspect-toolbutton" |
|
276 + label="&inspectButton.label;" |
|
277 + accesskey="&inspectButton.accesskey;" |
|
278 + class="toolbarbutton-text" |
|
279 + command="Inspector:Inspect"/> |
|
280 + <toolbarbutton id="inspector-previous-toolbutton" |
|
281 + label="&inspectPreviousButton.label;" |
|
282 + accesskey="&inspectPreviousButton.accesskey;" |
|
283 + class="toolbarbutton-text" |
|
284 + command="Inspector:Previous"/> |
|
285 + <toolbarbutton id="inspector-next-toolbutton" |
|
286 + label="&inspectNextButton.label;" |
|
287 + accesskey="&inspectNextButton.accesskey;" |
|
288 + class="toolbarbutton-text" |
|
289 + command="Inspector:Next"/> |
|
290 + <toolbarbutton id="inspector-style-toolbutton" |
|
291 + label="&inspectStyleButton.label;" |
|
292 + accesskey="&inspectStyleButton.accesskey;" |
|
293 + class="toolbarbutton-text" |
|
294 + command="Inspector:Style"/> |
|
295 + </toolbar> |
|
296 + <tree id="inspector-tree" class="plain" |
|
297 + seltype="single" |
|
298 + treelines="true" |
|
299 + onselect="InspectorUI.onTreeSelected()" |
|
300 + flex="1"> |
|
301 + <treecols> |
|
302 + <treecol id="colNodeName" label="nodeName" primary="true" |
|
303 + persist="width,hidden,ordinal" flex="1"/> |
|
304 + <splitter class="tree-splitter"/> |
|
305 + <treecol id="colNodeValue" label="nodeValue" |
|
306 + persist="width,hidden,ordinal" flex="1"/> |
|
307 + </treecols> |
|
308 + <treechildren id="inspector-tree-body"/> |
|
309 + </tree> |
|
310 + <hbox align="end"> |
|
311 + <spacer flex="1" /> |
|
312 + <resizer dir="bottomend" /> |
|
313 + </hbox> |
|
314 + </panel> |
|
315 + |
|
316 + <panel id="inspector-style-panel" |
|
317 + hidden="true" |
|
318 + orient="vertical" |
|
319 + ignorekeys="true" |
|
320 + noautofocus="true" |
|
321 + noautohide="true" |
|
322 + level="top" |
|
323 + titlebar="normal" |
|
324 + label="&inspectStylePanelTitle.label;"> |
|
325 + <listbox id="inspector-style-listbox" flex="1"/> |
|
326 + <hbox align="end"> |
|
327 + <spacer flex="1" /> |
|
328 + <resizer dir="bottomend" /> |
|
329 + </hbox> |
|
330 + </panel> |
|
331 + |
|
332 + <menupopup id="toolbar-context-menu" |
|
333 + onpopupshowing="onViewToolbarsPopupShowing(event);"> |
|
334 + <menuseparator/> |
|
335 + <menuitem command="cmd_ToggleTabsOnTop" |
|
336 + type="checkbox" |
|
337 + label="&viewTabsOnTop.label;" |
|
338 + accesskey="&viewTabsOnTop.accesskey;"/> |
215 + <menuseparator/> |
339 + <menuseparator/> |
216 + <menuitem command="cmd_CustomizeToolbars" |
340 + <menuitem command="cmd_CustomizeToolbars" |
217 + label="&viewCustomizeToolbar.label;" |
341 + label="&viewCustomizeToolbar.label;" |
218 + accesskey="&viewCustomizeToolbar.accesskey;"/> |
342 + accesskey="&viewCustomizeToolbar.accesskey;"/> |
219 + </popup> |
343 + </menupopup> |
220 + |
344 + |
221 + <popup id="blockedPopupOptions" |
345 + <menupopup id="blockedPopupOptions" |
222 + onpopupshowing="gPopupBlockerObserver.fillPopupList(event);"> |
346 + onpopupshowing="gPopupBlockerObserver.fillPopupList(event);"> |
223 + <menuitem observes="blockedPopupAllowSite"/> |
347 + <menuitem observes="blockedPopupAllowSite"/> |
224 + <menuitem observes="blockedPopupEditSettings"/> |
348 + <menuitem observes="blockedPopupEditSettings"/> |
225 + <menuitem observes="blockedPopupDontShowMessage"/> |
349 + <menuitem observes="blockedPopupDontShowMessage"/> |
226 + <menuseparator observes="blockedPopupsSeparator"/> |
350 + <menuseparator observes="blockedPopupsSeparator"/> |
227 + </popup> |
351 + </menupopup> |
228 + |
352 + |
229 + <menupopup id="autohide-context" |
353 + <menupopup id="autohide-context" |
230 + onpopupshowing="FullScreen.getAutohide(this.firstChild);"> |
354 + onpopupshowing="FullScreen.getAutohide(this.firstChild);"> |
231 + <menuitem type="checkbox" label="&fullScreenAutohide.label;" |
355 + <menuitem type="checkbox" label="&fullScreenAutohide.label;" |
232 + accesskey="&fullScreenAutohide.accesskey;" |
356 + accesskey="&fullScreenAutohide.accesskey;" |
320 + <toolbarbutton class="KUI-panel-closebutton" |
448 + <toolbarbutton class="KUI-panel-closebutton" |
321 + oncommand="allTabs.close()" |
449 + oncommand="allTabs.close()" |
322 + tooltiptext="&closeCmd.label;"/> |
450 + tooltiptext="&closeCmd.label;"/> |
323 + </hbox> |
451 + </hbox> |
324 + <stack id="allTabs-stack"> |
452 + <stack id="allTabs-stack"> |
325 + <box id="allTabs-container"/> |
453 + <vbox id="allTabs-container"><hbox/></vbox> |
326 + <toolbarbutton id="allTabs-tab-close-button" |
454 + <toolbarbutton id="allTabs-tab-close-button" |
327 + class="tab-close-button" |
455 + class="tab-close-button" |
328 + oncommand="allTabs.closeTab(event);" |
456 + oncommand="allTabs.closeTab(event);" |
329 + tooltiptext="&closeCmd.label;" |
457 + tooltiptext="&closeCmd.label;" |
330 + style="visibility:hidden"/> |
458 + style="visibility:hidden"/> |
331 + </stack> |
459 + </stack> |
332 + </panel> |
460 + </panel> |
|
461 + |
|
462 + <!-- Bookmarks and history tooltip --> |
|
463 + <tooltip id="bhTooltip"/> |
|
464 + |
|
465 + <panel id="customizeToolbarSheetPopup" |
|
466 + noautohide="true"> |
|
467 + <iframe id="customizeToolbarSheetIFrame" |
|
468 + style="&dialog.style;" |
|
469 + hidden="true"/> |
|
470 + </panel> |
|
471 + |
|
472 + <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/> |
333 + </popupset> |
473 + </popupset> |
334 + |
474 + |
335 + <!-- Bookmarks and history tooltip --> |
475 +#ifdef MENUBAR_CAN_AUTOHIDE |
336 + <tooltip id="bhTooltip"/> |
476 + <hbox id="appmenu-button-container"> |
337 + |
477 + <button id="appmenu-button" |
338 + <toolbox id="navigator-toolbox" class="toolbox-top" mode="icons" |
478 + type="menu" |
|
479 + label="&brandShortName;" |
|
480 + style="-moz-user-focus: ignore;"> |
|
481 + <menupopup id="appmenu-popup"> |
|
482 + <hbox flex="1" class="split-menuitem"> |
|
483 + <menuitem id="appmenu_newTab" |
|
484 + class="split-menuitem-item" |
|
485 + flex="1" |
|
486 + label="&tabCmd.label;" |
|
487 + command="cmd_newNavigatorTab"/> |
|
488 + <menu class="split-menuitem-menu"> |
|
489 + <menupopup> |
|
490 + <menuitem id="appmenu_newTab_sub" |
|
491 + label="&tabCmd.label;" |
|
492 + command="cmd_newNavigatorTab"/> |
|
493 + <menuitem id="appmenu_newNavigator" |
|
494 + label="&newNavigatorCmd.label;" |
|
495 + command="cmd_newNavigator"/> |
|
496 + </menupopup> |
|
497 + </menu> |
|
498 + </hbox> |
|
499 + <menuseparator/> |
|
500 + <menuitem id="appmenu_savePage" |
|
501 + label="&savePageCmd.label;" |
|
502 + command="Browser:SavePage"/> |
|
503 + <menuitem id="appmenu_sendLink" |
|
504 + label="&sendPageCmd.label;" |
|
505 + command="Browser:SendLink"/> |
|
506 + <hbox flex="1" class="split-menuitem"> |
|
507 + <menuitem id="appmenu_print" |
|
508 + class="split-menuitem-item" |
|
509 + flex="1" |
|
510 + label="&appMenuPrintCmd.label;" |
|
511 + command="cmd_print"/> |
|
512 + <menu class="split-menuitem-menu"> |
|
513 + <menupopup> |
|
514 + <menuitem id="menu_printSetup" |
|
515 + label="&printSetupCmd.label;" |
|
516 + command="cmd_pageSetup"/> |
|
517 + <menuitem id="menu_printPreview" |
|
518 + label="&printPreviewCmd.label;" |
|
519 + command="cmd_printPreview"/> |
|
520 + </menupopup> |
|
521 + </menu> |
|
522 + </hbox> |
|
523 + <menuitem id="appmenu_find" |
|
524 + label="&findOnCmd.label;" |
|
525 + command="cmd_find"/> |
|
526 + <menuseparator/> |
|
527 + <menu id="appmenu_history" |
|
528 + label="&historyMenu.label;"> |
|
529 + <menupopup id="appmenu_history_popup" |
|
530 + placespopup="true" |
|
531 + oncommand="this.parentNode._placesView._onCommand(event);" |
|
532 + onclick="checkForMiddleClick(this, event);" |
|
533 + onpopupshowing="if (!this.parentNode._placesView) |
|
534 + new HistoryMenu(event);" |
|
535 + tooltip="bhTooltip" |
|
536 + popupsinherittooltip="true"> |
|
537 + <menuitem id="appmenu_sanitizeHistory" |
|
538 + label="&clearRecentHistory.label;" |
|
539 + key="key_sanitize" |
|
540 + command="Tools:Sanitize"/> |
|
541 + <menuseparator/> |
|
542 + <menuitem id="appmenu_showAllHistory" |
|
543 + label="&showAllHistoryCmd2.label;" |
|
544 + key="showAllHistoryKb" |
|
545 + command="Browser:ShowAllHistory"/> |
|
546 + <menuseparator class="hide-if-empty-places-result"/> |
|
547 + </menupopup> |
|
548 + </menu> |
|
549 + <menuseparator/> |
|
550 + <menu id="appmenu_developer" |
|
551 + label="&developerMenu.label;"> |
|
552 + <menupopup id="appmenu_developer_popup"> |
|
553 + <menuitem id="appmenu_pageSource" |
|
554 + label="&pageSourceCmd.label;" |
|
555 + command="View:PageSource"/> |
|
556 + <menuseparator/> |
|
557 + <menuitem id="appmenu_pageInspect" |
|
558 + label="&inspectMenu.label;" |
|
559 + command="Tools:Inspect"/> |
|
560 + <menuitem id="appmenu_webConsole" |
|
561 + label="&webConsoleCmd.label;" |
|
562 + oncommand="HUDConsoleUI.toggleHUD();"/> |
|
563 + </menupopup> |
|
564 + </menu> |
|
565 + <menuseparator/> |
|
566 + <menu id="appmenu_customize" |
|
567 + label="&appMenuCustomize.label;"> |
|
568 + <menupopup id="appmenu_customizeMenu" |
|
569 + onpopupshowing="onViewToolbarsPopupShowing(event);"> |
|
570 + <menuseparator/> |
|
571 + <menuitem command="cmd_ToggleTabsOnTop" |
|
572 + type="checkbox" |
|
573 + label="&viewTabsOnTop.label;"/> |
|
574 + <menuitem id="appmenu_toolbarLayout" |
|
575 + label="&appMenuToolbarLayout.label;" |
|
576 + command="cmd_CustomizeToolbars"/> |
|
577 + <menu id="appmenu_sidebars" |
|
578 + label="&appMenuSidebars.label;"> |
|
579 + <menupopup id="appmenu_sidebarMenu"> |
|
580 + <menuitem id="appmenu_bookmarksSidebar" |
|
581 + key="viewBookmarksSidebarKb" |
|
582 + observes="viewBookmarksSidebar"/> |
|
583 + <menuitem id="appmenu_historySidebar" |
|
584 + key="key_gotoHistory" |
|
585 + observes="viewHistorySidebar" |
|
586 + label="&historyButton.label;"/> |
|
587 + </menupopup> |
|
588 + </menu> |
|
589 + <menuseparator/> |
|
590 + <menuitem id="appmenu_openAddons" |
|
591 + label="&addons.label;" |
|
592 + command="Tools:Addons"/> |
|
593 + </menupopup> |
|
594 + </menu> |
|
595 + <menuitem id="appmenu_preferences" |
|
596 +#ifdef XP_UNIX |
|
597 + label="&preferencesCmdUnix.label;" |
|
598 +#else |
|
599 + label="&preferencesCmd.label;" |
|
600 +#endif |
|
601 + oncommand="openPreferences();"/> |
|
602 + <menuitem id="appmenu_openHelp" |
|
603 + label="&appMenuHelp.label;" |
|
604 + oncommand="openHelpLink('firefox-help')" |
|
605 + onclick="checkForMiddleClick(this, event);"/> |
|
606 + <menuseparator/> |
|
607 + <menuitem id="appmenu_quit" |
|
608 +#ifdef XP_WIN |
|
609 + label="&quitApplicationCmdWin.label;" |
|
610 +#else |
|
611 + label="&quitApplicationCmd.label;" |
|
612 +#endif |
|
613 + command="cmd_quitApplication"/> |
|
614 + </menupopup> |
|
615 + </button> |
|
616 + </hbox> |
|
617 +#endif |
|
618 + |
|
619 + <toolbox id="navigator-toolbox" |
|
620 + defaultmode="icons" mode="icons" |
339 +#ifdef WINCE |
621 +#ifdef WINCE |
340 + defaulticonsize="small" iconsize="small" |
622 + defaulticonsize="small" iconsize="small" |
341 +#endif |
623 +#endif |
342 + defaultmode="icons"> |
624 +#ifdef XP_WIN |
|
625 + tabsontop="true" |
|
626 +#endif |
|
627 +#ifdef XP_MACOSX |
|
628 + tabsontop="true" |
|
629 +#endif |
|
630 + persist="tabsontop"> |
343 + <!-- Menu --> |
631 + <!-- Menu --> |
344 + <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true" |
632 + <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true" |
345 + defaultset="menubar-items" |
633 + defaultset="menubar-items" |
346 + mode="icons" iconsize="small" defaulticonsize="small" |
634 + mode="icons" iconsize="small" defaulticonsize="small" |
347 +#ifdef XP_WIN |
635 + lockiconsize="true" |
|
636 +#ifdef MENUBAR_CAN_AUTOHIDE |
348 + toolbarname="&menubarCmd.label;" |
637 + toolbarname="&menubarCmd.label;" |
349 + accesskey="&menubarCmd.accesskey;" |
638 + accesskey="&menubarCmd.accesskey;" |
350 +#endif |
639 +#endif |
351 + context="toolbar-context-menu"> |
640 + context="toolbar-context-menu"> |
352 + <toolbaritem id="menubar-items" align="center"> |
641 + <toolbaritem id="menubar-items" align="center"> |
386 + <observes element="Browser:Forward" attribute="disabled"/> |
686 + <observes element="Browser:Forward" attribute="disabled"/> |
387 + </toolbarbutton> |
687 + </toolbarbutton> |
388 + </toolbaritem> |
688 + </toolbaritem> |
389 + |
689 + |
390 + <toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
690 + <toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
391 + label="&reloadCmd.label;" |
691 + label="&reloadCmd.label;" removable="true" |
392 + command="Browser:ReloadOrDuplicate" |
692 + command="Browser:ReloadOrDuplicate" |
393 + onclick="checkForMiddleClick(this, event);" |
693 + onclick="checkForMiddleClick(this, event);" |
394 + tooltiptext="&reloadButton.tooltip;"/> |
694 + tooltiptext="&reloadButton.tooltip;"/> |
395 + |
695 + |
396 + <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
696 + <toolbarbutton id="stop-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
397 + label="&stopCmd.label;" |
697 + label="&stopCmd.label;" removable="true" |
398 + command="Browser:Stop" |
698 + command="Browser:Stop" |
399 + tooltiptext="&stopButton.tooltip;"/> |
699 + tooltiptext="&stopButton.tooltip;"/> |
400 + |
700 + |
401 + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
701 + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
402 + persist="class" |
702 + persist="class" removable="true" |
403 + label="&homeButton.label;" |
703 + label="&homeButton.label;" |
404 + ondragover="homeButtonObserver.onDragOver(event)" |
704 + ondragover="homeButtonObserver.onDragOver(event)" |
405 + ondragenter="homeButtonObserver.onDragOver(event)" |
705 + ondragenter="homeButtonObserver.onDragOver(event)" |
406 + ondrop="homeButtonObserver.onDrop(event)" |
706 + ondrop="homeButtonObserver.onDrop(event)" |
407 + ondragleave="homeButtonObserver.onDragLeave(event)" |
707 + ondragleave="homeButtonObserver.onDragLeave(event)" |
408 + onclick="BrowserGoHome(event);"/> |
708 + onclick="BrowserGoHome(event);"/> |
409 + |
709 + |
410 + <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" |
710 + <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" |
411 + title="&locationItem.title;" class="chromeclass-location"> |
711 + title="&locationItem.title;" class="chromeclass-location" removable="true"> |
412 + <textbox id="urlbar" flex="1" |
712 + <textbox id="urlbar" flex="1" |
413 + bookmarkhistoryemptytext="&urlbar.bookmarkhistory.emptyText;" |
713 + placeholder="&urlbar.placeholder;" |
414 + bookmarkemptytext="&urlbar.bookmark.emptyText;" |
|
415 + historyemptytext="&urlbar.history.emptyText;" |
|
416 + noneemptytext="&urlbar.none.emptyText;" |
|
417 + type="autocomplete" |
714 + type="autocomplete" |
418 + autocompletesearch="history" |
715 + autocompletesearch="history" |
|
716 + autocompletesearchparam="enable-actions" |
419 + autocompletepopup="PopupAutoCompleteRichResult" |
717 + autocompletepopup="PopupAutoCompleteRichResult" |
420 + completeselectedindex="true" |
718 + completeselectedindex="true" |
421 + tabscrolling="true" |
719 + tabscrolling="true" |
422 + showcommentcolumn="true" |
720 + showcommentcolumn="true" |
423 + showimagecolumn="true" |
721 + showimagecolumn="true" |
476 + </textbox> |
782 + </textbox> |
477 + </toolbaritem> |
783 + </toolbaritem> |
478 + |
784 + |
479 + <toolbaritem id="search-container" title="&searchItem.title;" |
785 + <toolbaritem id="search-container" title="&searchItem.title;" |
480 + align="center" class="chromeclass-toolbar-additional" |
786 + align="center" class="chromeclass-toolbar-additional" |
481 + flex="100" persist="width"> |
787 + flex="100" persist="width" removable="true"> |
482 + <searchbar id="searchbar" flex="1"/> |
788 + <searchbar id="searchbar" flex="1"/> |
483 + </toolbaritem> |
789 + </toolbaritem> |
|
790 + |
|
791 + <toolbaritem id="bookmarks-menu-button-container" |
|
792 + class="chromeclass-toolbar-additional" |
|
793 + removable="true" |
|
794 + title="&bookmarksMenuButton.label;"> |
|
795 + <toolbarbutton id="bookmarks-menu-button" |
|
796 + type="menu" |
|
797 + class="toolbarbutton-1" |
|
798 + label="&bookmarksMenuButton.label;" |
|
799 + tooltiptext="&bookmarksMenuButton.tooltip;" |
|
800 + ondragenter="PlacesMenuDNDHandler.onDragEnter(event);" |
|
801 + ondragover="PlacesMenuDNDHandler.onDragOver(event);" |
|
802 + ondragleave="PlacesMenuDNDHandler.onDragLeave(event);" |
|
803 + ondrop="PlacesMenuDNDHandler.onDrop(event);"> |
|
804 + <menupopup id="BMB_bookmarksPopup" |
|
805 + placespopup="true" |
|
806 + context="placesContext" |
|
807 + openInTabs="children" |
|
808 + oncommand="BookmarksEventHandler.onCommand(event);" |
|
809 + onclick="BookmarksEventHandler.onClick(event);" |
|
810 + onpopupshowing="BookmarksMenuButton.onPopupShowing(event); |
|
811 + if (!this.parentNode._placesView) |
|
812 + new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');" |
|
813 + tooltip="bhTooltip" popupsinherittooltip="true"> |
|
814 + <menuitem id="BMB_bookmarkAllTabs" |
|
815 + label="&addCurPagesCmd.label;" |
|
816 + command="Browser:BookmarkAllTabs" |
|
817 + key="bookmarkAllTabsKb"/> |
|
818 + <menuitem id="BMB_bookmarksShowAll" |
|
819 + label="&organizeBookmarks.label;" |
|
820 + command="Browser:ShowAllBookmarks" |
|
821 + key="manBookmarkKb"/> |
|
822 + <menuseparator/> |
|
823 + <menuitem id="BMB_viewBookmarksToolbar" |
|
824 + type="checkbox" |
|
825 + oncommand="onViewToolbarCommand(event)" |
|
826 + label="&viewBookmarksToolbar.label;"/> |
|
827 + <menuitem id="BMB_viewBookmarksSidebar" |
|
828 + label="&viewBookmarksSidebar.label;" |
|
829 + type="checkbox" |
|
830 + oncommand="toggleSidebar('viewBookmarksSidebar');" |
|
831 + key="viewBookmarksSidebarKb"> |
|
832 + <observes element="viewBookmarksSidebar" attribute="checked"/> |
|
833 + </menuitem> |
|
834 + <menuseparator/> |
|
835 + <menu id="BMB_bookmarksToolbarFolderMenu" |
|
836 + class="menu-iconic bookmark-item" |
|
837 + label="&personalbarCmd.label;" |
|
838 + container="true"> |
|
839 + <menupopup id="BMB_bookmarksToolbarFolderPopup" |
|
840 + placespopup="true" |
|
841 + context="placesContext" |
|
842 + onpopupshowing="if (!this.parentNode._placesView) |
|
843 + new PlacesMenu(event, 'place:folder=TOOLBAR');"/> |
|
844 + </menu> |
|
845 + <menu id="BMB_unsortedBookmarksFolderMenu" |
|
846 + class="menu-iconic bookmark-item" |
|
847 + container="true"> |
|
848 + <menupopup id="BMB_unsortedBookmarksFolderPopup" |
|
849 + placespopup="true" |
|
850 + context="placesContext" |
|
851 + onpopupshowing="if (!this.parentNode._placesView) |
|
852 + new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS');"/> |
|
853 + </menu> |
|
854 + <menuseparator/> |
|
855 + </menupopup> |
|
856 + </toolbarbutton> |
|
857 + </toolbaritem> |
|
858 + |
|
859 + <hbox id="fullscreenflex" flex="1" hidden="true" fullscreencontrol="true"/> |
|
860 + <hbox id="window-controls" hidden="true" fullscreencontrol="true"> |
|
861 + <toolbarbutton id="minimize-button" |
|
862 + tooltiptext="&fullScreenMinimize.tooltip;" |
|
863 + oncommand="window.minimize();"/> |
|
864 + |
|
865 + <toolbarbutton id="restore-button" |
|
866 + tooltiptext="&fullScreenRestore.tooltip;" |
|
867 + oncommand="BrowserFullScreen();"/> |
|
868 + |
|
869 + <toolbarbutton id="close-button" |
|
870 + tooltiptext="&fullScreenClose.tooltip;" |
|
871 + oncommand="BrowserTryToCloseWindow();"/> |
|
872 + </hbox> |
|
873 + </toolbar> |
|
874 + |
|
875 + <toolbarset id="customToolbars" context="toolbar-context-menu"/> |
|
876 + |
|
877 + <toolbar id="PersonalToolbar" |
|
878 + mode="icons" iconsize="small" defaulticonsize="small" |
|
879 + lockiconsize="true" |
|
880 + class="chromeclass-directories" |
|
881 + context="toolbar-context-menu" |
|
882 + defaultset="personal-bookmarks" |
|
883 + toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;" |
|
884 + collapsed="true" |
|
885 + customizable="true"> |
|
886 + <toolbaritem flex="1" id="personal-bookmarks" title="&bookmarksItem.title;" |
|
887 + removable="true"> |
|
888 + <hbox flex="1" |
|
889 + id="PlacesToolbar" |
|
890 + context="placesContext" |
|
891 + onclick="BookmarksEventHandler.onClick(event);" |
|
892 + oncommand="BookmarksEventHandler.onCommand(event);" |
|
893 + tooltip="bhTooltip" |
|
894 + popupsinherittooltip="true"> |
|
895 + <toolbarbutton class="bookmark-item bookmarks-toolbar-customize" |
|
896 + mousethrough="never" |
|
897 + label="&bookmarksToolbarItem.label;"/> |
|
898 + <hbox flex="1"> |
|
899 + <hbox align="center"> |
|
900 + <image id="PlacesToolbarDropIndicator" |
|
901 + mousethrough="always" |
|
902 + collapsed="true"/> |
|
903 + </hbox> |
|
904 + <scrollbox orient="horizontal" |
|
905 + id="PlacesToolbarItems" |
|
906 + flex="1"/> |
|
907 + <toolbarbutton type="menu" |
|
908 + id="PlacesChevron" |
|
909 + class="chevron" |
|
910 + mousethrough="never" |
|
911 + collapsed="true" |
|
912 + tooltiptext="&bookmarksToolbarChevron.tooltip;" |
|
913 + onpopupshowing="document.getElementById('PlacesToolbar') |
|
914 + ._placesView._onChevronPopupShowing(event);"> |
|
915 + <menupopup id="PlacesChevronPopup" |
|
916 + placespopup="true" |
|
917 + tooltip="bhTooltip" popupsinherittooltip="true" |
|
918 + context="placesContext"/> |
|
919 + </toolbarbutton> |
|
920 + </hbox> |
|
921 + </hbox> |
|
922 + </toolbaritem> |
|
923 + </toolbar> |
|
924 + |
|
925 + <toolbar id="TabsToolbar" |
|
926 + fullscreentoolbar="true" |
|
927 + customizable="true" |
|
928 + mode="icons" lockmode="true" |
|
929 + iconsize="small" defaulticonsize="small" lockiconsize="true" |
|
930 + aria-label="&tabsToolbar.label;" |
|
931 + context="toolbar-context-menu" |
|
932 + defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton" |
|
933 + collapsed="true"> |
|
934 + |
|
935 + <tabs id="tabbrowser-tabs" |
|
936 + class="tabbrowser-tabs" |
|
937 + tabbrowser="content" |
|
938 + flex="1" |
|
939 + setfocus="false" |
|
940 + tooltip="tabbrowser-tab-tooltip"> |
|
941 + <tab class="tabbrowser-tab" selected="true" fadein="true"/> |
|
942 + </tabs> |
|
943 + |
|
944 + <toolbarbutton id="new-tab-button" |
|
945 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
946 + label="&tabCmd.label;" |
|
947 + command="cmd_newNavigatorTab" |
|
948 + onclick="checkForMiddleClick(this, event);" |
|
949 + tooltiptext="&newTabButton.tooltip;" |
|
950 + ondrop="newTabButtonObserver.onDrop(event)" |
|
951 + ondragover="newTabButtonObserver.onDragOver(event)" |
|
952 + ondragenter="newTabButtonObserver.onDragOver(event)" |
|
953 + ondragleave="newTabButtonObserver.onDragLeave(event)" |
|
954 + removable="true"/> |
|
955 + |
|
956 + <toolbarbutton id="alltabs-button" |
|
957 + class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button" |
|
958 + type="menu" |
|
959 + label="&listAllTabs.label;" |
|
960 + tooltiptext="&listAllTabs.label;" |
|
961 + removable="true"> |
|
962 + <menupopup id="alltabs-popup" |
|
963 + position="after_end"/> |
|
964 + </toolbarbutton> |
|
965 + |
|
966 + <toolbarbutton id="tabs-closebutton" |
|
967 + class="close-button tabs-closebutton" |
|
968 + command="cmd_close" |
|
969 + label="&closeTab.label;" |
|
970 + tooltiptext="&closeTab.label;"/> |
|
971 + |
|
972 + </toolbar> |
|
973 + |
|
974 + <toolbarpalette id="BrowserToolbarPalette"> |
484 + |
975 + |
485 + <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
976 + <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
486 + label="&printButton.label;" command="cmd_print" |
977 + label="&printButton.label;" command="cmd_print" |
487 + tooltiptext="&printButton.tooltip;"/> |
978 + tooltiptext="&printButton.tooltip;"/> |
488 + |
979 + |
489 + <toolbaritem id="navigator-throbber" title="&throbberItem.title;" align="center" pack="center" |
980 + <toolbaritem id="navigator-throbber" title="&throbberItem.title;" align="center" pack="center" |
490 + mousethrough="always"> |
981 + mousethrough="always"> |
491 + <image/> |
982 + <image/> |
492 + </toolbaritem> |
983 + </toolbaritem> |
493 + |
984 + |
494 + <toolbaritem flex="1" id="personal-bookmarks" title="&bookmarksItem.title;"> |
985 + <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
495 + <hbox id="bookmarksBarContent" flex="1" |
986 + observes="Tools:Downloads" |
496 + type="places" |
987 + ondrop="DownloadsButtonDNDObserver.onDrop(event)" |
497 + place="place:folder=TOOLBAR" |
988 + ondragover="DownloadsButtonDNDObserver.onDragOver(event)" |
498 + context="placesContext" |
989 + ondragenter="DownloadsButtonDNDObserver.onDragOver(event)" |
499 + onclick="BookmarksEventHandler.onClick(event);" |
990 + ondragleave="DownloadsButtonDNDObserver.onDragLeave(event)" |
500 + oncommand="BookmarksEventHandler.onCommand(event);" |
991 + label="&downloads.label;" |
501 + onpopupshowing="BookmarksEventHandler.onPopupShowing(event);" |
992 + tooltiptext="&downloads.tooltip;"/> |
502 + tooltip="bhTooltip" popupsinherittooltip="true"/> |
993 + |
503 + </toolbaritem> |
994 + <toolbarbutton id="history-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
504 + |
995 + observes="viewHistorySidebar" label="&historyButton.label;" |
505 + <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
996 + tooltiptext="&historyButton.tooltip;"/> |
506 + observes="Tools:Downloads" |
997 + |
507 + ondrop="DownloadsButtonDNDObserver.onDrop(event)" |
998 + <toolbarbutton id="bookmarks-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
508 + ondragover="DownloadsButtonDNDObserver.onDragOver(event)" |
999 + observes="viewBookmarksSidebar" |
509 + ondragenter="DownloadsButtonDNDObserver.onDragOver(event)" |
1000 + tooltiptext="&bookmarksButton.tooltip;" |
510 + ondragleave="DownloadsButtonDNDObserver.onDragLeave(event)" |
1001 + ondrop="bookmarksButtonObserver.onDrop(event)" |
511 + label="&downloads.label;" |
1002 + ondragover="bookmarksButtonObserver.onDragOver(event)" |
512 + tooltiptext="&downloads.tooltip;"/> |
1003 + ondragenter="bookmarksButtonObserver.onDragOver(event)" |
513 + |
1004 + ondragleave="bookmarksButtonObserver.onDragLeave(event)"/> |
514 + <toolbarbutton id="history-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
1005 + |
515 + observes="viewHistorySidebar" label="&historyButton.label;" |
1006 + <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
516 + tooltiptext="&historyButton.tooltip;"/> |
1007 + label="&newNavigatorCmd.label;" |
517 + |
1008 + command="key_newNavigator" |
518 + <toolbarbutton id="bookmarks-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
1009 + tooltiptext="&newWindowButton.tooltip;" |
519 + observes="viewBookmarksSidebar" |
1010 + ondrop="newWindowButtonObserver.onDrop(event)" |
520 + tooltiptext="&bookmarksButton.tooltip;" |
1011 + ondragover="newWindowButtonObserver.onDragOver(event)" |
521 + ondrop="bookmarksButtonObserver.onDrop(event)" |
1012 + ondragenter="newWindowButtonObserver.onDragOver(event)" |
522 + ondragover="bookmarksButtonObserver.onDragOver(event)" |
1013 + ondragleave="newWindowButtonObserver.onDragLeave(event)"/> |
523 + ondragenter="bookmarksButtonObserver.onDragOver(event)" |
1014 + |
524 + ondragleave="bookmarksButtonObserver.onDragLeave(event)"/> |
1015 + <toolbarbutton id="cut-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
525 + |
1016 + label="&cutCmd.label;" |
526 + <toolbarbutton id="new-tab-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
1017 + command="cmd_cut" |
527 + label="&tabCmd.label;" |
1018 + tooltiptext="&cutButton.tooltip;"/> |
528 + command="cmd_newNavigatorTab" |
1019 + |
529 + tooltiptext="&newTabButton.tooltip;" |
1020 + <toolbarbutton id="copy-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
530 + ondrop="newTabButtonObserver.onDrop(event)" |
1021 + label="©Cmd.label;" |
531 + ondragover="newTabButtonObserver.onDragOver(event)" |
1022 + command="cmd_copy" |
532 + ondragenter="newTabButtonObserver.onDragOver(event)" |
1023 + tooltiptext="©Button.tooltip;"/> |
533 + ondragleave="newTabButtonObserver.onDragLeave(event)"/> |
1024 + |
534 + |
1025 + <toolbarbutton id="paste-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
535 + <toolbarbutton id="new-window-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
1026 + label="&pasteCmd.label;" |
536 + label="&newNavigatorCmd.label;" |
1027 + command="cmd_paste" |
537 + command="key_newNavigator" |
1028 + tooltiptext="&pasteButton.tooltip;"/> |
538 + tooltiptext="&newWindowButton.tooltip;" |
1029 + |
539 + ondrop="newWindowButtonObserver.onDrop(event)" |
1030 + <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
540 + ondragover="newWindowButtonObserver.onDragOver(event)" |
1031 + observes="View:FullScreen" |
541 + ondragenter="newWindowButtonObserver.onDragOver(event)" |
1032 + type="checkbox" |
542 + ondragleave="newWindowButtonObserver.onDragLeave(event)"/> |
1033 + label="&fullScreenCmd.label;" |
543 + |
1034 + tooltiptext="&fullScreenButton.tooltip;"/> |
544 + <toolbarbutton id="cut-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
1035 + |
545 + label="&cutCmd.label;" |
|
546 + command="cmd_cut" |
|
547 + tooltiptext="&cutButton.tooltip;"/> |
|
548 + |
|
549 + <toolbarbutton id="copy-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
550 + label="©Cmd.label;" |
|
551 + command="cmd_copy" |
|
552 + tooltiptext="©Button.tooltip;"/> |
|
553 + |
|
554 + <toolbarbutton id="paste-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
555 + label="&pasteCmd.label;" |
|
556 + command="cmd_paste" |
|
557 + tooltiptext="&pasteButton.tooltip;"/> |
|
558 + <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
559 + observes="View:FullScreen" |
|
560 + type="checkbox" |
|
561 + label="&fullScreenCmd.label;" |
|
562 + tooltiptext="&fullScreenButton.tooltip;"/> |
|
563 + </toolbarpalette> |
1036 + </toolbarpalette> |
564 + |
|
565 + <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" |
|
566 + toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" |
|
567 + fullscreentoolbar="true" mode="icons" |
|
568 +#ifdef WINCE |
|
569 + iconsize="small" defaulticonsize="small" |
|
570 +#else |
|
571 + iconsize="large" |
|
572 +#endif |
|
573 + customizable="true" |
|
574 +#ifdef WINCE |
|
575 + defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,navigator-throbber,fullscreenflex,window-controls" |
|
576 +#else |
|
577 + defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container,fullscreenflex,window-controls" |
|
578 +#endif |
|
579 + context="toolbar-context-menu"> |
|
580 + <hbox id="fullscreenflex" flex="1" hidden="true" fullscreencontrol="true"/> |
|
581 + <hbox id="window-controls" hidden="true" fullscreencontrol="true"> |
|
582 + <toolbarbutton id="minimize-button" class="toolbarbutton-1" |
|
583 + tooltiptext="&fullScreenMinimize.tooltip;" |
|
584 + oncommand="window.minimize();"/> |
|
585 + |
|
586 + <toolbarbutton id="restore-button" class="toolbarbutton-1" |
|
587 + tooltiptext="&fullScreenRestore.tooltip;" |
|
588 + oncommand="BrowserFullScreen();"/> |
|
589 + |
|
590 + <toolbarbutton id="close-button" class="toolbarbutton-1" |
|
591 + tooltiptext="&fullScreenClose.tooltip;" |
|
592 + oncommand="BrowserTryToCloseWindow();"/> |
|
593 + </hbox> |
|
594 + </toolbar> |
|
595 + |
|
596 + <toolbarset id="customToolbars" context="toolbar-context-menu"/> |
|
597 + |
|
598 + <toolbar id="PersonalToolbar" |
|
599 + mode="icons" iconsize="small" defaulticonsize="small" |
|
600 + class="chromeclass-directories" |
|
601 + context="toolbar-context-menu" |
|
602 + defaultset="personal-bookmarks" |
|
603 + toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;" |
|
604 +#ifdef WINCE |
|
605 + collapsed="true" |
|
606 +#endif |
|
607 + customizable="true"/> |
|
608 + </toolbox> |
1037 + </toolbox> |
609 + |
1038 + |
610 + <hbox flex="1" id="browser"> |
1039 + <hbox flex="1" id="browser"> |
611 + <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome"> |
1040 + <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome"> |
612 + <sidebarheader id="sidebar-header" align="center"> |
1041 + <sidebarheader id="sidebar-header" align="center"> |
620 + |
1049 + |
621 + <splitter id="sidebar-splitter" class="chromeclass-extrachrome" hidden="true"/> |
1050 + <splitter id="sidebar-splitter" class="chromeclass-extrachrome" hidden="true"/> |
622 + <vbox id="appcontent" flex="1"> |
1051 + <vbox id="appcontent" flex="1"> |
623 + <tabbrowser id="content" disablehistory="true" |
1052 + <tabbrowser id="content" disablehistory="true" |
624 + flex="1" contenttooltip="aHTMLTooltip" |
1053 + flex="1" contenttooltip="aHTMLTooltip" |
|
1054 + tabcontainer="tabbrowser-tabs" |
625 + contentcontextmenu="contentAreaContextMenu" |
1055 + contentcontextmenu="contentAreaContextMenu" |
626 + onnewtab="BrowserOpenTab();" |
|
627 + autocompletepopup="PopupAutoComplete" |
1056 + autocompletepopup="PopupAutoComplete" |
628 + ondrop="contentAreaDNDObserver.onDrop(event)" |
|
629 + onclick="return contentAreaClick(event, false);"/> |
1057 + onclick="return contentAreaClick(event, false);"/> |
630 + </vbox> |
1058 + </vbox> |
631 + </hbox> |
1059 + </hbox> |
632 + <panel id="customizeToolbarSheetPopup" noautohide="true"> |
|
633 + <iframe id="customizeToolbarSheetIFrame" |
|
634 + style="&dialog.style;" |
|
635 + hidden="true"/> |
|
636 + </panel> |
|
637 + |
1060 + |
638 + <vbox id="browser-bottombox"> |
1061 + <vbox id="browser-bottombox"> |
639 + <findbar browserid="content" id="FindToolbar"/> |
|
640 + |
|
641 + <statusbar class="chromeclass-status" id="status-bar" |
1062 + <statusbar class="chromeclass-status" id="status-bar" |
642 +#ifdef WINCE |
1063 +#ifdef WINCE |
643 + hidden="true" |
1064 + hidden="true" |
644 +#endif |
1065 +#endif |
645 + ondrop="contentAreaDNDObserver.onDrop(event)"> |
1066 + > |
646 + <statusbarpanel id="statusbar-display" label="" flex="1"/> |
1067 + <statusbarpanel id="statusbar-display" label="" flex="1"/> |
647 + <statusbarpanel class="statusbarpanel-progress" collapsed="true" id="statusbar-progresspanel"> |
1068 + <statusbarpanel class="statusbarpanel-progress" collapsed="true" id="statusbar-progresspanel"> |
648 + <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/> |
1069 + <progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/> |
649 + </statusbarpanel> |
1070 + </statusbarpanel> |
650 + <statusbarpanel id="download-monitor" class="statusbarpanel-iconic-text" |
1071 + <statusbarpanel id="download-monitor" class="statusbarpanel-iconic-text" |
651 + tooltiptext="&downloadMonitor2.tooltip;" hidden="true" |
1072 + tooltiptext="&downloadMonitor2.tooltip;" hidden="true" |
652 + command="Tools:Downloads"/> |
1073 + command="Tools:Downloads"/> |
653 + <statusbarpanel id="security-button" class="statusbarpanel-iconic" |
1074 + <statusbarpanel id="security-button" class="statusbarpanel-iconic" |
654 + hidden="true" |
1075 + hidden="true" |
655 + onclick="if (event.button == 0 && event.detail == 1) displaySecurityInfo();"/> |
1076 + onclick="if (event.button == 0 && event.detail == 1) displaySecurityInfo();"/> |
|
1077 +#ifdef MOZ_SERVICES_SYNC |
|
1078 + <statusbarpanel id="sync-status-button" |
|
1079 + class="statusbarpanel-iconic-text" |
|
1080 + image="chrome://browser/skin/sync-16.png" |
|
1081 + label="&syncLogInItem.label;" |
|
1082 + oncommand="gSyncUI.handleStatusbarButton();" |
|
1083 + onmousedown="event.preventDefault();"> |
|
1084 + </statusbarpanel> |
|
1085 + <separator class="thin"/> |
|
1086 + <statusbarpanel id="sync-notifications-button" |
|
1087 + class="statusbarpanel-iconic-text" |
|
1088 + hidden="true" |
|
1089 + popup="sync-notifications-panel"> |
|
1090 + </statusbarpanel> |
|
1091 + <panel id="sync-notifications-panel" position="before_end"> |
|
1092 + <notificationbox id="sync-notifications-box"/> |
|
1093 + </panel> |
|
1094 +#endif |
656 + <statusbarpanel id="page-report-button" type="menu" |
1095 + <statusbarpanel id="page-report-button" type="menu" |
657 + class="statusbarpanel-menu-iconic" |
1096 + class="statusbarpanel-menu-iconic" |
658 + hidden="true" |
1097 + hidden="true" |
659 + tooltiptext="&pageReportIcon.tooltip;"> |
1098 + tooltiptext="&pageReportIcon.tooltip;"> |
660 + <menupopup onpopupshowing="gPopupBlockerObserver.fillPopupList(event);"> |
1099 + <menupopup onpopupshowing="gPopupBlockerObserver.fillPopupList(event);"> |
709 |
1160 |
710 #include "nsProfileMigrator.h" |
1161 #include "nsProfileMigrator.h" |
711 #if !defined(XP_BEOS) |
1162 #if !defined(XP_BEOS) |
712 #include "nsDogbertProfileMigrator.h" |
1163 #include "nsDogbertProfileMigrator.h" |
713 #endif |
1164 #endif |
714 @@ -85,17 +85,18 @@ using namespace mozilla::browser; |
1165 @@ -85,17 +85,17 @@ using namespace mozilla::browser; |
715 ///////////////////////////////////////////////////////////////////////////// |
1166 ///////////////////////////////////////////////////////////////////////////// |
716 |
1167 |
717 NS_GENERIC_FACTORY_CONSTRUCTOR(nsPlacesImportExportService) |
1168 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
718 #if defined(XP_WIN) |
1169 #if defined(XP_WIN) |
719 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService) |
1170 NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService) |
720 #elif defined(XP_MACOSX) |
1171 #elif defined(XP_MACOSX) |
721 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService) |
1172 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService) |
722 #elif defined(MOZ_WIDGET_GTK2) |
1173 #elif defined(MOZ_WIDGET_GTK2) |
723 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
1174 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
724 +// in nsUnixShellService |
1175 +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUnixShellService, Init) |
725 +//NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUnixShellService, Init) |
|
726 #endif |
1176 #endif |
727 |
1177 |
728 #ifndef WINCE |
1178 #ifndef WINCE |
729 |
1179 |
730 #if !defined(XP_BEOS) |
1180 #if !defined(XP_BEOS) |
731 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator) |
1181 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator) |
732 #endif |
1182 #endif |
733 #if !defined(XP_OS2) |
1183 #if !defined(XP_OS2) |
734 @@ -129,17 +130,17 @@ static const nsModuleComponentInfo compo |
1184 @@ -151,17 +151,17 @@ NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEM |
735 NS_SHELLSERVICE_CID, |
1185 #endif /* WINCE */ |
736 NS_SHELLSERVICE_CONTRACTID, |
1186 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); |
737 nsWindowsShellServiceConstructor}, |
1187 |
738 |
1188 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
|
1189 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
|
1190 #if defined(XP_WIN) |
|
1191 { &kNS_SHELLSERVICE_CID, false, NULL, nsWindowsShellServiceConstructor }, |
739 #elif defined(MOZ_WIDGET_GTK2) |
1192 #elif defined(MOZ_WIDGET_GTK2) |
740 { "Browser Shell Service", |
1193 - { &kNS_SHELLSERVICE_CID, false, NULL, nsGNOMEShellServiceConstructor }, |
741 NS_SHELLSERVICE_CID, |
1194 + { &kNS_SHELLSERVICE_CID, false, NULL, nsUnixShellServiceConstructor }, |
742 NS_SHELLSERVICE_CONTRACTID, |
|
743 - nsGNOMEShellServiceConstructor }, |
|
744 + nsUnixShellServiceConstructor }, |
|
745 |
|
746 #endif |
1195 #endif |
747 |
1196 { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor }, |
748 |
1197 { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create }, |
749 { "Places Import/Export Service", |
1198 #ifndef WINCE |
750 NS_PLACESIMPORTEXPORTSERVICE_CID, |
1199 { &kNS_FIREFOX_PROFILEMIGRATOR_CID, false, NULL, nsProfileMigratorConstructor }, |
751 NS_PLACESIMPORTEXPORTSERVICE_CONTRACTID, |
1200 #if defined(XP_WIN) && !defined(__MINGW32__) |
752 nsPlacesImportExportServiceConstructor}, |
1201 { &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor }, |
|
1202 #elif defined(XP_MACOSX) |
753 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in |
1203 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in |
754 --- a/browser/components/shell/src/Makefile.in |
1204 --- a/browser/components/shell/src/Makefile.in |
755 +++ b/browser/components/shell/src/Makefile.in |
1205 +++ b/browser/components/shell/src/Makefile.in |
756 @@ -70,21 +70,22 @@ CPPSRCS = nsWindowsShellService.cpp |
1206 @@ -52,17 +52,18 @@ endif |
757 REQUIRES += \ |
1207 |
758 browsercomps \ |
1208 ifneq (,$(filter WINCE WINNT,$(OS_ARCH))) |
759 $(NULL) |
1209 CPPSRCS = nsWindowsShellService.cpp |
760 else |
1210 else |
761 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) |
1211 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) |
762 CPPSRCS = nsMacShellService.cpp |
1212 CPPSRCS = nsMacShellService.cpp |
763 else |
1213 else |
764 ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2) |
1214 ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2) |
765 -CPPSRCS = nsGNOMEShellService.cpp |
1215 -CPPSRCS = nsGNOMEShellService.cpp |
766 +CPPSRCS = nsUnixShellService.cpp nsGNOMEShellService.cpp nsKDEShellService.cpp |
1216 +CPPSRCS = nsUnixShellService.cpp nsGNOMEShellService.cpp nsKDEShellService.cpp |
767 REQUIRES += \ |
|
768 mozgnome \ |
|
769 thebes \ |
|
770 $(NULL) |
|
771 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
1217 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre |
772 endif |
1218 endif |
773 endif |
1219 endif |
774 endif |
1220 endif |
775 |
1221 |