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

Fixed normal task EXT-6024 - [TRANSLATED BUT IN EN] Side Bar > Edit Pick - "(will update after save)" 

Replaced hardcoded string with xml string.
Reviewed by Leyla Farazha https://codereview.productengine.com/secondlife/r/8/

--HG--
branch : product-engine
meow-7.2.2
Dmitry Zaporozhan 2010-03-15 10:32:51 +02:00
parent 272772b867
commit a58551c050
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llpanelpick.cpp
View File

@ -76,8 +76,6 @@
#define LABEL_PICK = "Pick"
#define LABEL_CHANGES = "Changes"
std::string SET_LOCATION_NOTICE("(will update after save)");
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
@ -410,7 +408,7 @@ void LLPanelPickEdit::onOpen(const LLSD& key)
childSetValue("pick_name", pick_name.empty() ? region_name : pick_name);
childSetValue("pick_desc", pick_desc);
setSnapshotId(snapshot_id);
setPickLocation(createLocationText(SET_LOCATION_NOTICE, pick_name, region_name, getPosGlobal()));
setPickLocation(createLocationText(getLocationNotice(), pick_name, region_name, getPosGlobal()));
enableSaveButton(true);
}
@ -578,7 +576,7 @@ void LLPanelPickEdit::onClickSetLocation()
region_name = region->getName();
}
setPickLocation(createLocationText(SET_LOCATION_NOTICE, parcel_name, region_name, getPosGlobal()));
setPickLocation(createLocationText(getLocationNotice(), parcel_name, region_name, getPosGlobal()));
mLocationChanged = true;
enableSaveButton(TRUE);
@ -595,6 +593,12 @@ void LLPanelPickEdit::onClickSave()
notifyParent(params);
}
std::string LLPanelPickEdit::getLocationNotice()
{
static std::string notice = getString("location_notice");
return notice;
}
void LLPanelPickEdit::processProperties(void* data, EAvatarProcessorType type)
{
if(mNeedData)

2
indra/newview/llpanelpick.h
View File

@ -248,6 +248,8 @@ protected:
*/
void onClickSave();
std::string getLocationNotice();
protected:
bool mLocationChanged;

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

@ -12,6 +12,10 @@
help_topic="profile_edit_pick"
top="0"
width="333">
<panel.string
name="location_notice">
(will update after save)
</panel.string>
<button
follows="top|right"
height="23"