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. --- ChangeLog.txt | 12 +++++++++ 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 ++++-- 5 files changed, 51 insertions(+), 6 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 4e12e8d..fad5530 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -77,6 +77,18 @@ Friends show yellow in minimap (VWR-3336). +2008-10-18 McCabe Maxsted + + * linden/indra/newview/app_settings/settings.xml: + Added Home button functionality to the web browser. + * linden/indra/newview/llfloaterhtmlhelp.cpp: + Ditto. + * linden/indra/newview/llfloaterhtmlhelp.h: + Ditto. + * linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml: + Ditto. + + =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- =- 1.0.0 -= =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- 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 @@ Value 0 - BrowserHomePage + BrowserHome Comment - [NOT USED] + Inworld browser home page Persist 1 Type String Value - http://www.secondlife.com + http://www.imprudenceviewer.org BlockAvatarAppearanceMessages 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 @@