Added Link/Unlink buttons to the Tools floater

author: McCabe Maxsted 2009-06-11 04:28:24 -0700
committer: McCabe Maxsted 2009-06-11 04:28:24 -0700
commit: 32bb4ace5451a510721158f4cd07b62de1df9a11 (patch)
tree: a30fcc50027a8b040543989e95084d1e19ba0180 /linden/indra/newview/skins/default
parent: Added pulldown label and fixed combobox not hiding (diff)
download: meta-impy-32bb4ace5451a510721158f4cd07b62de1df9a11.zip
meta-impy-32bb4ace5451a510721158f4cd07b62de1df9a11.tar.gz
meta-impy-32bb4ace5451a510721158f4cd07b62de1df9a11.tar.bz2
meta-impy-32bb4ace5451a510721158f4cd07b62de1df9a11.tar.xz
1 files changed, 32 insertions, 26 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index b649614..18d56b4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -79,43 +79,49 @@
        <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
             initial_value="false" label="Select Faces to Texture" left="4" mouse_opaque="true"
             name="radio select face" radio_style="true" width="114" />
-        <check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
+  <check_box bottom_delta="-22" control_name="SnapEnabled" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false"
+             font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
-             label="Edit linked parts" left="4" mouse_opaque="true"
+             left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
-             name="checkbox edit linked parts" width="114" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-        <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+             height="16" label="Options..." label_selected="Options..." left_delta="75"
+             mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
             bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
             font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6"
             mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">
-                Ruler mode:
+    Ruler mode:
-        </text>
+  </text>
-        <combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"
+  <combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"
             left_delta="74" max_chars="20" mouse_opaque="true"
             name="combobox grid mode" width="86">
-                <combo_item name="World" value="World">
+    <combo_item name="World" value="World">
-                        World
+      World
-                </combo_item>
+    </combo_item>
-                <combo_item name="Local" value="Local">
+    <combo_item name="Local" value="Local">
-                        Local
+      Local
-                </combo_item>
+    </combo_item>
-                <combo_item name="Reference" value="Reference">
+    <combo_item name="Reference" value="Reference">
-                        Reference
+      Reference
-                </combo_item>
+    </combo_item>
-        </combo_box>
+  </combo_box>
-        <check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
+  <check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="false"
             label="Stretch Both Sides" left="143" mouse_opaque="true"
             name="checkbox uniform" width="134" />
-        <check_box bottom_delta="-15" control_name="ScaleStretchTextures" follows="left|top"
+  <check_box bottom_delta="-15" control_name="ScaleStretchTextures" follows="left|top"
             font="SansSerifSmall" height="16" initial_value="true"
             label="Stretch Textures" left_delta="0" mouse_opaque="true"
             name="checkbox stretch textures" width="134" />
-        <check_box bottom_delta="-19" control_name="SnapEnabled" follows="left|top"
+  <check_box bottom_delta="-15" control_name="EditLinkedParts" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
+             font="SansSerifSmall" height="16" initial_value="false"
-             left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
+             label="Edit linked parts" left="143" mouse_opaque="true"
-        <button bottom_delta="-14" follows="left|top" font="SansSerifSmall" halign="center"
+             name="checkbox edit linked parts" width="114" />
-             height="16" label="Options..." label_selected="Options..." left_delta="20"
+  <button bottom_delta="-18" follows="left|top" font="SansSerifSmall"
-             mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
+          halign="center" height="18" label="Link" label_selected="Link"
+          right="-5" mouse_opaque="true" name="link_btn" width="78" />
+  <button bottom_delta="-20" follows="left|top" font="SansSerifSmall"
+          halign="center" height="18" label="Unlink" label_selected="Unlink"
+          right="-5" mouse_opaque="true" name="unlink_btn" width="78" />
 <!-- Help text -->
