STORM-276 Match preferences look to that of the auto-replace functionality in STORM-1738

4 files changed, 186 insertions, 142 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 9433866c4d..bd6faf4ed8 100644
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -120,12 +120,6 @@
          layout="topleft"
          help_topic="preferences_advanced1_tab"
          name="advanced1" />
-        <panel
-         class="panel_preference"
-         filename="panel_preferences_spellcheck.xml"
-         label="Spell Check"
-         layout="topleft"
-         name="spell_check" />
     </tab_container>
 
 </floater>
diff --git a/indra/newview/skins/default/xui/en/floater_spellcheck.xml b/indra/newview/skins/default/xui/en/floater_spellcheck.xml
new file mode 100644
index 0000000000..bd3f60cf4a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_spellcheck.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ border="true"
+ can_close="true"
+ can_minimize="true"
+ bottom="275"
+ left="300"
+ can_resize="false"
+ height="330"
+ width="490"
+ name="spellcheck_floater"
+ title="Spell Checker Settings">
+  <check_box
+   bottom_delta="30"
+   control_name="SpellCheck"
+   left_delta="15"
+   height="16"
+   width="100"
+   follows="left|top"
+   label="Enable spell checker"
+   name="spellcheck_enable" />
+  <view_border
+   top_pad="10"
+   left="2"
+   height="0"
+   width="491"
+   follows="left|top"
+   bevel_style="none"
+   border_thickness="1"
+   mouse_opaque="false"
+   name="divisor1"/>
+  <text
+   enabled_control="SpellCheck"
+   follows="top|left"
+   height="10"
+   layout="topleft"
+   left="38"
+   mouse_opaque="false"
+   name="spellcheck_main"
+   top_pad="15"
+   type="string"
+   width="90"
+  >
+    Main dictionary :
+  </text>
+  <combo_box
+   enabled_control="SpellCheck"
+   follows="top|left"
+   height="23"
+   layout="topleft"
+   left_pad="10"
+   name="spellcheck_main_combo"
+   top_pad="-15"
+   width="175"
+  />
+  <text
+   enabled_control="SpellCheck"
+   follows="top|left"
+   height="10"
+   label="Logs:"
+   layout="topleft"
+   left="38"
+   mouse_opaque="false"
+   name="spellcheck_additional"
+   top_pad="15"
+   type="string"
+   width="190"
+  >
+    Additional dictionaries :
+  </text>
+  <text
+   follows="top|left"
+   height="12"
+   layout="topleft"
+   left="55"
+   length="1"
+   name="spellcheck_available"
+   top_pad="10"
+   type="string"
+   width="175">
+      Available
+  </text>
+  <text
+   follows="top|left"
+   height="12"
+   type="string"
+   left_pad="45"
+   length="1"
+   layout="topleft"
+   name="spellcheck_active"
+   width="175">
+      Active
+  </text>
+  <scroll_list
+   enabled_control="SpellCheck"
+   follows="top|left"
+   height="155"
+   layout="topleft"
+   left="55"
+   multi_select="true"
+   name="spellcheck_available_list"
+   sort_column="0"
+   sort_ascending="true" 
+   width="175" />
+  <button
+   enabled_control="SpellCheck"
+   follows="top|left"
+   height="26"
+   image_overlay="Arrow_Right"
+   hover_glow_amount="0.15"
+   layout="topleft"
+   left_pad="10"
+   name="spellcheck_moveright_btn"
+   top_delta="50"
+   width="25">
+  </button>
+  <button
+   enabled_control="SpellCheck"
+   follows="top|left"
+   height="26"
+   image_overlay="Arrow_Left"
+   hover_glow_amount="0.15"
+   layout="topleft"
+   name="spellcheck_moveleft_btn"
+   top_delta="30"
+   width="25">
+  </button>
+  <scroll_list
+   enabled_control="SpellCheck"
+   follows="top|left"
+   height="155"
+   layout="topleft"
+   left_pad="10"
+   multi_select="true"
+   name="spellcheck_active_list"
+   sort_column="0"
+   sort_ascending="true" 
+   top_pad="-105"
+   width="175"
+  />
+  <view_border
+   top_pad="10"
+   left="2"
+   height="0"
+   width="491"
+   follows="left|top"
+   bevel_style="none"
+   border_thickness="1"
+   mouse_opaque="false"
+   name="divisor4"/>
+  <button
+   top_pad="10"
+   right="380"
+   height="22"
+   width="90"
+   enabled="true"
+   follows="left|top"
+   mouse_opaque="true"
+   halign="center"
+   scale_image="true"
+   name="spellcheck_ok"
+   label="OK" />
+  <button
+   top_delta="0"
+   right="480"
+   height="22"
+   width="90"
+   enabled="true"
+   follows="left|top"
+   mouse_opaque="true"
+   halign="center"
+   scale_image="true"
+   name="spellcheck_cancel"
+   label="Cancel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index caf7fc85f5..2e4c0ebbf5 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -216,4 +216,15 @@
    <button.commit_callback
     function="Pref.TranslationSettings" />
   </button>
