Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added ability to hide and show toolbars and taskbar to all mail windows. Added accesskeys to a number of menu items and fixed menus across product. Moved broadcaster elements to top of xul files to give command keys a chance to work. a=chofmann

Browse Source
This commit is contained in:
hangas%netscape.com 1999-09-29 04:29:20 +00:00
parent fd592cb480
commit 940bc92a57
19 changed files with 274 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
mailnews/addrbook/resources/content/addressbook.xul
View File

@ -130,15 +130,16 @@ Rights Reserved.
<menuitem id="menu_cut"/>
<menuitem id="menu_copy"/>
<menuitem id="menu_paste"/>
<menuseparator/>
<menuitem id="menu_delete"/>
<menuseparator/>
<menuitem id="menu_selectAll"/>
<menuseparator/>
<menuitem value="&searchCmd.label;" oncommand="AbSearch();"/>
<menuseparator/>
<menuitem value="&htmlDomainCmd.label;" oncommand="AbHTMLDomain();"/>
<menuitem value="&abPropsCmd.label;" oncommand="AbEditCard();"/>
<menuitem value="&editCardCmd.label;"
accesskey="&editCardCmd.accesskey;"
oncommand="AbEditCard();"/>
<menuitem value="&htmlDomainCmd.label;"
accesskey="&htmlDomainCmd.accesskey;"
oncommand="AbHTMLDomain();"/>
<menuseparator/>
<menuitem id="menu_preferences" oncommand="goPreferences('addressbook.xul', 'chrome://addressbook/content/pref-addressing.xul')"/>
</menupopup>
@ -146,43 +147,47 @@ Rights Reserved.
<menu id="menu_View">
<menupopup>
<menu value="&showMenu.label;">
<menupopup>
<menuitem value="&showAbToolbarCmd.label;" oncommand="AbShowToolbar()"/>
<menu id="menu_Toolbars">
<menupopup>
<menuitem id="menu_showAbToolbar"
value="&showAbToolbarCmd.label;"
accesskey="&showAbToolbarCmd.accesskey;"
oncommand="goToggleToolbar('abToolbar', 'menu_showAbToolbar')"
checked="true"/>
<menuitem id="menu_showTaskbar"/>
</menupopup>
</menu>
<menuitem value="&showCardPane.label;" oncommand="AbShowCardPane()"/>
<menuitem value="&showTaskbar.label;" oncommand="AbShowTaskbar()"/>
</menupopup>
</menu>
<menu value="&sortMenu.label;">
<menupopup>
<menuitem value="&sortByNameCmd.label;"
id="cmd_SortByName"
disabled="true"
oncommand="top.SortResultPane('NameColumn', 'http://home.netscape.com/NC-rdf#DisplayName')"/>
<menuitem value="&sortByEmailCmd.label;"
id="cmd_SortByEmail"
disabled="true"
oncommand="top.SortResultPane('EmailColumn', 'http://home.netscape.com/NC-rdf#PrimaryEmail')"/>
<menuitem value="&sortByOrganizationCmd.label;" oncommand="AbSortByOrganization()"/>
<menuitem value="&sortByNicknameCmd.label;" oncommand="AbSortByNickname()"/>
<menuitem value="&sortByPhoneCmd.label;"
id="cmd_SortByPhone"
disabled="true"
oncommand="top.SortResultPane('WorkPhoneColumn', 'http://home.netscape.com/NC-rdf#WorkPhone')"/>
<menuitem value="&sortByCityCmd.label;" oncommand="AbSortByCity()"/>
<menuseparator/>
<menuitem value="&sortAscendingCmd.label;" oncommand="AbSortAscending()"/>
<menuitem value="&sortDescendingCmd.label;" oncommand="AbSortDescending()"/>
</menupopup>
</menu>
</menupopup>
<menu value="&sortMenu.label;">
<menupopup>
<menuitem value="&sortByNameCmd.label;"
id="cmd_SortByName"
disabled="true"
oncommand="top.SortResultPane('NameColumn', 'http://home.netscape.com/NC-rdf#DisplayName')"/>
<menuitem value="&sortByEmailCmd.label;"
id="cmd_SortByEmail"
disabled="true"
oncommand="top.SortResultPane('EmailColumn', 'http://home.netscape.com/NC-rdf#PrimaryEmail')"/>
<menuitem value="&sortByOrganizationCmd.label;" oncommand="AbSortByOrganization()"/>
<menuitem value="&sortByNicknameCmd.label;" oncommand="AbSortByNickname()"/>
<menuitem value="&sortByPhoneCmd.label;"
id="cmd_SortByPhone"
disabled="true"
oncommand="top.SortResultPane('WorkPhoneColumn', 'http://home.netscape.com/NC-rdf#WorkPhone')"/>
<menuitem value="&sortByCityCmd.label;" oncommand="AbSortByCity()"/>
<menuseparator/>
<menuitem value="&sortAscendingCmd.label;" oncommand="AbSortAscending()"/>
<menuitem value="&sortDescendingCmd.label;" oncommand="AbSortDescending()"/>
</menupopup>
</menu>
</menupopup>
</menu>
<menu id="tasksMenu"/>
<menu id="menu_Help"/>
<spring flex="100%"/>
</menubar>
<toolbar>
<toolbar id="abToolbar" persist="collapsed">
<titledbutton src="&newcardButton.img;" align="top" value="&newcardButton.label;" onclick="AbNewCard()"/>
<titledbutton src="&newlistButton.img;" align="top" value="&newlistButton.label;" onclick="AbNewList()"/>
<titledbutton src="&editButton.img;" align="top" value="&editButton.label;" onclick="AbEditCard()"/>

