mozilla
/
releases-comm-central
зеркало из https://github.com/mozilla/releases-comm-central.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 694164 - Fold mailABOverlay.xul into addressbook.xul r=mnyromyr

This commit is contained in:
Ian Neal 2011-10-17 22:30:41 +01:00
Родитель 951b844071
Коммит b97bc46f97
3 изменённых файлов: 14 добавлений и 25 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
suite/mailnews/addrbook/addressbook.xul
Просмотреть файл

@ -47,12 +47,15 @@
<?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/addressbook/abResultsPaneOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/addressbook/abCardViewOverlay.xul"?>
<?xul-overlay href="chrome://navigator/content/platformMailOverlay.xul"?>
<!DOCTYPE window [
<!ENTITY % abMainWindowDTD SYSTEM "chrome://messenger/locale/addressbook/abMainWindow.dtd" >
%abMainWindowDTD;
<!ENTITY % abResultsPaneOverlayDTD SYSTEM "chrome://messenger/locale/addressbook/abResultsPaneOverlay.dtd" >
%abResultsPaneOverlayDTD;
<!ENTITY % mailOverlayDTD SYSTEM "chrome://messenger/locale/mailOverlay.dtd">
%mailOverlayDTD;
<!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd" >
%messengerDTD;
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
@ -101,7 +104,7 @@
<command id="cmd_newEditor"/>
<command id="cmd_newcard" oncommand="AbNewCard();"/>
<command id="cmd_newlist" oncommand="AbNewList();"/>
<command id="cmd_newmessage" oncommand="AbNewMessage()"/>
<command id="cmd_newMessage" oncommand="AbNewMessage();"/>
<command id="cmd_newim" oncommand="AbIMSelected()"/>
<command id="cmd_printSetup" oncommand="PrintUtils.showPageSetup()"/>
<command id="cmd_printCard" oncommand="AbPrintCard()"/>
@ -140,6 +143,10 @@
<!-- File Menu -->
<key id="key_newNavigator"/>
<key id="key_newBlankPage"/>
<key id="key_newMessage"
key="&newMessageCmd.key;"
command="cmd_newMessage"
modifiers="accel"/>
<key id="key_printCard" key="&printContactViewCmd.key;"
command="cmd_printCard" modifiers="accel"/>
<key id="key_close"/>
@ -200,7 +207,7 @@
<menuitem id="abResultsTreeContext-newmessage"
label="&newmsgButton.label;"
accesskey="&newmsgButton.accesskey;"
command="cmd_newmessage"/>
command="cmd_newMessage"/>
<menuitem id="abResultsTreeContext-newim"
label="&newimButton.label;"
accesskey="&newimButton.accesskey;"
@ -246,6 +253,11 @@
<menuitem label="&newLDAPDirectoryCmd.label;" id="addLDAP" accesskey="&newLDAPDirectoryCmd.accesskey;" oncommand="AbNewLDAPDirectory()"/>
<menuseparator/>
<menuitem id="menu_newNavigator"/>
<menuitem id="menu_newMessage"
label="&newMessageCmd.label;"
accesskey="&newMessageCmd.accesskey;"
key="key_newMessage"
command="cmd_newMessage"/>
<menuitem id="menu_newEditor"/>
</menupopup>
</menu>

2
suite/mailnews/jar.mn
Просмотреть файл

@ -8,7 +8,6 @@ messenger.jar:
% overlay chrome://communicator/content/pref/pref-scripts.xul chrome://messenger/content/mailPrefsOverlay.xul
% overlay chrome://communicator/content/pref/pref-cookies.xul chrome://messenger/content/mailPrefsOverlay.xul
% overlay chrome://editor/content/editorTasksOverlay.xul chrome://messenger/content/mailTasksOverlay.xul
% overlay chrome://messenger/content/addressbook/addressbook.xul chrome://messenger/content/mailABOverlay.xul
% overlay chrome://messenger/content/addressbook/abSelectAddressesDialog.xul chrome://messenger/content/mailOverlay.xul
% overlay chrome://editor/content/composerOverlay.xul chrome://messenger/content/mailEditorOverlay.xul
% overlay chrome://editor/content/EdImageOverlay.xul chrome://messenger/content/messengercompose/mailComposeEditorOverlay.xul
@ -48,7 +47,6 @@ messenger.jar:
content/messenger/mailTasksOverlay.xul
content/messenger/mailTasksOverlay.js
content/messenger/mailEditorOverlay.xul
content/messenger/mailABOverlay.xul
content/messenger/phishingDetector.js
content/messenger/mailOverlay.xul
content/messenger/mailOverlay.js

21
suite/mailnews/mailABOverlay.xul
Просмотреть файл

@ -1,21 +0,0 @@
<?xml version="1.0"?>
<?xul-overlay href="chrome://navigator/content/platformMailOverlay.xul"?>
<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/mailOverlay.dtd">
<overlay id="mailABOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<commandset id="tasksCommands">
<command id="cmd_newMessage" oncommand="AbNewMessage();"/>
</commandset>
<menupopup id="menu_NewPopup">
<menuitem id="menu_newMessage" position="7" label="&newMessageCmd.label;" key="key_newMessage" accesskey="&newMessageCmd.accesskey;" command="cmd_newMessage"/>
</menupopup>
<keyset id="tasksKeys">
<key id="key_newMessage" key="&newMessageCmd.key;" command="cmd_newMessage" modifiers="accel"/>
</keyset>
</overlay>