+  <button
+   follows="top|left"
+   height="23"
+   layout="topleft"
+   top_pad="-23"
+   left_pad="5"
+   name="spellcheck_showgui"
+   commit_callback.function="Pref.SpellChecker"
+   label="Spell Checker Settings"
+   width="150">
+  </button>
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_spellcheck.xml b/indra/newview/skins/default/xui/en/panel_preferences_spellcheck.xml
deleted file mode 100644
index f1b16c5d0d..0000000000
--- a/indra/newview/skins/default/xui/en/panel_preferences_spellcheck.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="true"
- follows="left|top|right|bottom"
- height="408"
- label="Spell Check"
- layout="topleft"
- left="102"
- name="spellcheck"
- top="1"
- width="517">
-    <check_box
-     control_name="SpellCheck"
-     enabled="true"
-     follows="top|left"
-     height="16"
-     label="Enable spell checking"
-     layout="topleft"
-     left="30"
-     name="check_spellcheck"
-     top="30"
-     width="250"
-    />
-    <text
-     enabled_control="SpellCheck"
-     follows="top|left"
-     height="10"
-     label="Logs:"
-     layout="topleft"
-     left="55"
-     mouse_opaque="false"
-     name="text_spellcheck_dict"
-     top_pad="15"
-     type="string"
-     width="90"
-    >
-      Main dictionary :
-    </text>
-    <combo_box
-     enabled_control="SpellCheck"
-     follows="top|left"
-     height="23"
-     layout="topleft"
-     left_pad="10"
-     name="combo_spellcheck_dict"
-     top_pad="-15"
-     width="175"
-    />
-
-    <text
-     enabled_control="SpellCheck"
-     follows="top|left"
-     height="10"
-     label="Logs:"
-     layout="topleft"
-     left="55"
-     mouse_opaque="false"
-     name="text_spellcheck_additional"
-     top_pad="15"
-     type="string"
-     width="190"
-    >
-      Additional dictionaries :
-    </text>
-    <text
-     follows="top|left"
-     height="12"
-     layout="topleft"
-     left="80"
-     length="1"
-     name="text_spellcheck_available"
-     top_pad="10"
-     type="string"
-     width="175">
-        Available
-    </text>
-    <text
-     follows="top|left"
-     height="12"
-     type="string"
-     left_pad="45"
-     length="1"
-     layout="topleft"
-     name="text_spellcheck_active"
-     width="175">
-        Active
-    </text>
-    <scroll_list
-     enabled_control="SpellCheck"
-     follows="top|left"
-     height="155"
-     layout="topleft"
-     left="80"
-     multi_select="true"
-     name="list_spellcheck_available"
-     sort_column="0"
-     sort_ascending="true" 
-     width="175" />
-    <button
-     enabled_control="SpellCheck"
-     follows="top|left"
-     height="26"
-     image_overlay="Arrow_Right"
-     hover_glow_amount="0.15"
-     layout="topleft"
-     left_pad="10"
-     name="btn_spellcheck_moveright"
-     top_delta="50"
-     width="25">
-    </button>
-    <button
-     enabled_control="SpellCheck"
-     follows="top|left"
-     height="26"
-     image_overlay="Arrow_Left"
-     hover_glow_amount="0.15"
-     layout="topleft"
-     name="btn_spellcheck_moveleft"
-     top_delta="30"
-     width="25">
-    </button>
-    <scroll_list
-     enabled_control="SpellCheck"
-     follows="top|left"
-     height="155"
-     layout="topleft"
-     left_pad="10"
-     multi_select="true"
-     name="list_spellcheck_active"
-     sort_column="0"
-     sort_ascending="true" 
-     top_pad="-105"
-     width="175"
-    />
-
-</panel>