| changeset 193 | c6b8ff4f191a |
| parent 180 | 3b887a914979 |
| child 205 | 71411f8585cd |
| 192:bb4213ee70c8 | 193:c6b8ff4f191a |
|---|---|
21 |
21 |
22 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul |
22 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul |
23 new file mode 100644 |
23 new file mode 100644 |
24 --- /dev/null |
24 --- /dev/null |
25 +++ b/browser/base/content/browser-kde.xul |
25 +++ b/browser/base/content/browser-kde.xul |
26 @@ -0,0 +1,1337 @@ |
26 @@ -0,0 +1,965 @@ |
27 +#filter substitution |
27 +#filter substitution |
28 +<?xml version="1.0"?> |
28 +<?xml version="1.0"?> |
29 +# -*- Mode: HTML -*- |
29 +# -*- Mode: HTML -*- |
30 +# |
30 +# |
31 +# ***** BEGIN LICENSE BLOCK ***** |
31 +# ***** BEGIN LICENSE BLOCK ***** |
176 + observes="History:UndoCloseTab"/> |
176 + observes="History:UndoCloseTab"/> |
177 + <menuitem id="context_closeTab" label="&closeTab.label;" accesskey="&closeTab.accesskey;" |
177 + <menuitem id="context_closeTab" label="&closeTab.label;" accesskey="&closeTab.accesskey;" |
178 + oncommand="gBrowser.removeTab(TabContextMenu.contextTab, { animate: true });"/> |
178 + oncommand="gBrowser.removeTab(TabContextMenu.contextTab, { animate: true });"/> |
179 + </menupopup> |
179 + </menupopup> |
180 + |
180 + |
181 + <!-- bug 415444/582485: event.stopPropagation is here for the cloned version |
|
182 + of this menupopup --> |
|
181 + <menupopup id="backForwardMenu" |
183 + <menupopup id="backForwardMenu" |
182 + onpopupshowing="return FillHistoryMenu(event.target);" |
184 + onpopupshowing="return FillHistoryMenu(event.target);" |
183 + oncommand="gotoHistoryIndex(event);" |
185 + oncommand="gotoHistoryIndex(event); event.stopPropagation();" |
184 + onclick="checkForMiddleClick(this, event);"/> |
186 + onclick="checkForMiddleClick(this, event);"/> |
185 + <tooltip id="aHTMLTooltip" onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);"/> |
187 + <tooltip id="aHTMLTooltip" onpopupshowing="return FillInHTMLTooltip(document.tooltipNode);"/> |
186 + |
188 + |
187 + <!-- for search and content formfill/pw manager --> |
189 + <!-- for search and content formfill/pw manager --> |
188 + <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/> |
190 + <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/> |
189 + |
191 + |
190 + <!-- for url bar autocomplete --> |
192 + <!-- for url bar autocomplete --> |
191 + <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/> |
193 + <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/> |
192 + |
194 + |
193 + <!-- for invalid form error message --> |
195 + <!-- for invalid form error message --> |
194 + <panel id="invalid-form-popup" noautofocus="true" hidden="true" level="parent"/> |
196 + <panel id="invalid-form-popup" noautofocus="true" hidden="true" level="parent"> |
197 + <description/> |
|
198 + </panel> |
|
195 + |
199 + |
196 + <panel id="editBookmarkPanel" |
200 + <panel id="editBookmarkPanel" |
197 + orient="vertical" |
201 + orient="vertical" |
198 + ignorekeys="true" |
202 + ignorekeys="true" |
199 + hidden="true" |
203 + hidden="true" |
205 + </vbox> |
209 + </vbox> |
206 + <vbox> |
210 + <vbox> |
207 + <label id="editBookmarkPanelTitle"/> |
211 + <label id="editBookmarkPanelTitle"/> |
208 + <description id="editBookmarkPanelDescription"/> |
212 + <description id="editBookmarkPanelDescription"/> |
209 + <hbox> |
213 + <hbox> |
210 + <button id="editBookmarkPanelUndoRemoveButton" |
|
211 + class="editBookmarkPanelHeaderButton" |
|
212 + hidden="true" |
|
213 + oncommand="StarUI.undoRemoveBookmarkCommand();" |
|
214 + label="&editBookmark.undo.label;" |
|
215 + accesskey="&editBookmark.undo.accessKey;"/> |
|
216 + <button id="editBookmarkPanelRemoveButton" |
214 + <button id="editBookmarkPanelRemoveButton" |
217 + class="editBookmarkPanelHeaderButton" |
215 + class="editBookmarkPanelHeaderButton" |
218 + oncommand="StarUI.removeBookmarkButtonCommand();" |
216 + oncommand="StarUI.removeBookmarkButtonCommand();" |
219 + accesskey="&editBookmark.removeBookmark.accessKey;"/> |
217 + accesskey="&editBookmark.removeBookmark.accessKey;"/> |
220 + <button id="editBookmarkPanelEditButton" |
|
221 + class="editBookmarkPanelHeaderButton" |
|
222 + oncommand="StarUI.editButtonCommand();" |
|
223 + label="&editBookmark.edit.label;" |
|
224 + accesskey="&editBookmark.edit.accessKey;"/> |
|
225 + </hbox> |
218 + </hbox> |
226 + </vbox> |
219 + </vbox> |
227 + </row> |
220 + </row> |
228 + <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/> |
221 + <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/> |
229 + <hbox id="editBookmarkPanelBottomButtons" pack="end"> |
222 + <hbox id="editBookmarkPanelBottomButtons" pack="end"> |
362 +#include browser-context.inc |
355 +#include browser-context.inc |
363 + </menupopup> |
356 + </menupopup> |
364 + |
357 + |
365 + <menupopup id="placesContext"/> |
358 + <menupopup id="placesContext"/> |
366 + |
359 + |
367 + <panel id="notification-popup" position="after_start" noautofocus="true" hidden="true"/> |
360 + <panel id="notification-popup" type="arrow" position="after_start" noautofocus="true" hidden="true"/> |
368 + |
361 + |
369 + <!-- Popup for site identity information --> |
362 + <!-- Popup for site identity information --> |
370 + <panel id="identity-popup" position="after_start" hidden="true" noautofocus="true" |
363 + <panel id="identity-popup" position="after_start" hidden="true" noautofocus="true" |
371 + onpopupshown="document.getElementById('identity-popup-more-info-button').focus();" |
364 + onpopupshown="document.getElementById('identity-popup-more-info-button').focus();" |
372 + level="top"> |
365 + level="top"> |
472 + label="&brandShortName;" |
465 + label="&brandShortName;" |
473 +#else |
466 +#else |
474 + label="&appMenuButton.label;" |
467 + label="&appMenuButton.label;" |
475 +#endif |
468 +#endif |
476 + style="-moz-user-focus: ignore;"> |
469 + style="-moz-user-focus: ignore;"> |
477 + <menupopup id="appmenu-popup" |
470 +#include browser-appmenu.inc |
478 +#ifdef MOZ_SERVICES_SYNC |
|
479 + onpopupshowing="updateEditUIVisibility();gSyncUI.updateUI();"> |
|
480 +#else |
|
481 + onpopupshowing="updateEditUIVisibility();"> |
|
482 +#endif |
|
483 + <hbox> |
|
484 + <vbox id="appmenuPrimaryPane"> |
|
485 + <hbox flex="1" |
|
486 + class="split-menuitem"> |
|
487 + <menuitem id="appmenu_newTab" |
|
488 + class="menuitem-tooltip split-menuitem-item" |
|
489 + flex="1" |
|
490 + label="&tabCmd.label;" |
|
491 + command="cmd_newNavigatorTab" |
|
492 + key="key_newNavigatorTab"/> |
|
493 + <menu class="split-menuitem-menu"> |
|
494 + <menupopup> |
|
495 + <menuitem id="appmenu_newTab_popup" |
|
496 + label="&tabCmd.label;" |
|
497 + command="cmd_newNavigatorTab" |
|
498 + key="key_newNavigatorTab"/> |
|
499 + <menuitem id="appmenu_newNavigator" |
|
500 + label="&newNavigatorCmd.label;" |
|
501 + command="cmd_newNavigator" |
|
502 + key="key_newNavigator"/> |
|
503 + <menuseparator/> |
|
504 + <menuitem id="appmenu_openFile" |
|
505 + label="&openFileCmd.label;" |
|
506 + command="Browser:OpenFile" |
|
507 + key="openFileKb"/> |
|
508 + </menupopup> |
|
509 + </menu> |
|
510 + </hbox> |
|
511 + <menuitem id="appmenu_privateBrowsing" |
|
512 + class="menuitem-iconic menuitem-iconic-tooltip" |
|
513 + label="&privateBrowsingCmd.start.label;" |
|
514 + startlabel="&privateBrowsingCmd.start.label;" |
|
515 + stoplabel="&privateBrowsingCmd.stop.label;" |
|
516 + command="Tools:PrivateBrowsing" |
|
517 + key="key_privatebrowsing"/> |
|
518 + <menuitem label="&goOfflineCmd.label;" |
|
519 + id="appmenu_offlineModeRecovery" |
|
520 + type="checkbox" |
|
521 + observes="workOfflineMenuitemState" |
|
522 + oncommand="BrowserOffline.toggleOfflineStatus();"/> |
|
523 + <menuseparator class="appmenu-menuseparator"/> |
|
524 + <hbox> |
|
525 + <menuitem id="appmenu-edit-label" |
|
526 + label="&appMenuEdit.label;" |
|
527 + disabled="true"/> |
|
528 + <toolbarbutton id="appmenu-cut" |
|
529 + class="appmenu-edit-button" |
|
530 + command="cmd_cut" |
|
531 + onclick="if (!this.disabled) hidePopup();" |
|
532 + tooltiptext="&cutButton.tooltip;"/> |
|
533 + <toolbarbutton id="appmenu-copy" |
|
534 + class="appmenu-edit-button" |
|
535 + command="cmd_copy" |
|
536 + onclick="if (!this.disabled) hidePopup();" |
|
537 + tooltiptext="©Button.tooltip;"/> |
|
538 + <toolbarbutton id="appmenu-paste" |
|
539 + class="appmenu-edit-button" |
|
540 + command="cmd_paste" |
|
541 + onclick="if (!this.disabled) hidePopup();" |
|
542 + tooltiptext="&pasteButton.tooltip;"/> |
|
543 + </hbox> |
|
544 + <menuitem id="appmenu_find" |
|
545 + class="menuitem-tooltip" |
|
546 + label="&appMenuFind.label;" |
|
547 + command="cmd_find" |
|
548 + key="key_find"/> |
|
549 + <menuseparator class="appmenu-menuseparator"/> |
|
550 + <menuitem id="appmenu_savePage" |
|
551 + class="menuitem-tooltip" |
|
552 + label="&savePageCmd.label;" |
|
553 + command="Browser:SavePage" |
|
554 + key="key_savePage"/> |
|
555 + <menuitem id="appmenu_sendLink" |
|
556 + label="&sendPageCmd.label;" |
|
557 + command="Browser:SendLink"/> |
|
558 + <hbox flex="1" |
|
559 + class="split-menuitem"> |
|
560 + <menuitem id="appmenu_print" |
|
561 + class="menuitem-iconic menuitem-iconic-tooltip split-menuitem-item" |
|
562 + flex="1" |
|
563 + label="&printCmd.label;" |
|
564 + command="cmd_print" |
|
565 + key="printKb"/> |
|
566 + <menu class="split-menuitem-menu"> |
|
567 + <menupopup> |
|
568 + <menuitem id="appmenu_print_popup" |
|
569 + class="menuitem-iconic" |
|
570 + label="&printCmd.label;" |
|
571 + command="cmd_print" |
|
572 + key="printKb"/> |
|
573 + <menuitem id="appmenu_printPreview" |
|
574 + label="&printPreviewCmd.label;" |
|
575 + command="cmd_printPreview"/> |
|
576 + <menuitem id="appmenu_printSetup" |
|
577 + label="&printSetupCmd.label;" |
|
578 + command="cmd_pageSetup"/> |
|
579 + </menupopup> |
|
580 + </menu> |
|
581 + </hbox> |
|
582 + <menuseparator class="appmenu-menuseparator"/> |
|
583 + <menu id="appmenu_webDeveloper" |
|
584 + label="&appMenuWebDeveloper.label;"> |
|
585 + <menupopup id="appmenu_webDeveloper_popup"> |
|
586 + <menuitem id="appmenu_webConsole" |
|
587 + label="&webConsoleCmd.label;" |
|
588 + type="checkbox" |
|
589 + oncommand="HUDConsoleUI.toggleHUD();" |
|
590 + key="key_webConsole"/> |
|
591 + <menuitem id="appmenu_pageInspect" |
|
592 + hidden="true" |
|
593 + label="&inspectMenu.label;" |
|
594 + type="checkbox" |
|
595 + command="Tools:Inspect" |
|
596 + key="key_inspect"/> |
|
597 + <menuseparator/> |
|
598 + <menuitem id="appmenu_pageSource" |
|
599 + label="&viewPageSourceCmd.label;" |
|
600 + command="View:PageSource" |
|
601 + key="key_viewSource"/> |
|
602 + <menuseparator/> |
|
603 +#define ID_PREFIX appmenu_developer_ |
|
604 +#include browser-charsetmenu.inc |
|
605 +#undef ID_PREFIX |
|
606 + <menuseparator/> |
|
607 + <menuitem label="&goOfflineCmd.label;" |
|
608 + type="checkbox" |
|
609 + observes="workOfflineMenuitemState" |
|
610 + oncommand="BrowserOffline.toggleOfflineStatus();"/> |
|
611 + </menupopup> |
|
612 + </menu> |
|
613 + <menuseparator class="appmenu-menuseparator"/> |
|
614 +#define ID_PREFIX appmenu_ |
|
615 +#include browser-charsetmenu.inc |
|
616 +#undef ID_PREFIX |
|
617 + <menuitem id="appmenu_fullScreen" |
|
618 + class="menuitem-tooltip" |
|
619 + label="&fullScreenCmd.label;" |
|
620 + type="checkbox" |
|
621 + observes="View:FullScreen" |
|
622 + key="key_fullScreen"/> |
|
623 + <menuitem id="appmenu-quit" |
|
624 + class="menuitem-iconic" |
|
625 +#ifdef XP_WIN |
|
626 + label="&quitApplicationCmdWin.label;" |
|
627 +#else |
|
628 + label="&quitApplicationCmd.label;" |
|
629 +#endif |
|
630 + command="cmd_quitApplication"/> |
|
631 + </vbox> |
|
632 + <vbox id="appmenuSecondaryPane"> |
|
633 + <hbox class="split-menuitem"> |
|
634 + <menuitem id="appmenu_bookmarks" |
|
635 + class="menuitem-iconic menuitem-iconic-tooltip split-menuitem-item" |
|
636 + flex="1" |
|
637 + label="&bookmarksMenu.label;" |
|
638 + command="Browser:ShowAllBookmarks" |
|
639 + key="manBookmarkKb"/> |
|
640 + <menu id="appmenu_bookmarksMenu" |
|
641 + class="split-menuitem-menu"> |
|
642 + <menupopup id="appmenu_bookmarksPopup" |
|
643 + placespopup="true" |
|
644 + context="placesContext" |
|
645 + openInTabs="children" |
|
646 + oncommand="BookmarksEventHandler.onCommand(event);" |
|
647 + onclick="BookmarksEventHandler.onClick(event);" |
|
648 + onpopupshowing="BookmarksMenuButton.onPopupShowing(event); |
|
649 + if (!this.parentNode._placesView) |
|
650 + new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');" |
|
651 + tooltip="bhTooltip" |
|
652 + popupsinherittooltip="true"> |
|
653 + <menuitem id="appmenu_showAllBookmarks" |
|
654 + label="&showAllBookmarks.label;" |
|
655 + command="Browser:ShowAllBookmarks" |
|
656 + context="" |
|
657 + key="manBookmarkKb"/> |
|
658 + <menuseparator/> |
|
659 + <menuitem id="appmenu_bookmarkThisPage" |
|
660 + class="menuitem-iconic" |
|
661 + label="&bookmarkThisPageCmd.label;" |
|
662 + command="Browser:AddBookmarkAs" |
|
663 + key="addBookmarkAsKb"/> |
|
664 + <menuitem id="appmenu_subscribeToPage" |
|
665 + class="menuitem-iconic" |
|
666 + label="&subscribeToPageMenuitem.label;" |
|
667 + oncommand="return FeedHandler.subscribeToFeed(null, event);" |
|
668 + onclick="checkForMiddleClick(this, event);" |
|
669 + observes="singleFeedMenuitemState"/> |
|
670 + <menu id="appmenu_subscribeToPageMenu" |
|
671 + class="menu-iconic" |
|
672 + label="&subscribeToPageMenupopup.label;" |
|
673 + observes="multipleFeedsMenuState"> |
|
674 + <menupopup id="appmenu_subscribeToPageMenupopup" |
|
675 + onpopupshowing="return FeedHandler.buildFeedList(event.target);" |
|
676 + oncommand="return FeedHandler.subscribeToFeed(null, event);" |
|
677 + onclick="checkForMiddleClick(this, event);"/> |
|
678 + </menu> |
|
679 + <menuseparator/> |
|
680 + <menu id="appmenu_bookmarksToolbar" |
|
681 + placesanonid="toolbar-autohide" |
|
682 + class="menu-iconic bookmark-item" |
|
683 + label="&personalbarCmd.label;" |
|
684 + container="true"> |
|
685 + <menupopup id="appmenu_bookmarksToolbarPopup" |
|
686 + placespopup="true" |
|
687 + context="placesContext" |
|
688 + onpopupshowing="if (!this.parentNode._placesView) |
|
689 + new PlacesMenu(event, 'place:folder=TOOLBAR');"/> |
|
690 + </menu> |
|
691 + <menuseparator/> |
|
692 + <!-- Bookmarks menu items --> |
|
693 + <menuseparator builder="end" |
|
694 + class="hide-if-empty-places-result"/> |
|
695 + <menuitem id="appmenu_unsortedBookmarks" |
|
696 + label="&appMenuUnsorted.label;" |
|
697 + oncommand="PlacesCommandHook.showPlacesOrganizer('UnfiledBookmarks');" |
|
698 + class="menuitem-iconic"/> |
|
699 + </menupopup> |
|
700 + </menu> |
|
701 + </hbox> |
|
702 + <hbox class="split-menuitem"> |
|
703 + <menuitem id="appmenu_history" |
|
704 + class="menuitem-iconic menuitem-iconic-tooltip split-menuitem-item" |
|
705 + flex="1" |
|
706 + label="&historyMenu.label;" |
|
707 + command="Browser:ShowAllHistory" |
|
708 + key="showAllHistoryKb"/> |
|
709 + <menu id="appmenu_historyMenu" |
|
710 + class="split-menuitem-menu"> |
|
711 + <menupopup id="appmenu_historyMenupopup" |
|
712 + placespopup="true" |
|
713 + oncommand="this.parentNode._placesView._onCommand(event);" |
|
714 + onclick="checkForMiddleClick(this, event);" |
|
715 + onpopupshowing="if (!this.parentNode._placesView) |
|
716 + new HistoryMenu(event);" |
|
717 + tooltip="bhTooltip" |
|
718 + popupsinherittooltip="true"> |
|
719 + <menuitem id="appmenu_showAllHistory" |
|
720 + label="&showAllHistoryCmd2.label;" |
|
721 + command="Browser:ShowAllHistory" |
|
722 + key="showAllHistoryKb"/> |
|
723 + <menuseparator/> |
|
724 + <menuitem id="appmenu_sanitizeHistory" |
|
725 + label="&clearRecentHistory.label;" |
|
726 + key="key_sanitize" |
|
727 + command="Tools:Sanitize"/> |
|
728 + <menuseparator class="hide-if-empty-places-result"/> |
|
729 + <menuitem id="appmenu_restoreLastSession" |
|
730 + class="restoreLastSession" |
|
731 + label="&historyRestoreLastSession.label;" |
|
732 + oncommand="restoreLastSession();" |
|
733 + disabled="true"/> |
|
734 + <menu id="appmenu_recentlyClosedTabsMenu" |
|
735 + class="recentlyClosedTabsMenu" |
|
736 + label="&historyUndoMenu.label;" |
|
737 + disabled="true"> |
|
738 + <menupopup id="appmenu_recentlyClosedTabsMenupopup" |
|
739 + onpopupshowing="document.getElementById('appmenu_historyMenu')._placesView.populateUndoSubmenu();"/> |
|
740 + </menu> |
|
741 + <menu id="appmenu_recentlyClosedWindowsMenu" |
|
742 + class="recentlyClosedWindowsMenu" |
|
743 + label="&historyUndoWindowMenu.label;" |
|
744 + disabled="true"> |
|
745 + <menupopup id="appmenu_recentlyClosedWindowsMenupopup" |
|
746 + onpopupshowing="document.getElementById('appmenu_historyMenu')._placesView.populateUndoWindowSubmenu();"/> |
|
747 + </menu> |
|
748 + <menuseparator/> |
|
749 + </menupopup> |
|
750 + </menu> |
|
751 + </hbox> |
|
752 + <menuitem id="appmenu_downloads" |
|
753 + class="menuitem-tooltip" |
|
754 + label="&downloads.label;" |
|
755 + command="Tools:Downloads" |
|
756 + key="key_openDownloads"/> |
|
757 + <spacer id="appmenuSecondaryPane-spacer"/> |
|
758 + <menuitem id="appmenu_addons" |
|
759 + class="menuitem-iconic menuitem-iconic-tooltip" |
|
760 + label="&addons.label;" |
|
761 + command="Tools:Addons" |
|
762 + key="key_openAddons"/> |
|
763 + <hbox class="split-menuitem"> |
|
764 + <menuitem id="appmenu_customize" |
|
765 + label="&preferencesCmd.label;" |
|
766 + class="split-menuitem-item" |
|
767 + flex="1" |
|
768 + oncommand="openPreferences();"/> |
|
769 + <menu class="split-menuitem-menu" |
|
770 + label="&preferencesCmd.label;"> |
|
771 + <menupopup id="appmenu_customizeMenu" |
|
772 + onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('appmenu_toggleTabsOnTop').previousSibling);"> |
|
773 + <menuitem id="appmenu_preferences" |
|
774 +#ifdef XP_UNIX |
|
775 + label="&preferencesCmdUnix.label;" |
|
776 +#else |
|
777 + label="&preferencesCmd.label;" |
|
778 +#endif |
|
779 + oncommand="openPreferences();"/> |
|
780 + <menuseparator/> |
|
781 + <menuseparator/> |
|
782 + <menuitem id="appmenu_toggleTabsOnTop" |
|
783 + label="&viewTabsOnTop.label;" |
|
784 + type="checkbox" |
|
785 + command="cmd_ToggleTabsOnTop"/> |
|
786 + <menuitem id="appmenu_toolbarLayout" |
|
787 + label="&appMenuToolbarLayout.label;" |
|
788 + command="cmd_CustomizeToolbars"/> |
|
789 + </menupopup> |
|
790 + </menu> |
|
791 + </hbox> |
|
792 + <hbox class="split-menuitem"> |
|
793 + <menuitem id="appmenu_help" |
|
794 + class="split-menuitem-item" |
|
795 + flex="1" |
|
796 + label="&helpMenu.label;" |
|
797 + oncommand="openHelpLink('firefox-help')"/> |
|
798 + <menu class="split-menuitem-menu"> |
|
799 + <menupopup id="appmenu_helpMenupopup"> |
|
800 + <menuitem id="appmenu_openHelp" |
|
801 + label="&helpMenu.label;" |
|
802 + oncommand="openHelpLink('firefox-help')" |
|
803 + onclick="checkForMiddleClick(this, event);"/> |
|
804 + <menuitem id="appmenu_gettingStarted" |
|
805 + label="&appMenuGettingStarted.label;" |
|
806 + oncommand="gBrowser.loadOneTab('http://www.mozilla.com/firefox/central/', {inBackground: false});" |
|
807 + onclick="checkForMiddleClick(this, event);"/> |
|
808 + <menuitem id="appmenu_troubleshootingInfo" |
|
809 + label="&helpTroubleshootingInfo.label;" |
|
810 + oncommand="openTroubleshootingPage()" |
|
811 + onclick="checkForMiddleClick(this,event);"/> |
|
812 + <menuseparator/> |
|
813 + <menuitem id="appmenu_safeMode" |
|
814 + accesskey="&appMenuSafeMode.accesskey;" |
|
815 + label="&appMenuSafeMode.label;" |
|
816 + oncommand="safeModeRestart();"/> |
|
817 + <menuseparator/> |
|
818 + <menuitem id="appmenu_about" |
|
819 + label="&aboutProduct.label;" |
|
820 + oncommand="openAboutDialog();"/> |
|
821 + </menupopup> |
|
822 + </menu> |
|
823 + </hbox> |
|
824 +#ifdef MOZ_SERVICES_SYNC |
|
825 + <spacer flex="1"/> |
|
826 + <!-- only one of sync-setup or sync-syncnow will be showing at once --> |
|
827 + <menuitem id="sync-setup-appmenu" |
|
828 + label="&syncSetup.label;" |
|
829 + observes="sync-setup-state" |
|
830 + oncommand="gSyncUI.openSetup()"/> |
|
831 + <menuitem id="sync-syncnowitem-appmenu" |
|
832 + label="&syncSyncNowItem.label;" |
|
833 + observes="sync-syncnow-state" |
|
834 + oncommand="gSyncUI.doSync(event);"/> |
|
835 +#endif |
|
836 + </vbox> |
|
837 + </hbox> |
|
838 + </menupopup> |
|
839 + </button> |
471 + </button> |
840 + </hbox> |
472 + </hbox> |
841 + <spacer id="titlebar-spacer" flex="1"/> |
473 + <spacer id="titlebar-spacer" flex="1"/> |
842 + <hbox id="titlebar-buttonbox"> |
474 + <hbox id="titlebar-buttonbox"> |
843 + <toolbarbutton id="titlebar-min" oncommand="window.minimize();"/> |
475 + <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/> |
844 + <toolbarbutton id="titlebar-max" oncommand="onTitlebarMaxClick();"/> |
476 + <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/> |
845 + <toolbarbutton id="titlebar-close" command="cmd_closeWindow"/> |
477 + <toolbarbutton class="titlebar-button" id="titlebar-close" command="cmd_closeWindow"/> |
846 + </hbox> |
478 + </hbox> |
847 + </hbox> |
479 + </hbox> |
848 + </vbox> |
480 + </vbox> |
849 +#endif |
481 +#endif |
850 + |
482 + |
854 + <toolbox id="navigator-toolbox" |
486 + <toolbox id="navigator-toolbox" |
855 + defaultmode="icons" mode="icons" |
487 + defaultmode="icons" mode="icons" |
856 +#ifdef WINCE |
488 +#ifdef WINCE |
857 + defaulticonsize="small" iconsize="small" |
489 + defaulticonsize="small" iconsize="small" |
858 +#endif |
490 +#endif |
859 +#ifdef XP_WIN |
|
860 + tabsontop="true" |
491 + tabsontop="true" |
861 +#endif |
|
862 +#ifdef XP_MACOSX |
|
863 + tabsontop="true" |
|
864 +#endif |
|
865 + persist="tabsontop"> |
492 + persist="tabsontop"> |
866 + <!-- Menu --> |
493 + <!-- Menu --> |
867 + <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true" |
494 + <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true" |
868 + defaultset="menubar-items" |
495 + defaultset="menubar-items" |
869 + mode="icons" iconsize="small" defaulticonsize="small" |
496 + mode="icons" iconsize="small" defaulticonsize="small" |
903 + <toolbarbutton id="forward-button" class="toolbarbutton-1" |
530 + <toolbarbutton id="forward-button" class="toolbarbutton-1" |
904 + label="&forwardCmd.label;" |
531 + label="&forwardCmd.label;" |
905 + command="Browser:ForwardOrForwardDuplicate" |
532 + command="Browser:ForwardOrForwardDuplicate" |
906 + onclick="checkForMiddleClick(this, event);" |
533 + onclick="checkForMiddleClick(this, event);" |
907 + tooltiptext="&forwardButton.tooltip;"/> |
534 + tooltiptext="&forwardButton.tooltip;"/> |
908 + <toolbarbutton id="back-forward-dropmarker" type="menu" |
|
909 + disabled="true" tooltiptext="&backForwardMenu.tooltip;" |
|
910 + onbroadcast="if (this.disabled) this.disabled = |
|
911 + document.getElementById('Browser:Back').hasAttribute('disabled') && |
|
912 + document.getElementById('Browser:Forward').hasAttribute('disabled');"> |
|
913 + <!-- bug 415444: event.stopPropagation is here for the cloned version of |
|
914 + this menupopup --> |
|
915 + <menupopup context="" |
|
916 + position="after_start" |
|
917 + onpopupshowing="return FillHistoryMenu(event.target);" |
|
918 + oncommand="gotoHistoryIndex(event); event.stopPropagation();" |
|
919 + onclick="checkForMiddleClick(this, event);"/> |
|
920 + <observes element="Browser:Back" attribute="disabled"/> |
|
921 + <observes element="Browser:Forward" attribute="disabled"/> |
|
922 + </toolbarbutton> |
|
923 + </toolbaritem> |
535 + </toolbaritem> |
924 + |
536 + |
925 + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
537 + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
926 + persist="class" removable="true" |
538 + persist="class" removable="true" |
927 + label="&homeButton.label;" |
539 + label="&homeButton.label;" |
991 + <image id="go-button" |
603 + <image id="go-button" |
992 + class="urlbar-icon" |
604 + class="urlbar-icon" |
993 + tooltiptext="&goEndCap.tooltip;" |
605 + tooltiptext="&goEndCap.tooltip;" |
994 + onclick="gURLBar.handleCommand(event);"/> |
606 + onclick="gURLBar.handleCommand(event);"/> |
995 + </hbox> |
607 + </hbox> |
996 + <progressmeter id="urlbar-progress" mode="normal" value="0" collapsed="true"/> |
|
997 + <toolbarbutton id="urlbar-go-button" |
608 + <toolbarbutton id="urlbar-go-button" |
998 + onclick="gURLBar.handleCommand(event);" |
609 + onclick="gURLBar.handleCommand(event);" |
999 + tooltiptext="&goEndCap.tooltip;"/> |
610 + tooltiptext="&goEndCap.tooltip;"/> |
1000 + <toolbarbutton id="urlbar-reload-button" |
611 + <toolbarbutton id="urlbar-reload-button" |
1001 + command="Browser:ReloadOrDuplicate" |
612 + command="Browser:ReloadOrDuplicate" |
1058 + label="&showAllBookmarks.label;" |
669 + label="&showAllBookmarks.label;" |
1059 + command="Browser:ShowAllBookmarks" |
670 + command="Browser:ShowAllBookmarks" |
1060 + key="manBookmarkKb"/> |
671 + key="manBookmarkKb"/> |
1061 + <menuseparator/> |
672 + <menuseparator/> |
1062 + <menuitem id="BMB_bookmarkThisPage" |
673 + <menuitem id="BMB_bookmarkThisPage" |
674 +#ifndef XP_MACOSX |
|
1063 + class="menuitem-iconic" |
675 + class="menuitem-iconic" |
676 +#endif |
|
1064 + label="&bookmarkThisPageCmd.label;" |
677 + label="&bookmarkThisPageCmd.label;" |
1065 + command="Browser:AddBookmarkAs" |
678 + command="Browser:AddBookmarkAs" |
1066 + key="addBookmarkAsKb"/> |
679 + key="addBookmarkAsKb"/> |
1067 + <menuitem id="BMB_subscribeToPageMenuitem" |
680 + <menuitem id="BMB_subscribeToPageMenuitem" |
1068 + label="&subscribeToPageMenuitem.label;" |
681 + label="&subscribeToPageMenuitem.label;" |
1303 + <toolbarbutton id="sync-button" |
916 + <toolbarbutton id="sync-button" |
1304 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
917 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
1305 + label="&syncToolbarButton.label;" |
918 + label="&syncToolbarButton.label;" |
1306 + oncommand="gSyncUI.handleToolbarButton()"/> |
919 + oncommand="gSyncUI.handleToolbarButton()"/> |
1307 +#endif |
920 +#endif |
921 + <toolbarbutton id="feed-button" |
|
922 + type="menu" |
|
923 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
924 + disabled="true" |
|
925 + label="&feedButton.label;" |
|
926 + tooltiptext="&feedButton.tooltip;" |
|
927 + onclick="return FeedHandler.onFeedButtonClick(event);"> |
|
928 + <menupopup position="after_end" |
|
929 + id="feed-menu" |
|
930 + onpopupshowing="return FeedHandler.buildFeedList(this);" |
|
931 + oncommand="return FeedHandler.subscribeToFeed(null, event);" |
|
932 + onclick="checkForMiddleClick(this, event);"/> |
|
933 + </toolbarbutton> |
|
1308 + </toolbarpalette> |
934 + </toolbarpalette> |
1309 + </toolbox> |
935 + </toolbox> |
1310 + |
936 + |
1311 + <hbox flex="1" id="browser"> |
937 + <hbox flex="1" id="browser"> |
1312 + <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome"> |
938 + <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome"> |
1329 + onclick="return contentAreaClick(event, false);"/> |
955 + onclick="return contentAreaClick(event, false);"/> |
1330 + </vbox> |
956 + </vbox> |
1331 + </hbox> |
957 + </hbox> |
1332 + |
958 + |
1333 + <vbox id="browser-bottombox" layer="true"> |
959 + <vbox id="browser-bottombox" layer="true"> |
1334 + <toolbar id="addon-bar" toolbarname="&addonBarCmd.label;" collapsed="true" |
960 + <toolbar id="addon-bar" |
961 + toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;" |
|
962 + collapsed="true" |
|
1335 + class="toolbar-primary chromeclass-toolbar" |
963 + class="toolbar-primary chromeclass-toolbar" |
1336 + context="toolbar-context-menu" toolboxid="navigator-toolbox" |
964 + context="toolbar-context-menu" toolboxid="navigator-toolbox" |
1337 + mode="icons" iconsize="small" defaulticonsize="small" |
965 + mode="icons" iconsize="small" defaulticonsize="small" |
1338 + lockiconsize="true" |
966 + lockiconsize="true" |
1339 + customizable="true" align="right"> |
967 + customizable="true" align="right"> |
1836 + |
1464 + |
1837 +#endif // nsunixshellservice_h____ |
1465 +#endif // nsunixshellservice_h____ |
1838 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1466 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1839 --- a/browser/installer/package-manifest.in |
1467 --- a/browser/installer/package-manifest.in |
1840 +++ b/browser/installer/package-manifest.in |
1468 +++ b/browser/installer/package-manifest.in |
1841 @@ -431,16 +431,17 @@ |
1469 @@ -432,16 +432,17 @@ |
1842 #endif |
1470 #endif |
1843 #endif |
1471 #endif |
1844 |
1472 |
1845 ; [Default Preferences] |
1473 ; [Default Preferences] |
1846 ; All the pref files must be part of base to prevent migration bugs |
1474 ; All the pref files must be part of base to prevent migration bugs |