author	McCabe Maxsted	2009-06-11 04:28:24 -0700
committer	McCabe Maxsted	2009-06-11 04:28:24 -0700
commit	32bb4ace5451a510721158f4cd07b62de1df9a11 (patch)
tree	a30fcc50027a8b040543989e95084d1e19ba0180 /linden/indra/newview/skins/default
parent	Added pulldown label and fixed combobox not hiding (diff)
download	meta-impy-32bb4ace5451a510721158f4cd07b62de1df9a11.zip meta-impy-32bb4ace5451a510721158f4cd07b62de1df9a11.tar.gz meta-impy-32bb4ace5451a510721158f4cd07b62de1df9a11.tar.bz2 meta-impy-32bb4ace5451a510721158f4cd07b62de1df9a11.tar.xz

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml index b649614..18d56b4 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -79,43 +79,49 @@
79	<check_box bottom_delta="-15" follows="left\|top" font="SansSerifSmall" height="16"	79	<check_box bottom_delta="-15" follows="left\|top" font="SansSerifSmall" height="16"
80	initial_value="false" label="Select Faces to Texture" left="4" mouse_opaque="true"	80	initial_value="false" label="Select Faces to Texture" left="4" mouse_opaque="true"
81	name="radio select face" radio_style="true" width="114" />	81	name="radio select face" radio_style="true" width="114" />
82	<check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left\|top"	82	<check_box bottom_delta="-22" control_name="SnapEnabled" follows="left\|top"
83	font="SansSerifSmall" height="16" initial_value="false"	83	font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
84	label="Edit linked parts" left="4" mouse_opaque="true"	84	left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
85	name="checkbox edit linked parts" width="114" />	85	<button bottom_delta="0" follows="left\|top" font="SansSerifSmall" halign="center"
86	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"	86	height="16" label="Options..." label_selected="Options..." left_delta="75"
		87	mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
		88	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
87	bottom_delta="-20" drop_shadow_visible="true" follows="left\|top"	89	bottom_delta="-20" drop_shadow_visible="true" follows="left\|top"
88	font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6"	90	font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6"
89	mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">	91	mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">
90	Ruler mode:	92	Ruler mode:
91	</text>	93	</text>
92	<combo_box allow_text_entry="false" bottom_delta="-4" follows="left\|top" height="20"	94	<combo_box allow_text_entry="false" bottom_delta="-4" follows="left\|top" height="20"
93	left_delta="74" max_chars="20" mouse_opaque="true"	95	left_delta="74" max_chars="20" mouse_opaque="true"
94	name="combobox grid mode" width="86">	96	name="combobox grid mode" width="86">
95	<combo_item name="World" value="World">	97	<combo_item name="World" value="World">
96	World	98	World
97	</combo_item>	99	</combo_item>
98	<combo_item name="Local" value="Local">	100	<combo_item name="Local" value="Local">
99	Local	101	Local
100	</combo_item>	102	</combo_item>
101	<combo_item name="Reference" value="Reference">	103	<combo_item name="Reference" value="Reference">
102	Reference	104	Reference
103	</combo_item>	105	</combo_item>
104	</combo_box>	106	</combo_box>
105	<check_box bottom="-70" control_name="ScaleUniform" follows="left\|top"	107	<check_box bottom="-70" control_name="ScaleUniform" follows="left\|top"
106	font="SansSerifSmall" height="16" initial_value="false"	108	font="SansSerifSmall" height="16" initial_value="false"
107	label="Stretch Both Sides" left="143" mouse_opaque="true"	109	label="Stretch Both Sides" left="143" mouse_opaque="true"
108	name="checkbox uniform" width="134" />	110	name="checkbox uniform" width="134" />
109	<check_box bottom_delta="-15" control_name="ScaleStretchTextures" follows="left\|top"	111	<check_box bottom_delta="-15" control_name="ScaleStretchTextures" follows="left\|top"
110	font="SansSerifSmall" height="16" initial_value="true"	112	font="SansSerifSmall" height="16" initial_value="true"
111	label="Stretch Textures" left_delta="0" mouse_opaque="true"	113	label="Stretch Textures" left_delta="0" mouse_opaque="true"
112	name="checkbox stretch textures" width="134" />	114	name="checkbox stretch textures" width="134" />
113	<check_box bottom_delta="-19" control_name="SnapEnabled" follows="left\|top"	115	<check_box bottom_delta="-15" control_name="EditLinkedParts" follows="left\|top"
114	font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"	116	font="SansSerifSmall" height="16" initial_value="false"
115	left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />	117	label="Edit linked parts" left="143" mouse_opaque="true"
116	<button bottom_delta="-14" follows="left\|top" font="SansSerifSmall" halign="center"	118	name="checkbox edit linked parts" width="114" />
117	height="16" label="Options..." label_selected="Options..." left_delta="20"	119	<button bottom_delta="-18" follows="left\|top" font="SansSerifSmall"
118	mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />	120	halign="center" height="18" label="Link" label_selected="Link"
		121	right="-5" mouse_opaque="true" name="link_btn" width="78" />
		122	<button bottom_delta="-20" follows="left\|top" font="SansSerifSmall"
		123	halign="center" height="18" label="Unlink" label_selected="Unlink"
		124	right="-5" mouse_opaque="true" name="unlink_btn" width="78" />
119		125
120	<!-- Help text -->	126	<!-- Help text -->
121		127