diff options
author | McCabe Maxsted | 2011-05-25 20:23:54 -0700 |
---|---|---|
committer | Jacek Antonelli | 2011-05-27 22:45:36 -0500 |
commit | b8e5b091681a31730cdbd60c5619ff9975287a38 (patch) | |
tree | 6e7e3f1d54c0db92152d382db9df770eb77340a6 /linden/indra/newview/skins/default | |
parent | Added URL parsing to group notice history messages (diff) | |
download | meta-impy-b8e5b091681a31730cdbd60c5619ff9975287a38.zip meta-impy-b8e5b091681a31730cdbd60c5619ff9975287a38.tar.gz meta-impy-b8e5b091681a31730cdbd60c5619ff9975287a38.tar.bz2 meta-impy-b8e5b091681a31730cdbd60c5619ff9975287a38.tar.xz |
Replaced the labels in the web browser window with icons based on those in the Open Icon Library (http://openiconlibrary.sourceforge.net)
Diffstat (limited to 'linden/indra/newview/skins/default')
-rw-r--r-- | linden/indra/newview/skins/default/textures/textures.xml | 5 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml | 43 |
2 files changed, 25 insertions, 23 deletions
diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml index 60fb4e0..9151ee9 100644 --- a/linden/indra/newview/skins/default/textures/textures.xml +++ b/linden/indra/newview/skins/default/textures/textures.xml | |||
@@ -397,5 +397,10 @@ | |||
397 | <texture name="media_btn_stoploading.png"/> | 397 | <texture name="media_btn_stoploading.png"/> |
398 | <texture name="media_panel_divider.png"/> | 398 | <texture name="media_panel_divider.png"/> |
399 | <texture name="media_panel_scrollbg.png"/> | 399 | <texture name="media_panel_scrollbg.png"/> |
400 | |||
401 | <texture name="go-previous-4.png"/> | ||
402 | <texture name="go-next-4.png"/> | ||
403 | <texture name="view-refresh-5.png"/> | ||
404 | <texture name="go-home-4.png"/> | ||
400 | 405 | ||
401 | </textures> | 406 | </textures> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml index c1bfdcc..76eee6f 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml | |||
@@ -3,20 +3,20 @@ | |||
3 | height="440" min_height="140" min_width="467" name="floater_about" | 3 | height="440" min_height="140" min_width="467" name="floater_about" |
4 | rect_control="FloaterMediaRect" title="Web Browser" width="560"> | 4 | rect_control="FloaterMediaRect" title="Web Browser" width="560"> |
5 | <layout_stack name="stack1" bottom="0" follows="left|right|top|bottom" left="10" top="-20" width="540"> | 5 | <layout_stack name="stack1" bottom="0" follows="left|right|top|bottom" left="10" top="-20" width="540"> |
6 | <layout_panel auto_resize="false" bottom="0" height="20" left="0" name="nav_controls" user_resize="false" | 6 | <layout_panel auto_resize="false" bottom="0" height="25" left="0" name="nav_controls" user_resize="false" |
7 | width="800"> | 7 | width="800"> |
8 | <button bottom="0" follows="left|top" height="20" label="Back" left="0" name="back" | 8 | <button bottom="0" follows="left|top" height="25" label="" image_overlay="go-previous-4.png" left="0" name="back" |
9 | width="55" /> | 9 | width="25" /> |
10 | <button bottom_delta="0" follows="left|top" height="20" label="Forward" left_delta="55" | 10 | <button bottom_delta="0" follows="left|top" height="25" label="" image_overlay="go-next-4.png" left_delta="27" |
11 | name="forward" width="68" /> | 11 | name="forward" width="25" /> |
12 | <button bottom_delta="0" enabled="false" follows="left|top" height="20" label="Reload" | 12 | <button bottom_delta="0" enabled="false" follows="left|top" height="25" label="" image_overlay="view-refresh-5.png" |
13 | left_delta="70" name="reload" width="70" /> | 13 | left_delta="27" name="reload" width="25" /> |
14 | <combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="20" | 14 | <combo_box allow_text_entry="true" bottom_delta="4" follows="left|top|right" height="20" |
15 | left_delta="75" max_chars="255" name="address" width="485" /> | 15 | left_delta="29" max_chars="255" name="address" width="622" /> |
16 | <button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go" | 16 | <button bottom_delta="-4" enabled="false" follows="right|top" height="25" label="Go" font="SansSerif" |
17 | left_delta="487" name="go" width="55" /> | 17 | left_delta="625" name="go" width="55" /> |
18 | <button bottom_delta="0" enabled="true" follows="right|top" height="20" label="Home" | 18 | <button bottom_delta="0" enabled="true" follows="right|top" height="25" label="" image_overlay="go-home-4.png" |
19 | left_delta="58" name="home" width="55" /> | 19 | left_delta="58" name="home" width="35" /> |
20 | </layout_panel> | 20 | </layout_panel> |
21 | <layout_panel auto_resize="false" bottom="0" height="20" left="0" name="time_controls" user_resize="false" | 21 | <layout_panel auto_resize="false" bottom="0" height="20" left="0" name="time_controls" user_resize="false" |
22 | width="800"> | 22 | width="800"> |
@@ -33,22 +33,19 @@ | |||
33 | </layout_panel> | 33 | </layout_panel> |
34 | <layout_panel auto_resize="false" bottom="0" height="20" left="0" | 34 | <layout_panel auto_resize="false" bottom="0" height="20" left="0" |
35 | name="parcel_owner_controls" user_resize="false" width="540"> | 35 | name="parcel_owner_controls" user_resize="false" width="540"> |
36 | <button bottom="0" enabled="false" follows="left|top" height="20" | 36 | <button bottom="0" enabled="false" follows="left|top" height="22" |
37 | label="Send Current URL to Parcel" left="0" name="assign" width="200" /> | 37 | label="Send Current URL To Parcel" left="0" name="assign" width="200" /> |
38 | </layout_panel> | 38 | </layout_panel> |
39 | <layout_panel auto_resize="true" bottom="0" height="20" left="0" name="external_controls" user_resize="false" | 39 | <layout_panel auto_resize="true" bottom="0" height="20" left="0" name="external_controls" user_resize="false" |
40 | width="540"> | 40 | width="540"> |
41 | <web_browser bottom="30" follows="left|right|top|bottom" left="0" name="browser" top="20" | 41 | <web_browser bottom="30" follows="left|right|top|bottom" left="0" name="browser" top="20" |
42 | width="540" /> | 42 | width="540" /> |
43 | <button bottom="5" follows="bottom|left" height="20" label="Open in My Web Browser" | 43 | <button bottom="4" follows="bottom|left" height="22" label="Open In External Browser" font="SansSerif" |
44 | left="0" name="open_browser" width="185" /> | 44 | left="0" name="open_browser" width="185" /> |
45 | <check_box bottom="5" control_name="UseExternalBrowser" follows="bottom|left" height="20" | 45 | <check_box bottom="6" control_name="UseExternalBrowser" follows="bottom|left" height="22" |
46 | label="Always open in my web browser" left_delta="184" name="open_always" | 46 | label="Always open in external browser" left_delta="190" name="open_always" width="200" /> |
47 | width="200" /> | 47 | <button bottom="4" enabled="false" follows="bottom|right" height="22" label="Set As Home" font="SansSerif" |
48 | <button bottom="5" enabled="false" follows="bottom|right" height="20" label="Set As Home" | 48 | left="-110" name="set_home" width="104" /> |
49 | left="-176" name="set_home" width="104" /> | ||
50 | <button bottom="5" follows="bottom|right" height="20" label="Close" left="-70" | ||
51 | name="close" width="70" /> | ||
52 | </layout_panel> | 49 | </layout_panel> |
53 | </layout_stack> | 50 | </layout_stack> |
54 | <string name="home_page_url"> | 51 | <string name="home_page_url"> |