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

Land a patch from Stephen Walker to collapse overlays in the address book. 

Add an about dialog to the help menu

Make the mail 3-pane toolbar icons show up in the customize toolbar dialog.

Add a context menu to the toolbar to let you customize it.
This commit is contained in:
scott%scott-macgregor.org 2003-05-31 01:55:49 +00:00
Родитель dc5c3717a5
Коммит 9206db459e
19 изменённых файлов: 651 добавлений и 202 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

Двоичные данные
mail/base/content/about-thunderbird.png Normal file
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

После

Ширина:  |  Высота:  |  Размер: 18 KiB

77
mail/base/content/aboutDialog.xul Normal file
Просмотреть файл

@ -0,0 +1,77 @@
<?xml version="1.0"?> <!-- -*- Mode: HTML -*- -->
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is Mozilla Thunderbird about dialog.
#
# The Initial Developer of the Original Code is
# Blake Ross (blaker@netscape.com).
# Portions created by the Initial Developer are Copyright (C) 2002
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the LGPL or the GPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK ***** -->
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<!DOCTYPE window [
<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
%brandDTD;
<!ENTITY % aboutDialogDTD SYSTEM "chrome://messenger/locale/aboutDialog.dtd" >
%aboutDialogDTD;
]>
<dialog xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
buttons="accept"
onload="onLoad();"
title="&aboutDialog.title;"
width="300" height="315">
<script type="application/x-javascript">
<![CDATA[
function onLoad() {
var versionField = document.getElementById("versionField");
versionField.value = navigator.vendorSub + ' (' + navigator.productSub + ')';
}
]]>
</script>
<vbox align="center" flex="1">
<image src="chrome://messenger/content/about-thunderbird.png"/>
<separator class="thin"/>
<hbox>
<label value="&brandShortName;" style="font-weight: bold;"/>
<label id="versionField"/>
</hbox>
<separator class="thin"/>
<html:a href="&copyrightLink;" style="display: block; color: blue; text-decoration: underline;">&copyright;</html:a>
</vbox>
<separator class="groove"/>
</dialog>

2
mail/base/content/customizeToolbar.xul
Просмотреть файл

@ -32,10 +32,10 @@
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://global/content/customizeToolbar.css" type="text/css"?>
<?xml-stylesheet href="chrome://global/skin/customizeToolbar.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/primaryToolbar.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/addressbook/addressbook.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/messengercompose/messengercompose.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/messengersmime/msgCompSMIMEOverlay.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/primaryToolbar.css" type="text/css"?>
<window id="CustomizeToolbarWindow"
title="&dialog.title;"

2
mail/base/content/mail3PaneWindowVertLayout.xul
Просмотреть файл