12
mailnews/addrbook/resources/locale/en-US/abMainWindow.dtd
View File

@ -43,15 +43,15 @@ Rights Reserved.
<!ENTITY deleteAbCmd.label "Delete Address Book">
<!ENTITY deleteCardCmd.label "Delete Card">
<!ENTITY deleteCardsCmd.label "Delete Selected Cards">
<!ENTITY searchCmd.label ".Search...">
<!ENTITY editCardCmd.label "Edit Card...">
<!ENTITY editCardCmd.accesskey "e">
<!ENTITY htmlDomainCmd.label ".HTML Domains...">
<!ENTITY abPropsCmd.label "Properties">
<!ENTITY htmlDomainCmd.accesskey "h">
<!-- View Menu -->
<!ENTITY showMenu.label ".Show">
<!ENTITY showAbToolbarCmd.label ".Address Book Toolbar">
<!ENTITY showCardPane.label ".Card Pane">
<!ENTITY showTaskbar.label ".Taskbar">
<!ENTITY showAbToolbarCmd.label "Show Address Book Toolbar">
<!ENTITY showAbToolbarCmd.accesskey "a">
<!ENTITY showCardPane.label ".Card Pane">
<!ENTITY sortMenu.label "Sort">
<!ENTITY sortByNameCmd.label "by Name">
<!ENTITY sortByEmailCmd.label "by Email">

112
mailnews/base/resources/content/messenger.xul
View File

