diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
8 files changed, 506 insertions, 56 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_joystick.xml b/indra/newview/skins/default/xui/en/floater_joystick.xml index e6f0420698..597744238c 100644 --- a/indra/newview/skins/default/xui/en/floater_joystick.xml +++ b/indra/newview/skins/default/xui/en/floater_joystick.xml @@ -3,9 +3,9 @@ legacy_header_height="18" height="500" layout="topleft" - name="Joystick" + name="3Dconnexion Device" help_topic="Viewerhelp:Joystick_Configuration" - title="JOYSTICK CONFIGURATION" + title="3DCONNEXION DEVICE CONFIGURATION" width="569"> <floater.string name="JoystickDisabled"> @@ -22,7 +22,7 @@ width="50" mouse_opaque="false" name="joystick_lbl"> - Joystick: + Device: </text> <combo_box allow_text_entry="false" @@ -35,7 +35,7 @@ <spinner bottom="56" height="10" - control_name="JoystickAxis1" + control_name="Axis1" decimal_digits="0" increment="1" label="X Axis Mapping" @@ -44,12 +44,12 @@ left="20" max_val="5" min_val="-1" - name="JoystickAxis1" + name="Axis1" width="140" /> <spinner bottom_delta="0" height="10" - control_name="JoystickAxis2" + control_name="Axis2" decimal_digits="0" increment="1" label="Y Axis Mapping" @@ -58,12 +58,12 @@ left="190" max_val="5" min_val="-1" - name="JoystickAxis2" + name="Axis2" width="140" /> <spinner bottom_delta="0" height="10" - control_name="JoystickAxis0" + control_name="Axis0" decimal_digits="0" increment="1" label="Z Axis Mapping" @@ -72,12 +72,12 @@ left="360" max_val="5" min_val="-1" - name="JoystickAxis0" + name="Axis0" width="140" /> <spinner bottom="76" height="10" - control_name="JoystickAxis4" + control_name="Axis4" decimal_digits="0" increment="1" label="Pitch Mapping" @@ -86,12 +86,12 @@ left="20" max_val="5" min_val="-1" - name="JoystickAxis4" + name="Axis4" width="140" /> <spinner bottom_delta="0" height="10" - control_name="JoystickAxis5" + control_name="Axis5" decimal_digits="0" increment="1" label="Yaw Mapping" @@ -100,12 +100,12 @@ left="190" max_val="5" min_val="-1" - name="JoystickAxis5" + name="Axis5" width="140" /> <spinner bottom_delta="0" height="10" - control_name="JoystickAxis3" + control_name="Axis3" decimal_digits="0" increment="1" label="Roll Mapping" @@ -114,12 +114,12 @@ left="360" max_val="5" min_val="-1" - name="JoystickAxis3" + name="Axis3" width="140" /> <spinner bottom="96" height="10" - control_name="JoystickAxis6" + control_name="Axis6" decimal_digits="0" increment="1" label="Zoom Mapping" @@ -128,7 +128,7 @@ left="20" max_val="5" min_val="-1" - name="JoystickAxis6" + name="Axis6" width="140" /> <check_box bottom_delta="18" @@ -203,7 +203,7 @@ width="60" /> <stat_view height="270" - label="Joystick Monitor" + label="Axis Monitor" layout="topleft" left="359" name="axis_view" diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index 4614f2f06c..e0dc538af4 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -171,12 +171,12 @@ help_topic="preferences_controls_tab" name="controls" /> <panel - class="panel_preference_game_controls" - filename="panel_preferences_game_controls.xml" - label="Game Controls" + class="panel_preference_game_control" + filename="panel_preferences_game_control.xml" + label="Game Control" layout="topleft" - help_topic="preferences_game_controls_tab" - name="gamecontrols" /> + help_topic="preferences_game_control_tab" + name="game_control" /> </tab_container> </floater> diff --git a/indra/newview/skins/default/xui/en/game_control_table_camera_rows.xml b/indra/newview/skins/default/xui/en/game_control_table_camera_rows.xml new file mode 100644 index 0000000000..b2381c8493 --- /dev/null +++ b/indra/newview/skins/default/xui/en/game_control_table_camera_rows.xml @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<contents> + <rows + enabled="false" + name="camera_actions" + value=""> + <columns + type="icontext" + column="action" + font="SansSerif" + halign="left" + label="Camera" + name="action" + value="Cam_FreeCam_Off" /> + </rows> + <rows + name="move" + value="move"> + <columns + column="action" + font="SansSerif" + halign="left" + name="action" + tool_tip="Camera move forward/backward" + value="Move Forward" /> + </rows> + <rows + name="pan" + value="pan"> + <columns + column="action" + font="SansSerif" + halign="left" + name="action" + tool_tip="Camera pan left/right" + value="Pan Left" /> + </rows> + <rows + name="rise" + value="rise"> + <columns + column="action" + font="SansSerif" + halign="left" + name="action" + tool_tip="Camera rise/fall" + value="Rise Up" /> + </rows> + <rows + name="pitch" + value="pitch"> + <columns + column="action" + font="SansSerif" + halign="left" + name="action" + tool_tip="Camera adjust pitch" + value="Pitch Down" /> + </rows> + <rows + name="yaw" + value="yaw"> + <columns + column="action" + font="SansSerif" + halign="left" + name="action" + tool_tip="Camera turn left/right" + value="Yaw CCW" /> + </rows> + <rows + name="zoom" + value="zoom"> + <columns + column="action" + font="SansSerif" + halign="left" + name="action" + tool_tip="Camera zoom in/out" + value="Zoom In" /> + </rows> + <!-- + <rows + name="roll_ccw" + value="roll_ccw"> + <columns + column="action" + font="SansSerif" + halign="left" + name="action" + tool_tip="Camera roll counterclockwise" + value="Roll Counterclockwise" /> + </rows> + <rows + name="roll_cw" + value="roll_cw"> + <columns + column="action" + font="SansSerif" + halign="left" + name="action" + tool_tip="Camera roll clockwise" + value="Roll Clockwise" /> + </rows> + --> +</contents> diff --git a/indra/newview/skins/default/xui/en/game_control_table_columns.xml b/indra/newview/skins/default/xui/en/game_control_table_columns.xml new file mode 100644 index 0000000000..f88fc8305c --- /dev/null +++ b/indra/newview/skins/default/xui/en/game_control_table_columns.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<contents> + <columns + relative_width="0.25" + label="Action" + name="action" /> + <columns + relative_width="0.25" + label="GameControl" + name="index" /> + <columns + relative_width="0.50" + label=" " + name="foo" /> +</contents> diff --git a/indra/newview/skins/default/xui/en/game_control_table_rows.xml b/indra/newview/skins/default/xui/en/game_control_table_rows.xml new file mode 100644 index 0000000000..90e6990842 --- /dev/null +++ b/indra/newview/skins/default/xui/en/game_control_table_rows.xml @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<contents> + <rows + enabled="false" + name="move_actions" + value=""> + <columns + type="icontext" + column="action" + font="SansSerif" + halign="left" + label="Move Actions" + name="action" + value="Move_Walk_Off" /> + </rows> + <rows + name="push" + value="push"> + <columns + column="action" + font="SansSerif" + halign="left" + name="action" + value="Walk Forward" /> + </rows> + <rows + name="slide" + value="slide"> + <columns + column="action" + font="SansSerif" + halign="left" + name="action" + value="Strafe Left" /> + </rows> + <rows + name="jump" + value="jump"> + <columns + column="action" + font="SansSerif" + halign="left" + name="action" + value="Jump Up" /> + </rows> + <rows + name="turn" + value="turn"> + <columns + column="action" + font="SansSerif" + halign="left" + name="action" + value="Turn Left" /> + </rows> + <rows + name="look" + value="look"> + <columns + column="action" + font="SansSerif" + halign="left" + name="action" + value="Look Down" /> + </rows> + + <rows + name="stop" + value="stop"> + <columns + column="action" + font="SansSerif" + halign="left" + name="action" + value="Stop" /> + </rows> + <rows + name="toggle_run" + value="toggle_run"> + <columns + column="action" + font="SansSerif" + halign="left" + name="action" + value="Run" /> + </rows> + <rows + name="toggle_fly" + value="toggle_fly"> + <columns + column="action" + font="SansSerif" + halign="left" + name="action" + value="Fly" /> + </rows> + <rows + name="toggle_sit" + value="toggle_sit"> + <columns + column="action" + font="SansSerif" + halign="left" + name="action" + value="Sit" /> + </rows> + <rows + name="toggle_flycam" + value="toggle_flycam"> + <columns + column="action" + font="SansSerif" + halign="left" + name="action" + value="Flycam" /> + </rows> +</contents> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_game_control.xml b/indra/newview/skins/default/xui/en/panel_preferences_game_control.xml new file mode 100644 index 0000000000..d48c0fe0d2 --- /dev/null +++ b/indra/newview/skins/default/xui/en/panel_preferences_game_control.xml @@ -0,0 +1,244 @@ +<?xml version="1.0" encoding="utf-8"?> +<panel + border="true" + follows="all" + height="408" + label="Game Controls" + layout="topleft" + left="102" + name="gamecontrol" + top="1" + width="517"> + <check_box + control_name="GameControlToServer" + follows="top|left" + height="15" + label="Send GameControl Data to server" + layout="topleft" + left="10" + name="game_control_to_server" + top="6" + width="232"/> + <check_box + control_name="GameControlToAgent" + follows="top|left" + height="15" + label="GameControl moves avatar and flycam" + layout="topleft" + left="10" + name="game_control_to_agent" + top="27" + width="232"/> + <check_box + control_name="AgentToGameControl" + follows="top|left" + height="15" + label="Avatar and flycam actions interpreted as GameControl" + layout="topleft" + left="10" + name="agent_to_game_control" + top="48" + width="232"/> + <scroll_list + draw_heading="true" + follows="all" + layout="topleft" + column_padding="0" + selection_type="header" + top="66" + left="3" + bottom="-3" + right="-3" + can_sort="false" + multi_select="false" + name="action_table" + fg_disable_color="ScrollUnselectedColor"/> + <combo_box + height="23" + layout="topleft" + left="10" + name="input_channel_combo" + top_pad="5" + width="90"> + <combo_box.item + label="AXIS_0-" + name="AXIS_0-" + value="AXIS_0-"/> + <combo_box.item + label="AXIS_0+" + name="AXIS_0+" + value="AXIS_0+"/> + <combo_box.item + label="AXIS_1-" + name="AXIS_1-" + value="AXIS_1-"/> + <combo_box.item + label="AXIS_1+" + name="AXIS_1+" + value="AXIS_1+"/> + <combo_box.item + label="AXIS_2-" + name="AXIS_2-" + value="AXIS_2-"/> + <combo_box.item + label="AXIS_2+" + name="AXIS_2+" + value="AXIS_2+"/> + <combo_box.item + label="AXIS_3-" + name="AXIS_3-" + value="AXIS_3-"/> + <combo_box.item + label="AXIS_3+" + name="AXIS_3+" + value="AXIS_3+"/> + <combo_box.item + label="AXIS_4-" + name="AXIS_4-" + value="AXIS_4-"/> + <combo_box.item + label="AXIS_4+" + name="AXIS_4+" + value="AXIS_4+"/> + <combo_box.item + label="AXIS_5-" + name="AXIS_5-" + value="AXIS_5-"/> + <combo_box.item + label="AXIS_5+" + name="AXIS_5+" + value="AXIS_5+"/> + <combo_box.item + label="BUTTON_0" + name="BUTTON_0" + value="BUTTON_0"/> + <combo_box.item + label="BUTTON_1" + name="BUTTON_1" + value="BUTTON_1"/> + <combo_box.item + label="BUTTON_2" + name="BUTTON_2" + value="BUTTON_2"/> + <combo_box.item + label="BUTTON_3" + name="BUTTON_3" + value="BUTTON_3"/> + <combo_box.item + label="BUTTON_4" + name="BUTTON_4" + value="BUTTON_4"/> + <combo_box.item + label="BUTTON_5" + name="BUTTON_5" + value="BUTTON_5"/> + <combo_box.item + label="BUTTON_6" + name="BUTTON_6" + value="BUTTON_6"/> + <combo_box.item + label="BUTTON_7" + name="BUTTON_7" + value="BUTTON_7"/> + <combo_box.item + label="BUTTON_8" + name="BUTTON_8" + value="BUTTON_8"/> + <combo_box.item + label="BUTTON_9" + name="BUTTON_9" + value="BUTTON_9"/> + <combo_box.item + label="BUTTON_10" + name="BUTTON_10" + value="BUTTON_10"/> + <combo_box.item + label="BUTTON_11" + name="BUTTON_11" + value="BUTTON_11"/> + <combo_box.item + label="BUTTON_12" + name="BUTTON_12" + value="BUTTON_12"/> + <combo_box.item + label="BUTTON_13" + name="BUTTON_13" + value="BUTTON_13"/> + <combo_box.item + label="BUTTON_14" + name="BUTTON_14" + value="BUTTON_14"/> + <combo_box.item + label="BUTTON_15" + name="BUTTON_15" + value="BUTTON_15"/> + <combo_box.item + label="BUTTON_16" + name="BUTTON_16" + value="BUTTON_16"/> + <combo_box.item + label="BUTTON_17" + name="BUTTON_17" + value="BUTTON_17"/> + <combo_box.item + label="BUTTON_18" + name="BUTTON_18" + value="BUTTON_18"/> + <combo_box.item + label="BUTTON_19" + name="BUTTON_19" + value="BUTTON_19"/> + <combo_box.item + label="BUTTON_20" + name="BUTTON_20" + value="BUTTON_20"/> + <combo_box.item + label="BUTTON_21" + name="BUTTON_21" + value="BUTTON_21"/> + <combo_box.item + label="BUTTON_22" + name="BUTTON_22" + value="BUTTON_22"/> + <combo_box.item + label="BUTTON_23" + name="BUTTON_23" + value="BUTTON_23"/> + <combo_box.item + label="BUTTON_24" + name="BUTTON_24" + value="BUTTON_24"/> + <combo_box.item + label="BUTTON_25" + name="BUTTON_25" + value="BUTTON_25"/> + <combo_box.item + label="BUTTON_26" + name="BUTTON_26" + value="BUTTON_26"/> + <combo_box.item + label="BUTTON_27" + name="BUTTON_27" + value="BUTTON_27"/> + <combo_box.item + label="BUTTON_28" + name="BUTTON_28" + value="BUTTON_28"/> + <combo_box.item + label="BUTTON_29" + name="BUTTON_29" + value="BUTTON_29"/> + <combo_box.item + label="BUTTON_30" + name="BUTTON_30" + value="BUTTON_30"/> + <combo_box.item + label="BUTTON_31" + name="BUTTON_31" + value="BUTTON_31"/> + <combo_box.item + label="NONE" + name="NONE" + value="NONE"/> + </combo_box> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_game_controls.xml b/indra/newview/skins/default/xui/en/panel_preferences_game_controls.xml deleted file mode 100644 index 4b693e8955..0000000000 --- a/indra/newview/skins/default/xui/en/panel_preferences_game_controls.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<panel - border="true" - follows="all" - height="408" - label="Game Controls" - layout="topleft" - left="102" - name="gamecontrols" - top="1" - width="517"> - <check_box - control_name="EnableGameControlInput" - follows="top|left" - height="15" - label="Send GameControl Input to server" - layout="topleft" - left="10" - name="enable_game_control_input" - top="6" - width="232"/> - <check_box - control_name="EnableGameControlKeyboardInput" - follows="top|left" - height="15" - label="Include otherwise 'unhandled' Keyboard events in GameControl Input" - layout="topleft" - left="10" - name="game_control_keyboard_input" - top="27" - width="232"/> -</panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml index 0412466b4f..8a372256dc 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml @@ -270,7 +270,7 @@ width="200" /> <button height="23" - label="Other Devices" + label="3Dconnexion devices" left="30" name="joystick_setup_button" top="30" |