Commit 6f809f01 authored by cmanske%netscape.com's avatar cmanske%netscape.com
Browse files

Remove pref to change delete key behavior for selected cells, b=95633, r=syd, sr=dveditz

parent 4620e7e9

editor/ui/composer.js

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ pref("editor.hrule.shading", true); 
pref("editor.hrule.align",                  1); // center



pref("editor.table.maintain_structure", true);

pref("editor.table.delete_key", 0);



pref("editor.prettyprint", true);
@@ -74,3 +73,5 @@ pref("editor.singleLine.pasteNewlines", 1); 
pref("editor.history.url_maximum", 10);



pref("editor.quotesPreformatted",            true);



pref("editor.publish.",                      "");

editor/ui/composer/content/pref-composer.xul

+1 −13
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
  <script type="application/x-javascript">

  <!-- Add "shouldAutoSave", "autoSaveAmount" to _elementIDs when implemented -->

  <![CDATA[

    var _elementIDs = ["maintainTableStructure", "tableDeleteKey", "preserveFormatting", "recentFiles"];

    var _elementIDs = ["maintainTableStructure", "preserveFormatting", "recentFiles"];

  ]]>

  </script>
@@ -93,18 +93,6 @@ 
      prefstring= "editor.table.maintain_structure"

    />

    <separator class = "thin"/>

    <hbox align="start">

      <label value="&pressingTheDeleteKey.label;" 

        tooltip = "aTooltip" tooltiptext="&pressingTheDeleteKey.tooltip;"

        control="tableDeleteKey" 

      />

      <radiogroup

          id       = "tableDeleteKey"

          prefstring="editor.table.delete_key">

        <radio value="0" label="&deleteCell.label;" accesskey="&deleteCell.accesskey;"/>

        <radio value="1" label="&deleteContent.label;" accesskey="&deleteContent.accesskey;" />

      </radiogroup>

    </hbox>

  </groupbox>



<!-- Take out Auto-Save; not supported at this time

editor/ui/composer/locale/en-US/pref-composer.dtd

+1 −9
Original line number Diff line number Diff line
@@ -8,17 +8,9 @@ 
<!ENTITY  rHeader                   "Settings for authoring of new Web pages">



<!ENTITY  tableEditing.label                    "Table Editing">



<!ENTITY  maintainTableStructure.label          "Maintain table layout when inserting or deleting cells">

<!ENTITY  maintainTableStructure.tooltip        "Prevents cell borders from collapsing when you delete one or more cells">

<!ENTITY  maintainTableStructure.tooltip        "Preserves table's rectangular shape by automatically adding cells after inserting or deleting cells"

<!ENTITY  maintainStructure.accesskey           "m">

<!-- LOCALIZATION NOTE (pressingTheDeleteKey.label): Don't translate "Delete" -->

<!ENTITY  pressingTheDeleteKey.label            "Delete key:">

<!ENTITY  pressingTheDeleteKey.tooltip          "Assign an action to the Delete key for table editing purposes">

<!ENTITY  deleteCell.label                      "Removes the entire cell">

<!ENTITY  deleteCell.accesskey                  "r">

<!ENTITY  deleteContent.label                   "Removes the cell's contents">

<!ENTITY  deleteContent.accesskey               "c">



<!ENTITY  savingFiles.title           "When Saving Files">

<!ENTITY  preserveExistingFormatting  "Retain original source formatting">

modules/libpref/src/init/editor.js

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ pref("editor.hrule.shading", true); 
pref("editor.hrule.align",                  1); // center



pref("editor.table.maintain_structure", true);

pref("editor.table.delete_key", 0);



pref("editor.prettyprint", true);
@@ -74,3 +73,5 @@ pref("editor.singleLine.pasteNewlines", 1); 
pref("editor.history.url_maximum", 10);



pref("editor.quotesPreformatted",            true);



pref("editor.publish.",                      "");