Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-09 00:11:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug 21474 add send page to the editor, r=brade a=waterson

Browse Source
This commit is contained in:
sford3%swbell.net 2000-02-25 00:55:20 +00:00
parent aa20242622
commit 0eb51d37cd
7 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/ui/composer/content/editorOverlay.xul
View File

@ -139,6 +139,7 @@
<broadcaster id="cmd_newEditor"/>
<broadcaster id="cmd_newEditorTemplate"/>
<broadcaster id="cmd_newEditorDraft"/>
<broadcaster id="cmd_sendPage"/>
<!-- Edit Menu -->
<broadcaster id="cmd_undo"/>
@ -218,7 +219,8 @@
<menuitem accesskey="&filesave.accesskey;" key="savekb" observes="Editor:Save"/>
<menuitem accesskey="&filesaveas.accesskey;" observes="Editor:SaveAs"/>
<menuseparator />
<!-- SEND PAGE, FRAME, LINK should go here, but nav must put them in global files -->
<!-- FRAME, LINK should go here, but nav must put them in global files -->
<menuitem id="menu_sendPage" observes="cmd_sendPage"/>
<menuitem accesskey="&filepreview.accesskey;" observes="Editor:Preview"/>
<menuseparator />
<menuitem accesskey="&fileprintsetup.accesskey;" observes="Editor:PrintSetup" />
@ -315,14 +317,18 @@
<menuitem value="&dcharThaiCmd.label;" accesskey="&charsetThai.accesskey;" oncommand="EditorSetDocumentCharacterSet('TIS-620');"/>
<menuseparator />
<menuitem value="&dcharArmCmd.label;" accesskey="&charsetArmenian.accesskey;" oncommand="EditorSetDocumentCharacterSet('ARMSCII-8');"/>
<!--
<menuseparator />
<menuitem value="&dcharIso6Cmd.label;" accesskey="&charsetArabic.accesskey;" oncommand="EditorSetDocumentCharacterSet('ISO-8859-6');"/>
<menuitem value="&dcharCp1256Cmd.label;" accesskey="&charsetWinArabic.accesskey;" oncommand="EditorSetDocumentCharacterSet('windows-1256');"/>
<menuseparator />
<menuitem value="&dcharIso8Cmd.label;" accesskey="&charsetHebrew.accesskey;" oncommand="EditorSetDocumentCharacterSet('ISO-8859-8');"/>
<menuitem value="&dcharCp1255Cmd.label;" accesskey="&charsetWinHebrew.accesskey;" oncommand="EditorSetDocumentCharacterSet('windows-1255');"/>
-->
</menupopup>
</menu>
<menu id="charsetMenu4" value="&dcharMenu4.label;" accesskey="&viewcharsetmenu4.accesskey;">

6
xpfe/browser/resources/content/navigator.xul
View File

@ -161,11 +161,7 @@ Contributor(s): ______________________________________. -->
accesskey="&bookmarkPageCmd.accesskey;"
oncommand="BrowserAddBookmark( window.content.location.href,
window.content.document.title )"/>
<menuitem id="context-sendpage"
value="&sendPageCmd.label;"
accesskey="&sendPageCmd.accesskey;"
oncommand="BrowserSendPage();"/>
<menuseparator/>
<menuseparator/>
<!-- Save ==================================== -->
<menuitem id="context-savepage"
value="&savePageCmd.label;"

4
xpfe/browser/resources/content/navigatorOverlay.xul
View File

