fix for bug#55972;customized helpmenu.rdf

This commit is contained in:
varada%netscape.com 2000-10-26 00:34:18 +00:00
parent 99ce6eef2c
commit 2a733c231a
5 changed files with 111 additions and 20 deletions

View File

@ -26,7 +26,7 @@ void CreateHelpMenu (void)
ifstream help1(file1);
ifstream help2(file2);
_mkdir (HelpPath);
CString HelpMenuFile = HelpPath +"helpmenu.xul";
CString HelpMenuFile = HelpPath +"helpMenu.rdf";
ofstream Hlp(HelpMenuFile);
CString HelpMenuName = GetGlobal("HelpMenuCommandName");
@ -46,10 +46,11 @@ void CreateHelpMenu (void)
Hlp <<jsprefname<<"\n";
}
Hlp <<"<menuitem position=\"7\" value=\""<<HelpMenuName<<"\"\n\t";
Hlp <<"oncommand=\"openTopWin('"<<HelpMenuUrl<<"')\" /> \n\t";
Hlp <<"<menuseparator position=\"9\" /> \n";
Hlp <<" <RDF:li resource=\"urn:helpmenu:customizedHelp\" />\n";
// Hlp <<"<menuitem position=\"7\" value=\""<<HelpMenuName<<"\"\n\t";
// Hlp <<"oncommand=\"openTopWin('"<<HelpMenuUrl<<"')\" /> \n\t";
// Hlp <<"<menuseparator position=\"9\" /> \n";
if(!help2) {
cout << "cannot open the file \n";
@ -59,5 +60,14 @@ void CreateHelpMenu (void)
help2.getline(jsprefname,200);
Hlp <<jsprefname<<"\n";
}
Hlp <<"<RDF:Description about=\"urn:helpmenu:customizedHelp\">\n";
Hlp <<" <NC:level>1</NC:level> \n";
Hlp <<" <NC:title>"<<HelpMenuName<<"</NC:title> \n";
Hlp <<" <NC:content>openTopWin('"<<HelpMenuUrl<<"')</NC:content>\n";
Hlp <<"</RDF:Description>\n";
Hlp <<"</RDF:RDF>\n";
Hlp.close();
}

View File

@ -1,16 +1,42 @@
<?xml version="1.0"?>
<!DOCTYPE RDF
[
<!ENTITY helpMenu.label "Help">
<!ENTITY helpContentCmd.label "Help Contents">
<!DOCTYPE window SYSTEM "chrome://global/locale/helpMenu.dtd" >
<!ENTITY webBrowseCmd.label "Web Browsing">
<!ENTITY emailCmd.label "Mail and News">
<!ENTITY imCmd.label "Instant Messenger">
<!ENTITY composeCmd.label "Composer">
<!ENTITY customCmd.label "Customization">
<overlay id="helpMenuID"
xmlns:html="http://www.w3.org/TR/REC-html40"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<!ENTITY privSecCmd.label "Privacy and Security">
<!ENTITY secCmd.label "Security Center">
<!ENTITY whatNewCmd.label "What's New in Netscape 6?">
<!ENTITY newNetCmd.label "New to the Net Tutorial">
<!ENTITY feedBackCmd.label "Feedback Center">
<!ENTITY supportChannelCmd.label "Netscape Technical Support">
<!ENTITY interUsersCmd.label "International Users">
<!ENTITY helpAtCmd.label "Netscape.com Help">
]
>
<menupopup id="helpPopup">
<menuitem id="nscpHelpCmd.label" position="1" value="&nscpHelpCmd.label;" oncommand="openTopWin('urn:clienturl:help:nscphelp')" />
<menuitem id="whatNew" position="2" value="&whatNewCmd.label;" disabled="true" oncommand="" />
<menuitem id="netHelp" position="3" value="&netHelpCmd.label;" oncommand="openTopWin('urn:clienturl:help:nethelp')" />
<menuseparator position="4" />
<menuitem id="feedBack" position="5" value="&feedBackCmd.label;" oncommand="openTopWin('urn:clienturl:help:feedback')" />
<menuitem id="intUsers" position="6" value="&intUsersCmd.label;" oncommand="openTopWin('urn:clienturl:help:intlusers')" />
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:NC="http://home.netscape.com/NC-rdf#">
<!-- root start -->
<RDF:Seq ID="root">
<RDF:li resource="urn:helpmenu:help-contents" />
<RDF:li resource="urn:helpmenu:separator" />
<RDF:li resource="urn:helpmenu:whatsnew" />
<RDF:li resource="urn:helpmenu:newnet" />
<RDF:li resource="urn:helpmenu:support" />
<RDF:li resource="urn:helpmenu:security" />
<RDF:li resource="urn:helpmenu:intl" />
<RDF:li resource="urn:helpmenu:separator2" />
<RDF:li resource="urn:helpmenu:feedback" />