@ -55,23 +55,6 @@ Rights Reserved.
<commandset id="globalEditMenuItems"/>
</commands>
<keyset id="keyset">
<!-- File Menu -->
<key id="key_newNavigator"/>
<key id="key_newMessage"/>
<key id="key_close"/>
<key id="key_quit"/>
<!-- Edit Menu -->
<key id="key_undo"/>
<key id="key_redo"/>
<key id="key_cut"/>
<key id="key_copy"/>
<key id="key_paste"/>
<key id="key_delete"/>
<key id="key_selectAll"/>
<key id="key_preferences"/>
</keyset>
<broadcasterset id="broadcasterset">
<!-- File Menu -->
<broadcaster id="cmd_newNavigator"/>
@ -96,6 +79,23 @@ Rights Reserved.
<broadcaster id="Messenger:LoadingProgress"/>
</broadcasterset>
<keyset id="keyset">
<!-- File Menu -->
<key id="key_newNavigator"/>
<key id="key_newMessage"/>
<key id="key_close"/>
<key id="key_quit"/>
<!-- Edit Menu -->
<key id="key_undo"/>
<key id="key_redo"/>
<key id="key_cut"/>
<key id="key_copy"/>
<key id="key_paste"/>
<key id="key_delete"/>
<key id="key_selectAll"/>
<key id="key_preferences"/>
</keyset>
<!-- The main mail three pane frame -->
<box align="horizontal" style="height:100px" flex="1">
<box id="sidebarbox" />
@ -105,7 +105,10 @@ Rights Reserved.
<menubar>
<menu id="menu_File">
<menupopup id="menu_FilePopup">
<menuitem value="&newMessage.label;" accessKey="&newMessage.accesskey;" key="key_newMessage" observes="cmd_newMessage"/>
<menuitem value="&newMessage.label;"
accessKey="&newMessage.accesskey;"
key="key_newMessage"
observes="cmd_newMessage"/>
<menu id="menu_New">
<menupopup>
<menuitem value="&newFolderCmd.label;" oncommand="MsgNewFolder();"/>
@ -120,18 +123,28 @@ Rights Reserved.
<menuitem value="&openAttachmentCmd.label;" oncommand="MsgOpenAttachment();"/>
<menuseparator/>
<menuitem id="menu_close"/>
<menu value="&saveAsMenu.label;">
<menu value="&saveAsMenu.label;" accessKey="&saveAsMenu.accesskey;">
<menupopup>
<menuitem value="&saveAsFileCmd.label;" oncommand="MsgSaveAsFile();"/>
<menuitem value="&saveAsTemplateCmd.label;" oncommand="MsgSaveAsTemplate();"/>
<menuitem value="&saveAsFileCmd.label;"
accessKey="&saveAsFileCmd.accesskey;"
oncommand="MsgSaveAsFile();"/>
<menuitem value="&saveAsTemplateCmd.label;"
accessKey="&saveAsTemplateCmd.accesskey;"
oncommand="MsgSaveAsTemplate();"/>
</menupopup>
</menu>
<menuseparator/>
<menuitem value="&getNewMsgCmd.label;" oncommand="MsgGetMessage();"/>
<menuitem value="&sendUnsentCmd.label;" oncommand="MsgSendUnsentMsg();"/>
<menuitem value="&getNewMsgCmd.label;"
accessKey="&getNewMsgCmd.accesskey;"
oncommand="MsgGetMessage();"/>
<menuitem value="&sendUnsentCmd.label;"
accessKey="&sendUnsentCmd.accesskey;"
oncommand="MsgSendUnsentMsg();"/>
<menuitem value="&loadFirstDraft.label;" oncommand="MsgLoadFirstDraft();"/>
<menuitem value="&emptyTrashCmd.label;" oncommand="MsgEmptyTrash();"/>
<menuitem value="&subscribeCmd.label;" oncommand="MsgSubscribe();"/>
<menuitem value="&subscribeCmd.label;"
accessKey="&subscribeCmd.accesskey;"
oncommand="MsgSubscribe();"/>
<menuseparator/>
<menuitem value="&renameFolder.label;" oncommand="MsgRenameFolder();"/>
<menuitem value="&compactFolder.label;" oncommand="MsgCompactFolder();"/>
@ -183,31 +196,36 @@ Rights Reserved.
<menu id="menu_View">
<menupopup>
<menu value="&showToolbarMenu.label;">
<menupopup>
<menuitem value="&showMessengerToolbarCmd.label;" oncommand="MsgShowMsgToolbar();"/>
<menu id="menu_Toolbars">
<menupopup>
<menuitem id="menu_showMessengerToolbar"
value="&showMessengerToolbarCmd.label;"
accesskey="&showMessengerToolbarCmd.accesskey;"
oncommand="goToggleToolbar('msgToolbar', 'menu_showMessengerToolbar')"
checked="true"/>
<menuitem id="menu_showTaskbar"/>
</menupopup>
</menu>
<menuitem value="&showMessageCmd.label;" oncommand="MsgToggleMessagePane();"/>
<menuitem value="&showFoldersCmd.label;" oncommand="MsgToggleFolderPane();"/>
</menupopup>
</menu>
<menuseparator/>
<menu value="&sortMenu.label;">
<menupopup>
<menuitem value="&sortByDateCmd.label;" oncommand="MsgSortByDate();"/>
<menuitem value="&sortByFlagCmd.label;" oncommand="MsgSortByFlag();"/>
<menuitem value="&sortByPriorityCmd.label;" oncommand="MsgSortByPriority();"/>
<menuitem value="&sortBySenderCmd.label;" oncommand="MsgSortBySender();"/>
<menuitem value="&sortBySizeCmd.label;" oncommand="MsgSortBySize();"/>
<menuitem value="&sortByStatusCmd.label;" oncommand="MsgSortByStatus();"/>
<menuitem value="&sortBySubjectCmd.label;" oncommand="MsgSortBySubject();"/>
<menuitem value="&sortByThreadCmd.label;" oncommand="MsgSortByThread();"/>
<menuitem value="&sortByUnreadCmd.label;" oncommand="MsgSortByUnread();"/>
<menuitem value="&sortByOrderReceivedCmd.label;" oncommand="MsgSortByOrderReceived();"/>
<menuseparator/>
<menuitem value="&sortAscendCmd.label;" oncommand="MsgSortAscending();"/>
<menuitem value="&sortDescendCmd.label;" oncommand="MsgSortDescending();"/>
</menupopup>
</menu>
<menu value="&sortMenu.label;">
<menupopup>
<menuitem value="&sortByDateCmd.label;" oncommand="MsgSortByDate();"/>
<menuitem value="&sortByFlagCmd.label;" oncommand="MsgSortByFlag();"/>
<menuitem value="&sortByPriorityCmd.label;" oncommand="MsgSortByPriority();"/>
<menuitem value="&sortBySenderCmd.label;" oncommand="MsgSortBySender();"/>
<menuitem value="&sortBySizeCmd.label;" oncommand="MsgSortBySize();"/>
<menuitem value="&sortByStatusCmd.label;" oncommand="MsgSortByStatus();"/>
<menuitem value="&sortBySubjectCmd.label;" oncommand="MsgSortBySubject();"/>
<menuitem value="&sortByThreadCmd.label;" oncommand="MsgSortByThread();"/>
<menuitem value="&sortByUnreadCmd.label;" oncommand="MsgSortByUnread();"/>
<menuitem value="&sortByOrderReceivedCmd.label;" oncommand="MsgSortByOrderReceived();"/>
<menuseparator/>
<menuitem value="&sortAscendCmd.label;" oncommand="MsgSortAscending();"/>
<menuitem value="&sortDescendCmd.label;" oncommand="MsgSortDescending();"/>
</menupopup>
</menu>
<menu value="&msgsMenu.label;">
<menupopup>
<menuitem value="&threadsMsgsCmd.label;" oncommand="MsgViewAllThreadMsgs();"/>
@ -448,7 +466,7 @@ Rights Reserved.
</toolbox>
<toolbox>
<toolbar>
<toolbar id="msgToolbar" persist="collapsed">
<titledbutton src="&getMsgButton.img;" align="top" value="&getMsgButton.label;" onclick="MsgGetMessage()"/>
<titledbutton src="&newMsgButton.img;" align="top" value="&newMsgButton.label;" onclick="MsgNewMessage()"/>
<html:div class="separator" align="vertical"/>

1
mailnews/base/resources/content/widgetglue.js
View File

@ -627,7 +627,6 @@ function MsgShowFolders()
function MsgFolderProperties() {}
function MsgShowMsgToolbar() {}
function MsgShowLocationbar() {}
function MsgSortByFlag() {}
function MsgSortByPriority() {}

16
mailnews/base/resources/locale/en-US/messenger.dtd
View File

