Bug 1684611 - Move Forms from debugQA to Composer - add toolbar button. r=frg

suite/editor/base/content/editingOverlay.xhtml

@@ -238,4 +238,10 @@
                  removable="true"
                  tooltiptext="&printToolbarCmd.tooltip;"/>
   <!-- 'print-button' is merged in here from utilityOverlay.xhtml -->
+  <toolbarbutton id="formButton"
+                 class="toolbarbutton-1"
+                 removable="true"
+                 label="&formToolbarCmd.label;"
+                 command="cmd_form"
+                 tooltiptext="&formToolbarCmd.tooltip;"/>
 </overlay>

suite/editor/base/content/editor.xhtml

@@ -268,6 +268,7 @@
     <toolbarbutton id="linkButton"/>
     <toolbarbutton id="namedAnchorButton"/>
     <toolbarbutton id="imageButton"/>
+    <toolbarbutton id="formButton"/>
     <toolbarbutton id="hlineButton"/>
     <toolbarbutton id="tableButton"/>
     <toolbarbutton id="spellingButton"/>

suite/locales/en-US/chrome/editor/editingOverlay.dtd

@@ -58,3 +58,5 @@
 <!ENTITY publishToolbarCmd.tooltip "Upload file to a remote location">
 <!ENTITY printToolbarCmd.label "Print">
 <!ENTITY printToolbarCmd.tooltip "Print this page">
+<!ENTITY formToolbarCmd.label "Form">
+<!ENTITY formToolbarCmd.tooltip "Insert new form or edit selected form's properties">

suite/themes/classic/editor/editorPrimaryToolbar.css

@@ -125,6 +125,23 @@
   -moz-image-region: rect(60px 119px 89px 90px) !important;
 }
 
+#formButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(450px 29px 479px 0);
+}
+
+#formButton:hover {
+  -moz-image-region: rect(450px 59px 479px 30px);
+}
+
+#formButton:hover:active {
+  -moz-image-region: rect(450px 89px 479px 60px);
+}
+
+#formButton[disabled="true"] {
+  -moz-image-region: rect(450px 119px 479px 90px) !important;
+}
+
 #namedAnchorButton {
   list-style-image: url("chrome://editor/skin/icons/editoricons.png");
   -moz-image-region: rect(0 29px 29px 0);
@@ -389,6 +406,24 @@ toolbar[iconsize="small"] > #imageButton[disabled="true"] {
   -moz-image-region: rect(40px 79px 59px 60px) !important;
 }
 
+toolbar[iconsize="small"] > #formButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #formButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(300px 19px 319px 0);
+}
+
+toolbar[iconsize="small"] > #formButton:hover {
+  -moz-image-region: rect(300px 39px 319px 20px);
+}
+
+toolbar[iconsize="small"] > #formButton:hover:active {
+  -moz-image-region: rect(300px 59px 319px 40px);
+}
+
+toolbar[iconsize="small"] > #formButton[disabled="true"] {
+  -moz-image-region: rect(300px 79px 319px 60px) !important;
+}
+
 toolbar[iconsize="small"] > #namedAnchorButton,
 toolbar[iconsize="small"] > toolbarpaletteitem > #namedAnchorButton {
   list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");

suite/themes/classic/mac/editor/editorPrimaryToolbar.css

@@ -97,6 +97,19 @@
   -moz-image-region: rect(60px 89px 89px 60px) !important;
 }
 
+#formButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(450px 29px 479px 0);
+}
+
+#formButton:hover:active {
+  -moz-image-region: rect(450px 59px 479px 30px);
+}
+
+#formButton[disabled="true"] {
+  -moz-image-region: rect(450px 89px 479px 60px) !important;
+}
+
 #namedAnchorButton {
   list-style-image: url("chrome://editor/skin/icons/editoricons.png");
   -moz-image-region: rect(0 29px 29px 0);
@@ -301,6 +314,20 @@ toolbar[iconsize="small"] > #imageButton[disabled="true"] {
   -moz-image-region: rect(40px 59px 59px 40px) !important;
 }
 
+toolbar[iconsize="small"] > #formButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #formButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(300px 19px 319px 0);
+}
+
+toolbar[iconsize="small"] > #formButton:hover:active {
+  -moz-image-region: rect(300px 39px 319px 20px);
+}
+
+toolbar[iconsize="small"] > #formButton[disabled="true"] {
+  -moz-image-region: rect(300px 59px 319px 40px) !important;
+}
+
 toolbar[iconsize="small"] > #namedAnchorButton,
 toolbar[iconsize="small"] > toolbarpaletteitem > #namedAnchorButton {
   list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");

suite/themes/modern/editor/editorPrimaryToolbar.css

@@ -157,6 +157,23 @@
   -moz-image-region: rect(68px 199px 101px 150px) !important;
 }
 
+#formButton {
+  list-style-image: url("chrome://editor/skin/icons/btn1.png");
+  -moz-image-region: rect(510px 49px 543px 0);
+}
+
+#formButton:hover {
+  -moz-image-region: rect(510px 99px 543px 50px);
+}
+
+#formButton:hover:active {
+  -moz-image-region: rect(510px 149px 543px 100px);
+}
+
+#formButton[disabled="true"] {
+  -moz-image-region: rect(510px 199px 543px 150px) !important;
+}
+
 #namedAnchorButton {
   list-style-image: url("chrome://editor/skin/icons/btn1.png");
   -moz-image-region: rect(0 49px 33px 0);