Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #264061 --> Tools/Options should be Edit/Preferences on Linux

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@165235 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scott%scott-macgregor.org
2004-11-10 23:14:30 +00:00
parent ef7659d950
commit a07df16214
8 changed files with 70 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/mail/base/content/mailWindowOverlay.xul
View File

@@ -1171,6 +1171,12 @@
<menuitem id="menu_properties" label="&folderPropsCmd.label;"
accesskey="&folderPropsCmd.accesskey;"
observes="cmd_properties"/>
#ifdef XP_UNIX
#ifndef XP_MACOSX
<menuitem label="&accountManagerCmd.label;" accesskey="&accountManagerCmd.accesskey;" oncommand="MsgAccountManager(null);"/>
<menuitem id="menu_preferences" oncommand="openOptionsDialog('mailnews', 'chrome://messenger/content/pref-mailnews.xul','mailnews')"/>
#endif
#endif
</menupopup>
</menu>
@@ -1634,9 +1640,17 @@
accesskey="&importCmd.accesskey;"
oncommand="toImport();"/>
<menuitem id="javaScriptConsole" label="&javaScriptConsoleCmd.label;" accesskey="&javaScriptConsoleCmd.accesskey;" oncommand="toJavaScriptConsole();"/>
<menuseparator/>
#ifndef XP_UNIX
<menuseparator id="prefSep"/>
<menuitem label="&accountManagerCmd.label;" accesskey="&accountManagerCmd.accesskey;" oncommand="MsgAccountManager(null);"/>
<menuitem id="menu_preferences" oncommand="openOptionsDialog('mailnews', 'chrome://messenger/content/pref-mailnews.xul','mailnews')"/>
#else
#ifdef XP_MACOSX
<menuseparator id="prefSep"/>
<menuitem label="&accountManagerCmd.label;" accesskey="&accountManagerCmd.accesskey;" oncommand="MsgAccountManager(null);"/>
<menuitem id="menu_preferences" oncommand="openOptionsDialog('mailnews', 'chrome://messenger/content/pref-mailnews.xul','mailnews')"/>
#endif
#endif
</menupopup>
</menu>

11
mozilla/mail/base/content/utilityOverlay.xul
View File

@@ -169,9 +169,20 @@
<!-- broadcaster id="cmd_preferences"/ -->
<menuitem id="menu_preferences"
#ifdef XP_UNIX
#ifndef XP_MACOSX
label="&preferencesCmdUnix.label;"
accesskey="&preferencesCmdUnix.accesskey;"/>
#else
label="&preferencesCmd.label;"
key="key_preferences"
accesskey="&preferencesCmd.accesskey;"/>
#endif
#else
label="&preferencesCmd.label;"
key="key_preferences"
accesskey="&preferencesCmd.accesskey;"/>
#endif
<!-- View Menu -->
<menu id="menu_View"

3
mozilla/mail/base/jar.mn
View File

@@ -44,10 +44,11 @@ comm.jar:
* content/help/contents.rdf (content/help.rdf)
content/help/contextHelp.js (content/contextHelp.js)
*+ content/communicator/contentAreaClick.js (content/contentAreaClick.js)
*+ content/communicator/utilityOverlay.xul (content/utilityOverlay.xul)
toolkit.jar:
*+ content/global/customizeToolbar.xul (content/customizeToolbar.xul)
*+ content/global/customizeToolbar.js (content/customizeToolbar.js)
*+ content/communicator/nsContextMenu.js (content/nsContextMenu.js)
+ content/communicator/tasksOverlay.xul (content/tasksOverlay.xul)
+ content/communicator/utilityOverlay.xul (content/utilityOverlay.xul)
*+ content/communicator/utilityOverlay.xul (content/utilityOverlay.xul)

18
mozilla/mail/components/addrbook/content/addressbook.xul
View File

@@ -297,6 +297,13 @@
accesskey="&propertiesCmd.accesskey;"
key="key_properties"
command="cmd_properties"/>
#ifdef XP_UNIX
#ifndef XP_MACOSX
<menuseparator id="prefSep"/>
<menuitem id="menu_preferences" label="&preferencesCmdUnix.label;" accesskey="&preferencesCmdUnix.accesskey;"
oncommand="openOptionsDialog('mailnews', 'chrome://messenger/content/addressbook/pref-addressing.xul', 'mailaddressbookpref')"/>
#endif
#endif
</menupopup>
</menu>
@@ -429,9 +436,18 @@
#endif
<menuitem label="&importCmd.label;" accesskey="&importCmd.accesskey;" oncommand="toImport()"/>
<menuitem label="&exportCmd.label;" accesskey="&exportCmd.accesskey;" oncommand="AbExport()"/>
<menuseparator />
#ifndef XP_UNIX
<menuseparator id="prefSep"/>
<menuitem id="menu_preferences" label="&preferencesCmd.label;" accesskey="&preferencesCmd.accesskey;"
oncommand="openOptionsDialog('mailnews', 'chrome://messenger/content/addressbook/pref-addressing.xul', 'mailaddressbookpref')"/>
#else
#ifdef XP_MACOSX
<menuseparator id="prefSep"/>
<menuitem id="menu_preferences" label="&preferencesCmd.label;" accesskey="&preferencesCmd.accesskey;"
oncommand="openOptionsDialog('mailnews', 'chrome://messenger/content/addressbook/pref-addressing.xul', 'mailaddressbookpref')"/>
#endif
#endif
</menupopup>
</menu>

