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

Fix for bug 118915, by Morten@Nilsen.com, r=db48x, sr=alecf - add more descriptive title to images

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@112227 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alecf%netscape.com 2002-01-15 23:34:32 +00:00
parent e61b0b8a71
commit 26a9ef64b1
2 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
mozilla/content/html/document/src/nsImageDocument.cpp
View File

@ -20,7 +20,7 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Morten Nilsen <morten@nilsen.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
@ -468,7 +468,7 @@ nsresult nsImageDocument::UpdateTitle( void )
// - get the URL interface, get the extension, convert to upper-case
// Unless the Imagerequest or Image can tell us the type this is the best we can do.
nsIURL *pURL=nsnull;
if(NS_SUCCEEDED(mDocumentURL->QueryInterface(NS_GET_IID(nsIURL),(void **)&pURL))){
if(NS_SUCCEEDED(mDocumentURL->QueryInterface(NS_GET_IID(nsIURL),(void **)&pURL))) {
char *pExtension=nsnull;
pURL->GetFileExtension(&pExtension);
if(pExtension){
@ -491,10 +491,22 @@ nsresult nsImageDocument::UpdateTitle( void )
rv = stringService->CreateBundle(NSIMAGEDOCUMENT_PROPERTIES_URI, getter_AddRefs(bundle));
}
if (NS_SUCCEEDED(rv) && bundle) {
nsAutoString key;
nsXPIDLString valUni;
nsAutoString widthStr;
nsAutoString heightStr;
nsXPIDLString fileStr;
PRUint32 width = 0, height = 0;
nsCOMPtr<nsIURL> url = do_QueryInterface(mDocumentURL);
if (url) {
nsXPIDLCString pName;
url->GetFileName(getter_Copies(pName));
if(pName){
fileStr.Assign(NS_ConvertUTF8toUCS2(pName));
}
}
if (mImageRequest) {
PRUint32 width, height;
#ifdef USE_IMG2
imgIContainer* imgContainer;
rv = mImageRequest->GetImage(&imgContainer);
@ -509,19 +521,30 @@ nsresult nsImageDocument::UpdateTitle( void )
#else
mImageRequest->GetNaturalImageSize(&width, &height);
#endif
widthStr.AppendInt(width);
heightStr.AppendInt(height);
}
// If we got a filename, display it
if(!fileStr.IsEmpty()) {
// if we got a valid size (sometimes we do not) then display it
if (width != 0 && height != 0){
const PRUnichar *formatStrings[3] = {fileStr.get(), widthStr.get(), heightStr.get()};
rv = bundle->FormatStringFromName(NS_LITERAL_STRING("ImageTitleWithDimensionsAndFile").get(), formatStrings, 3, getter_Copies(valUni));
} else {
const PRUnichar *formatStrings[1] = {fileStr.get()};
rv = bundle->FormatStringFromName(NS_LITERAL_STRING("ImageTitleWithoutDimensions").get(), formatStrings, 1, getter_Copies(valUni));
}
} else {
// if we got a valid size (sometimes we do not) then display it
if (width != 0 && height != 0){
key.Assign(NS_LITERAL_STRING("ImageTitleWithDimensions"));
nsAutoString widthStr; widthStr.AppendInt(width);
nsAutoString heightStr; heightStr.AppendInt(height);
const PRUnichar *formatStrings[2] = {widthStr.get(), heightStr.get()};
rv = bundle->FormatStringFromName(key.get(), formatStrings, 2, getter_Copies(valUni));
rv = bundle->FormatStringFromName(NS_LITERAL_STRING("ImageTitleWithDimensions").get(), formatStrings, 2, getter_Copies(valUni));
} else {
rv = bundle->GetStringFromName(NS_LITERAL_STRING("ImageTitleWithoutDimensionsAndFile").get(), getter_Copies(valUni));
}
}
if (!valUni || !valUni[0]) {
key.Assign(NS_LITERAL_STRING("ImageTitleWithoutDimensions"));
rv = bundle->GetStringFromName(key.get(), getter_Copies(valUni));
}
if (NS_SUCCEEDED(rv) && valUni) {
// set it on the document
SetTitle(nsDependentString(valUni));

11
mozilla/layout/html/forms/src/ImageDocument.properties
View File

@ -17,7 +17,12 @@
#
# Contributor(s):
# Blake Ross <blakeross@telocity.com> (Original Author)
# Morten Nilsen <morten@nilsen.com>
#LOCALIZATION NOTE (ImageTitleWithDimensions): first %S is width, second %S is height
ImageTitleWithDimensions=Image %Sx%S pixels
ImageTitleWithoutDimensions=Image
#LOCALIZATION NOTE (ImageTitleWithDimensionsAndfile): first %S is filename, second %S is width and third %S is height
#LOCALIZATION NOTE (ImageTitleWithoutDimensions): first %S is filename
#LOCALIZATION NOTE (ImageTitleWithDimensions): first %S is width and second %S is height
ImageTitleWithDimensionsAndFile=%S (Image %Sx%S pixels)
ImageTitleWithoutDimensions=%S (Image)
ImageTitleWithDimensions=(Image %Sx%S pixels)
ImageTitleWithoutDimensionsAndFile=(Image)