Spit shine on browser, good as new! Thanks McCabe!

This commit is contained in:
Siana Gearz
2011-10-15 03:10:31 +02:00
parent 61777e9b8c
commit ca757ff1b2
8 changed files with 23 additions and 25 deletions

View File

@@ -105,6 +105,7 @@ void LLFloaterMediaBrowser::draw()
media_playing = media_plugin->getStatus() == LLPluginClassMediaOwner::MEDIA_PLAYING;
}
}
childSetVisible("time_controls", show_time_controls);
childSetVisible("rewind", show_time_controls);
childSetVisible("play", show_time_controls && ! media_playing);
childSetVisible("pause", show_time_controls && media_playing);
@@ -139,7 +140,6 @@ BOOL LLFloaterMediaBrowser::postBuild()
childSetAction("pause", onClickPlay, this);
childSetAction("seek", onClickSeek, this);
childSetAction("go", onClickGo, this);
childSetAction("close", onClickClose, this);
childSetAction("open_browser", onClickOpenWebBrowser, this);
childSetAction("assign", onClickAssign, this);
@@ -284,14 +284,6 @@ void LLFloaterMediaBrowser::onClickGo(void* user_data)
self->mBrowser->navigateTo(self->mAddressCombo->getValue().asString());
}
//static
void LLFloaterMediaBrowser::onClickClose(void* user_data)
{
LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
self->close();
}
//static
void LLFloaterMediaBrowser::onClickOpenWebBrowser(void* user_data)
{

View File

@@ -85,7 +85,6 @@ public:
static void onClickBack(void* user_data);
static void onClickForward(void* user_data);
static void onClickGo(void* user_data);
static void onClickClose(void* user_data);
static void onClickOpenWebBrowser(void* user_data);
static void onClickAssign(void* user_data);
static void onClickRewind(void* user_data);

Binary file not shown.

After

Width:  |  Height:  |  Size: 485 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 508 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 467 B

View File

@@ -390,5 +390,10 @@
<texture name="media_btn_stoploading.png"/>
<texture name="media_panel_divider.png"/>
<texture name="media_panel_scrollbg.png"/>
<texture name="go-previous-4.png"/>
<texture name="go-next-4.png"/>
<texture name="view-refresh-5.png"/>
<texture name="go-home-4.png"/>
</textures>

Binary file not shown.

After

Width:  |  Height:  |  Size: 786 B

View File

@@ -3,18 +3,20 @@
height="440" min_height="140" min_width="467" name="floater_about"
rect_control="FloaterMediaRect" title="Media Browser" width="820">
<layout_stack name="stack1" bottom="0" follows="left|right|top|bottom" left="10" top="-20" width="800">
<layout_panel auto_resize="false" bottom="0" height="20" left="0" name="nav_controls" user_resize="false"
<layout_panel auto_resize="false" bottom="0" height="25" left="0" name="nav_controls" user_resize="false"
width="800">
<button bottom="0" follows="left|top" height="20" label="Back" left="0" name="back"
width="55" />
<button bottom_delta="0" follows="left|top" height="20" label="Forward" left_delta="55"
name="forward" width="60" />
<button bottom_delta="0" enabled="false" follows="left|top" height="20" label="Reload"
left_delta="65" name="reload" width="70" />
<combo_box allow_text_entry="true" bottom_delta="0" follows="left|top|right" height="20"
left_delta="75" max_chars="255" name="address" width="540" />
<button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go"
left_delta="545" name="go" width="55" />
<button bottom="0" follows="left|top" height="25" label="" image_overlay="go-previous-4.png" left="0" name="back"
width="25" />
<button bottom_delta="0" follows="left|top" height="25" label="" image_overlay="go-next-4.png" left_delta="27"
name="forward" width="25" />
<button bottom_delta="0" enabled="false" follows="left|top" height="25" label="" image_overlay="view-refresh-5.png"
left_delta="27" name="reload" width="25" />
<combo_box allow_text_entry="true" bottom_delta="4" follows="left|top|right" height="20"
left_delta="29" max_chars="255" name="address" width="657" />
<button bottom_delta="-4" enabled="false" follows="right|top" height="25" label="Go" font="SansSerif"
left_delta="660" name="go" width="55" />
<!--button bottom_delta="0" enabled="true" follows="right|top" height="25" label="" image_overlay="go-home-4.png"
left_delta="58" name="home" width="35" /-->
</layout_panel>
<layout_panel auto_resize="false" bottom="0" height="20" left="0" name="time_controls" user_resize="false"
width="800">
@@ -31,8 +33,8 @@
</layout_panel>
<layout_panel auto_resize="false" bottom="0" height="20" left="0"
name="parcel_owner_controls" user_resize="false" width="540">
<button bottom="0" enabled="false" follows="left|top" height="20"
label="Send Current URL to Parcel" left="0" name="assign" width="200" />
<button bottom="0" enabled="false" follows="left|top" height="22"
label="Send Current URL To Parcel" left="0" name="assign" width="200" />
</layout_panel>
<layout_panel auto_resize="true" bottom="0" height="20" left="0" name="external_controls" user_resize="false"
width="540">
@@ -43,8 +45,8 @@
<check_box bottom="5" control_name="UseExternalBrowser" follows="bottom|left" height="20"
label="Always open in my web browser" left_delta="190" name="open_always"
width="200" />
<button bottom="5" follows="bottom|right" height="20" label="Close" left="-70"
name="close" width="70" />
<!--button bottom="5" follows="bottom|right" height="20" label="Close" left="-70"
name="close" width="70" /-->
</layout_panel>
</layout_stack>
<string name="home_page_url">