Move Account Settings and Preferences to the Edit Menu for all Platforms

custom-2020
Matt A. Tobin 4 years ago committed by Roy Tam
parent 64f31ff6cc
commit d1edf0ebb1
  1. 22
      mail/base/content/mailWindowOverlay.xul
  2. 8
      mail/base/content/utilityOverlay.xul
  3. 25
      mail/components/addrbook/content/addressbook.xul
  4. 17
      mail/components/compose/content/messengercompose.xul

@ -2365,15 +2365,12 @@
<menuitem id="menu_properties" label="&folderPropsCmd2.label;"
accesskey="&folderPropsCmd.accesskey;"
command="cmd_properties"/>
#ifdef XP_UNIX
#ifndef XP_MACOSX
<menuseparator id="prefSep"/>
<menuitem id="menu_accountmgr"
label="&accountManagerCmd2.label;"
accesskey="&accountManagerCmdUnix2.accesskey;"
oncommand="MsgAccountManager(null);"/>
<menuitem id="menu_preferences" oncommand="openOptionsDialog()"/>
#endif
#endif
</menupopup>
</menu>
@ -2941,29 +2938,12 @@
accesskey="&clearRecentHistory.accesskey;"
key="key_sanitizeHistory"
oncommand="toSanitize();"/>
#ifndef XP_UNIX
<menuseparator id="prefSep"/>
<menuitem id="menu_accountmgr"
label="&accountManagerCmd2.label;"
accesskey="&accountManagerCmd2.accesskey;"
oncommand="MsgAccountManager(null);"/>
<menuitem id="menu_preferences" oncommand="openOptionsDialog()"/>
#else
#ifdef XP_MACOSX
<menuseparator id="prefSep"/>
<menuitem id="menu_accountmgr"
label="&accountManagerCmd2.label;"
accesskey="&accountManagerCmd2.accesskey;"
oncommand="MsgAccountManager(null);"/>
<menuitem id="menu_preferences"
label="&preferencesCmdMac2.label;"
key="key_preferencesCmdMac"
oncommand="openOptionsDialog()"/>
<menuitem id="menu_mac_services" label="&servicesMenuMac.label;"/>
<menuitem id="menu_mac_hide_app" label="&hideThisAppCmdMac.label;" key="key_hideThisAppCmdMac"/>
<menuitem id="menu_mac_hide_others" label="&hideOtherAppsCmdMac.label;" key="key_hideOtherAppsCmdMac"/>
<menuitem id="menu_mac_show_all" label="&showAllAppsCmdMac.label;"/>
#endif
#endif
</menupopup>
</menu>

@ -107,17 +107,9 @@
<!-- Not needed yet, window will need this: -->
<!-- broadcaster id="cmd_preferences"/ -->
#ifndef XP_MACOSX
<menuitem id="menu_preferences"
#ifdef XP_UNIX
label="&preferencesCmdUnix.label;"
accesskey="&preferencesCmdUnix.accesskey;"/>
#else
label="&preferencesCmd2.label;"
accesskey="&preferencesCmd2.accesskey;"/>
#endif
#endif
<!-- View Menu -->
<menu id="menu_View" label="&viewMenu.label;" accesskey="&viewMenu.accesskey;"/>

@ -421,13 +421,9 @@
<menuitem id="menu_properties"
key="key_properties"
command="cmd_properties-menu"/>
#ifdef XP_UNIX
#ifndef XP_MACOSX
<menuseparator id="prefSep"/>
<menuitem id="menu_preferences" label="&preferencesCmdUnix.label;" accesskey="&preferencesCmdUnix.accesskey;"
command="cmd_preferences"/>
#endif
#endif
<menuseparator id="prefSep"/>
<menuitem id="menu_preferences" label="&preferencesCmdUnix.label;" accesskey="&preferencesCmdUnix.accesskey;"
command="cmd_preferences"/>
</menupopup>
</menu>
@ -575,21 +571,6 @@
<menuitem label="&exportCmd.label;"
accesskey="&exportCmd.accesskey;"
oncommand="AbExportSelection();"/>
#ifndef XP_UNIX
<menuseparator id="prefSep"/>
<menuitem id="menu_preferences"
label="&preferencesCmd2.label;"
accesskey="&preferencesCmd2.accesskey;"
command="cmd_preferences"/>
#else
#ifdef XP_MACOSX
<menuitem id="menu_preferences"
label="&preferencesCmd2.label;"
accesskey="&preferencesCmd2.accesskey;"
command="cmd_preferences"/>
#endif
#endif
</menupopup>
</menu>

@ -574,8 +574,6 @@
accesskey="&findPrevCmd.accesskey;"
key="key_findPrev"
command="cmd_findPrev"/>
#ifdef XP_UNIX
#ifndef XP_MACOSX
<menuseparator id="prefSep"/>
<menuitem id="menu_accountmgr"
label="&accountManagerCmd2.label;"
@ -583,8 +581,6 @@
command="cmd_account"/>
<menuitem id="menu_preferences" label="&preferencesCmdUnix.label;" accesskey="&preferencesCmdUnix.accesskey;"
oncommand="openOptionsDialog('paneCompose');"/>
#endif
#endif
</menupopup>
</menu>
@ -709,19 +705,6 @@
accesskey="&addressBookCmd.accesskey;"
key="key_addressbook"
oncommand="toAddressBook();"/>
#endif
#ifndef XP_UNIX
<menuseparator id="prefSep"/>
<menuitem label="&accountManagerCmd2.label;" accesskey="&accountManagerCmd2.accesskey;" command="cmd_account"/>
<menuitem id="menu_preferences" label="&preferencesCmd2.label;" accesskey="&preferencesCmd2.accesskey;"
oncommand="openOptionsDialog('paneCompose');"/>
#else
#ifdef XP_MACOSX
<menuitem label="&accountManagerCmd2.label;" accesskey="&accountManagerCmd2.accesskey;" command="cmd_account"/>
<menuitem id="menu_preferences" label="&preferencesCmd2.label;" accesskey="&preferencesCmd2.accesskey;"
oncommand="openOptionsDialog('paneCompose');"/>
#endif
#endif
</menupopup>
</menu>

Loading…
Cancel
Save