From f664b2fa4239d75b8ae78585334453bb1e519580 Mon Sep 17 00:00:00 2001 From: "neil%parkwaycc.co.uk" Date: Mon, 21 Nov 2005 13:55:47 +0000 Subject: [PATCH] Bug 244886 Reuse in Compose window p=Stefan.Borggraefe@gmx.de r=mscott sr=me git-svn-id: svn://10.0.0.236/trunk@185040 18797224-902f-48f8-a5cc-f745e15eee43 --- .../compose/content/MsgComposeCommands.js | 14 +++------ .../compose/content/messengercompose.xul | 2 +- .../mail/compose/messengercompose.css | 13 -------- .../qute/mail/compose/messengercompose.css | 12 -------- .../resources/content/MsgComposeCommands.js | 14 +++------ .../resources/content/mailComposeBindings.xml | 30 ------------------- .../resources/content/messengercompose.xul | 2 +- mozilla/mailnews/jar.mn | 1 - .../messengercompose/messengercompose.css | 8 ----- .../messengercompose/messengercompose.css | 10 ------- .../themes/gnomestripe/global/menu.css | 6 ++++ .../toolkit/themes/pinstripe/global/menu.css | 6 ++++ .../themes/pinstripe/global/menulist.css | 6 ++++ mozilla/toolkit/themes/qute/global/menu.css | 6 ++++ .../toolkit/themes/qute/global/menulist.css | 6 ++++ .../toolkit/themes/winstripe/global/menu.css | 6 ++++ .../themes/winstripe/global/menulist.css | 6 ++++ 17 files changed, 52 insertions(+), 96 deletions(-) delete mode 100644 mozilla/mailnews/compose/resources/content/mailComposeBindings.xml diff --git a/mozilla/mail/components/compose/content/MsgComposeCommands.js b/mozilla/mail/components/compose/content/MsgComposeCommands.js index 569e5e3cd10..c19f9a859b5 100644 --- a/mozilla/mail/components/compose/content/MsgComposeCommands.js +++ b/mozilla/mail/components/compose/content/MsgComposeCommands.js @@ -1232,12 +1232,11 @@ function ComposeStartup(recycled, aParams) } var identityList = document.getElementById("msgIdentity"); - var identityListPopup = document.getElementById("msgIdentityPopup"); document.addEventListener("keypress", awDocumentKeyPress, true); - if (identityListPopup) - FillIdentityListPopup(identityListPopup); + if (identityList) + FillIdentityList(identityList); if (!params) { // This code will go away soon as now arguments are passed to the window using a object of type nsMsgComposeParams instead of a string @@ -2334,7 +2333,7 @@ function compareAccountSortOrder(account1, account2) return 0; } -function FillIdentityListPopup(popup) +function FillIdentityList(menulist) { var accounts = queryISupportsArray(gAccountManager.accounts, Components.interfaces.nsIMsgAccount); accounts.sort(compareAccountSortOrder); @@ -2346,13 +2345,8 @@ function FillIdentityListPopup(popup) var identites = queryISupportsArray(accounts[i].identities, Components.interfaces.nsIMsgIdentity); for (var j in identites) { var identity = identites[j]; - var item = document.createElement("menuitem"); - item.className = "identity-popup-item"; - item.setAttribute("label", identity.identityName); - item.setAttribute("value", identity.key); + var item = menulist.appendItem(identity.identityName, identity.key, server.prettyName); item.setAttribute("accountkey", accounts[i].key); - item.setAttribute("accountname", " - " + server.prettyName); - popup.appendChild(item); } } } diff --git a/mozilla/mail/components/compose/content/messengercompose.xul b/mozilla/mail/components/compose/content/messengercompose.xul index a1604816037..8ce779e469a 100644 --- a/mozilla/mail/components/compose/content/messengercompose.xul +++ b/mozilla/mail/components/compose/content/messengercompose.xul @@ -697,7 +697,7 @@ diff --git a/mozilla/mail/themes/pinstripe/mail/compose/messengercompose.css b/mozilla/mail/themes/pinstripe/mail/compose/messengercompose.css index b75cfd80c27..dd1f0cc8e06 100644 --- a/mozilla/mail/themes/pinstripe/mail/compose/messengercompose.css +++ b/mozilla/mail/themes/pinstripe/mail/compose/messengercompose.css @@ -387,19 +387,6 @@ treechildren::-moz-tree-image(remote-err) { list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.png"); } -.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); -} - -.composemenu-text-2 { - font-style: italic; - color: GrayText; -} - /* ::::: addressing widget ::::: */ #addressingWidget { diff --git a/mozilla/mail/themes/qute/mail/compose/messengercompose.css b/mozilla/mail/themes/qute/mail/compose/messengercompose.css index bb9c4b95ccb..1c1c1ee4173 100644 --- a/mozilla/mail/themes/qute/mail/compose/messengercompose.css +++ b/mozilla/mail/themes/qute/mail/compose/messengercompose.css @@ -374,18 +374,6 @@ treechildren::-moz-tree-image(remote-err) { list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.png"); } -.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); -} - -.composemenu-text-2 { - color: #555566; -} - /* ::::: addressing widget ::::: */ .autocomplete-treebody::-moz-tree-cell-text(comment) { diff --git a/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js b/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js index bb22fc9132a..a61d76d1056 100644 --- a/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js +++ b/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js @@ -1231,12 +1231,11 @@ function ComposeStartup(recycled, aParams) } var identityList = document.getElementById("msgIdentity"); - var identityListPopup = document.getElementById("msgIdentityPopup"); document.addEventListener("keypress", awDocumentKeyPress, true); - if (identityListPopup) - FillIdentityListPopup(identityListPopup); + if (identityList) + FillIdentityList(identityList); if (!params) { // This code will go away soon as now arguments are passed to the window using a object of type nsMsgComposeParams instead of a string @@ -2183,7 +2182,7 @@ function compareAccountSortOrder(account1, account2) return 0; } -function FillIdentityListPopup(popup) +function FillIdentityList(menulist) { var accounts = queryISupportsArray(gAccountManager.accounts, Components.interfaces.nsIMsgAccount); accounts.sort(compareAccountSortOrder); @@ -2195,13 +2194,8 @@ function FillIdentityListPopup(popup) var identites = queryISupportsArray(accounts[i].identities, Components.interfaces.nsIMsgIdentity); for (var j in identites) { var identity = identites[j]; - var item = document.createElement("menuitem"); - item.className = "identity-popup-item"; - item.setAttribute("label", identity.identityName); - item.setAttribute("value", identity.key); + var item = menulist.appendItem(identity.identityName, identity.key, server.prettyName); item.setAttribute("accountkey", accounts[i].key); - item.setAttribute("accountname", " - " + server.prettyName); - popup.appendChild(item); } } } diff --git a/mozilla/mailnews/compose/resources/content/mailComposeBindings.xml b/mozilla/mailnews/compose/resources/content/mailComposeBindings.xml deleted file mode 100644 index 280b2129a3d..00000000000 --- a/mozilla/mailnews/compose/resources/content/mailComposeBindings.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mozilla/mailnews/compose/resources/content/messengercompose.xul b/mozilla/mailnews/compose/resources/content/messengercompose.xul index 0261cb559af..203e013b53f 100644 --- a/mozilla/mailnews/compose/resources/content/messengercompose.xul +++ b/mozilla/mailnews/compose/resources/content/messengercompose.xul @@ -488,7 +488,7 @@ diff --git a/mozilla/mailnews/jar.mn b/mozilla/mailnews/jar.mn index 15996b9c99b..3b3f1afe759 100644 --- a/mozilla/mailnews/jar.mn +++ b/mozilla/mailnews/jar.mn @@ -175,7 +175,6 @@ messenger.jar: content/messenger/messengercompose/askSendFormat.xul (compose/resources/content/askSendFormat.xul) content/messenger/messengercompose/sendProgress.xul (compose/resources/content/sendProgress.xul) content/messenger/messengercompose/sendProgress.js (compose/resources/content/sendProgress.js) - content/messenger/messengercompose/mailComposeBindings.xml (compose/resources/content/mailComposeBindings.xml) content/messenger/messengercompose/MsgAttachPage.xul (compose/resources/content/MsgAttachPage.xul) content/messenger/messengercompose/MsgAttachPage.js (compose/resources/content/MsgAttachPage.js) content/messenger/messengercompose/mailComposeExtrasOverlay.xul (compose/resources/content/mailComposeExtrasOverlay.xul) diff --git a/mozilla/themes/classic/messenger/messengercompose/messengercompose.css b/mozilla/themes/classic/messenger/messengercompose/messengercompose.css index be4eef173ac..5105deef04f 100644 --- a/mozilla/themes/classic/messenger/messengercompose/messengercompose.css +++ b/mozilla/themes/classic/messenger/messengercompose/messengercompose.css @@ -182,11 +182,3 @@ treechildren::-moz-tree-image(remote-err) { list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.gif"); } -.identity-popup-item { - -moz-binding: url(chrome://messenger/content/messengercompose/mailComposeBindings.xml#fromMenuitem); -} - -.composemenu-text-2 { - font-style: italic; - color: GrayText; -} diff --git a/mozilla/themes/modern/messenger/messengercompose/messengercompose.css b/mozilla/themes/modern/messenger/messengercompose/messengercompose.css index 03801cbbcd6..5796914de72 100644 --- a/mozilla/themes/modern/messenger/messengercompose/messengercompose.css +++ b/mozilla/themes/modern/messenger/messengercompose/messengercompose.css @@ -200,13 +200,3 @@ treechildren::-moz-tree-image(remote-err) { list-style-image: url("chrome://messenger/skin/addressbook/icons/directory-down.gif"); } -.identity-popup-item -{ - -moz-binding: url(chrome://messenger/content/messengercompose/mailComposeBindings.xml#fromMenuitem); -} - -.composemenu-text-2 -{ - font-style: italic; - color: #8C99AB; -} diff --git a/mozilla/toolkit/themes/gnomestripe/global/menu.css b/mozilla/toolkit/themes/gnomestripe/global/menu.css index 6047d493787..8a2f3c729f8 100644 --- a/mozilla/toolkit/themes/gnomestripe/global/menu.css +++ b/mozilla/toolkit/themes/gnomestripe/global/menu.css @@ -113,6 +113,12 @@ menulist > menupopup > menu { font-weight: inherit; } +.menu-description { + font-style: italic; + color: GrayText; + -moz-margin-start: 1ex !important; +} + .menu-accel, .menu-iconic-accel { margin-top: 0px !important; diff --git a/mozilla/toolkit/themes/pinstripe/global/menu.css b/mozilla/toolkit/themes/pinstripe/global/menu.css index a2c9862ce2c..7412164706f 100644 --- a/mozilla/toolkit/themes/pinstripe/global/menu.css +++ b/mozilla/toolkit/themes/pinstripe/global/menu.css @@ -75,6 +75,12 @@ menuitem[_moz-menuactive="true"][disabled="true"] { font-weight: inherit; } +.menu-description { + font-style: italic; + color: GrayText; + -moz-margin-start: 1ex !important; +} + .menu-accel, .menu-iconic-accel { margin: 0px 2px 0px 7px !important; diff --git a/mozilla/toolkit/themes/pinstripe/global/menulist.css b/mozilla/toolkit/themes/pinstripe/global/menulist.css index 10774177d25..4f3df4a9fd1 100644 --- a/mozilla/toolkit/themes/pinstripe/global/menulist.css +++ b/mozilla/toolkit/themes/pinstripe/global/menulist.css @@ -64,6 +64,12 @@ border: 1px solid blue; margin: 1px 3px !important; } +.menulist-description { + font-style: italic; + color: GrayText; + -moz-margin-start: 1ex !important; +} + /* ..... dropmarker ..... */ .menulist-dropmarker { diff --git a/mozilla/toolkit/themes/qute/global/menu.css b/mozilla/toolkit/themes/qute/global/menu.css index 00f4e4e1f63..61baa1342f0 100644 --- a/mozilla/toolkit/themes/qute/global/menu.css +++ b/mozilla/toolkit/themes/qute/global/menu.css @@ -80,6 +80,12 @@ menuitem[_moz-menuactive="true"][disabled="true"] { font-weight: inherit; } +.menu-description { + font-style: italic; + color: GrayText; + -moz-margin-start: 1ex !important; +} + .menu-accel, .menu-iconic-accel { margin-top: 0px !important; diff --git a/mozilla/toolkit/themes/qute/global/menulist.css b/mozilla/toolkit/themes/qute/global/menulist.css index 26d7f01f398..0a01fe23486 100644 --- a/mozilla/toolkit/themes/qute/global/menulist.css +++ b/mozilla/toolkit/themes/qute/global/menulist.css @@ -79,6 +79,12 @@ menulist[open="true"]:focus > .menulist-label-box { margin: 1px 3px !important; } +.menulist-description { + font-style: italic; + color: GrayText; + -moz-margin-start: 1ex !important; +} + /* ..... dropmarker ..... */ .menulist-dropmarker { diff --git a/mozilla/toolkit/themes/winstripe/global/menu.css b/mozilla/toolkit/themes/winstripe/global/menu.css index c6d28b92552..56719cfe718 100644 --- a/mozilla/toolkit/themes/winstripe/global/menu.css +++ b/mozilla/toolkit/themes/winstripe/global/menu.css @@ -90,6 +90,12 @@ menuitem[_moz-menuactive="true"][disabled="true"] { font-weight: inherit; } +.menu-description { + font-style: italic; + color: GrayText; + -moz-margin-start: 1ex !important; +} + .menu-accel, .menu-iconic-accel { -moz-margin-end: 19px !important; diff --git a/mozilla/toolkit/themes/winstripe/global/menulist.css b/mozilla/toolkit/themes/winstripe/global/menulist.css index 3d12b6425d7..9d135bd8b14 100644 --- a/mozilla/toolkit/themes/winstripe/global/menulist.css +++ b/mozilla/toolkit/themes/winstripe/global/menulist.css @@ -82,6 +82,12 @@ menulist[open="true"]:focus > .menulist-label-box { -moz-margin-start: 1px !important; } +.menulist-description { + font-style: italic; + color: GrayText; + -moz-margin-start: 1ex !important; +} + /* ..... dropmarker ..... */ .menulist-dropmarker {