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

Bug 342560: preference panel for new tag feature; r=IanN, sr=Neil

This commit is contained in:
mnyromyr%tprac.de 2006-09-27 23:08:11 +00:00
Родитель b542a830cd
Коммит 2be01086ab
10 изменённых файлов: 383 добавлений и 5182 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4938
extensions/help/resources/locale/en-US/mail_help.xhtml
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

2
mailnews/base/prefs/resources/content/mailPrefsOverlay.xul
Просмотреть файл

@ -91,7 +91,7 @@
<treecell url="chrome://messenger/content/pref-junk.xul" label="&junk.label;"/>
</treerow>
</treeitem>
<treeitem>
<treeitem id="mailtagspref">
<treerow>
<treecell url="chrome://messenger/content/pref-labels.xul" label="&tags.label;"/>
</treerow>

410
mailnews/base/prefs/resources/content/pref-labels.js
Просмотреть файл

@ -11,16 +11,13 @@
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla Communicator.
* The Original Code is SeaMonkey Internet Suite Code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corp.
* Portions created by the Initial Developer are Copyright (C) 2001
* The Initial Developer of the Original Code is the SeaMonkey project.
* Portions created by the Initial Developer are Copyright (C) 2006
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Sean Su <ssu@netscape.com>
* Ian Neal <bugzilla@arlen.demon.co.uk>
* Karsten Düsterloh <mnyromyr@tprac.de>
*
* Alternatively, the contents of this file may be used under the terms of
@ -37,105 +34,366 @@
*
* ***** END LICENSE BLOCK ***** */
var gTagListBox = null;
// Each tag entry in our list looks like this, where <key> is tag's unique key:
// <listitem>
// <listcell>
// <textbox onfocus='OnFocus(<key>)/>
// </listcell>
// <listcell>
// <colorpicker onfocus='OnFocus(<key>) type='button'/>
// </listcell>
// </listitem>
const TAGPANEL_URI = 'chrome://messenger/content/pref-labels.xul';
const TAGLIST_ID = 'tagList'; // UI element
const ACTIVE_TAGS_ID = TAGLIST_ID + '.active'; // wsm element
const DELETED_TAGS_ID = TAGLIST_ID + '.deleted'; // wsm element
var gTagList = null; // tagList root element
var gAddButton = null;
var gDeleteButton = null;
var gRaiseButton = null;
var gLowerButton = null;
var gDeletedTags = null; // tags to be deleted by the tagService
// init global stuff before the wsm is used
function InitTagPanel()
{
gTagList = document.getElementById(TAGLIST_ID);
gAddButton = document.getElementById('addTagButton');
gDeleteButton = document.getElementById('deleteTagButton');
gRaiseButton = document.getElementById('raiseTagButton');
gLowerButton = document.getElementById('lowerTagButton');
UpdateButtonStates();
parent.initPanel(TAGPANEL_URI);
}
function Startup()
{
gTagListBox = document.getElementById('tagList');
BuildTagList();
parent.hPrefWindow.registerOKCallbackFunc(OnOK);
}
function GetCSSValue(aElement, aProperty)
// store pref values in the wsm
function GetFields(aPageData)
{
return getComputedStyle(aElement, null).getPropertyCSSValue(aProperty).cssText;
// collect the tag definitions from the UI and store them in the wsm
var tags = [];
for (var entry = gTagList.firstChild; entry; entry = entry.nextSibling)
if (entry.localName == 'listitem')
{
// update taginfo with current values from textbox and colorpicker
var taginfo = entry.taginfo;
taginfo.tag = entry.firstChild.firstChild.value;
taginfo.color = entry.lastChild.lastChild.color;
tags.push(taginfo);
}
aPageData[ACTIVE_TAGS_ID] = tags;
// store the list of tags to be deleted in the OKHandler
aPageData[DELETED_TAGS_ID] = gDeletedTags;
return aPageData;
}
// appends the tag to the tag list box
function AppendTagItem(aTagName, aKey, aColor)
// read pref values stored in the wsm
function SetFields(aPageData)
{
var item = gTagListBox.appendItem(aTagName, aKey);
item.style.color = aColor;
var listBackColor = GetCSSValue(gTagListBox, "background-color");
var itemForeColor = GetCSSValue(item, "color");
if (listBackColor == itemForeColor)
item.style.color = GetCSSValue(gTagListBox, "color");
return item;
}
function BuildTagList()
{
var tagService = Components.classes["@mozilla.org/messenger/tagservice;1"]
.getService(Components.interfaces.nsIMsgTagService);
var allTags = tagService.tagEnumerator;
var allKeys = tagService.keyEnumerator;
while (allTags.hasMore())
var i, tags;
// If the wsm has no tag data yet, get the list from the tag service.
if (!(ACTIVE_TAGS_ID in aPageData))
{
var key = allKeys.getNext();
AppendTagItem(allTags.getNext(), key, tagService.getColorForKey(key));
var tagService = Components.classes["@mozilla.org/messenger/tagservice;1"]
.getService(Components.interfaces.nsIMsgTagService);
var tagArray = tagService.getAllTags({});
tags = aPageData[ACTIVE_TAGS_ID] = [];
for (i = 0; i < tagArray.length; ++i)
{
// The nsMsgTag items are readonly, but we may need to change them.
// And we don't care for the current ordinal strings, we'll create new
// ones in the OKHandler if necessary
var t = tagArray[i];
tags.push({tag: t.tag, key: t.key, color: t.color});
}
}
// now create the dynamic elements
tags = aPageData[ACTIVE_TAGS_ID];
// Listitems we append to the "end" of the listbox and would be rendered
// outside the clipping area don't get their text and color set!
// (See also 354065.)
// So we stuff them in bottom-up... :-|
var beforeTag = null;
for (i = tags.length - 1; i >= 0; --i)
beforeTag = AppendTagEntry(tags[i], beforeTag);
// grab the list of tags to be deleted in the OKHandler
gDeletedTags = (DELETED_TAGS_ID in aPageData) ? aPageData[DELETED_TAGS_ID] : {};
}
// set text and color of the listitem
function UpdateTagEntry(aTagInfo, aEntry)
{
aEntry.firstChild.firstChild.value = aTagInfo.tag;
aEntry.lastChild.lastChild.color = aTagInfo.color;
}
function AppendTagEntry(aTagInfo, aRefChild)
{
// Creating a colorpicker dynamically in an onload handler is really sucky.
// You MUST first set its type attribute (to select the correct binding), then
// add the element to the DOM (to bind the binding) and finally set the color
// property(!) afterwards. Try in any other order and fail... :-(
var key = aTagInfo.key;
var tagCell = document.createElement('listcell');
var textbox = document.createElement('textbox');
tagCell.appendChild(textbox);
var colorCell = document.createElement('listcell');
var colorpicker = document.createElement('colorpicker');
colorpicker.setAttribute('type', 'button');
colorCell.appendChild(colorpicker);
var entry = document.createElement('listitem');
entry.addEventListener('focus', OnFocus, true);
entry.setAttribute('allowevents', 'true'); // activate textbox and colorpicker
entry.taginfo = aTagInfo;
entry.appendChild(tagCell);
entry.appendChild(colorCell);
gTagList.insertBefore(entry, aRefChild);
UpdateTagEntry(aTagInfo, entry);
return entry;
}
function OnFocus(aEvent)
{
// walk up until we find the listitem
var entry = aEvent.target;
while (entry.localName != 'listitem')
entry = entry.parentNode;
gTagList.selectedItem = entry;
UpdateButtonStates();
}
function FocusTagEntry(aEntry)
{
// focus the entry's textbox
gTagList.ensureElementIsVisible(aEntry);
aEntry.firstChild.firstChild.focus();
}
function UpdateButtonStates()
{
var entry = gTagList.selectedItem;
// disable Delete if no selection
gDeleteButton.disabled = !entry;
// disable Raise if no selection or first entry
gRaiseButton.disabled = !entry || !gTagList.getPreviousItem(entry, 1);
// disable Lower if no selection or last entry
gLowerButton.disabled = !entry || !gTagList.getNextItem(entry, 1);
}
function DisambiguateTag(aTag, aTagList)
{
if (aTag in aTagList)
{
var suffix = 2;
while (aTag + ' ' + suffix in aTagList)
++suffix;
aTag += ' ' + suffix;
}
return aTag;
}
function AddTag()
{
// Add a new tag to the UI here. It will be only be written to the
// preference system only if the OKHandler is executed!
// create unique tag name
var dupeList = {}; // indexed by tag
for (var entry = gTagList.firstChild; entry; entry = entry.nextSibling)
if (entry.localName == 'listitem')
dupeList[entry.firstChild.firstChild.value] = true;
var tag = DisambiguateTag(gAddButton.getAttribute('defaulttagname'), dupeList);
// create new tag list entry
var tagInfo = {tag: tag, key: '', color: '', ordinal: ''};
var refChild = gTagList.getNextItem(gTagList.selectedItem, 1);
var newEntry = AppendTagEntry(tagInfo, refChild);
FocusTagEntry(newEntry);
}
function DeleteTag()
{
var tagItemToRemove = gTagListBox.getSelectedItem();
var index = gTagListBox.selectedIndex;
if (index >= 0)
{
var itemToRemove = gTagListBox.getItemAtIndex(index);
var tagService = Components.classes["@mozilla.org/messenger/tagservice;1"]
.getService(Components.interfaces.nsIMsgTagService);
tagService.deleteKey(itemToRemove.value);
gTagListBox.removeItemAt(index);
var numItemsInListBox = gTagListBox.getRowCount();
gTagListBox.selectedIndex = index < numItemsInListBox ? index : numItemsInListBox - 1;
}
// Delete the selected tag from the UI here. If it was added during this
// preference dialog session, we can drop it at once; if it was read from
// the preferences system, we need to remember killing it in the OKHandler.
var entry = gTagList.selectedItem;
var key = entry.taginfo.key;
if (key)
gDeletedTags[key] = true; // dummy value
// after removing, move focus to next entry, if it exist, else try previous
var newFocusItem = gTagList.getNextItem(entry, 1) ||
gTagList.getPreviousItem(entry, 1);
gTagList.removeItemAt(gTagList.getIndexOfItem(entry));
if (newFocusItem)
FocusTagEntry(newFocusItem);
else
UpdateButtonStates();
}
function AddTag()
{
var args = {result: "", okCallback: AddTagCallback};
var dialog = window.openDialog("chrome://messenger/content/newTagDialog.xul",
"",
"chrome,titlebar,modal",
args);
}
function AddTagCallback(aName, aColor)
function MoveTag(aMoveUp)
{
var tagService = Components.classes["@mozilla.org/messenger/tagservice;1"]
.getService(Components.interfaces.nsIMsgTagService);
tagService.addTag(aName, aColor);
var item = AppendTagItem(aName, tagService.getKeyForTag(aName), aColor);
var tagListBox = document.getElementById('tagList');
tagListBox.ensureElementIsVisible(item);
tagListBox.selectItem(item);
tagListBox.focus();
// Move the selected tag one position up or down in the tagList's child order.
// This reordering may require changing ordinal strings, which will happen
// when we write tag data to the preferences system in the OKHandler.
var entry = gTagList.selectedItem;
var successor = aMoveUp ? gTagList.getPreviousItem(entry, 1)
: gTagList.getNextItem(entry, 2);
entry.parentNode.insertBefore(entry, successor);
UpdateTagEntry(entry.taginfo, entry);
FocusTagEntry(entry);
}
function RestoreDefaults()
function Restore()
{
var tagService = Components.classes["@mozilla.org/messenger/tagservice;1"]
.getService(Components.interfaces.nsIMsgTagService);
// remove all existing labels
var allKeys = tagService.keyEnumerator;
while (allKeys.hasMore())
// clear pref panel tag list
// Remember any known keys for deletion in the OKHandler.
while (gTagList.getRowCount())
{
tagService.deleteKey(allKeys.getNext());
gTagListBox.removeItemAt(0);
var key = gTagList.removeItemAt(0).taginfo.key;
if (key)
gDeletedTags[key] = true; // dummy value
}
// add default items
// add default items (no ordinal strings for those)
var prefService = Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefService);
var prefDescription = prefService.getDefaultBranch("mailnews.labels.description.");
var prefColor = prefService.getDefaultBranch("mailnews.labels.color.");
const kLocalizedString = Components.interfaces.nsIPrefLocalizedString;
for (var i = 1; i <= 5; ++i)
{
// mimic nsMsgTagService::MigrateLabelsToTags() and create default tags from
// the former label defaults
var tag = prefDescription.getComplexValue(i, Components.interfaces.nsIPrefLocalizedString).data;
// create default tags from the former label defaults
var key = "$label" + i;
var tag = prefDescription.getComplexValue(i, kLocalizedString).data;
var color = prefColor.getCharPref(i);
tagService.addTagForKey("$label" + i, tag, color);
var tagInfo = {tag: tag, key: key, color: color};
AppendTagEntry(tagInfo, null);
}
BuildTagList();
FocusTagEntry(gTagList.getItemAtIndex(0));
}
function OnOK()
{
var i;
var tagService = Components.classes["@mozilla.org/messenger/tagservice;1"]
.getService(Components.interfaces.nsIMsgTagService);
// we may be called in another page's context, so get the stored data from the
// wsm the hard way
var pageData = parent.hPrefWindow.wsm.dataManager.pageData[TAGPANEL_URI];
var activeTags = pageData[ACTIVE_TAGS_ID];
var deletedTags = pageData[DELETED_TAGS_ID];
// remove all deleted tags from the preferences system
for (var key in deletedTags)
tagService.deleteKey(key);
// count dupes so that we can eliminate them later
var dupeCounts = {}; // indexed by tag
for (i = 0; i < activeTags.length; ++i)
{
var tag = activeTags[i].tag;
if (tag in dupeCounts)
++dupeCounts[tag];
else
dupeCounts[tag] = 0; // no dupes found yet
}
// Now write tags to the preferences system, create keys and ordinal strings.
// Manually set ordinal strings are NOT retained!
var lastTagInfo = null;
for (i = 0; i < activeTags.length; ++i)
{
var tagInfo = activeTags[i];
if (tagInfo)
{
var dupeCount = dupeCounts[tagInfo.tag];
if (dupeCount > 0)
{
// ignore the first dupe, but set mark for further processing
dupeCounts[tagInfo.tag] = -1;
}
else if (dupeCount < 0)
{
tagInfo.tag = DisambiguateTag(tagInfo.tag, dupeCounts);
dupeCounts[tagInfo.tag] = 0; // new tag name is unique
}
if (!tagInfo.key)
{
// newly added tag, need to create a key and read it
tagService.addTag(tagInfo.tag, '', '');
try
{
tagInfo.key = tagService.getKeyForTag(tagInfo.tag);
}
catch (e) {}
}
if (tagInfo.key)
{
if (!lastTagInfo)
{
// the first tag list entry needs no ordinal string
lastTagInfo = tagInfo;
tagInfo.ordinal = '';
}
else
{
// if tagInfo's key is lower than that of its predecessor,
// it needs an ordinal string
var lastOrdinal = lastTagInfo.ordinal || lastTagInfo.key;
if (lastOrdinal >= tagInfo.key)
{
// create new ordinal
var tail = lastOrdinal.length - 1;
if (('a' <= lastOrdinal[tail]) && (lastOrdinal[tail] < 'z'))
{
// increment last character
lastOrdinal = lastOrdinal.substr(0, tail) +
String.fromCharCode(lastOrdinal.charCodeAt(tail) + 1);
}
else
{
// just begin a new increment position
lastOrdinal += 'a';
}
tagInfo.ordinal = lastOrdinal;
}
else
{
// no ordinal necessary
tagInfo.ordinal = '';
}
}
// Update the tag definition
try
{
tagService.addTagForKey(tagInfo.key,
tagInfo.tag,
tagInfo.color,
tagInfo.ordinal);
}
catch (e)
{
dump('Could not update tag:\n' + e);
}
lastTagInfo = tagInfo;
} // have key
} // have tagInfo
} // for all active tags
}

