summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2018-12-05 17:14:06 +0200
committermaxim_productengine <mnikolenko@productengine.com>2018-12-05 17:14:06 +0200
commit2f188b36d9b892e48ba72c3485b34036273d755b (patch)
treede42e4b7942077350e5f8b470f4b306f26d96ae3
parentf0afc19bee33a31f9e648e72935f3b7c7dee2fd5 (diff)
SL-10167 Change wording on Add/Load/Delete buttons in the day editor
-rw-r--r--indra/newview/llfloatereditextdaycycle.cpp10
-rw-r--r--indra/newview/llfloatereditextdaycycle.h1
-rw-r--r--indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml8
3 files changed, 16 insertions, 3 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp
index 95df4206b7..36958a948a 100644
--- a/indra/newview/llfloatereditextdaycycle.cpp
+++ b/indra/newview/llfloatereditextdaycycle.cpp
@@ -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
diff --git a/indra/newview/llfloatereditextdaycycle.h b/indra/newview/llfloatereditextdaycycle.h
index 6224517aa0..a9b5c8a3f0 100644
--- a/indra/newview/llfloatereditextdaycycle.h
+++ b/indra/newview/llfloatereditextdaycycle.h
@@ -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);
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
index 9aa7c6f499..cac6f334c7 100644
--- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
+++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml
@@ -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" />