Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/siana/SingularityViewer.git

Browse Source
This commit is contained in:
Shyotl
2011-03-15 02:36:25 -05:00
parent ef4c050e35 68fa3ae13c
commit 0eab7bd2a5
18 changed files with 158 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
indra/newview/skins/default/xui/en-us/floater_teleport_history.xml
View File

@@ -1,46 +1,28 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="false"
min_width="470" min_height="250" width="470" height="250" name="teleporthistory"
rect_control="FloaterTeleportHistoryRect" title="Teleport History">
<tab_container label="TPlistTabs" bottom="40" height="185" left="5" mouse_opaque="false" name="tplisttabs"
tab_min_width="50" tab_position="top" width="460" bg_opaque_color="0,0,0,0.0">
<panel border="true" bottom="-185" follows="left|top|right|bottom" height="185"
label="Teleported into" left="2" mouse_opaque="true" name="TP-in" width="455">
<scroll_list background_visible="true" draw_border="true" draw_stripes="true"
draw_heading="true" follows="left|top|right|bottom" left="2" top="5" width="450"
height="175" bottom_delta="-177" multi_select="false" name="places_list_in">
<column dynamicwidth="true" label="Region" name="region" />
<column dynamicwidth="true" label="Position" name="position" />
<column dynamicwidth="true" label="Visited" name="visited" />
<!--Hidden fields, used as storage for prebuilt strings, please keep at width 0-->
<column width="0" label="SLURL" name="slurl" />
<column width="0" label="Sim String" name="simstring" />
</scroll_list>
</panel>
<panel border="true" bottom="-185" follows="left|top|right|bottom" height="185"
label="Teleported out of" left="2" mouse_opaque="true" name="TP-out" width="455">
<scroll_list background_visible="true" draw_border="true" draw_stripes="true"
draw_heading="true" follows="left|top|right|bottom" left="2" top="5" width="450"
height="175" bottom_delta="-177" multi_select="false" name="places_list_out">
<column dynamicwidth="true" label="Region" name="region" />
<column dynamicwidth="true" label="Position" name="position" />
<column dynamicwidth="true" label="Visited" name="visited" />
<!--Hidden fields, used as storage for prebuilt strings, please keep at width 0-->
<column width="0" label="SLURL" name="slurl" />
<column width="0" label="Sim String" name="simstring" />
</scroll_list>
</panel>
</tab_container>
<button
bottom_delta="-24" enabled="false" follows="left|bottom" font="SansSerif" halign="center"
width="90" height="20" label="Teleport" label_selected="Teleport"
left="10" mouse_opaque="true" name="teleport" tool_tip="Teleport to selected location" />
<button bottom_delta="0" enabled="false" follows="left|bottom" font="SansSerif" halign="center"
height="20" label="Show On Map" label_selected="Show On Map"
left_delta="100" mouse_opaque="true" name="show_on_map"
tool_tip="Center map on this location" width="125" />
<button bottom_delta="0" enabled="false" follows="bottom|right" font="SansSerif"
height="20" label="Copy SLURL to clipboard" left="-230" name="copy_slurl"
tool_tip="Copies current location as SLURL to be used on the web."
width="222" />
</floater>
<floater name="teleporthistory" title="Teleport History" rect_control="FloaterTeleportHistoryRect"
can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
min_width="550" min_height="150" width="550" height="200">
<scroll_list name="places_list" can_resize="true" multi_select="false"
background_visible="true" draw_border="true" draw_stripes="true" draw_heading="true"
height="150" width="530" bottom_delta="-170" top="10" left="10" follows="left|top|right|bottom">
<column name="parcel" label="Parcel" dynamicwidth="true" />
<column name="region" label="Region" width="150" />
<column name="position" label="Position" width="90" />
<column name="visited" label="Visited" width="110" />
<!--Hidden fields, used as storage for prebuilt strings, please keep at width 0-->
<column name="slurl" label="" width="0" />
<column name="simstring" label="" width="0" />
</scroll_list>
<button name="teleport" label="Teleport" tool_tip="Teleport to selected location"
enabled="false" mouse_opaque="true" font="SansSerif" halign="center"
height="20" width="90" bottom_delta="-24" left="10" follows="left|bottom"
/>
<button name="show_on_map" label="Show on map" tool_tip="Center map on selected location."
enabled="false" mouse_opaque="true" font="SansSerif" halign="center"
height="20" width="125" bottom_delta="0" left_delta="100" follows="left|bottom"
/>
<button name="copy_slurl" label="Copy SLURL to clipboard" tool_tip="Copy selected location as SLURL."
enabled="false" mouse_opaque="true" font="SansSerif" halign="center"
height="20" width="180" bottom_delta="0" left_delta="135" follows="left|bottom"
/>
</floater>

12
indra/newview/skins/default/xui/en-us/fonts.xml
View File

@@ -21,13 +21,13 @@
</font>
<font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
<file>"MtBkLfRg.ttf"</file>
<file>DroidSans.ttf</file>
</font>
<font name="SansSerifBold"
comment="Name of bold sans-serif font"
font_style="Bold">
<file>MtBdLfRg.ttf</file>
<file>DroidSans-Bold.ttf</file>
</font>
<font name="Monospace"
@@ -92,19 +92,19 @@
/>
<font_size name="Huge"
comment="Size of huge font (points, or 1/72 of an inch)"
size="16.0"
size="14.0"
/>
<font_size name="Large"
comment="Size of large font (points, or 1/72 of an inch)"
size="12.0"
size="11.0"
/>
<font_size name="Medium"
comment="Size of medium font (points, or 1/72 of an inch)"
size="10.0"
size="9.5"
/>
<font_size name="Small"
comment="Size of small font (points, or 1/72 of an inch)"
size="9"
size="8.5"
/>
</fonts>

10
indra/newview/skins/default/xui/en-us/panel_status_bar.xml
View File

@@ -15,21 +15,21 @@
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-20" disabled_color="BalanceTextColor" drop_shadow_visible="true"
enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
halign="right" height="18" left="-210" mouse_opaque="true"
halign="right" height="18" left="-230" mouse_opaque="true"
name="BalanceText" text_color="BalanceTextColor" tool_tip="Account Balance"
v_pad="2" width="76">
v_pad="2" width="86">
Loading...
</text>
<button bottom="-18" enabled="true" follows="right|bottom" font="SansSerifSmall"
halign="center" height="18"
image_selected="button_enabled_selected_32x128.tga"
image_unselected="button_enabled_32x128.tga" label="[CURRENCY]"
left="-210" mouse_opaque="true" name="buycurrency" scale_image="true"
tool_tip="Buy currency" width="36" />
left="-220" mouse_opaque="true" name="buycurrency" scale_image="true"
tool_tip="Buy currency" width="24" />
<text type="string" length="12" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-20" disabled_color="TimeTextColor" drop_shadow_visible="true"
enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
halign="right" height="18" left="-300" mouse_opaque="true" name="TimeText"
halign="right" height="18" left="-310" mouse_opaque="true" name="TimeText"
text_color="TimeTextColor" tool_tip="Current Time (Pacific)" v_pad="2" width="80">
12:00 AM
</text>