livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use refactored FSScrollListCtrl to get rid of FSAreaSearchListCtrl, FSAvatarSearchListCtrl, FSBlockListCtrl and FSContactsFriendsCtrl to reduce code duplication

Ansariel 2015-02-16 12:29:45 +01:00
parent 3ea6668459
commit 80d71f004c
61 changed files with 308 additions and 799 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/CMakeLists.txt
View File

@ -133,16 +133,12 @@ set(viewer_SOURCE_FILES
exopostprocess.cpp
floatermedialists.cpp
fsareasearch.cpp
fsareasearchlistctrl.cpp
fsareasearchmenu.cpp
fsavatarsearchlistctrl.cpp
fsavatarsearchmenu.cpp
fsblocklistctrl.cpp
fsblocklistmenu.cpp
fschathistory.cpp
fscommon.cpp
fsconsoleutils.cpp
fscontactsfriendsctrl.cpp
fscontactsfriendsmenu.cpp
fsdata.cpp
fsdroptarget.cpp
@ -864,16 +860,12 @@ set(viewer_HEADER_FILES
exopostprocess.h
floatermedialists.h
fsareasearch.h
fsareasearchlistctrl.h
fsareasearchmenu.h
fsavatarsearchlistctrl.h
fsavatarsearchmenu.h
fsblocklistctrl.h
fsblocklistmenu.h
fschathistory.h
fscommon.h
fsconsoleutils.h
fscontactsfriendsctrl.h
fscontactsfriendsmenu.h
fsdata.h
fsdroptarget.h

6
indra/newview/fsareasearch.cpp
View File

@ -60,8 +60,8 @@
#include "llviewerjoystick.h" // For disabling/re-enabling when requested to look at an object.
#include "llmoveview.h" // For LLPanelStandStopFlying::clearStandStopFlyingMode
#include "rlvhandler.h"
#include "fsareasearchlistctrl.h"
#include "fsareasearchmenu.h"
#include "fsscrolllistctrl.h"
// max number of objects that can be (de-)selected in a single packet.
const S32 MAX_OBJECTS_PER_PACKET = 255;
@ -1031,7 +1031,7 @@ void FSAreaSearch::updateObjectCosts(const LLUUID& object_id, F32 object_cost, F
return;
}
FSAreaSearchListCtrl* result_list = mPanelList->getResultList();
FSScrollListCtrl* result_list = mPanelList->getResultList();
if (result_list)
{
LLScrollListItem* list_row = result_list->getItem(LLSD(object_id));
@ -1278,7 +1278,7 @@ FSPanelAreaSearchList::FSPanelAreaSearchList(FSAreaSearch* pointer)
BOOL FSPanelAreaSearchList::postBuild()
{
mResultList = getChild<FSAreaSearchListCtrl>("result_list");
mResultList = getChild<FSScrollListCtrl>("result_list");
mResultList->setDoubleClickCallback(boost::bind(&FSPanelAreaSearchList::onDoubleClick, this));
mResultList->sortByColumn("name", TRUE);
mResultList->setContextMenu(&gFSAreaSearchMenu);

6
indra/newview/fsareasearch.h
View File

@ -47,12 +47,12 @@ class LLContextMenu;
class LLSpinCtrl;
class LLComboBox;
class FSAreaSearchListCtrl;
class FSPanelAreaSearchList;
class FSPanelAreaSearchFind;
class FSPanelAreaSearchFilter;
class FSPanelAreaSearchAdvanced;
class FSPanelAreaSearchOptions;
class FSScrollListCtrl;
struct FSObjectProperties
{
@ -275,7 +275,7 @@ public:
void updateName(LLUUID id, std::string name);
void touchObject(LLViewerObject* objectp);
FSAreaSearchListCtrl* getResultList() { return mResultList; }
FSScrollListCtrl* getResultList() { return mResultList; }
void updateResultListColumns();
void setAgentLastPosition(LLVector3d d) { mAgentLastPosition = d; }
@ -299,7 +299,7 @@ private:
FSAreaSearch* mFSAreaSearch;
LLButton* mRefreshButton;
FSAreaSearchListCtrl* mResultList;
FSScrollListCtrl* mResultList;
LLCheckBoxCtrl* mCheckboxBeacons;
LLTextBox* mCounterText;

69
indra/newview/fsareasearchlistctrl.cpp
View File

@ -1,69 +0,0 @@
/**
* @file fsareasearchlistctrl.cpp
* @brief A area search-specific implementation of scrolllist
*
* $LicenseInfo:firstyear=2014&license=viewerlgpl$
* Phoenix Firestorm Viewer Source Code
* Copyright (c) 2014 Ansariel Hiller
*
* 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
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"
#include "fsareasearchlistctrl.h"
#include "llscrolllistitem.h"
static LLDefaultChildRegistry::Register<FSAreaSearchListCtrl> r("area_search_list");
FSAreaSearchListCtrl::FSAreaSearchListCtrl(const Params& p)
: FSScrollListCtrl(p)
{
}
BOOL FSAreaSearchListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
{
BOOL handled = LLUICtrl::handleRightMouseDown(x, y, mask);
if (mContextMenu)
{
std::vector<LLScrollListItem*> selected_items = getAllSelected();
if (selected_items.size() > 1)
{
uuid_vec_t selected_uuids;
for (std::vector<LLScrollListItem*>::iterator it = selected_items.begin(); it != selected_items.end(); ++it)
{
selected_uuids.push_back((*it)->getUUID());
}
mContextMenu->show(this, selected_uuids, x, y);
}
else
{
LLScrollListItem* hit_item = hitItem(x, y);
if (hit_item)
{
LLUUID val = hit_item->getValue();
selectByID(val);
uuid_vec_t selected_uuids;
selected_uuids.push_back(val);
mContextMenu->show(this, selected_uuids, x, y);
}
}
}
return handled;
}

52
indra/newview/fsareasearchlistctrl.h
View File

@ -1,52 +0,0 @@
/**
* @file fsareasearchlistctrl.h
* @brief A area search-specific implementation of scrolllist
*
* $LicenseInfo:firstyear=2014&license=viewerlgpl$
* Phoenix Firestorm Viewer Source Code
* Copyright (c) 2014 Ansariel Hiller
*
* 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
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#ifndef FS_AREASEARCHLISTCTRL_H
#define FS_AREASEARCHLISTCTRL_H
#include "fsscrolllistctrl.h"
class FSAreaSearchListCtrl
: public FSScrollListCtrl, public LLInstanceTracker<FSAreaSearchListCtrl>
{
public:
struct Params : public LLInitParam::Block<Params, FSScrollListCtrl::Params>
{
Params()
{}
};
BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
protected:
FSAreaSearchListCtrl(const Params&);
virtual ~FSAreaSearchListCtrl() {}
friend class LLUICtrlFactory;
};
#endif // FS_AREASEARCHLISTCTRL_H

69
indra/newview/fsavatarsearchlistctrl.cpp
View File

@ -1,69 +0,0 @@
/**
* @file fsavatarsearchlistctrl.cpp
* @brief A avatar search-specific implementation of scrolllist
*
* $LicenseInfo:firstyear=2014&license=viewerlgpl$
* Phoenix Firestorm Viewer Source Code
* Copyright (c) 2014 Ansariel Hiller
*
* 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
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"
#include "fsavatarsearchlistctrl.h"
#include "llscrolllistitem.h"
static LLDefaultChildRegistry::Register<FSAvatarSearchListCtrl> r("fs_avatar_search_list");
FSAvatarSearchListCtrl::FSAvatarSearchListCtrl(const Params& p)
: FSScrollListCtrl(p)
{
}
BOOL FSAvatarSearchListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
{
BOOL handled = LLUICtrl::handleRightMouseDown(x, y, mask);
if (mContextMenu)
{
std::vector<LLScrollListItem*> selected_items = getAllSelected();
if (selected_items.size() > 1)
{
uuid_vec_t selected_uuids;
for (std::vector<LLScrollListItem*>::iterator it = selected_items.begin(); it != selected_items.end(); ++it)
{
selected_uuids.push_back((*it)->getUUID());
}
mContextMenu->show(this, selected_uuids, x, y);
}
else
{
LLScrollListItem* hit_item = hitItem(x, y);
if (hit_item)
{
LLUUID val = hit_item->getValue();
selectByID(val);
uuid_vec_t selected_uuids;
selected_uuids.push_back(val);
mContextMenu->show(this, selected_uuids, x, y);
}
}
}
return handled;
}

52
indra/newview/fsavatarsearchlistctrl.h
View File

@ -1,52 +0,0 @@
/**
* @file fsavatarsearchlistctrl.h
* @brief A avatar search-specific implementation of scrolllist
*
* $LicenseInfo:firstyear=2014&license=viewerlgpl$
* Phoenix Firestorm Viewer Source Code
* Copyright (c) 2014 Ansariel Hiller
*
* 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
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#ifndef FS_AVATARSEARCHLISTCTRL_H
#define FS_AVATARSEARCHLISTCTRL_H
#include "fsscrolllistctrl.h"
class FSAvatarSearchListCtrl
: public FSScrollListCtrl, public LLInstanceTracker<FSAvatarSearchListCtrl>
{
public:
struct Params : public LLInitParam::Block<Params, FSScrollListCtrl::Params>
{
Params()
{}
};
BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
protected:
FSAvatarSearchListCtrl(const Params&);
virtual ~FSAvatarSearchListCtrl() {}
friend class LLUICtrlFactory;
};
#endif // FS_AVATARSEARCHLISTCTRL_H

69
indra/newview/fsblocklistctrl.cpp
View File

@ -1,69 +0,0 @@
/**
* @file fsblocklistctrl.cpp
* @brief A block list-specific implementation of scrolllist
*
* $LicenseInfo:firstyear=2014&license=viewerlgpl$
* Phoenix Firestorm Viewer Source Code
* Copyright (c) 2014 Ansariel Hiller
*
* 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
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"
#include "fsblocklistctrl.h"
#include "llscrolllistitem.h"
static LLDefaultChildRegistry::Register<FSBlockListCtrl> r("fs_block_list");
FSBlockListCtrl::FSBlockListCtrl(const Params& p)
: FSScrollListCtrl(p)
{
}
BOOL FSBlockListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
{
BOOL handled = LLUICtrl::handleRightMouseDown(x, y, mask);
if (mContextMenu)
{
std::vector<LLScrollListItem*> selected_items = getAllSelected();
if (selected_items.size() > 1)
{
uuid_vec_t selected_uuids;
for (std::vector<LLScrollListItem*>::iterator it = selected_items.begin(); it != selected_items.end(); ++it)
{
selected_uuids.push_back((*it)->getUUID());
}
mContextMenu->show(this, selected_uuids, x, y);
}
else
{
LLScrollListItem* hit_item = hitItem(x, y);
if (hit_item)
{
LLUUID val = hit_item->getValue();
selectByID(val);
uuid_vec_t selected_uuids;
selected_uuids.push_back(val);
mContextMenu->show(this, selected_uuids, x, y);
}
}
}
return handled;
}

52
indra/newview/fsblocklistctrl.h
View File

@ -1,52 +0,0 @@
/**
* @file fsblocklistctrl.h
* @brief A block list-specific implementation of scrolllist
*
* $LicenseInfo:firstyear=2014&license=viewerlgpl$
* Phoenix Firestorm Viewer Source Code
* Copyright (c) 2014 Ansariel Hiller
*
* 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
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#ifndef FS_BLOCKLISTCTRL_H
#define FS_BLOCKLISTCTRL_H
#include "fsscrolllistctrl.h"
class FSBlockListCtrl
: public FSScrollListCtrl, public LLInstanceTracker<FSBlockListCtrl>
{
public:
struct Params : public LLInitParam::Block<Params, FSScrollListCtrl::Params>
{
Params()
{}
};
BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
protected:
FSBlockListCtrl(const Params&);
virtual ~FSBlockListCtrl() {}
friend class LLUICtrlFactory;
};
#endif // FS_BLOCKLISTCTRL_H

70
indra/newview/fscontactsfriendsctrl.cpp
View File

@ -1,70 +0,0 @@
/**
* @file fscontactsfriendsctrl.cpp
* @brief A friend list specific implementation of scrolllist
*
* $LicenseInfo:firstyear=2014&license=viewerlgpl$
* Phoenix Firestorm Viewer Source Code
* Copyright (c) 2014 Ansariel Hiller @ Second Life
*
* 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
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"
#include "fscontactsfriendsctrl.h"
#include "llscrolllistitem.h"
static LLDefaultChildRegistry::Register<FSContactsFriendsCtrl> r("friend_list");
FSContactsFriendsCtrl::FSContactsFriendsCtrl(const Params& p)
: FSScrollListCtrl(p)
{
}
BOOL FSContactsFriendsCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
{
BOOL handled = LLUICtrl::handleRightMouseDown(x, y, mask);
if (mContextMenu)
{
std::vector<LLScrollListItem*> selected_items = getAllSelected();
if (selected_items.size() > 1)
{
uuid_vec_t selected_uuids;
for (std::vector<LLScrollListItem*>::iterator it = selected_items.begin(); it != selected_items.end(); ++it)
{
selected_uuids.push_back((*it)->getUUID());
}
mContextMenu->show(this, selected_uuids, x, y);
}
else
{
LLScrollListItem* hit_item = hitItem(x, y);
if (hit_item)
{
selectByID(hit_item->getValue());
LLUUID av = hit_item->getValue();
uuid_vec_t selected_uuids;
selected_uuids.push_back(av);
mContextMenu->show(this, selected_uuids, x, y);
}
}
}
return handled;
}

52
indra/newview/fscontactsfriendsctrl.h
View File

@ -1,52 +0,0 @@
/**
* @file fscontactsfriendsctrl.h
* @brief A friend list specific implementation of scrolllist
*
* $LicenseInfo:firstyear=2014&license=viewerlgpl$
* Phoenix Firestorm Viewer Source Code
* Copyright (c) 2014 Ansariel Hiller @ Second Life
*
* 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
*
* The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
* http://www.firestormviewer.org
* $/LicenseInfo$
*/
#ifndef FS_CONTACTSFRIENDSTCTRL_H
#define FS_CONTACTSFRIENDSTCTRL_H
#include "fsscrolllistctrl.h"
class FSContactsFriendsCtrl
: public FSScrollListCtrl, public LLInstanceTracker<FSContactsFriendsCtrl>
{
public:
struct Params : public LLInitParam::Block<Params, FSScrollListCtrl::Params>
{
Params()
{}
};
BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
protected:
FSContactsFriendsCtrl(const Params&);
virtual ~FSContactsFriendsCtrl() {}
friend class LLUICtrlFactory;
};
#endif // FS_CONTACTSFRIENDSTCTRL_H

4
indra/newview/fsfloatercontacts.cpp
View File

@ -30,9 +30,9 @@
#include "fsfloatercontacts.h"
#include "fscommon.h"
#include "fscontactsfriendsctrl.h"
#include "fscontactsfriendsmenu.h"
#include "fsfloaterimcontainer.h"
#include "fsscrolllistctrl.h"
#include "llagent.h"
#include "llavataractions.h"
#include "llcallingcard.h" // for LLAvatarTracker
@ -127,7 +127,7 @@ BOOL FSFloaterContacts::postBuild()
mFriendsTab = getChild<LLPanel>(FRIENDS_TAB_NAME);
mFriendListFontName = mFriendsTab->getString("FontName");
mFriendsList = mFriendsTab->getChild<FSContactsFriendsCtrl>("friend_list");
mFriendsList = mFriendsTab->getChild<FSScrollListCtrl>("friend_list");
mFriendsList->setMaxSelectable(MAX_FRIEND_SELECT);
mFriendsList->setCommitOnSelectionChange(TRUE);
mFriendsList->setCommitCallback(boost::bind(&FSFloaterContacts::onSelectName, this));

4
indra/newview/fsfloatercontacts.h
View File

@ -34,7 +34,7 @@
#include "llscrolllistcolumn.h"
#include "rlvhandler.h"
class FSContactsFriendsCtrl;
class FSScrollListCtrl;
class LLAvatarList;
class LLAvatarTracker;
class LLFriendObserver;
@ -70,7 +70,7 @@ public:
void onDisplayNameChanged();
LLPanel* mFriendsTab;
FSContactsFriendsCtrl* mFriendsList;
FSScrollListCtrl* mFriendsList;
LLPanel* mGroupsTab;
LLGroupList* mGroupList;

4
indra/newview/fsfloatersearch.cpp
View File

@ -28,8 +28,8 @@
#include "llviewerprecompiledheaders.h"
#include "fsfloatersearch.h"
#include "fsavatarsearchlistctrl.h"
#include "fsavatarsearchmenu.h"
#include "fsscrolllistctrl.h"
#include "lfsimfeaturehandler.h"
#include "llagent.h"
#include "llavatarname.h"
@ -731,7 +731,7 @@ FSPanelSearchPeople::~FSPanelSearchPeople()
BOOL FSPanelSearchPeople::postBuild()
{
mSearchComboBox = findChild<LLSearchComboBox>("people_edit");
mSearchResults = findChild<FSAvatarSearchListCtrl>("search_results_people");
mSearchResults = findChild<FSScrollListCtrl>("search_results_people");
if (mSearchComboBox)
{
mSearchComboBox->setCommitCallback(boost::bind(&FSPanelSearchPeople::onBtnFind, this));

4
indra/newview/fsfloatersearch.h
View File

@ -48,8 +48,8 @@ class LLGroupMgrObserver;
class LLSearchEditor;
class LLSearchComboBox;
class FSFloaterSearch;
class FSAvatarSearchListCtrl;
class FSPanelProfile;
class FSScrollListCtrl;
struct SearchQuery : public LLInitParam::Block<SearchQuery>
{
@ -108,7 +108,7 @@ private:
FSFloaterSearch* mParent;
LLSearchComboBox* mSearchComboBox;
FSAvatarSearchListCtrl* mSearchResults;
FSScrollListCtrl* mSearchResults;
};
class FSPanelSearchGroups : public FSSearchPanelBase

4
indra/newview/fspanelblocklist.cpp
View File

@ -31,8 +31,8 @@
#include "fspanelblocklist.h"
#include "fsblocklistctrl.h"
#include "fsblocklistmenu.h"
#include "fsscrolllistctrl.h"
#include "llavataractions.h"
#include "llavatarname.h"
#include "llfiltereditor.h"
@ -85,7 +85,7 @@ FSPanelBlockList::~FSPanelBlockList()
BOOL FSPanelBlockList::postBuild()
{
mBlockedList = getChild<FSBlockListCtrl>("block_list");
mBlockedList = getChild<FSScrollListCtrl>("block_list");
mBlockedList->setCommitOnSelectionChange(TRUE);
mBlockedList->setCommitCallback(boost::bind(&FSPanelBlockList::onSelectionChanged, this));
mBlockedList->setDoubleClickCallback(boost::bind(&FSPanelBlockList::showProfile, this));

4
indra/newview/fspanelblocklist.h
View File

@ -35,7 +35,7 @@
#include "llfloater.h"
class LLAvatarName;
class FSBlockListCtrl;
class FSScrollListCtrl;
class FSPanelBlockList
: public LLPanel, public LLMuteListObserver
@ -93,7 +93,7 @@ private:
void callbackBlockByName(const std::string& text);
private:
FSBlockListCtrl* mBlockedList;
FSScrollListCtrl* mBlockedList;
LLHandle<LLFloater> mAvatarPicker;
LLHandle<LLFloater> mObjectPicker;
std::string mFilterSubString;

2
indra/newview/fsscrolllistctrl.cpp
View File

@ -29,6 +29,8 @@
#include "fsscrolllistctrl.h"
static LLDefaultChildRegistry::Register<FSScrollListCtrl> r("fs_scroll_list");
FSScrollListCtrl::FSScrollListCtrl(const Params& p)
: LLScrollListCtrl(p),
mContextMenu(NULL),

10
indra/newview/llfloateravatarpicker.cpp
View File

@ -59,8 +59,8 @@
//#include "llsdserialize.h"
#include "fsavatarsearchlistctrl.h"
#include "fsavatarsearchmenu.h"
#include "fsscrolllistctrl.h"
//put it back as a member once the legacy path is out?
static std::map<LLUUID, LLAvatarName> sAvatarNameMap;
@ -137,7 +137,7 @@ BOOL LLFloaterAvatarPicker::postBuild()
// <FS:Ansariel> FIRE-5096: Add context menu for result lists
//LLScrollListCtrl* searchresults = getChild<LLScrollListCtrl>("SearchResults");
FSAvatarSearchListCtrl* searchresults = getChild<FSAvatarSearchListCtrl>("SearchResults");
FSScrollListCtrl* searchresults = getChild<FSScrollListCtrl>("SearchResults");
searchresults->setContextMenu(&gFSAvatarSearchMenu);
// </FS:Ansariel>
searchresults->setDoubleClickCallback( boost::bind(&LLFloaterAvatarPicker::onBtnSelect, this));
@ -146,7 +146,7 @@ BOOL LLFloaterAvatarPicker::postBuild()
// <FS:Ansariel> FIRE-5096: Add context menu for result lists
//LLScrollListCtrl* nearme = getChild<LLScrollListCtrl>("NearMe");
FSAvatarSearchListCtrl* nearme = getChild<FSAvatarSearchListCtrl>("NearMe");
FSScrollListCtrl* nearme = getChild<FSScrollListCtrl>("NearMe");
nearme->setContextMenu(&gFSAvatarSearchMenu);
// </FS:Ansariel>
nearme->setDoubleClickCallback(boost::bind(&LLFloaterAvatarPicker::onBtnSelect, this));
@ -154,7 +154,7 @@ BOOL LLFloaterAvatarPicker::postBuild()
// <FS:Ansariel> FIRE-5096: Add context menu for result lists
//LLScrollListCtrl* friends = getChild<LLScrollListCtrl>("Friends");
FSAvatarSearchListCtrl* friends = getChild<FSAvatarSearchListCtrl>("Friends");
FSScrollListCtrl* friends = getChild<FSScrollListCtrl>("Friends");
friends->setContextMenu(&gFSAvatarSearchMenu);
// </FS:Ansariel>
friends->setDoubleClickCallback(boost::bind(&LLFloaterAvatarPicker::onBtnSelect, this));
@ -183,7 +183,7 @@ BOOL LLFloaterAvatarPicker::postBuild()
childSetAction("FindUUID", boost::bind(&LLFloaterAvatarPicker::onBtnFindUUID, this));
getChildView("FindUUID")->setEnabled(FALSE);
FSAvatarSearchListCtrl* searchresultsuuid = getChild<FSAvatarSearchListCtrl>("SearchResultsUUID");
FSScrollListCtrl* searchresultsuuid = getChild<FSScrollListCtrl>("SearchResultsUUID");
searchresultsuuid->setContextMenu(&gFSAvatarSearchMenu);
searchresultsuuid->setDoubleClickCallback( boost::bind(&LLFloaterAvatarPicker::onBtnSelect, this));
searchresultsuuid->setCommitCallback(boost::bind(&LLFloaterAvatarPicker::onList, this));

24
indra/newview/skins/ansastorm/xui/en/panel_fs_contacts_friends.xml
View File

@ -26,7 +26,7 @@
top="-10"
width="240" />
-->
<friend_list
<fs_scroll_list
desired_line_height="14"
left="4"
right="-85"
@ -39,54 +39,54 @@
heading_height="20"
multi_select="true"
name="friend_list">
<friend_list.column
<fs_scroll_list.column
name="icon_online_status"
tool_tip="Online status"
width="16" />
<friend_list.column
<fs_scroll_list.column
dynamicwidth="true"
label="Username"
name="user_name"
tool_tip="This contact's username."/>
<friend_list.column
<fs_scroll_list.column
dynamicwidth="true"
label="Display name"
name="display_name"
tool_tip="This contact's display name."/>
<friend_list.column
<fs_scroll_list.column
dynamicwidth="true"
label="Name"
name="full_name"
tool_tip="This contact's chosen name." />
<friend_list.column
<fs_scroll_list.column
image="Permission_Visible_Online_h"
name="icon_visible_online"
tool_tip="Friend can see when you&apos;re online"
width="16" />
<friend_list.column
<fs_scroll_list.column
image="Permission_Visible_Map_h"
name="icon_visible_map"
tool_tip="Friend can locate you on the map"
width="16" />
<friend_list.column
<fs_scroll_list.column
image="Permission_Edit_Objects_Mine_h"
name="icon_edit_mine"
tool_tip="Friend can edit, delete or take objects"
width="16" />
<friend_list.column
<fs_scroll_list.column
image="Permission_Visible_Map_h"
name="icon_visible_map_theirs"
tool_tip="You can locate them on the map"
width="16" />
<friend_list.column
<fs_scroll_list.column
image="Permission_Edit_Objects_Theirs_h"
name="icon_edit_theirs"
tool_tip="You can edit this friend&apos;s objects"
width="16" />
<friend_list.column
<fs_scroll_list.column
name="friend_last_update_generation"
width="-1" />
</friend_list>
</fs_scroll_list>
<button
top="1"
follows="top|right"

8
indra/newview/skins/default/xui/da/floater_avatar_picker.xml
View File

@ -24,10 +24,10 @@
Indtast en del af beboerens navn:
</text>
<button label="Find" label_selected="Find" name="Find"/>
<fs_avatar_search_list name="SearchResults">
<fs_scroll_list name="SearchResults">
<columns label="Navn" name="name"/>
<columns label="Brugernavn" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
<panel label="Venner" name="FriendsPanel">
<text name="InstructSelectFriend">
@ -43,10 +43,10 @@
meter
</text>
<button label="Gentegn liste" label_selected="Gentegn liste" name="Refresh"/>
<fs_avatar_search_list name="NearMe">
<fs_scroll_list name="NearMe">
<columns label="Navn" name="name"/>
<columns label="Brugernavn" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
</tab_container>
<button label="OK" label_selected="OK" name="ok_btn"/>

12
indra/newview/skins/default/xui/de/floater_avatar_picker.xml
View File

@ -24,10 +24,10 @@
Geben Sie einen Teil des Namens einer Person ein:
</text>
<button label="Los" label_selected="Los" name="Find"/>
<fs_avatar_search_list name="SearchResults">
<fs_scroll_list name="SearchResults">
<columns label="Name" name="name"/>
<columns label="Benutzername" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
<panel label="Freunde" name="FriendsPanel">
<text name="InstructSelectFriend">
@ -43,20 +43,20 @@
Meter
</text>
<button follows="top|left" height="28" image_overlay="Refresh_Off" layout="topleft" left_pad="0" name="Refresh" width="28"/>
<fs_avatar_search_list border="false" follows="all" height="100" layout="topleft" left="0" name="NearMe" sort_column="0" top="50" width="132">
<fs_scroll_list border="false" follows="all" height="100" layout="topleft" left="0" name="NearMe" sort_column="0" top="50" width="132">
<columns label="Name" name="name"/>
<columns label="Benutzername" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
<panel label="Suchen per UUID" name="SearchPanelUUID">
<text name="SearchByUUIDLabel">
Geben Sie die UUID einer Person ein:
</text>
<button label="Los" label_selected="Los" name="FindUUID"/>
<fs_avatar_search_list name="SearchResultsUUID">
<fs_scroll_list name="SearchResultsUUID">
<columns label="Name" name="nameUUID"/>
<columns label="Benutzername" name="usernameUUID"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
</tab_container>
<button label="OK" label_selected="OK" name="ok_btn"/>

24
indra/newview/skins/default/xui/de/floater_fs_area_search.xml
View File

@ -8,18 +8,18 @@
<panel.string name="ListedPendingTotalFilled">
[LISTED] Gelistet | [PENDING] Offen | [TOTAL] Total
</panel.string>
<area_search_list name="result_list">
<area_search_list.columns name="distance" label="Entf." tool_tip="Entfernung vom Avatar zum Objekt."/>
<area_search_list.columns name="name" label="Name"/>
<area_search_list.columns name="description" label="Beschreibung" width="170"/>
<area_search_list.columns name="price" label="Preis" tool_tip="Preis des Objects, falls es zum Verkauf steht."/>
<area_search_list.columns name="land_impact" label="LI" tool_tip="Der Wert, der mit dem Prim-Maximum der Parzelle verrechnet wird."/>
<area_search_list.columns name="prim_count" label="Prims" tool_tip="Anzahl an Primitiven, aus dem das Objekt besteht."/>
<area_search_list.columns name="owner" label="Eigentümer"/>
<area_search_list.columns name="group" label="Gruppe" tool_tip="Welcher Gruppe das Objekt zugeordnet ist."/>
<area_search_list.columns name="creator" label="Ersteller" width="150"/>
<area_search_list.columns name="last_owner" label="Vorheriger Eigentümer" width="140" tool_tip="Der Vorbesitzer des Objekts."/>
</area_search_list>
<fs_scroll_list name="result_list">
<fs_scroll_list.columns name="distance" label="Entf." tool_tip="Entfernung vom Avatar zum Objekt."/>
<fs_scroll_list.columns name="name" label="Name"/>
<fs_scroll_list.columns name="description" label="Beschreibung" width="170"/>
<fs_scroll_list.columns name="price" label="Preis" tool_tip="Preis des Objects, falls es zum Verkauf steht."/>
<fs_scroll_list.columns name="land_impact" label="LI" tool_tip="Der Wert, der mit dem Prim-Maximum der Parzelle verrechnet wird."/>
<fs_scroll_list.columns name="prim_count" label="Prims" tool_tip="Anzahl an Primitiven, aus dem das Objekt besteht."/>
<fs_scroll_list.columns name="owner" label="Eigentümer"/>
<fs_scroll_list.columns name="group" label="Gruppe" tool_tip="Welcher Gruppe das Objekt zugeordnet ist."/>
<fs_scroll_list.columns name="creator" label="Ersteller" width="150"/>
<fs_scroll_list.columns name="last_owner" label="Vorheriger Eigentümer" width="140" tool_tip="Der Vorbesitzer des Objekts."/>
</fs_scroll_list>
<button name="Refresh" label="Aktualisieren" width="100"/>
<text name="counter" left_delta="110">
Gelistet | Offen | Total

8
indra/newview/skins/default/xui/de/panel_fs_block_list_sidetray.xml
View File

@ -7,8 +7,8 @@
<menu_button name="plus_btn" tool_tip="Einwohner oder Objekt zum ignorieren auswählen"/>
<button name="unblock_btn" tool_tip="Einwohner oder Objekt aus der Liste der ignorierten Einwohner oder Objekte entfernen"/>
</panel>
<fs_block_list name="block_list">
<fs_block_list.columns name="item_name" label="Name"/>
<fs_block_list.columns name="item_type" label="Typ"/>
</fs_block_list>
<fs_scroll_list name="block_list">
<fs_scroll_list.columns name="item_name" label="Name"/>
<fs_scroll_list.columns name="item_type" label="Typ"/>
</fs_scroll_list>
</panel>

22
indra/newview/skins/default/xui/de/panel_fs_contacts_friends.xml
View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="friends">
<friend_list name="friend_list" right="-90">
<friend_list.column name="icon_online_status" tool_tip="Online-Status"/>
<friend_list.column label="Benutzername" name="user_name" tool_tip="Der Benutzername dieses Freundes."/>
<friend_list.column label="Anzeigename" name="display_name" tool_tip="Der Anzeigename dieses Freundes."/>
<friend_list.column label="Name" name="full_name" tool_tip="Der Name dieses Freundes."/>
<friend_list.column name="icon_visible_online" tool_tip="Dieser Freund kann sehen ob sie online sind."/>
<friend_list.column name="icon_visible_map" tool_tip="Dieser Freund kann ihre Position auf der Karte sehen."/>
<friend_list.column name="icon_edit_mine" tool_tip="Dieser Freund kann deine Objekte editieren, löschen oder nehmen."/>
<friend_list.column name="icon_visible_map_theirs" tool_tip="Du kannst die Position dieses Freundes auf der Karte sehen."/>
<friend_list.column name="icon_edit_theirs" tool_tip="Du kannst Objekte von diesem Freund editieren."/>
</friend_list>
<fs_scroll_list name="friend_list" right="-90">
<fs_scroll_list.column name="icon_online_status" tool_tip="Online-Status"/>
<fs_scroll_list.column label="Benutzername" name="user_name" tool_tip="Der Benutzername dieses Freundes."/>
<fs_scroll_list.column label="Anzeigename" name="display_name" tool_tip="Der Anzeigename dieses Freundes."/>
<fs_scroll_list.column label="Name" name="full_name" tool_tip="Der Name dieses Freundes."/>
<fs_scroll_list.column name="icon_visible_online" tool_tip="Dieser Freund kann sehen ob sie online sind."/>
<fs_scroll_list.column name="icon_visible_map" tool_tip="Dieser Freund kann ihre Position auf der Karte sehen."/>
<fs_scroll_list.column name="icon_edit_mine" tool_tip="Dieser Freund kann deine Objekte editieren, löschen oder nehmen."/>
<fs_scroll_list.column name="icon_visible_map_theirs" tool_tip="Du kannst die Position dieses Freundes auf der Karte sehen."/>
<fs_scroll_list.column name="icon_edit_theirs" tool_tip="Du kannst Objekte von diesem Freund editieren."/>
</fs_scroll_list>
<button
label="IM/Anruf"
name="im_btn"

4
indra/newview/skins/default/xui/de/panel_fs_search_legacy_people.xml
View File

@ -7,10 +7,10 @@
</panel>
<!-- Search Pane -->
<panel name="panel_ls_scrolllist">
<fs_avatar_search_list name="search_results_people">
<fs_scroll_list name="search_results_people">
<columns label="" name="icon"/>
<columns label="Name" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
<button label="Zurück" name="people_back"/>
<button label="Vor" name="people_next"/>
</panel>

14
indra/newview/skins/default/xui/en/floater_avatar_picker.xml
View File

@ -84,7 +84,7 @@
left_pad="5"
name="Find"
width="45" />
<fs_avatar_search_list
<fs_scroll_list
draw_heading="true"
follows="all"
height="98"
@ -101,7 +101,7 @@
label="Username"
name="username"
width="150" />
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
<panel
height="150"
@ -136,7 +136,7 @@
<button.commit_callback
function="Refresh.FriendList"/>
</button>
<fs_avatar_search_list
<fs_scroll_list
follows="all"
height="120"
layout="topleft"
@ -202,7 +202,7 @@
width="28"
name="Refresh"
image_overlay="Refresh_Off" />
<fs_avatar_search_list
<fs_scroll_list
draw_heading="true"
follows="all"
height="100"
@ -220,7 +220,7 @@
label="Username"
name="username"
width="150" />
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
<panel
@ -263,7 +263,7 @@
left_pad="5"
name="FindUUID"
width="45" />
<fs_avatar_search_list
<fs_scroll_list
draw_heading="true"
follows="all"
height="98"
@ -280,7 +280,7 @@
label="Username"
name="usernameUUID"
width="150" />
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
</tab_container>
<button

24
indra/newview/skins/default/xui/en/floater_fs_area_search.xml
View File

@ -39,7 +39,7 @@
<panel.string name="ListedPendingTotalFilled">
[LISTED] Listed | [PENDING] Pending | [TOTAL] Total
</panel.string>
<area_search_list
<fs_scroll_list
name="result_list"
left="5"
right="-5"
@ -50,53 +50,53 @@
draw_heading="true"
multi_select="true"
search_column="1">
<area_search_list.columns
<fs_scroll_list.columns
name="distance"
label="Dist"
width="40"
tool_tip="Distance from your avatar to the object."/>
<area_search_list.columns
<fs_scroll_list.columns
name="name"
label="Name"
width="180"/>
<area_search_list.columns
<fs_scroll_list.columns
name="description"
label="Description"
width="180"/>
<area_search_list.columns
<fs_scroll_list.columns
name="price"
label="Price"
width="40"
tool_tip="If the object is for sale, what you'd pay to purchase it."/>
<area_search_list.columns
<fs_scroll_list.columns
name="land_impact"
label="LI"
width="40"
tool_tip="The number that is counted against your parcel's maximum."/>
<area_search_list.columns
<fs_scroll_list.columns
name="prim_count"
label="Prims"
width="40"
tool_tip="Count of prims that make up each object."/>
<area_search_list.columns
<fs_scroll_list.columns
name="owner"
label="Owner"
width="140"/>
<area_search_list.columns
<fs_scroll_list.columns
name="group"
label="Group"
width="140"
tool_tip="What group the object is set to."/>
<area_search_list.columns
<fs_scroll_list.columns
name="creator"
label="Creator"
width="170"/>
<area_search_list.columns
<fs_scroll_list.columns
name="last_owner"
label="Last Owner"
width="150"
tool_tip="Who owned it last."/>
</area_search_list>
</fs_scroll_list>
<button
name="Refresh"
label="Refresh"

10
indra/newview/skins/default/xui/en/panel_fs_block_list_sidetray.xml
View File

@ -88,7 +88,7 @@
top_delta="0"
width="31"/>
</panel>
<fs_block_list
<fs_scroll_list
draw_heading="true"
follows="all"
bottom="-4"
@ -101,15 +101,15 @@
draw_stripes="true"
multi_select="true"
right="-1">
<fs_block_list.columns
<fs_scroll_list.columns
name="item_name"
label="Name"/>
<fs_block_list.columns
<fs_scroll_list.columns
name="item_type"
label="Type"
width="96"/>
<fs_block_list.columns
<fs_scroll_list.columns
name="item_mute_type"
width="-1" />
</fs_block_list>
</fs_scroll_list>
</panel>

24
indra/newview/skins/default/xui/en/panel_fs_contacts_friends.xml
View File

@ -26,7 +26,7 @@
top="-10"
width="240" />
-->
<friend_list
<fs_scroll_list
left="4"
right="-85"
top="0"
@ -38,55 +38,55 @@
heading_height="20"
multi_select="true"
name="friend_list">
<friend_list.column
<fs_scroll_list.column
name="icon_online_status"
image="icon_avatar_online_h"
tool_tip="Online status"
width="20" />
<friend_list.column
<fs_scroll_list.column
dynamicwidth="true"
label="Username"
name="user_name"
tool_tip="This contact's username."/>
<friend_list.column
<fs_scroll_list.column
dynamicwidth="true"
label="Display name"
name="display_name"
tool_tip="This contact's display name."/>
<friend_list.column
<fs_scroll_list.column
dynamicwidth="true"
label="Name"
name="full_name"
tool_tip="This contact's chosen name." />
<friend_list.column
<fs_scroll_list.column
name="icon_visible_online"
image="Permission_Visible_Online_h"
tool_tip="Friend can see when you&apos;re online"
width="16" />
<friend_list.column
<fs_scroll_list.column
name="icon_visible_map"
image="Permission_Visible_Map_h"
tool_tip="Friend can locate you on the map"
width="16" />
<friend_list.column
<fs_scroll_list.column
name="icon_edit_mine"
image="Permission_Edit_Objects_Mine_h"
tool_tip="Friend can edit, delete or take objects"
width="16" />
<friend_list.column
<fs_scroll_list.column
name="icon_visible_map_theirs"
image="Permission_Visible_Map_h"
tool_tip="You can locate them on the map"
width="16" />
<friend_list.column
<fs_scroll_list.column
name="icon_edit_theirs"
image="Permission_Edit_Objects_Theirs_h"
tool_tip="You can edit this friend&apos;s objects"
width="16" />
<friend_list.column
<fs_scroll_list.column
name="friend_last_update_generation"
width="-1" />
</friend_list>
</fs_scroll_list>
<button
top="1"
follows="top|right"

4
indra/newview/skins/default/xui/en/panel_fs_search_legacy_people.xml
View File

@ -49,7 +49,7 @@
width="410"
top_pad="1"
name="panel_ls_scrolllist">
<fs_avatar_search_list
<fs_scroll_list
draw_heading="true"
follows="all"
height="485"
@ -66,7 +66,7 @@
label="Name"
name="username"
relwidth="1" />
</fs_avatar_search_list>
</fs_scroll_list>
<button
layout="topleft"
follows="left|bottom"

8
indra/newview/skins/default/xui/es/floater_avatar_picker.xml
View File

@ -24,10 +24,10 @@
Escribe parte del nombre del residente:
</text>
<button label="Busca" label_selected="Busca" name="Find"/>
<fs_avatar_search_list name="SearchResults">
<fs_scroll_list name="SearchResults">
<columns label="Nombre" name="name"/>
<columns label="Nombre de usuario" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
<panel label="Amigos" name="FriendsPanel">
<text name="InstructSelectFriend">
@ -43,10 +43,10 @@
Metros
</text>
<button font="SansSerifSmall" label="Actualizar la lista" label_selected="Actualizar la lista" left_delta="1" name="Refresh" width="115"/>
<fs_avatar_search_list bottom_delta="-169" height="159" name="NearMe">
<fs_scroll_list bottom_delta="-169" height="159" name="NearMe">
<columns label="Nombre" name="name"/>
<columns label="Nombre de usuario" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
</tab_container>
<button label="Aceptar" label_selected="Aceptar" name="ok_btn"/>

16
indra/newview/skins/default/xui/es/floater_fs_area_search.xml
View File

@ -8,14 +8,14 @@
<panel.string name="ListedPendingTotalFilled">
[LISTED] Listados | [PENDING] Pendientes | [TOTAL] Totales
</panel.string>
<area_search_list name="result_list">
<area_search_list.columns name="name" label="Nombre"/>
<area_search_list.columns name="description" label="Descripción"/>
<area_search_list.columns name="owner" label="Propietario"/>
<area_search_list.columns name="group" label="Grupo" tool_tip="Con qué grupo está configurado el objeto."/>
<area_search_list.columns name="creator" label="Creador"/>
<area_search_list.columns name="last_owner" label="Último propietario" tool_tip="Quién lo poseyó anteriormente."/>
</area_search_list>
<fs_scroll_list name="result_list">
<fs_scroll_list.columns name="name" label="Nombre"/>
<fs_scroll_list.columns name="description" label="Descripción"/>
<fs_scroll_list.columns name="owner" label="Propietario"/>
<fs_scroll_list.columns name="group" label="Grupo" tool_tip="Con qué grupo está configurado el objeto."/>
<fs_scroll_list.columns name="creator" label="Creador"/>
<fs_scroll_list.columns name="last_owner" label="Último propietario" tool_tip="Quién lo poseyó anteriormente."/>
</fs_scroll_list>
<button name="Refresh" label="Actualizar"/>
<text name="counter">
Listados | Pendientes | Totales

20
indra/newview/skins/default/xui/es/panel_fs_contacts_friends.xml
View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="friends">
<friend_list name="friend_list">
<friend_list.column name="icon_online_status" tool_tip="Estado de conexión"/>
<friend_list.column label="Usuario" name="user_name" tool_tip="Nombre de usuario de este contacto"/>
<friend_list.column label="Nombre" name="full_name" tool_tip="Nombre por el que desea ser conocido este contacto"/>
<friend_list.column name="icon_visible_online" tool_tip="Este contacto puede ver si estás conectado"/>
<friend_list.column name="icon_visible_map" tool_tip="Este contacto puede localizarte en el mapa"/>
<friend_list.column name="icon_edit_mine" tool_tip="Este contacto puede editar, eliminar o tomar tus objetos"/>
<friend_list.column name="icon_visible_map_theirs" tool_tip="Puedes localizar a este contacto en el mapa"/>
<friend_list.column name="icon_edit_theirs" tool_tip="Puedes editar los objetos de este contacto"/>
</friend_list>
<fs_scroll_list name="friend_list">
<fs_scroll_list.column name="icon_online_status" tool_tip="Estado de conexión"/>
<fs_scroll_list.column label="Usuario" name="user_name" tool_tip="Nombre de usuario de este contacto"/>
<fs_scroll_list.column label="Nombre" name="full_name" tool_tip="Nombre por el que desea ser conocido este contacto"/>
<fs_scroll_list.column name="icon_visible_online" tool_tip="Este contacto puede ver si estás conectado"/>
<fs_scroll_list.column name="icon_visible_map" tool_tip="Este contacto puede localizarte en el mapa"/>
<fs_scroll_list.column name="icon_edit_mine" tool_tip="Este contacto puede editar, eliminar o tomar tus objetos"/>
<fs_scroll_list.column name="icon_visible_map_theirs" tool_tip="Puedes localizar a este contacto en el mapa"/>
<fs_scroll_list.column name="icon_edit_theirs" tool_tip="Puedes editar los objetos de este contacto"/>
</fs_scroll_list>
<button label="MI/Llamar" name="im_btn" tool_tip="Abre una sesión de mensajería instantánea con un contacto o conferencia si hay seleccionado más de uno"/>
<button label="Perfil" tool_tip="Mostrar imagen, grupos y otra información del contacto seleccionado" name="profile_btn"/>
<button label="Teleporte..." name="offer_teleport_btn" tool_tip="Ofrecer al contacto seleccionado teleporte a tu posición actual"/>

4
indra/newview/skins/default/xui/es/panel_fs_search_legacy_people.xml
View File

@ -6,9 +6,9 @@
</text>
</panel>
<panel name="panel_ls_scrolllist">
<fs_avatar_search_list name="search_results_people">
<fs_scroll_list name="search_results_people">
<columns label="Nombre" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
<button label="Anterior" name="people_back"/>
<button label="Siguiente" name="people_next"/>
</panel>

8
indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
View File

@ -24,10 +24,10 @@
Saisissez une partie du nom du résident :
</text>
<button label="OK" label_selected="OK" name="Find"/>
<fs_avatar_search_list name="SearchResults">
<fs_scroll_list name="SearchResults">
<columns label="Nom" name="name"/>
<columns label="Nom d&apos;utilisateur" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
<panel label="Amis" name="FriendsPanel">
<text name="InstructSelectFriend">
@ -43,10 +43,10 @@
mètres
</text>
<button font="SansSerifSmall" label="Rafraîchir la liste" label_selected="Rafraîchir la liste" left_delta="10" name="Refresh" width="105"/>
<fs_avatar_search_list bottom_delta="-169" height="159" name="NearMe">
<fs_scroll_list bottom_delta="-169" height="159" name="NearMe">
<columns label="Nom" name="name"/>
<columns label="Nom d&apos;utilisateur" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
</tab_container>
<button label="OK" label_selected="OK" name="ok_btn"/>

8
indra/newview/skins/default/xui/it/floater_avatar_picker.xml
View File

@ -24,10 +24,10 @@
Comincia a digitare il nome della persona:
</text>
<button label="Vai" label_selected="Vai" name="Find"/>
<fs_avatar_search_list name="SearchResults">
<fs_scroll_list name="SearchResults">
<columns label="Nome" name="name"/>
<columns label="Nome utente" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
<panel label="Amici" name="FriendsPanel">
<text name="InstructSelectFriend">
@ -43,10 +43,10 @@
Metri
</text>
<button font="SansSerifSmall" label="Aggiorna la lista" label_selected="Aggiorna l&apos;elenco" left_delta="6" name="Refresh" width="110"/>
<fs_avatar_search_list bottom_delta="-169" height="159" name="NearMe">
<fs_scroll_list bottom_delta="-169" height="159" name="NearMe">
<columns label="Nome" name="name"/>
<columns label="Nome utente" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
</tab_container>
<button label="OK" label_selected="OK" name="ok_btn"/>

20
indra/newview/skins/default/xui/it/panel_fs_contacts_friends.xml
View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="friends">
<friend_list name="friend_list">
<friend_list.column name="icon_online_status" tool_tip="Stato online"/>
<friend_list.column label="Nazwa" name="user_name" tool_tip="Nazwa użytkownika tego kontaktu."/>
<friend_list.column label="Nome" name="full_name" tool_tip="Nome scelto dal contatto."/>
<friend_list.column name="icon_visible_online" tool_tip="Un amico può vedere se sei online/offline"/>
<friend_list.column name="icon_visible_map" tool_tip="Il tuo amico ti può trovare sulla mappa"/>
<friend_list.column name="icon_edit_mine" tool_tip="Il tuo amico può modificare, cancellare, o prendere i tuoi oggetti oggetti"/>
<friend_list.column name="icon_visible_map_theirs" tool_tip="Lo puoi visualizzare sulla mappa"/>
<friend_list.column name="icon_edit_theirs" tool_tip="È possibile modificare gli oggetti di un amico"/>
</friend_list>
<fs_scroll_list name="friend_list">
<fs_scroll_list.column name="icon_online_status" tool_tip="Stato online"/>
<fs_scroll_list.column label="Nazwa" name="user_name" tool_tip="Nazwa użytkownika tego kontaktu."/>
<fs_scroll_list.column label="Nome" name="full_name" tool_tip="Nome scelto dal contatto."/>
<fs_scroll_list.column name="icon_visible_online" tool_tip="Un amico può vedere se sei online/offline"/>
<fs_scroll_list.column name="icon_visible_map" tool_tip="Il tuo amico ti può trovare sulla mappa"/>
<fs_scroll_list.column name="icon_edit_mine" tool_tip="Il tuo amico può modificare, cancellare, o prendere i tuoi oggetti oggetti"/>
<fs_scroll_list.column name="icon_visible_map_theirs" tool_tip="Lo puoi visualizzare sulla mappa"/>
<fs_scroll_list.column name="icon_edit_theirs" tool_tip="È possibile modificare gli oggetti di un amico"/>
</fs_scroll_list>
<button name="im_btn" tool_tip="Apri una conversazione privata (Instant message/IM)"/>
<button label="Profilo" name="profile_btn" tool_tip="Apri il profilo dell'amico selezionato"/>
<button name="offer_teleport_btn" tool_tip="Offri teleport all'amico selezionato"/>

8
indra/newview/skins/default/xui/ja/floater_avatar_picker.xml
View File

@ -24,10 +24,10 @@
名前の一部を入力：
</text>
<button label="検索" label_selected="検索" name="Find"/>
<fs_avatar_search_list name="SearchResults">
<fs_scroll_list name="SearchResults">
<columns label="名前" name="name"/>
<columns label="ユーザー名" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
<panel label="フレンド" name="FriendsPanel">
<text name="InstructSelectFriend">
@ -43,10 +43,10 @@
メートル
</text>
<button label="リスト更新" label_selected="リスト更新" name="Refresh"/>
<fs_avatar_search_list name="NearMe">
<fs_scroll_list name="NearMe">
<columns label="名前" name="name"/>
<columns label="ユーザー名" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
</tab_container>
<button label="OK" label_selected="OK" name="ok_btn"/>

18
indra/newview/skins/default/xui/ja/floater_fs_area_search.xml
View File

@ -8,15 +8,15 @@
<panel.string name="ListedPendingTotalFilled">
表示済 [LISTED] | 取得中 [PENDING] | 合計 [TOTAL]
</panel.string>
<area_search_list name="result_list">
<area_search_list.columns name="distance" label="距離" />
<area_search_list.columns name="name" label="名前" />
<area_search_list.columns name="description" label="説明" />
<area_search_list.columns name="owner" label="オーナー" />
<area_search_list.columns name="group" label="グループ" tool_tip="オブジェクトに設定されたグループ名です。" />
<area_search_list.columns name="creator" label="クリエイター" />
<area_search_list.columns name="last_owner" label="最終オーナー" tool_tip="オブジェクトを最後に所有していた人です。" />
</area_search_list>
<fs_scroll_list name="result_list">
<fs_scroll_list.columns name="distance" label="距離" />
<fs_scroll_list.columns name="name" label="名前" />
<fs_scroll_list.columns name="description" label="説明" />
<fs_scroll_list.columns name="owner" label="オーナー" />
<fs_scroll_list.columns name="group" label="グループ" tool_tip="オブジェクトに設定されたグループ名です。" />
<fs_scroll_list.columns name="creator" label="クリエイター" />
<fs_scroll_list.columns name="last_owner" label="最終オーナー" tool_tip="オブジェクトを最後に所有していた人です。" />
</fs_scroll_list>
<button name="Refresh" label="更新" />
<text name="counter">
表示済 | 取得中 | 合計

22
indra/newview/skins/default/xui/ja/panel_fs_contacts_friends.xml
View File

@ -2,17 +2,17 @@
<!-- created Jun.30, 2013 based on English 4.4.2 version -->
<panel name="friends">
<friend_list name="friend_list">
<friend_list.column name="icon_online_status" tool_tip="オンライン・ステータス" />
<friend_list.column label="ユーザー名" name="user_name" tool_tip="この連絡先のユーザー名です。" />
<friend_list.column label="名前" name="full_name" tool_tip="この連絡先が選択した名前の表示です。" />
<friend_list.column name="icon_visible_online" tool_tip="フレンドは、あなたがオンラインかどうか確認することができます。" />
<friend_list.column name="icon_visible_map" tool_tip="フレンドは、地図であなたの居場所を見つけることができます。" />
<friend_list.column name="icon_edit_mine" tool_tip="フレンドは、オブジェクトを編集、削除、または取得することができます。" />
<friend_list.column name="icon_visible_map_theirs" tool_tip="あなたは、地図でフレンドの居場所を見つけることができます。" />
<friend_list.column name="icon_edit_theirs" tool_tip="あなたは、このフレンドのオブジェクトを編集することができます。" />
<friend_list.column name="friend_last_update_generation" />
</friend_list>
<fs_scroll_list name="friend_list">
<fs_scroll_list.column name="icon_online_status" tool_tip="オンライン・ステータス" />
<fs_scroll_list.column label="ユーザー名" name="user_name" tool_tip="この連絡先のユーザー名です。" />
<fs_scroll_list.column label="名前" name="full_name" tool_tip="この連絡先が選択した名前の表示です。" />
<fs_scroll_list.column name="icon_visible_online" tool_tip="フレンドは、あなたがオンラインかどうか確認することができます。" />
<fs_scroll_list.column name="icon_visible_map" tool_tip="フレンドは、地図であなたの居場所を見つけることができます。" />
<fs_scroll_list.column name="icon_edit_mine" tool_tip="フレンドは、オブジェクトを編集、削除、または取得することができます。" />
<fs_scroll_list.column name="icon_visible_map_theirs" tool_tip="あなたは、地図でフレンドの居場所を見つけることができます。" />
<fs_scroll_list.column name="icon_edit_theirs" tool_tip="あなたは、このフレンドのオブジェクトを編集することができます。" />
<fs_scroll_list.column name="friend_last_update_generation" />
</fs_scroll_list>
<button label="IM/コール" name="im_btn" tool_tip="インスタントメッセージ・セッションを開く" />
<button label="プロフィール" name="profile_btn" tool_tip="写真、グループ、およびその他の情報を表示します。" />
<button label="テレポート..." name="offer_teleport_btn" tool_tip="このフレンドに、あなたの現在のロケーションまでのテレポートを送ります。" />

4
indra/newview/skins/default/xui/ja/panel_fs_search_legacy_people.xml
View File

@ -10,10 +10,10 @@
<!-- Search Pane -->
<panel name="panel_ls_scrolllist">
<fs_avatar_search_list name="search_results_people">
<fs_scroll_list name="search_results_people">
<columns label="" name="icon" />
<columns label="名前" name="username" />
</fs_avatar_search_list>
</fs_scroll_list>
<button label="戻る" name="people_back" />
<button label="次へ" name="people_next" />
</panel>

12
indra/newview/skins/default/xui/pl/floater_avatar_picker.xml
View File

@ -24,10 +24,10 @@
Wpisz fragment imienia:
</text>
<button label="Szukaj" label_selected="Szukaj" name="Find"/>
<fs_avatar_search_list name="SearchResults">
<fs_scroll_list name="SearchResults">
<columns label="Imię" name="name"/>
<columns label="Nazwa użytkownika" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
<panel label="Znajomi" name="FriendsPanel">
<text name="InstructSelectFriend">
@ -42,20 +42,20 @@
<text name="meters">
Metry
</text>
<fs_avatar_search_list name="NearMe">
<fs_scroll_list name="NearMe">
<columns label="Imię" name="name"/>
<columns label="Nazwa użytkownika" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
<panel label="Szukaj po UUID" name="SearchPanelUUID">
<text name="SearchByUUIDLabel">
Wpisz UUID osoby:
</text>
<button label="Szukaj" label_selected="Szukaj" name="FindUUID" />
<fs_avatar_search_list name="SearchResultsUUID">
<fs_scroll_list name="SearchResultsUUID">
<columns label="Imię" name="nameUUID" />
<columns label="Nazwa użytkownika" name="usernameUUID" />
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
</tab_container>
<button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/>

24
indra/newview/skins/default/xui/pl/floater_fs_area_search.xml
View File

@ -8,18 +8,18 @@
<panel.string name="ListedPendingTotalFilled">
[LISTED] na liście | [PENDING] zostało | [TOTAL] w sumie
</panel.string>
<area_search_list name="result_list">
<area_search_list.columns name="distance" label="Odl." tool_tip="Odległość obiektu od Twojego awatara."/>
<area_search_list.columns name="name" label="Nazwa"/>
<area_search_list.columns name="description" label="Opis"/>
<area_search_list.columns name="price" label="Cena" tool_tip="Ile zapłacisz za kupno, jeśli obiekt jest wystawiony na sprzedaż."/>
<area_search_list.columns name="land_impact" label="Wpływ" tool_tip="Ilość prim, jaka jest odliczana od maksymalnie dostępnych na działce." width="45"/>
<area_search_list.columns name="prim_count" label="Primy" tool_tip="Ilość prim, z jakich zrobiony jest obiekt."/>
<area_search_list.columns name="owner" label="Właściciel"/>
<area_search_list.columns name="group" label="Grupa" tool_tip="Na jaką grupę ustawiony jest obiekt."/>
<area_search_list.columns name="creator" label="Twórca"/>
<area_search_list.columns name="last_owner" label="Ostatni właściciel" tool_tip="Do kogo obiekt ostatnio należał."/>
</area_search_list>
<fs_scroll_list name="result_list">
<fs_scroll_list.columns name="distance" label="Odl." tool_tip="Odległość obiektu od Twojego awatara."/>
<fs_scroll_list.columns name="name" label="Nazwa"/>
<fs_scroll_list.columns name="description" label="Opis"/>
<fs_scroll_list.columns name="price" label="Cena" tool_tip="Ile zapłacisz za kupno, jeśli obiekt jest wystawiony na sprzedaż."/>
<fs_scroll_list.columns name="land_impact" label="Wpływ" tool_tip="Ilość prim, jaka jest odliczana od maksymalnie dostępnych na działce." width="45"/>
<fs_scroll_list.columns name="prim_count" label="Primy" tool_tip="Ilość prim, z jakich zrobiony jest obiekt."/>
<fs_scroll_list.columns name="owner" label="Właściciel"/>
<fs_scroll_list.columns name="group" label="Grupa" tool_tip="Na jaką grupę ustawiony jest obiekt."/>
<fs_scroll_list.columns name="creator" label="Twórca"/>
<fs_scroll_list.columns name="last_owner" label="Ostatni właściciel" tool_tip="Do kogo obiekt ostatnio należał."/>
</fs_scroll_list>
<button name="Refresh" label="Odśwież"/>
<text name="counter">
Na liście | Zostało | W sumie

8
indra/newview/skins/default/xui/pl/panel_fs_block_list_sidetray.xml
View File

@ -7,8 +7,8 @@
<menu_button name="plus_btn" tool_tip="Wybierz Rezydenta lub obiekt do zablokowania" />
<button name="unblock_btn" tool_tip="Usuń Rezydenta lub obiekt z listy zablokowanych" />
</panel>
<fs_block_list name="block_list">
<fs_block_list.columns name="item_name" label="Nazwa" />
<fs_block_list.columns name="item_type" label="Typ" />
</fs_block_list>
<fs_scroll_list name="block_list">
<fs_scroll_list.columns name="item_name" label="Nazwa" />
<fs_scroll_list.columns name="item_type" label="Typ" />
</fs_scroll_list>
</panel>

22
indra/newview/skins/default/xui/pl/panel_fs_contacts_friends.xml
View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="friends">
<friend_list name="friend_list">
<friend_list.column name="icon_online_status" tool_tip="Status online"/>
<friend_list.column label="Nazwa" name="user_name" tool_tip="Nazwa użytkownika tego kontaktu."/>
<friend_list.column label="Wyświetlane" name="display_name" tool_tip="Imię Wyświetlane tego kontaktu."/>
<friend_list.column label="Imię" name="full_name" tool_tip="Wybrane imię tego kontaktu."/>
<friend_list.column name="icon_visible_online" tool_tip="Znajomy może widzieć, że jesteś dostępny/a online w świecie"/>
<friend_list.column name="icon_visible_map" tool_tip="Znajomy może znaleźć Cię na mapie"/>
<friend_list.column name="icon_edit_mine" tool_tip="Znajomy może edytować, usuwać lub zabierać Twoje obiekty"/>
<friend_list.column name="icon_visible_map_theirs" tool_tip="Możesz znajdować na mapie"/>
<friend_list.column name="icon_edit_theirs" tool_tip="Możesz edytować obiekty tego znajomego"/>
</friend_list>
<fs_scroll_list name="friend_list">
<fs_scroll_list.column name="icon_online_status" tool_tip="Status online"/>
<fs_scroll_list.column label="Nazwa" name="user_name" tool_tip="Nazwa użytkownika tego kontaktu."/>
<fs_scroll_list.column label="Wyświetlane" name="display_name" tool_tip="Imię Wyświetlane tego kontaktu."/>
<fs_scroll_list.column label="Imię" name="full_name" tool_tip="Wybrane imię tego kontaktu."/>
<fs_scroll_list.column name="icon_visible_online" tool_tip="Znajomy może widzieć, że jesteś dostępny/a online w świecie"/>
<fs_scroll_list.column name="icon_visible_map" tool_tip="Znajomy może znaleźć Cię na mapie"/>
<fs_scroll_list.column name="icon_edit_mine" tool_tip="Znajomy może edytować, usuwać lub zabierać Twoje obiekty"/>
<fs_scroll_list.column name="icon_visible_map_theirs" tool_tip="Możesz znajdować na mapie"/>
<fs_scroll_list.column name="icon_edit_theirs" tool_tip="Możesz edytować obiekty tego znajomego"/>
</fs_scroll_list>
<button label="IM/Dzwoń" name="im_btn" tool_tip="Rozpocznij sesję IM (prywatnej wiadomości)"/>
<button label="Profil" name="profile_btn" tool_tip="Pokaż obrazek, grupy i inne informacje"/>
<button label="Teleportuj..." name="offer_teleport_btn" tool_tip="Zaoferuj teleport do Twojej obecnej lokalizacji temu znajomemu"/>

4
indra/newview/skins/default/xui/pl/panel_fs_search_legacy_people.xml
View File

@ -6,9 +6,9 @@
</text>
</panel>
<panel name="panel_ls_scrolllist">
<fs_avatar_search_list name="search_results_people">
<fs_scroll_list name="search_results_people">
<columns label="Imię" name="username" />
</fs_avatar_search_list>
</fs_scroll_list>
<button label="Wstecz" name="people_back" />
<button label="Dalej" name="people_next" />
</panel>

8
indra/newview/skins/default/xui/pt/floater_avatar_picker.xml
View File

@ -24,10 +24,10 @@
Digite parte do nome de alguém:
</text>
<button label="OK" label_selected="OK" name="Find"/>
<fs_avatar_search_list name="SearchResults">
<fs_scroll_list name="SearchResults">
<columns label="Nome" name="name"/>
<columns label="Nome de usuário" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
<panel label="Amigos" name="FriendsPanel">
<text name="InstructSelectFriend">
@ -43,10 +43,10 @@
Metros
</text>
<button font="SansSerifSmall" label="Atualizar Lista" label_selected="Atualizar Lista" left_delta="1" name="Refresh" width="115"/>
<fs_avatar_search_list bottom_delta="-169" height="159" name="NearMe">
<fs_scroll_list bottom_delta="-169" height="159" name="NearMe">
<columns label="Nome" name="name"/>
<columns label="Nome de usuário" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
</tab_container>
<button label="OK" label_selected="OK" name="ok_btn"/>

8
indra/newview/skins/default/xui/ru/floater_avatar_picker.xml
View File

@ -24,10 +24,10 @@
Наберите часть имени жителя:
</text>
<button label="Перейти" label_selected="Перейти" name="Find"/>
<fs_avatar_search_list name="SearchResults">
<fs_scroll_list name="SearchResults">
<columns label="Название" name="name"/>
<columns label="Имя пользователя" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
<panel label="Друзья" name="FriendsPanel">
<text name="InstructSelectFriend">
@ -42,10 +42,10 @@
<text name="meters">
Метров
</text>
<fs_avatar_search_list name="NearMe">
<fs_scroll_list name="NearMe">
<columns label="Название" name="name"/>
<columns label="Имя пользователя" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
</tab_container>
<button label="ОК" label_selected="ОК" name="ok_btn"/>

22
indra/newview/skins/default/xui/ru/panel_fs_contacts_friends.xml
View File

@ -25,7 +25,7 @@
top="-10"
width="240" />
-->
<friend_list
<fs_scroll_list
left="4"
right="-100"
top="10"
@ -37,50 +37,50 @@
heading_height="24"
multi_select="true"
name="friend_list">
<friend_list.column
<fs_scroll_list.column
name="icon_online_status"
image="legacy/icon_avatar_online_h.tga"
tool_tip="Online status"
width="20" />
<friend_list.column
<fs_scroll_list.column
label="Имя пользователя"
name="user_name"
tool_tip="This contact's username."
width="-1" />
<friend_list.column
<fs_scroll_list.column
dynamicwidth="true"
label="Отображаемое имя"
name="full_name"
tool_tip="Выбраный контактом отображаемый ник. Пример: Шашлык Кифировна." />
<friend_list.column
<fs_scroll_list.column
name="icon_visible_online"
image="Permission_Visible_Online_h"
tool_tip="Friend can see when you&apos;re online"
width="16" />
<friend_list.column
<fs_scroll_list.column
name="icon_visible_map"
image="Permission_Visible_Map_h"
tool_tip="Friend can locate you on the map"
width="16" />
<friend_list.column
<fs_scroll_list.column
name="icon_edit_mine"
image="Permission_Edit_Objects_Mine_h"
tool_tip="Friend can edit, delete or take objects"
width="16" />
<friend_list.column
<fs_scroll_list.column
name="icon_visible_map_theirs"
image="Permission_Visible_Map_h"
tool_tip="You can locate them on the map"
width="16" />
<friend_list.column
<fs_scroll_list.column
name="icon_edit_theirs"
image="Permission_Edit_Objects_Theirs_h"
tool_tip="You can edit this friend&apos;s objects"
width="16" />
<friend_list.column
<fs_scroll_list.column
name="friend_last_update_generation"
width="-1" />
</friend_list>
</fs_scroll_list>
<button
top="10"
follows="top|right"

8
indra/newview/skins/default/xui/tr/floater_avatar_picker.xml
View File

@ -24,10 +24,10 @@
Bir kişinin adının bir kısmını yazın:
</text>
<button label="Git" label_selected="Git" name="Find"/>
<fs_avatar_search_list name="SearchResults">
<fs_scroll_list name="SearchResults">
<columns label="Ad" name="name"/>
<columns label="Kullanıcı Adı" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
<panel label="Arkadaşlar" name="FriendsPanel">
<text name="InstructSelectFriend">
@ -42,10 +42,10 @@
<text name="meters">
Metre
</text>
<fs_avatar_search_list name="NearMe">
<fs_scroll_list name="NearMe">
<columns label="Ad" name="name"/>
<columns label="Kullanıcı Adı" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
</tab_container>
<button label="Tamam" label_selected="Tamam" name="ok_btn"/>

8
indra/newview/skins/default/xui/zh/floater_avatar_picker.xml
View File

@ -24,10 +24,10 @@
鍵入人名的一部分：
</text>
<button label="前往" label_selected="前往" name="Find"/>
<fs_avatar_search_list name="SearchResults">
<fs_scroll_list name="SearchResults">
<columns label="名稱" name="name"/>
<columns label="使用者名稱" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
<panel label="朋友" name="FriendsPanel">
<text name="InstructSelectFriend">
@ -42,10 +42,10 @@
<text name="meters">
公尺
</text>
<fs_avatar_search_list name="NearMe">
<fs_scroll_list name="NearMe">
<columns label="名稱" name="name"/>
<columns label="使用者名稱" name="username"/>
</fs_avatar_search_list>
</fs_scroll_list>
</panel>
</tab_container>
<button label="確定" label_selected="確定" name="ok_btn"/>

24
indra/newview/skins/firestorm/xui/en/panel_fs_contacts_friends.xml
View File

@ -26,7 +26,7 @@
top="-10"
width="240" />
-->
<friend_list
<fs_scroll_list
left="4"
right="-85"
top="0"
@ -38,55 +38,55 @@
heading_height="20"
multi_select="true"
name="friend_list">
<friend_list.column
<fs_scroll_list.column
image="legacy/ff_online_status_button.tga"
name="icon_online_status"
tool_tip="Online status"
width="20" />
<friend_list.column
<fs_scroll_list.column
dynamicwidth="true"
label="Username"
name="user_name"
tool_tip="This contact's username."/>
<friend_list.column
<fs_scroll_list.column
dynamicwidth="true"
label="Display name"
name="display_name"
tool_tip="This contact's display name."/>
<friend_list.column
<fs_scroll_list.column
dynamicwidth="true"
label="Name"
name="full_name"
tool_tip="This contact's chosen name." />
<friend_list.column
<fs_scroll_list.column
image="legacy/ff_visible_online_button.tga"
name="icon_visible_online"
tool_tip="Friend can see when you&apos;re online"
width="20" />
<friend_list.column
<fs_scroll_list.column
image="legacy/ff_visible_map_button.tga"
name="icon_visible_map"
tool_tip="Friend can locate you on the map"
width="20" />
<friend_list.column
<fs_scroll_list.column
image="legacy/ff_edit_mine_button.tga"
name="icon_edit_mine"
tool_tip="Friend can edit, delete or take objects"
width="20" />
<friend_list.column
<fs_scroll_list.column
image="legacy/ff_visible_map_button_theirs.tga"
name="icon_visible_map_theirs"
tool_tip="You can locate them on the map"
width="20" />
<friend_list.column
<fs_scroll_list.column
image="legacy/ff_edit_theirs_button.tga"
name="icon_edit_theirs"
tool_tip="You can edit this friend&apos;s objects"
width="20" />
<friend_list.column
<fs_scroll_list.column
name="friend_last_update_generation"
width="-1" />
</friend_list>
</fs_scroll_list>
<button
top="1"
follows="top|right"

24
indra/newview/skins/latency/xui/en/panel_fs_contacts_friends.xml
View File

@ -26,7 +26,7 @@
top="-10"
width="240" />
-->
<friend_list
<fs_scroll_list
left="4"
right="-85"
top="0"
@ -38,55 +38,55 @@
heading_height="20"
multi_select="true"
name="friend_list">
<friend_list.column
<fs_scroll_list.column
image="legacy/ff_online_status_button.tga"
name="icon_online_status"
tool_tip="Online status"
width="20" />
<friend_list.column
<fs_scroll_list.column
dynamicwidth="true"
label="Username"
name="user_name"
tool_tip="This contact's username."/>
<friend_list.column
<fs_scroll_list.column
dynamicwidth="true"
label="Display name"
name="display_name"
tool_tip="This contact's display name."/>
<friend_list.column
<fs_scroll_list.column
dynamicwidth="true"
label="Name"
name="full_name"
tool_tip="This contact's chosen name." />
<friend_list.column
<fs_scroll_list.column
image="legacy/ff_visible_online_button.tga"
name="icon_visible_online"
tool_tip="Friend can see when you&apos;re online"
width="20" />
<friend_list.column
<fs_scroll_list.column
image="legacy/ff_visible_map_button.tga"
name="icon_visible_map"
tool_tip="Friend can locate you on the map"
width="20" />
<friend_list.column
<fs_scroll_list.column
image="legacy/ff_edit_mine_button.tga"
name="icon_edit_mine"
tool_tip="Friend can edit, delete or take objects"
width="20" />
<friend_list.column
<fs_scroll_list.column
image="legacy/ff_visible_map_button_theirs.tga"
name="icon_visible_map_theirs"
tool_tip="You can locate them on the map"
width="20" />
<friend_list.column
<fs_scroll_list.column
image="legacy/ff_edit_theirs_button.tga"
name="icon_edit_theirs"
tool_tip="You can edit this friend&apos;s objects"
width="20" />
<friend_list.column
<fs_scroll_list.column
name="friend_last_update_generation"
width="-1" />
</friend_list>
</fs_scroll_list>
<button
top="1"
follows="top|right"

4
indra/newview/skins/latency/xui/en/panel_fs_search_legacy_people.xml
View File

@ -54,7 +54,7 @@
layout="topleft"
border="true"
>
<fs_avatar_search_list
<fs_scroll_list
name="search_results_people"
top="0"
left="0"
@ -74,7 +74,7 @@
label="Name"
relwidth="1"
/>
</fs_avatar_search_list>
</fs_scroll_list>
<button
name="people_back"
label="Back"

4
indra/newview/skins/latency/xui/pl/panel_fs_search_legacy_people.xml
View File

@ -6,9 +6,9 @@
</text>
</panel>
<panel name="panel_ls_scrolllist">
<fs_avatar_search_list name="search_results_people">
<fs_scroll_list name="search_results_people">
<columns label="Imię" name="username" />
</fs_avatar_search_list>
</fs_scroll_list>
<button label="Wstecz" name="people_back" />
<button label="Dalej" name="people_next" />
</panel>

8
indra/newview/skins/vintage/xui/de/panel_fs_block_list_sidetray.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<panel name="block_list_panel">
<fs_block_list name="block_list">
<fs_block_list.columns name="item_name" label="Name"/>
<fs_block_list.columns name="item_type" label="Typ"/>
</fs_block_list>
<fs_scroll_list name="block_list">
<fs_scroll_list.columns name="item_name" label="Name"/>
<fs_scroll_list.columns name="item_type" label="Typ"/>
</fs_scroll_list>
<layout_stack name="block_list_sidetray_main">
<layout_panel name="back_button_container">
<button tool_tip="Zurück zu Leute" name="back"/>

22
indra/newview/skins/vintage/xui/de/panel_fs_contacts_friends.xml
View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="friends">
<friend_list name="friend_list" right="-90">
<friend_list.column name="icon_online_status" tool_tip="Online-Status"/>
<friend_list.column label="Benutzername" name="user_name" tool_tip="Der Benutzername dieses Freundes."/>
<friend_list.column label="Anzeigename" name="display_name" tool_tip="Der Anzeigename dieses Freundes."/>
<friend_list.column label="Name" name="full_name" tool_tip="Der Name dieses Freundes."/>
<friend_list.column name="icon_visible_online" tool_tip="Dieser Freund kann sehen ob sie online sind."/>
<friend_list.column name="icon_visible_map" tool_tip="Dieser Freund kann ihre Position auf der Karte sehen."/>
<friend_list.column name="icon_edit_mine" tool_tip="Dieser Freund kann deine Objekte editieren, löschen oder nehmen."/>
<friend_list.column name="icon_visible_map_theirs" tool_tip="Du kannst die Position dieses Freundes auf der Karte sehen."/>
<friend_list.column name="icon_edit_theirs" tool_tip="Du kannst Objekte von diesem Freund editieren."/>
</friend_list>
<fs_scroll_list name="friend_list" right="-90">
<fs_scroll_list.column name="icon_online_status" tool_tip="Online-Status"/>
<fs_scroll_list.column label="Benutzername" name="user_name" tool_tip="Der Benutzername dieses Freundes."/>
<fs_scroll_list.column label="Anzeigename" name="display_name" tool_tip="Der Anzeigename dieses Freundes."/>
<fs_scroll_list.column label="Name" name="full_name" tool_tip="Der Name dieses Freundes."/>
<fs_scroll_list.column name="icon_visible_online" tool_tip="Dieser Freund kann sehen ob sie online sind."/>
<fs_scroll_list.column name="icon_visible_map" tool_tip="Dieser Freund kann ihre Position auf der Karte sehen."/>
<fs_scroll_list.column name="icon_edit_mine" tool_tip="Dieser Freund kann deine Objekte editieren, löschen oder nehmen."/>
<fs_scroll_list.column name="icon_visible_map_theirs" tool_tip="Du kannst die Position dieses Freundes auf der Karte sehen."/>
<fs_scroll_list.column name="icon_edit_theirs" tool_tip="Du kannst Objekte von diesem Freund editieren."/>
</fs_scroll_list>
<button
label="IM/Anruf"
name="im_btn"

10
indra/newview/skins/vintage/xui/en/panel_fs_block_list_sidetray.xml
View File

@ -7,7 +7,7 @@
help_topic="blocked_list"
width="304">
<fs_block_list
<fs_scroll_list
draw_heading="true"
height="70"
left="0"
@ -20,17 +20,17 @@
name="block_list"
draw_stripes="true"
multi_select="true">
<fs_block_list.columns
<fs_scroll_list.columns
name="item_name"
label="Name"/>
<fs_block_list.columns
<fs_scroll_list.columns
name="item_type"
label="Type"
width="96"/>
<fs_block_list.columns
<fs_scroll_list.columns
name="item_mute_type"
width="-1" />
</fs_block_list>
</fs_scroll_list>
<layout_stack
name="block_list_sidetray_main"

24
indra/newview/skins/vintage/xui/en/panel_fs_contacts_friends.xml
View File

@ -16,7 +16,7 @@
bevel_style="in"
name="info_border" />
<friend_list
<fs_scroll_list
left="7"
right="-88"
top="1"
@ -28,55 +28,55 @@
heading_height="20"
multi_select="true"
name="friend_list">
<friend_list.column
<fs_scroll_list.column
image="legacy/ff_online_status_button.tga"
name="icon_online_status"
tool_tip="Online status"
width="20" />
<friend_list.column
<fs_scroll_list.column
dynamicwidth="true"
label="Username"
name="user_name"
tool_tip="This contact's username."/>
<friend_list.column
<fs_scroll_list.column
dynamicwidth="true"
label="Display name"
name="display_name"
tool_tip="This contact's display name."/>
<friend_list.column
<fs_scroll_list.column
dynamicwidth="true"
label="Name"
name="full_name"
tool_tip="This contact's chosen name." />
<friend_list.column
<fs_scroll_list.column
image="legacy/ff_visible_online_button.tga"
name="icon_visible_online"
tool_tip="Friend can see when you&apos;re online"
width="20" />
<friend_list.column
<fs_scroll_list.column
image="legacy/ff_visible_map_button.tga"
name="icon_visible_map"
tool_tip="Friend can locate you on the map"
width="20" />
<friend_list.column
<fs_scroll_list.column
image="legacy/ff_edit_mine_button.tga"
name="icon_edit_mine"
tool_tip="Friend can edit, delete or take objects"
width="20" />
<friend_list.column
<fs_scroll_list.column
image="legacy/ff_visible_map_button_theirs.tga"
name="icon_visible_map_theirs"
tool_tip="You can locate them on the map"
width="20" />
<friend_list.column
<fs_scroll_list.column
image="legacy/ff_edit_theirs_button.tga"
name="icon_edit_theirs"
tool_tip="You can edit this friend&apos;s objects"
width="20" />
<friend_list.column
<fs_scroll_list.column
name="friend_last_update_generation"
width="-1" />
</friend_list>
</fs_scroll_list>
<button
top="1"
follows="top|right"

8
indra/newview/skins/vintage/xui/pl/panel_fs_block_list_sidetray.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel name="block_list_panel">
<fs_block_list name="block_list">
<fs_block_list.columns name="item_name" label="Nazwa" />
<fs_block_list.columns name="item_type" label="Typ" />
</fs_block_list>
<fs_scroll_list name="block_list">
<fs_scroll_list.columns name="item_name" label="Nazwa" />
<fs_scroll_list.columns name="item_type" label="Typ" />
</fs_scroll_list>
<layout_stack name="block_list_sidetray_main">
<layout_panel name="back_button_container">
<button tool_tip="Wróć do Ludzi" name="back" />