Bug 431061 - Migrate main Composer prefs and toolbars prefs to new pref pane (SeaMonkey-only). r+sr=Neil.

This commit is contained in:
stefanh@inbox.com 2008-05-04 11:37:51 -07:00
Родитель f777399574
Коммит 7520682876
6 изменённых файлов: 290 добавлений и 241 удалений

Просмотреть файл

@ -97,13 +97,6 @@ pref("editor.toolbars.showbutton.absolutePosition", true);
pref("editor.toolbars.showbutton.decreaseZIndex", true); pref("editor.toolbars.showbutton.decreaseZIndex", true);
pref("editor.toolbars.showbutton.increaseZIndex", true); pref("editor.toolbars.showbutton.increaseZIndex", true);
pref("editor.auto_save", false);
pref("editor.auto_save_delay", 10); // minutes
pref("editor.use_html_editor", 0);
pref("editor.html_editor", "");
pref("editor.use_image_editor", 0);
pref("editor.image_editor", "");
pref("editor.history.url_maximum", 10); pref("editor.history.url_maximum", 10);
pref("editor.publish.", ""); pref("editor.publish.", "");

Просмотреть файл

@ -3861,7 +3861,7 @@ var nsPreferencesCommand =
doCommand: function(aCommand) doCommand: function(aCommand)
{ {
goPreferences('editor', 'chrome://editor/content/pref-composer.xul','editor'); goPreferences('composer_pane');
window.content.focus(); window.content.focus();
} }
}; };

Просмотреть файл

@ -24,13 +24,33 @@
accesskey="&editorCheck.accesskey;" accesskey="&editorCheck.accesskey;"
preference="general.startup.editor"/> preference="general.startup.editor"/>
</groupbox> </groupbox>
<!-- category tree entries for editor -->
<treechildren id="prefsPanelChildren">
<treeitem container="true"
id="composerItem"
insertafter="mailnews,navigator"
label="&compose.label;"
prefpane="composer_pane"
url="chrome://editor/content/pref-composer.xul"
helpTopic="composer_prefs_general">
<treechildren id="composerChildren">
<!-- XXX Move pref panes from below to here as they are migrated -->
<treeitem id="toolbarsItem"
label="&toolbars.label;"
prefpane="toolbars_pane"
url="chrome://editor/content/pref-toolbars.xul"
helpTopic="composer_prefs_toolbars"/>
</treechildren>
</treeitem>
</treechildren>
<!-- category tree entries for editor --> <!-- category tree entries for editor -->
<treechildren id="panelChildren"> <treechildren id="panelChildren">
<treeitem container="true" id="editor" insertafter="mailnews,navigator"> <treeitem container="true" id="editor" insertafter="mailnews,navigator">
<treerow> <treerow>
<treecell url="chrome://editor/content/pref-composer.xul" label="&compose.label;" /> <treecell label="Migrated: &compose.label;"/>
</treerow> </treerow>
<!-- XXX Move these up as we migrate the panels -->
<treechildren> <treechildren>
<treeitem> <treeitem>
<treerow> <treerow>
@ -46,7 +66,7 @@
--> -->
<treeitem> <treeitem>
<treerow> <treerow>
<treecell url="chrome://editor/content/pref-toolbars.xul" label="&toolbars.label;"/> <treecell label="Migrated: &toolbars.label;"/>
</treerow> </treerow>
</treeitem> </treeitem>
</treechildren> </treechildren>

Просмотреть файл