45
mailnews/base/prefs/resources/content/pref-labels.xul
Просмотреть файл

@ -48,39 +48,62 @@
<!DOCTYPE page SYSTEM "chrome://messenger/locale/pref-labels.dtd">
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="parent.initPanel('chrome://messenger/content/pref-labels.xul');"
onload="InitTagPanel()"
headertitle="&pref.tags.title;">
<script type="application/x-javascript" src="chrome://messenger/content/pref-labels.js"/>
<script type="application/x-javascript">
<![CDATA[
var _elementIDs = ["addTag", "deleteTag", "restoreDefaults"];
var _elementIDs = ["addTagButton", "deleteTagButton",
"raiseTagButton", "lowerTagButton",
"restoreDefaultsButton"];
]]>
</script>
<groupbox flex="1">
<caption label="&pref.tags.caption;"/>
<description>&pref.tags.description;</description>
<hbox flex="1">
<listbox id="tagList" flex="1"/>
<listbox id="tagList" flex="1" onselect="UpdateButtonStates();">
<listcols>
<listcol flex="1"/>
<listcol/>
</listcols>
<listhead>
<listheader label="&tagColumn.label;"/>
<listheader label="&colorColumn.label;"/>
</listhead>
</listbox>
<vbox>
<button id="addTag"
<button id="addTagButton"
label="&addTagButton.label;"
accesskey="&addTagButton.accesskey;"
defaulttagname="&defaultTagName.label;"
prefstring="pref.tags.disable_button.add"
oncommand="AddTag();"/>
<button id="deleteTag"
label="&deleteTagButton.label;"
<button id="deleteTagButton"
label="&deleteTagButton.label;"
accesskey="&deleteTagButton.accesskey;"
prefstring="pref.tags.disable_button.delete"
oncommand="DeleteTag();"/>
<spacer flex="1"/>
<button id="restoreDefaults"
label="&restoreDefaults.label;"
accesskey="&restoreDefaults.accesskey;"
<button id="raiseTagButton"
label="&raiseTagButton.label;"
accesskey="&raiseTagButton.accesskey;"
prefstring="pref.tags.disable_button.raise"
oncommand="MoveTag(true);"/>
<button id="lowerTagButton"
label="&lowerTagButton.label;"
accesskey="&lowerTagButton.accesskey;"
prefstring="pref.tags.disable_button.lower"
oncommand="MoveTag(false);"/>
<spacer flex="1"/>
<button id="restoreButton"
label="&restoreButton.label;"
accesskey="&restoreButton.accesskey;"
prefstring="pref.tags.disable_button.restore"
oncommand="RestoreDefaults();"/>
oncommand="Restore();"/>
</vbox>
</hbox>
</groupbox>

