diff options
author | callum <none@none> | 2010-12-01 19:02:53 -0800 |
---|---|---|
committer | callum <none@none> | 2010-12-01 19:02:53 -0800 |
commit | 88eabbd0776ed0c2ce923b23cda14b9f91445aa4 (patch) | |
tree | 2cb14d834c69d7d53887fbed88e1d28d2d1193fd /indra/newview/skins/default/xui | |
parent | 3f2f03923cc2789dc85d09fabfd19c7e92e7bfa9 (diff) |
SOCIAL-311 PARTIAL FIX (2) Media browser has too many oddities to be useful for viewer web apps
Latest traunch of fixes to new Web only content floater
Also removed line in test app that fails to build - have a note to fix later
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_web_content.xml | 275 |
1 files changed, 151 insertions, 124 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml index 777c67261a..62df206360 100644 --- a/indra/newview/skins/default/xui/en/floater_web_content.xml +++ b/indra/newview/skins/default/xui/en/floater_web_content.xml @@ -1,124 +1,151 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater - legacy_header_height="18" - can_resize="true" - height="440" - layout="topleft" - min_height="140" - min_width="467" - name="floater_web_content" - help_topic="floater_web_content" - save_rect="true" - auto_tile="true" - title="WEB CONTENT" - width="820"> - <floater.string - name="home_page_url"> - http://www.secondlife.com - </floater.string> - <layout_stack - bottom="440" - follows="left|right|top|bottom" - layout="topleft" - left="10" - name="stack1" - orientation="vertical" - top="20" - width="800"> - <layout_panel - auto_resize="false" - default_tab_group="1" - height="20" - layout="topleft" - left="0" - min_height="20" - name="nav_controls" - top="400" - user_resize="false" - width="800"> - <button - follows="left|top" - height="20" - label="Back" - layout="topleft" - left="0" - name="back" - top="0" - width="55"> - <button.commit_callback - function="MediaBrowser.Back" /> - </button> - <button - follows="left|top" - height="20" - label="Forward" - layout="topleft" - left_pad="3" - name="forward" - top_delta="0" - width="68"> - <button.commit_callback - function="MediaBrowser.Forward" /> - </button> - <button - enabled="false" - follows="left|top" - height="20" - label="Reload" - layout="topleft" - left_pad="2" - name="reload" - top_delta="0" - width="70"> - <button.commit_callback - function="MediaBrowser.Refresh" /> - </button> - <combo_box - allow_text_entry="true" - follows="left|top|right" - tab_group="1" - height="20" - layout="topleft" - left_pad="5" - max_chars="1024" - name="address" - combo_editor.select_on_focus="true" - top_delta="0" - width="540"> - <combo_box.commit_callback - function="MediaBrowser.EnterAddress" /> - </combo_box> - <button - enabled="false" - follows="right|top" - height="20" - label="Go" - layout="topleft" - left_pad="5" - name="go" - top_delta="0" - width="55"> - <button.commit_callback - function="MediaBrowser.Go" /> - </button> - </layout_panel> - - <layout_panel - height="40" - layout="topleft" - left_delta="0" - name="external_controls" - top_delta="0" - user_resize="false" - width="540"> - <web_browser - bottom="-30" - follows="all" - layout="topleft" - left="0" - name="webbrowser" - top="0" - width="540" /> - </layout_panel> - </layout_stack> -</floater> +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ can_resize="true"
+ height="440"
+ layout="topleft"
+ min_height="140"
+ min_width="467"
+ name="floater_web_content"
+ help_topic="floater_web_content"
+ save_rect="true"
+ auto_tile="true"
+ title="WEB CONTENT"
+ width="820">
+ <layout_stack
+ bottom="440"
+ follows="left|right|top|bottom"
+ layout="topleft"
+ left="5"
+ name="stack1"
+ orientation="vertical"
+ top="20"
+ width="810">
+ <layout_panel
+ auto_resize="false"
+ default_tab_group="1"
+ height="20"
+ layout="topleft"
+ left="0"
+ min_height="20"
+ name="nav_controls"
+ top="400"
+ user_resize="false"
+ width="800">
+ <button
+ follows="left|top"
+ height="20"
+ label="Back"
+ layout="topleft"
+ left="0"
+ name="back"
+ top="0"
+ width="35">
+ <button.commit_callback
+ function="WebContent.Back" />
+ </button>
+ <button
+ follows="left|top"
+ height="20"
+ label="Forward"
+ layout="topleft"
+ left_pad="3"
+ name="forward"
+ top_delta="0"
+ width="35">
+ <button.commit_callback
+ function="WebContent.Forward" />
+ </button>
+ <button
+ enabled="false"
+ follows="left|top"
+ height="20"
+ label="Reload"
+ layout="topleft"
+ left_pad="2"
+ name="reload"
+ top_delta="0"
+ width="35">
+ <button.commit_callback
+ function="WebContent.Reload" />
+ </button>
+ <button
+ enabled="false"
+ follows="left|top"
+ height="20"
+ label="Stop"
+ layout="topleft"
+ left_pad="2"
+ name="stop"
+ top_delta="0"
+ width="35">
+ <button.commit_callback
+ function="WebContent.Stop" />
+ </button>
+ <combo_box
+ allow_text_entry="true"
+ follows="left|top|right"
+ tab_group="1"
+ height="20"
+ layout="topleft"
+ left_pad="5"
+ max_chars="1024"
+ name="address"
+ combo_editor.select_on_focus="true"
+ top_delta="0"
+ width="610">
+ <combo_box.commit_callback
+ function="WebContent.EnterAddress" />
+ </combo_box>
+ <button
+ enabled="false"
+ follows="right|top"
+ height="20"
+ label="Go"
+ layout="topleft"
+ left_pad="0"
+ name="go"
+ top_delta="0"
+ width="35">
+ <button.commit_callback
+ function="WebContent.Go" />
+ </button>
+ </layout_panel>
+ <layout_panel
+ height="40"
+ layout="topleft"
+ left_delta="0"
+ name="external_controls"
+ top_delta="0"
+ user_resize="false"
+ width="540">
+ <web_browser
+ bottom="-22"
+ follows="all"
+ layout="topleft"
+ left="0"
+ name="webbrowser"
+ top="0"
+ width="540" />
+ <text
+ type="string"
+ length="100"
+ follows="bottom|left"
+ height="20"
+ layout="topleft"
+ left_delta="0"
+ name="statusbartext"
+ top_pad="5"
+ width="452"/>
+ <progress_bar
+ color_bar="0.3 1.0 0.3 1"
+ follows="bottom|right"
+ height="16"
+ top_delta="-1"
+ left_pad="24"
+ layout="topleft"
+ name="statusbarprogress"
+ width="64"/>
+ </layout_panel>
+ </layout_stack>
+</floater>
|