Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #214687 --> thunderbird specific change. Show the account name in the mail compose menu list value

Browse Source 
just like we do for the menu list popup.

r/sr=bienvenu


git-svn-id: svn://10.0.0.236/trunk@145438 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scott%scott-macgregor.org 2003-08-01 00:17:10 +00:00
parent ceef59281c
commit b8a549c596
4 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/mail/components/compose/content/MsgComposeCommands.js
View File

@ -2461,6 +2461,10 @@ function LoadIdentity(startup)
var idKey = identityElement.value;
gCurrentIdentity = gAccountManager.getIdentity(idKey);
// set the account name on the menu list value.
var accountName = identityElement.selectedItem.getAttribute('accountname');
identityElement.setAttribute('accountname', accountName);
if (!startup && prevIdentity && idKey != prevIdentity.key)
{
var prefstring = "mail.identity." + prevIdentity.key;

2
mozilla/mail/components/compose/content/messengercompose.xul
View File

@ -521,7 +521,7 @@
<vbox flex="1" id="addresses-box">
<hbox align="center">
<label value="&fromAddr.label;" accesskey="&fromAddr.accesskey;" control="msgIdentity"/>
<menulist id="msgIdentity" label="..." flex="1" oncommand="LoadIdentity(false);">
<menulist id="msgIdentity" class="identity-menulist" label="..." flex="1" oncommand="LoadIdentity(false);">
<menupopup id="msgIdentityPopup"/>
</menulist>
</hbox>

4
mozilla/mail/components/compose/skin/messengercompose.css
View File

@ -264,6 +264,10 @@ treechildren::-moz-tree-image(remote-err) {
list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.gif");
}
.identity-menulist {
-moz-binding: url(chrome://messenger/content/messengercompose/mailComposeBindings.xml#fromMenuList);
}
.identity-popup-item {
-moz-binding: url(chrome://messenger/content/messengercompose/mailComposeBindings.xml#fromMenuitem);
}

30
mozilla/mailnews/compose/resources/content/mailComposeBindings.xml
View File

@ -5,14 +5,26 @@
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:xbl="http://www.mozilla.org/xbl">
<binding id="fromMenuitem"
extends="chrome://global/content/bindings/menu.xml#menuitem">
<content autostretch="never" excludes="template,observes,menupopup">
<xul:label class="composemenu-text" xbl:inherits="value=label,accesskey,crop"
crop="right"/>
<xul:label class="composemenu-text-2" xbl:inherits="value=accountname"
crop="right"/>
</content>
</binding>
<binding id="fromMenuitem" extends="chrome://global/content/bindings/menu.xml#menuitem">
<content autostretch="never" excludes="template,observes,menupopup">
<xul:label class="composemenu-text" xbl:inherits="value=label,accesskey,crop"
crop="right"/>
<xul:label class="composemenu-text-2" xbl:inherits="value=accountname"
crop="right"/>
</content>
</binding>
<binding id="fromMenuList" display="xul:menu" extends="chrome://global/content/bindings/menulist.xml#menulist">
<content sizetopopup="pref">
<xul:hbox class="menulist-label-box" flex="1">
<xul:image class="menulist-icon" xbl:inherits="src"/>
<xul:label class="menulist-label" xbl:inherits="value=label,crop,accesskey" crop="right" flex="1"/>
<xul:label class="composemenu-text-2" xbl:inherits="value=accountname" crop="right" flex="100"/>
</xul:hbox>
<xul:dropmarker class="menulist-dropmarker" type="menu"/>
<children includes="menupopup"/>
</content>
</binding>
</bindings>