47
mailnews/base/prefs/resources/locale/en-US/pref-labels.dtd
Просмотреть файл

@ -1,47 +0,0 @@
<!-- ***** 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 Communicator.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corp.
- Portions created by the Initial Developer are Copyright (C) 2001
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
- Sean Su <ssu@netscape.com>
- Karsten Düsterloh <mnyromyr@tprac.de>
-
- 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 ***** -->
<!ENTITY pref.tags.title "Tags">
<!ENTITY pref.tags.caption "Customize Tags">
<!ENTITY pref.tags.description "Tags can be used to categorize and prioritize your messages.">
<!ENTITY addTagButton.label "Add">
<!ENTITY addTagButton.accesskey "A">
<!ENTITY deleteTagButton.label "Delete">
<!ENTITY deleteTagButton.accesskey "D">
<!ENTITY restoreDefaults.label "Restore Defaults">
<!ENTITY restoreDefaults.accesskey "R">

24
mailnews/base/resources/content/mailWindowOverlay.xul
Просмотреть файл

@ -574,10 +574,10 @@
<menuitem id="threadPaneContext-tagRemoveAll" oncommand="RemoveAllMessageTags();"/>
<menuseparator/>
<menuseparator/>
<menuitem id="threadPaneContext-tagNew"
label="&newTag.label;"
accesskey="&newTag.accesskey;"
oncommand="AddTag()"/>
<menuitem id="threadPaneContext-tagCustomize"
label="&tagCustomize.label;"
accesskey="&tagCustomize.accesskey;"
oncommand="goPreferences('mailnews', 'chrome://messenger/content/pref-labels.xul', 'mailtagspref');"/>
</menupopup>
</menu>
<menu id="threadPaneContext-mark" label="&markMenu.label;" accesskey="&markMenu.accesskey;">
@ -895,10 +895,10 @@
<menuitem id="messagePaneContext-tagRemoveAll" oncommand="RemoveAllMessageTags();"/>
<menuseparator/>
<menuseparator/>
<menuitem id="messagePaneContext-tagNew"
label="&newTag.label;"
accesskey="&newTag.accesskey;"
oncommand="AddTag()"/>
<menuitem id="messagePaneContext-tagCustomize"
label="&tagCustomize.label;"
accesskey="&tagCustomize.accesskey;"
oncommand="goPreferences('mailnews', 'chrome://messenger/content/pref-labels.xul', 'mailtagspref');"/>
</menupopup>
</menu>
<menu id="messagePaneContext-mark" label="&markMenu.label;" accesskey="&markMenu.accesskey;">
@ -1566,10 +1566,10 @@
<menuitem id="tagMenu-tagRemoveAll" oncommand="RemoveAllMessageTags();"/>
<menuseparator/>
<menuseparator/>
<menuitem id="tagMenu-tagNew"
label="&newTag.label;"
accesskey="&newTag.accesskey;"
oncommand="AddTag()"/>
<menuitem id="tagMenu-tagCustomize"
label="&tagCustomize.label;"
accesskey="&tagCustomize.accesskey;"
oncommand="goPreferences('mailnews', 'chrome://messenger/content/pref-labels.xul', 'mailtagspref');"/>
</menupopup>
</menu>
<menu id="markMenu" label="&markMenu.label;" accesskey="&markMenu.accesskey;">

