From e93e12d653177e6fa6f505b38fc993101b647bd3 Mon Sep 17 00:00:00 2001 From: "scott%scott-macgregor.org" Date: Sun, 14 Dec 2003 23:52:03 +0000 Subject: [PATCH] fix ctrl-m chars. git-svn-id: svn://10.0.0.236/trunk@150300 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mail/base/jar.mn | 70 ++-- .../components/addrbook/content/abCommon.js | 10 +- .../addrbook/content/abContactsPanel.js | 40 +- .../addrbook/content/addressbook.js | 2 +- mozilla/mail/components/addrbook/jar.mn | 14 +- .../addrbook/skin/abContactsPanel.css | 70 ++-- .../components/addrbook/skin/addressbook.css | 370 +++++++++--------- .../components/addrbook/skin/cardDialog.css | 76 ++-- .../compose/content/MsgComposeCommands.js | 82 ++-- .../compose/content/messengercompose.xul | 42 +- .../compose/locale/messengercompose.dtd | 6 +- .../compose/skin/messengercompose.css | 170 ++++---- 12 files changed, 476 insertions(+), 476 deletions(-) diff --git a/mozilla/mail/base/jar.mn b/mozilla/mail/base/jar.mn index b0adc39ff43..e7c58263f48 100644 --- a/mozilla/mail/base/jar.mn +++ b/mozilla/mail/base/jar.mn @@ -25,7 +25,7 @@ messenger.jar: *+ content/messenger/aboutDialog.xul (content/aboutDialog.xul) *+ content/messenger/junkMail.xul (content/junkMail.xul) *+ content/messenger/junkMail.js (content/junkMail.js) -*+ content/messenger/msgSelectOffline.xul (content/msgSelectOffline.xul) +*+ content/messenger/msgSelectOffline.xul (content/msgSelectOffline.xul) + content/messenger-views/contents.rdf (content/messenger-views.rdf) content/messenger/about-thunderbird.png (content/about-thunderbird.png) @@ -39,10 +39,10 @@ classic.jar: + skin/classic/messenger/accountCentral.css (skin/accountCentral.css) + skin/classic/messenger/messageHeader.css (skin/messageHeader.css) + skin/classic/messenger/mailWindow1.css (skin/mailWindow1.css) -+ skin/classic/messenger/junkMail.css (skin/junkMail.css) -+ skin/classic/messenger/folderMenus.css (skin/folderMenus.css) ++ skin/classic/messenger/junkMail.css (skin/junkMail.css) ++ skin/classic/messenger/folderMenus.css (skin/folderMenus.css) + skin/classic/messenger/subscribe.css (skin/subscribe.css) -+ skin/classic/messenger/searchDialog.css (skin/searchDialog.css) ++ skin/classic/messenger/searchDialog.css (skin/searchDialog.css) + skin/classic/messenger/msgSelectOffline.css (skin/msgSelectOffline.css) + skin/classic/messenger/icons/new-mail-alert.png (skin/icons/new-mail-alert.png) skin/classic/messenger/icons/mail-toolbar.png (skin/icons/mail-toolbar.png) @@ -59,43 +59,43 @@ classic.jar: skin/classic/messenger/icons/folder-inbox-new.png (skin/icons/folder-inbox-new.png) skin/classic/messenger/icons/folder-inbox.png (skin/icons/folder-inbox.png) skin/classic/messenger/icons/folder-new-closed.png (skin/icons/folder-new-closed.png) - skin/classic/messenger/icons/folder-open.png (skin/icons/folder-open.png) + skin/classic/messenger/icons/folder-open.png (skin/icons/folder-open.png) skin/classic/messenger/icons/folder-new-open.png (skin/icons/folder-new-open.png) skin/classic/messenger/icons/folder-outbox.png (skin/icons/folder-outbox.png) - skin/classic/messenger/icons/folder-sent.png (skin/icons/folder-sent.png) - skin/classic/messenger/icons/folder-template.png (skin/icons/folder-template.png) + skin/classic/messenger/icons/folder-sent.png (skin/icons/folder-sent.png) + skin/classic/messenger/icons/folder-template.png (skin/icons/folder-template.png) skin/classic/messenger/icons/folder-trash.png (skin/icons/folder-trash.png) - skin/classic/messenger/icons/message-mail-forwarded.png (skin/icons/message-mail-forwarded.png) + skin/classic/messenger/icons/message-mail-forwarded.png (skin/icons/message-mail-forwarded.png) skin/classic/messenger/icons/message-mail-forwarded-read.png (skin/icons/message-mail-forwarded-read.png) - skin/classic/messenger/icons/message-mail-replied.png (skin/icons/message-mail-replied.png) + skin/classic/messenger/icons/message-mail-replied.png (skin/icons/message-mail-replied.png) skin/classic/messenger/icons/message-mail-replied-read.png (skin/icons/message-mail-replied-read.png) - skin/classic/messenger/icons/message-mail-replied-forw.png (skin/icons/message-mail-replied-forw.png) + skin/classic/messenger/icons/message-mail-replied-forw.png (skin/icons/message-mail-replied-forw.png) skin/classic/messenger/icons/message-mail-replied-forw-read.png (skin/icons/message-mail-replied-forw-read.png) - skin/classic/messenger/icons/message-mail.png (skin/icons/message-mail.png) - skin/classic/messenger/icons/message-mail-imapdelete.png (skin/icons/message-mail-imapdelete.png) - skin/classic/messenger/icons/message-mail-new.png (skin/icons/message-mail-new.png) - skin/classic/messenger/icons/message-mail-read.png (skin/icons/message-mail-read.png) - skin/classic/messenger/icons/message-news.png (skin/icons/message-news.png) - skin/classic/messenger/icons/message-news-forwarded.png (skin/icons/message-news-forwarded.png) - skin/classic/messenger/icons/message-news-replied.png (skin/icons/message-news-replied.png) - skin/classic/messenger/icons/message-news-replied-forw.png (skin/icons/message-news-replied-forw.png) - skin/classic/messenger/icons/attachment-col.png (skin/icons/attachment-col.png) - skin/classic/messenger/icons/attachment.png (skin/icons/attachment.png) - skin/classic/messenger/icons/junk-col.png (skin/icons/junk-col.png) - skin/classic/messenger/icons/thread-col.png (skin/icons/thread-col.png) - skin/classic/messenger/icons/flag-col.png (skin/icons/flag-col.png) - skin/classic/messenger/icons/flag.png (skin/icons/flag.png) - skin/classic/messenger/icons/server-mail.png (skin/icons/server-mail.png) - skin/classic/messenger/icons/server-mail-new.png (skin/icons/server-mail-new.png) - skin/classic/messenger/icons/server-remote-lock.png (skin/icons/server-remote-lock.png) - skin/classic/messenger/icons/server-remote-lock-new.png (skin/icons/server-remote-lock-new.png) - skin/classic/messenger/icons/server-local.png (skin/icons/server-local.png) - skin/classic/messenger/icons/server-news.png (skin/icons/server-news.png) - skin/classic/messenger/icons/server-news-lock.png (skin/icons/server-news-lock.png) - skin/classic/messenger/icons/folder-newsgroup.png (skin/icons/folder-newsgroup.png) - skin/classic/messenger/icons/message-news-new.png (skin/icons/message-news-new.png) - skin/classic/messenger/icons/readcol.png (skin/icons/readcol.png) - skin/classic/messenger/icons/unreadmail.png (skin/icons/unreadmail.png) + skin/classic/messenger/icons/message-mail.png (skin/icons/message-mail.png) + skin/classic/messenger/icons/message-mail-imapdelete.png (skin/icons/message-mail-imapdelete.png) + skin/classic/messenger/icons/message-mail-new.png (skin/icons/message-mail-new.png) + skin/classic/messenger/icons/message-mail-read.png (skin/icons/message-mail-read.png) + skin/classic/messenger/icons/message-news.png (skin/icons/message-news.png) + skin/classic/messenger/icons/message-news-forwarded.png (skin/icons/message-news-forwarded.png) + skin/classic/messenger/icons/message-news-replied.png (skin/icons/message-news-replied.png) + skin/classic/messenger/icons/message-news-replied-forw.png (skin/icons/message-news-replied-forw.png) + skin/classic/messenger/icons/attachment-col.png (skin/icons/attachment-col.png) + skin/classic/messenger/icons/attachment.png (skin/icons/attachment.png) + skin/classic/messenger/icons/junk-col.png (skin/icons/junk-col.png) + skin/classic/messenger/icons/thread-col.png (skin/icons/thread-col.png) + skin/classic/messenger/icons/flag-col.png (skin/icons/flag-col.png) + skin/classic/messenger/icons/flag.png (skin/icons/flag.png) + skin/classic/messenger/icons/server-mail.png (skin/icons/server-mail.png) + skin/classic/messenger/icons/server-mail-new.png (skin/icons/server-mail-new.png) + skin/classic/messenger/icons/server-remote-lock.png (skin/icons/server-remote-lock.png) + skin/classic/messenger/icons/server-remote-lock-new.png (skin/icons/server-remote-lock-new.png) + skin/classic/messenger/icons/server-local.png (skin/icons/server-local.png) + skin/classic/messenger/icons/server-news.png (skin/icons/server-news.png) + skin/classic/messenger/icons/server-news-lock.png (skin/icons/server-news-lock.png) + skin/classic/messenger/icons/folder-newsgroup.png (skin/icons/folder-newsgroup.png) + skin/classic/messenger/icons/message-news-new.png (skin/icons/message-news-new.png) + skin/classic/messenger/icons/readcol.png (skin/icons/readcol.png) + skin/classic/messenger/icons/unreadmail.png (skin/icons/unreadmail.png) comm.jar: *+ content/navigator/viewSource.xul (content/viewSource.xul) diff --git a/mozilla/mail/components/addrbook/content/abCommon.js b/mozilla/mail/components/addrbook/content/abCommon.js index 7ef2ce0b1db..362631e6009 100644 --- a/mozilla/mail/components/addrbook/content/abCommon.js +++ b/mozilla/mail/components/addrbook/content/abCommon.js @@ -167,11 +167,11 @@ var DirPaneController = case "button_delete": if (command == "cmd_delete") goSetMenuValue(command, "valueAddressBook"); - - selectedDir = GetSelectedDirectory(); - - if (selectedDir == kPersonalAddressbookURI || selectedDir == kCollectedAddressbookURI) - return false; + + selectedDir = GetSelectedDirectory(); + + if (selectedDir == kPersonalAddressbookURI || selectedDir == kCollectedAddressbookURI) + return false; if (selectedDir) { // If the selected directory is an ldap directory diff --git a/mozilla/mail/components/addrbook/content/abContactsPanel.js b/mozilla/mail/components/addrbook/content/abContactsPanel.js index 575eb7881e5..1c652e76d0b 100644 --- a/mozilla/mail/components/addrbook/content/abContactsPanel.js +++ b/mozilla/mail/components/addrbook/content/abContactsPanel.js @@ -39,26 +39,26 @@ function GetAbViewListener() // the ab panel doesn't care if the total changes, or if the selection changes return null; } - - -function contactsListDoubleClick(event) -{ - // we only care about button 0 (left click) events - if (event.button != 0) - return; - - var row = {}, colID = {}, childElt = {}; - var contactsTree = document.getElementById("abResultsTree"); - contactsTree.treeBoxObject.getCellAt(event.clientX, event.clientY, row, colID, childElt); - if (row.value == -1 || row.value > contactsTree.view.rowCount-1 || event.originalTarget.localName != "treechildren") - { - // double clicking on a non valid row should not open the edit filter dialog - return; - } - - // ok, go ahead and add the entry - addSelectedAddresses('addr_to'); -} + + +function contactsListDoubleClick(event) +{ + // we only care about button 0 (left click) events + if (event.button != 0) + return; + + var row = {}, colID = {}, childElt = {}; + var contactsTree = document.getElementById("abResultsTree"); + contactsTree.treeBoxObject.getCellAt(event.clientX, event.clientY, row, colID, childElt); + if (row.value == -1 || row.value > contactsTree.view.rowCount-1 || event.originalTarget.localName != "treechildren") + { + // double clicking on a non valid row should not open the edit filter dialog + return; + } + + // ok, go ahead and add the entry + addSelectedAddresses('addr_to'); +} function addSelectedAddresses(recipientType) { diff --git a/mozilla/mail/components/addrbook/content/addressbook.js b/mozilla/mail/components/addrbook/content/addressbook.js index 361f1269ede..6a74cff08f9 100644 --- a/mozilla/mail/components/addrbook/content/addressbook.js +++ b/mozilla/mail/components/addrbook/content/addressbook.js @@ -559,7 +559,7 @@ function AbDeleteDirectory() if (!promptService.confirm(window, null, confirmDeleteMessage)) return; - var resourceArray = Components.classes["@mozilla.org/supports-array;1"].createInstance(Components.interfaces.nsISupportsArray); + var resourceArray = Components.classes["@mozilla.org/supports-array;1"].createInstance(Components.interfaces.nsISupportsArray); var selectedABResource = GetDirectoryFromURI(selectedABURI).QueryInterface(Components.interfaces.nsIRDFResource); resourceArray.AppendElement(selectedABResource); diff --git a/mozilla/mail/components/addrbook/jar.mn b/mozilla/mail/components/addrbook/jar.mn index a07d7f5caa5..0d2de3d84d8 100644 --- a/mozilla/mail/components/addrbook/jar.mn +++ b/mozilla/mail/components/addrbook/jar.mn @@ -1,14 +1,14 @@ classic.jar: + skin/classic/messenger/addressbook/addressbook.css (skin/addressbook.css) + skin/classic/messenger/addressbook/abContactsPanel.css (skin/abContactsPanel.css) -+ skin/classic/messenger/addressbook/cardDialog.css (skin/cardDialog.css) ++ skin/classic/messenger/addressbook/cardDialog.css (skin/cardDialog.css) + skin/classic/messenger/addressbook/abResultsPane.css (skin/abResultsPane.css) - skin/classic/messenger/addressbook/icons/abcard.png (skin/icons/abcard.png) - skin/classic/messenger/addressbook/icons/addrbook.png (skin/icons/addrbook.png) - skin/classic/messenger/addressbook/icons/ablist.png (skin/icons/ablist.png) - skin/classic/messenger/addressbook/icons/addressbook-toolbar.png (skin/icons/addressbook-toolbar.png) - skin/classic/messenger/addressbook/icons/addressbook-toolbar-small.png (skin/icons/addressbook-toolbar-small.png) - + skin/classic/messenger/addressbook/icons/abcard.png (skin/icons/abcard.png) + skin/classic/messenger/addressbook/icons/addrbook.png (skin/icons/addrbook.png) + skin/classic/messenger/addressbook/icons/ablist.png (skin/icons/ablist.png) + skin/classic/messenger/addressbook/icons/addressbook-toolbar.png (skin/icons/addressbook-toolbar.png) + skin/classic/messenger/addressbook/icons/addressbook-toolbar-small.png (skin/icons/addressbook-toolbar-small.png) + messenger.jar: *+ content/messenger/addressbook/abCardViewOverlay.js (content/abCardViewOverlay.js) *+ content/messenger/addressbook/addressbook.js (content/addressbook.js) diff --git a/mozilla/mail/components/addrbook/skin/abContactsPanel.css b/mozilla/mail/components/addrbook/skin/abContactsPanel.css index f2f3d320dcc..07ac75a92eb 100644 --- a/mozilla/mail/components/addrbook/skin/abContactsPanel.css +++ b/mozilla/mail/components/addrbook/skin/abContactsPanel.css @@ -51,39 +51,39 @@ background-color: transparent; } -treechildren::-moz-tree-image(GeneratedName) { - margin-right: 2px; - list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png"); -} - -treechildren::-moz-tree-image(GeneratedName, MailList) { - margin-right: 2px; - list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png"); -} - -/* ::::: directory pane icons ::::: */ - -treechildren::-moz-tree-image(DirCol) { - margin-right: 2px; - list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png"); -} - -treechildren::-moz-tree-image(DirCol, IsMailList-true) { - list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png"); -} - -treechildren::-moz-tree-image(DirCol, IsRemote-true) { - list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.gif"); -} - -treechildren::-moz-tree-image(DirCol, IsRemote-true, IsSecure-true) { - list-style-image: url("chrome://messenger/skin/addressbook/icons/secure-remote-addrbook.gif"); -} - -#dirTree [sortDirection="ascending"] { - list-style-image: none; -} - -#dirTree [sortDirection="descending"] { - list-style-image: none; +treechildren::-moz-tree-image(GeneratedName) { + margin-right: 2px; + list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png"); +} + +treechildren::-moz-tree-image(GeneratedName, MailList) { + margin-right: 2px; + list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png"); +} + +/* ::::: directory pane icons ::::: */ + +treechildren::-moz-tree-image(DirCol) { + margin-right: 2px; + list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.png"); +} + +treechildren::-moz-tree-image(DirCol, IsMailList-true) { + list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png"); +} + +treechildren::-moz-tree-image(DirCol, IsRemote-true) { + list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.gif"); +} + +treechildren::-moz-tree-image(DirCol, IsRemote-true, IsSecure-true) { + list-style-image: url("chrome://messenger/skin/addressbook/icons/secure-remote-addrbook.gif"); +} + +#dirTree [sortDirection="ascending"] { + list-style-image: none; +} + +#dirTree [sortDirection="descending"] { + list-style-image: none; } \ No newline at end of file diff --git a/mozilla/mail/components/addrbook/skin/addressbook.css b/mozilla/mail/components/addrbook/skin/addressbook.css index 69c89ba3da7..d7b89349660 100644 --- a/mozilla/mail/components/addrbook/skin/addressbook.css +++ b/mozilla/mail/components/addrbook/skin/addressbook.css @@ -38,75 +38,75 @@ /* ::::: primary toolbar buttons ::::: */ -.toolbarbutton-1 { - -moz-box-orient: vertical; - min-width: 0px; - list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png"); -} - -.toolbarbutton-1[type="menu-button"] -{ - min-width: 57px; -} - -toolbar[mode="icons"] .toolbarbutton-text { - display: none; -} - -toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker, -toolbar[mode="text"] .toolbarbutton-icon { - display: none; -} - -toolbar[mode="text"] .toolbarbutton-text { - padding: 0 !important; - margin: 3px 5px !important; -} - -#button-newcard { - list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png"); - -moz-image-region: rect(0px 30px 30px 0px); -} - -#button-newcard:hover { - -moz-image-region: rect(30px 30px 60px 0px); -} - -#button-newcard:hover:active { - -moz-image-region: rect(30px 30px 60px 0px); -} - -#button-newcard[disabled="true"] { - -moz-image-region: rect(60px 30px 90px 0px) !important; -} - -#button-newlist { - list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png"); - -moz-image-region: rect(0px 60px 30px 30px); -} - -#button-newlist:hover { - -moz-image-region: rect(30px 60px 60px 30px); -} - -#button-newlist[disabled="true"] { - -moz-image-region: rect(60px 60px 90px 30px) !important; -} - -#button-editcard { - list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png"); - -moz-image-region: rect(0px 90px 30px 60px); -} - -#button-editcard:hover { - -moz-image-region: rect(30px 90px 60px 60px); -} - -#button-editcard[disabled="true"] { - -moz-image-region: rect(60px 90px 90px 60px) !important; -} +.toolbarbutton-1 { + -moz-box-orient: vertical; + min-width: 0px; + list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png"); +} -#button-newmessage { +.toolbarbutton-1[type="menu-button"] +{ + min-width: 57px; +} + +toolbar[mode="icons"] .toolbarbutton-text { + display: none; +} + +toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker, +toolbar[mode="text"] .toolbarbutton-icon { + display: none; +} + +toolbar[mode="text"] .toolbarbutton-text { + padding: 0 !important; + margin: 3px 5px !important; +} + +#button-newcard { + list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png"); + -moz-image-region: rect(0px 30px 30px 0px); +} + +#button-newcard:hover { + -moz-image-region: rect(30px 30px 60px 0px); +} + +#button-newcard:hover:active { + -moz-image-region: rect(30px 30px 60px 0px); +} + +#button-newcard[disabled="true"] { + -moz-image-region: rect(60px 30px 90px 0px) !important; +} + +#button-newlist { + list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png"); + -moz-image-region: rect(0px 60px 30px 30px); +} + +#button-newlist:hover { + -moz-image-region: rect(30px 60px 60px 30px); +} + +#button-newlist[disabled="true"] { + -moz-image-region: rect(60px 60px 90px 30px) !important; +} + +#button-editcard { + list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png"); + -moz-image-region: rect(0px 90px 30px 60px); +} + +#button-editcard:hover { + -moz-image-region: rect(30px 90px 60px 60px); +} + +#button-editcard[disabled="true"] { + -moz-image-region: rect(60px 90px 90px 60px) !important; +} + +#button-newmessage { list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png"); -moz-image-region: rect(0px 120px 30px 90px); } @@ -119,8 +119,8 @@ toolbar[mode="text"] .toolbarbutton-text { -moz-image-region: rect(60px 120px 90px 90px) !important; } -#button-newim { - list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png"); +#button-newim { + list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png"); -moz-image-region: rect(0px 150px 30px 120px); } @@ -132,7 +132,7 @@ toolbar[mode="text"] .toolbarbutton-text { -moz-image-region: rect(60px 150px 90px 120px) !important; } -#button-abdelete { +#button-abdelete { list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png"); -moz-image-region: rect(0px 180px 30px 150px); } @@ -144,120 +144,120 @@ toolbar[mode="text"] .toolbarbutton-text { #button-abdelete[disabled] { -moz-image-region: rect(60px 180px 90px 150px) !important; } - -/* ::::: small primary toolbar buttons ::::: */ - -toolbar[iconsize="small"] .toolbarbutton-1 { - list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png"); -} - -toolbar[iconsize="small"] #button-newcard { - list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png"); - -moz-image-region: rect(0px 20px 20px 0px); -} - -toolbar[iconsize="small"] #button-newcard:hover { - -moz-image-region: rect(20px 20px 40px 0px); -} - -toolbar[iconsize="small"] #button-newcard[disabled] { - -moz-image-region: rect(40px 20px 60px 0px) !important; -} - -toolbar[iconsize="small"] #button-newlist { - list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png"); - -moz-image-region: rect(0px 40px 20px 20px); -} - -toolbar[iconsize="small"] #button-newlist:hover { - -moz-image-region: rect(20px 40px 40px 20px); -} - -toolbar[iconsize="small"] #button-newlist[disabled] { - -moz-image-region: rect(40px 40px 60px 20px) !important; -} - -toolbar[iconsize="small"] #button-editcard { - list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png"); - -moz-image-region: rect(0px 60px 20px 40px); -} - -toolbar[iconsize="small"] #button-editcard:hover { - -moz-image-region: rect(20px 60px 40px 40px); -} - -toolbar[iconsize="small"] #button-editcard[disabled="true"] { - -moz-image-region: rect(40px 60px 60px 40px) !important; -} - -toolbar[iconsize="small"] #button-newmessage { - list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png"); - -moz-image-region: rect(0px 80px 20px 60px); -} - -toolbar[iconsize="small"] #button-newmessage:hover { - -moz-image-region: rect(20px 80px 40px 60px); -} - -toolbar[iconsize="small"] #button-newmessage[disabled] { - -moz-image-region: rect(40px 80px 60px 60px) !important; -} - -toolbar[iconsize="small"] #button-newim { - list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png"); - -moz-image-region: rect(0px 100px 20px 80px); -} - -toolbar[iconsize="small"] #button-newim:hover { - -moz-image-region: rect(20px 100px 40px 80px); -} - -toolbar[iconsize="small"] #button-newim[disabled] { - -moz-image-region: rect(40px 100px 60px 80px) !important; -} - -toolbar[iconsize="small"] #button-abdelete { - list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png"); - -moz-image-region: rect(0px 120px 20px 100px); -} - -toolbar[iconsize="small"] #button-abdelete:hover { - -moz-image-region: rect(20px 120px 40px 100px); -} - -toolbar[iconsize="small"] #button-abdelete[disabled] { - -moz-image-region: rect(40px 120px 60px 100px) !important; -} - -toolbar[iconsize="small"] .toolbarbutton-1 { - padding: 2px; -} - -toolbar[iconsize="small"] .toolbarbutton-1:hover:active, -toolbar[iconsize="small"] .toolbarbutton-1[open="true"] { - padding: 3px 1px 1px 3px; -} - -toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"], -toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"]:hover, -toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"]:hover:active, -toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"][open="true"] { - padding: 2px; -} - -toolbar[iconsize="small"] .toolbarbutton-1[checked="true"] { - padding: 3px 1px 1px 3px !important; -} - -toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"], -toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"]:hover, -toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"]:hover:active, -toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][open="true"], -toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][disabled="true"], -toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][disabled="true"]:hover, -toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][disabled="true"]:hover:active { - padding: 0; -} + +/* ::::: small primary toolbar buttons ::::: */ + +toolbar[iconsize="small"] .toolbarbutton-1 { + list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png"); +} + +toolbar[iconsize="small"] #button-newcard { + list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png"); + -moz-image-region: rect(0px 20px 20px 0px); +} + +toolbar[iconsize="small"] #button-newcard:hover { + -moz-image-region: rect(20px 20px 40px 0px); +} + +toolbar[iconsize="small"] #button-newcard[disabled] { + -moz-image-region: rect(40px 20px 60px 0px) !important; +} + +toolbar[iconsize="small"] #button-newlist { + list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png"); + -moz-image-region: rect(0px 40px 20px 20px); +} + +toolbar[iconsize="small"] #button-newlist:hover { + -moz-image-region: rect(20px 40px 40px 20px); +} + +toolbar[iconsize="small"] #button-newlist[disabled] { + -moz-image-region: rect(40px 40px 60px 20px) !important; +} + +toolbar[iconsize="small"] #button-editcard { + list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png"); + -moz-image-region: rect(0px 60px 20px 40px); +} + +toolbar[iconsize="small"] #button-editcard:hover { + -moz-image-region: rect(20px 60px 40px 40px); +} + +toolbar[iconsize="small"] #button-editcard[disabled="true"] { + -moz-image-region: rect(40px 60px 60px 40px) !important; +} + +toolbar[iconsize="small"] #button-newmessage { + list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png"); + -moz-image-region: rect(0px 80px 20px 60px); +} + +toolbar[iconsize="small"] #button-newmessage:hover { + -moz-image-region: rect(20px 80px 40px 60px); +} + +toolbar[iconsize="small"] #button-newmessage[disabled] { + -moz-image-region: rect(40px 80px 60px 60px) !important; +} + +toolbar[iconsize="small"] #button-newim { + list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png"); + -moz-image-region: rect(0px 100px 20px 80px); +} + +toolbar[iconsize="small"] #button-newim:hover { + -moz-image-region: rect(20px 100px 40px 80px); +} + +toolbar[iconsize="small"] #button-newim[disabled] { + -moz-image-region: rect(40px 100px 60px 80px) !important; +} + +toolbar[iconsize="small"] #button-abdelete { + list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar-small.png"); + -moz-image-region: rect(0px 120px 20px 100px); +} + +toolbar[iconsize="small"] #button-abdelete:hover { + -moz-image-region: rect(20px 120px 40px 100px); +} + +toolbar[iconsize="small"] #button-abdelete[disabled] { + -moz-image-region: rect(40px 120px 60px 100px) !important; +} + +toolbar[iconsize="small"] .toolbarbutton-1 { + padding: 2px; +} + +toolbar[iconsize="small"] .toolbarbutton-1:hover:active, +toolbar[iconsize="small"] .toolbarbutton-1[open="true"] { + padding: 3px 1px 1px 3px; +} + +toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"], +toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"]:hover, +toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"]:hover:active, +toolbar[iconsize="small"] .toolbarbutton-1[disabled="true"][open="true"] { + padding: 2px; +} + +toolbar[iconsize="small"] .toolbarbutton-1[checked="true"] { + padding: 3px 1px 1px 3px !important; +} + +toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"], +toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"]:hover, +toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"]:hover:active, +toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][open="true"], +toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][disabled="true"], +toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][disabled="true"]:hover, +toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][disabled="true"]:hover:active { + padding: 0; +} /* ::::: directory pane icons ::::: */ diff --git a/mozilla/mail/components/addrbook/skin/cardDialog.css b/mozilla/mail/components/addrbook/skin/cardDialog.css index 1739a3fbe63..5deda7ae95c 100644 --- a/mozilla/mail/components/addrbook/skin/cardDialog.css +++ b/mozilla/mail/components/addrbook/skin/cardDialog.css @@ -48,44 +48,44 @@ .stateZipSpacer { width: 3em; } - -/* ::::: List dialogs ::::: */ - -#addressingWidget { - -moz-user-focus: none; - width: 0; -} - -#typecol-addressingWidget { - min-width: 9em; - border-right: 1px solid #CACAFF; -} - -.addressingWidgetItem, -.dummy-row { - border: none !important; - background-color: inherit !important; - color: inherit !important; -} - -.addressingWidgetCell { - border-bottom: 1px solid #CACAFF; - padding: 0px; -} - -.addressingWidgetCell:first-child { - border-top: none; -} - -.dummy-row-cell:first-child { - border-top: none; - border-bottom: 1px solid #CACAFF; -} - -.person-icon { - margin: 0 3px; - list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png"); -} + +/* ::::: List dialogs ::::: */ + +#addressingWidget { + -moz-user-focus: none; + width: 0; +} + +#typecol-addressingWidget { + min-width: 9em; + border-right: 1px solid #CACAFF; +} + +.addressingWidgetItem, +.dummy-row { + border: none !important; + background-color: inherit !important; + color: inherit !important; +} + +.addressingWidgetCell { + border-bottom: 1px solid #CACAFF; + padding: 0px; +} + +.addressingWidgetCell:first-child { + border-top: none; +} + +.dummy-row-cell:first-child { + border-top: none; + border-bottom: 1px solid #CACAFF; +} + +.person-icon { + margin: 0 3px; + list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png"); +} /* XXX: would be nice to find a common place for this XXX ::::captions in tabs ::::: */ diff --git a/mozilla/mail/components/compose/content/MsgComposeCommands.js b/mozilla/mail/components/compose/content/MsgComposeCommands.js index 7b4cf7a3b94..3cc53e86a1f 100644 --- a/mozilla/mail/components/compose/content/MsgComposeCommands.js +++ b/mozilla/mail/components/compose/content/MsgComposeCommands.js @@ -1316,9 +1316,9 @@ function ComposeStartup(recycled, aParams) // Force color picker on toolbar to show document colors onFontColorChange(); onBackgroundColorChange(); - } - - // reset the priorty field for recycled windows + } + + // reset the priorty field for recycled windows updatePriorityToolbarButton('normal'); } else @@ -1411,18 +1411,18 @@ function ComposeLoad() } AddMessageComposeOfflineObserver(); - AddDirectoryServerObserver(true); - - try { - // XXX: We used to set commentColumn on the initial auto complete column after the document has loaded - // inside of setupAutocomplete. But this happens too late for the first widget and it was never showing - // the comment field. Try to set it before the document finishes loading: - if (sPrefs.getIntPref("mail.autoComplete.commentColumn")) - document.getElementById('addressCol2#1').showCommentColumn = true; - } - catch (ex) { - // do nothing... - } + AddDirectoryServerObserver(true); + + try { + // XXX: We used to set commentColumn on the initial auto complete column after the document has loaded + // inside of setupAutocomplete. But this happens too late for the first widget and it was never showing + // the comment field. Try to set it before the document finishes loading: + if (sPrefs.getIntPref("mail.autoComplete.commentColumn")) + document.getElementById('addressCol2#1').showCommentColumn = true; + } + catch (ex) { + // do nothing... + } if (gLogComposePerformance) @@ -1845,38 +1845,38 @@ function MessageFcc(menuItem) } } } - -function updatePriorityMenu() -{ - if (gMsgCompose) - { - var msgCompFields = gMsgCompose.compFields; - if (msgCompFields && msgCompFields.priority) - { - var priorityMenu = document.getElementById('priorityMenu' ); - priorityMenu.getElementsByAttribute( "checked", 'true' )[0].removeAttribute('checked'); - priorityMenu.getElementsByAttribute( "value", msgCompFields.priority )[0].setAttribute('checked', 'true'); - } - - } -} - -function updatePriorityToolbarButton(newPriorityValue) -{ - var prioritymenu = document.getElementById('priorityMenu-button'); - if (prioritymenu) - prioritymenu.value = newPriorityValue; -} + +function updatePriorityMenu() +{ + if (gMsgCompose) + { + var msgCompFields = gMsgCompose.compFields; + if (msgCompFields && msgCompFields.priority) + { + var priorityMenu = document.getElementById('priorityMenu' ); + priorityMenu.getElementsByAttribute( "checked", 'true' )[0].removeAttribute('checked'); + priorityMenu.getElementsByAttribute( "value", msgCompFields.priority )[0].setAttribute('checked', 'true'); + } + + } +} + +function updatePriorityToolbarButton(newPriorityValue) +{ + var prioritymenu = document.getElementById('priorityMenu-button'); + if (prioritymenu) + prioritymenu.value = newPriorityValue; +} function PriorityMenuSelect(target) { if (gMsgCompose) { var msgCompFields = gMsgCompose.compFields; - if (msgCompFields) - msgCompFields.priority = target.getAttribute('value'); - - // keep priority toolbar button in synch with possible changes via the menu item + if (msgCompFields) + msgCompFields.priority = target.getAttribute('value'); + + // keep priority toolbar button in synch with possible changes via the menu item updatePriorityToolbarButton(target.getAttribute('value')); } } diff --git a/mozilla/mail/components/compose/content/messengercompose.xul b/mozilla/mail/components/compose/content/messengercompose.xul index 38c557f8230..40e38cb5629 100644 --- a/mozilla/mail/components/compose/content/messengercompose.xul +++ b/mozilla/mail/components/compose/content/messengercompose.xul @@ -381,11 +381,11 @@ - - - + + + - + @@ -517,9 +517,9 @@ @@ -562,25 +562,25 @@ label="&pasteCmd.label;" command="cmd_paste" tooltiptext="&pasteButton.tooltip;"/> - - - + + + - + diff --git a/mozilla/mail/components/compose/locale/messengercompose.dtd b/mozilla/mail/components/compose/locale/messengercompose.dtd index dcebbe675ee..4ec5fcb77e8 100644 --- a/mozilla/mail/components/compose/locale/messengercompose.dtd +++ b/mozilla/mail/components/compose/locale/messengercompose.dtd @@ -137,7 +137,7 @@ - + @@ -201,8 +201,8 @@ - - + + diff --git a/mozilla/mail/components/compose/skin/messengercompose.css b/mozilla/mail/components/compose/skin/messengercompose.css index 6c75bdcc564..d62634db4e0 100644 --- a/mozilla/mail/components/compose/skin/messengercompose.css +++ b/mozilla/mail/components/compose/skin/messengercompose.css @@ -45,11 +45,11 @@ -moz-box-orient: vertical; min-width: 0px; list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png"); -} - -.toolbarbutton-1[type="menu-button"] -{ - min-width: 57px; +} + +.toolbarbutton-1[type="menu-button"] +{ + min-width: 57px; } toolbar[mode="icons"] .toolbarbutton-text { @@ -152,44 +152,44 @@ toolbar[mode="text"] .toolbarbutton-text { -moz-image-region: rect(60px 210px 90px 180px) !important; } -#cut-button { - list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png"); - -moz-image-region: rect(0px 240px 30px 210px); -} - -#cut-button:hover { - -moz-image-region: rect(30px 240px 60px 210px); -} - -#cut-button[disabled="true"] { - -moz-image-region: rect(60px 240px 90px 210px) !important; -} - -#copy-button { - list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png"); - -moz-image-region: rect(0px 270px 30px 240px); -} - -#copy-button:hover { - -moz-image-region: rect(30px 270px 60px 240px); -} - -#copy-button[disabled="true"] { - -moz-image-region: rect(60px 270px 90px 240px) !important; -} - -#paste-button { - list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png"); - -moz-image-region: rect(0px 300px 30px 270px); -} - -#paste-button:hover { - -moz-image-region: rect(30px 300px 60px 270px); -} - -#paste-button[disabled="true"] { - -moz-image-region: rect(60px 300px 90px 270px) !important; -} +#cut-button { + list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png"); + -moz-image-region: rect(0px 240px 30px 210px); +} + +#cut-button:hover { + -moz-image-region: rect(30px 240px 60px 210px); +} + +#cut-button[disabled="true"] { + -moz-image-region: rect(60px 240px 90px 210px) !important; +} + +#copy-button { + list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png"); + -moz-image-region: rect(0px 270px 30px 240px); +} + +#copy-button:hover { + -moz-image-region: rect(30px 270px 60px 240px); +} + +#copy-button[disabled="true"] { + -moz-image-region: rect(60px 270px 90px 240px) !important; +} + +#paste-button { + list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png"); + -moz-image-region: rect(0px 300px 30px 270px); +} + +#paste-button:hover { + -moz-image-region: rect(30px 300px 60px 270px); +} + +#paste-button[disabled="true"] { + -moz-image-region: rect(60px 300px 90px 270px) !important; +} /* ::::: small primary toolbar buttons ::::: */ @@ -275,44 +275,44 @@ toolbar[iconsize="small"] #quoteButton:hover { toolbar[iconsize="small"] #quoteButton[disabled="true"] { -moz-image-region: rect(40px 140px 60px 120px) !important; } - -toolbar[iconsize="small"] #cut-button { - list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png"); - -moz-image-region: rect(0px 160px 20px 140px); -} - -toolbar[iconsize="small"] #cut-button:hover { - -moz-image-region: rect(20px 160px 40px 140px); -} - -toolbar[iconsize="small"] #cut-button[disabled="true"] { - -moz-image-region: rect(40px 160px 60px 140px) !important; -} - -toolbar[iconsize="small"] #copy-button { - list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png"); - -moz-image-region: rect(0px 180px 20px 160px); -} - -toolbar[iconsize="small"] #copy-button:hover { - -moz-image-region: rect(20px 180px 40px 160px); -} - -toolbar[iconsize="small"] #copy-button[disabled="true"] { - -moz-image-region: rect(40px 180px 60px 160px) !important; -} -toolbar[iconsize="small"] #paste-button { - list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png"); - -moz-image-region: rect(0px 200px 20px 180px); -} - -toolbar[iconsize="small"] #paste-button:hover { - -moz-image-region: rect(20px 200px 40px 180px); -} - -toolbar[iconsize="small"] #paste-button[disabled="true"] { - -moz-image-region: rect(40px 200px 60px 180px) !important; -} + +toolbar[iconsize="small"] #cut-button { + list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png"); + -moz-image-region: rect(0px 160px 20px 140px); +} + +toolbar[iconsize="small"] #cut-button:hover { + -moz-image-region: rect(20px 160px 40px 140px); +} + +toolbar[iconsize="small"] #cut-button[disabled="true"] { + -moz-image-region: rect(40px 160px 60px 140px) !important; +} + +toolbar[iconsize="small"] #copy-button { + list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png"); + -moz-image-region: rect(0px 180px 20px 160px); +} + +toolbar[iconsize="small"] #copy-button:hover { + -moz-image-region: rect(20px 180px 40px 160px); +} + +toolbar[iconsize="small"] #copy-button[disabled="true"] { + -moz-image-region: rect(40px 180px 60px 160px) !important; +} +toolbar[iconsize="small"] #paste-button { + list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar-small.png"); + -moz-image-region: rect(0px 200px 20px 180px); +} + +toolbar[iconsize="small"] #paste-button:hover { + -moz-image-region: rect(20px 200px 40px 180px); +} + +toolbar[iconsize="small"] #paste-button[disabled="true"] { + -moz-image-region: rect(40px 200px 60px 180px) !important; +} toolbar[iconsize="small"] .toolbarbutton-1 { padding: 2px; @@ -416,10 +416,10 @@ treechildren::-moz-tree-image(remote-err) { } /* ::::: addressing widget ::::: */ - -.autocomplete-treebody::-moz-tree-cell-text(comment) { - color: #555566; -} + +.autocomplete-treebody::-moz-tree-cell-text(comment) { + color: #555566; +} #addressingWidget { -moz-user-focus: none;