From 5043867f05a39c1f634a1e4c0f930de4efa16c72 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 18 Oct 2008 17:31:02 -0700
Subject: Added Home button functionality to the web browser.

---
 linden/indra/newview/app_settings/settings.xml     |  6 ++---
 linden/indra/newview/llfloaterhtmlhelp.cpp         | 29 +++++++++++++++++++++-
 linden/indra/newview/llfloaterhtmlhelp.h           |  2 ++
 .../default/xui/en-us/floater_media_browser.xml    |  8 ++++--
 4 files changed, 39 insertions(+), 6 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 1f0f240..8093521 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -675,16 +675,16 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>BrowserHomePage</key>
+    <key>BrowserHome</key>
     <map>
       <key>Comment</key>
-      <string>[NOT USED]</string>
+      <string>Inworld browser home page</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
       <string>String</string>
       <key>Value</key>
-      <string>http://www.secondlife.com</string>
+      <string>http://www.imprudenceviewer.org</string>
     </map>
     <key>BlockAvatarAppearanceMessages</key>
         <map>
diff --git a/linden/indra/newview/llfloaterhtmlhelp.cpp b/linden/indra/newview/llfloaterhtmlhelp.cpp
index d6d249e..a9d2e46 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.cpp
+++ b/linden/indra/newview/llfloaterhtmlhelp.cpp
@@ -58,7 +58,9 @@ LLFloaterMediaBrowser::LLFloaterMediaBrowser(const LLSD& media_data)
 
 void LLFloaterMediaBrowser::draw()
 {
-	childSetEnabled("go", !mAddressCombo->getValue().asString().empty());
+	BOOL url_exists = !mAddressCombo->getValue().asString().empty();
+	childSetEnabled("go", url_exists);
+	childSetEnabled("set_home", url_exists);
 	LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
 	if(parcel)
 	{
@@ -84,6 +86,8 @@ BOOL LLFloaterMediaBrowser::postBuild()
 	childSetAction("close", onClickClose, this);
 	childSetAction("open_browser", onClickOpenWebBrowser, this);
 	childSetAction("assign", onClickAssign, this);
+	childSetAction("home", onClickHome, this);
+	childSetAction("set_home", onClickSetHome, this);
 
 	buildURLHistory();
 	return TRUE;
@@ -238,6 +242,29 @@ void LLFloaterMediaBrowser::onClickAssign(void* user_data)
 
 }
 
+void LLFloaterMediaBrowser::onClickHome(void* user_data)
+{
+	LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+	if (self)
+	{
+		if (self->mBrowser)
+		{
+			std::string home_url = gSavedSettings.getString("BrowserHome");
+			self->mBrowser->navigateTo(home_url);
+		}
+	}
+}
+
+void LLFloaterMediaBrowser::onClickSetHome(void* user_data)
+{
+	LLFloaterMediaBrowser* self = (LLFloaterMediaBrowser*)user_data;
+	std::string url = self->mCurrentURL;
+	if(!url.empty())
+	{
+		gSavedSettings.setString("BrowserHome", url);
+	}
+}
+
 void LLFloaterMediaBrowser::openMedia(const std::string& media_url)
 {
 	mBrowser->setHomePageUrl(media_url);
diff --git a/linden/indra/newview/llfloaterhtmlhelp.h b/linden/indra/newview/llfloaterhtmlhelp.h
index 7257566..f6da106 100644
--- a/linden/indra/newview/llfloaterhtmlhelp.h
+++ b/linden/indra/newview/llfloaterhtmlhelp.h
@@ -73,6 +73,8 @@ public:
 	static void onClickClose(void* user_data);
 	static void onClickOpenWebBrowser(void* user_data);
 	static void onClickAssign(void* user_data);
+	static void onClickHome(void* user_data);
+	static void onClickSetHome(void* user_data);
 
 private:
 	LLWebBrowserCtrl* mBrowser;
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 5b2d310..077ab23 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
@@ -12,9 +12,11 @@
 			<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="280" />
+			     left_delta="75" max_chars="235" name="address" width="225" />
 			<button bottom_delta="0" enabled="false" follows="right|top" height="20" label="Go"
-			     left_delta="285" name="go" width="55" />
+			     left_delta="230" name="go" width="55" />
+			<button bottom_delta="0" enabled="true" follows="right|top" height="20" label="Home"
+			     left_delta="60" name="home" width="55" />
 		</layout_panel>
 		<layout_panel auto_resize="false" bottom="0" height="20" left="0"
 		     name="parcel_owner_controls" user_resize="false" width="540">
@@ -30,6 +32,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" enabled="false" follows="bottom|right" height="20" label="Set Home To Here"
+			     left="-265" name="set_home" width="155" />
 			<button bottom="5" follows="bottom|right" height="20" label="Close" left="-70"
 			     name="close" width="70" />
 		</layout_panel>
-- 
cgit v1.1