@ -29,7 +29,6 @@ Rights Reserved.
<?xul-overlay href="chrome://messenger/content/mailWindowOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/mailOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
<!DOCTYPE window [
<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@ -59,7 +58,6 @@ Rights Reserved.
</stringbundleset>
<script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/commandglue.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/shareglue.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/msgViewNavigation.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>

12
mail/base/content/mailWindowOverlay.xul
Просмотреть файл

@ -962,8 +962,7 @@ Rights Reserved.
</popup>
<popup id="toolbar-context-menu">
<menuitem command="cmd_CustomizeToolbars"
label="Customize Toolbar"/>
<menuitem oncommand="CustomizeMailToolbar('mail-toolbox');" label="&customizeToolbar.label;" accesskey="&customizeToolbar.accesskey;"/>
</popup>
<toolbox id="mail-toolbox" class="toolbox-top" mode="icons">
@ -1486,10 +1485,13 @@ Rights Reserved.
<menupopup id="menu_HelpPopup">
<menuitem accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="loadThrobberUrl('mailnews.release_notes.url');"/>
<menuitem accesskey="&hintsAndTips.accesskey;" label="&hintsAndTips.label;" oncommand="loadThrobberUrl('mailnews.hints_and_tips.url');"/>
<menuseparator/>
<menuitem accesskey="&aboutCmd.accesskey;"
label="&aboutCmd.label;"
oncommand="window.openDialog('chrome://messenger/content/aboutDialog.xul', 'About', 'modal,centerscreen,chrome,resizable=no');"/>
</menupopup>
</menu>
<spacer flex="100%"/>
<spacer flex="100%"/>
</menubar>
</toolbaritem>
</toolbar>
@ -1618,9 +1620,9 @@ Rights Reserved.
toolbarname="Mail"
fullscreentoolbar="true" mode="full"
customizable="true"
context="toolbar-context-menu"
defaultset="button-getmsg,button-newmsg,button-address,spacer,spacer,spacer,button-reply,button-replyall,button-forward,spacer,spacer,spacer,button-delete,button-junk,button-print,button-stop,spring,throbber-box">
</toolbar>
<toolbarset id="customToolbars" context="toolbar-context-menu"/>
</toolbox>
<hbox id="searchBox" persist="collapsed" align="center">

3
mail/base/content/messenger.xul
Просмотреть файл

@ -29,7 +29,6 @@ Rights Reserved.
<?xul-overlay href="chrome://messenger/content/mailWindowOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/mailOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
<!DOCTYPE window [
<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@ -59,7 +58,6 @@ Rights Reserved.
</stringbundleset>
<script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/commandglue.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/shareglue.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/msgViewNavigation.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
@ -113,6 +111,7 @@ Rights Reserved.
<popup id="threadPaneContext"/>
<popup id="folderPaneContext"/>
<popup id="attachmentListContext"/>
<popup id="toolbar-context-menu"/>
<tooltip id="attachmentListTooltip"/>
<popup id="emailAddressPopup" popupanchor="bottomleft" onpopupshowing="goUpdateCommand('cmd_createFilterFromPopup')">

3
mail/base/jar.mn
Просмотреть файл

@ -12,6 +12,8 @@ messenger.jar:
+ content/messenger/msgMail3PaneWindow.js (content/msgMail3PaneWindow.js)
+ content/messenger/mailCore.js (content/mailCore.js)
+ content/messenger/SearchDialog.xul (content/SearchDialog.xul)
*+ content/messenger/aboutDialog.xul (content/aboutDialog.xul)
content/messenger/about-thunderbird.png (content/about-thunderbird.png)
classic.jar:
+ skin/classic/global/tree/twisty-open.gif (skin/icons/twisty-open.gif)
@ -54,6 +56,7 @@ en-US.jar:
locale/en-US/messenger/h1.png (locale/h1.png)
locale/en-US/messenger/h2.png (locale/h2.png)
locale/en-US/messenger/back.png (locale/back.png)
locale/en-US/messenger/aboutDialog.dtd (locale/aboutDialog.dtd)
+ locale/en-US/messenger/messenger.dtd (locale/messenger.dtd)
+ locale/en-US/messenger/mailTasksOverlay.dtd (locale/mailTasksOverlay.dtd)
+ locale/en-US/messenger/msgAccountCentral.dtd (locale/msgAccountCentral.dtd)

3
mail/base/locale/aboutDialog.dtd Normal file
Просмотреть файл

@ -0,0 +1,3 @@
<!ENTITY aboutDialog.title "About &brandShortName;">
<!ENTITY copyright "Copyright and contributor information">
<!ENTITY copyrightLink "http://www.mozilla.org/projects/thunderbird/">

4
mail/base/locale/brand.dtd
Просмотреть файл

@ -1,4 +1,4 @@
<!ENTITY lang.version "1.4">
<!ENTITY brandShortName "Thunderbird">
<!ENTITY vendorShortName "Thunderbird">
<!ENTITY brandShortName "Mozilla Thunderbird">
<!ENTITY vendorShortName "Mozilla Thunderbird">
<!ENTITY sidebarName "Sidebar">

4
mail/base/locale/messenger.dtd
Просмотреть файл

@ -570,8 +570,10 @@ Rights Reserved.
<!ENTITY helpMenu.accesskey "H">
<!ENTITY releaseCmd.label "Release Notes">
<!ENTITY releaseCmd.accesskey "R">
<!ENTITY hintsAndTips.label "Thunderbird Help">
<!ENTITY hintsAndTips.label "&brandShortName; Help">
<!ENTITY hintsAndTips.accesskey "h">
<!ENTITY aboutCmd.label "About &brandShortName;">
<!ENTITY aboutCmd.accesskey "A">

87
mail/components/addrbook/content/abDirTreeOverlay.xul
Просмотреть файл

@ -1,87 +0,0 @@
<?xml version="1.0"?>
<!--
The contents of this file are subject to the Netscape Public
License Version 1.1 (the "License"); you may not use this file
except in compliance with the License. You may obtain a copy of
the License at http://www.mozilla.org/NPL/
Software distributed under the License is distributed on an "AS
IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
implied. See the License for the specific language governing
rights and limitations under the License.
The Original Code is Mozilla Communicator client code, released
March 31, 1998.
The Initial Developer of the Original Code is Netscape
Communications Corporation. Portions created by Netscape are
Copyright (C) 1998-1999 Netscape Communications Corporation. All
Rights Reserved.
Contributors:
Seth Spitzer <sspitzer@netscape.com>
-->
<?xml-stylesheet href="chrome://messenger/skin/addressbook/addressPanes.css" type="text/css"?>
<overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
<!-- FIX ME - remove document.commandDispatcher.updateCommands() when tree selection calls this automatically -->
<tree id="dirTree" class="abDirectory plain" seltype="single"
datasources="rdf:addressdirectory" ref="moz-abdirectory://"
flags="dont-build-content"
hidecolumnpicker="true"
onselect="DirPaneSelectionChange(); document.commandDispatcher.updateCommands('addrbook-select');"
onclick="DirPaneClick(event);"
ondblclick="DirPaneDoubleClick(event);"
onblur="goOnEvent(this,'blur')">
<treecols>
<treecol id="DirCol" flex="1" primary="true"
crop="center" persist="width" ignoreincolumnpicker="true" hideheader="true"
sort="?DirTreeNameSort" sortActive="true" sortDirection="ascending"/>
</treecols>
<template>
<rule>
<conditions>
<treeitem uri="?container"/>
<member container="?container" child="?member"/>
</conditions>
<bindings>
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#DirName"
object="?DirName"/>
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#DirTreeNameSort"
object="?DirTreeNameSort"/>
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#IsMailList"
object="?IsMailList"/>
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#IsRemote"
object="?IsRemote"/>
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#IsSecure"
object="?IsSecure"/>
</bindings>
<action>
<treechildren>
<treeitem uri="?member" persist="sortDirection sortColumn open">
<treerow>
<treecell label="?DirName" properties="IsMailList-?IsMailList IsRemote-?IsRemote IsSecure-?IsSecure"/>
</treerow>
</treeitem>
</treechildren>
</action>
</rule>
</template>
</tree>
</overlay>

443
mail/components/addrbook/content/addressbook.xul
Просмотреть файл

@ -23,22 +23,11 @@ Contributor(s):
-->
<?xml-stylesheet href="chrome://messenger/skin/addressbook/addressbook.css" type="text/css"?>
<?xml-stylesheet href="chrome://communicator/skin/tasksOverlay.css" type="text/css"?>
<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/contentAreaContextOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/addressbook/abDirTreeOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/addressbook/abResultsPaneOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/addressbook/abCardViewOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
<!DOCTYPE window [
<!ENTITY % abMainWindowDTD SYSTEM "chrome://messenger/locale/addressbook/abMainWindow.dtd" >
%abMainWindowDTD;
<!ENTITY % abResultsPaneOverlayDTD SYSTEM "chrome://messenger/locale/addressbook/abResultsPaneOverlay.dtd" >
%abResultsPaneOverlayDTD;
<!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd" >
%messengerDTD;
<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
%brandDTD;
]>
@ -69,34 +58,51 @@ Contributor(s):
<script type="application/x-javascript" src="chrome://communicator/content/printing.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/msgPrintEngine.js"/>
<!-- move needed functions into a single js file -->
<script type="application/x-javascript" src="chrome://communicator/content/utilityOverlay.js"/>
<script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
<script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abResultsPane.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCardViewOverlay.js"/>
<commandset id="addressBook">
<commandset id="CommandUpdate_AddressBook"
commandupdater="true"
events="focus,addrbook-select"
oncommandupdate="CommandUpdate_AddressBook()"/>
<commandset id="selectEditMenuItems"/>
<commandset id="undoEditMenuItems"/>
<commandset id="globalEditMenuItems"/>
commandupdater="true"
events="focus,addrbook-select"
oncommandupdate="CommandUpdate_AddressBook()"/>
<commandset id="selectEditMenuItems"
commandupdater="true"
events="select"
oncommandupdate="goUpdateSelectEditMenuItems()"/>
<commandset id="undoEditMenuItems"
commandupdater="true"
events="undo"
oncommandupdate="goUpdateUndoEditMenuItems()"/>
<commandset id="globalEditMenuItems"
commandupdater="true"
events="focus"
oncommandupdate="goUpdateGlobalEditMenuItems()"/>
<command id="cmd_printSetup" oncommand="NSPrintSetup()"/>
<command id="cmd_printCard" oncommand="AbPrintCard()"/>
<command id="cmd_printPreviewCard" oncommand="AbPrintPreviewCard()"/>
<command id="cmd_printAddressBook" oncommand="AbPrintAddressBook()"/>
<command id="cmd_printPreviewAddressBook" oncommand="AbPrintPreviewAddressBook()"/>
<command id="cmd_quit"/>
<command id="cmd_quit" oncommand="goQuitApplication()"/>
<command id="cmd_close" oncommand="AbClose()"/>
<command id="cmd_properties" oncommand="goDoCommand('button_edit');"/>
<command id="cmd_undo"/>
<command id="cmd_redo"/>
<command id="cmd_copy"/>
<command id="cmd_paste"/>
<command id="cmd_cut"/>
<command id="cmd_selectAll"/>
<command id="cmd_undo" oncommand="goDoCommand('cmd_undo')" disabled="true"/>
<command id="cmd_redo" oncommand="goDoCommand('cmd_redo')" disabled="true"/>
<command id="cmd_cut" oncommand="goDoCommand('cmd_cut')" disabled="true"/>
<command id="cmd_copy" oncommand="goDoCommand('cmd_copy')" disabled="true"/>
<command id="cmd_paste" oncommand="goDoCommand('cmd_paste')" disabled="true"/>
<command id="cmd_delete" oncommand="goDoCommand('cmd_delete')" valueDefault="&deleteCmd.label;" disabled="true"/>
<command id="cmd_selectAll" oncommand="goDoCommand('cmd_selectAll')" disabled="true"/>
<command id="cmd_swapFirstNameLastName" oncommand="AbSwapFirstNameLastName()"/>
</commandset>
<broadcasterset id="abBroadcasters">
<!-- File Menu -->
<!-- Edit Menu -->
<broadcaster id="cmd_delete"
valueAddressBook="&deleteAbCmd.label;"
@ -109,17 +115,17 @@ Contributor(s):
<keyset id="tasksKeys">
<!-- File Menu -->
<key id="key_printCard" key="&printCardViewCmd.key;" command="cmd_printCard" modifiers="accel"/>
<key id="key_close"/>
<key id="key_quit"/>
<key id="key_printCard" key="&printCardViewCmd.key;" command="cmd_printCard" modifiers="accel"/>
<key id="key_close" key="&closeCmd.key;" modifiers="accel"/>
<key id="key_quit" key="&quitApplicationCmd.key;" modifiers="accel"/>
<!-- Edit Menu -->
<key id="key_delete"/>
<key id="key_undo"/>
<key id="key_redo"/>
<key id="key_cut"/>
<key id="key_copy"/>
<key id="key_paste"/>
<key id="key_selectAll"/>
<key id="key_undo" key="&undoCmd.key;" modifiers="accel"/>
<key id="key_redo" key="&redoCmd.key;" modifiers="accel"/>
<key id="key_cut" key="&cutCmd.key;" modifiers="accel"/>
<key id="key_copy" key="&copyCmd.key;" modifiers="accel"/>
<key id="key_paste" key="&pasteCmd.key;" modifiers="accel"/>
<key id="key_delete" keycode="VK_DELETE"/>
<key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
<key id="key_properties" key="&propertiesCmd.key;" command="cmd_properties" modifiers="accel"/>
<!-- Tab/F6 Keys -->
@ -133,15 +139,21 @@ Contributor(s):
<key id="key_mail" key="&messengerCmd.commandkey;" oncommand="toMessengerWindow();" modifiers="accel"/>
</keyset>
<popupset id="aTooltipSet">
<popup id="aTooltip" class="tooltip" onpopupshowing="return FillInTooltip(document.tooltipNode);" >
<label id="TOOLTIP-tooltipText" class="tooltip-label" flex="1"/>
</popup>
</popupset>
<toolbox id="ab-toolbox" class="toolbox-top" mode="icons">
<toolbar type="menubar" id="addrbook-toolbar-menubar" class="chromeclass-menubar" customizable="false"
defaultset="menubar-items" mode="icons">
<toolbaritem id="menubar-items" align="center">
<menubar id="mail-menubar" style="border:0px;padding:0px;margin:0px;-moz-appearance:none">
<menu id="menu_File">
<menu id="menu_File" label="&fileMenu.label;" accesskey="&fileMenu.accesskey;">
<menupopup id="menu_FilePopup">
<menu id="menu_New">
<menu id="menu_New" label="&newMenu.label;" accesskey="&newMenu.accesskey;">
<menupopup id="menu_NewPopup">
<menuitem label="&newCard.label;" accesskey="&newCard.accesskey;" oncommand="AbNewCard('dirTree')"/>
<menuitem label="&newListCmd.label;" accesskey="&newListCmd.accesskey;" oncommand="AbNewList('dirTree')"/>
@ -150,27 +162,58 @@ Contributor(s):
<menuseparator/>
</menupopup>
</menu>
<menuitem id="menu_close"/>
<menuitem id="menu_close" label="&closeCmd.label;" key="key_close" accesskey="&closeCmd.accesskey;" command="cmd_close"/>
<menuseparator/>
<menuitem id="printSetupMenuItem" label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" command="cmd_printSetup"/>
<menuitem id="printPreviewMenuItem" label="&printPreviewCardViewCmd.label;" accesskey="&printPreviewCardViewCmd.accesskey;" command="cmd_printPreviewCard"/>
<menuitem id="printPreviewAddressBook" label="&printPreviewAddressBook.label;" accesskey="&printPreviewAddressBook.accesskey;" command="cmd_printPreviewAddressBook"/>
<menuitem id="printMenuItem" label="&printCardViewCmd.label;" accesskey="&printCardViewCmd.accesskey;" key="key_printCard" command="cmd_printCard"/>
<menuitem id="printAddressBook" label="&printAddressBook.label;" accesskey="&printAddressBook.accesskey;" command="cmd_printAddressBook"/>
<menuitem id="printSetupMenuItem" label="&printSetupCmd.label;" accesskey="&printSetupCmd.accesskey;" command="cmd_printSetup"/>
<menuitem id="printPreviewMenuItem" label="&printPreviewCardViewCmd.label;" accesskey="&printPreviewCardViewCmd.accesskey;" command="cmd_printPreviewCard"/>
<menuitem id="printPreviewAddressBook" label="&printPreviewAddressBook.label;" accesskey="&printPreviewAddressBook.accesskey;" command="cmd_printPreviewAddressBook"/>
<menuitem id="printMenuItem" label="&printCardViewCmd.label;" accesskey="&printCardViewCmd.accesskey;" key="key_printCard" command="cmd_printCard"/>
<menuitem id="printAddressBook" label="&printAddressBook.label;" accesskey="&printAddressBook.accesskey;" command="cmd_printAddressBook"/>
<menuseparator id="menu_FileQuitSeparator"/>
<menuitem id="menu_FileQuitItem" label="&quitApplicationCmd.label;" accesskey="&quitApplicationCmd.accesskey;" key="key_quit" command="cmd_quit"/>
</menupopup>
</menu>
<menu id="menu_Edit">
<menu id="menu_Edit" label="&editMenu.label;" accesskey="&editMenu.accesskey;">
<menupopup>
<menuitem id="menu_undo"/>
<menuitem id="menu_redo"/>
<menuitem id="menu_undo"
label="&undoCmd.label;"
key="key_undo"
accesskey="&undoCmd.accesskey;"
command="cmd_undo"/>
<menuitem id="menu_redo"
label="&redoCmd.label;"
key="key_redo"
accesskey="&redoCmd.accesskey;"
command="cmd_redo"/>
<menuseparator/>
<menuitem id="menu_cut"/>
<menuitem id="menu_copy"/>
<menuitem id="menu_paste"/>
<menuitem id="menu_delete" observes="button_delete"/>
<menuitem id="menu_cut"
label="&cutCmd.label;"
key="key_cut"
accesskey="&cutCmd.accesskey;"
command="cmd_cut"/>
<menuitem id="menu_copy"
label="&copyCmd.label;"
key="key_copy"
accesskey="&copyCmd.accesskey;"
command="cmd_copy"/>
<menuitem id="menu_paste"
label="&pasteCmd.label;"
key="key_paste"
accesskey="&pasteCmd.accesskey;"
command="cmd_paste"/>
<menuitem id="menu_delete"
label="&deleteCmd.label;"
key="key_delete"
accesskey="&deleteCmd.accesskey;"
command="cmd_delete"
observes="button_delete"/>
<menuseparator/>
<menuitem id="menu_selectAll"/>
<menuitem id="menu_selectAll"
label="&selectAllCmd.label;"
key="key_selectAll"
accesskey="&selectAllCmd.accesskey;"
command="cmd_selectAll"/>
<menuseparator/>
<!-- LOCALIZATION NOTE: set "hideSwapFnLnUI" to false in .dtd to enable the UI -->
<menuitem label="&swapFirstNameLastNameCmd.label;"
@ -183,9 +226,10 @@ Contributor(s):
command="cmd_properties"/>
</menupopup>
</menu>
<menu id="menu_View">
<menu id="menu_View" label="&viewMenu.label;" accesskey="&viewMenu.accesskey;">
<menupopup id="menu_View_Popup">
<menu id="menu_Toolbars">
<menu id="menu_Toolbars" label="&viewToolbarsMenu.label;" accesskey="&viewToolbarsMenu.accesskey;">
<menupopup id="view_toolbars_popup">
<menuitem id="menu_showAbToolbar"
label="&showAbToolbarCmd.label;"
@ -196,8 +240,11 @@ Contributor(s):
accesskey="&showSearchToolbarCmd.accesskey;"
oncommand="goToggleToolbar('searchBox','menu_showSearchToolbar')"
checked="true" type="checkbox"/>
<menuitem id="menu_showTaskbar"
type="checkbox"/>
<menuitem id="menu_showTaskbar"
label="&showTaskbarCmd.label;"
accesskey="&showTaskbarCmd.accesskey;"
oncommand="goToggleToolbar('status-bar', 'menu_showTaskbar')"
checked="true" type="checkbox"/>
<menuitem id="menu_showCardPane"
label="&showCardPane.label;"
accesskey="&showCardPane.accesskey;"
@ -212,91 +259,92 @@ Contributor(s):
<menupopup>
<menuitem type="radio" name="shownameas"
id="firstLastCmd"
label="&firstLastCmd.label;"
label="&firstLastCmd.label;"
accesskey="&firstLastCmd.accesskey;"
oncommand="SetNameColumn('firstLastCmd')"/>
<menuitem type="radio" name="shownameas"
id="lastFirstCmd"
label="&lastFirstCmd.label;"
label="&lastFirstCmd.label;"
accesskey="&lastFirstCmd.accesskey;"
oncommand="SetNameColumn('lastFirstCmd')"/>
<menuitem type="radio" name="shownameas"
id="displayNameCmd"
label="&displayNameCmd.label;"
label="&displayNameCmd.label;"
accesskey="&displayNameCmd.accesskey;"
oncommand="SetNameColumn('displayNameCmd')"/>
</menupopup>
</menu>
<menu label="&sortMenu.label;" accesskey="&sortMenu.accesskey;">
<menu label="&sortMenu.label;" accesskey="&sortMenu.accesskey;">
<menupopup id="sortMenuPopup" onpopupshowing="InitViewSortByMenu()">
<menuitem label="&GeneratedName.label;"
<menuitem label="&GeneratedName.label;"
id="cmd_SortByGeneratedName"
accesskey="&GeneratedName.accesskey;"
oncommand="SortResultPane('GeneratedName');" name="sortas" type="radio" checked="true"/>
<menuitem label="&PrimaryEmail.label;"
<menuitem label="&PrimaryEmail.label;"
id="cmd_SortByPrimaryEmail"
accesskey="&PrimaryEmail.accesskey;"
oncommand="SortResultPane('PrimaryEmail');" name="sortas" type="radio" checked="true"/>
<menuitem label="&ScreenName.label;"
<menuitem label="&ScreenName.label;"
id="cmd_SortBy_AimScreenName"
accesskey="&ScreenName.accesskey;"
oncommand="SortResultPane('_AimScreenName');" name="sortas" type="radio" checked="true"/>
<menuitem label="&Company.label;"
<menuitem label="&Company.label;"
id="cmd_SortByCompany"
accesskey="&Company.accesskey;"
oncommand="SortResultPane('Company');" name="sortas" type="radio" checked="true"/>
<!-- LOCALIZATION NOTE:
Fields for phonetic are disabled as default and can be enabled by
editing "mail.addr_book.show_phonetic_fields"
-->
<menuitem label="&_PhoneticName.label;"
<!-- LOCALIZATION NOTE:
Fields for phonetic are disabled as default and can be enabled by
editing "mail.addr_book.show_phonetic_fields"
-->
<menuitem label="&_PhoneticName.label;"
id="cmd_SortBy_PhoneticName"
hidden="true"
accesskey="&_PhoneticName.accesskey;"
oncommand="SortResultPane('_PhoneticName');" name="sortas" type="radio" checked="true"/>
<menuitem label="&NickName.label;"
<menuitem label="&NickName.label;"
id="cmd_SortByNickName"
accesskey="&NickName.accesskey;"
oncommand="SortResultPane('NickName');" name="sortas" type="radio" checked="true"/>
<menuitem label="&SecondEmail.label;"
<menuitem label="&SecondEmail.label;"
id="cmd_SortBySecondEmail"
accesskey="&SecondEmail.accesskey;"
oncommand="SortResultPane('SecondEmail');" name="sortas" type="radio" checked="true"/>
<menuitem label="&Department.label;"
<menuitem label="&Department.label;"
id="cmd_SortByDepartment"
accesskey="&Department.accesskey;"
oncommand="SortResultPane('Department');" name="sortas" type="radio" checked="true"/>
<menuitem label="&JobTitle.label;"
<menuitem label="&JobTitle.label;"
id="cmd_SortByJobTitle"
accesskey="&JobTitle.accesskey;"
oncommand="SortResultPane('JobTitle');" name="sortas" type="radio" checked="true"/>
<menuitem label="&CellularNumber.label;"
<menuitem label="&CellularNumber.label;"
id="cmd_SortByCellularNumber"
accesskey="&CellularNumber.accesskey;"
oncommand="SortResultPane('CellularNumber');" name="sortas" type="radio" checked="true"/>
<menuitem label="&PagerNumber.label;"
<menuitem label="&PagerNumber.label;"
id="cmd_SortByPagerNumber"
accesskey="&PagerNumber.accesskey;"
oncommand="SortResultPane('PagerNumber');" name="sortas" type="radio" checked="true"/>
<menuitem label="&FaxNumber.label;"
<menuitem label="&FaxNumber.label;"
id="cmd_SortByFaxNumber"
accesskey="&FaxNumber.accesskey;"
oncommand="SortResultPane('FaxNumber');" name="sortas" type="radio" checked="true"/>
<menuitem label="&HomePhone.label;"
<menuitem label="&HomePhone.label;"
id="cmd_SortByHomePhone"
accesskey="&HomePhone.accesskey;"
oncommand="SortResultPane('HomePhone');" name="sortas" type="radio" checked="true"/>
<menuitem label="&WorkPhone.label;"
<menuitem label="&WorkPhone.label;"
id="cmd_SortByWorkPhone"
accesskey="&WorkPhone.accesskey;"
oncommand="SortResultPane('WorkPhone');" name="sortas" type="radio" checked="true"/>
<menuseparator/>
<menuitem id="sortAscending" type="radio" name="sortdirection" label="&sortAscending.label;" accesskey="&sortAscending.accesskey;" oncommand="AbSortAscending()"/>
<menuitem id="sortDescending" type="radio" name="sortdirection" label="&sortDescending.label;" accesskey="&sortDescending.accesskey;" oncommand="AbSortDescending()"/>
<menuseparator/>
<menuitem id="sortAscending" type="radio" name="sortdirection" label="&sortAscending.label;" accesskey="&sortAscending.accesskey;" oncommand="AbSortAscending()"/>
<menuitem id="sortDescending" type="radio" name="sortdirection" label="&sortDescending.label;" accesskey="&sortDescending.accesskey;" oncommand="AbSortDescending()"/>
</menupopup>
</menu>
</menupopup>
</menu>
</menu>
<menu id="tasksMenu" label="&tasksMenu.label;" accesskey="&tasksMenu.accesskey;">
<menupopup id="taskPopup">
<menuitem accesskey="&messengerCmd.accesskey;" label="&messengerCmd.label;" key="key_mail" oncommand="toMessengerWindow();" id="tasksMenuMail" class="menuitem-iconic icon-mail16 menu-iconic"/>
@ -308,7 +356,8 @@ Contributor(s):
<menuitem label="&importCmd.label;" accesskey="&importCmd.accesskey;" oncommand="toImport()"/>
<menuitem label="&exportCmd.label;" accesskey="&exportCmd.accesskey;" oncommand="AbExport()"/>
<menuseparator />
<menuitem id="menu_preferences" oncommand="goPreferences('mailnews', 'chrome://messenger/content/addressbook/pref-addressing.xul', 'mailaddressbookpref')"/>
<menuitem id="menu_preferences" label="&preferencesCmd.label;" accesskey="&preferencesCmd.accesskey;"
oncommand="goPreferences('mailnews', 'chrome://messenger/content/addressbook/pref-addressing.xul', 'mailaddressbookpref')"/>
</menupopup>
</menu>
@ -316,6 +365,10 @@ Contributor(s):
<menupopup id="menu_HelpPopup">
<menuitem accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="loadThrobberUrl('mailnews.release_notes.url');"/>
<menuitem accesskey="&hintsAndTips.accesskey;" label="&hintsAndTips.label;" oncommand="loadThrobberUrl('mailnews.hints_and_tips.url');"/>
<menuseparator/>
<menuitem accesskey="&aboutCmd.accesskey;"
label="&aboutCmd.label;"
oncommand="window.openDialog('chrome://messenger/content/aboutDialog.xul', 'About', 'modal,centerscreen,chrome,resizable=no');"/>
</menupopup>
</menu>
@ -328,7 +381,7 @@ Contributor(s):
<toolbarbutton class="toolbarbutton-1" id="button-newlist" label="&newlistButton.label;" tooltiptext="&newlistButton.tooltip;" oncommand="AbNewList('dirTree');"/>
<toolbarbutton class="toolbarbutton-1" id="button-editcard" label="&editButton.label;" tooltiptext="&editButton.tooltip;" oncommand="goDoCommand('button_edit');"/>
<toolbarbutton class="toolbarbutton-1" id="button-newmessage" label="&newmsgButton.label;" tooltiptext="&newmsgButton.tooltip;" oncommand="AbNewMessage();"/>
<toolbarbutton id="button-newim" class="toolbarbutton-1" label="&newIM.label;" tooltiptext="&newIM.tooltip;" oncommand="AbIMSelected();"/>
<toolbarbutton class="toolbarbutton-1" id="button-newim" label="&newIM.label;" tooltiptext="&newIM.tooltip;" oncommand="AbIMSelected();"/>
<toolbarbutton class="toolbarbutton-1" id="button-delete" observes="button_delete" label="&deleteButton.label;" tooltiptext="&deleteButton.tooltip;" oncommand="goDoCommand('button_delete');"/>
<toolbaritem id="throbber-box" align="center" pack="center">
@ -353,7 +406,59 @@ Contributor(s):
<sidebarheader id="abDirTreeHeader" align="center">
<label id="abDirTreeHeader-title" value="&dirTreeHeader.label;"/>
</sidebarheader>
<tree id="dirTree" style="min-width:150px" flex="1" persist="width"/>
<!-- FIX ME - remove document.commandDispatcher.updateCommands() when tree selection calls this automatically -->
<tree id="dirTree" class="abDirectory plain" seltype="single" style="min-width:150px" flex="1" persist="width"
datasources="rdf:addressdirectory" ref="moz-abdirectory://"
flags="dont-build-content"
hidecolumnpicker="true"
onselect="DirPaneSelectionChange(); document.commandDispatcher.updateCommands('addrbook-select');"
onclick="DirPaneClick(event);"
ondblclick="DirPaneDoubleClick(event);"
onblur="goOnEvent(this,'blur')">
<treecols>
<treecol id="DirCol" flex="1" primary="true"
crop="center" persist="width" ignoreincolumnpicker="true" hideheader="true"
sort="?DirTreeNameSort" sortActive="true" sortDirection="ascending"/>
</treecols>
<template>
<rule>
<conditions>
<treeitem uri="?container"/>
<member container="?container" child="?member"/>
</conditions>
<bindings>
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#DirName"
object="?DirName"/>
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#DirTreeNameSort"
object="?DirTreeNameSort"/>
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#IsMailList"
object="?IsMailList"/>
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#IsRemote"
object="?IsRemote"/>
<binding subject="?member"
predicate="http://home.netscape.com/NC-rdf#IsSecure"
object="?IsSecure"/>
</bindings>
<action>
<treechildren>
<treeitem uri="?member" persist="sortDirection sortColumn open">
<treerow>
<treecell label="?DirName" properties="IsMailList-?IsMailList IsRemote-?IsRemote IsSecure-?IsSecure"/>
</treerow>
</treeitem>
</treechildren>
</action>
</rule>
</template>
</tree>
</vbox>
<splitter id="dirTree-splitter" collapse="before" persist="state">
@ -381,7 +486,77 @@ Contributor(s):
</hbox>
<!-- results pane -->
<tree id="abResultsTree" flex="1" persist="height"/>
<tree id="abResultsTree" flex="1" enableColumnDrag="true" class="plain"
onclick="AbResultsPaneOnClick(event);"
onselect="this.view.selectionChanged();"
sortCol="GeneratedName"
persist="height sortCol">
<treecols id="abResultsTreeCols">
<!-- these column ids must match up to the mork column names, except for GeneratedName, see nsIAddrDatabase.idl -->
<treecol id="GeneratedName" class="sortDirectionIndicator"
persist="hidden ordinal width sortDirection" flex="1"
label="&GeneratedName.label;" primary="true"/>
<splitter class="tree-splitter"/>
<treecol id="PrimaryEmail" class="sortDirectionIndicator"
persist="hidden ordinal width sortDirection" flex="1"
label="&PrimaryEmail.label;"/>
<splitter class="tree-splitter"/>
<treecol id="_AimScreenName" class="sortDirectionIndicator"
persist="hidden ordinal width sortDirection" flex="1"
label="&ScreenName.label;"/>
<splitter class="tree-splitter"/>
<treecol id="Company" class="sortDirectionIndicator"
persist="hidden ordinal width sortDirection" flex="1"
label="&Company.label;"/>
<splitter class="tree-splitter"/>
<treecol id="NickName" class="sortDirectionIndicator"
persist="hidden ordinal width sortDirection" flex="1"
label="&NickName.label;" hiddenbydefault="true"/>
<splitter class="tree-splitter"/>
<treecol id="SecondEmail" class="sortDirectionIndicator"
persist="hidden ordinal width sortDirection" flex="1"
label="&SecondEmail.label;" hiddenbydefault="true"/>
<splitter class="tree-splitter"/>
<treecol id="Department" class="sortDirectionIndicator"
persist="hidden ordinal width sortDirection" flex="1"
label="&Department.label;" hiddenbydefault="true"/>
<splitter class="tree-splitter"/>
<treecol id="JobTitle" class="sortDirectionIndicator"
persist="hidden ordinal width sortDirection" flex="1"
label="&JobTitle.label;" hiddenbydefault="true"/>
<splitter class="tree-splitter"/>
<treecol id="CellularNumber" class="sortDirectionIndicator"
persist="hidden ordinal width sortDirection" flex="1"
label="&CellularNumber.label;" hiddenbydefault="true"/>
<splitter class="tree-splitter"/>
<treecol id="PagerNumber" class="sortDirectionIndicator"
persist="hidden ordinal width sortDirection" flex="1"
label="&PagerNumber.label;" hiddenbydefault="true"/>
<splitter class="tree-splitter"/>
<treecol id="FaxNumber" class="sortDirectionIndicator"
persist="hidden ordinal width sortDirection" flex="1"
label="&FaxNumber.label;" hiddenbydefault="true"/>
<splitter class="tree-splitter"/>
<treecol id="HomePhone" class="sortDirectionIndicator"
persist="hidden ordinal width sortDirection" flex="1"
label="&HomePhone.label;" hiddenbydefault="true"/>
<splitter class="tree-splitter"/>
<treecol id="WorkPhone" class="sortDirectionIndicator"
persist="hidden ordinal width sortDirection" flex="1"
label="&WorkPhone.label;"/>
<!-- LOCALIZATION NOTE: _PhoneticName may be enabled for Japanese builds. -->
<!--
<treecol id="_PhoneticName" class="sortDirectionIndicator"
persist="hidden ordinal width sortDirection" flex="1"
label="&_PhoneticName.label;" hiddenbydefault="true"/>
<splitter class="tree-splitter"/>
-->
</treecols>
<treechildren ondraggesture="nsDragAndDrop.startDrag(event, abResultsPaneObserver);"/>
</tree>
<splitter id="results-splitter" collapse="after" persist="state">
<grippy/>
@ -389,7 +564,101 @@ Contributor(s):
<!-- card view -->
<hbox id="CardViewOuterBox" flex="1">
<vbox id="CardViewBox" style="height:170px; min-height:1px; min-width:1px"/>
<vbox id="CardViewBox" flex="1" style="height:170px; min-height:1px; min-width:1px">
<vbox id="CardViewInnerBox" collapsed="true" flex="1">
<description id="CardTitle"/>
<hbox style="width:100%" flex="1">
<vbox flex="1">
<vbox id="cvbContact" class="cardViewGroup">
<description class="CardViewHeading" id="cvhContact">&contact.heading;</description>
<description class="CardViewLink" id="cvListNameBox">
<html:p><html:a href="" id="cvListName"/></html:p>
</description>
<description class="CardViewText" id="cvDisplayName"/>
<description class="CardViewText" id="cvNickname"/>
<description class="CardViewLink" id="cvEmail1Box">
<html:a href="" id="cvEmail1"/>
</description>
<description class="CardViewLink" id="cvEmail2Box">
<html:a href="" id="cvEmail2"/>
</description>
<description class="CardViewLink" id="cvScreennameBox">
<html:a href="" id="cvScreenname"/>
<html:img onclick="GoIM()" align="top" id="cvAimPresence"/>
</description>
</vbox>
<vbox id="cvbHome" class="cardViewGroup">
<description class="CardViewHeading" id="cvhHome">&home.heading;</description>
<hbox>
<vbox flex="1">
<description class="CardViewText" id="cvHomeAddress"/>
<description class="CardViewText" id="cvHomeAddress2"/>
<description class="CardViewText" id="cvHomeCityStZip"/>
<description class="CardViewText" id="cvHomeCountry"/>
</vbox>
<vbox id="cvbHomeMapItBox" pack="end">
<button id="cvHomeMapIt" url="" label="&mapItButton.label;" oncommand="MapIt('cvHomeMapIt');" tooltiptext="&mapIt.tooltip;"/>
</vbox>
</hbox>
<description class="CardViewLink" id="cvHomeWebPageBox">
<html:a onclick="return openLink('cvHomeWebPage');" href="" id="cvHomeWebPage"/>
</description>
</vbox>
<vbox id="cvbOther" class="cardViewGroup">
<description class="CardViewHeading" id="cvhOther">&other.heading;</description>
<description class="CardViewText" id="cvCustom1"/>
<description class="CardViewText" id="cvCustom2"/>
<description class="CardViewText" id="cvCustom3"/>
<description class="CardViewText" id="cvCustom4"/>
<description class="CardViewText" id="cvNotes"/>
<hbox autostretch="never">
<image id="cvBuddyIcon"/>
</hbox>
</vbox>
<vbox id="cvbDescription" class="cardViewGroup">
<description class="CardViewHeading" id="cvhDescription">&description.heading;</description>
<description class="CardViewText" id="cvDescription"/>
</vbox>
<vbox id="cvbAddresses" class="cardViewGroup">
<description class="CardViewHeading" id="cvhAddresses">&addresses.heading;</description>
</vbox>
</vbox>
<spacer style="width:20px"/>
<vbox flex="1">
<vbox id="cvbPhone" class="cardViewGroup">
<description class="CardViewHeading" id="cvhPhone">&phone.heading;</description>
<description class="CardViewText" id="cvPhWork"/>
<description class="CardViewText" id="cvPhHome"/>
<description class="CardViewText" id="cvPhFax"/>
<description class="CardViewText" id="cvPhCellular"/>
<description class="CardViewText" id="cvPhPager"/>
</vbox>
<vbox id="cvbWork" class="cardViewGroup">
<description class="CardViewHeading" id="cvhWork">&work.heading;</description>
<description class="CardViewText" id="cvJobTitle"/>
<description class="CardViewText" id="cvDepartment"/>
<description class="CardViewText" id="cvCompany"/>
<hbox>
<vbox flex="1">
<description class="CardViewText" id="cvWorkAddress"/>
<description class="CardViewText" id="cvWorkAddress2"/>
<description class="CardViewText" id="cvWorkCityStZip"/>
<description class="CardViewText" id="cvWorkCountry"/>
</vbox>
<vbox id="cvbWorkMapItBox" pack="end">
<button id="cvWorkMapIt" url="" label="&mapItButton.label;" oncommand="MapIt('cvWorkMapIt');" tooltiptext="&mapIt.tooltip;"/>
</vbox>
</hbox>
<description class="CardViewLink" id="cvWorkWebPageBox">
<html:a onclick="return openLink('cvWorkWebPage');" href="" id="cvWorkWebPage"/>
</description>
</vbox>
</vbox>
</hbox>
</vbox>
</vbox>
</hbox>
</vbox>
</hbox>

1
mail/components/addrbook/jar.mn
Просмотреть файл

@ -5,7 +5,6 @@ messenger.jar:
+ content/messenger/addressbook/abCardViewOverlay.js (content/abCardViewOverlay.js)
+ content/messenger/addressbook/addressbook.js (content/addressbook.js)
+ content/messenger/addressbook/addressbook.xul (content/addressbook.xul)
+ content/messenger/addressbook/abDirTreeOverlay.xul (content/abDirTreeOverlay.xul)
en-US.jar:
+ locale/en-US/messenger/addressbook/abMainWindow.dtd (locale/abMainWindow.dtd)

149
mail/components/addrbook/locale/abMainWindow.dtd
Просмотреть файл

@ -19,11 +19,15 @@ Rights Reserved.
-->
<!-- Title -->
<!ENTITY addressbookWindow.title "Address Book">
<!ENTITY addressbookWindow.title "Address Book">
<!-- Menus: the . means that the menu item isn't implemented yet -->
<!-- File Menu -->
<!ENTITY fileMenu.label "File">
<!ENTITY fileMenu.accesskey "f">
<!ENTITY newMenu.label "New">
<!ENTITY newMenu.accesskey "N">
<!ENTITY newCard.label "Address Book Card...">
<!-- LOCALIZATION NOTE (newCard.accesskey) : DONT_TRANSLATE -->
<!ENTITY newCard.accesskey "C">
@ -38,6 +42,9 @@ Rights Reserved.
<!-- LOCALIZATION NOTE (newLDAPDirectoryCmd.accesskey) : DONT_TRANSLATE -->
<!ENTITY newLDAPDirectoryCmd.accesskey "D">
<!ENTITY newIM.label "IM">
<!ENTITY closeCmd.label "Close">
<!ENTITY closeCmd.key "W">
<!ENTITY closeCmd.accesskey "c">
<!ENTITY importCmd.label "Import...">
<!ENTITY importCmd.accesskey "I">
<!ENTITY exportCmd.label "Export...">
@ -54,8 +61,34 @@ Rights Reserved.
<!ENTITY printPreviewAddressBook.accesskey "B">
<!ENTITY printSetupCmd.label "Page Setup...">
<!ENTITY printSetupCmd.accesskey "u">
<!ENTITY quitApplicationCmd.label "Exit">
<!ENTITY quitApplicationCmd.key "Q">
<!ENTITY quitApplicationCmd.accesskey "x">
<!-- Edit Menu -->
<!ENTITY editMenu.label "Edit">
<!ENTITY editMenu.accesskey "e">
<!ENTITY undoCmd.label "Undo">
<!ENTITY undoCmd.key "Z">
<!ENTITY undoCmd.accesskey "u">
<!ENTITY redoCmd.label "Redo">
<!ENTITY redoCmd.key "Y">
<!ENTITY redoCmd.accesskey "r">
<!ENTITY cutCmd.label "Cut">
<!ENTITY cutCmd.key "X">
<!ENTITY cutCmd.accesskey "t">
<!ENTITY copyCmd.label "Copy">
<!ENTITY copyCmd.key "C">
<!ENTITY copyCmd.accesskey "c">
<!ENTITY pasteCmd.label "Paste">
<!ENTITY pasteCmd.key "V">
<!ENTITY pasteCmd.accesskey "p">
<!ENTITY deleteCmd.label "Delete">
<!ENTITY deleteCmd.key "D">
<!ENTITY deleteCmd.accesskey "d">
<!ENTITY selectAllCmd.label "Select All">
<!ENTITY selectAllCmd.key "A">
<!ENTITY selectAllCmd.accesskey "a">
<!ENTITY deleteAbCmd.label "Delete Address Book">
<!ENTITY deleteCardCmd.label "Delete Card">
<!ENTITY deleteCardsCmd.label "Delete Selected Cards">
@ -67,12 +100,20 @@ Rights Reserved.
<!ENTITY propertiesCmd.key "i">
<!-- View Menu -->
<!ENTITY viewMenu.label "View">
<!ENTITY viewMenu.accesskey "v">
<!ENTITY viewToolbarsMenu.label "Toolbars">
<!ENTITY viewToolbarsMenu.accesskey "T">
<!ENTITY showAbToolbarCmd.label "Address Book Toolbar">
<!ENTITY showAbToolbarCmd.accesskey "o">
<!ENTITY showAbToolbarCmd.accesskey "o">
<!ENTITY showSearchToolbarCmd.label "Search Bar">
<!ENTITY showSearchToolbarCmd.accesskey "e">
<!ENTITY showTaskbarCmd.label "Status Bar">
<!ENTITY showTaskbarCmd.accesskey "S">
<!ENTITY showCardPane.label "Card Summary Pane">
<!ENTITY showCardPane.accesskey "a">
<!ENTITY customizeToolbar.label "Customize...">
<!ENTITY customizeToolbar.accesskey "C">
<!ENTITY menu_ShowNameAs.label "Show Name As">
<!ENTITY menu_ShowNameAs.accesskey "n">
<!ENTITY firstLastCmd.label "First Last">
@ -80,10 +121,34 @@ Rights Reserved.
<!ENTITY lastFirstCmd.label "Last, First">
<!ENTITY lastFirstCmd.accesskey "l">
<!ENTITY displayNameCmd.label "Display Name">
<!ENTITY displayNameCmd.accesskey "d">
<!ENTITY displayNameCmd.accesskey "d">
<!ENTITY sortMenu.label "Sort by">
<!ENTITY sortMenu.accesskey "S">
<!ENTITY stopSearchingCmd.label ".Stop Searching">
<!-- Tools Menu -->
<!ENTITY tasksMenu.label "Tools">
<!ENTITY tasksMenu.accesskey "T">
<!ENTITY messengerCmd.label "Mail &amp; Newsgroups">
<!ENTITY messengerCmd.accesskey "m">
<!ENTITY messengerCmd.commandkey "1">
<!ENTITY searchAddressesCmd.label "Search Addresses...">
<!ENTITY searchAddressesCmd.accesskey "S">
<!ENTITY preferencesCmd.label "Options...">
<!ENTITY preferencesCmd.key "O">
<!ENTITY preferencesCmd.accesskey "O">
<!-- Help Menu -->
<!ENTITY helpMenu.label "Help">
<!ENTITY helpMenu.accesskey "H">
<!ENTITY releaseCmd.label "Release Notes">
<!ENTITY releaseCmd.accesskey "R">
<!ENTITY hintsAndTips.label "&brandShortName; Help">
<!ENTITY hintsAndTips.accesskey "h">
<!ENTITY aboutCmd.label "About &brandShortName;">
<!ENTITY aboutCmd.accesskey "A">
<!-- Toolbar items -->
<!ENTITY newcardButton.label "New Card">
<!ENTITY newlistButton.label "New List">
@ -94,6 +159,78 @@ Rights Reserved.
<!ENTITY searchButton.label ".Search">
<!ENTITY showNames.label "Show names containing:">
<!-- Dir Tree header -->
<!ENTITY dirTreeHeader.label "Address Books">
<!-- Search Bar -->
<!ENTITY SearchNameOrEmail.label "Name or Email contains:">
<!ENTITY SearchNameOrEmail.accesskey "N">
<!ENTITY advancedButton.label "Advanced...">
<!ENTITY advancedButton.accesskey "A">
<!ENTITY clearButton.label "Clear">
<!ENTITY clearButton.accesskey "C">
<!-- Results pane -->
<!ENTITY GeneratedName.label "Name">
<!ENTITY GeneratedName.accesskey "N">
<!ENTITY PrimaryEmail.label "Email">
<!ENTITY PrimaryEmail.accesskey "E">
<!ENTITY Company.label "Company">
<!ENTITY Company.accesskey "C">
<!ENTITY _PhoneticName.label "Phonetic Name">
<!ENTITY _PhoneticName.accesskey "O">
<!ENTITY NickName.label "Nickname">
<!ENTITY NickName.accesskey "i">
<!ENTITY SecondEmail.label "Additional Email">
<!ENTITY SecondEmail.accesskey "l">
<!ENTITY Department.label "Department">
<!ENTITY Department.accesskey "r">
<!ENTITY JobTitle.label "Title">
<!ENTITY JobTitle.accesskey "T">
<!ENTITY CellularNumber.label "Mobile">
<!ENTITY CellularNumber.accesskey "M">
<!ENTITY PagerNumber.label "Pager">
<!ENTITY PagerNumber.accesskey "P">
<!ENTITY FaxNumber.label "Fax">
<!ENTITY FaxNumber.accesskey "F">
<!ENTITY HomePhone.label "Home Phone">
<!ENTITY HomePhone.accesskey "H">
<!ENTITY WorkPhone.label "Work Phone">
<!ENTITY WorkPhone.accesskey "W">
<!ENTITY ScreenName.label "Screen Name">
<!ENTITY ScreenName.accesskey "S">
<!ENTITY sortAscending.label "Ascending">
<!ENTITY sortAscending.accesskey "A">
<!ENTITY sortDescending.label "Descending">
<!ENTITY sortDescending.accesskey "D">
<!-- Results pane context menu -->
<!ENTITY composeEmail.label "Compose Email To">
<!ENTITY composeEmail.accesskey "C">
<!ENTITY deleteAddrBookCard.label "Delete">
<!ENTITY deleteAddrBookCard.accesskey "D">
<!ENTITY newAddrBookCard.label "New Card...">
<!ENTITY newAddrBookCard.accesskey "N">
<!ENTITY newAddrBookMailingList.label "New Mailing List...">
<!ENTITY newAddrBookMailingList.accesskey "M">
<!ENTITY addrBookCardProperties.label "Properties">
<!ENTITY addrBookCardProperties.accesskey "P">
<!-- Card view -->
<!-- Box Headings -->
<!ENTITY contact.heading "Contact">
<!ENTITY home.heading "Home">
<!ENTITY other.heading "Other">
<!ENTITY phone.heading "Phone">
<!ENTITY work.heading "Work">
<!-- Special Box Headings, for mailing lists -->
<!ENTITY description.heading "Description">
<!ENTITY addresses.heading "Addresses">
<!-- For Map It! -->
<!ENTITY mapItButton.label "Get Map">
<!ENTITY mapIt.tooltip "Display a map of this address from the Web">
<!-- Tooltips -->
<!ENTITY addressbookToolbar.tooltip "Address Book Toolbar">
<!ENTITY newcardButton.tooltip "Create a new address book card">
@ -114,5 +251,3 @@ Rights Reserved.
<!-- LOCALIZATION NOTE (hideSwapFnLnUI) : DONT_TRANSLATE -->
<!-- Swap FN/LN UI Set to "false" to show swap fn/ln UI -->
<!ENTITY hideSwapFnLnUI "true">
<!ENTITY dirTreeHeader.label "Address Books">

49
mail/components/addrbook/skin/addressbook.css
Просмотреть файл

@ -29,6 +29,12 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* ::::: tools menu icon ::::: */
.icon-mail16 {
list-style-image: url("chrome://communicator/skin/taskbar/mail-16.gif");
}
/* ::::: primary toolbar buttons ::::: */
.toolbarbutton-1 {
@ -107,7 +113,7 @@
list-style-image: url("chrome://messenger/skin/addressbook/icons/im-hov.gif");
}
button-newim:hover:active {
#button-newim:hover:active {
list-style-image: url("chrome://messenger/skin/addressbook/icons/im-act.gif");
}
@ -131,7 +137,46 @@ button-newim:hover:active {
-moz-image-region: rect(210px 92px 231px 69px) !important;
}
/* CardView styles - used in the Card View Pane */
/* ::::: directory pane icons ::::: */
treechildren:-moz-tree-image(DirCol) {
margin-right: 2px;
list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.gif");
}
treechildren:-moz-tree-image(DirCol, IsMailList-true) {
list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.gif");
}
treechildren:-moz-tree-image(DirCol, IsRemote-true) {
list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.gif");
}
treechildren:-moz-tree-image(DirCol, IsRemote-true, IsSecure-true) {
list-style-image: url("chrome://messenger/skin/addressbook/icons/secure-remote-addrbook.gif");
}
#dirTree [sortDirection="ascending"] {
list-style-image: none;
}
#dirTree [sortDirection="descending"] {
list-style-image: none;
}
/* ::::: results pane ::::: */
treechildren:-moz-tree-image(GeneratedName) {
margin-right: 2px;
list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.gif");
}
treechildren:-moz-tree-image(GeneratedName, MailList) {
margin-right: 2px;
list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.gif");
}
/* ::::: card view pane ::::: */
#CardViewOuterBox {
border-left: 1px solid ThreeDShadow;