@ -40,154 +40,87 @@
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<?xul-overlay href="chrome://global/content/globalOverlay.xul"?> <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
<!DOCTYPE page SYSTEM "chrome://editor/locale/pref-composer.dtd" > <!DOCTYPE overlay SYSTEM "chrome://editor/locale/pref-composer.dtd">
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
onload="parent.initPanel('chrome://editor/content/pref-composer.xul');" <prefpane id="composer_pane"
headertitle="&pref.composer.title;"> label="&pref.composer.title;"
script="chrome://editor/content/EdDialogCommon.js chrome://editor/content/editorUtilities.js">
<script type="application/x-javascript"> <preferences id="composer_preferences">
<!-- Add "shouldAutoSave", "autoSaveAmount" to _elementIDs when implemented --> <preference id="editor.history.url_maximum"
<![CDATA[ name="editor.history.url_maximum"
var _elementIDs = ["maintainTableStructure", "preserveFormatting", "saveAssociatedFiles", "showPublishDialog", "recentFiles", "useCSS", "crInPCreatesNewP"]; type="int"/>
]]> <preference id="editor.prettyprint"
</script> name="editor.prettyprint"
<script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/> type="bool"
<script type="application/x-javascript" src="chrome://editor/content/editorUtilities.js"/> inverted="true"/>
<preference id="editor.save_associated_files"
<!-- Recent files menu --> name="editor.save_associated_files"
<groupbox> type="bool"/>
<caption label="&recentFiles.title;"/> <preference id="editor.always_show_publish_dialog"
<hbox align="center"> name="editor.always_show_publish_dialog"
<label value = "&documentsInMenu.label;" type="bool"/>
accesskey = "&documentsInMenu.accesskey;" <preference id="editor.table.maintain_structure"
control = "recentFiles"/> name="editor.table.maintain_structure"
<textbox type="bool"/>
id="recentFiles" <preference id="editor.use_css"
name="recent string" name="editor.use_css"
size="3" type="bool"/>
value="10" <preference id="editor.CR_creates_new_p"
preftype="int" name="editor.CR_creates_new_p"
prefstring="editor.history.url_maximum" type="bool"/>
oninput=" ValidateNumber(this, null, 0, 99); LimitStringLength('recentFiles',2);" </preferences>
/>
</hbox>
</groupbox>
<!-- HTML formatting on output --> <!-- Recent files menu -->
<groupbox>
<caption label="&savingFiles.title;"/>
<spacer class="spacer"/>
<checkbox
label = "&preserveExisting.label;"
id = "preserveFormatting"
accesskey = "&preserveExisting.accesskey;"
tooltiptext = "&preserveExisting.tooltip;"
preftype = "bool"
prefstring = "editor.prettyprint"
reversed = "true"
/>
<checkbox
label = "&saveAssociatedFiles.label;"
id = "saveAssociatedFiles"
accesskey = "&saveAssociatedFiles.accesskey;"
preftype = "bool"
prefindex = "0"
prefstring = "editor.save_associated_files"
/>
<checkbox
label = "&showPublishDialog.label;"
id = "showPublishDialog"
accesskey = "&showPublishDialog.accesskey;"
preftype = "bool"
prefindex = "0"
prefstring = "editor.always_show_publish_dialog"
/>
</groupbox>
<groupbox align="start">
<caption label = "&composerEditing.label;"/>
<checkbox
label = "&maintainStructure.label;"
id = "maintainTableStructure"
accesskey = "&maintainStructure.accesskey;"
tooltiptext = "&maintainStructure.tooltip;"
prefstring = "editor.table.maintain_structure"
/>
<checkbox
label = "&useCSS.label;"
id = "useCSS"
accesskey = "&useCSS.accesskey;"
prefstring = "editor.use_css"
/>
<checkbox
label = "&crInPCreatesNewP.label;"
id = "crInPCreatesNewP"
accesskey = "&crInPCreatesNewP.accesskey;"
prefstring = "editor.CR_creates_new_p"
/>
</groupbox>
<!-- Take out Auto-Save; not supported at this time
<groupbox>
<caption label="&saving;"/>
<hbox align="center">
<checkbox
label = "&AutoSaveCheck;"
id = "shouldAutoSave"
prefstring = "editor.auto_save"
name = "autosave"
/>
<textbox
id="autoSaveAmount"
name="time"
size="3"
value="5"
preftype="int"
prefstring="editor.auto_save_delay"
/>
<label value="&minText;" />
</hbox>
</groupbox>
-->
<!-- External Editors are not supported at this time
<groupbox> <groupbox>
<caption label="&exterLegend.label;"/> <caption label="&recentFiles.title;"/>
<hbox> <hbox align="center">
<checkbox <label value="&documentsInMenu.label;"
name = "htmlSourceEditorCheckbox" accesskey="&documentsInMenu.accesskey;"
label = "&htmlSource;" control="recentFiles"/>
preftype = "int" <textbox id="recentFiles"
prefindex = "0" name="recent string"
prefstring = "editor.use_html_editor" size="3"
/> value="10"
<textbox preference="editor.history.url_maximum"
name = "&chooseButton.label;" oninput=" ValidateNumber(this, null, 0, 99); LimitStringLength('recentFiles',2);"/>
preftype = "string" </hbox>
/> </groupbox>
<button
name = ""
label = "&chooseButton.label;"
/>
</hbox>
<hbox> <!-- HTML formatting on output -->
<checkbox <groupbox>
name = "htmlImageEditorCheckbox" <caption label="&savingFiles.title;"/>
label = "&imageeditor;" <checkbox id="preserveFormatting"
preftype = "int" label="&preserveExisting.label;"
prefindex = "0" accesskey="&preserveExisting.accesskey;"
prefstring ="editor.use_image_editor" tooltiptext="&preserveExisting.tooltip;"
/> preference="editor.prettyprint"/>
<checkbox id="saveAssociatedFiles"
label="&saveAssociatedFiles.label;"
accesskey="&saveAssociatedFiles.accesskey;"
preference="editor.save_associated_files"/>
<checkbox id="showPublishDialog"
label="&showPublishDialog.label;"
accesskey="&showPublishDialog.accesskey;"
preference="editor.always_show_publish_dialog"/>
</groupbox>
<textbox <groupbox align="start">
name="chooseButton.label" <caption label="&composerEditing.label;"/>
prefstring = "editor.image_editor" <checkbox id="maintainTableStructure"
/> label="&maintainStructure.label;"
<button label="&chooseButton.label;" /> accesskey="&maintainStructure.accesskey;"
</hbox> tooltiptext="&maintainStructure.tooltip;"
preference="editor.table.maintain_structure"/>
</groupbox> <checkbox id="useCSS"
--> label="&useCSS.label;"
</page> accesskey="&useCSS.accesskey;"
preference="editor.use_css"/>
<checkbox id="crInPCreatesNewP"
label="&crInPCreatesNewP.label;"
accesskey="&crInPCreatesNewP.accesskey;"
preference="editor.CR_creates_new_p"/>
</groupbox>
</prefpane>
</overlay>