@ -70,6 +70,7 @@ Contributor(s): ______________________________________. -->
<broadcaster id="cmd_newEditor"/>
<broadcaster id="cmd_newEditorTemplate"/>
<broadcaster id="cmd_newEditorDraft"/>
<broadcaster id="cmd_sendPage"/>
<broadcaster id="cmd_quit"/>
<!-- Edit Menu -->
@ -92,7 +93,6 @@ Contributor(s): ______________________________________. -->
<broadcaster id="cmd_close" oncommand="BrowserClose()"/>
<broadcaster id="Browser:SendLink" value="&sendLinkCmd.label;" oncommand="BrowserSendLink(window.content.location.href, window.content.document.title);"/>
<broadcaster id="Browser:SendPage" value="&sendPageCmd.label;" oncommand="BrowserSendPage(window.content.location.href, window.content.document.title);"/>
<broadcaster id="Browser:EditPage" value="&editPageCmd.label;" oncommand="BrowserEditPage(window.content.location.href);"/>
<broadcaster id="Browser:GoOffline" value="&offlineGoOfflineCmd.label;" disabled="true" oncommand="BrowserReload();"/>
@ -135,7 +135,7 @@ Contributor(s): ______________________________________. -->
<menuitem id="menu_close"/>
<menuitem id="context-savepage" value="&savePageCmd.label;" accesskey="&savePageCmd.accesskey;" oncommand="savePage();"/>
<menuseparator/>
<menuitem accesskey="&sendPageCmd.label;" observes="Browser:SendPage"/>
<menuitem id="menu_sendPage" observes="cmd_sendPage"/>
<menuitem accesskey="&sendLinkCmd.label;" observes="Browser:SendLink"/>
<menuitem accesskey="&editPageCmd.label;" observes="Browser:EditPage" />
<menuseparator/>

2
xpfe/browser/resources/locale/en-US/navigator.dtd
View File

@ -21,8 +21,6 @@
<!ENTITY openFileCmd.label "Open File...">
<!ENTITY openFileCmd.accesskey "o">
<!ENTITY openFileCmd.commandkey "o">
<!ENTITY sendPageCmd.label "Send Page">
<!ENTITY sendPageCmd.accesskey "s">
<!ENTITY sendLinkCmd.label "Send Link">
<!ENTITY editPageCmd.label "Edit Page">
<!ENTITY editPageCmd.accesskey "d">

10
xpfe/global/resources/content/globalOverlay.js
View File

@ -271,4 +271,12 @@ function NewEditorFromDraft()
{
dump("NOT IMPLEMENTED: Write NewEditorFromDraft()!\n")
}
function SendPage()
{
var pageUrl = window.content.location.href;
var pageTitle = window.content.document.title;
window.openDialog( "chrome://messengercompose/content/", "_blank",
"chrome,all,dialog=no",
"attachment='" + pageUrl + "',body='" + pageUrl +
"',subject='" + pageTitle + "',bodyislink=true");
}

3
xpfe/global/resources/content/globalOverlay.xul
View File

@ -17,6 +17,7 @@
<broadcaster id="cmd_newNavigator" oncommand="OpenBrowserWindow()"/>
<broadcaster id="cmd_newMessage" oncommand="goOpenNewMessage()"/>
<broadcaster id="cmd_newEditor" oncommand="NewEditorWindow();"/>
<broadcaster id="cmd_sendPage" oncommand="SendPage();"/>
<!-- NOT IMPLEMENTED, so temporarily disabled -->
<broadcaster id="cmd_newEditorTemplate" disabled="true" oncommand="NewEditorFromTemplate();"/>
<broadcaster id="cmd_newEditorDraft" disabled="true" oncommand="NewEditorFromDraft();"/>
@ -29,6 +30,8 @@
<menuitem id="menu_newNavigator" value="&newNavigatorCmd.label;" accesskey="&newNavigatorCmd.accesskey;" key="key_newNavigator" observes="cmd_newNavigator"/>
<menuitem id="menu_newMessage" value="&newMessageCmd.label;" accesskey="&newMessageCmd.accesskey;" key="key_newMessage" observes="cmd_newMessage"/>
<menuitem id="cmd_newCard" value="&newCardCmd.label;" accesskey="&newCardCmd.accesskey;" oncommand="goNewCardDialog(0)"/>
<menuitem id="menu_sendPage" value="&sendPage.label;" accesskey="&sendPage.accesskey;" key="key_sendPage" observes="cmd_sendPage"/>
<key id="key_newBlankPage" xulkey="true" shift="true" key="&newBlankPageCmd.key;" observes="cmd_newEditor"/>
<key id="key_newNavigator" xulkey="true" shift="false" key="&newNavigatorCmd.key;" observes="cmd_newNavigator"/>

2
xpfe/global/resources/locale/en-US/globalOverlay.dtd
View File

@ -23,6 +23,8 @@
<!ENTITY newMessageCmd.accesskey "m">
<!ENTITY newCardCmd.label "Address Book Card">
<!ENTITY newCardCmd.accesskey "a">
<!ENTITY sendPage.label "Send Page">
<!ENTITY sendPage.accesskey "p">
<!ENTITY pageSetupCmd.label ".Page Setup...">