initial support for switching between icons only and icons + text

3 files changed, 23 insertions, 42 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
index b58c006b3f..fbfbe51a69 100644
--- a/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_toolbar.xml
@@ -16,14 +16,9 @@
            min_button_width="0"
            max_button_width="100"
            side="top">
-    <button auto_resize="true"
-            use_ellipses="true"
-            label="Button"/>
-    <button auto_resize="true"
-            label="Button with long label"/>
-    <button auto_resize="true"
-            use_ellipses="true"
-            label="Button with longest label of all"/>
+    <command name="avatar"/>
+    <command name="build"/>
+    <command name="chat"/>
   </toolbar>
   <toolbar name="test_toolbar_left"
            follows="left|bottom|top"
@@ -33,12 +28,9 @@
            top="70"
            min_button_width="100"           
            side="left">
-    <button height="30"
-            label="Button"/>
-    <button height="50"
-            label="Button with long label"/>
-    <button height="60"
-            label="Button with longest label of all"/>
+    <command name="avatar"/>
+    <command name="build"/>
+    <command name="chat"/>
   </toolbar>
   <toolbar name="test_toolbar_right"
            follows="right|bottom|top"
@@ -47,12 +39,9 @@
            right="500"
            top="70"
            side="right">
-    <button auto_resize="true"
-            label="Button 1"/>
-    <button auto_resize="true"
-            label="Button with long label"/>
-    <button auto_resize="true"
-            label="Button with longest label of all"/>
+    <command name="avatar"/>
+    <command name="build"/>
+    <command name="chat"/>
   </toolbar>
   <toolbar name="test_toolbar_bottom"
            follows="left|right|bottom"
@@ -62,11 +51,8 @@
            bottom="500"
            min_button_width="100"
            side="bottom">
-    <button auto_resize="true"
-            label="Button"/>
-    <button auto_resize="true"
-            label="Button with long label"/>
-    <button auto_resize="true"
-            label="Button with longest label of all"/>
+    <command name="avatar"/>
+    <command name="build"/>
+    <command name="chat"/>
   </toolbar>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
index b24f5c3347..23ea516b86 100644
--- a/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_toolbar_view.xml
@@ -47,11 +47,9 @@
                  top="0"
                  side="left"
                  button_display_mode="icons_only">
-          <button name="button1" label="Left Toolbar"/>
-          <button name="button2" label="Left Toolbar"/>
-          <button name="button3" label="Left Toolbar"/>
-          <button name="button4" label="Left Toolbar"/>
-          <button name="button5" label="Left Toolbar"/>
+          <command name="avatar"/>
+          <command name="build"/>
+          <command name="chat"/>
         </toolbar>
       </layout_panel>
       <layout_panel name="non_toolbar_panel"
@@ -74,11 +72,9 @@
           top="0"
           side="right"
           button_display_mode="icons_only">
-          <button name="button1" label="Right Toolbar"/>
-          <button name="button2" label="Right Toolbar"/>
-          <button name="button3" label="Right Toolbar"/>
-          <button name="button4" label="Right Toolbar"/>
-          <button name="button5" label="Right Toolbar"/>
+          <command name="avatar"/>
+          <command name="build"/>
+          <command name="chat"/>
         </toolbar>
       </layout_panel>
     </layout_stack>
@@ -100,12 +96,9 @@
              follows="left|right|bottom"
              button_display_mode="icons_with_text"
              visible="true">
-      <button name="button1" label="Bottom toolbar"/>
-      <button name="button2" label="Bottom toolbar"/>
-      <button name="button3" label="Bottom toolbar"/>
-      <button name="button4" label="Bottom toolbar"/>
-      <button name="button5" label="Bottom toolbar"/>
-      <button name="button6" label="Bottom toolbar"/>
+      <command name="avatar"/>
+      <command name="build"/>
+      <command name="chat"/>
     </toolbar>
   </layout_panel>
   </layout_stack>
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 29b5d02299..32bc88cc9a 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -13,9 +13,11 @@
                 background_opaque="true"/>
   <button_icon_and_text follows="left|top"
                         chrome="true"
+                        image_overlay_alignment="left"
                         use_ellipses="true"
                         auto_resize="true"/>
   <button_icon follows="left|top"
+               label=""
                chrome="true"
                use_ellipses="true"
                auto_resize="true"/>