19
mozilla/mail/components/compose/content/messengercompose.xul
View File

@@ -321,6 +321,14 @@
<menuitem label="&findCmd.label;" key="key_find" accesskey="&findCmd.accesskey;" command="cmd_find"/>
<menuitem label="&findAgainCmd.label;" key="key_findNext" accesskey="&findAgainCmd.accesskey;" command="cmd_findNext"/>
<menuitem label="&findPrevCmd.label;" key="key_findPrev" accesskey="&findPrevCmd.accesskey;" command="cmd_findPrev"/>
#ifdef XP_UNIX
#ifndef XP_MACOSX
<menuseparator id="prefSep"/>
<menuitem label="&accountManagerCmd.label;" accesskey="&accountManagerCmd.accesskey;" command="cmd_account"/>
<menuitem id="menu_preferences" label="&preferencesCmdUnix.label;" accesskey="&preferencesCmdUnix.accesskey;"
oncommand="openOptionsDialog('mailcomposepref', 'chrome://messenger/content/messengercompose/pref-composing_messages.xul', 'mailcomposepref');"/>
#endif
#endif
</menupopup>
</menu>
@@ -465,11 +473,20 @@
#ifndef XP_MACOSX
<menuitem accesskey="&messengerCmd.accesskey;" label="&messengerCmd.label;" key="key_mail" oncommand="toMessengerWindow();" id="tasksMenuMail" class="menuitem-iconic icon-mail16 menu-iconic"/>
<menuitem label="&addressBookCmd.label;" accesskey="&addressBookCmd.accesskey;" key="key_addressbook" oncommand="toAddressBook();" id="tasksMenuAddressBook" class="menuitem-iconic icon-addressbook16 menu-iconic"/>
<menuseparator/>
#endif
#ifndef XP_UNIX
<menuseparator id="prefSep"/>
<menuitem label="&accountManagerCmd.label;" accesskey="&accountManagerCmd.accesskey;" command="cmd_account"/>
<menuitem id="menu_preferences" label="&preferencesCmd.label;" accesskey="&preferencesCmd.accesskey;"
oncommand="openOptionsDialog('mailcomposepref', 'chrome://messenger/content/messengercompose/pref-composing_messages.xul', 'mailcomposepref');"/>
#else
#ifdef XP_MACOSX
<menuitem label="&accountManagerCmd.label;" accesskey="&accountManagerCmd.accesskey;" command="cmd_account"/>
<menuitem id="menu_preferences" label="&preferencesCmd.label;" accesskey="&preferencesCmd.accesskey;"
oncommand="openOptionsDialog('mailcomposepref', 'chrome://messenger/content/messengercompose/pref-composing_messages.xul', 'mailcomposepref');"/>
#endif
#endif
</menupopup>
</menu>

2
mozilla/mail/components/compose/locale/messengercompose.dtd
View File

@@ -170,6 +170,8 @@
<!ENTITY preferencesCmd.label "Options...">
<!ENTITY preferencesCmd.key "O">
<!ENTITY preferencesCmd.accesskey "O">
<!ENTITY preferencesCmdUnix.label "Preferences">
<!ENTITY preferencesCmdUnix.accesskey "P">
<!-- Mac OS X Window Menu -->
<!ENTITY minimizeWindow.key "m">

4
mozilla/mail/locales/en-US/chrome/communicator/utilityOverlay.dtd
View File

@@ -44,8 +44,10 @@
<!ENTITY selectAllCmd.key "A">
<!ENTITY selectAllCmd.accesskey "a">
<!ENTITY preferencesCmd.label "Options...">
<!ENTITY preferencesCmd.key "O">
<!ENTITY preferencesCmd.accesskey "O">
<!ENTITY preferencesCmdUnix.label "Preferences">
<!ENTITY preferencesCmdUnix.accesskey "P">
<!ENTITY findTypeTextCmd.label "Find Text As You Type">
<!ENTITY findTypeTextCmd.accesskey "x">
<!ENTITY findTypeLinksCmd.label "Find Links As You Type">

2
mozilla/mail/locales/en-US/chrome/messenger/addressbook/abMainWindow.dtd
View File

@@ -121,6 +121,8 @@
<!ENTITY preferencesCmd.label "Options...">
<!ENTITY preferencesCmd.key "O">
<!ENTITY preferencesCmd.accesskey "O">
<!ENTITY preferencesCmdUnix.label "Preferences">
<!ENTITY preferencesCmdUnix.accesskey "P">
<!-- Help Menu -->
<!ENTITY helpMenu.label "Help">