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

SL-10167 Change wording on Add/Load/Delete buttons in the day editor

master
maxim_productengine 2018-12-05 17:14:06 +02:00
parent f0afc19bee
commit 2f188b36d9
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloatereditextdaycycle.cpp
View File

@ -903,6 +903,7 @@ void LLFloaterEditExtDayCycle::selectTrack(U32 track_index, bool force )
mSkyTabLayoutContainer->setVisible(!show_water);
mWaterTabLayoutContainer->setVisible(show_water);
updateSlider();
updateLabels();
}
void LLFloaterEditExtDayCycle::selectFrame(F32 frame, F32 slop_factor)
@ -1010,6 +1011,15 @@ void LLFloaterEditExtDayCycle::updateSkyTabs(const LLSettingsSkyPtr_t &p_sky)
}
void LLFloaterEditExtDayCycle::updateLabels()
{
std::string label_arg = (mCurrentTrack == LLSettingsDay::TRACK_WATER) ? "water_label" : "sky_label";
mAddFrameButton->setLabelArg("[FRAME]", getString(label_arg));
mDeleteFrameButton->setLabelArg("[FRAME]", getString(label_arg));
mLoadFrame->setLabelArg("[FRAME]", getString(label_arg));
}
void LLFloaterEditExtDayCycle::updateButtons()
{
// This logic appears to work in reverse, the add frame button

1
indra/newview/llfloatereditextdaycycle.h
View File

@ -131,6 +131,7 @@ private:
void updateWaterTabs(const LLSettingsWaterPtr_t &p_water);
void updateSkyTabs(const LLSettingsSkyPtr_t &p_sky);
void updateButtons();
void updateLabels();
void updateSlider(); //generate sliders from current track
void updateTimeAndLabel();
void addSliderFrame(const F32 frame, const LLSettingsBase::ptr_t &setting, bool update_ui = true);

8
indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
View File

@ -21,6 +21,8 @@
<!-- Substitutions -->
<string name="time_label"> ([HH]:[MM])</string>
<string name="sky_track_label">Sky [ALT]</string>
<string name="sky_label">Sky</string>
<string name="water_label">Water</string>
<!-- Layout -->
<layout_stack name="outer_stack"
@ -400,7 +402,7 @@
follows="top|left"
height="23"
width="90"
label="Add Frame"
label="Add [FRAME]"
left_pad="175"
top_delta="-20"
name="add_frame" />
@ -408,7 +410,7 @@
follows="top|left"
height="23"
width="90"
label="Load Frame"
label="Load [FRAME]"
top_pad="0"
left_delta="0"
name="btn_load_frame" />
@ -416,7 +418,7 @@
follows="left|top"
height="23"
width="90"
label="Delete Frame"
label="Delete [FRAME]"
top_pad="0"
left_delta="0"
name="delete_frame" />