Просмотреть файл

@ -37,93 +37,195 @@
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<!DOCTYPE page SYSTEM "chrome://editor/locale/pref-toolbars.dtd"> <!DOCTYPE overlay SYSTEM "chrome://editor/locale/pref-toolbars.dtd">
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
onload="parent.initPanel('chrome://editor/content/pref-toolbars.xul');" <prefpane id="toolbars_pane"
headertitle="&pref.toolbars.title;"> label="&pref.toolbars.title;">
<script type="application/x-javascript"> <preferences id="toolbars_preferences">
<![CDATA[ <preference id="editor.toolbars.showbutton.new"
var _elementIDs = [ name="editor.toolbars.showbutton.new"
"showNew", "showOpen", "showSave", "showPublish", "showPreview", "showSmaller", "showLarger", "showBold", type="bool"/>
"showCut", "showCopy", "showPaste", "showPrint", "showFind", "showBullets", "showNumbers", "showItalic", <preference id="editor.toolbars.showbutton.open"
"showImage", "showHline", "showTable", "showLink", "showAnchor", "showOutdent", "showIndent", "showUnderline", name="editor.toolbars.showbutton.open"
"showAbsolutePosition", "showDecreaseZIndex", "showIncreaseZIndex" ]; type="bool"/>
]]> <preference id="editor.toolbars.showbutton.save"
</script> name="editor.toolbars.showbutton.save"
type="bool"/>
<preference id="editor.toolbars.showbutton.publish"
name="editor.toolbars.showbutton.publish"
type="bool"/>
<preference id="editor.toolbars.showbutton.preview"
name="editor.toolbars.showbutton.preview"
type="bool"/>
<preference id="editor.toolbars.showbutton.cut"
name="editor.toolbars.showbutton.cut"
type="bool"/>
<preference id="editor.toolbars.showbutton.copy"
name="editor.toolbars.showbutton.copy"
type="bool"/>
<preference id="editor.toolbars.showbutton.paste"
name="editor.toolbars.showbutton.paste"
type="bool"/>
<preference id="editor.toolbars.showbutton.print"
name="editor.toolbars.showbutton.print"
type="bool"/>
<preference id="editor.toolbars.showbutton.find"
name="editor.toolbars.showbutton.find"
type="bool"/>
<preference id="editor.toolbars.showbutton.image"
name="editor.toolbars.showbutton.image"
type="bool"/>
<preference id="editor.toolbars.showbutton.hline"
name="editor.toolbars.showbutton.hline"
type="bool"/>
<preference id="editor.toolbars.showbutton.table"
name="editor.toolbars.showbutton.table"
type="bool"/>
<preference id="editor.toolbars.showbutton.link"
name="editor.toolbars.showbutton.link"
type="bool"/>
<preference id="editor.toolbars.showbutton.namedAnchor"
name="editor.toolbars.showbutton.namedAnchor"
type="bool"/>
<preference id="editor.toolbars.showbutton.DecreaseFontSize"
name="editor.toolbars.showbutton.DecreaseFontSize"
type="bool"/>
<preference id="editor.toolbars.showbutton.IncreaseFontSize"
name="editor.toolbars.showbutton.IncreaseFontSize"
type="bool"/>
<preference id="editor.toolbars.showbutton.bold"
name="editor.toolbars.showbutton.bold"
type="bool"/>
<preference id="editor.toolbars.showbutton.absolutePosition"
name="editor.toolbars.showbutton.absolutePosition"
type="bool"/>
<preference id="editor.toolbars.showbutton.ul"
name="editor.toolbars.showbutton.ul"
type="bool"/>
<preference id="editor.toolbars.showbutton.ol"
name="editor.toolbars.showbutton.ol"
type="bool"/>
<preference id="editor.toolbars.showbutton.italic"
name="editor.toolbars.showbutton.italic"
type="bool"/>
<preference id="editor.toolbars.showbutton.decreaseZIndex"
name="editor.toolbars.showbutton.decreaseZIndex"
type="bool"/>
<preference id="editor.toolbars.showbutton.outdent"
name="editor.toolbars.showbutton.outdent"
type="bool"/>
<preference id="editor.toolbars.showbutton.indent"
name="editor.toolbars.showbutton.indent"
type="bool"/>
<preference id="editor.toolbars.showbutton.underline"
name="editor.toolbars.showbutton.underline"
type="bool"/>
<preference id="editor.toolbars.showbutton.increaseZIndex"
name="editor.toolbars.showbutton.increaseZIndex"
type="bool"/>
</preferences>
<groupbox orient="horizontal"> <groupbox orient="horizontal">
<caption label="&composition.caption;"/> <caption label="&composition.caption;"/>
<vbox flex="1"> <vbox flex="1">
<checkbox label="&new.label;" id="showNew" <checkbox id="showNew"
prefstring="editor.toolbars.showbutton.new"/> label="&new.label;"
<checkbox label="&open.label;" id="showOpen" preference="editor.toolbars.showbutton.new"/>
prefstring="editor.toolbars.showbutton.open"/> <checkbox id="showOpen"
<checkbox label="&save.label;" id="showSave" label="&open.label;"
prefstring="editor.toolbars.showbutton.save"/> preference="editor.toolbars.showbutton.open"/>
<checkbox label="&publish.label;" id="showPublish" <checkbox id="showSave"
prefstring="editor.toolbars.showbutton.publish"/> label="&save.label;"
<checkbox label="&preview.label;" id="showPreview" preference="editor.toolbars.showbutton.save"/>
prefstring="editor.toolbars.showbutton.preview"/> <checkbox id="showPublish"
</vbox> label="&publish.label;"
<vbox flex="1"> preference="editor.toolbars.showbutton.publish"/>
<checkbox label="&cut.label;" id="showCut" <checkbox id="showPreview"
prefstring="editor.toolbars.showbutton.cut"/> label="&preview.label;"
<checkbox label="&copy.label;" id="showCopy" preference="editor.toolbars.showbutton.preview"/>
prefstring="editor.toolbars.showbutton.copy"/> </vbox>
<checkbox label="&paste.label;" id="showPaste" <vbox flex="1">
prefstring="editor.toolbars.showbutton.paste"/> <checkbox id="showCut"
<checkbox label="&print.label;" id="showPrint" label="&cut.label;"
prefstring="editor.toolbars.showbutton.print"/> preference="editor.toolbars.showbutton.cut"/>
<checkbox label="&find.label;" id="showFind" <checkbox id="showCopy"
prefstring="editor.toolbars.showbutton.find"/> label="&copy.label;"
</vbox> preference="editor.toolbars.showbutton.copy"/>
<vbox flex="1"> <checkbox id="showPaste"
<checkbox label="&image.label;" id="showImage" label="&paste.label;"
prefstring="editor.toolbars.showbutton.image"/> preference="editor.toolbars.showbutton.paste"/>
<checkbox label="&hline.label;" id="showHline" <checkbox id="showPrint"
prefstring="editor.toolbars.showbutton.hline"/> label="&print.label;"
<checkbox label="&table.label;" id="showTable" preference="editor.toolbars.showbutton.print"/>
prefstring="editor.toolbars.showbutton.table"/> <checkbox id="showFind"
<checkbox label="&link.label;" id="showLink" label="&find.label;"
prefstring="editor.toolbars.showbutton.link"/> preference="editor.toolbars.showbutton.find"/>
<checkbox label="&anchor.label;" id="showAnchor" </vbox>
prefstring="editor.toolbars.showbutton.namedAnchor"/> <vbox flex="1">
</vbox> <checkbox id="showImage"
</groupbox> label="&image.label;"
preference="editor.toolbars.showbutton.image"/>
<checkbox id="showHline"
label="&hline.label;"
preference="editor.toolbars.showbutton.hline"/>
<checkbox id="showTable"
label="&table.label;"
preference="editor.toolbars.showbutton.table"/>
<checkbox id="showLink"
label="&link.label;"
preference="editor.toolbars.showbutton.link"/>
<checkbox id="showAnchor"
label="&anchor.label;"
preference="editor.toolbars.showbutton.namedAnchor"/>
</vbox>
</groupbox>
<groupbox orient="horizontal"> <groupbox orient="horizontal">
<caption label="&formatting.caption;"/> <caption label="&formatting.caption;"/>
<vbox flex="1"> <vbox flex="1">
<checkbox label="&smaller.label;" id="showSmaller" <checkbox id="showSmaller"
prefstring="editor.toolbars.showbutton.DecreaseFontSize"/> label="&smaller.label;"
<checkbox label="&larger.label;" id="showLarger" preference="editor.toolbars.showbutton.DecreaseFontSize"/>
prefstring="editor.toolbars.showbutton.IncreaseFontSize"/> <checkbox id="showLarger"
<checkbox label="&bold.label;" id="showBold" label="&larger.label;"
prefstring="editor.toolbars.showbutton.bold"/> preference="editor.toolbars.showbutton.IncreaseFontSize"/>
<checkbox label="&absolutePosition.label;" id="showAbsolutePosition" <checkbox id="showBold"
prefstring="editor.toolbars.showbutton.absolutePosition"/> label="&bold.label;"
</vbox> preference="editor.toolbars.showbutton.bold"/>
<vbox flex="1"> <checkbox id="showAbsolutePosition"
<checkbox label="&bullets.label;" id="showBullets" label="&absolutePosition.label;"
prefstring="editor.toolbars.showbutton.ul"/> preference="editor.toolbars.showbutton.absolutePosition"/>
<checkbox label="&numbers.label;" id="showNumbers" </vbox>
prefstring="editor.toolbars.showbutton.ol"/> <vbox flex="1">
<checkbox label="&italic.label;" id="showItalic" <checkbox id="showBullets"
prefstring="editor.toolbars.showbutton.italic"/> label="&bullets.label;"
<checkbox label="&decreaseZIndex.label;" id="showDecreaseZIndex" preference="editor.toolbars.showbutton.ul"/>
prefstring="editor.toolbars.showbutton.decreaseZIndex"/> <checkbox id="showNumbers"
</vbox> label="&numbers.label;"
<vbox flex="1"> preference="editor.toolbars.showbutton.ol"/>
<checkbox label="&outdent.label;" id="showOutdent" <checkbox id="showItalic"
prefstring="editor.toolbars.showbutton.outdent"/> label="&italic.label;"
<checkbox label="&indent.label;" id="showIndent" preference="editor.toolbars.showbutton.italic"/>
prefstring="editor.toolbars.showbutton.indent"/> <checkbox id="showDecreaseZIndex"
<checkbox label="&underline.label;" id="showUnderline" label="&decreaseZIndex.label;"
prefstring="editor.toolbars.showbutton.underline"/> preference="editor.toolbars.showbutton.decreaseZIndex"/>
<checkbox label="&increaseZIndex.label;" id="showIncreaseZIndex" </vbox>
prefstring="editor.toolbars.showbutton.increaseZIndex"/> <vbox flex="1">
</vbox> <checkbox id="showOutdent"
</groupbox> label="&outdent.label;"
</page> preference="editor.toolbars.showbutton.outdent"/>
<checkbox id="showIndent"
label="&indent.label;"
preference="editor.toolbars.showbutton.indent"/>
<checkbox id="showUnderline"
label="&underline.label;"
preference="editor.toolbars.showbutton.underline"/>
<checkbox id="showIncreaseZIndex"
label="&increaseZIndex.label;"
preference="editor.toolbars.showbutton.increaseZIndex"/>
</vbox>
</groupbox>
</prefpane>
</overlay>

