diff options
author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-30 22:34:56 +0300 |
---|---|---|
committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-05-30 22:34:56 +0300 |
commit | 657e434fd59139436e8b97e5ecd01ca686e82269 (patch) | |
tree | bebf0c4c8adff3587cec47f6403757f841f5c872 /indra/newview/skins/default | |
parent | 6f1cdd4926444567d21b1d6e0735a445b981e56b (diff) |
STORM-1253 WIP New day cycle editor.
Done:
* Creating new local day cycles.
* Editing existing local day cycles.
* Deleting day cycles.
To do:
* Editing region day cycle, dealing with skies in region scope.
* Handle teleport while editing a day cycle.
* Update UI when a day cycle or sky preset gets deleted.
* Make the time ctrl increase/decrease consistently.
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_delete_env_preset.xml | 2 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml | 30 |
2 files changed, 18 insertions, 14 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml index 1539c6448e..82a541d40d 100644 --- a/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml +++ b/indra/newview/skins/default/xui/en/floater_delete_env_preset.xml @@ -16,6 +16,8 @@ <string name="label_water">Preset:</string> <string name="label_sky">Preset:</string> <string name="label_day_cycle">Day cycle:</string> + + <string name="msg_confirm_deletion">Are you sure you want to delete the selected preset?</string> <text follows="top|left|right" diff --git a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml index 7572efea05..5b72d295e5 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_day_cycle.xml @@ -13,6 +13,7 @@ <string name="title_edit">Edit Day Cycle</string> <string name="hint_new">Name your day cycle, adjust the controls to create it, and click "Save".</string> <string name="hint_edit">To edit your day cycle, adjust the controls below and click "Save".</string> + <string name="combo_label">-Select a preset-</string> <text follows="top|left|right" @@ -42,12 +43,14 @@ left_pad="10" name="day_cycle_combo" top_delta="-5" - width="200"> - <combo_box.item - label="-Select a preset-" - name="item0" - value="any" /> - </combo_box> + width="200" /> + <line_editor + height="20" + left_delta="0" + name="day_cycle_name" + top_delta="0" + visible="true" + width="200" /> <text follows="top|left|right" height="40" @@ -110,7 +113,7 @@ <panel follows="top|left" height="100" - name="day_cycle_slider" + name="day_cycle_slider_panel" layout="topleft" left_delta="25" top_pad="25" @@ -428,7 +431,7 @@ label="Preset" layout="topleft" left_pad="5" - name="WLKeyPresets" + name="WLSkyPresets" width="205" /> <text type="string" @@ -444,24 +447,23 @@ width="35"> Time: </text> - <text_editor - allow_scroll="false" - follows="left|top|right" - font="SansSerif" + <time + follows="left|top" height="16" + label_width="0" layout="topleft" left_pad="3" name="time" top_delta="-1" value="6:00 AM" - width="60"/> + width="75"/> <check_box follows="top|left" height="10" label="Make this my new day cycle" layout="topleft" left="330" - name="new_water_preset_chb" + name="make_default_cb" top="430" width="280"/> <button |