Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature Request: Copy URI button in avatar profiles

Browse Source 
This takes the copy key button's place... if this is bad, I'll figure something out down the line.
This commit is contained in:
Inusaito Sayori
2014-12-29 18:53:01 -05:00
parent 01c639c261
commit de28034c20
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llpanelavatar.cpp
View File

@@ -1184,7 +1184,10 @@ BOOL LLPanelAvatar::postBuild()
ctrl->setEnabled(false); ctrl->setEnabled(false);
getChild<LLUICtrl>("OK")->setCommitCallback(boost::bind(&LLPanelAvatar::onClickOK, this)); getChild<LLUICtrl>("OK")->setCommitCallback(boost::bind(&LLPanelAvatar::onClickOK, this));
getChild<LLUICtrl>("Cancel")->setCommitCallback(boost::bind(&LLPanelAvatar::onClickCancel, this)); getChild<LLUICtrl>("Cancel")->setCommitCallback(boost::bind(&LLPanelAvatar::onClickCancel, this));
getChild<LLUICtrl>("copy_key")->setCommitCallback(boost::bind(&LLPanelAvatar::onClickGetKey, this)); if (LLUICtrl* ctrl = findChild<LLUICtrl>("copy_key")) // Singu TODO: Bring this back
ctrl->setCommitCallback(boost::bind(&LLPanelAvatar::onClickGetKey, this));
void copy_profile_uri(const LLUUID& id, bool group);
getChild<LLUICtrl>("copy_uri")->setCommitCallback(boost::bind(copy_profile_uri, boost::bind(&LLPanelAvatar::getAvatarID, this), false));
getChildView("web_profile")->setVisible(!gSavedSettings.getString("WebProfileURL").empty()); getChildView("web_profile")->setVisible(!gSavedSettings.getString("WebProfileURL").empty());
if (mTab && !sAllowFirstLife) if (mTab && !sAllowFirstLife)
@@ -1207,7 +1210,7 @@ BOOL LLPanelAvatar::postBuild()
LLPanelAvatar::~LLPanelAvatar() LLPanelAvatar::~LLPanelAvatar()
{ {
LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarID,this); LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarID, this);
sAllPanels.remove(this); sAllPanels.remove(this);
mCacheConnection.disconnect(); mCacheConnection.disconnect();
} }
@@ -1224,7 +1227,7 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status)
// If they are a friend, we may know the truth! // If they are a friend, we may know the truth!
if ((ONLINE_STATUS_YES != online_status) if ((ONLINE_STATUS_YES != online_status)
&& mIsFriend && mIsFriend
&& (LLAvatarTracker::instance().isBuddyOnline( mAvatarID ))) && LLAvatarTracker::instance().isBuddyOnline(mAvatarID))
{ {
online_status = ONLINE_STATUS_YES; online_status = ONLINE_STATUS_YES;
} }
@@ -1266,10 +1269,8 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id)
if (avatar_id != mAvatarID) if (avatar_id != mAvatarID)
{ {
//avatar_changed = TRUE; //avatar_changed = TRUE;
if(mAvatarID.notNull()) if (mAvatarID.notNull())
{
LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarID, this); LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarID, this);
}
mAvatarID = avatar_id; mAvatarID = avatar_id;
} }

2
indra/newview/skins/default/xui/de/panel_avatar.xml
View File

@@ -5,7 +5,7 @@
<string name="CaptionTextAcctInfo">[ACCTTYPE] <string name="CaptionTextAcctInfo">[ACCTTYPE]
[PAYMENTINFO] [PAYMENTINFO]
[AGEVERIFICATION]</string> [AGEVERIFICATION]</string>
<button label="Kopiere Schlüssel" tool_tip="Schlüssel in die Zwischenablage kopieren" name="copy_key"/> <button label="Kopiere URI" tool_tip="SLURL in die Zwischenablage kopieren" name="copy_uri"/>
<button name="web_profile" label="Web Profil"/> <button name="web_profile" label="Web Profil"/>
<text name="Name:">Name:</text> <text name="Name:">Name:</text>

2
indra/newview/skins/default/xui/en-us/panel_avatar.xml
View File

@@ -9,7 +9,7 @@
[PAYMENTINFO] [PAYMENTINFO]
[AGEVERIFICATION] [AGEVERIFICATION]
</string> </string>
<button bottom="-24" follows="left|top" halign="right" height="16" label="Copy Key:" left="4" font="SansSerifSmall" tool_tip="Copy key to clipboard" name="copy_key" width="70"/> <button bottom="-24" follows="left|top" height="16" label="Copy URI" left="4" font="SansSerifSmall" tool_tip="Copy SLURL to clipboard" name="copy_uri" width="70"/>
<name_editor bevel_style="in" border_style="line" <name_editor bevel_style="in" border_style="line"
border_thickness="1" bottom="-24" enabled="false" follows="left|top" border_thickness="1" bottom="-24" enabled="false" follows="left|top"
font="SansSerifSmall" height="16" is_unicode="false" left_delta="75" font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"

2
indra/newview/skins/default/xui/es/panel_avatar.xml
View File

@@ -7,7 +7,7 @@
[PAYMENTINFO] [PAYMENTINFO]
[AGEVERIFICATION] [AGEVERIFICATION]
</string> </string>
<button label="Copiar Key:" tool_tip="Copyiar key al portapapeles" name="copy_key"/> <button label="Copiar URI" tool_tip="Copyiar SLURL al portapapeles" name="copy_url"/>
<name_editor name="avatar_key"/> <name_editor name="avatar_key"/>
<button name="web_profile" label="Perfil Web"/> <button name="web_profile" label="Perfil Web"/>
<text name="Name:" > <text name="Name:" >

2
indra/newview/skins/default/xui/fr/panel_avatar.xml
View File

@@ -151,7 +151,7 @@ vous avez écrit.
</text> </text>
<text_editor bottom_delta="-260" height="240" name="notes edit" width="430"/> <text_editor bottom_delta="-260" height="240" name="notes edit" width="430"/>
<button name="copy_key" label="Copy Clef-Key :"/> <button name="copy_uri" label="Copy URI"/>
<name_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line" <name_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
border_thickness="1" bottom_delta="1" enabled="false" follows="left|top" border_thickness="1" bottom_delta="1" enabled="false" follows="left|top"
font="SansSerifSmall" height="18" is_unicode="false" left_delta="95" font="SansSerifSmall" height="18" is_unicode="false" left_delta="95"