From f536f04be71ffbf3344b7997d21044adacadbbf5 Mon Sep 17 00:00:00 2001 From: "rhp%netscape.com" Date: Thu, 7 Oct 1999 20:53:06 +0000 Subject: [PATCH] Changes for bug #13098 - Reviewer: jefft git-svn-id: svn://10.0.0.236/trunk@50130 18797224-902f-48f8-a5cc-f745e15eee43 --- .../resources/skin/mailheader-all.css | 3 + .../resources/skin/mailheader-micro.css | 3 + .../resources/skin/mailheader-normal.css | 3 + .../mime/emitters/src/nsMimeXULEmitter.cpp | 89 +++--------------- mozilla/mailnews/mime/resources/skin/less.gif | Bin 839 -> 872 bytes mozilla/mailnews/mime/resources/skin/more.gif | Bin 840 -> 858 bytes 6 files changed, 24 insertions(+), 74 deletions(-) diff --git a/mozilla/mailnews/mime/emitters/resources/skin/mailheader-all.css b/mozilla/mailnews/mime/emitters/resources/skin/mailheader-all.css index 8314f8f156e..7f0f3e0964c 100644 --- a/mozilla/mailnews/mime/emitters/resources/skin/mailheader-all.css +++ b/mozilla/mailnews/mime/emitters/resources/skin/mailheader-all.css @@ -11,6 +11,9 @@ box[name=header-part1] { background-color: #EFEFEF; border: 0px solid #EFEF box[name=header-part2] { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; } box[name=header-part3] { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; } +menubar[name=attachment-menubar] { background-color: #EFEFEF; border: 0px solid #EFEFEF; } +menu[name=attachment-menu] { background-color: #EFEFEF; border: 0px solid #EFEFEF; } + /************************************************** * These are all the headers that are displayed * for the normal header display. This is accomplished diff --git a/mozilla/mailnews/mime/emitters/resources/skin/mailheader-micro.css b/mozilla/mailnews/mime/emitters/resources/skin/mailheader-micro.css index 399f313b836..16618704337 100644 --- a/mozilla/mailnews/mime/emitters/resources/skin/mailheader-micro.css +++ b/mozilla/mailnews/mime/emitters/resources/skin/mailheader-micro.css @@ -11,6 +11,9 @@ box[name=header-part1] { background-color: #EFEFEF; border: 0px solid #EFEF box[name=header-part2] { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; } box[name=header-part3] { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; } +menubar[name=attachment-menubar] { background-color: #EFEFEF; border: 0px solid #EFEFEF; } +menu[name=attachment-menu] { background-color: #EFEFEF; border: 0px solid #EFEFEF; } + /************************************************** * These are all the headers that are displayed * for the normal header display. This is accomplished diff --git a/mozilla/mailnews/mime/emitters/resources/skin/mailheader-normal.css b/mozilla/mailnews/mime/emitters/resources/skin/mailheader-normal.css index 747dd6fac4a..8448b6b9d07 100644 --- a/mozilla/mailnews/mime/emitters/resources/skin/mailheader-normal.css +++ b/mozilla/mailnews/mime/emitters/resources/skin/mailheader-normal.css @@ -11,6 +11,9 @@ box[name=header-part1] { background-color: #EFEFEF; border: 0px solid #EFEF box[name=header-part2] { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; } box[name=header-part3] { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; } +menubar[name=attachment-menubar] { background-color: #EFEFEF; border: 0px solid #EFEFEF; } +menu[name=attachment-menu] { background-color: #EFEFEF; border: 0px solid #EFEFEF; } + /************************************************** * These are all the headers that are displayed * for the normal header display. This is accomplished diff --git a/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp b/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp index fe667de9732..7ac5940809e 100644 --- a/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp +++ b/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp @@ -525,22 +525,14 @@ nsMimeXULEmitter::Complete() nsresult nsMimeXULEmitter::DumpAttachmentMenu() { + nsresult rv; + if ( (!mAttachArray) || (mAttachArray->Count() <= 0) ) return NS_OK; - // RICHIE SHERRY - Hard coded string...evil...need to use string bundle when they work on - // non UI threads. - char *i18nString = nsnull; - nsresult rv; - - if (mAttachArray->Count() == 1) - i18nString = "Attachment"; - else - i18nString = "Attachments"; - char *buttonXUL = PR_smprintf( - "", - mAttachArray->Count(), i18nString); + "", + mAttachArray->Count()); if ( (!buttonXUL) || (!*buttonXUL) ) return NS_OK; @@ -554,16 +546,18 @@ nsMimeXULEmitter::DumpAttachmentMenu() // Now we can finally write out the attachment information... if (mAttachArray->Count() > 0) { - UtilityWriteCRLF(""); - UtilityWriteCRLF(""); PRInt32 i; - + UtilityWriteCRLF(""); + UtilityWriteCRLF(""); + UtilityWriteCRLF(buttonXUL); + UtilityWriteCRLF(""); + for (i=0; iCount(); i++) { attachmentInfoType *attachInfo = (attachmentInfoType *)mAttachArray->ElementAt(i); if (!attachInfo) continue; - + UtilityWrite("displayName); UtilityWrite("\" oncommand=\"OpenAttachURL('"); @@ -577,10 +571,11 @@ nsMimeXULEmitter::DumpAttachmentMenu() { UtilityWrite(attachInfo->urlSpec); } + UtilityWrite("','"); UtilityWrite(attachInfo->displayName); UtilityWrite("','"); - + nsCOMPtr messageUrl = do_QueryInterface(mURL, &rv); if (NS_SUCCEEDED(rv)) rv = messageUrl->GetURI(&urlString); @@ -592,66 +587,12 @@ nsMimeXULEmitter::DumpAttachmentMenu() } UtilityWriteCRLF("' );\" />"); } + UtilityWriteCRLF(""); UtilityWriteCRLF(""); - UtilityWriteCRLF(""); + + UtilityWriteCRLF(""); } -#if 1 - - // **** jefft - this is a temporary implementation - if (mAttachArray->Count() > 0) - { - PRInt32 i; - - UtilityWriteCRLF(""); - - UtilityWriteCRLF(""); - UtilityWriteCRLF(""); - - for (i=0; iCount(); i++) - { - attachmentInfoType *attachInfo = (attachmentInfoType - *)mAttachArray->ElementAt(i); - if (!attachInfo) - continue; - - UtilityWrite("displayName); - UtilityWrite("\" oncommand=\"OpenAttachURL('"); - escapedUrl = nsEscape(attachInfo->urlSpec, url_Path); - if (escapedUrl) - { - UtilityWrite(escapedUrl); - nsCRT::free(escapedUrl); - } - else - { - UtilityWrite(attachInfo->urlSpec); - } - UtilityWrite("','"); - UtilityWrite(attachInfo->displayName); - UtilityWrite("','"); - - nsCOMPtr messageUrl = do_QueryInterface(mURL, &rv); - if (NS_SUCCEEDED(rv)) - rv = messageUrl->GetURI(&urlString); - if (NS_SUCCEEDED(rv) && urlString) - { - UtilityWrite(urlString); - nsCRT::free(urlString); - urlString = nsnull; - } - UtilityWriteCRLF("' );\" />"); - } - UtilityWriteCRLF(""); - UtilityWriteCRLF(""); - - UtilityWriteCRLF(""); - } - -#endif - UtilityWriteCRLF(buttonXUL); - UtilityWriteCRLF(""); PR_FREEIF(buttonXUL); diff --git a/mozilla/mailnews/mime/resources/skin/less.gif b/mozilla/mailnews/mime/resources/skin/less.gif index 950eb06c4901dfa30ae075a799c14df7e349abfd..30854a2dd5daa7a4b1d633d98f6cf6dd54dc9bc5 100644 GIT binary patch literal 872 zcmZ?wbhEHbsp_N0?jOW7!#ls!U(o!rAg~<*K4AuZH#t7&D diff --git a/mozilla/mailnews/mime/resources/skin/more.gif b/mozilla/mailnews/mime/resources/skin/more.gif index cb8d2a59892dfba80fa3d1c62f49fcad638c32be..8f1f48b0a2c5ba6ac89285ed2a3847317305492e 100644 GIT binary patch literal 858 zcmZ?wbhEHb e#>dCnIW+xb1Qs+Lo50L6L+3|;>cIvE25SJ@tOVWw literal 840 zcmZ?wbhEHbWMklF_|Cx4QoOdOXYKz{Fd70QG6WQVvM@3*Ffr&b00AgZFmR|cFmgy( n7&JIEF$gKKBorhZYG>k6n{p!H;o)WhSvCcY2MPxp7#OSpJ?#oo