394 + <tooltip id="bhTooltip"/> |
394 + <tooltip id="bhTooltip"/> |
395 + |
395 + |
396 + <panel id="customizeToolbarSheetPopup" |
396 + <panel id="customizeToolbarSheetPopup" |
397 + noautohide="true"> |
397 + noautohide="true"> |
398 + <iframe id="customizeToolbarSheetIFrame" |
398 + <iframe id="customizeToolbarSheetIFrame" |
399 + style="&dialog.style;" |
399 + style="&dialog.dimensions;" |
400 + hidden="true"/> |
400 + hidden="true"/> |
401 + </panel> |
401 + </panel> |
402 + |
402 + |
403 + <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/> |
403 + <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/> |
404 + |
404 + |
405 + <tooltip id="back-button-tooltip"> |
405 + <tooltip id="back-button-tooltip"> |
406 + <label value="&backButton.tooltip;"/> |
406 + <label class="tooltip-label" value="&backButton.tooltip;"/> |
407 +#ifdef XP_MACOSX |
407 +#ifdef XP_MACOSX |
408 + <label value="&backForwardButtonMenuMac.tooltip;"/> |
408 + <label class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/> |
409 +#else |
409 +#else |
410 + <label value="&backForwardButtonMenu.tooltip;"/> |
410 + <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/> |
411 +#endif |
411 +#endif |
412 + </tooltip> |
412 + </tooltip> |
413 + |
413 + |
414 + <tooltip id="forward-button-tooltip"> |
414 + <tooltip id="forward-button-tooltip"> |
415 + <label value="&forwardButton.tooltip;"/> |
415 + <label class="tooltip-label" value="&forwardButton.tooltip;"/> |
416 +#ifdef XP_MACOSX |
416 +#ifdef XP_MACOSX |
417 + <label value="&backForwardButtonMenuMac.tooltip;"/> |
417 + <label class="tooltip-label" value="&backForwardButtonMenuMac.tooltip;"/> |
418 +#else |
418 +#else |
419 + <label value="&backForwardButtonMenu.tooltip;"/> |
419 + <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/> |
420 +#endif |
420 +#endif |
421 + </tooltip> |
421 + </tooltip> |
422 + </popupset> |
422 + </popupset> |
423 + |
423 + |
424 +#ifdef CAN_DRAW_IN_TITLEBAR |
424 +#ifdef CAN_DRAW_IN_TITLEBAR |
447 +<deck flex="1" id="tab-view-deck"> |
447 +<deck flex="1" id="tab-view-deck"> |
448 +<vbox flex="1" id="browser-panel"> |
448 +<vbox flex="1" id="browser-panel"> |
449 + |
449 + |
450 + <toolbox id="navigator-toolbox" |
450 + <toolbox id="navigator-toolbox" |
451 + defaultmode="icons" mode="icons" |
451 + defaultmode="icons" mode="icons" |
452 + iconsize="large" |
452 + iconsize="large"> |
453 + tabsontop="true" |
|
454 + persist="tabsontop"> |
|
455 + <!-- Menu --> |
453 + <!-- Menu --> |
456 + <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true" |
454 + <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true" |
457 + defaultset="menubar-items" |
455 + defaultset="menubar-items" |
458 + mode="icons" iconsize="small" defaulticonsize="small" |
456 + mode="icons" iconsize="small" defaulticonsize="small" |
459 + lockiconsize="true" |
457 + lockiconsize="true" |
507 + <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true" |
505 + <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true" |
508 + title="&locationItem.title;" class="chromeclass-location" removable="true"> |
506 + title="&locationItem.title;" class="chromeclass-location" removable="true"> |
509 + <textbox id="urlbar" flex="1" |
507 + <textbox id="urlbar" flex="1" |
510 + placeholder="&urlbar.placeholder;" |
508 + placeholder="&urlbar.placeholder;" |
511 + type="autocomplete" |
509 + type="autocomplete" |
512 + autocompletesearch="history" |
510 + autocompletesearch="urlinline history" |
513 + autocompletesearchparam="enable-actions" |
511 + autocompletesearchparam="enable-actions" |
514 + autocompletepopup="PopupAutoCompleteRichResult" |
512 + autocompletepopup="PopupAutoCompleteRichResult" |
515 + completeselectedindex="true" |
513 + completeselectedindex="true" |
516 + tabscrolling="true" |
514 + tabscrolling="true" |
517 + showcommentcolumn="true" |
515 + showcommentcolumn="true" |
539 + <box id="identity-box" role="button" |
537 + <box id="identity-box" role="button" |
540 + onclick="gIdentityHandler.handleIdentityButtonEvent(event);" |
538 + onclick="gIdentityHandler.handleIdentityButtonEvent(event);" |
541 + onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);" |
539 + onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);" |
542 + ondragstart="gIdentityHandler.onDragStart(event);"> |
540 + ondragstart="gIdentityHandler.onDragStart(event);"> |
543 + <hbox id="identity-box-inner" align="center"> |
541 + <hbox id="identity-box-inner" align="center"> |
544 + <stack id="page-proxy-stack" |
542 + <hbox id="page-proxy-stack" |
545 + onclick="PageProxyClickHandler(event);"> |
543 + onclick="PageProxyClickHandler(event);"> |
546 + <image id="page-proxy-favicon" validate="never" |
544 + <image id="page-proxy-favicon" validate="never" |
547 + pageproxystate="invalid" |
545 + pageproxystate="invalid" |
548 + onerror="this.removeAttribute('src');"/> |
546 + onerror="this.removeAttribute('src');"/> |
549 + </stack> |
547 + </hbox> |
550 + <hbox id="identity-icon-labels"> |
548 + <hbox id="identity-icon-labels"> |
551 + <label id="identity-icon-label" class="plain" flex="1"/> |
549 + <label id="identity-icon-label" class="plain" flex="1"/> |
552 + <label id="identity-icon-country-label" class="plain"/> |
550 + <label id="identity-icon-country-label" class="plain"/> |
553 + </hbox> |
551 + </hbox> |
554 + </hbox> |
552 + </hbox> |
998 + class="devtools-toolbar" |
996 + class="devtools-toolbar" |
999 + nowindowdrag="true" |
997 + nowindowdrag="true" |
1000 + hidden="true"> |
998 + hidden="true"> |
1001 + <vbox flex="1"> |
999 + <vbox flex="1"> |
1002 + <resizer id="inspector-top-resizer" flex="1" |
1000 + <resizer id="inspector-top-resizer" flex="1" |
1003 + class="inspector-resizer" |
|
1004 + dir="top" disabled="true" |
1001 + dir="top" disabled="true" |
1005 + element="inspector-tree-box"/> |
1002 + element="inspector-tree-box"/> |
1006 + <hbox> |
1003 + <hbox> |
1007 +#ifdef XP_MACOSX |
1004 +#ifdef XP_MACOSX |
1008 + <toolbarbutton id="highlighter-closebutton" |
1005 + <toolbarbutton id="highlighter-closebutton" |
1019 + clicktoscroll="true"/> |
1016 + clicktoscroll="true"/> |
1020 + <hbox id="inspector-tools"> |
1017 + <hbox id="inspector-tools"> |
1021 + <toolbarbutton id="inspector-3D-button" |
1018 + <toolbarbutton id="inspector-3D-button" |
1022 + class="devtools-toolbarbutton" |
1019 + class="devtools-toolbarbutton" |
1023 + hidden="true" |
1020 + hidden="true" |
1024 + label="&inspect3DButton.label;" |
1021 + label="&inspect3DViewButton.label;" |
1025 + accesskey="&inspect3DButton.accesskey;" |
1022 + accesskey="&inspect3DViewButton.accesskey;" |
1026 + command="Inspector:Tilt"/> |
1023 + command="Inspector:Tilt"/> |
1027 + <toolbarbutton id="inspector-style-button" |
1024 + <toolbarbutton id="inspector-style-button" |
1028 + class="devtools-toolbarbutton" |
1025 + class="devtools-toolbarbutton" |
1029 + label="&inspectStyleButton.label;" |
1026 + label="&inspectStyleButton.label;" |
1030 + accesskey="&inspectStyleButton.accesskey;" |
1027 + accesskey="&inspectStyleButton.accesskey;" |
1034 +#ifndef XP_MACOSX |
1031 +#ifndef XP_MACOSX |
1035 + <toolbarbutton id="highlighter-closebutton" |
1032 + <toolbarbutton id="highlighter-closebutton" |
1036 + oncommand="InspectorUI.closeInspectorUI(false);" |
1033 + oncommand="InspectorUI.closeInspectorUI(false);" |
1037 + tooltiptext="&inspectCloseButton.tooltiptext;"/> |
1034 + tooltiptext="&inspectCloseButton.tooltiptext;"/> |
1038 +#endif |
1035 +#endif |
1039 + <resizer id="inspector-end-resizer" |
|
1040 + class="inspector-resizer" |
|
1041 + dir="top" disabled="true" |
|
1042 + element="inspector-tree-box"/> |
|
1043 + </hbox> |
1036 + </hbox> |
1044 + </vbox> |
1037 + </vbox> |
1045 + </toolbar> |
1038 + </toolbar> |
1046 + <toolbar id="addon-bar" |
1039 + <toolbar id="addon-bar" |
1047 + toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;" |
1040 + toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;" |
1714 + |
1707 + |
1715 +#endif // nsunixshellservice_h____ |
1708 +#endif // nsunixshellservice_h____ |
1716 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1709 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1717 --- a/browser/installer/package-manifest.in |
1710 --- a/browser/installer/package-manifest.in |
1718 +++ b/browser/installer/package-manifest.in |
1711 +++ b/browser/installer/package-manifest.in |
1719 @@ -449,16 +449,17 @@ |
1712 @@ -450,16 +450,17 @@ |
1720 #endif |
1713 #endif |
1721 #endif |
1714 #endif |
1722 |
1715 |
1723 ; [Default Preferences] |
1716 ; [Default Preferences] |
1724 ; All the pref files must be part of base to prevent migration bugs |
1717 ; All the pref files must be part of base to prevent migration bugs |