diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/commands.xml | 46 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 22 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_test_button.xml | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_toybox.xml | 13 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/button.xml | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/toolbar.xml | 6 |
6 files changed, 68 insertions, 27 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 3a91ef490d..1fff95417b 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -7,6 +7,8 @@ tooltip_ref="Command_AboutLand_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="about_land" + is_running_function="Floater.IsOpen" + is_running_parameters="about_land" /> <command name="appearance" available_in_toybox="true" @@ -15,6 +17,8 @@ tooltip_ref="Command_Appearance_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="appearance" + is_running_function="Floater.IsOpen" + is_running_parameters="appearance" /> <command name="avatar" available_in_toybox="true" @@ -23,6 +27,8 @@ tooltip_ref="Command_Avatar_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="avatar_picker" + is_running_function="Floater.IsOpen" + is_running_parameters="avatar_picker" /> <command name="build" available_in_toybox="true" @@ -31,6 +37,8 @@ tooltip_ref="Command_Build_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="build" + is_running_function="Floater.IsOpen" + is_running_parameters="build" /> <command name="chat" available_in_toybox="true" @@ -39,6 +47,8 @@ tooltip_ref="Command_Chat_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="chat_bar" + is_running_function="Floater.IsOpen" + is_running_parameters="chat_bar" /> <command name="compass" available_in_toybox="false" @@ -47,6 +57,8 @@ tooltip_ref="Command_Compass_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="compass" + is_running_function="Floater.IsOpen" + is_running_parameters="compass" /> <command name="destinations" available_in_toybox="true" @@ -55,6 +67,8 @@ tooltip_ref="Command_Destinations_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="destinations" + is_running_function="Floater.IsOpen" + is_running_parameters="destinations" /> <command name="gestures" available_in_toybox="true" @@ -63,6 +77,8 @@ tooltip_ref="Command_Gestures_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="gestures" + is_running_function="Floater.IsOpen" + is_running_parameters="gestures" /> <command name="howto" available_in_toybox="true" @@ -71,6 +87,8 @@ tooltip_ref="Command_HowTo_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="help_browser" + is_running_function="Floater.IsOpen" + is_running_parameters="help_browser" /> <command name="inventory" available_in_toybox="true" @@ -79,6 +97,8 @@ tooltip_ref="Command_Inventory_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="inventory" + is_running_function="Floater.IsOpen" + is_running_parameters="inventory" /> <command name="map" available_in_toybox="true" @@ -87,6 +107,8 @@ tooltip_ref="Command_Map_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="world_map" + is_running_function="Floater.IsOpen" + is_running_parameters="world_map" /> <command name="marketplace" available_in_toybox="true" @@ -95,6 +117,8 @@ tooltip_ref="Command_Marketplace_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="marketplace" + is_running_function="Floater.IsOpen" + is_running_parameters="marketplace" /> <command name="minimap" available_in_toybox="true" @@ -103,6 +127,8 @@ tooltip_ref="Command_MiniMap_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="mini_map" + is_running_function="Floater.IsOpen" + is_running_parameters="mini_map" /> <command name="move" available_in_toybox="true" @@ -111,6 +137,8 @@ tooltip_ref="Command_Move_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="moveview" + is_running_function="Floater.IsOpen" + is_running_parameters="moveview" /> <command name="people" available_in_toybox="true" @@ -119,6 +147,8 @@ tooltip_ref="Command_People_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="people" + is_running_function="Floater.IsOpen" + is_running_parameters="people" /> <command name="places" available_in_toybox="true" @@ -127,6 +157,8 @@ tooltip_ref="Command_Places_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="places" + is_running_function="Floater.IsOpen" + is_running_parameters="places" /> <command name="preferences" available_in_toybox="true" @@ -135,6 +167,8 @@ tooltip_ref="Command_Preferences_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="preferences" + is_running_function="Floater.IsOpen" + is_running_parameters="preferences" /> <command name="profile" available_in_toybox="true" @@ -143,6 +177,8 @@ tooltip_ref="Command_Profile_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="my_profile" + is_running_function="Floater.IsOpen" + is_running_parameters="my_profile" /> <command name="search" available_in_toybox="true" @@ -151,6 +187,8 @@ tooltip_ref="Command_Search_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="search" + is_running_function="Floater.IsOpen" + is_running_parameters="search" /> <command name="snapshot" available_in_toybox="true" @@ -159,6 +197,8 @@ tooltip_ref="Command_Snapshot_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="snapshot" + is_running_function="Floater.IsOpen" + is_running_parameters="snapshot" /> <command name="speak" available_in_toybox="true" @@ -167,6 +207,8 @@ tooltip_ref="Command_Speak_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="speak" + is_running_function="Floater.IsOpen" + is_running_parameters="speak" /> <command name="view" available_in_toybox="true" @@ -175,6 +217,8 @@ tooltip_ref="Command_View_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="camera" + is_running_function="Floater.IsOpen" + is_running_parameters="camera" /> <command name="voice" available_in_toybox="true" @@ -183,5 +227,7 @@ tooltip_ref="Command_Voice_Tooltip" execute_function="Floater.ToolbarToggle" execute_parameters="voice_controls" + is_running_function="Floater.IsOpen" + is_running_parameters="voice_controls" /> </commands> diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 7a641ea630..203bcab03a 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1150,28 +1150,6 @@ <key>Value</key> <integer>0</integer> </map> - <key>ButtonFlashCount</key> - <map> - <key>Comment</key> - <string>Number of flashes after which flashing buttons stay lit up</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>8</integer> - </map> - <key>ButtonFlashRate</key> - <map> - <key>Comment</key> - <string>Frequency at which buttons flash (hz)</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>1.25</real> - </map> <key>ButtonHPad</key> <map> <key>Comment</key> diff --git a/indra/newview/skins/default/xui/en/floater_test_button.xml b/indra/newview/skins/default/xui/en/floater_test_button.xml index bf0a774e76..9bc05107a2 100644 --- a/indra/newview/skins/default/xui/en/floater_test_button.xml +++ b/indra/newview/skins/default/xui/en/floater_test_button.xml @@ -78,7 +78,6 @@ <button bottom_delta="30" height="23" - highlight_color="EmphasisColor" label="Highlight" layout="topleft" name="highlight_color_button" /> diff --git a/indra/newview/skins/default/xui/en/floater_toybox.xml b/indra/newview/skins/default/xui/en/floater_toybox.xml index 972ae1487a..5c6fa5bc86 100644 --- a/indra/newview/skins/default/xui/en/floater_toybox.xml +++ b/indra/newview/skins/default/xui/en/floater_toybox.xml @@ -61,6 +61,19 @@ side="top" top="85"> <button_panel background_visible="false" /> + <button_icon_and_text image_unselected="PushButton_Off" + image_selected="PushButton_Off" + image_disabled_selected="PushButton_Disabled" + image_disabled="PushButton_Disabled" + label_color="ButtonLabelColor" + label_color_selected="ButtonLabelColor" + label_color_disabled="ButtonLabelDisabledColor" + label_color_disabled_selected="ButtonLabelDisabledColor" + image_color="ButtonImageColor" + image_color_disabled="ButtonImageColor" + flash_color="ButtonUnselectedFgColor" + hover_glow_amount="0.15" + display_pressed_state="false" /> </toolbar> <panel bevel_style="none" diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index 61d36468d7..e2baba92a3 100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml @@ -15,7 +15,6 @@ label_color_selected="ButtonLabelSelectedColor" label_color_disabled="ButtonLabelDisabledColor" label_color_disabled_selected="ButtonLabelSelectedDisabledColor" - highlight_color="ButtonUnselectedFgColor" image_color="ButtonImageColor" image_color_disabled="ButtonImageColor" flash_color="ButtonFlashBgColor" @@ -27,5 +26,9 @@ scale_image="true" handle_right_mouse="true" use_draw_context_alpha="true" - held_down_delay.seconds="0.5"> + held_down_delay.seconds="0.5" + button_flash_count="8" + button_flash_rate="1.25" + display_pressed_state="true" + > </button> diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml index 0c7e7cff56..1585166114 100644 --- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml +++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml @@ -21,7 +21,8 @@ chrome="true" image_overlay_alignment="left" use_ellipses="true" - auto_resize="true"/> + auto_resize="true" + flash_color="EmphasisColor"/> <button_icon pad_left="10" pad_right="10" desired_height="35" @@ -31,5 +32,6 @@ label="" chrome="true" use_ellipses="true" - auto_resize="true"/> + auto_resize="true" + flash_color="EmphasisColor"/> </toolbar> |