Added next/prev buttons to windlight water window

3 files changed, 72 insertions, 6 deletions

diff --git a/linden/indra/newview/llfloaterwater.cpp b/linden/indra/newview/llfloaterwater.cpp
index c42b12b..d2ea74e 100644
--- a/linden/indra/newview/llfloaterwater.cpp
+++ b/linden/indra/newview/llfloaterwater.cpp
@@ -168,7 +168,11 @@ void LLFloaterWater::initCallbacks(void) {
 
         LLTextureCtrl* textCtrl = getChild<LLTextureCtrl>("WaterNormalMap");
         textCtrl->setDefaultImageAssetID(DEFAULT_WATER_NORMAL);
-        childSetCommitCallback("WaterNormalMap", onNormalMapPicked, NULL);      
+        childSetCommitCallback("WaterNormalMap", onNormalMapPicked, NULL);
+
+        // next/prev buttons
+        childSetAction("next", onClickNext, this);
+        childSetAction("prev", onClickPrev, this);
 }
 
 void LLFloaterWater::onClickHelp(void* data)
@@ -237,6 +241,12 @@ void LLFloaterWater::syncMenu()
 
         LLWaterParamSet & current_params = param_mgr->mCurParams;
 
+        LLComboBox* comboBox = getChild<LLComboBox>("WaterPresetsCombo");
+        if (comboBox->getSelectedItemLabel() != current_params.mName)
+        {
+                comboBox->setSimple(current_params.mName);
+        }
+
         // blue horizon
         param_mgr->mFogColor = current_params.getVector4(param_mgr->mFogColor.mName, err);
 
@@ -727,3 +737,50 @@ void LLFloaterWater::onChangePresetName(LLUICtrl* ctrl, void * userData)
         sWaterMenu->syncMenu();
 }
 
+void LLFloaterWater::onClickNext(void* user_data)
+{
+        LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
+        LLWaterParamSet& currentParams = param_mgr->mCurParams;
+
+        // find place of current param
+        std::map<std::string, LLWaterParamSet>::iterator mIt = 
+                param_mgr->mParamList.find(currentParams.mName);
+
+        // if at the end, loop
+        std::map<std::string, LLWaterParamSet>::iterator last = param_mgr->mParamList.end(); --last;
+        if(mIt == last) 
+        {
+                mIt = param_mgr->mParamList.begin();
+        }
+        else
+        {
+                mIt++;
+        }
+        /*param_mgr->mAnimator.mIsRunning = false;
+        param_mgr->mAnimator.mUseLindenTime = false;*/
+        param_mgr->loadPreset(mIt->first, true);
+}
+
+void LLFloaterWater::onClickPrev(void* user_data)
+{
+        LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
+        LLWaterParamSet & currentParams = param_mgr->mCurParams;
+
+        // find place of current param
+        std::map<std::string, LLWaterParamSet>::iterator mIt = 
+                param_mgr->mParamList.find(currentParams.mName);
+
+        // if at the beginning, loop
+        if(mIt == param_mgr->mParamList.begin()) 
+        {
+                std::map<std::string, LLWaterParamSet>::iterator last = param_mgr->mParamList.end(); --last;
+                mIt = last;
+        }
+        else
+        {
+                mIt--;
+        }
+        /*param_mgr->mAnimator.mIsRunning = false;
+        param_mgr->mAnimator.mUseLindenTime = false;*/
+        param_mgr->loadPreset(mIt->first, true);
+}
diff --git a/linden/indra/newview/llfloaterwater.h b/linden/indra/newview/llfloaterwater.h
index 5c1fced..40704f2 100644
--- a/linden/indra/newview/llfloaterwater.h
+++ b/linden/indra/newview/llfloaterwater.h
@@ -127,6 +127,9 @@ private:
         static LLFloaterWater* sWaterMenu;
 
         static std::set<std::string> sDefaultPresets;
+
+        static void onClickNext(void* user_data);
+        static void onClickPrev(void* user_data);
 };
 
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_water.xml b/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
index 9dcb96e..7038c93 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_water.xml
@@ -11,17 +11,23 @@
              width="110">
                 Water Presets:
         </text>
-        <combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18"
-             left_delta="110" max_chars="20" mouse_opaque="true"
+        <combo_box allow_text_entry="false" bottom="-52" follows="left|top" height="18"
+             left_delta="120" max_chars="20" mouse_opaque="true"
              name="WaterPresetsCombo" width="150" />
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+             label="" label_selected="" left_delta="-25" image_overlay="arrow_left.tga"
+             mouse_opaque="true" name="prev" scale_image="true" width="20" />
+  <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+             label="" label_selected="" left_delta="180" image_overlay="arrow_right.tga"
+             mouse_opaque="true" name="next" scale_image="true" width="20" />
         <button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-             label="New" label_selected="New" left_delta="170"
+             label="New" label_selected="New" left_delta="40"
              mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Save" label_selected="Save" left_delta="80"
+             label="Save" label_selected="Save" left_delta="70"
              mouse_opaque="true" name="WaterSavePreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-             label="Delete" label_selected="Delete" left_delta="80"
+             label="Delete" label_selected="Delete" left_delta="70"
              mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="70" />
         <tab_container bottom="-240" follows="left|top" height="180" left="0"
              mouse_opaque="false" name="Water Tabs" tab_position="top" width="700">