Added prev/next buttons for windlight presets, cleaned up some stuff

8 files changed, 104 insertions, 34 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 0f481c6..339e1d0 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,16 @@
+2009-09-13  McCabe Maxsted  <hakushakukun@gmail.com>
+
+     * Added prev/next buttons for windlight presets, cleaned up some stuff.
+         
+                modified:   linden/indra/newview/llfloaterwindlight.cpp
+        modified:   linden/indra/newview/llfloaterwindlight.h
+        modified:   linden/indra/newview/llwindlightremotectrl.cpp
+        modified:   linden/indra/newview/llwlparammanager.cpp
+        modified:   linden/indra/newview/llwlparammanager.h
+        modified:   linden/indra/newview/skins/default/textures/textures.xml
+        modified:   linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
+         
+
 2009-09-12  McCabe Maxsted  <hakushakukun@gmail.com>
 
      * Clarified 'show in search' in profile.
diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp
index 1c3db9b..914513b 100644
--- a/linden/indra/newview/llfloaterwindlight.cpp
+++ b/linden/indra/newview/llfloaterwindlight.cpp
@@ -228,6 +228,10 @@ void LLFloaterWindLight::initCallbacks(void) {
         // Dome
         childSetCommitCallback("WLGamma", onFloatControlMoved, &param_mgr->mWLGamma);
         childSetCommitCallback("WLStarAlpha", onStarAlphaMoved, NULL);
+
+        // next/prev buttons
+        childSetAction("next", onClickNext, this);
+        childSetAction("prev", onClickPrev, this);
 }
 
 void LLFloaterWindLight::onClickHelp(void* data)
@@ -318,6 +322,13 @@ void LLFloaterWindLight::syncMenu()
         LLWLParamSet& currentParams = param_mgr->mCurParams;
         //std::map<std::string, LLVector4> & currentParams = param_mgr->mCurParams.mParamValues;
 
+        // Fixes LL "bug" (preset name isn't kept synchronized)
+        LLComboBox* comboBox = getChild<LLComboBox>("WLPresetsCombo");
+        if (comboBox->getSelectedItemLabel() != currentParams.mName)
+        {
+                comboBox->setSimple(currentParams.mName);
+        }
+
         // blue horizon
         param_mgr->mBlueHorizon = currentParams.getVector(param_mgr->mBlueHorizon.mName, err);
         childSetValue("WLBlueHorizonR", param_mgr->mBlueHorizon.r / 2.0);
@@ -439,14 +450,6 @@ void LLFloaterWindLight::syncMenu()
         childSetValue("WLGamma", param_mgr->mWLGamma.x);
 
         childSetValue("WLStarAlpha", param_mgr->mCurParams.getStarBrightness());
-
-        // Update combobox name
-        LLComboBox* comboBox = getChild<LLComboBox>("WLPresetsCombo");
-        std::string current_name = param_mgr->mCurPresetName;
-        if (!current_name.empty() && current_name != comboBox->getSelectedValue().asString())
-        {
-                comboBox->selectByValue(LLSD(current_name));
-        }
 }
 
 
@@ -1001,3 +1004,51 @@ void LLFloaterWindLight::deactivateAnimator()
         LLWLParamManager::instance()->mAnimator.mIsRunning = false;
         LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
 }
