From adb62e958ff3a4be2eb43fbb1754358ec60a118c Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Wed, 1 Dec 2010 22:25:13 -0800
Subject: SOCIAL-311 PARTIAL FIX Media browser has too many oddities to be
 useful for viewer web apps Added support for graphic browser buttons and laid
 them out differently

---
 indra/newview/llfloaterwebcontent.cpp              | 13 +---
 .../skins/default/xui/en/floater_web_content.xml   | 88 +++++++++++-----------
 2 files changed, 49 insertions(+), 52 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp
index 8321b2914f..8e5638f549 100644
--- a/indra/newview/llfloaterwebcontent.cpp
+++ b/indra/newview/llfloaterwebcontent.cpp
@@ -45,7 +45,6 @@ LLFloaterWebContent::LLFloaterWebContent(const LLSD& key)
 	mCommitCallbackRegistrar.add("WebContent.Reload", boost::bind( &LLFloaterWebContent::onClickReload, this));
 
 	mCommitCallbackRegistrar.add("WebContent.EnterAddress", boost::bind( &LLFloaterWebContent::onEnterAddress, this));
-	mCommitCallbackRegistrar.add("WebContent.Go", boost::bind( &LLFloaterWebContent::onClickGo, this));
 }
 
 BOOL LLFloaterWebContent::postBuild()
@@ -61,7 +60,6 @@ BOOL LLFloaterWebContent::postBuild()
 
 	// these button are always enabled
 	getChildView("reload")->setEnabled( true );
-	getChildView("go")->setEnabled( true );
 
 	return TRUE;
 }
@@ -214,7 +212,8 @@ void LLFloaterWebContent::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent
 		getChildView("forward")->setEnabled( self->getHistoryForwardAvailable() );
 
 		// manually decide on the state of this button
-		getChildView("stop")->setEnabled( true );
+		getChildView("reload")->setVisible( false );
+		getChildView("stop")->setVisible( true );
 
 		// turn "on" progress bar now we're loaded
 		mStatusBarProgress->setVisible( true );
@@ -226,7 +225,8 @@ void LLFloaterWebContent::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent
 		getChildView("forward")->setEnabled( self->getHistoryForwardAvailable() );
 
 		// manually decide on the state of this button
-		getChildView("stop")->setEnabled( false );
+		getChildView("reload")->setVisible( true );
+		getChildView("stop")->setVisible( false );
 
 		// turn "off" progress bar now we're loaded
 		mStatusBarProgress->setVisible( false );
@@ -302,8 +302,3 @@ void LLFloaterWebContent::onEnterAddress()
 {
 	mWebBrowser->navigateTo( mAddressCombo->getValue().asString() );
 }
-
-void LLFloaterWebContent::onClickGo()
-{
-	mWebBrowser->navigateTo( mAddressCombo->getValue().asString() );
-}
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 62df206360..97a7a0e737 100644
--- a/indra/newview/skins/default/xui/en/floater_web_content.xml
+++ b/indra/newview/skins/default/xui/en/floater_web_content.xml
@@ -24,7 +24,7 @@
     <layout_panel
       auto_resize="false"
       default_tab_group="1"
-      height="20"
+      height="22"
       layout="topleft"
       left="0"
       min_height="20"
@@ -33,83 +33,86 @@
       user_resize="false"
       width="800">
       <button
+        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"
         follows="left|top"
-        height="20"
-        label="Back"
+        height="22"
         layout="topleft"
-        left="0"
+        left="1"
         name="back"
         top="0"
-        width="35">
+        width="22">
         <button.commit_callback
           function="WebContent.Back" />
       </button>
       <button
+        image_overlay="Stop_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
+        enabled="false"
         follows="left|top"
-        height="20"
-        label="Forward"
+        height="22"
         layout="topleft"
-        left_pad="3"
-        name="forward"
+        left="27"
+        name="stop"
         top_delta="0"
-        width="35">
+        width="22">
         <button.commit_callback
-          function="WebContent.Forward" />
+          function="WebContent.Stop" />
       </button>
       <button
-        enabled="false"
+        image_overlay="Refresh_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
         follows="left|top"
-        height="20"
-        label="Reload"
+        height="22"
         layout="topleft"
-        left_pad="2"
+        left="27"
         name="reload"
         top_delta="0"
-        width="35">
+        width="22">
         <button.commit_callback
           function="WebContent.Reload" />
-      </button>
+      </button>      
       <button
-        enabled="false"
+        image_overlay="Arrow_Right_Off"
+		    image_disabled="PushButton_Disabled"
+		    image_disabled_selected="PushButton_Disabled"
+		    image_selected="PushButton_Selected"
+		    image_unselected="PushButton_Off"
         follows="left|top"
-        height="20"
-        label="Stop"
+        height="22"
         layout="topleft"
-        left_pad="2"
-        name="stop"
+        left="51"
+        name="forward"
         top_delta="0"
-        width="35">
+        width="22">
         <button.commit_callback
-          function="WebContent.Stop" />
+          function="WebContent.Forward" />
       </button>
       <combo_box
         allow_text_entry="true"
         follows="left|top|right"
         tab_group="1"
-        height="20"
+        height="22"
         layout="topleft"
-        left_pad="5"
+        left_pad="4"
         max_chars="1024"
         name="address"
         combo_editor.select_on_focus="true"
         top_delta="0"
-        width="610">
+        width="729">
         <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"
@@ -125,8 +128,7 @@
         layout="topleft"
         left="0"
         name="webbrowser"
-        top="0"
-        width="540" />
+        top="0"/>
       <text
         type="string"
         length="100"
@@ -138,7 +140,7 @@
         top_pad="5"
         width="452"/>
       <progress_bar
-        color_bar="0.3 1.0 0.3 1" 
+        color_bar="0.3 1.0 0.3 1"
         follows="bottom|right"
         height="16"
         top_delta="-1"
-- 
cgit v1.2.3