Remove 'PastAs' menu (feature not implemented), b= 41547, r=mjudge, sr=kin, a=asa; Remove separate 'Replace' menuitem and command, b=80807, r=anthonyd, sr=sfraser, a=asa-drivers

This commit is contained in:
cmanske%netscape.com 2001-06-08 05:01:59 +00:00
parent be81baabc6
commit ea97cc4638
3 changed files with 10 additions and 25 deletions

View File

@ -95,7 +95,6 @@ function SetupTextEditorCommands()
controller.registerCommand("cmd_find", nsFindCommand);
controller.registerCommand("cmd_findNext", nsFindNextCommand);
controller.registerCommand("cmd_replace", nsReplaceCommand);
controller.registerCommand("cmd_spelling", nsSpellingCommand);
controller.registerCommand("cmd_insertChars", nsInsertCharsCommand);
}
@ -604,20 +603,6 @@ var nsFindNextCommand =
}
};
//-----------------------------------------------------------------------------------
var nsReplaceCommand =
{
isCommandEnabled: function(aCommand, dummy)
{
return (window.editorShell && !IsInHTMLSourceMode());
},
doCommand: function(aCommand)
{
window.editorShell.Replace();
}
};
//-----------------------------------------------------------------------------------
var nsSpellingCommand =
{
@ -686,10 +671,9 @@ var nsHLineCommand =
hLine.setAttribute("align", "left");
} else if (align == 2) {
hLine.setAttribute("align", "right");
} else {
// Default is center
hLine.setAttribute("align", "center");
}
//Note: Default is center (don't write attribute)
var width = gPrefs.GetIntPref("editor.hrule.width");
var percent = gPrefs.GetBoolPref("editor.hrule.width_percent");

View File

@ -155,7 +155,6 @@
<command id="cmd_find" oncommand="goDoCommand('cmd_find')"/>
<command id="cmd_findNext" oncommand="goDoCommand('cmd_findNext')" label="&findAgainCmd.label;"/>
<command id="cmd_replace" oncommand="goDoCommand('cmd_replace')" />
<command id="cmd_spelling" oncommand="goDoCommand('cmd_spelling')"/>
<command id="cmd_pasteQuote" oncommand="goDoCommand('cmd_pasteQuote')" label="&pasteAsQuotationCmd.label;"/>
@ -318,6 +317,8 @@
<menuitem id="menu_cut"/>
<menuitem id="menu_copy"/>
<menuitem id="menu_paste"/>
<!-- PasteAs not implemented yet
<menu id="menu_pasteAs" label="&pasteAs.label;" accesskey="&pasteAs.accesskey;">
<menupopup oncreate="InitPasteAsMenu();">
<menuitem id="menu_pasteText" label="&pasteTextCmd.label;" accesskey="&pasteText.accesskey;"/>
@ -325,17 +326,16 @@
<menuseparator/>
<menuitem id="menu_pasteRows" label="&pasteRowsCmd.label;" accesskey="&pasteRows.accesskey;"/>
<menuitem id="menu_pasteColumns" label="&pasteColumnsCmd.label;" accesskey="&pasteColumns.accesskey;"/>
<!-- label set in InitPasteAsMenu depending on context -->
<menuitem id="menu_pasteTable" accesskey="&pasteTable.accesskey;"/>
</menupopup>
</menu>
-->
<menuitem id="menu_delete"/>
<menuseparator id="edEditMenuSep2" />
<menuitem id="menu_selectAll"/>
<menuseparator id="sep_find" class="hide-in-IM"/>
<menuitem id="menu_find" accesskey="&editfind.accesskey;" key="findkb" observes="cmd_find" label="&findCmd.label;"/>
<menuitem id="menu_findnext" accesskey="&editfindnext.accesskey;" key="findnextkb" observes="cmd_findNext"/>
<menuitem id="menu_replace" observes="cmd_replace" label="&replaceCmd.label;"/>
<menuseparator id="sep_checkspelling" class="hide-in-IM" />
<menuitem id="menu_checkspelling" accesskey="&editcheckspelling.accesskey;" key="checkspellingkb" observes="cmd_spelling" label="&checkSpellingCmd.label;"/>
<menuseparator/>
@ -601,7 +601,7 @@
</menubutton>
<!-- this is only used in mailnews -->
<!-- this is only used in messengercompose.xul -->
<menubutton id="AlignPopupButton" class="button-toolbar" observes="cmd_align"
tooltip="aTooltip" tooltiptext="&AlignPopupButton.tooltip;">
<menupopup id="AlignPopup">
@ -617,7 +617,8 @@
</menubutton>
<!-- InsertPopupButton is used by messengercompose.xul -->
<menubutton id="InsertPopupButton" class="button-toolbar" observes="cmd_insert">
<menubutton id="InsertPopupButton" class="button-toolbar" observes="cmd_insert"
tooltip="aTooltip" tooltiptext="&InsertPopupButton.tooltip;">
<menupopup id="InsertPopup">
<menuitem id="InsertLinkItem" class="menuitem-iconic" observes="cmd_link"
oncommand="goDoCommand('cmd_link')" label="&linkToolbarCmd.label;"/>

View File

@ -101,13 +101,12 @@
<!ENTITY editpastequotation.keybinding "v">
<!ENTITY editStripQuotesCmd.label "Strip Quotes">
<!ENTITY editRewrapCmd.label "Rewrap">
<!ENTITY findCmd.label "Find...">
<!ENTITY findCmd.label "Find and Replace...">
<!ENTITY editfind.accesskey "f">
<!ENTITY editfind.keybinding "f">
<!ENTITY findAgainCmd.label "Find Again">
<!ENTITY editfindnext.accesskey "n">
<!ENTITY editfindnext.keybinding "g">
<!ENTITY replaceCmd.label "Replace...">
<!ENTITY checkSpellingCmd.label "Check Spelling">
<!ENTITY editcheckspelling.accesskey "s">
<!ENTITY editcheckspelling.keybinding "k">
@ -594,6 +593,7 @@
<!ENTITY outdentToolbarCmd.tooltip "Outdent text (move left)">
<!ENTITY indentToolbarCmd.tooltip "Indent text (move right)">
<!ENTITY AlignPopupButton.tooltip "Choose text alignment">
<!ENTITY InsertPopupButton.tooltip "Insert a Link, Anchor, Image, Horizontal Line, or Table">
<!ENTITY alignLeftButton.tooltip "Align text along left margin">
<!ENTITY alignCenterButton.tooltip "Align text centered">
<!ENTITY alignRightButton.tooltip "Align text along right margin">