New prefs for saving and publishing, b=110779, r=brade, sr=hewitt, a=asa

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

@@ -34,7 +34,7 @@
   <script type="application/x-javascript">
   <!-- Add "shouldAutoSave", "autoSaveAmount" to _elementIDs when implemented -->
   <![CDATA[
-    var _elementIDs = ["maintainTableStructure", "preserveFormatting", "recentFiles", "useCSS"];
+    var _elementIDs = ["maintainTableStructure", "preserveFormatting", "saveAssociatedFiles", "showPublishDialog", "recentFiles", "useCSS"];
   ]]>
   </script>        
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -78,6 +78,21 @@
         tooltiptext= "&reformat.tooltip;"
       />
     </radiogroup>
+    <separator class="thin"/>
+    <checkbox 
+      label      = "&saveAssociatedFiles.label;"
+      id         = "saveAssociatedFiles"
+      preftype   = "bool" 
+      prefindex  = "0" 
+      prefstring = "editor.save_associated_files"
+    />
+    <checkbox 
+      label      = "&showPublishDialog.label;"
+      id         = "showPublishDialog"
+      preftype   = "bool" 
+      prefindex  = "0" 
+      prefstring = "editor.always_show_publish_dialog"
+    />
   </groupbox>
   
   <groupbox align="start">
@@ -120,8 +135,8 @@
       <caption label="&exterLegend.label;"/> 
     <hbox>
       <checkbox 
-        name  = "htmlSourceEditorCheckbox"
-        label = "&htmlSource;"
+        name       = "htmlSourceEditorCheckbox"
+        label      = "&htmlSource;"
         preftype   = "int" 
         prefindex  = "0" 
         prefstring = "editor.use_html_editor"