Просмотреть файл

@ -4,6 +4,7 @@ comm.jar:
% overlay chrome://messenger/content/mailWindowOverlay.xul chrome://editor/content/editorMailOverlay.xul % overlay chrome://messenger/content/mailWindowOverlay.xul chrome://editor/content/editorMailOverlay.xul
#ifdef MOZ_SUITE #ifdef MOZ_SUITE
% overlay chrome://communicator/content/pref/preftree.xul chrome://editor/content/editorPrefsOverlay.xul % overlay chrome://communicator/content/pref/preftree.xul chrome://editor/content/editorPrefsOverlay.xul
% overlay chrome://communicator/content/pref/preferences.xul chrome://editor/content/editorPrefsOverlay.xul
% overlay chrome://communicator/content/pref/pref-appearance.xul chrome://editor/content/editorPrefsOverlay.xul % overlay chrome://communicator/content/pref/pref-appearance.xul chrome://editor/content/editorPrefsOverlay.xul
% overlay chrome://navigator/content/navigatorOverlay.xul chrome://editor/content/editorNavigatorOverlay.xul % overlay chrome://navigator/content/navigatorOverlay.xul chrome://editor/content/editorNavigatorOverlay.xul
% content editor-region %content/editor-region/ xpcnativewrappers=yes % content editor-region %content/editor-region/ xpcnativewrappers=yes