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

Bug 123090, give Mozilla the capability to be registered as the default handler for XHTML documents on Windows. r=law, sr=alecf.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@114331 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
heikki%netscape.com 2002-02-12 23:38:08 +00:00
parent cd3327dcab
commit a6522c08fa
6 changed files with 63 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mozilla/xpfe/components/prefwindow/resources/content/pref-winhooks.js
View File

@ -43,6 +43,7 @@ if ( !( "winHooks" in parent ) ) {
"isHandlingBMP",
"isHandlingICO",
"isHandlingXML",
"isHandlingXHTML",
"isHandlingXUL",
"isHandlingHTTP",
"isHandlingHTTPS",

7
mozilla/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
View File

@ -99,6 +99,13 @@
</treecell>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell>
<checkbox id="isHandlingXHTML" label="&xhtml.label;" accesskey="&xhtml.accesskey;" allowevents="true"/>
</treecell>
</treerow>
</treeitem>
<treeitem>
<treerow>
<treecell>

42
mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-winhooks.dtd
View File

@ -3,26 +3,28 @@
<!ENTITY title.label "System">
<!-- These entities are used on the "File Types" section of the dialog. -->
<!ENTITY files.label "File Types">
<!ENTITY files.text "Windows should use &brandShortName; to open these file types:">
<!ENTITY html.label "HTML documents">
<!ENTITY html.accesskey "H">
<!ENTITY jpeg.label "JPEG images">
<!ENTITY jpeg.accesskey "J">
<!ENTITY gif.label "GIF images">
<!ENTITY gif.accesskey "G">
<!ENTITY png.label "PNG images">
<!ENTITY png.accesskey "P">
<!ENTITY mng.label "MNG images">
<!ENTITY mng.accesskey "M">
<!ENTITY bmp.label "BMP images">
<!ENTITY bmp.accesskey "B">
<!ENTITY ico.label "ICO images">
<!ENTITY ico.accesskey "I">
<!ENTITY xml.label "XML documents">
<!ENTITY xml.accesskey "X">
<!ENTITY xul.label "XUL documents">
<!ENTITY xul.accesskey "U">
<!ENTITY files.label "File Types">
<!ENTITY files.text "Windows should use &brandShortName; to open these file types:">
<!ENTITY html.label "HTML documents">
<!ENTITY html.accesskey "H">
<!ENTITY jpeg.label "JPEG images">
<!ENTITY jpeg.accesskey "J">
<!ENTITY gif.label "GIF images">
<!ENTITY gif.accesskey "G">
<!ENTITY png.label "PNG images">
<!ENTITY png.accesskey "P">
<!ENTITY mng.label "MNG images">
<!ENTITY mng.accesskey "M">
<!ENTITY bmp.label "BMP images">
<!ENTITY bmp.accesskey "B">
<!ENTITY ico.label "ICO images">
<!ENTITY ico.accesskey "I">
<!ENTITY xml.label "XML documents">
<!ENTITY xml.accesskey "X">
<!ENTITY xhtml.label "XHTML documents">
<!ENTITY xhtml.accesskey "T">
<!ENTITY xul.label "XUL documents">
<!ENTITY xul.accesskey "U">
<!-- These entities are used on the "Internet Shortcuts" section of the dialog. -->
<!ENTITY shortcuts.label "Internet Shortcuts">

1
mozilla/xpfe/components/winhooks/nsIWindowsHooks.idl
View File

@ -135,6 +135,7 @@ interface nsIWindowsHooksSettings : nsISupports {
attribute boolean isHandlingBMP;
attribute boolean isHandlingICO;
attribute boolean isHandlingXML;
attribute boolean isHandlingXHTML;
attribute boolean isHandlingXUL;
// Nag dialog flag. Set this so that dialog

49
mozilla/xpfe/components/winhooks/nsWindowsHooks.cpp
View File

@ -69,25 +69,27 @@ static ProtocolRegistryEntry
ftp( "ftp" ),
chrome( "chrome" ),
gopher( "gopher" );
const char *jpgExts[] = { ".jpg", ".jpeg", 0 };
const char *gifExts[] = { ".gif", 0 };
const char *pngExts[] = { ".png", 0 };
const char *mngExts[] = { ".mng", 0 };
const char *bmpExts[] = { ".bmp", 0 };
const char *icoExts[] = { ".ico", 0 };
const char *xmlExts[] = { ".xml", 0 };
const char *xulExts[] = { ".xul", 0 };
const char *htmExts[] = { ".htm", ".html", ".shtml", 0 };
const char *jpgExts[] = { ".jpg", ".jpeg", 0 };
const char *gifExts[] = { ".gif", 0 };
const char *pngExts[] = { ".png", 0 };
const char *mngExts[] = { ".mng", 0 };
const char *bmpExts[] = { ".bmp", 0 };
const char *icoExts[] = { ".ico", 0 };
const char *xmlExts[] = { ".xml", 0 };
const char *xhtmExts[] = { ".xht", ".xhtml", 0 };
const char *xulExts[] = { ".xul", 0 };
const char *htmExts[] = { ".htm", ".html", ".shtml", 0 };
static FileTypeRegistryEntry
jpg( jpgExts, "MozillaJPEG", "Mozilla Joint Photographic Experts Group Image File" ),
gif( gifExts, "MozillaGIF", "Mozilla Graphics Interchange Format Image File" ),
png( pngExts, "MozillaPNG", "Mozilla Portable Network Graphic Image File" ),
mng( mngExts, "MozillaMNG", "Mozilla Multiple-Image Network Graphic Image File" ),
bmp( bmpExts, "MozillaBMP", "Mozilla Bitmap Image File" ),
ico( icoExts, "MozillaICO", "Mozilla Icon File" ),
xml( xmlExts, "MozillaXML", "Mozilla XML File Document" ),
xul( xulExts, "MozillaXUL", "Mozilla XUL File Document" );
jpg( jpgExts, "MozillaJPEG", "Mozilla Joint Photographic Experts Group Image File" ),
gif( gifExts, "MozillaGIF", "Mozilla Graphics Interchange Format Image File" ),
png( pngExts, "MozillaPNG", "Mozilla Portable Network Graphic Image File" ),
mng( mngExts, "MozillaMNG", "Mozilla Multiple-Image Network Graphic Image File" ),
bmp( bmpExts, "MozillaBMP", "Mozilla Bitmap Image File" ),
ico( icoExts, "MozillaICO", "Mozilla Icon File" ),
xml( xmlExts, "MozillaXML", "Mozilla XML File Document" ),
xhtml( xhtmExts, "MozillaXHTML", "Mozilla XHTML File Document" ),
xul( xulExts, "MozillaXUL", "Mozilla XUL File Document" );
static EditableFileTypeRegistryEntry
mozillaMarkup( htmExts, "MozillaHTML", "Mozilla HyperText Markup Language Document" );
@ -140,6 +142,7 @@ DEFINE_GETTER_AND_SETTER( IsHandlingMNG, mHandleMNG )
DEFINE_GETTER_AND_SETTER( IsHandlingBMP, mHandleBMP )
DEFINE_GETTER_AND_SETTER( IsHandlingICO, mHandleICO )
DEFINE_GETTER_AND_SETTER( IsHandlingXML, mHandleXML )
DEFINE_GETTER_AND_SETTER( IsHandlingXHTML, mHandleXHTML )
DEFINE_GETTER_AND_SETTER( IsHandlingXUL, mHandleXUL )
DEFINE_GETTER_AND_SETTER( IsHandlingHTTP, mHandleHTTP )
DEFINE_GETTER_AND_SETTER( IsHandlingHTTPS, mHandleHTTPS )
@ -190,6 +193,7 @@ nsWindowsHooks::GetSettings( nsWindowsHooksSettings **result ) {
prefs->mHandleBMP = (void*)( BoolRegistryEntry( "isHandlingBMP" ) ) ? PR_TRUE : PR_FALSE;
prefs->mHandleICO = (void*)( BoolRegistryEntry( "isHandlingICO" ) ) ? PR_TRUE : PR_FALSE;
prefs->mHandleXML = (void*)( BoolRegistryEntry( "isHandlingXML" ) ) ? PR_TRUE : PR_FALSE;
prefs->mHandleXHTML = (void*)( BoolRegistryEntry( "isHandlingXHTML" ) ) ? PR_TRUE : PR_FALSE;
prefs->mHandleXUL = (void*)( BoolRegistryEntry( "isHandlingXUL" ) ) ? PR_TRUE : PR_FALSE;
prefs->mShowDialog = (void*)( BoolRegistryEntry( "showDialog" ) ) ? PR_TRUE : PR_FALSE;
prefs->mHaveBeenSet = (void*)( BoolRegistryEntry( "haveBeenSet" ) ) ? PR_TRUE : PR_FALSE;
@ -311,6 +315,7 @@ nsWindowsHooks::CheckSettings( nsIDOMWindowInternal *aParent,
settings->mHandleBMP = PR_TRUE;
settings->mHandleICO = PR_TRUE;
settings->mHandleXML = PR_TRUE;
settings->mHandleXHTML = PR_TRUE;
settings->mHandleXUL = PR_TRUE;
settings->mShowDialog = PR_TRUE;
@ -361,7 +366,9 @@ nsWindowsHooks::CheckSettings( nsIDOMWindowInternal *aParent,
||
misMatch( settings->mHandleXML, xml )
||
misMatch( settings->mHandleXUL, xul ) ) {
misMatch( settings->mHandleXHTML, xhtml )
||
misMatch( settings->mHandleXUL, xul )) {
// Need to prompt user.
// First:
// o We need the common dialog service to show the dialog.
@ -521,6 +528,7 @@ nsWindowsHooks::SetSettings(nsIWindowsHooksSettings *prefs) {
putPRBoolIntoRegistry( "isHandlingBMP", prefs, &nsIWindowsHooksSettings::GetIsHandlingBMP );
putPRBoolIntoRegistry( "isHandlingICO", prefs, &nsIWindowsHooksSettings::GetIsHandlingICO );
putPRBoolIntoRegistry( "isHandlingXML", prefs, &nsIWindowsHooksSettings::GetIsHandlingXML );
putPRBoolIntoRegistry( "isHandlingXHTML", prefs, &nsIWindowsHooksSettings::GetIsHandlingXHTML );
putPRBoolIntoRegistry( "isHandlingXUL", prefs, &nsIWindowsHooksSettings::GetIsHandlingXUL );
putPRBoolIntoRegistry( "showDialog", prefs, &nsIWindowsHooksSettings::GetShowDialog );
@ -583,6 +591,11 @@ nsWindowsHooks::SetRegistry() {
} else {
(void) xml.reset();
}
if ( prefs->mHandleXHTML ) {
(void) xhtml.set();
} else {
(void) xhtml.reset();
}
if ( prefs->mHandleXUL ) {
(void) xul.set();
} else {

1
mozilla/xpfe/components/winhooks/nsWindowsHooks.h
View File

@ -87,6 +87,7 @@ private:
PRBool mHandleBMP;
PRBool mHandleICO;
PRBool mHandleXML;
PRBool mHandleXHTML;
PRBool mHandleXUL;
};
struct {