diff options
| -rw-r--r-- | indra/newview/llfloaterimsession.h | 1 | ||||
| -rw-r--r-- | indra/newview/llfloaterimsessiontab.h | 1 | ||||
| -rw-r--r-- | indra/newview/lllookshistorypanel.h | 67 | ||||
| -rw-r--r-- | indra/newview/llpanelimcontrolpanel.cpp | 44 | ||||
| -rw-r--r-- | indra/newview/llpanelimcontrolpanel.h | 84 | ||||
| -rw-r--r-- | indra/newview/lltoolview.cpp | 196 | ||||
| -rw-r--r-- | indra/newview/lltoolview.h | 84 |
7 files changed, 0 insertions, 477 deletions
diff --git a/indra/newview/llfloaterimsession.h b/indra/newview/llfloaterimsession.h index a442099ad1..aa03fc4e62 100644 --- a/indra/newview/llfloaterimsession.h +++ b/indra/newview/llfloaterimsession.h @@ -39,7 +39,6 @@ class LLAvatarName; class LLButton; class LLChatEntry; class LLTextEditor; -class LLPanelChatControlPanel; class LLChatHistory; class LLInventoryItem; class LLInventoryCategory; diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h index 6d04d622e1..289a9e90fe 100644 --- a/indra/newview/llfloaterimsessiontab.h +++ b/indra/newview/llfloaterimsessiontab.h @@ -38,7 +38,6 @@ #include "llconversationview.h" #include "lltexteditor.h" -class LLPanelChatControlPanel; class LLChatEntry; class LLChatHistory; class LLPanelEmojiComplete; diff --git a/indra/newview/lllookshistorypanel.h b/indra/newview/lllookshistorypanel.h deleted file mode 100644 index 0bcf511e89..0000000000 --- a/indra/newview/lllookshistorypanel.h +++ /dev/null @@ -1,67 +0,0 @@ -/** - * @file llpanelteleporthistory.h - * @brief Teleport history represented by a scrolling list - * class definition - * - * $LicenseInfo:firstyear=2009&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#ifndef LL_LLPANELLOOKSHISTORY_H -#define LL_LLPANELLOOKSHISTORY_H - -#include "lluictrlfactory.h" -#include "llscrolllistctrl.h" - -#include "llpanelappearancetab.h" -#include "lllookshistory.h" - -class LLLooksHistoryPanel : public LLPanelAppearanceTab -{ -public: - LLLooksHistoryPanel(); - virtual ~LLLooksHistoryPanel(); - - /*virtual*/ bool postBuild(); - /*virtual*/ void onSearchEdit(const std::string& string); - /*virtual*/ void onShowOnMap(); - /*virtual*/ void onLooks(); - ///*virtual*/ void onCopySLURL(); - - void showLooksHistory(); - void handleItemSelect(const LLSD& data); - - static void onDoubleClickItem(void* user_data); - -private: - enum LOOKS_HISTORY_COLUMN_ORDER - { - LIST_ICON, - LIST_ITEM_TITLE, - LIST_INDEX - }; - - LLLooksHistory* mLooksHistory; - LLScrollListCtrl* mHistoryItems; - std::string mFilterSubString; -}; - -#endif //LL_LLPANELLOOKSHISTORY_H diff --git a/indra/newview/llpanelimcontrolpanel.cpp b/indra/newview/llpanelimcontrolpanel.cpp deleted file mode 100644 index 07a8641a92..0000000000 --- a/indra/newview/llpanelimcontrolpanel.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/** - * @file llpanelimcontrolpanel.cpp - * @brief LLPanelIMControlPanel and related class implementations - * - * $LicenseInfo:firstyear=2004&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#include "llviewerprecompiledheaders.h" -#include "llfloaterreg.h" - -#include "llpanelimcontrolpanel.h" - -#include "llagent.h" -#include "llappviewer.h" // for gDisconnected -#include "llavataractions.h" -#include "llavatariconctrl.h" -#include "llbutton.h" -#include "llgroupactions.h" -#include "llavatarlist.h" -#include "llparticipantlist.h" -#include "llimview.h" -#include "llspeakers.h" -#include "lltrans.h" - - diff --git a/indra/newview/llpanelimcontrolpanel.h b/indra/newview/llpanelimcontrolpanel.h deleted file mode 100644 index 2fdd409fdc..0000000000 --- a/indra/newview/llpanelimcontrolpanel.h +++ /dev/null @@ -1,84 +0,0 @@ -/** - * @file llpanelimcontrolpanel.h - * @brief LLPanelIMControlPanel and related class definitions - * - * $LicenseInfo:firstyear=2004&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#ifndef LL_LLPANELIMCONTROLPANEL_H -#define LL_LLPANELIMCONTROLPANEL_H - -#include "llpanel.h" -#include "llcallingcard.h" - -class LLParticipantList; - -class LLPanelChatControlPanel - : public LLPanel -{ -public: - LLPanelChatControlPanel() : - mSessionId(LLUUID()) {}; - ~LLPanelChatControlPanel(); - - virtual bool postBuild(); - - virtual void setSessionId(const LLUUID& session_id); - const LLUUID& getSessionId() { return mSessionId; } - -private: - LLUUID mSessionId; - - // connection to voice channel state change signal - boost::signals2::connection mVoiceChannelStateChangeConnection; -}; - -class LLPanelGroupControlPanel : public LLPanelChatControlPanel -{ -public: - LLPanelGroupControlPanel(const LLUUID& session_id); - ~LLPanelGroupControlPanel(); - - bool postBuild(); - - void setSessionId(const LLUUID& session_id); - /*virtual*/ void draw(); - -protected: - LLUUID mGroupID; - - LLParticipantList* mParticipantList; - -private: - void onSortMenuItemClicked(const LLSD& userdata); -}; - -class LLPanelAdHocControlPanel : public LLPanelGroupControlPanel -{ -public: - LLPanelAdHocControlPanel(const LLUUID& session_id); - - bool postBuild(); - -}; - -#endif // LL_LLPANELIMCONTROLPANEL_H diff --git a/indra/newview/lltoolview.cpp b/indra/newview/lltoolview.cpp deleted file mode 100644 index cd1d90ea9e..0000000000 --- a/indra/newview/lltoolview.cpp +++ /dev/null @@ -1,196 +0,0 @@ -/** - * @file lltoolview.cpp - * @brief A UI contains for tool palette tools - * - * $LicenseInfo:firstyear=2001&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#include "llviewerprecompiledheaders.h" - -#include "lltoolview.h" - -#include "llfontgl.h" -#include "llrect.h" - -#include "llagent.h" -#include "llbutton.h" -#include "llpanel.h" -#include "lltool.h" -#include "lltoolmgr.h" -#include "lltextbox.h" -#include "llresmgr.h" - - -LLToolContainer::LLToolContainer(LLToolView* parent) -: mParent(parent), - mButton(NULL), - mPanel(NULL), - mTool(NULL) -{ } - - -LLToolContainer::~LLToolContainer() -{ - // mParent is a pointer to the tool view - // mButton is owned by the tool view - // mPanel is owned by the tool view - delete mTool; - mTool = NULL; -} - - -LLToolView::LLToolView(const std::string& name, const LLRect& rect) -: mButtonCount(0) -{ - LLView::init(LLView::Params().name(name).rect(rect).mouse_opaque(true)); -} - - -LLToolView::~LLToolView() -{ - for_each(mContainList.begin(), mContainList.end(), DeletePointer()); - mContainList.clear(); -} - -//*TODO:translate? -// void LLToolView::addTool(const std::string& icon_off, const std::string& icon_on, LLPanel* panel, LLTool* tool, LLView* hoverView, const char* label) -// { -// llassert(tool); - -// LLToolContainer* contain = new LLToolContainer(this); - -// LLRect btn_rect = getButtonRect(mButtonCount); - -// contain->mButton = new LLButton("ToolBtn", -// btn_rect, -// icon_off, -// icon_on, -// "", -// &LLToolView::onClickToolButton, -// contain, -// LLFontGL::getFontSansSerif()); - -// contain->mPanel = panel; -// contain->mTool = tool; - -// addChild(contain->mButton); -// mButtonCount++; - -// const S32 LABEL_TOP_SPACING = 0; -// const LLFontGL* font = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL ); -// S32 label_width = font->getWidth( label ); -// LLRect label_rect; -// label_rect.setLeftTopAndSize( -// btn_rect.mLeft + btn_rect.getWidth() / 2 - label_width / 2, -// btn_rect.mBottom - LABEL_TOP_SPACING, -// label_width, -// llfloor(font->getLineHeight())); -// addChild( new LLTextBox( "tool label", label_rect, label, font ) ); - -// // Can optionally ignore panel -// if (contain->mPanel) -// { -// contain->mPanel->setBackgroundVisible( false ); -// contain->mPanel->setBorderVisible( false ); -// addChild(contain->mPanel); -// } - -// mContainList.push_back(contain); -// } - - -LLRect LLToolView::getButtonRect(S32 button_index) -{ - const S32 HPAD = 7; - const S32 VPAD = 7; - const S32 TOOL_SIZE = 32; - const S32 HORIZ_SPACING = TOOL_SIZE + 5; - const S32 VERT_SPACING = TOOL_SIZE + 14; - - S32 tools_per_row = getRect().getWidth() / HORIZ_SPACING; - - S32 row = button_index / tools_per_row; - S32 column = button_index % tools_per_row; - - // Build the rectangle, recalling the origin is at lower left - // and we want the icons to build down from the top. - LLRect rect; - rect.setLeftTopAndSize( HPAD + (column * HORIZ_SPACING), - -VPAD + getRect().getHeight() - (row * VERT_SPACING), - TOOL_SIZE, - TOOL_SIZE - ); - - return rect; -} - - -void LLToolView::draw() -{ - // turn off highlighting for all containers - // and hide all option panels except for the selected one. - LLTool* selected = LLToolMgr::getInstance()->getCurrentToolset()->getSelectedTool(); - for (contain_list_t::iterator iter = mContainList.begin(); - iter != mContainList.end(); ++iter) - { - LLToolContainer* contain = *iter; - bool state = (contain->mTool == selected); - contain->mButton->setToggleState( state ); - if (contain->mPanel) - { - contain->mPanel->setVisible( state ); - } - } - - // Draw children normally - LLView::draw(); -} - -// protected -LLToolContainer* LLToolView::findToolContainer( LLTool *tool ) -{ - // Find the container for this tool - llassert( tool ); - for (contain_list_t::iterator iter = mContainList.begin(); - iter != mContainList.end(); ++iter) - { - LLToolContainer* contain = *iter; - if( contain->mTool == tool ) - { - return contain; - } - } - LL_ERRS() << "LLToolView::findToolContainer - tool not found" << LL_ENDL; - return NULL; -} - -// static -void LLToolView::onClickToolButton(void* userdata) -{ - LLToolContainer* clicked = (LLToolContainer*) userdata; - - // Switch to this one - LLToolMgr::getInstance()->getCurrentToolset()->selectTool( clicked->mTool ); -} - - - diff --git a/indra/newview/lltoolview.h b/indra/newview/lltoolview.h deleted file mode 100644 index 7b348e7088..0000000000 --- a/indra/newview/lltoolview.h +++ /dev/null @@ -1,84 +0,0 @@ -/** - * @file lltoolview.h - * @brief UI container for tools. - * - * $LicenseInfo:firstyear=2001&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#ifndef LL_LLTOOLVIEW_H -#define LL_LLTOOLVIEW_H - -// requires stdtypes.h -#include "llpanel.h" - -// forward declares -class LLTool; -class LLButton; - -class LLToolView; - - -// Utility class, container for the package of information we need about -// each tool. The package can either point directly to a tool, or indirectly -// to another view of tools. -class LLToolContainer -{ -public: - LLToolContainer(LLToolView* parent); - ~LLToolContainer(); - -public: - LLToolView* mParent; // toolview that owns this container - LLButton* mButton; - LLPanel* mPanel; - LLTool* mTool; // if not NULL, this is a tool ref -}; - - -// A view containing automatically arranged button icons representing -// tools. The icons sit on top of panels containing options for each -// tool. -class LLToolView -: public LLView -{ -public: - LLToolView(const std::string& name, const LLRect& rect); - ~LLToolView(); - - virtual void draw(); // handle juggling tool button highlights, panel visibility - - static void onClickToolButton(void* container); - - LLView* getCurrentHoverView(); - -private: - LLRect getButtonRect(S32 button_index); // return rect for button to add, zero-based index - LLToolContainer *findToolContainer(LLTool *tool); - - -private: - typedef std::vector<LLToolContainer*> contain_list_t; - contain_list_t mContainList; - S32 mButtonCount; // used to compute rectangles -}; - -#endif |