diff --git a/mozilla/xpfe/bootstrap/icons/windows/gif-file.ico b/mozilla/xpfe/bootstrap/icons/windows/gif-file.ico new file mode 100644 index 00000000000..c32910f3412 Binary files /dev/null and b/mozilla/xpfe/bootstrap/icons/windows/gif-file.ico differ diff --git a/mozilla/xpfe/bootstrap/icons/windows/html-file.ico b/mozilla/xpfe/bootstrap/icons/windows/html-file.ico new file mode 100644 index 00000000000..38176da03bd Binary files /dev/null and b/mozilla/xpfe/bootstrap/icons/windows/html-file.ico differ diff --git a/mozilla/xpfe/bootstrap/icons/windows/image-file.ico b/mozilla/xpfe/bootstrap/icons/windows/image-file.ico new file mode 100644 index 00000000000..05e1b875ae3 Binary files /dev/null and b/mozilla/xpfe/bootstrap/icons/windows/image-file.ico differ diff --git a/mozilla/xpfe/bootstrap/icons/windows/jpeg-file.ico b/mozilla/xpfe/bootstrap/icons/windows/jpeg-file.ico new file mode 100644 index 00000000000..538f84d8a23 Binary files /dev/null and b/mozilla/xpfe/bootstrap/icons/windows/jpeg-file.ico differ diff --git a/mozilla/xpfe/bootstrap/icons/windows/misc-file.ico b/mozilla/xpfe/bootstrap/icons/windows/misc-file.ico new file mode 100644 index 00000000000..38176da03bd Binary files /dev/null and b/mozilla/xpfe/bootstrap/icons/windows/misc-file.ico differ diff --git a/mozilla/xpfe/bootstrap/icons/windows/readme.txt b/mozilla/xpfe/bootstrap/icons/windows/readme.txt new file mode 100755 index 00000000000..4a7b1750d81 --- /dev/null +++ b/mozilla/xpfe/bootstrap/icons/windows/readme.txt @@ -0,0 +1,80 @@ +***** BEGIN LICENSE BLOCK ***** +Version: MPL 1.1/GPL 2.0/LGPL 2.1 + +The contents of this file are subject to the Mozilla Public License Version +1.1 (the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at +http://www.mozilla.org/MPL/ + +Software distributed under the License is distributed on an "AS IS" basis, +WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +for the specific language governing rights and limitations under the +License. + +The Original Code is readme.txt by Brian Bober + +Portions created by the Initial Developer are Copyright (C) 2003 +the Initial Developer. All Rights Reserved. + +Contributor(s): + +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 +the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +in which case the provisions of the GPL or the LGPL are applicable instead +of those above. If you wish to allow use of your version of this file only +under the terms of either the GPL or the LGPL, and not to allow others to +use your version of this file under the terms of the MPL, indicate your +decision by deleting the provisions above and replace them with the notice +and other provisions required by the GPL or the LGPL. If you do not delete +the provisions above, a recipient may use your version of this file under +the terms of any one of the MPL, the GPL or the LGPL. + +***** END LICENSE BLOCK ***** + + + +The icons in this directory are Win32 program icons, file association icons, +and window icons (to appear in the upper left corner of various windows). + + + +Requirements: +Each icon should contain the follwing devices images: +48x48, 32x32, and 16x16 - 16 color +48x48, 32x32, and 16x16 - True color +48x48, 32x32, and 16x16 - True color XP (Contains alpha shadows) + +At this time, we don't think 256 color is a good idea since Windows does +a good job dithering and some systems will use 256 color icons even when +True Color exists. + +See bug http://bugzilla.mozilla.org/show_bug.cgi?id=99380 for a lot of rambling about +icons. + + + +Window icons: +Should be named using the following convention: [NAME]-window.ico where [NAME] +represents the name of the window. Example: +history-window.ico + +Blank template icon should be available as: template-window.ico + +XXXFIXME +Some icons have been given names such as downloadManager.ico and is because +there are two naming schemes for windows. This should be remedied. +Bug http://bugzilla.mozilla.org/show_bug.cgi?id=199576 +XXXFIXME + + +File association icons: +Should be named using the following convention: [NAME]-file.ico where [NAME] +represents the type of file it is. Example: +image-file.ico + +Blank template icon should be available as: template-file.ico + + +Program icon: +Currently, the only available program icon is mozilla.ico diff --git a/mozilla/xpfe/bootstrap/icons/windows/script-file.ico b/mozilla/xpfe/bootstrap/icons/windows/script-file.ico new file mode 100644 index 00000000000..ac6a3fc703f Binary files /dev/null and b/mozilla/xpfe/bootstrap/icons/windows/script-file.ico differ diff --git a/mozilla/xpfe/bootstrap/icons/windows/template-file.ico b/mozilla/xpfe/bootstrap/icons/windows/template-file.ico new file mode 100644 index 00000000000..654a3be929c Binary files /dev/null and b/mozilla/xpfe/bootstrap/icons/windows/template-file.ico differ diff --git a/mozilla/xpfe/bootstrap/icons/windows/template-window.ico b/mozilla/xpfe/bootstrap/icons/windows/template-window.ico new file mode 100755 index 00000000000..16bd7e9d1c3 Binary files /dev/null and b/mozilla/xpfe/bootstrap/icons/windows/template-window.ico differ diff --git a/mozilla/xpfe/bootstrap/icons/windows/xml-file.ico b/mozilla/xpfe/bootstrap/icons/windows/xml-file.ico new file mode 100644 index 00000000000..5e4f2fb4234 Binary files /dev/null and b/mozilla/xpfe/bootstrap/icons/windows/xml-file.ico differ diff --git a/mozilla/xpfe/bootstrap/icons/windows/xul-file.ico b/mozilla/xpfe/bootstrap/icons/windows/xul-file.ico new file mode 100644 index 00000000000..133ab629a5f Binary files /dev/null and b/mozilla/xpfe/bootstrap/icons/windows/xul-file.ico differ diff --git a/mozilla/xpfe/components/winhooks/nsWindowsHooks.cpp b/mozilla/xpfe/components/winhooks/nsWindowsHooks.cpp index 0a4e6f3074a..0eead3aa766 100644 --- a/mozilla/xpfe/components/winhooks/nsWindowsHooks.cpp +++ b/mozilla/xpfe/components/winhooks/nsWindowsHooks.cpp @@ -25,6 +25,7 @@ * Joe Elwell * Håkan Waara * Aaron Kaluszka + * Jeremy Morton * * 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 @@ -82,12 +83,12 @@ static ProtocolRegistryEntry ftp( "ftp" ), chrome( "chrome" ), gopher( "gopher" ); -const char *jpgExts[] = { ".jpg", ".jpeg", ".jfif", ".pjpeg", ".pjp", 0 }; +const char *jpgExts[] = { ".jpg", ".jpe", ".jpeg", ".jfif", ".pjpeg", ".pjp", 0 }; const char *gifExts[] = { ".gif", 0 }; const char *pngExts[] = { ".png", 0 }; const char *mngExts[] = { ".mng", 0 }; const char *xbmExts[] = { ".xbm", 0 }; -const char *bmpExts[] = { ".bmp", 0 }; +const char *bmpExts[] = { ".bmp", ".rle", ".dib", 0 }; const char *icoExts[] = { ".ico", 0 }; const char *xmlExts[] = { ".xml", 0 }; const char *xhtmExts[] = { ".xht", ".xhtml", 0 }; @@ -95,19 +96,19 @@ const char *xulExts[] = { ".xul", 0 }; const char *htmExts[] = { ".htm", ".html", ".shtml", 0 }; static FileTypeRegistryEntry - jpg( jpgExts, "MozillaJPEG", "JPEG Image", "jpegfile", "image-file.ico"), - gif( gifExts, "MozillaGIF", "GIF Image", "giffile", "image-file.ico"), + jpg( jpgExts, "MozillaJPEG", "JPEG Image", "jpegfile", "jpeg-file.ico"), + gif( gifExts, "MozillaGIF", "GIF Image", "giffile", "gif-file.ico"), png( pngExts, "MozillaPNG", "PNG Image", "pngfile", "image-file.ico"), mng( mngExts, "MozillaMNG", "MNG Image", "", "image-file.ico"), xbm( xbmExts, "MozillaXBM", "XBM Image", "xbmfile", "image-file.ico"), bmp( bmpExts, "MozillaBMP", "BMP Image", "", "image-file.ico"), ico( icoExts, "MozillaICO", "Icon", "icofile", "%1"), - xml( xmlExts, "MozillaXML", "XML Document", "xmlfile", "doc-file.ico"), - xhtml( xhtmExts, "MozillaXHTML", "XHTML Document", "", "doc-file.ico"), - xul( xulExts, "MozillaXUL", "Mozilla XUL Document", "", "doc-file.ico"); + xml( xmlExts, "MozillaXML", "XML Document", "xmlfile", "xml-file.ico"), + xhtml( xhtmExts, "MozillaXHTML", "XHTML Document", "", "misc-file.ico"), + xul( xulExts, "MozillaXUL", "Mozilla XUL Document", "", "xul-file.ico"); static EditableFileTypeRegistryEntry - mozillaMarkup( htmExts, "MozillaHTML", "HTML Document", "htmlfile", "doc-file.ico"); + mozillaMarkup( htmExts, "MozillaHTML", "HTML Document", "htmlfile", "html-file.ico"); // Implementation of the nsIWindowsHooksSettings interface. // Use standard implementation of nsISupports stuff.