1
mail/components/compose/content/compose.xul
Просмотреть файл

@ -31,7 +31,6 @@
<?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
<?xul-overlay href="chrome://mail/content/messengercompose/addressingWidgetOverlay.xul"?>
<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>

5
mail/components/compose/content/messengercompose.xul
Просмотреть файл

@ -279,7 +279,7 @@
<menu id="menu_View" label="&viewMenu.label;" accesskey="&viewMenu.accesskey;">
<menupopup id="menu_View_Popup">
<menu id="menu_Toolbars" label="&viewToolbarsMenu.label;" accesskey="&viewToolbarsMenu.accesskey;">
<menu id="menu_ToolbarsNew" label="&viewToolbarsMenuNew.label;" accesskey="&viewToolbarsMenuNew.accesskey;">
<menupopup>
<menuitem id="menu_showComposeToolbar"
type="checkbox"
@ -430,6 +430,9 @@
<menupopup id="menu_HelpPopup">
<menuitem accesskey="&releaseCmd.accesskey;" label="&releaseCmd.label;" oncommand="loadThrobberUrl('mailnews.release_notes.url');"/>
<menuitem accesskey="&hintsAndTips.accesskey;" label="&hintsAndTips.label;" oncommand="loadThrobberUrl('mailnews.hints_and_tips.url');"/>
<menuitem accesskey="&aboutCmd.accesskey;"
label="&aboutCmd.label;"
oncommand="window.openDialog('chrome://messenger/content/aboutDialog.xul', 'About', 'modal,centerscreen,chrome,resizable=no');"/>
</menupopup>
</menu>
</menubar>

