From a48a60fbdd97487b9c5e68c79ad0fed9dfcd835f Mon Sep 17 00:00:00 2001
From: "cmanske%netscape.com" <cmanske%netscape.com>
Date: Fri, 16 Feb 2001 03:33:07 +0000
Subject: [PATCH] UI for Insert Break, b=47545, r=brade, sr=sfraser

---
 editor/ui/composer/content/editorOverlay.xul      | 7 +++++++
 editor/ui/composer/locale/en-US/editorOverlay.dtd | 8 ++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/editor/ui/composer/content/editorOverlay.xul b/editor/ui/composer/content/editorOverlay.xul
index 500b923226dd..e68515a77c9c 100644
--- a/editor/ui/composer/content/editorOverlay.xul
+++ b/editor/ui/composer/content/editorOverlay.xul
@@ -131,6 +131,8 @@
     <command id="cmd_insertChars"      oncommand="goDoCommand('cmd_insertChars')"     value="&insertCharsCmd.label;"/>
     <command id="cmd_insertHTML"       oncommand="goDoCommand('cmd_insertHTML')"     value="&insertHTMLCmd.label;"/>
     <command id="cmd_smiley"           state=""         oncommand="goDoCommand('cmd_smiley')"/>
+    <command id="cmd_insertBreak"      oncommand="goDoCommand('cmd_insertBreak')"/>
+    <command id="cmd_insertBreakAll"   oncommand="goDoCommand('cmd_insertBreakAll')"/>
     
     <command id="cmd_NormalMode"       oncommand="goDoCommand('cmd_NormalMode')"     value="&NormalMode.label;"/>
     <command id="cmd_AllTagsMode"      oncommand="goDoCommand('cmd_AllTagsMode')"    value="&AllTagsMode.label;"/>
@@ -363,6 +365,11 @@
       <menuitem accesskey="&inserttable.accesskey;"      observes="cmd_InsertTable" value="&insertTableCmd.label;"/>
       <menuitem accesskey="&HTMLSourceMode.accesskey;"   observes="cmd_insertHTML"  key="inserthtmlkb"/>
       <menuitem accesskey="&insertchars.accesskey;"      observes="cmd_insertChars" />
+      <menuseparator/>
+<!-- Activate this after Enter key inserts P tag and not BR
+      <menuitem accesskey="&insertbreak.accesskey;"      observes="cmd_insertBreak"      value="&insertBreakCmd.label;"/>
+-->
+      <menuitem accesskey="&insertbreakall.accesskey;"   observes="cmd_insertBreakAll"   value="&insertBreakAllCmd.label;"/>
     </menupopup>
   </menu>
     
diff --git a/editor/ui/composer/locale/en-US/editorOverlay.dtd b/editor/ui/composer/locale/en-US/editorOverlay.dtd
index 04cee223bfb8..40a95e3746db 100644
--- a/editor/ui/composer/locale/en-US/editorOverlay.dtd
+++ b/editor/ui/composer/locale/en-US/editorOverlay.dtd
@@ -235,8 +235,6 @@
 <!ENTITY insertlink.accesskey "l">
 <!ENTITY insertAnchorCmd.label "Named Anchor...">
 <!ENTITY insertanchor.accesskey "a">
-<!ENTITY insertCharsCmd.label "Characters and Symbols...">
-<!ENTITY insertchars.accesskey "c">
 <!ENTITY insertImageCmd.label "Image...">
 <!ENTITY insertimage.accesskey "i">
 <!ENTITY insertImageMapCmd.label "Image Map...">
@@ -246,6 +244,12 @@
 <!ENTITY inserttable.accesskey "t">
 <!ENTITY insertHTMLCmd.label "HTML...">
 <!ENTITY insertHTMLCmd.accesskey "h">
+<!ENTITY insertCharsCmd.label "Characters and Symbols...">
+<!ENTITY insertchars.accesskey "c">
+<!ENTITY insertBreakCmd.label "Line Break">
+<!ENTITY insertbreak.accesskey "b">
+<!ENTITY insertBreakAllCmd.label "Break below Image(s)">
+<!ENTITY insertbreakall.accesskey "k">
 
 <!-- Used just in context popup. -->
 <!ENTITY createLinkCmd.label "Create Link...">