View File

@ -1,4 +1,58 @@
</RDF:Seq>
<!-- root end -->
</menupopup>
<!-- Description -->
<!-- help contents -->
<RDF:Description about="urn:helpmenu:separator">
<NC:sep>y</NC:sep>
</RDF:Description>
<RDF:Description about="urn:helpmenu:separator2">
<NC:sep>y</NC:sep>
</RDF:Description>
<RDF:Description about="urn:helpmenu:help-contents">
<NC:level>1</NC:level>
<NC:title>&helpContentCmd.label;</NC:title>
<NC:content>toOpenWindowByType('help:main', 'chrome://communicator/content/help/help_main.xul')</NC:content>
</RDF:Description>
<RDF:Description about="urn:helpmenu:whatsnew">
<NC:level>1</NC:level>
<NC:title>&whatNewCmd.label;</NC:title>
<NC:content>openTopWin('urn:clienturl:help:whatsnew')</NC:content>
</RDF:Description>
<RDF:Description about="urn:helpmenu:newnet">
<NC:level>1</NC:level>
<NC:title>&newNetCmd.label;</NC:title>
<NC:content>openTopWin('urn:clienturl:help:newnethelp')</NC:content>
</RDF:Description>
<RDF:Description about="urn:helpmenu:support">
<NC:level>1</NC:level>
<NC:title>&supportChannelCmd.label;</NC:title>
<NC:content>openTopWin('urn:clienturl:help:supporthelp')</NC:content>
</RDF:Description>
<RDF:Description about="urn:helpmenu:security">
<NC:level>1</NC:level>
<NC:title>&secCmd.label;</NC:title>
<NC:content>openTopWin('urn:clienturl:help:security')</NC:content>
</RDF:Description>
<RDF:Description about="urn:helpmenu:intl">
<NC:level>1</NC:level>
<NC:title>&interUsersCmd.label;</NC:title>
<NC:content>openTopWin('urn:clienturl:help:intlusers')</NC:content>
</RDF:Description>
<RDF:Description about="urn:helpmenu:feedback">
<NC:level>1</NC:level>
<NC:title>&feedBackCmd.label;</NC:title>
<NC:content>openTopWin('urn:clienturl:help:feedback')</NC:content>
</RDF:Description>
</overlay>

View File

@ -872,8 +872,8 @@ int StartIB(CString parms, WIDGET *curWidget)
SetGlobal("HelpMenuCommandURL",httpvalue);
}
// Create the HelpMenu.xul in the beginning so that it can be called from the script.ib
CString setHlpXul = tempPath +"\\HelpMenu.xul";
SetGlobal("HlpXul",setHlpXul);
CString setHlpRDF = tempPath +"\\helpMenu.rdf";
SetGlobal("HlpRDF",setHlpRDF);
CreateHelpMenu();

View File

@ -13,6 +13,7 @@ replaceXPI(browser.xpi,bin/chrome/modern.jar,skin/modern/global/animthrob.gif,%L
replaceXPI(browser.xpi,bin/chrome/modern.jar,skin/modern/global/animthrob_single.gif,%LargeStillPath%)
replaceXPI(deflenus.xpi,no.jar,bin/defaults/profile/bookmarks.html,%CustomBookmarkFile%)
replaceXPI(deflenus.xpi,no.jar,bin/defaults/profile/panels.rdf,%SidebarPath%)
replaceXPI(langenus.xpi,bin/chrome/en-US.jar,locale/en-US/communicator/helpMenu.rdf,%HlpRDF%)
modifyDTD(langenus.xpi,bin/chrome/en-US.jar,locale/en-US/navigator/navigator.dtd,mainWindow.titlemodifier,%CompanyName%)
modifyProperties(langenus.xpi,bin/chrome/en-US.jar,locale/en-US/navigator/navigator.properties,browser.startup.homepage,%HomePageURL%)
modifyProperties(langenus.xpi,bin/chrome/en-US.jar,locale/en-US/navigator/navigator.properties,browser.throbber.url,%AnimatedLogoURL%)