summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-02-25 15:13:21 -0800
committerRichard Linden <none@none>2011-02-25 15:13:21 -0800
commit4619a1e58bd53307bf5b2e326d814eddad73fbb1 (patch)
treefbfafa6e35523397244a606df16be10acd7ca3e6
parent31d0bf5ba5dd5e1df6c42dd19ce63ef3978a2f4c (diff)
SOCIAL-550 FIX Add back media volume and play/pause buttons to top bar
SOCIAL-577 FIX create streamlined navigation bar
-rw-r--r--indra/newview/app_settings/settings_minimal.xml73
-rw-r--r--indra/newview/skins/minimal/xui/en/main_view.xml9
-rw-r--r--indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml24
-rw-r--r--indra/newview/skins/minimal/xui/en/panel_prim_media_controls.xml581
-rw-r--r--indra/newview/skins/minimal/xui/en/panel_status_bar.xml62
-rw-r--r--indra/newview/skins/minimal/xui/en/panel_volume_pulldown.xml34
6 files changed, 106 insertions, 677 deletions
diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml
index 04712ec30b..3130c7802c 100644
--- a/indra/newview/app_settings/settings_minimal.xml
+++ b/indra/newview/app_settings/settings_minimal.xml
@@ -36,15 +36,6 @@
<key>Value</key>
<string>http://pdp48.lindenlab.com:8001/viewer/guide/</string>
</map>
- <key>DisableExternalBrowser</key>
- <map>
- <key>Comment</key>
- <string>Disable opening an external browser.</string>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>1</integer>
- </map>
<key>EnableGrab</key>
<map>
<key>Comment</key>
@@ -81,15 +72,6 @@
<key>Value</key>
<string>http://interest.secondlife.com/static/viewer/howto/index.html</string>
</map>
- <key>LocalFileSystemBrowsingEnabled</key>
- <map>
- <key>Comment</key>
- <string>Enable/disable access to the local file system via the file picker</string>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>PreferredMaturity</key>
<map>
<key>Comment</key>
@@ -193,61 +175,6 @@
<key>Value</key>
<integer>1</integer>
</map>
- <key>MediaControlFadeTime</key>
- <map>
- <key>Comment</key>
- <string>Amount of time (in seconds) that the media control fades</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0</real>
- </map>
- <key>MediaControlTimeout</key>
- <map>
- <key>Comment</key>
- <string>Amount of time (in seconds) for media controls to fade with no mouse activity</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0</real>
- </map>
- <key>MediaShowOutsideParcel</key>
- <map>
- <key>Comment</key>
- <string>Whether or not to show media from outside the current parcel</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>MediaShowWithinParcel</key>
- <map>
- <key>Comment</key>
- <string>Whether or not to show media within the current parcel</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
- <key>AudioStreamingMedia</key>
- <map>
- <key>Comment</key>
- <string>Enable streaming</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>Boolean</string>
- <key>Value</key>
- <integer>0</integer>
- </map>
<key>AvatarPickerHintTimeout</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml
index 2a3107398d..5906205636 100644
--- a/indra/newview/skins/minimal/xui/en/main_view.xml
+++ b/indra/newview/skins/minimal/xui/en/main_view.xml
@@ -176,6 +176,15 @@
width="1024"/>
</layout_panel>
</layout_stack>
+ <panel mouse_opaque="false"
+ follows="right|top"
+ name="status_bar_container"
+ tab_stop="false"
+ height="30"
+ left="-70"
+ top="0"
+ width="70"
+ visible="false"/>
<panel follows="top|bottom"
height="500"
mouse_opaque="false"
diff --git a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
index 65d9e8a2ab..cd21242edc 100644
--- a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml
@@ -11,33 +11,11 @@
width="600">
<icon
follows="all"
- image_name="NavBar_BG"
- mouse_opaque="false"
- name="bg_icon"
- scale_image="true"
- visible="true"
- left="0"
- top="0"
- height="26"
- width="600"/>
- <icon
- follows="all"
image_name="NavBar_BG_NoFav_Bevel"
mouse_opaque="false"
name="bg_icon_no_fav_bevel"
scale_image="true"
- visible="false"
- left="0"
- top="0"
- height="26"
- width="600"/>
- <icon
- follows="all"
- image_name="NavBar_BG_NoNav_Bevel"
- mouse_opaque="false"
- name="bg_icon_no_nav_bevel"
- scale_image="true"
- visible="false"
+ visible="true"
left="0"
top="0"
height="26"
diff --git a/indra/newview/skins/minimal/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/minimal/xui/en/panel_prim_media_controls.xml
deleted file mode 100644
index dfc8f55b03..0000000000
--- a/indra/newview/skins/minimal/xui/en/panel_prim_media_controls.xml
+++ /dev/null
@@ -1,581 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- follows="left|right|top|bottom"
- name="MediaControls"
- background_visible="false"
- height="200"
- layout="topleft"
- help_topic="prim_media_controls"
- mouse_opaque="false"
- min_width="300"
- width="800">
- <string name="control_background_image_name">Inspector_Background</string>
- <string name="skip_step">0.2</string>
- <string name="min_width">300</string>
- <string name="min_height">75</string>
- <string name="zoom_near_padding">1.0</string>
- <string name="zoom_medium_padding">1.1</string>
- <string name="zoom_far_padding">1.5</string>
- <string name="top_world_view_avoid_zone">50</string>
- <layout_stack
- name="progress_indicator_area"
- follows="left|right|top"
- height="8"
- layout="topleft"
- animate="false"
- left="0"
- orientation="horizontal"
- top="22">
- <!-- outer layout_panels center the inner one -->
- <layout_panel
- width="0"
- name="left_bookend_bottom"
- mouse_opaque="false"
- layout="topleft"
- user_resize="false" />
- <layout_panel
- name="media_progress_indicator"
- mouse_opaque="false"
- height="8"
- layout="topleft"
- left="0"
- top="0"
- auto_resize="false"
- user_resize="false"
- min_width="100"
- width="200">
- <progress_bar
- name="media_progress_bar"
- color_bg="1 1 1 1"
- color_bar="1 1 1 0.96"
- follows="left|right|top"
- height="8"
- layout="topleft"
- top="0"
- left="0"
- tool_tip="Media is Loading"/>
- </layout_panel>
- <layout_panel
- name="right_bookend_bottom"
- width="0"
- mouse_opaque="false"
- layout="topleft"
- user_resize="false" />
- </layout_stack>
- <layout_stack
- name="media_controls"
- follows="left|right|top"
- animate="false"
- height="75"
- layout="topleft"
- top="0"
- left="0"
- border_size="0"
- mouse_opaque="false"
- orientation="horizontal">
- <!-- outer layout_panels center the inner one -->
- <layout_panel
- name="left_bookend"
- top="0"
- width="0"
- mouse_opaque="false"
- layout="topleft"
- user_resize="false" />
- <layout_panel
- name="back"
- top="0"
- auto_resize="false"
- user_resize="false"
- layout="topleft"
- mouse_opaque="false"
- min_width="22"
- width="22">
- <button
- name="back_btn"
- follows="top"
- image_overlay="Arrow_Left_Off"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
- auto_resize="false"
- layout="topleft"
- tool_tip="Navigate back"
- top="0"
- left="0"
- width="22"
- height="22">
- <button.commit_callback
- function="MediaCtrl.Back" />
- </button>
- </layout_panel>
- <layout_panel
- name="fwd"
- mouse_opaque="false"
- auto_resize="false"
- user_resize="false"
- layout="topleft"
- min_width="22"
- top="0"
- height="22"
- width="22">
- <button
- name="fwd_btn"
- follows="top"
- image_overlay="Arrow_Right_Off"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
- top="0"
- height="22"
- width="22"
- layout="topleft"
- tool_tip="Navigate forward">
- <button.commit_callback
- function="MediaCtrl.Forward" />
- </button>
- </layout_panel>
- <layout_panel
- name="home"
- mouse_opaque="false"
- auto_resize="false"
- user_resize="false"
- layout="topleft"
- top="0"
- height="22"
- min_width="22"
- width="22">
- <button
- name="home_btn"
- follows="top"
- image_overlay="Home_Off"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
- layout="topleft"
- tool_tip="Home page"
- top="0"
- height="22"
- width="22">
- <button.commit_callback
- function="MediaCtrl.Home" />
- </button>
- </layout_panel>
- <layout_panel
- name="media_stop"
- mouse_opaque="false"
- auto_resize="false"
- user_resize="false"
- layout="topleft"
- top="0"
- height="22"
- min_width="22"
- width="22">
- <button
- name="media_stop_btn"
- follows="top"
- image_overlay="Stop_Off"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
- layout="topleft"
- tool_tip="Stop media"
- top="0"
- height="22"
- width="22">
- <button.commit_callback
- function="MediaCtrl.MediaStop" />
- </button>
- </layout_panel>
- <layout_panel
- name="reload"
- mouse_opaque="false"
- auto_resize="false"
- user_resize="false"
- layout="topleft"
- top="0"
- height="22"
- min_width="22"
- width="22">
- <button
- name="reload_btn"
- follows="top"
- image_overlay="Refresh_Off"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
- layout="topleft"
- tool_tip="Reload"
- top="0"
- height="22"
- width="22">
- <button.commit_callback
- function="MediaCtrl.Reload" />
- </button>
- </layout_panel>
- <layout_panel
- name="stop"
- mouse_opaque="false"
- auto_resize="false"
- user_resize="false"
- layout="topleft"
- top="0"
- height="22"
- min_width="22"
- width="22">
- <button
- name="stop_btn"
- follows="top"
- image_overlay="StopReload_Off"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
- layout="topleft"
- tool_tip = "Stop loading"
- top="0"
- height="22"
- width="22">
- <button.commit_callback
- function="MediaCtrl.Stop" />
- </button>
- </layout_panel>
- <layout_panel
- name="play"
- mouse_opaque="false"
- auto_resize="false"
- user_resize="false"
- layout="topleft"
- top="0"
- height="22"
- min_width="22"
- width="22">
- <button
- name="play_btn"
- follows="top"
- image_overlay="Play_Off"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
- layout="topleft"
- tool_tip = "Play media"
- top="0"
- height="22"
- width="22">
- <button.commit_callback
- function="MediaCtrl.Play" />
- </button>
- </layout_panel>
- <layout_panel
- name="pause"
- mouse_opaque="false"
- auto_resize="false"
- user_resize="false"
- layout="topleft"
- top="0"
- min_width="22"
- width="22">
- <button
- name="pause_btn"
- follows="top"
- image_overlay="Pause_Off"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
- layout="topleft"
- top="0"
- height="22"
- width="22"
- tool_tip = "Pause media">
- <button.commit_callback
- function="MediaCtrl.Pause" />
- </button>
- </layout_panel>
- <!-- media URL entry -->
- <layout_panel
- name="media_address"
- mouse_opaque="false"
- auto_resize="true"
- user_resize="false"
- height="24"
- follows="left|right|bottom"
- layout="topleft"
- top="0"
- width="190"
- min_width="90">
- <text
- name="media_address_url"
- follows="top|left|right"
- height="22"
- top="5"
- valign="bottom"
- tool_tip="Media URL"
- text_pad_right="16">
- http://www.secondlife.com
- </text>
- <layout_stack
- name="media_address_url_icons"
- animate="false"
- follows="top|right"
- height="20"
- width="38"
- top="0"
- right="-1"
- border_size="0"
- mouse_opaque="false"
- orientation="horizontal">
- <layout_panel
- layout="topleft"
- width="16"
- mouse_opaque="false"
- auto_resize="false"
- user_resize="false">
- <icon
- name="media_whitelist_flag"
- follows="top|right"
- height="16"
- image_name="Flag"
- layout="topleft"
- tool_tip="White List enabled"
- width="16" />
- </layout_panel>
- <layout_panel
- layout="topleft"
- width="16"
- mouse_opaque="false"
- auto_resize="false"
- user_resize="false">
- <icon
- name="media_secure_lock_flag"
- height="16"
- image_name="Lock2"
- layout="topleft"
- tool_tip="Secured Browsing"
- width="16" />
- </layout_panel>
- </layout_stack>
- </layout_panel>
- <layout_panel
- name="media_play_position"
- mouse_opaque="false"
- auto_resize="true"
- user_resize="false"
- follows="left|right"
- layout="topleft"
- top="0"
- height="22"
- min_width="100"
- width="200">
- <slider_bar
- name="media_play_slider"
- follows="left|right|top"
- top="0"
- height="22"
- increment="0.01"
- initial_value="0.5"
- layout="topleft"
- tool_tip="Movie play progress"
- width="200">
- <slider_bar.commit_callback
- function="MediaCtrl.JumpProgress" />
- </slider_bar>
- </layout_panel>
- <layout_panel
- name="skip_back"
- mouse_opaque="false"
- auto_resize="false"
- user_resize="false"
- layout="topleft"
- top="0"
- min_width="22"
- width="22">
- <button
- name="skip_back_btn"
- follows="top"
- image_overlay="SkipBackward_Off"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
- auto_resize="false"
- height="22"
- layout="topleft"
- tool_tip="Step back"
- top="0"
- width="22"
- left="0">
- <button.commit_callback
- function="MediaCtrl.SkipBack" />
- </button>
- </layout_panel>
- <layout_panel
- name="skip_forward"
- mouse_opaque="false"
- auto_resize="false"
- user_resize="false"
- layout="topleft"
- top="0"
- min_width="22"
- width="22">
- <button
- name="skip_forward_btn"
- follows="top"
- image_overlay="SkipForward_Off"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
- height="22"
- layout="topleft"
- tool_tip="Step forward"
- top="0"
- width="22">
- <button.commit_callback
- function="MediaCtrl.SkipForward" />
- </button>
- </layout_panel>
- <layout_panel
- name="media_volume"
- mouse_opaque="false"
- auto_resize="false"
- user_resize="false"
- layout="topleft"
- top="0"
- height="72"
- min_width="22"
- width="22">
- <!-- Note: this is not quite right either...the mute button is not the -->
- <!-- same as the others because it cannot have the "image_overlay" be -->
- <!-- two different images. -->
- <!-- Note also: the button and the slider must overlap! -->
- <button
- name="media_mute_button"
- follows="top"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
- image_selected="AudioMute_Off"
- image_unselected="Audio_Off"
- hover_glow_amount="0.15"
- is_toggle="true"
- layout="topleft"
- scale_image="false"
- tool_tip="Mute This Media"
- top="0"
- height="20"
- width="22" >
- <button.commit_callback
- function="MediaCtrl.ToggleMute" />
- <button.mouseenter_callback
- function="MediaCtrl.ShowVolumeSlider" />
- <button.mouseleave_callback
- function="MediaCtrl.HideVolumeSlider" />
- </button>
- <slider
- orientation="vertical"
- left="0"
- top="16"
- height="50"
- layout="topleft"
- increment="0.01"
- initial_value="0.5"
- name="volume_slider"
- tool_tip="Media Volume"
- show_text="false"
- volume="true">
- <slider.commit_callback
- function="MediaCtrl.Volume"/>
- <slider.mouseenter_callback
- function="MediaCtrl.ShowVolumeSlider" />
- <slider.mouseleave_callback
- function="MediaCtrl.HideVolumeSlider" />
- </slider>
- </layout_panel>
- <layout_panel
- name="zoom_frame"
- mouse_opaque="false"
- auto_resize="false"
- user_resize="false"
- layout="topleft"
- top="0"
- height="28"
- min_width="22"
- width="22">
- <button
- name="zoom_frame_btn"
- follows="top"
- image_overlay="Zoom_Off"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
- top="0"
- height="22"
- layout="topleft"
- tool_tip="Zoom into media"
- width="22">
- <button.commit_callback
- function="MediaCtrl.Zoom" />
- </button>
- </layout_panel>
- <layout_panel
- name="close"
- mouse_opaque="false"
- auto_resize="false"
- user_resize="false"
- layout="topleft"
- top="0"
- min_width="21"
- width="21" >
- <button
- name="close_btn"
- follows="top"
- image_overlay="UnZoom_Off"
- image_disabled="PushButton_Disabled"
- image_disabled_selected="PushButton_Disabled"
- image_selected="PushButton_Selected"
- image_unselected="PushButton_Off"
- hover_glow_amount="0.15"
- top="0"
- height="22"
- layout="topleft"
- tool_tip ="Zoom Back"
- top_delta="-4"
- width="21" >
- <button.commit_callback
- function="MediaCtrl.Close" />
- </button>
- </layout_panel>
- <!-- bookend panel -->
- <layout_panel
- name="right_bookend"
- mouse_opaque="false"
- top="0"
- width="0"
- layout="topleft"
- user_resize="false" />
- </layout_stack>
- <panel
- name="media_region"
- height="100"
- follows="left|right|top|bottom"
- layout="topleft"
- mouse_opaque="false"
- top="30" />
-</panel>
diff --git a/indra/newview/skins/minimal/xui/en/panel_status_bar.xml b/indra/newview/skins/minimal/xui/en/panel_status_bar.xml
new file mode 100644
index 0000000000..6ccd0e938d
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/panel_status_bar.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_opaque="true"
+ background_visible="true"
+ bg_opaque_color="MouseGray"
+ chrome="true"
+ follows="top|right"
+ height="30"
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="status"
+ top="19"
+ tab_stop="false"
+ width="70">
+ <panel.string
+ name="packet_loss_tooltip">
+ Packet Loss
+ </panel.string>
+ <panel.string
+ name="bandwidth_tooltip">
+ Bandwidth
+ </panel.string>
+ <panel.string
+ name="time">
+ [hour12, datetime, slt]:[min, datetime, slt] [ampm, datetime, slt] [timezone,datetime, slt]
+ </panel.string>
+ <panel.string
+ name="timeTooltip">
+ [weekday, datetime, slt], [day, datetime, slt] [month, datetime, slt] [year, datetime, slt]
+ </panel.string>
+ <panel.string
+ name="buycurrencylabel">
+ L$ [AMT]
+ </panel.string>
+ <button
+ follows="right|top"
+ height="16"
+ image_selected="Play_Off"
+ image_unselected="Pause_Off"
+ image_pressed="Pause_Press"
+ image_pressed_selected="Play_Press"
+ is_toggle="true"
+ left="15"
+ top="7"
+ name="media_toggle_btn"
+ tool_tip="Start/Stop All Media (Music, Video, Web pages)"
+ width="16" >
+ </button>
+ <button
+ follows="right|top"
+ height="16"
+ image_selected="AudioMute_Off"
+ image_pressed="Audio_Press"
+ image_unselected="Audio_Off"
+ is_toggle="true"
+ left_pad="5"
+ top="8"
+ name="volume_btn"
+ tool_tip="Global Volume Control"
+ width="16" />
+</panel>
diff --git a/indra/newview/skins/minimal/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/minimal/xui/en/panel_volume_pulldown.xml
new file mode 100644
index 0000000000..36ad39abe8
--- /dev/null
+++ b/indra/newview/skins/minimal/xui/en/panel_volume_pulldown.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_opaque="true"
+ background_visible="true"
+ bg_opaque_image="Volume_Background"
+ bg_alpha_image="Volume_Background"
+ border_visible="false"
+ border="false"
+ chrome="true"
+ follows="bottom"
+ height="150"
+ layout="topleft"
+ name="volumepulldown_floater"
+ width="32">
+ <slider
+ control_name="AudioLevelMaster"
+ follows="left|top"
+ left="0"
+ top="1"
+ orientation="vertical"
+ height="140"
+ increment="0.05"
+ initial_value="0.5"
+ layout="topleft"
+ name="mastervolume"
+ show_text="false"
+ slider_label.halign="right"
+ top_pad="2"
+ volume="true">
+ <slider.commit_callback
+ function="Vol.setControlFalse"
+ parameter="MuteAudio" />
+ </slider>
+</panel>