@ -33,12 +33,18 @@ Rights Reserved.
<!ENTITY newAccountCmd.accesskey "a">
<!ENTITY openAttachmentCmd.label ".Open Attachment">
<!ENTITY saveAsMenu.label "Save As">
<!ENTITY saveAsMenu.accesskey "s">
<!ENTITY saveAsFileCmd.label "File">
<!ENTITY saveAsFileCmd.accesskey "f">
<!ENTITY saveAsTemplateCmd.label "Template">
<!ENTITY saveAsTemplateCmd.accesskey "t">
<!ENTITY getNewMsgCmd.label "Get New Messages">
<!ENTITY getNewMsgCmd.accesskey "g">
<!ENTITY sendUnsentCmd.label "Send Unsent Messages">
<!ENTITY sendUnsentCmd.accesskey "d">
<!ENTITY loadFirstDraft.label "Load First Draft Message">
<!ENTITY subscribeCmd.label "Subscribe...">
<!ENTITY subscribeCmd.accesskey "b">
<!ENTITY renameFolder.label "Rename Folder...">
<!ENTITY compactFolder.label "Compact This Folder">
<!ENTITY emptyTrashCmd.label "Empty Trash">
@ -64,12 +70,12 @@ Rights Reserved.
<!ENTITY accountWizardCmd.label "New Account Wizard...">
<!-- View Menu -->
<!ENTITY showToolbarMenu.label "Show...">
<!-- LOCALIZATION NOTE (showSidebarMenu) : Do not translate below line. -->
<!ENTITY showSidebarMenu.label ".SideBar">
<!ENTITY showMessengerToolbarCmd.label ".Messenger Toolbar">
<!ENTITY showMessageCmd.label "Message">
<!ENTITY showFoldersCmd.label "Folders">
<!ENTITY showSidebarMenu.label ".SideBar">
<!ENTITY showMessengerToolbarCmd.label "Show Messenger Toolbar">
<!ENTITY showMessengerToolbarCmd.accesskey "m">
<!ENTITY showMessageCmd.label "Message">
<!ENTITY showFoldersCmd.label "Folders">
<!ENTITY sortMenu.label "Sort">
<!ENTITY sortByDateCmd.label "by Date">
<!ENTITY sortByFlagCmd.label ".by Flag">

105
mailnews/compose/resources/content/messengercompose.xul
View File

@ -44,6 +44,47 @@ Rights Reserved.
<html:script language="JavaScript" src="chrome://messengercompose/content/MsgComposeCommands.js"/>
<html:script language="JavaScript" src="chrome://messengercompose/content/addressAutoComplete.js"/>
<broadcasterset id="broadcasterset">
<!-- File Menu -->
<broadcaster id="cmd_newNavigator"/>
<broadcaster id="cmd_newMessage"/>
<broadcaster id="cmd_close" oncommand="CloseWindow()"/>
<broadcaster id="cmd_quit"/>
<!-- Edit Menu -->
<broadcaster id="cmd_undo"/>
<broadcaster id="cmd_redo"/>
<broadcaster id="cmd_cut"/>
<broadcaster id="cmd_copy"/>
<broadcaster id="cmd_paste"/>
<broadcaster id="cmd_delete"/>
<broadcaster id="cmd_selectAll"/>
<broadcaster id="cmd_preferences"/>
</broadcasterset>
<broadcaster id="args" value="editorType=default"/>
<!-- Interim hack to transition from nsIXULWindowCallbacks/ShowWindowWithArgs -->
<broadcaster id="dialog.start" ready="false"/>
<observes element="dialog.start" attribute="ready" onbroadcast="ComposeStartup()"/>
<keyset id="keyset">
<!-- File Menu -->
<key id="key_newNavigator"/>
<key id="key_newMessage"/>
<key id="key_close"/>
<key id="key_quit"/>
<!-- Edit Menu -->
<key id="key_undo"/>
<key id="key_redo"/>
<key id="key_cut"/>
<key id="key_copy"/>
<key id="key_paste"/>
<key id="key_delete"/>
<key id="key_selectAll"/>
<key id="key_preferences"/>
</keyset>
<!--- REMOVE KEYSET UNTIL IT WORKS CORRECTLY ON MAC!
ACTUALLY, EVERY TIME YOU TYPE ANY OF THE KEY DEFINED HERE AFTER WITHOUT ANY OF THE MODIFIERS PRESSED, THE COMMAND IS EXECUTED.
@ -63,45 +104,6 @@ ACTUALLY, EVERY TIME YOU TYPE ANY OF THE KEY DEFINED HERE AFTER WITHOUT ANY OF T
</keyset>
-->
<!-- how to handle return, enter, tab, function keys, arrow keys, others? -->
<broadcaster id="args" value="editorType=default"/>
<broadcasterset id="broadcasterset">
<!-- File Menu -->
<broadcaster id="cmd_newNavigator"/>
<broadcaster id="cmd_newMessage"/>
<broadcaster id="cmd_close" oncommand="CloseWindow()"/>
<broadcaster id="cmd_quit"/>
<!-- Edit Menu -->
<broadcaster id="cmd_undo"/>
<broadcaster id="cmd_redo"/>
<broadcaster id="cmd_cut"/>
<broadcaster id="cmd_copy"/>
<broadcaster id="cmd_paste"/>
<broadcaster id="cmd_delete"/>
<broadcaster id="cmd_selectAll"/>
</broadcasterset>
<keyset id="keyset">
<!-- File Menu -->
<key id="key_newNavigator"/>
<key id="key_newMessage"/>
<key id="key_close"/>
<key id="key_quit"/>
<!-- Edit Menu -->
<key id="key_undo"/>
<key id="key_redo"/>
<key id="key_cut"/>
<key id="key_copy"/>
<key id="key_paste"/>
<key id="key_delete"/>
<key id="key_selectAll"/>
</keyset>
<!-- Interim hack to transition from nsIXULWindowCallbacks/ShowWindowWithArgs -->
<broadcaster id="dialog.start" ready="false"/>
<observes element="dialog.start" attribute="ready" onbroadcast="ComposeStartup()"/>
<!-- box id="toolbar" align="vertical" style="width:100%;height:100%" -->
<toolbox>
@ -167,13 +169,22 @@ ACTUALLY, EVERY TIME YOU TYPE ANY OF THE KEY DEFINED HERE AFTER WITHOUT ANY OF T
</menu>
<menu id="menu_View">
<menupopup>
<menuitem value="&showCmd.label;" cmd="nsCmd:ComposeNYI"/>
<menuseparator/>
<menuitem value="&addressCmd.label;" cmd="nsCmd:ComposeNYI"/>
<menuitem value="&attachmentsCmd.label;" cmd="nsCmd:ComposeNYI"/>
<menuseparator/>
<menuitem value="&wrapCmd.label;" cmd="nsCmd:ComposeNYI"/>
<menuseparator/>
<menu id="menu_Toolbars">
<menupopup>
<menuitem id="menu_showComposeToolbar"
value="&showComposeToolbarCmd.label;"
accesskey="&showComposeToolbarCmd.accesskey;"
oncommand="goToggleToolbar('composeToolbar', 'menu_showComposeToolbar')"
checked="true"/>
<menuitem id="menu_showTaskbar"/>
</menupopup>
</menu>
<menuseparator/>
<menuitem value="&addressCmd.label;" cmd="nsCmd:ComposeNYI"/>
<menuitem value="&attachmentsCmd.label;" cmd="nsCmd:ComposeNYI"/>
<menuseparator/>
<menuitem value="&wrapCmd.label;" cmd="nsCmd:ComposeNYI"/>
<menuseparator/>
<menu value="&dcharMenu.label;">
<menupopup>
<menuitem value="&dcharIso1Cmd.label;" oncommand="SetDocumentCharacterSet('ISO-8859-1');"/>
@ -278,7 +289,7 @@ ACTUALLY, EVERY TIME YOU TYPE ANY OF THE KEY DEFINED HERE AFTER WITHOUT ANY OF T
<spring flex="100%"/>
</menubar>
<toolbar>
<toolbar id="composeToolbar" persist="collapsed">
<titledbutton src="&sendButton.img;" align="top" value="&sendButton.label;" onclick="SendMessage()"/>
<html:div class="separator" align="vertical"/>
<titledbutton src="&addressButton.img;" align="top" value="&addressButton.label;" onclick="SelectAddress()"/>