4
mailnews/base/resources/locale/en-US/messenger.dtd
Просмотреть файл

@ -394,8 +394,8 @@
<!ENTITY addAllToAddressBookCmd.accesskey "A">
<!ENTITY tagMenu.label "Tag">
<!ENTITY tagMenu.accesskey "g">
<!ENTITY newTag.label "New Tag...">
<!ENTITY newTag.accesskey "N">
<!ENTITY tagCustomize.label "Customize...">
<!ENTITY tagCustomize.accesskey "C">
<!ENTITY tagCmd0.key "0">
<!ENTITY tagCmd1.key "1">
<!ENTITY tagCmd2.key "2">

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

@ -119,8 +119,6 @@ messenger.jar:
content/messenger/subscribe.js (base/resources/content/subscribe.js)
content/messenger/newFolderDialog.xul (base/resources/content/newFolderDialog.xul)
content/messenger/newFolderDialog.js (base/resources/content/newFolderDialog.js)
content/messenger/newTagDialog.xul (base/resources/content/newTagDialog.xul)
content/messenger/newTagDialog.js (base/resources/content/newTagDialog.js)
content/messenger/msgViewNavigation.js (base/resources/content/msgViewNavigation.js)
content/messenger/msgMail3PaneWindow.js (base/resources/content/msgMail3PaneWindow.js)
content/messenger/searchBar.js (base/resources/content/searchBar.js)
@ -212,7 +210,6 @@ en-US.jar:
locale/en-US/messenger/messenger.properties (base/resources/locale/en-US/messenger.properties)
locale/en-US/messenger/threadpane.dtd (base/resources/locale/en-US/threadpane.dtd)
locale/en-US/messenger/folderpane.dtd (base/resources/locale/en-US/folderpane.dtd)
locale/en-US/messenger/newTagDialog.dtd (base/resources/locale/en-US/newTagDialog.dtd)
locale/en-US/messenger/newFolderDialog.dtd (base/resources/locale/en-US/newFolderDialog.dtd)
locale/en-US/messenger/renameFolderDialog.dtd (base/resources/locale/en-US/renameFolderDialog.dtd)
locale/en-US/messenger/virtualFolderProperties.dtd (base/resources/locale/en-US/virtualFolderProperties.dtd)

46
themes/classic/messenger/prefPanels.css
Просмотреть файл

@ -1,46 +0,0 @@
/* ***** 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 Communicator client code, released
* March 31, 1998.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998-1999
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either of 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 GPL or the LGPL. 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 ***** */
/* ===== prefPanels.css =================================================
== Styles for the Messenger preference panels.
======================================================================= */
@import url("chrome://messenger/skin/");
@import url("chrome://communicator/skin/prefpanels.css");
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");

46
themes/modern/messenger/prefPanels.css
Просмотреть файл

@ -1,46 +0,0 @@
/* ***** 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.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Joe Hewitt <hewitt@netscape.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either of 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 GPL or the LGPL. 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 ***** */
/* ===== prefPanels.css =================================================
== Styles for the Messenger preference panels.
======================================================================= */
@import url("chrome://messenger/skin/");
@import url("chrome://communicator/skin/prefpanels.css");
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");