diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-09-23 09:45:28 -0700 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-23 09:45:28 -0700 |
commit | 53a8e1299305a4acad83f52401679c86485fcf51 (patch) | |
tree | cae9ec1ca3411831d40031a84fe7ecde4171d89c | |
parent | 565483ee1f2ea7b8d525c6d89700452216481c5e (diff) |
EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars
EXP-1233 PROGRESS -- Populate the toybox floater window with all FUI toolbar buttons
* Added all documented FUI commands from the wiki, 20 in all, with text,
tooltips and placeholder icons.
* Note current toolbar checked in toolbar code does not lay these commands out
properly.
-rw-r--r-- | indra/newview/app_settings/commands.xml | 126 | ||||
-rw-r--r-- | indra/newview/skins/default/textures/textures.xml | 22 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 38 |
3 files changed, 183 insertions, 3 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 8e45e866ca..5cb8ddffcd 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -7,6 +7,83 @@ function="Floater.ToolbarToggle" param="avatar" /> + <command name="build" + icon="Command_Build_Icon" + label_ref="Command_Build_Label" + tooltip_ref="Command_Build_Tooltip" + function="Floater.ToolbarToggle" + param="build" + /> + <command name="chat" + icon="Command_Chat_Icon" + label_ref="Command_Chat_Label" + tooltip_ref="Command_Chat_Tooltip" + function="Floater.ToolbarToggle" + param="chat" + /> + <command name="compass" + icon="Command_Compass_Icon" + label_ref="Command_Compass_Label" + tooltip_ref="Command_Compass_Tooltip" + function="Floater.ToolbarToggle" + param="compass" + /> + <command name="gestures" + icon="Command_Gestures_Icon" + label_ref="Command_Gestures_Label" + tooltip_ref="Command_Gestures_Tooltip" + function="Floater.ToolbarToggle" + param="gestures" + /> + <command name="howto" + icon="Command_HowTo_Icon" + label_ref="Command_HowTo_Label" + tooltip_ref="Command_HowTo_Tooltip" + function="Floater.ToolbarToggle" + param="howto" + /> + <command name="landmarks" + icon="Command_Landmarks_Icon" + label_ref="Command_Landmarks_Label" + tooltip_ref="Command_Landmarks_Tooltip" + function="Floater.ToolbarToggle" + param="landmarks" + /> + <command name="map" + icon="Command_Map_Icon" + label_ref="Command_Map_Label" + tooltip_ref="Command_Map_Tooltip" + function="Floater.ToolbarToggle" + param="map" + /> + <command name="move" + icon="Command_Move_Icon" + label_ref="Command_Move_Label" + tooltip_ref="Command_Move_Tooltip" + function="Floater.ToolbarToggle" + param="move" + /> + <command name="myland" + icon="Command_MyLand_Icon" + label_ref="Command_MyLand_Label" + tooltip_ref="Command_MyLand_Tooltip" + function="Floater.ToolbarToggle" + param="myland" + /> + <command name="mystuff" + icon="Command_MyStuff_Icon" + label_ref="Command_MyStuff_Label" + tooltip_ref="Command_MyStuff_Tooltip" + function="Floater.ToolbarToggle" + param="mystuff" + /> + <command name="people" + icon="Command_People_Icon" + label_ref="Command_People_Label" + tooltip_ref="Command_People_Tooltip" + function="Floater.ToolbarToggle" + param="people" + /> <command name="places" icon="Command_Places_Icon" label_ref="Command_Places_Label" @@ -14,4 +91,53 @@ function="Floater.ToolbarToggle" param="places" /> + <command name="search" + icon="Command_Search_Icon" + label_ref="Command_Search_Label" + tooltip_ref="Command_Search_Tooltip" + function="Floater.ToolbarToggle" + param="search" + /> + <command name="settings" + icon="Command_Settings_Icon" + label_ref="Command_Settings_Label" + tooltip_ref="Command_Settings_Tooltip" + function="Floater.ToolbarToggle" + param="settings" + /> + <command name="shop" + icon="Command_Shop_Icon" + label_ref="Command_Shop_Label" + tooltip_ref="Command_Shop_Tooltip" + function="Floater.ToolbarToggle" + param="shop" + /> + <command name="snapshot" + icon="Command_Snapshot_Icon" + label_ref="Command_Snapshot_Label" + tooltip_ref="Command_Snapshot_Tooltip" + function="Floater.ToolbarToggle" + param="snapshot" + /> + <command name="speak" + icon="Command_Speak_Icon" + label_ref="Command_Speak_Label" + tooltip_ref="Command_Speak_Tooltip" + function="Floater.ToolbarToggle" + param="speak" + /> + <command name="upload" + icon="Command_Upload_Icon" + label_ref="Command_Upload_Label" + tooltip_ref="Command_Upload_Tooltip" + function="Floater.ToolbarToggle" + param="upload" + /> + <command name="view" + icon="Command_View_Icon" + label_ref="Command_View_Label" + tooltip_ref="Command_View_Tooltip" + function="Floater.ToolbarToggle" + param="view" + /> </commands> diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 598e39730c..d68594097c 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -125,8 +125,26 @@ with the same filename but different name <texture name="Checkbox_Press" file_name="widgets/Checkbox_Press.png" preload="true" /> <texture name="Check_Mark" file_name="icons/check_mark" preload="true" /> - <texture name="Command_Avatar_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Places_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Avatar_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Build_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Chat_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Compass_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Gestures_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_HowTo_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Landmarks_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Map_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Move_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_MyLand_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_MyStuff_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_People_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Places_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Search_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Settings_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Shop_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Snapshot_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Speak_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_Upload_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_View_Icon" file_name="icons/SL_Logo.png" preload="true" /> <texture name="ComboButton_Disabled" file_name="widgets/ComboButton_Disabled.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> <texture name="ComboButton_Selected" file_name="widgets/ComboButton_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 3b986664db..d4c2bc50ca 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3653,8 +3653,44 @@ Try enclosing path to the editor with double quotes. <!-- commands --> <string name="Command_Avatar_Label">Avatar</string> - <string name="Command_Avatar_Tooltip">Customize your avatar</string> + <string name="Command_Avatar_Tooltip">Change the appearance of your avatar</string> + <string name="Command_Build_Label">Build</string> + <string name="Command_Build_Tooltip">Building, reshaping terrain</string> + <string name="Command_Chat_Label">Chat</string> + <string name="Command_Chat_Tooltip">Chat with people nearby</string> + <string name="Command_Compass_Label">Compass</string> + <string name="Command_Compass_Tooltip"></string> + <string name="Command_Gestures_Label">Gestures</string> + <string name="Command_Gestures_Tooltip"></string> + <string name="Command_HowTo_Label">How To</string> + <string name="Command_HowTo_Tooltip"></string> + <string name="Command_Landmarks_Label">Landmarks</string> + <string name="Command_Landmarks_Tooltip"></string> + <string name="Command_Map_Label">Map</string> + <string name="Command_Map_Tooltip"></string> + <string name="Command_Move_Label">Move</string> + <string name="Command_Move_Tooltip"></string> + <string name="Command_MyLand_Label">My Land</string> + <string name="Command_MyLand_Tooltip">Information about the land you're visiting</string> + <string name="Command_MyStuff_Label">My Stuff</string> + <string name="Command_MyStuff_Tooltip">View and use your belongings</string> + <string name="Command_People_Label">People</string> + <string name="Command_People_Tooltip"></string> <string name="Command_Places_Label">Places</string> <string name="Command_Places_Tooltip">Destination guide</string> + <string name="Command_Search_Label">Search</string> + <string name="Command_Search_Tooltip">Find...</string> + <string name="Command_Settings_Label">Settings</string> + <string name="Command_Settings_Tooltip">Preferences</string> + <string name="Command_Shop_Label">Shop</string> + <string name="Command_Shop_Tooltip"></string> + <string name="Command_Snapshot_Label">Snapshot</string> + <string name="Command_Snapshot_Tooltip">Take a picture</string> + <string name="Command_Speak_Label">Speak</string> + <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string> + <string name="Command_Upload_Label">Upload</string> + <string name="Command_Upload_Tooltip"></string> + <string name="Command_View_Label">View</string> + <string name="Command_View_Tooltip">Changing your view of the world</string> </strings> |