3
mailnews/compose/resources/locale/en-US/messengercompose.dtd
View File

@ -35,7 +35,8 @@
<!ENTITY showMatchingAddrCmd.label ".Show Matching Address">
<!-- View menu items -->
<!ENTITY showCmd.label ".Show">
<!ENTITY showComposeToolbarCmd.label "Show Message Toolbar">
<!ENTITY showComposeToolbarCmd.accesskey "m">
<!ENTITY addressCmd.label ".Address">
<!ENTITY attachmentsCmd.label ".Attachments">
<!ENTITY wrapCmd.label ".Wrap Long Lines">

42
suite/browser/navigator.xul
View File

@ -50,6 +50,26 @@ Contributor(s): ______________________________________. -->
<html:script language="javascript" src="navigator.js" />
<html:script language="javascript" src="tooltip.js" />
<!-- broadcasters are appended from the overlay -->
<broadcasterset id="broadcasterset">
<broadcaster id="canReload" value="&reloadCmd.label;" oncommand="BrowserReallyReload(0);"/>
<broadcaster id="canStop"/>
<broadcaster id="canPrint"/>
<broadcaster id="Browser:LoadingProgress"/>
<broadcaster id="Browser:Status"/>
<broadcaster id="Browser:ProtocolIcon" uri=""/>
<broadcaster id="Browser:Throbber" busy="false"/>
<broadcaster id="args" value=""/>
</broadcasterset>
<!-- Interim hack to transition from nsIXULWindowCallbacks/ShowWindowWithArgs -->
<broadcaster id="dialog.start" ready="false"/>
<observes element="dialog.start" attribute="ready" onbroadcast="onLoadWithArgs()"/>
<!-- keys are appended from the overlay -->
<keyset id="keyset"/>
<!-- This needs to go into a xul fragment, but since those don't work now, this stays here !-->
<popupset>
<popup id="aTooltip"
@ -187,31 +207,11 @@ Contributor(s): ______________________________________. -->
var gBookmarkPopup = null;
</html:script>
<broadcaster id="canReload" value="&reloadCmd.label;" oncommand="BrowserReallyReload(0);"/>
<broadcaster id="canStop"/>
<broadcaster id="canPrint"/>
<broadcaster id="Browser:LoadingProgress"/>
<broadcaster id="Browser:Status"/>
<broadcaster id="Browser:ProtocolIcon" uri=""/>
<broadcaster id="Browser:Throbber" busy="false"/>
<broadcaster id="args" value=""/>
<!-- Interim hack to transition from nsIXULWindowCallbacks/ShowWindowWithArgs -->
<broadcaster id="dialog.start" ready="false"/>
<observes element="dialog.start" attribute="ready" onbroadcast="onLoadWithArgs()"/>
<!-- keys are appended from the overlay -->
<keyset id="keyset"/>
<!-- broadcasters are appended from the overlay -->
<broadcasterset id="broadcasterset"/>
<toolbox id="main-toolbox">
<!-- Menu -->
<menubar id="main-menubar"/>
<toolbar class="main-bar" chromeclass="toolbar" persist="collapsed">
<toolbar id="nav-bar" class="main-bar" chromeclass="toolbar" persist="collapsed">
<titledbutton id="back-button" align="top" value="&backButton.label;" observes="canGoBack" />
<titledbutton id="forward-button" align="top" value="&forwardButton.label;" observes="canGoForward" />