4
mail/components/compose/locale/messengercompose.dtd
Просмотреть файл

@ -98,8 +98,8 @@
<!-- View menu items -->
<!ENTITY viewMenu.label "View">
<!ENTITY viewMenu.accesskey "v">
<!ENTITY viewToolbarsMenu.label "Toolbars">
<!ENTITY viewToolbarsMenu.accesskey "T">
<!ENTITY viewToolbarsMenuNew.label "Toolbars">
<!ENTITY viewToolbarsMenuNew.accesskey "T">
<!ENTITY showComposeToolbarCmd.label "Mail Toolbar">
<!ENTITY showComposeToolbarCmd.accesskey "o">
<!ENTITY showFormatToolbarCmd.label "Formatting Toolbar">

4
mail/components/prefwindow/locale/pref-fonts.dtd
Просмотреть файл

@ -41,7 +41,9 @@
<!ENTITY font.langGroup.thai "Thai">
<!ENTITY font.langGroup.hebrew "Hebrew">
<!ENTITY font.langGroup.arabic "Arabic">
<!ENTITY font.langGroup.hi-IN "Hindi">
<!ENTITY font.langGroup.devanagari "Devanagari">
<!ENTITY font.langGroup.tamil "Tamil">
<!-- Minimum font size -->
<!ENTITY minSize.label "Minimum font size:">
<!ENTITY minSize.accesskey "z">