Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 22:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use more efficient command structure, refactor commands, broadcasters and keys, remove unused attributes, do some other optimization (72923). Landing navigator part only; this should help new window opening and some other areas. r=ben sr=hyatt

Browse Source
This commit is contained in:
blakeross%telocity.com 2001-04-05 19:53:13 +00:00
parent 761edd13d9
commit c9b9689e26
244 changed files with 1594 additions and 1049 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/events/src/nsEventStateManager.cpp
View File

@ -1386,9 +1386,8 @@ nsEventStateManager::PostHandleEvent(nsIPresContext* aPresContext,
case NS_MOUSE_MIDDLE_BUTTON_UP:
case NS_MOUSE_RIGHT_BUTTON_UP:
{
ret = CheckForAndDispatchClick(aPresContext, (nsMouseEvent*)aEvent, aStatus);
SetContentState(nsnull, NS_EVENT_STATE_ACTIVE);
ret = CheckForAndDispatchClick(aPresContext, (nsMouseEvent*)aEvent, aStatus);
nsCOMPtr<nsIPresShell> shell;
nsresult rv = aPresContext->GetShell(getter_AddRefs(shell));
if (NS_SUCCEEDED(rv) && shell){

2
content/html/style/src/nsCSSParser.cpp
View File

@ -1376,10 +1376,8 @@ static PRBool IsPseudoClass(const nsIAtom* aAtom)
(nsCSSAtoms::lastChildPseudo == aAtom) ||
(nsCSSAtoms::lastNodePseudo == aAtom) ||
(nsCSSAtoms::linkPseudo == aAtom) ||
(nsCSSAtoms::outOfDatePseudo == aAtom) ||
(nsCSSAtoms::rootPseudo == aAtom) ||
(nsCSSAtoms::xblBoundElementPseudo == aAtom) ||
(nsCSSAtoms::outOfDatePseudo == aAtom) ||
(nsCSSAtoms::visitedPseudo == aAtom));
}

7
content/html/style/src/nsCSSStyleSheet.cpp
View File

@ -2871,7 +2871,6 @@ static PRBool IsEventPseudo(nsIAtom* aAtom)
static PRBool IsLinkPseudo(nsIAtom* aAtom)
{
return PRBool ((nsCSSAtoms::linkPseudo == aAtom) ||
(nsCSSAtoms::outOfDatePseudo == aAtom) ||
(nsCSSAtoms::visitedPseudo == aAtom));
}
@ -2967,7 +2966,7 @@ static PRBool SelectorMatches(SelectorMatchesData &data,
if ((localTrue == result) &&
(nsnull != aSelector->mPseudoClassList)) { // test for pseudo class match
// first-child, root, lang, active, focus, hover, link, outOfDate, visited
// first-child, root, lang, active, focus, hover, link, visited...
// XXX disabled, enabled, selected, selection
nsAtomList* pseudoClass = aSelector->mPseudoClassList;
@ -3061,9 +3060,6 @@ static PRBool SelectorMatches(SelectorMatchesData &data,
if (nsCSSAtoms::linkPseudo == pseudoClass->mAtom) {
result = PRBool(localTrue == (eLinkState_Unvisited == data.mLinkState));
}
else if (nsCSSAtoms::outOfDatePseudo == pseudoClass->mAtom) {
result = PRBool(localTrue == (eLinkState_OutOfDate == data.mLinkState));
}
else if (nsCSSAtoms::visitedPseudo == pseudoClass->mAtom) {
result = PRBool(localTrue == (eLinkState_Visited == data.mLinkState));
}
@ -3698,7 +3694,6 @@ PRBool IsStateSelector(nsCSSSelector& aSelector)
(pseudoClass->mAtom == nsCSSAtoms::focusPseudo) ||
(pseudoClass->mAtom == nsCSSAtoms::hoverPseudo) ||
(pseudoClass->mAtom == nsCSSAtoms::linkPseudo) ||
(pseudoClass->mAtom == nsCSSAtoms::outOfDatePseudo) ||
(pseudoClass->mAtom == nsCSSAtoms::selectionPseudo) ||
(pseudoClass->mAtom == nsCSSAtoms::visitedPseudo)) {
return PR_TRUE;

2
content/shared/public/nsCSSAtomList.h
View File

@ -69,8 +69,6 @@ CSS_ATOM(menuPseudo, ":menu")
CSS_ATOM(notPseudo, ":not")
CSS_ATOM(outOfDatePseudo, ":out-of-date")
CSS_ATOM(rootPseudo, ":root")
CSS_ATOM(xblBoundElementPseudo, ":-moz-bound-element")

2
docshell/base/nsWebShell.cpp
View File

@ -856,8 +856,6 @@ nsWebShell::GetLinkState(const char* aLinkURI, nsLinkState& aState)
NS_ERROR_FAILURE);
if (isVisited)
aState = eLinkState_Visited;
// XXX how to tell if eLinkState_OutOfDate?
}
return NS_OK;

6
editor/composer/src/res/EditorOverride.css
View File

@ -28,7 +28,7 @@
*/
/* Override the browser's pointer cursor over links */
a:link, a:visited, a:active, a:out-of-date {
a:link, a:visited, a:active {
cursor: text;
}
@ -37,7 +37,7 @@ a:link, a:visited, a:active, a:out-of-date {
represents the named anchor
*/
a:link img, a:visited img, a:active img,
a:out-of-date img, img[usemap],
img[usemap],
object[usemap],
a[name] {
cursor: default;
@ -47,7 +47,7 @@ a:link img, a:visited img, a:active {
-moz-user-input: none;
}
a:visited, a:active, a:out-of-date {
a:visited, a:activez {
cursor: text;
color : inherit;
-moz-user-input: none;

6
editor/ui/composer/content/EditorOverride.css
View File

@ -28,7 +28,7 @@
*/
/* Override the browser's pointer cursor over links */
a:link, a:visited, a:active, a:out-of-date {
a:link, a:visited, a:active {
cursor: text;
}
@ -37,7 +37,7 @@ a:link, a:visited, a:active, a:out-of-date {
represents the named anchor
*/
a:link img, a:visited img, a:active img,
a:out-of-date img, img[usemap],
img[usemap],
object[usemap],
a[name] {
cursor: default;
@ -47,7 +47,7 @@ a:link img, a:visited img, a:active {
-moz-user-input: none;
}
a:visited, a:active, a:out-of-date {
a:visited, a:activez {
cursor: text;
color : inherit;
-moz-user-input: none;

12
editor/ui/composer/content/editor.xul
View File

@ -71,7 +71,7 @@
<popupset id="aTooltipSet" />
<popupset id="editorContentContextSet"/>
<commands id="commands">
<commandset id="tasksCommands">
<commandset id="globalEditMenuItems"/>
<commandset id="selectEditMenuItems"/>
<commandset id="undoEditMenuItems"/>
@ -84,7 +84,8 @@
<commandset id="composerStyleMenuItems"/>
<commandset id="composerTableMenuItems"/>
<commandset id="composerListMenuItems"/>
</commands>
<command id="toggleSidebar"/>
</commandset>
<!-- Use this when we abandon the default startup page -->
<!-- broadcaster id="args" value="about:blank"/ -->
@ -95,13 +96,16 @@
<broadcaster id="dialog.start" ready="false"/>
<observes element="dialog.start" attribute="ready" onbroadcast="EditorStartup('html')"/>
-->
<!-- command nodes are appended here from the overlays -->
<broadcasterset id="broadcasterset">
<broadcaster id="Editor:Throbber" busy="false"/>
<broadcaster id="Communicator:WorkMode"/>
</broadcasterset>
<!-- keys are appended from the overlay -->
<keyset id="keyset"/>
<keyset id="editorKeys">
<keyset id="tasksKeys"/>
<key id="showHideSidebar"/>
</keyset>
<toolbox class="toolbox-top" id="EditorToolbox">
<menubar id="main-menubar" class="chromeclass-menubar" persist="collapsed">

54
editor/ui/composer/content/editorOverlay.xul
View File

@ -33,34 +33,13 @@
<script type="application/x-javascript" src="chrome://editor/content/editorOverlay.js"/>
<script type="application/x-javascript" src="chrome://editor/content/ComposerCommands.js"/>
<!--keyset id="platformOverlayKeyset" /--> <!-- Don't do that, only one keyset per window! Anyway, this keyset is not defined! -->
<key id="pastequotationkb" key="&editpastequotation.keybinding;" observes="cmd_pasteQuote" modifiers="accel, shift"/>
<key id="findkb" key="&editfind.keybinding;" observes="cmd_find" modifiers="accel"/>
<key id="findnextkb" key="&editfindnext.keybinding;" observes="cmd_findNext" modifiers="accel"/>
<key id="checkspellingkb" key="&editcheckspelling.keybinding;" observes="cmd_spelling" modifiers="accel"/>
<key id="boldkb" key="&stylebold.keybinding;" observes="cmd_bold" modifiers="accel"/>
<key id="italickb" key="&styleitalic.keybinding;" observes="cmd_italic" modifiers="accel"/>
<key id="underlinekb" key="&styleunderline.keybinding;" observes="cmd_underline" modifiers="accel"/>
<key id="fontfixedwidthkb" key="&formatfontfixed.keybinding;" oncommand="doStatefulCommand('cmd_fontFace', 'tt')" modifiers="accel, shift"/>
<key id="increaseindentkb" key="&formatindent.keybinding;" observes="cmd_indent" modifiers="accel"/>
<key id="decreaseindentkb" key="&formatoutdent.keybinding;" observes="cmd_outdent" modifiers="accel"/>
<key id="removestyleskb" key="&formatremovestyles.keybinding;" observes="cmd_removeStyles" modifiers="shift, accel"/>
<key id="removelinkskb" key="&formatremovelinks.keybinding;" observes="cmd_removeLinks" modifiers="shift, accel"/>
<key id="decreasefontsizekb" key="&decreaseFontSize.keybinding;" observes="cmd_decreaseFont" modifiers="shift, accel"/>
<key id="increasefontsizekb" key="&increaseFontSize.keybinding;" observes="cmd_increaseFont" modifiers="shift, accel"/>
<keyset id="keyset">
<keyset id="editorKeys">
<!-- defined in globalOverlay -->
<key id="key_newNavigator"/>
<key id="key_newBlankPage"/>
<key id="openeditorkb" key="&fileopen.keybinding;" observes="cmd_open" modifiers="accel"/>
<key id="openremoteeditorkb" key="&fileopenremote.keybinding;" observes="cmd_openRemote" modifiers="accel"/>
<key id="openremoteeditorkb" key="&fileopenremote.keybinding;" observes="cmd_openRemote" modifiers="accel,shift"/>
<key id="savekb" key="&filesave.keybinding;" observes="cmd_save" modifiers="accel"/>
<key id="closekb" key="&fileclose.keybinding;" observes="cmd_close" modifiers="accel"/>
<key id="printkb" key="&fileprint.keybinding;" observes="cmd_print" modifiers="accel"/>
@ -70,26 +49,25 @@
<key id="key_cut"/>
<key id="key_copy"/>
<key id="key_paste"/>
<key id="pastequotationkb"/>
<key id="key_delete"/>
<key id="key_selectAll"/>
<key id="findkb"/>
<key id="findnextkb"/>
<key id="checkspellingkb"/>
<key id="boldkb"/>
<key id="italickb"/>
<key id="underlinekb"/>
<key id="pastequotationkb" key="&editpastequotation.keybinding;" observes="cmd_pasteQuote" modifiers="accel, shift"/>
<key id="findkb" key="&editfind.keybinding;" observes="cmd_find" modifiers="accel"/>
<key id="findnextkb" key="&editfindnext.keybinding;" observes="cmd_findNext" modifiers="accel"/>
<key id="checkspellingkb" key="&editcheckspelling.keybinding;" observes="cmd_spelling" modifiers="accel"/>
<key id="fontfixedwidthkb"/>
<key id="increaseindentkb"/>
<key id="decreaseindentkb"/>
<key id="boldkb" key="&stylebold.keybinding;" observes="cmd_bold" modifiers="accel"/>
<key id="italickb" key="&styleitalic.keybinding;" observes="cmd_italic" modifiers="accel"/>
<key id="underlinekb" key="&styleunderline.keybinding;" observes="cmd_underline" modifiers="accel"/>
<key id="removestyleskb"/>
<key id="removelinkskb"/>
<key id="fontfixedwidthkb" key="&formatfontfixed.keybinding;" oncommand="doStatefulCommand('cmd_fontFace', 'tt')" modifiers="accel, shift"/>
<key id="increaseindentkb" key="&formatindent.keybinding;" observes="cmd_indent" modifiers="accel"/>
<key id="decreaseindentkb" key="&formatoutdent.keybinding;" observes="cmd_outdent" modifiers="accel"/>
<key id="decreasefontsizekb"/>
<key id="increasefontsizekb"/>
<key id="removestyleskb" key="&formatremovestyles.keybinding;" observes="cmd_removeStyles" modifiers="shift, accel"/>
<key id="removelinkskb" key="&formatremovelinks.keybinding;" observes="cmd_removeLinks" modifiers="shift, accel"/>
<key id="decreasefontsizekb" key="&decreaseFontSize.keybinding;" observes="cmd_decreaseFont" modifiers="shift, accel"/>
<key id="increasefontsizekb" key="&increaseFontSize.keybinding;" observes="cmd_increaseFont" modifiers="shift, accel"/>
</keyset>
<!-- commands updated when the editor gets created -->

2
editor/ui/composer/content/pref-composer.xul
View File

@ -23,7 +23,7 @@
-->
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
<!DOCTYPE window SYSTEM "chrome://editor/locale/pref-composer.dtd" >

2
editor/ui/composer/content/pref-editing.xul
View File

@ -23,7 +23,7 @@
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://editor/locale/pref-editing.dtd">

2
editor/ui/dialogs/content/EdAdvancedEdit.xul
View File

@ -40,7 +40,7 @@
onload="Startup()"
orient="vertical">
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<popupset id="aTooltipSet" />
<!-- Methods common to all editor dialogs -->

2
editor/ui/dialogs/content/EdColorPicker.xul
View File

@ -43,7 +43,7 @@
<broadcaster id="args" value=""/>
<spring id="location" offsetY="50" persist="offsetX offsetY"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<box id="TableOrCellGroup" valign="middle" autostretch="never" collapsed="true">
<text value="&background.label;"/>
<radiogroup id="1" orient="horizontal">

2
editor/ui/dialogs/content/EdDialogTemplate.xul
View File

@ -43,7 +43,7 @@
<spring id="location" offsetY="50" persist="offsetX offsetY"/>
<broadcaster id="args" value=""/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<!-- from EdDialogOverlay -->
<box id="AdvancedEdit"/>

2
editor/ui/dialogs/content/EdHLineProps.xul
View File

@ -45,7 +45,7 @@
<script type="application/x-javascript" src="chrome://editor/content/EdHLineProps.js"/>
<spring id="location" offsetY="50" persist="offsetX offsetY"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<popupset id="aTooltipSet" />
<titledbox orient="vertical"><label value="&dimensionsBox.label;"/>

2
editor/ui/dialogs/content/EdImageMap.xul
View File

@ -59,7 +59,7 @@
<broadcaster id="args" value=""/>
<keyset id="keyset">
<keyset id="dialogKeys">
<key id="deletespot" keycode="VK_DELETE" oncommand="deleteElement(currentElement)" />
<key id="nudgeup" keycode="VK_UP" oncommand="nudge(event, 'up')" />

2
editor/ui/dialogs/content/EdImageProps.xul
View File

@ -50,7 +50,7 @@
<spring id="location" offsetY="50" persist="offsetX offsetY"/>
<broadcaster id="args" value=""/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<popupset id="aTooltipSet" />
<titledbox orient="vertical">

2
editor/ui/dialogs/content/EdInsSrc.xul
View File

@ -43,7 +43,7 @@
<spring id="location" offsetY="50" persist="offsetX offsetY"/>
<broadcaster id="args" value=""/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<text class="label" id="srcMessage" value="&sourceEditField.label;"/>
<box orient="vertical" flex="1" style="width: 30em; height: 20em;">

2
editor/ui/dialogs/content/EdInsertChars.xul
View File

@ -41,7 +41,7 @@
<script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
<spring id="location" offsetY="50" persist="offsetX offsetY"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<broadcaster id="args" value=""/>
<titledbox orient="vertical"><label value="&category.label;"/>

2
editor/ui/dialogs/content/EdInsertTable.xul
View File

@ -46,7 +46,7 @@
<spring id="location" offsetY="50" persist="offsetX offsetY"/>
<broadcaster id="args" value=""/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<popupset id="aTooltipSet" />
<titledbox orient="vertical"><label value="&size.label;"/>
<grid>

2
editor/ui/dialogs/content/EdLinkProps.xul
View File

@ -43,7 +43,7 @@
<broadcaster id="args" value=""/>
<spring id="location" offsetY="50" persist="offsetX offsetY"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<box orient="vertical" style="min-width: 20em">
<titledbox orient="vertical"><label id="linkTextCaption" align="left"/>

2
editor/ui/dialogs/content/EdListProps.xul
View File

@ -39,7 +39,7 @@
<script type="application/x-javascript" src="chrome://editor/content/EdListProps.js"/>
<script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<broadcaster id="args" value=""/>
<spring id="location" offsetY="50" persist="offsetX offsetY"/>

2
editor/ui/dialogs/content/EdNamedAnchorProps.xul
View File

@ -44,7 +44,7 @@
<script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
<spring id="location" offsetY="50" persist="offsetX offsetY"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<popupset id="aTooltipSet" />
<text class="label" align="left" for="nameInput" value="&anchorNameEditField.label;"/>

2
editor/ui/dialogs/content/EdPageProps.xul
View File

@ -43,7 +43,7 @@
<spring id="location" offsetY="50" persist="offsetX offsetY"/>
<broadcaster id="args" value=""/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<grid>
<columns><column flex="1"/><column flex="2"/></columns>
<rows>

2
editor/ui/dialogs/content/EdTableProps.xul
View File

@ -44,7 +44,7 @@
<spring id="location" offsetY="50" persist="offsetX offsetY"/>
<broadcaster id="args" value=""/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<tabcontrol align="vertical" orient="vertical">
<tabbox flex="1">

2
editor/ui/dialogs/content/EditConflict.xul
View File

@ -42,7 +42,7 @@
<script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
<spring id="location" offsetY="50" persist="offsetX offsetY"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<popupset id="aTooltipSet" />
<text class="label" value ="&conflictWarning.label;"/>

2
editor/ui/dialogs/content/EditorSaveAsCharset.xul
View File

@ -45,7 +45,7 @@
<spring id="location" offsetY="50" persist="offsetX offsetY"/>
<broadcaster id="args" value=""/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<box orient="vertical">
<titledbox orient="vertical"><label align="left" value="&documentTitleTitle.label;"/>

6
extensions/cookie/resources/content/pref-cookies.xul
View File

@ -23,14 +23,14 @@
-->
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://cookie/locale/pref-cookies.dtd">
<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml" id="cookieWindow"
<window xmlns:html="http://www.w3.org/1999/xhtml" id="cookieWindow"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
class="color-dialog"
align="vertical"
orient="vertical"
onload="init();">
<script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>

6
extensions/cookie/resources/content/pref-images.xul
View File

@ -22,7 +22,7 @@
Peter Annema <disttsc@bart.nl>
-->
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
<!DOCTYPE window [
<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@ -31,10 +31,10 @@
%prefImagesDTD;
]>
<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml" id="imagesWindow"
<window xmlns:html="http://www.w3.org/1999/xhtml" id="imagesWindow"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
class="color-dialog"
align="vertical"
orient="vertical"
onload="init();">
<script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>

1
extensions/cookie/resources/locale/en-US/pref-cookies.dtd
View File

@ -1,4 +1,3 @@
<!ENTITY window.title "Cookies">
<!ENTITY lHeader "Cookies">
<!-- cookies -->

1
extensions/cookie/resources/locale/en-US/pref-images.dtd
View File

@ -1,4 +1,3 @@
<!ENTITY window.title "Images">
<!ENTITY lHeader "Images">
<!ENTITY imageBlocking.label "Image Blocking">

12
extensions/inspector/resources/content/tasksOverlay.xul
View File

@ -14,17 +14,17 @@
</script>
<broadcasterset id="broadcasterset">
<broadcaster id="Tasks:Inspector" label="&inspectorTaskCmd.label;" oncommand="launchInspector();"/>
</broadcasterset>
<commandset id="tasksCommands">
<command id="Tasks:Inspector" oncommand="launchInspector();"/>
</commandset>
<!--
<keyset id="keyset">
<key id="kInspectorTask" key="&inspectorTaskCmd.commandkey;" observes="Tasks:Inspector" modifiers="accel"/>
<keyset id="tasksKeys">
<key id="kInspectorTask" key="&inspectorTaskCmd.commandkey;" command="Tasks:Inspector" modifiers="accel"/>
</keyset>
-->
<menupopup id="toolsPopup">
<menuitem accesskey="&inspectorTaskCmd.accesskey;" observes="Tasks:Inspector"/>
<menuitem label="&inspectorTaskCmd.label;" accesskey="&inspectorTaskCmd.accesskey;" command="Tasks:Inspector"/>
</menupopup>
</overlay>

10
extensions/irc/xul/content/chatzilla.xul
View File

@ -51,12 +51,12 @@
<script src="chrome://chatzilla/content/handlers.js"/>
<script src="chrome://chatzilla/content/rdf.js"/>
<broadcasterset id="broadcasterset">
<broadcaster id="cmd_close" oncommand="window.close();"/>
<broadcaster id="cmd_quit"/>
</broadcasterset>
<commandset id="tasksCommands">
<command id="cmd_close" oncommand="window.close();"/>
<command id="cmd_quit"/>
</commandset>
<keyset id="keyset">
<keyset id="tasksKeys">
<key id="key_close"/>
<key id="key_quit"/>
</keyset>

13
extensions/irc/xul/content/chatzillaOverlay.xul
View File

@ -10,20 +10,21 @@
<script type="application/x-javascript" src="chrome://chatzilla/content/chatzillaOverlay.js"/>
<keyset id="keyset">
<key id="key_irc" key="&ircCmd.commandkey;" observes="Tasks:IRC" modifiers="accel"/>
<keyset id="tasksKeys">
<key id="key_irc" key="&ircCmd.commandkey;" command="Tasks:IRC" modifiers="accel"/>
</keyset>
<broadcasterset id="broadcasterset">
<broadcaster id="Tasks:IRC" label="&ircCmd.label;" oncommand="toIRC();"/>
</broadcasterset>
<commandset id="tasksCommands">
<command id="Tasks:IRC" oncommand="toIRC();"/>
</commandset>
<menupopup id="taskPopup">
<menuitem
position="7"
label="&ircCmd.label;"
accesskey="&ircCmd.accesskey;"
key="key_irc"
observes="Tasks:IRC"/>
command="Tasks:IRC"/>
</menupopup>
</overlay>

2
extensions/vixen/resources/content/vfd/vfd.xul
View File

@ -25,7 +25,7 @@
<!-- selection manager -->
<script src="chrome://vixen/content/vfd/vxVFDSelectionManager.js"></script>
<keyset id="keyset"/>
<keyset id="vxKeys"/>
<iframe id="vfdDocument" name="vfdDocument" src="about:blank" style="width:0px;" flex="1"/>

2
extensions/vixen/resources/content/vixen.xul
View File

@ -46,7 +46,7 @@
<script type="application/x-javascript" src="chrome://vixen/content/vixen.js"/>
<script type="application/x-javascript" src="chrome://vixen/content/vxUtils.js"/>
<keyset id="keyset"/>
<keyset id="vxKeys"/>
<toolbox id="xuledit-toolbox" flex="1">
<menubar id="xuledit-menubar">

2
extensions/vixen/resources/content/vxKeysetOverlay.xul
View File

@ -7,7 +7,7 @@
<script src="chrome://vixen/content/vxKeysetOverlay.js"></script>
<keyset id="keyset">
<keyset id="vxKeys">
<key id="quitKey" key="&vxQuitKey.commandKey;" modifiers="accel"
oncommand="goDoCommand('cmd_quit');"/>
<key id="closeKey" key="&vxCloseKey.commandKey;" modifiers="accel"

2
extensions/wallet/cookieviewer/CookieViewer.xul
View File

@ -42,7 +42,7 @@
<script src="chrome://global/content/strres.js"/>
<script src="chrome://communicator/content/wallet/nsWalletTreeUtils.js"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<tabcontrol id="tabcontrol" flex="1" orient="vertical">
<tabbox>

2
extensions/wallet/editor/WalletEditor.xul
View File

@ -38,7 +38,7 @@
<script type="application/x-javascript" src="chrome://communicator/content/wallet/WalletEditor.js"/>
<script type="application/x-javascript" src="chrome://global/content/strres.js" />
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<box id="system" flex="100%" orient="vertical">
<spring style="height: 7px;"/>

2
extensions/wallet/editor/WalletViewer.xul
View File

@ -46,7 +46,7 @@
<script type="application/x-javascript" src="chrome://communicator/content/wallet/WalletViewer.js"/>
<script type="application/x-javascript" src="chrome://global/content/strres.js" />
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<box flex="1">
<!-- tree sidebar -->

2
extensions/wallet/editor/privacy.xul
View File

@ -60,7 +60,7 @@
</script>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<iframe id="maintext" class="output-container" type="content" flex="1"/>

2
extensions/wallet/editor/resources/content/WalletViewer.xul
View File

@ -46,7 +46,7 @@
<script type="application/x-javascript" src="chrome://communicator/content/wallet/WalletViewer.js"/>
<script type="application/x-javascript" src="chrome://global/content/strres.js" />
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<box flex="1">
<!-- tree sidebar -->

6
extensions/wallet/resources/content/pref-passwords.xul
View File

@ -20,7 +20,7 @@
Contributor(s):
-->
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
<!DOCTYPE window [
<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@ -28,10 +28,10 @@
<!ENTITY % prefWalletDTD SYSTEM "chrome://wallet/locale/pref-passwords.dtd" >
%prefWalletDTD;
]>
<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
<window xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
class="color-dialog"
orient="vertical" title="&window.title;"
orient="vertical"
onload="parent.initPanel('chrome://wallet/content/pref-passwords.xul');">
<script type="application/x-javascript">

6
extensions/wallet/resources/content/pref-wallet.xul
View File

@ -20,7 +20,7 @@
Contributor(s):
-->
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
<!DOCTYPE window [
<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
@ -28,10 +28,10 @@
<!ENTITY % prefWalletDTD SYSTEM "chrome://wallet/locale/pref-wallet.dtd" >
%prefWalletDTD;
]>
<window debug="false" xmlns:html="http://www.w3.org/1999/xhtml"
<window xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
class="color-dialog"
orient="vertical" title="&window.title;"
orient="vertical"
onload="parent.initPanel('chrome://wallet/content/pref-wallet.xul');">
<script type="application/x-javascript" src="chrome://wallet/content/walletOverlay.js"/>

1
extensions/wallet/resources/locale/en-US/pref-passwords.dtd
View File

@ -1,4 +1,3 @@
<!ENTITY window.title "Passwords">
<!ENTITY lHeader "Passwords">
<!ENTITY rHeader "Manage passwords">

1
extensions/wallet/resources/locale/en-US/pref-wallet.dtd
View File

@ -1,4 +1,3 @@
<!ENTITY window.title "Forms">
<!ENTITY lHeader "Forms">
<!ENTITY rHeader "Manage personal information">

2
extensions/wallet/signonviewer/SignonViewer.xul
View File

@ -42,7 +42,7 @@
<script src="chrome://global/content/strres.js"/>
<script src="chrome://communicator/content/wallet/nsWalletTreeUtils.js"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<tabcontrol flex="1" orient="vertical">
<tabbox orient="horizontal">

2
extensions/wallet/walletpreview/WalletPreview.xul
View File

@ -36,7 +36,7 @@
<script type="application/x-javascript" src="chrome://communicator/content/wallet/WalletPreview.js"/>
<script type="application/x-javascript" src="chrome://wallet/content/walletOverlay.js"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<box>
<text value="&heading.label;"/>

BIN
extensions/xml-rpc/macbuild/xml-rpcIDL.mcp
View File

Binary file not shown.

17
extensions/xmlterm/ui/content/xmltermOverlay.xul
View File

@ -10,19 +10,20 @@
<script type="application/x-javascript" src="chrome://xmlterm/content/xmltermOverlay.js"/>
<keyset id="keyset">
<keyset id="tasksKeys">
<key id="key_xmlterm" key="&xmltermCmd.commandkey;"
observes="Tasks:xmlterm" modifiers="accel"/>
command="Tasks:xmlterm" modifiers="accel"/>
</keyset>
<broadcasterset id="broadcasterset">
<broadcaster id="Tasks:xmlterm" value="&xmltermCmd.label;" oncommand="toXMLterm();"/>
</broadcasterset>
<commandset id="tasksCommands">
<command id="Tasks:xmlterm" oncommand="toXMLterm();"/>
</commandset>
<menupopup id="taskPopup">
<menuitem accesskey="&xmltermCmd.accesskey;" key="key_xmlterm"
position="6"
observes="Tasks:xmlterm"/>
<menuitem label="&xmltermCmd.label;" accesskey="&xmltermCmd.accesskey;"
key="key_xmlterm"
position="6"
command="Tasks:xmlterm"/>
</menupopup>
</overlay>

BIN
gfx/src/os2/res/libprint.ico
View File

Binary file not shown.

14
layout/base/nsCaret.cpp
View File

@ -77,7 +77,7 @@ nsCaret::nsCaret()
, mVisible(PR_FALSE)
, mDrawn(PR_FALSE)
, mReadOnly(PR_FALSE)
, mShowWhenSelection(PR_FALSE)
, mShowDuringSelection(PR_FALSE)
, mLastCaretFrame(nsnull)
, mLastCaretView(nsnull)
, mLastContentOffset(0)
@ -109,8 +109,8 @@ NS_IMETHODIMP nsCaret::Init(nsIPresShell *inPresShell)
mCaretTwipsWidth = (nscoord)tempInt;
if (NS_SUCCEEDED(touchyFeely->GetMetric(nsILookAndFeel::eMetric_CaretBlinkTime, tempInt)))
mBlinkRate = (PRUint32)tempInt;
if (NS_SUCCEEDED(touchyFeely->GetMetric(nsILookAndFeel::eMetric_ShowCaretWhenSelection, tempInt)))
mShowWhenSelection = tempInt ? PR_TRUE : PR_FALSE;
if (NS_SUCCEEDED(touchyFeely->GetMetric(nsILookAndFeel::eMetric_ShowCaretDuringSelection, tempInt)))
mShowDuringSelection = tempInt ? PR_TRUE : PR_FALSE;
NS_RELEASE(touchyFeely);
}
@ -474,7 +474,7 @@ PRBool nsCaret::SetupDrawingFrameAndOffset()
PRBool isCollapsed = PR_FALSE;
domSelection->GetIsCollapsed(&isCollapsed);
if (!mShowWhenSelection && !isCollapsed) return PR_FALSE;
if (!mShowDuringSelection && !isCollapsed) return PR_FALSE;
// start and end parent should be the same since we are collapsed
nsCOMPtr<nsIDOMNode> focusNode;
@ -846,7 +846,7 @@ PRBool nsCaret::MustDrawCaret()
if (NS_FAILED(domSelection->GetIsCollapsed(&isCollapsed)))
return PR_FALSE;
if (mShowWhenSelection)
if (mShowDuringSelection)
return PR_TRUE; // show the caret even in selections
return isCollapsed;
@ -1062,3 +1062,7 @@ NS_IMETHODIMP nsCaret::SetCaretWidth(nscoord aPixels)
}
return NS_OK;
}
void nsCaret::SetVisibilityDuringSelection(PRBool aVisibility) {
mShowDuringSelection = aVisibility;
}

3
layout/base/nsCaret.h
View File

@ -66,6 +66,7 @@ class nsCaret : public nsICaret,
NS_IMETHOD EraseCaret();
NS_IMETHOD SetCaretWidth(nscoord aPixels);
void SetVisibilityDuringSelection(PRBool aVisibility);
//nsISelectionListener interface
NS_IMETHOD NotifySelectionChanged(nsIDOMDocument *aDoc, nsISelection *aSel, short aReason);
@ -102,7 +103,7 @@ protected:
PRPackedBool mVisible; // is the caret blinking
PRPackedBool mDrawn; // this should be mutable
PRPackedBool mReadOnly; // it the caret in readonly state (draws differently)
PRPackedBool mShowWhenSelection; // show when text is selected
PRPackedBool mShowDuringSelection; // show when text is selected
nsRect mCaretRect; // the last caret rect
nsIFrame* mLastCaretFrame; // store the frame the caret was last drawn in.

14
layout/base/src/nsCaret.cpp
View File

@ -77,7 +77,7 @@ nsCaret::nsCaret()
, mVisible(PR_FALSE)
, mDrawn(PR_FALSE)
, mReadOnly(PR_FALSE)
, mShowWhenSelection(PR_FALSE)
, mShowDuringSelection(PR_FALSE)
, mLastCaretFrame(nsnull)
, mLastCaretView(nsnull)
, mLastContentOffset(0)
@ -109,8 +109,8 @@ NS_IMETHODIMP nsCaret::Init(nsIPresShell *inPresShell)
mCaretTwipsWidth = (nscoord)tempInt;
if (NS_SUCCEEDED(touchyFeely->GetMetric(nsILookAndFeel::eMetric_CaretBlinkTime, tempInt)))
mBlinkRate = (PRUint32)tempInt;
if (NS_SUCCEEDED(touchyFeely->GetMetric(nsILookAndFeel::eMetric_ShowCaretWhenSelection, tempInt)))
mShowWhenSelection = tempInt ? PR_TRUE : PR_FALSE;
if (NS_SUCCEEDED(touchyFeely->GetMetric(nsILookAndFeel::eMetric_ShowCaretDuringSelection, tempInt)))
mShowDuringSelection = tempInt ? PR_TRUE : PR_FALSE;
NS_RELEASE(touchyFeely);
}
@ -474,7 +474,7 @@ PRBool nsCaret::SetupDrawingFrameAndOffset()
PRBool isCollapsed = PR_FALSE;
domSelection->GetIsCollapsed(&isCollapsed);
if (!mShowWhenSelection && !isCollapsed) return PR_FALSE;
if (!mShowDuringSelection && !isCollapsed) return PR_FALSE;
// start and end parent should be the same since we are collapsed
nsCOMPtr<nsIDOMNode> focusNode;
@ -846,7 +846,7 @@ PRBool nsCaret::MustDrawCaret()
if (NS_FAILED(domSelection->GetIsCollapsed(&isCollapsed)))
return PR_FALSE;
if (mShowWhenSelection)
if (mShowDuringSelection)
return PR_TRUE; // show the caret even in selections
return isCollapsed;
@ -1062,3 +1062,7 @@ NS_IMETHODIMP nsCaret::SetCaretWidth(nscoord aPixels)
}
return NS_OK;
}
void nsCaret::SetVisibilityDuringSelection(PRBool aVisibility) {
mShowDuringSelection = aVisibility;
}

3
layout/base/src/nsCaret.h
View File

@ -66,6 +66,7 @@ class nsCaret : public nsICaret,
NS_IMETHOD EraseCaret();
NS_IMETHOD SetCaretWidth(nscoord aPixels);
void SetVisibilityDuringSelection(PRBool aVisibility);
//nsISelectionListener interface
NS_IMETHOD NotifySelectionChanged(nsIDOMDocument *aDoc, nsISelection *aSel, short aReason);
@ -102,7 +103,7 @@ protected:
PRPackedBool mVisible; // is the caret blinking
PRPackedBool mDrawn; // this should be mutable
PRPackedBool mReadOnly; // it the caret in readonly state (draws differently)
PRPackedBool mShowWhenSelection; // show when text is selected
PRPackedBool mShowDuringSelection; // show when text is selected
nsRect mCaretRect; // the last caret rect
nsIFrame* mLastCaretFrame; // store the frame the caret was last drawn in.

1
layout/html/tests/printer/general/test1.html
View File

@ -61,7 +61,6 @@ H4 { color: yellow;
<p>Some links to test pseudo-classes</p>
<p><a href="http://link">link</a></p>
<p><a href="http://visited">visited</a></p>
<p><a href="http://out-of-date">outofdate</a></p>
<p><a href="http://active">active</a></p>
<p><a href="http://hover">hover</a></p>
<h2>Bulleted List </h2>

2
layout/style/nsCSSParser.cpp
View File

@ -1376,10 +1376,8 @@ static PRBool IsPseudoClass(const nsIAtom* aAtom)
(nsCSSAtoms::lastChildPseudo == aAtom) ||
(nsCSSAtoms::lastNodePseudo == aAtom) ||
(nsCSSAtoms::linkPseudo == aAtom) ||
(nsCSSAtoms::outOfDatePseudo == aAtom) ||
(nsCSSAtoms::rootPseudo == aAtom) ||
(nsCSSAtoms::xblBoundElementPseudo == aAtom) ||
(nsCSSAtoms::outOfDatePseudo == aAtom) ||
(nsCSSAtoms::visitedPseudo == aAtom));
}

7
layout/style/nsCSSStyleSheet.cpp
View File

@ -2871,7 +2871,6 @@ static PRBool IsEventPseudo(nsIAtom* aAtom)
static PRBool IsLinkPseudo(nsIAtom* aAtom)
{
return PRBool ((nsCSSAtoms::linkPseudo == aAtom) ||
(nsCSSAtoms::outOfDatePseudo == aAtom) ||
(nsCSSAtoms::visitedPseudo == aAtom));
}
@ -2967,7 +2966,7 @@ static PRBool SelectorMatches(SelectorMatchesData &data,
if ((localTrue == result) &&
(nsnull != aSelector->mPseudoClassList)) { // test for pseudo class match
// first-child, root, lang, active, focus, hover, link, outOfDate, visited
// first-child, root, lang, active, focus, hover, link, visited...
// XXX disabled, enabled, selected, selection
nsAtomList* pseudoClass = aSelector->mPseudoClassList;
@ -3061,9 +3060,6 @@ static PRBool SelectorMatches(SelectorMatchesData &data,
if (nsCSSAtoms::linkPseudo == pseudoClass->mAtom) {
result = PRBool(localTrue == (eLinkState_Unvisited == data.mLinkState));
}
else if (nsCSSAtoms::outOfDatePseudo == pseudoClass->mAtom) {
result = PRBool(localTrue == (eLinkState_OutOfDate == data.mLinkState));
}
else if (nsCSSAtoms::visitedPseudo == pseudoClass->mAtom) {
result = PRBool(localTrue == (eLinkState_Visited == data.mLinkState));
}
@ -3698,7 +3694,6 @@ PRBool IsStateSelector(nsCSSSelector& aSelector)
(pseudoClass->mAtom == nsCSSAtoms::focusPseudo) ||
(pseudoClass->mAtom == nsCSSAtoms::hoverPseudo) ||
(pseudoClass->mAtom == nsCSSAtoms::linkPseudo) ||
(pseudoClass->mAtom == nsCSSAtoms::outOfDatePseudo) ||
(pseudoClass->mAtom == nsCSSAtoms::selectionPseudo) ||
(pseudoClass->mAtom == nsCSSAtoms::visitedPseudo)) {
return PR_TRUE;

2
mailnews/addrbook/prefs/resources/content/pref-addressing.xul
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/pref-addressing.dtd">

2
mailnews/addrbook/resources/content/abAddressBookNameDialog.xul
View File

@ -35,7 +35,7 @@ Rights Reserved.
<script language="JavaScript" src="chrome://messenger/content/addressbook/abAddressBookNameDialog.js"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<box orient="vertical" style="width:36em; min-height:12em">

2
mailnews/addrbook/resources/content/abEditCardDialog.xul
View File

@ -32,7 +32,7 @@ Rights Reserved.
<stringbundleset id="stringbundleset"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<box id="editcard"/>

2
mailnews/addrbook/resources/content/abEditListDialog.xul
View File

@ -37,7 +37,7 @@ Rights Reserved.
<stringbundleset id="stringbundleset"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<box id="editlist"/>

2
mailnews/addrbook/resources/content/abMailListDialog.xul
View File

@ -38,7 +38,7 @@ Rights Reserved.
<stringbundleset id="stringbundleset"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<box orient="horizontal" autostretch="never" valign="center">
<text for="abPopup" value="&addToAddressBook.label;"/>

2
mailnews/addrbook/resources/content/abNewCardDialog.xul
View File

@ -36,7 +36,7 @@ Rights Reserved.
<stringbundleset id="stringbundleset"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<box orient="horizontal" autostretch="never" valign="center">

2
mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
View File

@ -46,7 +46,7 @@ Rights Reserved.
<script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<popupset id="aTooltipSet"/>
<!-- Main box, 3 pane and majority of buttons -->

42
mailnews/addrbook/resources/content/addressbook.xul
View File

@ -55,45 +55,47 @@ Rights Reserved.
<script language="JavaScript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
<script language="JavaScript" src="chrome://messenger/content/msgPrintEngine.js"/>
<commands id="commands">
<commandset id="tasksCommands">
<commandset id="CommandUpdate_AddressBook"
commandupdater="true"
events="focus,tree-select"
oncommandupdate="CommandUpdate_AddressBook()"/>
<commandset id="globalEditMenuItems"/>
</commands>
<command id="cmd_newNavigator"/>
<command id="cmd_newEditor"/>
<command id="cmd_PrintCard" oncommand="AbPrintCard()"/>
<command id="cmd_quit"/>
<command id="cmd_close" oncommand="AbClose()"/>
<command id="cmd_CardProperties" oncommand="AbEditCard();"/>
<command id='cmd_selectAll'/>
<command id="toggleSidebar"/>
</commandset>
<broadcasterset id="broadcasterset">
<broadcasterset id="abBroadcasters">
<!-- File Menu -->
<broadcaster id="cmd_newNavigator"/>
<broadcaster id="cmd_newEditor"/>
<broadcaster id="cmd_PrintCard" oncommand="AbPrintCard()"/>
<broadcaster id="cmd_close" oncommand="AbClose()"/>
<broadcaster id="cmd_quit"/>
<!-- Edit Menu -->
<broadcaster id="cmd_delete"
valueAddressBook="&deleteAbCmd.label;"
valueCard="&deleteCardCmd.label;"
valueCards="&deleteCardsCmd.label;"/>
<broadcaster id="cmd_CardProperties" oncommand="AbEditCard();"/>
<broadcaster id='button_delete'/>
<broadcaster id='cmd_selectAll'/>
<broadcaster id="cmd_preferences"/>
<broadcaster id="broadcaster-throbber" busy="false"/>
<broadcaster id="button_delete" disabled="true"/>
<broadcaster id="Communicator:WorkMode"/>
</broadcasterset>
<keyset id="keyset">
<keyset id="tasksKeys">
<!-- File Menu -->
<key id="key_newNavigator"/>
<key id="key_PrintCard" key="&printCardViewCmd.key;" observes="cmd_PrintCard" modifiers="accel"/>
<key id="key_PrintCard" key="&printCardViewCmd.key;" command="cmd_PrintCard" modifiers="accel"/>
<key id="key_close"/>
<key id="key_quit"/>
<!-- Edit Menu -->
<key id="key_delete"/>
<key id="key_selectAll"/>
<key id="key_CardProperties" key="&cardPropertiesCmd.key;" observes="cmd_CardProperties" modifiers="accel"/>
<key id="showHideSidebar"/>
<key id="key_CardProperties" key="&cardPropertiesCmd.key;" command="cmd_CardProperties" modifiers="accel"/>
</keyset>
<popupset id="aTooltipSet"/>
@ -117,21 +119,21 @@ Rights Reserved.
<menuseparator/>
<menuitem label="&importCmd.label;" accesskey="&importCmd.accesskey;" oncommand="toImport()"/>
<menuseparator/>
<menuitem label="&printCardViewCmd.label;" accesskey="&printCardViewCmd.accesskey;" key="key_PrintCard" observes="cmd_PrintCard"/>
<menuitem label="&printCardViewCmd.label;" accesskey="&printCardViewCmd.accesskey;" key="key_PrintCard" command="cmd_PrintCard"/>
<menuseparator/>
</menupopup>
</menu>
<menu id="menu_Edit">
<menupopup>
<menuitem id="menu_delete"/>
<menuitem id="menu_delete" observes="button_delete"/>
<menuseparator/>
<menuitem id="menu_selectAll"/>
<menuseparator/>
<menuitem label="&cardPropertiesCmd.label;"
accesskey="&cardPropertiesCmd.accesskey;"
key="key_CardProperties"
observes="cmd_CardProperties"/>
command="cmd_CardProperties"/>
<menuseparator/>
<menuitem id="menu_preferences" oncommand="goPreferences('addressbook.xul', 'chrome://messenger/content/addressbook/pref-addressing.xul')"/>
</menupopup>
@ -209,7 +211,7 @@ Rights Reserved.
<toolbarseparator class="toolbarseparator-primary"/>
<button class="button-toolbar-2 top" orient="vertical" id="button-editcard" label="&editButton.label;" tooltip="aTooltip" tooltiptext="&editButton.tooltip;" oncommand="AbEditCard();"/>
<button class="button-toolbar-2 top" orient="vertical" id="button-newmessage" label="&newmsgButton.label;" tooltip="aTooltip" tooltiptext="&newmsgButton.tooltip;" oncommand="AbNewMessage();"/>
<button class="button-toolbar-2 top" orient="vertical" id="button-delete" disabled="true" observes="button_delete" label="&deleteButton.label;" tooltip="aTooltip" tooltiptext="&deleteButton.tooltip;" oncommand="goDoCommand('button_delete');"/>
<button class="button-toolbar-2 top" orient="vertical" id="button-delete" observes="button_delete" label="&deleteButton.label;" tooltip="aTooltip" tooltiptext="&deleteButton.tooltip;" oncommand="goDoCommand('button_delete');"/>
<box orient="vertical" flex="100%">
<spring flex="1"/>

2
mailnews/base/prefs/resources/content/AccountManager.xul
View File

@ -17,7 +17,7 @@
<script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<box flex="1">
<box orient="vertical" flex="1">

2
mailnews/base/prefs/resources/content/AccountWizard.xul
View File

@ -31,7 +31,7 @@ Rights Reserved.
height="400" width="500" class="color-dialog"
onload="onLoad();">
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<!-- XXX: strres.js is included so that WizardManager.js will work -->
<script type="application/x-javascript" src="chrome://global/content/strres.js"/>

2
mailnews/base/prefs/resources/content/SmtpServerEdit.xul
View File

@ -39,7 +39,7 @@
>
<script language="javascript" src="SmtpServerEdit.js"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<box id="smtpServerEditor"/>
<separator/>
<box id="okCancelButtonsRight"/>

2
mailnews/base/prefs/resources/content/SmtpServerList.xul
View File

@ -41,7 +41,7 @@
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
<script language="javascript" src="SmtpServerList.js"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<html flex="1">&smtpListDesc.label;</html>

2
mailnews/base/prefs/resources/content/am-imap-advanced.xul
View File

@ -13,7 +13,7 @@
onload="onLoad();"
align="vertical">
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<script src="am-imap-advanced.js"/>

2
mailnews/base/prefs/resources/content/pref-mailnews.xul
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/pref-mailnews.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
<!--
The contents of this file are subject to the Netscape Public

2
mailnews/base/prefs/resources/content/pref-receipts.xul
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-receipts.dtd">

1
mailnews/base/prefs/resources/content/pref-viewing_messages.xul
View File

@ -1,5 +1,6 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://communicator/skin/prefpanels.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>

2
mailnews/base/resources/content/commandglue.js
View File

@ -800,7 +800,7 @@ function Redo()
function MsgToggleWorkOffline()
{
var ioService = nsJSComponentManager.getServiceByID("{9ac9e770-18bc-11d3-9337-00104ba0fd40}", "nsIIOService");
var broadcaster = document.getElementById("Communicator:WorkMode");
// var command = document.getElementById("Communicator:WorkMode");
// this is just code for my testing purposes, and doesn't have the proper UI, as in the offline spec.
// we could use the account manager, or add a new service, the offline manager.
// what the heck, might as well bite the bullet and add a new service.

2
mailnews/base/resources/content/imapFolderProps.xul
View File

@ -38,7 +38,7 @@
<script language="Javascript" src="chrome://global/content/globalOverlay.js"></script>
<script language="JavaScript" src="chrome://messenger/content/folderProps.js"></script>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<tabcontrol orient="vertical">
<tabbox>

12
mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
View File

@ -71,8 +71,7 @@ Rights Reserved.
<script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
<commands id="commands">
<commandset id="tasksCommands">
<commandset id="mailFileMenuItems"/>
<commandset id="mailViewMenuItems"/>
<commandset id="mailEditMenuItems"/>
@ -88,11 +87,14 @@ Rights Reserved.
commandupdater="true"
events="focus"
oncommandupdate="FocusRingUpdate_Mail()"/>
</commands>
<command id="toggleSidebar"/>
</commandset>
<broadcasterset id="broadcasterset"/>
<broadcasterset id="mailBroadcasters"/>
<keyset id="keyset"/>
<keyset id="tasksKeys">
<key id="showHideSidebar"/>
</keyset>
<popupset>

4
mailnews/base/resources/content/mailABOverlay.xul
View File

@ -8,8 +8,8 @@
<!-- addressbook specific UI items -->
<menupopup id="menu_NewPopup">
<menuitem id="menu_newMessage" key="key_newMessage" observes="cmd_newMessage" position="5"/>
<menuitem id="menu_newCard" observes="cmd_newCard" position="6"/>
<menuitem id="menu_newMessage" position="5"/>
<menuitem id="menu_newCard" position="6"/>
</menupopup>
</overlay>

6
mailnews/base/resources/content/mailEditorOverlay.xul
View File

@ -3,7 +3,7 @@
<!-- retrieve generic commands -->
<?xul-overlay href="chrome://messenger/content/mailOverlay.xul"?>
<!DOCTYPE window SYSTEM "chrome://messenger/content/mailEditorOverlay.dtd">
<!DOCTYPE window SYSTEM "chrome://messenger/locale/mailEditorOverlay.dtd" >
<overlay id="mailEditorOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@ -11,8 +11,8 @@
<!-- editor specific UI items -->
<menupopup id="menu_NewPopup">
<!-- Command nodes and implemention are in mailOverlay.xul -->
<menuitem id="menu_newMessage" key="key_newMessage" observes="cmd_newMessage" position="2"/>
<menuitem id="menu_newCard" observes="cmd_newCard" position="3"/>
<menuitem id="menu_newMessage" position="2"/>
<menuitem id="menu_newCard" position="3"/>
</menupopup>
<menupopup id="menu_FilePopup">

4
mailnews/base/resources/content/mailMessengerComposeOverlay.xul
View File

@ -8,8 +8,8 @@
<!-- messengercompose specific UI items -->
<menupopup id="menu_NewPopup">
<menuitem id="menu_newMessage" key="key_newMessage" observes="cmd_newMessage" position="2"/>
<menuitem id="menu_newCard" observes="cmd_newCard" position="3"/>
<menuitem id="menu_newMessage" position="2"/>
<menuitem id="menu_newCard" position="3"/>
</menupopup>
</overlay>

4
mailnews/base/resources/content/mailMessengerOverlay.xul
View File

@ -8,8 +8,8 @@
<!-- addressbook specific UI items -->
<menupopup id="menu_NewPopup">
<menuitem id="menu_newMessage" key="key_newMessage" observes="cmd_newMessage" position="5"/>
<menuitem id="menu_newCard" observes="cmd_newCard" position="6"/>
<menuitem id="menu_newMessage" position="5"/>
<menuitem id="menu_newCard" position="6"/>
</menupopup>
</overlay>

18
mailnews/base/resources/content/mailNavigatorOverlay.xul
View File

@ -3,7 +3,7 @@
<!-- retrieve generic commands -->
<?xul-overlay href="chrome://messenger/content/mailOverlay.xul"?>
<!DOCTYPE window SYSTEM "chrome://messenger/locale/mailNavigatorOverlay.dtd">
<!DOCTYPE window SYSTEM "chrome://messenger/locale/mailNavigatorOverlay.dtd" >
<overlay id="mailNavigatorOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@ -33,20 +33,20 @@
</script>
<!-- navigator specific commands -->
<broadcasterset id="broadcasterset">
<broadcaster id="cmd_sendPage" label="&sendPage.label;" accesskey="&sendPage.accesskey;" oncommand="sendPage();"/>
<broadcaster id="Browser:SendLink" label="&sendLinkCmd.label;" accesskey="&sendLinkCmd.accesskey;" oncommand="sendLink(window._content.location.href, window._content.document.title);"/>
</broadcasterset>
<commandset id="tasksCommands">
<command id="cmd_sendPage" oncommand="sendPage();"/>
<command id="Browser:SendLink" oncommand="sendLink(window._content.location.href, window._content.document.title);"/>
</commandset>
<!-- navigator specific UI items -->
<menupopup id="menu_NewPopup">
<menuitem id="menu_newCard" insertafter="menu_newNavigator" observes="cmd_newCard" position="3"/>
<menuitem id="menu_newMessage" insertafter="menu_newNavigator" key="key_newMessage" observes="cmd_newMessage" position="2"/>
<menuitem id="menu_newCard" position="3"/>
<menuitem id="menu_newMessage" position="2"/>
</menupopup>
<menupopup id="menu_FilePopup">
<menuitem id="menu_sendPage" observes="cmd_sendPage" position="11"/>
<menuitem id="menu_sendLink" observes="Browser:SendLink" position="12"/>
<menuitem id="menu_sendPage" label="&sendPage.label;" accesskey="&sendPage.accesskey;" command="cmd_sendPage" position="11"/>
<menuitem id="menu_sendLink" label="&sendLinkCmd.label;" accesskey="&sendLinkCmd.accesskey;" command="Browser:SendLink" position="12"/>
</menupopup>
</overlay>

16
mailnews/base/resources/content/mailOverlay.xul
View File

@ -1,7 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE window SYSTEM "chrome://messenger/locale/mailOverlay.dtd">
<overlay id="mailOverlay.xul"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@ -36,12 +35,13 @@
</script>
<!-- generic commands -->
<broadcasterset id="broadcasterset">
<broadcaster id="cmd_newMessage" label="&newMessageCmd.label;" accesskey="&newMessageCmd.accesskey;" oncommand="goOpenNewMessage();"/>
<broadcaster id="cmd_newCard" label="&newCardCmd.label;" accesskey="&newCardCmd.accesskey;" oncommand="goNewCardDialog(0)"/>
</broadcasterset>
<keyset id="keyset">
<key id="key_newMessage" key="&newMessageCmd.key;" observes="cmd_newMessage" modifiers="accel"/>
<commandset id="tasksCommands">
<command id="cmd_newMessage" oncommand="goOpenNewMessage();"/>
<command id="cmd_newCard" oncommand="goNewCardDialog(0)"/>
</commandset>
<menuitem id="menu_newCard" label="&newCardCmd.label;" accesskey="&newCardCmd.accesskey;" command="cmd_newCard"/>
<menuitem id="menu_newMessage" label="&newMessageCmd.label;" accesskey="&newMessageCmd.accesskey;" key="key_newMessage" command="cmd_newMessage"/>
<keyset id="tasksKeys">
<key id="key_newMessage" key="&newMessageCmd.key;" command="cmd_newMessage" modifiers="accel"/>
</keyset>
</overlay>

14
mailnews/base/resources/content/mailTasksOverlay.xul
View File

@ -48,23 +48,23 @@
]]>
</script>
<keyset id="keyset">
<key id="key_mail" key="&messengerCmd.commandkey;" observes="Tasks:Mail" modifiers="accel"/>
<keyset id="tasksKeys">
<key id="key_mail" key="&messengerCmd.commandkey;" command="Tasks:Mail" modifiers="accel"/>
</keyset>
<broadcasterset id="broadcasterset">
<broadcaster id="Tasks:Mail" label="&messengerCmd.label;" oncommand="toMessengerWindow();"/>
</broadcasterset>
<commandset id="tasksCommands">
<command id="Tasks:Mail" oncommand="toMessengerWindow();"/>
</commandset>
<box id="taskButtons">
<button class="button-toolbar-4 taskbutton" id="mini-mail" onclick="toMessengerWindow()"
<button class="button-toolbar-4 taskbutton" id="mini-mail" oncommand="toMessengerWindow()"
position="2" tooltip="aTooltip" tooltiptext="&taskMessenger.tooltip;"/>
</box>
<menupopup id="taskPopup">
<menuitem position="2" accesskey="&messengerCmd.accesskey;" key="key_mail" observes="Tasks:Mail"/>
<menuitem position="2" accesskey="&messengerCmd.accesskey;" label="&messengerCmd.label;" key="key_mail" command="Tasks:Mail"/>
</menupopup>
</overlay>

21
mailnews/base/resources/content/mailWindowOverlay.xul
View File

@ -43,8 +43,9 @@ Rights Reserved.
<script src="chrome://messenger/content/mailWindowOverlay.js"/>
<script src="chrome://messenger/content/commandglue.js"/>
<stringbundleset id="stringbundleset">
<stringbundleset id="mailStringBundles">
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
<stringbundle id="bundle_viewZoom"/>
</stringbundleset>
<commandset id="mailFileMenuItems"
@ -76,6 +77,12 @@ Rights Reserved.
<command id="cmd_renameFolder" oncommand="goDoCommand('cmd_renameFolder')" />
</commandset>
<commandset id="mailCommands">
<command id="cmd_newNavigator"/>
<command id="cmd_newEditor"/>
<command id="cmd_quit"/>
<!-- <command id="cmd_pageSetup"/>-->
</commandset>
<commandset id="mailViewMenuItems"
commandupdater="true"
events="create-menu-view"
@ -185,17 +192,13 @@ Rights Reserved.
<command id="button_file"/>
</commandset>
<broadcasterset id="broadcasterset">
<broadcasterset id="mailBroadcasters">
<!-- File Menu -->
<broadcaster id="cmd_newNavigator"/>
<broadcaster id="cmd_newEditor"/>
<broadcaster id="cmd_quit"/>
<broadcaster id="cmd_pageSetup"/>
<broadcaster id="Communicator:WorkMode"/>
<!-- Edit Menu -->
</broadcasterset>
<keyset id="keyset">
<keyset id="mailKeys">
<key id="space" key=" " oncommand="SpaceHit()"/>
<!-- File Menu -->
@ -237,7 +240,7 @@ Rights Reserved.
modifiers="accel, shift"/>
<key id="key_find" key="&findCmd.key;" oncommand="goDoCommand('cmd_find')" modifiers="accel"/>
<key id="key_findAgain" key="&findAgainCmd.key;" oncommand="goDoCommand('cmd_findAgain')" modifiers="accel"/>
<keyset id="viewZoomKeys"/>
<!-- Tab Keys -->
<key id="tabpaneCounterClockwise" keycode="VK_TAB" oncommand="SwitchPaneFocus('counter-clockwise');"
modifiers="shift"/>

15
mailnews/base/resources/content/messageWindow.xul
View File

@ -45,7 +45,7 @@ Rights Reserved.
persist="width height screenX screenY sizemode"
windowtype="mail:messageWindow">
<stringbundleset id="stringbundleset">
<stringbundleset id="mailStringBundles">
<stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
</stringbundleset>
@ -67,7 +67,7 @@ Rights Reserved.
<script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
<commands id="commands">
<commandset id="mailCommands">
<commandset id="mailFileMenuItems"/>
<commandset id="mailViewMenuItems"/>
<commandset id="mailEditMenuItems"/>
@ -75,12 +75,13 @@ Rights Reserved.
<commandset id="mailGoMenuItems"/>
<commandset id="mailMessageMenuItems"/>
<commandset id="mailToolbarItems"/>
</commands>
<commandset id="commandKeys"/>
</commandset>
<stringbundleset id="stringbundleset"/>
<broadcasterset id="broadcasterset"/>
<keyset id="keyset"/>
<broadcasterset id="mailBroadcasters"/>
<keyset id="mailKeys">
<keyset id="tasksKeys"/>
</keyset>
<popupset>
<popup id="emailAddressPopup" popupanchor="bottomleft">

16
mailnews/base/resources/content/messenger.xul
View File

@ -50,7 +50,7 @@ Rights Reserved.
persist="width height screenX screenY sizemode"
windowtype="mail:3pane">
<stringbundleset id="stringbundleset">
<stringbundleset id="mailStringBundles">
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
<stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
</stringbundleset>
@ -73,8 +73,7 @@ Rights Reserved.
<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
<commands id="commands">
<commandset id="mailCommands">
<commandset id="mailFileMenuItems"/>
<commandset id="mailViewMenuItems"/>
<commandset id="mailEditMenuItems"/>
@ -90,11 +89,16 @@ Rights Reserved.
commandupdater="true"
events="focus"
oncommandupdate="FocusRingUpdate_Mail()"/>
</commands>
<commandset id="tasksKeys"/>
<command id="toggleSidebar"/>
</commandset>
<broadcasterset id="broadcasterset"/>
<broadcasterset id="mailBroadcasters"/>
<keyset id="keyset"/>
<keyset id="mailKeys">
<key id="showHideSidebar"/>
<keyset id="tasksKeys"/>
</keyset>
<popupset>

2
mailnews/base/resources/content/msgHdrViewAddresses.js
View File

@ -21,7 +21,7 @@
/////////////////////////////////////////////////////////////////////
// If we want to do any special processing for each email address
// we show in the msg header view overlay, we can isolate it in this file.
// It is included by msgHdrViewOverlay.
// (Remember to include it in msgHdrViewOverlay.xul)
//////////////////////////////////////////////////////////////////////
// AddExtraAddressProcessing --> If you want to add any extra

1
mailnews/base/resources/content/msgHdrViewOverlay.xul
View File

@ -26,7 +26,6 @@ Rights Reserved.
<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 src="chrome://messenger/content/msgHdrViewAddresses.js"/>
<script src="chrome://messenger/content/msgHdrViewOverlay.js"/>
<script src="chrome://messenger/content/mime.js"/>

2
mailnews/base/resources/content/newFolderDialog.xul
View File

@ -41,7 +41,7 @@
<script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/newFolderDialog.js"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<box align="vertical">

2
mailnews/base/resources/content/renameFolderDialog.xul
View File

@ -40,7 +40,7 @@
<script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/renameFolderDialog.js"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<box align="vertical">

2
mailnews/base/resources/content/subscribe.xul
View File

@ -46,7 +46,7 @@ Rights Reserved.
<script language="JavaScript" src="chrome://messenger/content/mailWindow.js"/>
<script language="JavaScript" src="chrome://messenger/content/subscribe.js"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<grid flex="1" style="width: 40em; height: 25em;">
<columns>

2
mailnews/base/search/resources/content/FilterEditor.xul
View File

@ -45,7 +45,7 @@ Rights Reserved.
<script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/FilterEditor.js"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<box autostretch="never">
<text class="label" value="&filterName.label;"/>

2
mailnews/base/search/resources/content/FilterListDialog.xul
View File

@ -36,7 +36,7 @@ Rights Reserved.
<!-- <script src="resource:/res/samples/DumpDOM.js"/> -->
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<grid flex="1">
<columns>

4
mailnews/base/search/resources/content/SearchDialog.xul
View File

@ -20,7 +20,7 @@ Communications Corporation. Portions created by Netscape are
Copyright (C) 1998-1999 Netscape Communications Corporation. All
Rights Reserved.
-->
<?xml-stylesheet href="chrome://communicator/skin/search-widgets.css" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
<?xul-overlay href="chrome://messenger/content/threadPane.xul"?>
<?xul-overlay href="chrome://messenger/content/searchTermOverlay.xul"?>
@ -41,7 +41,7 @@ Rights Reserved.
class="color-dialog"
orient="vertical">
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>

2
mailnews/compose/prefs/resources/content/pref-composing_messages.xul
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>

2
mailnews/compose/prefs/resources/content/pref-formatting.xul
View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/pref-formatting.dtd">

88
mailnews/compose/prefs/resources/content/pref-messages.xul Normal file
View File

@ -0,0 +1,88 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://communicator/skin/dialogOverlay.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://messengercompose/locale/pref-messages.dtd">
<window xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="parent.initPanel('chrome://messengercompose/content/pref-messages.xul');"
orient="vertical"
class="color-dialog">
<box class="box-smallheader" title="&pane.title;" description="&pane.description;"/>
<titledbox orient="vertical">
<label value="&forwardReply.label;"/>
<box autostretch="never">
<text class="label" value="&forwardMsg.label;" accesskey="&forwardMsg.accesskey;"/>
<menulist id="forwardMessageMode"
pref="true" preftype="int" prefstring="mail.forward_message_mode"
prefattribute="value">
<menupopup>
<menuitem value="0" label="&asAttachment.label;" accesskey="&asAttachment.accesskey;"/>
<menuitem value="1" label="&quoted.label;" accesskey="&quoted.accesskey;"/>
<menuitem value="2" label="&inline.label;" accesskey="&inline.accesskey;"/>
</menupopup>
</menulist>
</box>
<checkbox id="autoQuote" label="&autoQuote.label;"
pref="true" preftype="bool" prefstring="mail.auto_quote"
prefattribute="checked"/>
<box autostretch="never">
<text class="label" value="&then.label;" accesskey="&then.accesskey;" for="replyOnTop"/>
<menulist id="replyOnTop" pref="true" preftype="int" prefstring="mailnews.reply_on_top"
prefattribute="value">
<menupopup>
<menuitem value="1" label="&aboveQuote.label;" accesskey="&aboveQuote.accesskey;"/>
<menuitem value="0" label="&belowQuote.label;" accesskey="&belowQuote.accesskey;"/>
<menuitem value="2" label="&selectAndAboveQuote.label;" accesskey="&selectAndAboveQuote.accesskey;"/>
<menuitem value="3" label="&selectAndBelowQuote.label;" accesskey="&selectAndBelowQuote.accesskey;"/>
</menupopup>
</menulist>
</box>
</titledbox>
<!-- Reading -->
<titledbox orient="vertical" autostretch="never">
<label value="&readingMessagesHeader.label;"/>
<checkbox id="wrapLongLines" label="&wrapInMsg.label;"
pref="true" preftype="bool" prefstring="mail.wrap_long_lines"
prefattribute="checked"/>
<checkbox id="displayGlyph" label="&convertEmoticons.label;"
pref="true" preftype="bool" prefstring="mail.display_glyph"
prefattribute="checked"/>
<checkbox id="displayStruct" label="&convertStructs.label;"
pref="true" preftype="bool" prefstring="mail.display_struct"
prefattribute="checked"/>
</titledbox>
<!-- Sending -->
<titledbox orient="vertical">
<label value="&sendingMessagesHeader.label;"/>
<checkbox id="spellCheckBeforeSend" label="&spellCheck.label;"
pref="true" preftype="bool" prefstring="mail.SpellCheckBeforeSend"
prefattribute="checked"/>
<checkbox id="sendStruct" label="&convertStructs.label;"
pref="true" preftype="bool" prefstring="mail.send_struct"
prefattribute="checked"/>
<box autostretch="never">
<text class="label" value="&wrapOutMsg.label;" accesskey="&wrapOutMsg.accesskey;" for="wrapLength"/>
<textbox id="wrapLength" size="3" pref="true" preftype="int"
prefstring="mailnews.wraplength" prefattribute="value"/>
<text class="label" value="&char.label;"/>
</box>
<html>&use8Bits.label;</html>
<radiogroup id="strictlyMime" orient="vertical" autostretch="never"
pref="true" preftype="bool" prefstring="mail.strictly_mime"
prefattribute="value">
<radio group="strictlyMime" value="false" label="&asIs.label;"/>
<radio group="strictlyMime" value="true" label="&useMIME.label;"/>
</radiogroup>
</titledbox>
</window>

2
mailnews/compose/resources/content/MsgAttachPage.xul
View File

@ -14,7 +14,7 @@
<script language="JavaScript" src="chrome://messenger/content/messengercompose/MsgAttachPage.js"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<spring style="height:0.5em" />
<box align="horizontal">

2
mailnews/compose/resources/content/askSendFormat.xul
View File

@ -18,7 +18,7 @@
<script language="JavaScript" src="chrome://messenger/content/messengercompose/askSendFormat.js"/>
<keyset id="keyset"/>
<keyset id="dialogKeys"/>
<spring style="height:0.5em"/>
<box align="horizontal">

Some files were not shown because too many files have changed in this diff Show More