6
suite/browser/navigatorOverlay.xul
View File

@ -81,9 +81,9 @@ Contributor(s): ______________________________________. -->
<broadcaster id="cmd_selectAll"/>
<broadcaster id="cmd_preferences"/>
<broadcaster id="cmd_viewnavbar" oncommand="toggleToolbar( 'nav-bar','cmd_viewnavbar');" checked="true"/>
<broadcaster id="cmd_viewpersonaltoolbar" oncommand="toggleToolbar('PersonalToolbar','cmd_viewpersonaltoolbar');" checked="true"/>
<broadcaster id="cmd_viewtaskbar" oncommand="toggleToolbar('taskbar','cmd_viewtaskbar');" checked="true"/>
<broadcaster id="cmd_viewnavbar" oncommand="goToggleToolbar( 'nav-bar','cmd_viewnavbar');" checked="true"/>
<broadcaster id="cmd_viewpersonaltoolbar" oncommand="goToggleToolbar('PersonalToolbar','cmd_viewpersonaltoolbar');" checked="true"/>
<broadcaster id="cmd_viewtaskbar" oncommand="goToggleToolbar('taskbar','cmd_viewtaskbar');" checked="true"/>
<broadcaster id="Browser:NewEditor" value="&newBlankPageCmd.label;" oncommand="BrowserNewEditorWindow();"/>
<broadcaster id="Browser:NewEditorTemplate" value="&newPageFromTemplateCmd.label;" disabled="true" oncommand="BrowserNewWindow();"/>

8
suite/locales/en-US/chrome/browser/navigator.dtd
View File

@ -11,8 +11,8 @@
<!ENTITY defaultHomepage.url "www.mozilla.org" >
<!-- LOCALIZATION NOTE fileMenu.label: Localize all the menu labels with accesskeys but not commandkeys. e.g. "File" -> "XXXX(F)" in Japanese -->
<!ENTITY browserCmd.label "New Navigator Window">
<!ENTITY browserCmd.accesskey "n">
<!ENTITY browserCmd.label "New Navigator Window">
<!ENTITY browserCmd.accesskey "n">
<!ENTITY newBlankPageCmd.label "Blank Window">
<!ENTITY newBlankPageCmd.accesskey "b" >
<!ENTITY newBlankPageCmd.commandkey "n" >
@ -28,8 +28,8 @@
<!ENTITY openFileCmd.commandkey "l">
<!ENTITY sendPageCmd.label "Send Page">
<!ENTITY sendPageCmd.accesskey "s">
<!ENTITY editPageCmd.label "Edit Page">
<!ENTITY editPageCmd.accesskey "e">
<!ENTITY editPageCmd.label "Edit Page">
<!ENTITY editPageCmd.accesskey "d">
<!ENTITY offlineMenu.label "Offline">
<!ENTITY offlineMenu.accesskey "f">
<!ENTITY offlineGoOfflineCmd.label "Go Offline">

12
suite/locales/en-US/chrome/mailnews/addressbook/abMainWindow.dtd
View File

@ -43,15 +43,15 @@ Rights Reserved.
<!ENTITY deleteAbCmd.label "Delete Address Book">
<!ENTITY deleteCardCmd.label "Delete Card">
<!ENTITY deleteCardsCmd.label "Delete Selected Cards">
<!ENTITY searchCmd.label ".Search...">
<!ENTITY editCardCmd.label "Edit Card...">
<!ENTITY editCardCmd.accesskey "e">
<!ENTITY htmlDomainCmd.label ".HTML Domains...">
<!ENTITY abPropsCmd.label "Properties">
<!ENTITY htmlDomainCmd.accesskey "h">
<!-- View Menu -->
<!ENTITY showMenu.label ".Show">
<!ENTITY showAbToolbarCmd.label ".Address Book Toolbar">
<!ENTITY showCardPane.label ".Card Pane">
<!ENTITY showTaskbar.label ".Taskbar">
<!ENTITY showAbToolbarCmd.label "Show Address Book Toolbar">
<!ENTITY showAbToolbarCmd.accesskey "a">
<!ENTITY showCardPane.label ".Card Pane">
<!ENTITY sortMenu.label "Sort">
<!ENTITY sortByNameCmd.label "by Name">
<!ENTITY sortByEmailCmd.label "by Email">

3
suite/locales/en-US/chrome/mailnews/compose/messengercompose.dtd
View File

