diff options
| author | Lynx Linden <lynx@lindenlab.com> | 2009-12-02 14:25:18 +0000 | 
|---|---|---|
| committer | Lynx Linden <lynx@lindenlab.com> | 2009-12-02 14:25:18 +0000 | 
| commit | 3d3f2fa4be8b28041b46983010547fb804ff8144 (patch) | |
| tree | 178cb40f9276bdfe180ce2947acc0c39e251421d | |
| parent | f496c2b164a100836d74909c3e27adcdf98018f0 (diff) | |
DEV-43439: Initial web-based Home side tray panel
Moved LLSideTrayInfoPanel from llsidetray.cpp into its own
llpanelhome.{cpp|h} module.
Updated the XUI for the Home tab to simply embed a web view.
Thanks to Erica for the initial cut at this XUI.
| -rw-r--r-- | indra/newview/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/newview/llpanelhome.cpp | 47 | ||||
| -rw-r--r-- | indra/newview/llpanelhome.h | 50 | ||||
| -rw-r--r-- | indra/newview/llsidetray.cpp | 31 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml | 279 | 
5 files changed, 123 insertions, 286 deletions
| diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 73240cebbb..c2ca366ce4 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -316,6 +316,7 @@ set(viewer_SOURCE_FILES      llpanelgrouplandmoney.cpp      llpanelgroupnotices.cpp      llpanelgrouproles.cpp +    llpanelhome.cpp      llpanelimcontrolpanel.cpp      llpanelland.cpp      llpanellandaudio.cpp @@ -813,6 +814,7 @@ set(viewer_HEADER_FILES      llpanelgrouplandmoney.h      llpanelgroupnotices.h      llpanelgrouproles.h +    llpanelhome.h      llpanelimcontrolpanel.h      llpanelland.h      llpanellandaudio.h diff --git a/indra/newview/llpanelhome.cpp b/indra/newview/llpanelhome.cpp new file mode 100644 index 0000000000..7f2d24ab34 --- /dev/null +++ b/indra/newview/llpanelhome.cpp @@ -0,0 +1,47 @@ +/**  +* @file llpanelhome.cpp +* @author Martin Reddy +* @brief The Home side tray panel +* +* $LicenseInfo:firstyear=2009&license=viewergpl$ +*  +* Copyright (c) 2009, Linden Research, Inc. +*  +* Second Life Viewer Source Code +* The source code in this file ("Source Code") is provided by Linden Lab +* to you under the terms of the GNU General Public License, version 2.0 +* ("GPL"), unless you have obtained a separate licensing agreement +* ("Other License"), formally executed by you and Linden Lab.  Terms of +* the GPL can be found in doc/GPL-license.txt in this distribution, or +* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 +*  +* There are special exceptions to the terms and conditions of the GPL as +* it is applied to this Source Code. View the full text of the exception +* in the file doc/FLOSS-exception.txt in this software distribution, or +* online at +* http://secondlifegrid.net/programs/open_source/licensing/flossexception +*  +* By copying, modifying or distributing this software, you acknowledge +* that you have read and understood your obligations described above, +* and agree to abide by those obligations. +*  +* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO +* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, +* COMPLETENESS OR PERFORMANCE. +* $/LicenseInfo$ +*/ + +#include "llviewerprecompiledheaders.h" +#include "llpanelhome.h" + +static LLRegisterPanelClassWrapper<LLPanelHome> t_people("panel_sidetray_home"); + +LLPanelHome::LLPanelHome() : +	LLPanel() +{ +} + +void LLPanelHome::reshape(S32 width, S32 height, BOOL called_from_parent) +{ +	return LLPanel::reshape(width, height, called_from_parent); +} diff --git a/indra/newview/llpanelhome.h b/indra/newview/llpanelhome.h new file mode 100644 index 0000000000..2c60eecc39 --- /dev/null +++ b/indra/newview/llpanelhome.h @@ -0,0 +1,50 @@ +/**  +* @file llpanelhome.h +* @author Martin Reddy +* @brief The Home side tray panel +* +* $LicenseInfo:firstyear=2009&license=viewergpl$ +*  +* Copyright (c) 2009, Linden Research, Inc. +*  +* Second Life Viewer Source Code +* The source code in this file ("Source Code") is provided by Linden Lab +* to you under the terms of the GNU General Public License, version 2.0 +* ("GPL"), unless you have obtained a separate licensing agreement +* ("Other License"), formally executed by you and Linden Lab.  Terms of +* the GPL can be found in doc/GPL-license.txt in this distribution, or +* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 +*  +* There are special exceptions to the terms and conditions of the GPL as +* it is applied to this Source Code. View the full text of the exception +* in the file doc/FLOSS-exception.txt in this software distribution, or +* online at +* http://secondlifegrid.net/programs/open_source/licensing/flossexception +*  +* By copying, modifying or distributing this software, you acknowledge +* that you have read and understood your obligations described above, +* and agree to abide by those obligations. +*  +* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO +* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, +* COMPLETENESS OR PERFORMANCE. +* $/LicenseInfo$ +*/ + +#ifndef LL_LLPANELHOME_H +#define LL_LLPANELHOME_H + +#include "llpanel.h" + +/** + * Base class for web-based Home side tray + */ +class LLPanelHome : public LLPanel +{ +public: +	LLPanelHome(); + +	void reshape(S32 width, S32 height, BOOL called_from_parent); +}; + +#endif //LL_LLPANELHOME_H diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index ee62d689b5..9333465052 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -66,37 +66,6 @@ static const std::string TAB_PANEL_CAPTION_TITLE_BOX = "sidetray_tab_title";  LLSideTray* LLSideTray::sInstance = 0; -class LLSideTrayInfoPanel: public LLPanel -{ -	 -public: -	LLSideTrayInfoPanel():LLPanel() -	{ -		setBorderVisible(true); -	} - -	BOOL handleHover(S32 x, S32 y, MASK mask) -	{ -		getWindow()->setCursor(UI_CURSOR_HAND); -		return TRUE; -	} - -	BOOL handleMouseUp(S32 x, S32 y, MASK mask) -	{ -		std::string name = getName(); -		onCommit(); -		LLSideTray::getInstance()->selectTabByName(name); -		return LLPanel::handleMouseUp(x,y,mask); -	} -	void reshape		(S32 width, S32 height, BOOL called_from_parent ) -	{ -		return LLPanel::reshape(width, height, called_from_parent); -	} - -}; - -static LLRegisterPanelClassWrapper<LLSideTrayInfoPanel> t_people("panel_sidetray_home_info"); -  LLSideTray* LLSideTray::getInstance()  {  	if (!sInstance) diff --git a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml index 9839075862..e04a07b177 100644 --- a/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml +++ b/indra/newview/skins/default/xui/en/panel_sidetray_home_tab.xml @@ -1,265 +1,34 @@  <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<!-- Part of side tray, see that XML file for panel config --> +<!-- the web-based Home panel of the side tray -->  <panel   follows="all" - height="560" + height="570" + min_height="350"   label="home_tab"   layout="topleft" + top="0" + left="0"   name="home_tab"   width="333"> -  <scroll_container -   color="DkGray" -   follows="all" -   layout="topleft" -   left="0" -   name="profile_scroll" -   opaque="true" -   height="560" -   width="333" -   top="0">    <panel -   background_visible="true" -   height="560" +   class="panel_sidetray_home" +   follows="all" +   height="550"     layout="topleft" -   name="profile_scroll_panel" -   top="0" -   left="0" -   width="311"> -    <panel -     background_visible="true" -     bg_alpha_color="DkGray2" -     class="panel_sidetray_home_info" -     follows="left|top|right" -     height="90" -     layout="topleft" -     left="15" -     top="17" -     name="sidebar_people" -     width="303"> -        <text -         follows="left|right|top" -         font="SansSerifBigBold" -         height="30" -         layout="topleft" -         left="10" -         mouse_opaque="false" -         name="tab_name" -         text_color="EmphasisColor" -         top="10" -         value="People" -         width="200" -         word_wrap="true" /> -        <icon -         follows="top|right" -         height="20" -         layout="topleft" -         name="tab_icon" -         right="-10" -         top="10" -         image_name="TabIcon_People_Selected" -         width="20" /> -        <text -         follows="left|right|bottom" -         height="90" -         layout="topleft" -         left="10" -         mouse_opaque="false" -         name="tab_description" -         right="-10" -         text_color="white" -         top="40" -         word_wrap="true"> -            Find your friends, your groups, contacts and people nearby. -        </text> -    </panel> -    <panel -     background_visible="true" -     bg_alpha_color="DkGray2" -     class="panel_sidetray_home_info" -     follows="left|top|right" -     height="90" -     layout="topleft" -     left="15" -     top_pad="15" -     name="sidebar_places" -     width="303"> -        <text -         follows="left|right|top" -         font="SansSerifBigBold" -         height="30" -         layout="topleft" -         left="10" -         mouse_opaque="false" -         name="tab_name" -         text_color="EmphasisColor" -         top="10" -         value="Places" -         width="200" -         word_wrap="true" /> -        <icon -         follows="top|right" -         height="20" -         layout="topleft" -         name="tab_icon" -         right="-10" -         top="10" -         width="20" -         image_name="TabIcon_Places_Selected"/> -        <text -         follows="all" -         height="90" -         layout="topleft" -         left="10" -         mouse_opaque="false" -         name="tab_description" -         right="-10" -         text_color="white" -         top="40" -         word_wrap="true"> -            Find places to go and places you've visited before. -        </text> -    </panel> -    <panel -     background_visible="true" -     bg_alpha_color="DkGray2" -     class="panel_sidetray_home_info" -     follows="left|top|right" -     height="90" -     layout="topleft" -     left="15" -     top_pad="15" -     name="sidebar_me" -     width="303"> -        <text -         follows="left|right|top" -         font="SansSerifBigBold" -         height="30" -         layout="topleft" -         left="10" -         mouse_opaque="false" -         name="tab_name" -         text_color="EmphasisColor" -         top="10" -         value="My Profile" -         width="200" -         word_wrap="true" /> -        <icon -         follows="top|right" -         height="20" -         layout="topleft" -         name="tab_icon" -         right="-10" -         top="10" -         width="20" -         image_name="TabIcon_Me_Selected"/> -        <text -         follows="all" -         height="90" -         layout="topleft" -         left="10" -         mouse_opaque="false" -         name="tab_description" -         right="-10" -         text_color="white" -         top="40" -         word_wrap="true"> -            Edit your public profile. -        </text> -    </panel> -    <panel -     background_visible="true" -     bg_alpha_color="DkGray2" -     class="panel_sidetray_home_info" -     follows="left|top|right" -     height="90" -     layout="topleft" -     left="15" -     top_pad="15" -     name="sidebar_appearance" -     width="303"> -        <text -         follows="left|right|top" -         font="SansSerifBigBold" -         height="30" -         layout="topleft" -         left="10" -         mouse_opaque="false" -         name="tab_name" -         text_color="EmphasisColor" -         top="10" -         value="My Appearance" -         width="200" -         word_wrap="true" /> -        <icon -         follows="top|right" -         height="20" -         layout="topleft" -         name="tab_icon" -         right="-10" -         top="10" -         width="20" -         image_name="TabIcon_Appearance_Selected"/> -        <text -         follows="all" -         height="90" -         layout="topleft" -         left="10" -         mouse_opaque="false" -         name="tab_description" -         right="-10" -         text_color="white" -         top="40" -         word_wrap="true"> -            Change your appearance and current look. -        </text> -    </panel> -    <panel -     background_visible="true" -     bg_alpha_color="DkGray2" -     class="panel_sidetray_home_info" -     follows="left|top|right" -     height="90" -     layout="topleft" -     left="15" -     top_pad="15" -     name="sidebar_inventory" -     width="303"> -        <text -         follows="left|right|top" -         font="SansSerifBigBold" -         height="30" -         layout="topleft" -         left="10" -         mouse_opaque="false" -         name="tab_name" -         text_color="EmphasisColor" -         top="10" -         value="My Inventory" -         width="200" -         word_wrap="true" /> -        <icon -         follows="top|right" -         height="20" -         layout="topleft" -         name="tab_icon" -         right="-10" -         top="10" -         width="20" -         image_name="TabIcon_Things_Selected"/> -        <text -         follows="all" -         height="90" -         layout="topleft" -         left="10" -         mouse_opaque="false" -         name="tab_description" -         right="-10" -         text_color="white" -         top="40" -         word_wrap="true"> -            Browse your inventory. -        </text> -    </panel> -  </panel> -  </scroll_container> +   left="10" +   help_topic="sidetray_home" +   name="sidetray_home" +   top_pad="10" +   width="313"> +     <web_browser +      border_visible="false" +      follows="all" +      height="550" +      layout="topleft" +      left="0" +      name="sidetray_home_browser" +      start_url="about:blank" +      top="0" +      width="313" /> +   </panel>  </panel> | 