+
+void LLFloaterWindLight::onClickNext(void* user_data)
+{
+        LLWLParamManager * param_mgr = LLWLParamManager::instance();
+        LLWLParamSet& currentParams = param_mgr->mCurParams;
+
+        // find place of current param
+        std::map<std::string, LLWLParamSet>::iterator mIt = 
+                param_mgr->mParamList.find(currentParams.mName);
+
+        // if at the end, loop
+        std::map<std::string, LLWLParamSet>::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 LLFloaterWindLight::onClickPrev(void* user_data)
+{
+        LLWLParamManager * param_mgr = LLWLParamManager::instance();
+        LLWLParamSet& currentParams = param_mgr->mCurParams;
+
+        // find place of current param
+        std::map<std::string, LLWLParamSet>::iterator mIt = 
+                param_mgr->mParamList.find(currentParams.mName);
+
+        // if at the beginning, loop
+        if(mIt == param_mgr->mParamList.begin()) 
+        {
+                std::map<std::string, LLWLParamSet>::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/llfloaterwindlight.h b/linden/indra/newview/llfloaterwindlight.h
index 3e5556b..70e76c5 100644
--- a/linden/indra/newview/llfloaterwindlight.h
+++ b/linden/indra/newview/llfloaterwindlight.h
@@ -136,6 +136,9 @@ private:
         static LLFloaterWindLight* sWindLight;
 
         static std::set<std::string> sDefaultPresets;
+
+        static void onClickNext(void* user_data);
+        static void onClickPrev(void* user_data);
 };
 
 
diff --git a/linden/indra/newview/llwindlightremotectrl.cpp b/linden/indra/newview/llwindlightremotectrl.cpp
index ca411c5..591b413 100644
--- a/linden/indra/newview/llwindlightremotectrl.cpp
+++ b/linden/indra/newview/llwindlightremotectrl.cpp
@@ -92,11 +92,11 @@ void LLWindlightRemoteCtrl::build()
 {
         if (gSavedSettings.getBOOL("ShowWindlightSettingsPopup"))
         {
-                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_windlight_remote_expanded.xml"/*, &getFactoryMap()*/);
+                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_windlight_remote_expanded.xml");
         }
         else
         {
-                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_windlight_remote.xml"/*, &getFactoryMap()*/);
+                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_windlight_remote.xml");
         }
 }
 
@@ -128,14 +128,15 @@ void LLWindlightRemoteCtrl::refreshPresets()
         if (mPresetsCombo)
         {
                 // snag current preset
-                std::string cur_preset = LLWLParamManager::instance()->mCurPresetName;//mPresetsCombo->getValue().asString();
+                LLWLParamManager * param_mgr = LLWLParamManager::instance();
+                LLWLParamSet& currentParams = param_mgr->mCurParams;
                 
                 // clear in case presets names have changed
                 mPresetsCombo->clearRows();
 
                 std::map<std::string, LLWLParamSet>::iterator mIt = 
-                        LLWLParamManager::instance()->mParamList.begin();
-                for(; mIt != LLWLParamManager::instance()->mParamList.end(); mIt++) 
+                        param_mgr->mParamList.begin();
+                for(; mIt != param_mgr->mParamList.end(); mIt++) 
                 {
                         mPresetsCombo->add(mIt->first);
                 }
@@ -148,9 +149,10 @@ void LLWindlightRemoteCtrl::refreshPresets()
                 mPresetsCombo->addSimpleElement(getString("midnight"), ADD_BOTTOM);
                 mPresetsCombo->addSimpleElement(getString("revert_region"), ADD_BOTTOM);
 
-                if (!cur_preset.empty())
+                if (mPresetsCombo->getSelectedItemLabel() != currentParams.mName &&
+                        !currentParams.mName.empty())
                 {
-                        mPresetsCombo->selectByValue(LLSD(cur_preset));
+                        mPresetsCombo->selectByValue(LLSD(currentParams.mName));
                 }
                 else
                 {
diff --git a/linden/indra/newview/llwlparammanager.cpp b/linden/indra/newview/llwlparammanager.cpp
index ba21a96..ba3d070 100644
--- a/linden/indra/newview/llwlparammanager.cpp
+++ b/linden/indra/newview/llwlparammanager.cpp
@@ -97,10 +97,7 @@ LLWLParamManager::LLWLParamManager() :
 
         // sky dome
         mDomeOffset(0.96f),
-        mDomeRadius(15000.f),
-
-        // current name
-        mCurPresetName("")
+        mDomeRadius(15000.f)
 {
 }
 
@@ -229,7 +226,6 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
                         setParamSet(name, paramsData);
                 }
                 presetsXML.close();
-                mCurPresetName = name;
         } 
         else 
         {
diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h
index 4507307..355d3e3 100644
--- a/linden/indra/newview/llwlparammanager.h
+++ b/linden/indra/newview/llwlparammanager.h
@@ -261,11 +261,7 @@ public:
         F32 mDomeRadius;
         
         // list of all the parameters, listed by name
-        std::map<std::string, LLWLParamSet> mParamList;
-
-        // current parameter name
-        std::string mCurPresetName;
-        
+        std::map<std::string, LLWLParamSet> mParamList; 
         
 private:
         // our parameter manager singleton instance
diff --git a/linden/indra/newview/skins/default/textures/textures.xml b/linden/indra/newview/skins/default/textures/textures.xml
index 9e1d9b5..4800048 100644
--- a/linden/indra/newview/skins/default/textures/textures.xml
+++ b/linden/indra/newview/skins/default/textures/textures.xml
@@ -365,6 +365,9 @@
   <texture name="icn_label_music.tga"/>
   <texture name="icn_label_media.tga"/>
   <texture name="arrow_down.tga"/>
+  <texture name="arrow_up.tga"/>
+  <texture name="arrow_left.tga"/>
+  <texture name="arrow_right.tga"/>
   <texture name="cloud-particle.j2c" use_mips="true"/>
   
   <texture name="skin_thumbnail_default.png" preload="true" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
index 906e7de..471b3e5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml
@@ -4,29 +4,35 @@
      min_width="400" mouse_opaque="true" name="WindLight floater"
      rect_control="FloaterAdvancedSkyRect" title="Advanced Sky Editor"
      width="700">
-        <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-50" drop_shadow_visible="true" follows="left|top|right"
              font="SansSerif" h_pad="0" halign="left" height="16"
              left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
              width="110">
-                Sky Presets:
-        </text>
-        <combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18"
+    Sky Presets:
+  </text>
+  <combo_box allow_text_entry="false" bottom="-52" follows="left|top" height="18"
              left_delta="110" max_chars="20" mouse_opaque="true" name="WLPresetsCombo"
              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="WLNewPreset" 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="WLSavePreset" 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="WLDeletePreset" scale_image="true" width="70" />
         <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
              label="Day Cycle Editor" label_selected="Day Cycle Editor"
-             left_delta="120" mouse_opaque="true" name="WLDayCycleMenuButton"
-             scale_image="true" width="120" />
+             left_delta="100" mouse_opaque="true" name="WLDayCycleMenuButton"
+             scale_image="true" width="125" />
         <tab_container bottom="-220" follows="left|top" height="160" left="0"
              mouse_opaque="false" name="WindLight Tabs" tab_position="top" width="700">
                 <panel border="true" bottom="-220" follows="left|top|right|bottom" height="160"