@ -35,7 +35,8 @@
<!ENTITY showMatchingAddrCmd.label ".Show Matching Address">
<!-- View menu items -->
<!ENTITY showCmd.label ".Show">
<!ENTITY showComposeToolbarCmd.label "Show Message Toolbar">
<!ENTITY showComposeToolbarCmd.accesskey "m">
<!ENTITY addressCmd.label ".Address">
<!ENTITY attachmentsCmd.label ".Attachments">
<!ENTITY wrapCmd.label ".Wrap Long Lines">

16
suite/locales/en-US/chrome/mailnews/messenger.dtd
View File

@ -33,12 +33,18 @@ Rights Reserved.
<!ENTITY newAccountCmd.accesskey "a">
<!ENTITY openAttachmentCmd.label ".Open Attachment">
<!ENTITY saveAsMenu.label "Save As">
<!ENTITY saveAsMenu.accesskey "s">
<!ENTITY saveAsFileCmd.label "File">
<!ENTITY saveAsFileCmd.accesskey "f">
<!ENTITY saveAsTemplateCmd.label "Template">
<!ENTITY saveAsTemplateCmd.accesskey "t">
<!ENTITY getNewMsgCmd.label "Get New Messages">
<!ENTITY getNewMsgCmd.accesskey "g">
<!ENTITY sendUnsentCmd.label "Send Unsent Messages">
<!ENTITY sendUnsentCmd.accesskey "d">
<!ENTITY loadFirstDraft.label "Load First Draft Message">
<!ENTITY subscribeCmd.label "Subscribe...">
<!ENTITY subscribeCmd.accesskey "b">
<!ENTITY renameFolder.label "Rename Folder...">
<!ENTITY compactFolder.label "Compact This Folder">
<!ENTITY emptyTrashCmd.label "Empty Trash">
@ -64,12 +70,12 @@ Rights Reserved.
<!ENTITY accountWizardCmd.label "New Account Wizard...">
<!-- View Menu -->
<!ENTITY showToolbarMenu.label "Show...">
<!-- LOCALIZATION NOTE (showSidebarMenu) : Do not translate below line. -->
<!ENTITY showSidebarMenu.label ".SideBar">
<!ENTITY showMessengerToolbarCmd.label ".Messenger Toolbar">
<!ENTITY showMessageCmd.label "Message">
<!ENTITY showFoldersCmd.label "Folders">
<!ENTITY showSidebarMenu.label ".SideBar">
<!ENTITY showMessengerToolbarCmd.label "Show Messenger Toolbar">
<!ENTITY showMessengerToolbarCmd.accesskey "m">
<!ENTITY showMessageCmd.label "Message">
<!ENTITY showFoldersCmd.label "Folders">
<!ENTITY sortMenu.label "Sort">
<!ENTITY sortByDateCmd.label "by Date">
<!ENTITY sortByFlagCmd.label ".by Flag">

42
xpfe/browser/resources/content/navigator.xul
View File

@ -50,6 +50,26 @@ Contributor(s): ______________________________________. -->
<html:script language="javascript" src="navigator.js" />
<html:script language="javascript" src="tooltip.js" />
<!-- broadcasters are appended from the overlay -->
<broadcasterset id="broadcasterset">
<broadcaster id="canReload" value="&reloadCmd.label;" oncommand="BrowserReallyReload(0);"/>
<broadcaster id="canStop"/>
<broadcaster id="canPrint"/>
<broadcaster id="Browser:LoadingProgress"/>
<broadcaster id="Browser:Status"/>
<broadcaster id="Browser:ProtocolIcon" uri=""/>
<broadcaster id="Browser:Throbber" busy="false"/>
<broadcaster id="args" value=""/>
</broadcasterset>
<!-- Interim hack to transition from nsIXULWindowCallbacks/ShowWindowWithArgs -->
<broadcaster id="dialog.start" ready="false"/>
<observes element="dialog.start" attribute="ready" onbroadcast="onLoadWithArgs()"/>
<!-- keys are appended from the overlay -->
<keyset id="keyset"/>
<!-- This needs to go into a xul fragment, but since those don't work now, this stays here !-->
<popupset>
<popup id="aTooltip"
@ -187,31 +207,11 @@ Contributor(s): ______________________________________. -->
var gBookmarkPopup = null;
</html:script>
<broadcaster id="canReload" value="&reloadCmd.label;" oncommand="BrowserReallyReload(0);"/>
<broadcaster id="canStop"/>
<broadcaster id="canPrint"/>
<broadcaster id="Browser:LoadingProgress"/>
<broadcaster id="Browser:Status"/>
<broadcaster id="Browser:ProtocolIcon" uri=""/>
<broadcaster id="Browser:Throbber" busy="false"/>
<broadcaster id="args" value=""/>
<!-- Interim hack to transition from nsIXULWindowCallbacks/ShowWindowWithArgs -->
<broadcaster id="dialog.start" ready="false"/>
<observes element="dialog.start" attribute="ready" onbroadcast="onLoadWithArgs()"/>
<!-- keys are appended from the overlay -->
<keyset id="keyset"/>
<!-- broadcasters are appended from the overlay -->
<broadcasterset id="broadcasterset"/>
<toolbox id="main-toolbox">
<!-- Menu -->
<menubar id="main-menubar"/>
<toolbar class="main-bar" chromeclass="toolbar" persist="collapsed">
<toolbar id="nav-bar" class="main-bar" chromeclass="toolbar" persist="collapsed">
<titledbutton id="back-button" align="top" value="&backButton.label;" observes="canGoBack" />
<titledbutton id="forward-button" align="top" value="&forwardButton.label;" observes="canGoForward" />

6
xpfe/browser/resources/content/navigatorOverlay.xul
View File

@ -81,9 +81,9 @@ Contributor(s): ______________________________________. -->
<broadcaster id="cmd_selectAll"/>
<broadcaster id="cmd_preferences"/>
<broadcaster id="cmd_viewnavbar" oncommand="toggleToolbar( 'nav-bar','cmd_viewnavbar');" checked="true"/>
<broadcaster id="cmd_viewpersonaltoolbar" oncommand="toggleToolbar('PersonalToolbar','cmd_viewpersonaltoolbar');" checked="true"/>
<broadcaster id="cmd_viewtaskbar" oncommand="toggleToolbar('taskbar','cmd_viewtaskbar');" checked="true"/>
<broadcaster id="cmd_viewnavbar" oncommand="goToggleToolbar( 'nav-bar','cmd_viewnavbar');" checked="true"/>
<broadcaster id="cmd_viewpersonaltoolbar" oncommand="goToggleToolbar('PersonalToolbar','cmd_viewpersonaltoolbar');" checked="true"/>
<broadcaster id="cmd_viewtaskbar" oncommand="goToggleToolbar('taskbar','cmd_viewtaskbar');" checked="true"/>
<broadcaster id="Browser:NewEditor" value="&newBlankPageCmd.label;" oncommand="BrowserNewEditorWindow();"/>
<broadcaster id="Browser:NewEditorTemplate" value="&newPageFromTemplateCmd.label;" disabled="true" oncommand="BrowserNewWindow();"/>

8
xpfe/browser/resources/locale/en-US/navigator.dtd
View File

@ -11,8 +11,8 @@
<!ENTITY defaultHomepage.url "www.mozilla.org" >
<!-- LOCALIZATION NOTE fileMenu.label: Localize all the menu labels with accesskeys but not commandkeys. e.g. "File" -> "XXXX(F)" in Japanese -->
<!ENTITY browserCmd.label "New Navigator Window">
<!ENTITY browserCmd.accesskey "n">
<!ENTITY browserCmd.label "New Navigator Window">
<!ENTITY browserCmd.accesskey "n">
<!ENTITY newBlankPageCmd.label "Blank Window">
<!ENTITY newBlankPageCmd.accesskey "b" >
<!ENTITY newBlankPageCmd.commandkey "n" >
@ -28,8 +28,8 @@
<!ENTITY openFileCmd.commandkey "l">
<!ENTITY sendPageCmd.label "Send Page">
<!ENTITY sendPageCmd.accesskey "s">
<!ENTITY editPageCmd.label "Edit Page">
<!ENTITY editPageCmd.accesskey "e">
<!ENTITY editPageCmd.label "Edit Page">
<!ENTITY editPageCmd.accesskey "d">
<!ENTITY offlineMenu.label "Offline">
<!ENTITY offlineMenu.accesskey "f">
<!ENTITY offlineGoOfflineCmd.label "Go Offline">

14
xpfe/global/resources/content/globalOverlay.js
View File

@ -85,11 +85,11 @@ function goPreferences(id, pane)
}
function toggleToolbar( id, broadcasterID )
function goToggleToolbar( id, elementID )
{
dump( "toggling toolbar "+id+"\n");
var toolbar = document.getElementById( id );
var broadcaster = document.getElementById( broadcasterID );
var element = document.getElementById( elementID );
if ( toolbar )
{
var attribValue = toolbar.getAttribute("hidden") ;
@ -99,18 +99,18 @@ function toggleToolbar( id, broadcasterID )
{
// dump( "Show \n");
toolbar.setAttribute("hidden", "" );
if ( broadcaster )
broadcaster.setAttribute("checked","true")
if ( element )
element.setAttribute("checked","true")
}
else
{
// dump("hide \n");
toolbar.setAttribute("hidden", true );
if ( broadcaster )
broadcaster.setAttribute("checked","")
if ( element )
element.setAttribute("checked","false")
}
document.persist(id, 'hidden');
document.persist(broadcasterID, 'checked');
document.persist(elementID, 'checked');
}
}

6
xpfe/global/resources/content/globalOverlay.xul
View File

@ -84,6 +84,12 @@
<!-- View Menu -->
<menu id="menu_View" value="&viewMenu.label;"/>
<menu id="menu_Toolbars" value="&viewToolbarsMenu.label;" accesskey="&viewToolbarsMenu.accesskey;"/>
<menuitem id="menu_showTaskbar"
value="&showTaskbarCmd.label;"
accesskey="&showTaskbarCmd.accesskey;"
oncommand="goToggleToolbar('taskbar', 'menu_showTaskbar')"
checked="true"/>
<!-- Help Menu -->
<menu id="menu_Help" value="&helpMenu.label;">

4
xpfe/global/resources/locale/globalOverlay.dtd
View File

@ -43,6 +43,10 @@
<!ENTITY viewMenu.label "View">
<!ENTITY viewMenu.accesskey "v">
<!ENTITY viewToolbarsMenu.label "Toolbars">
<!ENTITY viewToolbarsMenu.accesskey "t">
<!ENTITY showTaskbarCmd.label "Show Taskbar">
<!ENTITY showTaskbarCmd.accesskey "t">
<!ENTITY helpMenu.label "Help">
<!ENTITY helpMenu.accesskey "h">