1 files changed, 39 insertions, 215 deletions

diff --git a/linden/indra/newview/llfloatervoicewizard.cpp b/linden/indra/newview/llfloatervoicedevicesettings.cpp
index 94063a0..c7b9562 100644
--- a/linden/indra/newview/llfloatervoicewizard.cpp
+++ b/linden/indra/newview/llfloatervoicedevicesettings.cpp
@@ -1,7 +1,7 @@
 /** 
- * @file llfloatervoicewizard.cpp
+ * @file llfloatervoicedevicesettings.cpp
  * @author Richard Nelson
- * @brief Voice communication set-up wizard
+ * @brief Voice communication set-up 
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
@@ -32,8 +32,9 @@
  
 #include "llviewerprecompiledheaders.h"
 
-#include "llfloatervoicewizard.h"
+#include "llfloatervoicedevicesettings.h"
 
+// Viewer includes
 #include "llagent.h"
 #include "llbutton.h"
 #include "llcombobox.h"
@@ -42,184 +43,14 @@
 #include "llprefsvoice.h"
 #include "llsliderctrl.h"
 #include "llviewercontrol.h"
-#include "llvieweruictrlfactory.h"
 #include "llvoiceclient.h"
 #include "llimpanel.h"
 
-LLFloaterVoiceWizard::LLFloaterVoiceWizard(const LLSD& seed) : LLFloater("floater_voice_wizard"), mDevicePanel(NULL)
-{
-        mFactoryMap["device_settings"] = LLCallbackMap(createPanelDeviceSettings, this);
-        // do not automatically open singleton floaters (as result of getInstance())
-        BOOL no_open = FALSE;
-        gUICtrlFactory->buildFloater(this, "floater_voice_wizard.xml", &mFactoryMap, no_open);
-
-        mLogic = new LLPrefsVoiceLogic(this);
-        center();
-}
-
-LLFloaterVoiceWizard::~LLFloaterVoiceWizard()
-{
-        delete mLogic;
-        mLogic = NULL;
-}
-
-BOOL LLFloaterVoiceWizard::postBuild()
-{
-        childSetAction("next_btn", onClickNext, this);
-        childSetAction("back_btn", onClickBack, this);
-        childSetAction("ok_btn", onClickOK, this);
-        childSetAction("cancel_btn", onClickCancel, this);
-
-        childSetCommitCallback("voice_enable", onCommitVoiceEnable, this);
-
-        return TRUE;
-}
-
-void LLFloaterVoiceWizard::draw()
-{
-        mLogic->refresh();
-        if (mDevicePanel)
-        {
-                mDevicePanel->refresh();
-        }
-
-        LLTabContainer* tabs = LLUICtrlFactory::getTabContainerByName(this, "wizard_tabs");
-
-        if (tabs)
-        {
-                // if on first tab, disable back button, etc
-                if (tabs->getCurrentPanelIndex() == 0)
-                {
-                        if (gSavedSettings.getBOOL("EnableVoiceChat"))
-                        {
-                                childSetEnabled("next_btn", TRUE);
-                                setDefaultBtn(gUICtrlFactory->getButtonByName(this, "next_btn"));
-                        }
-                        else
-                        {
-                                childSetEnabled("next_btn", FALSE);
-                                setDefaultBtn(gUICtrlFactory->getButtonByName(this, "ok_btn"));
-                        }
-                        childSetEnabled("back_btn", FALSE);
-                }
-                else
-                {
-                        // if on any tab but the last, enable the next button
-                        if (tabs->getCurrentPanelIndex() < tabs->getTabCount() - 1)
-                        {
-                                childSetEnabled("next_btn", TRUE);
-                                setDefaultBtn(gUICtrlFactory->getButtonByName(this, "next_btn"));
-                        }
-                        else
-                        {
-                                childSetEnabled("next_btn", FALSE);
-                                setDefaultBtn(gUICtrlFactory->getButtonByName(this, "ok_btn"));
-                        }
-                        childSetEnabled("back_btn", TRUE);
-                }
-        }
-
-        // because we can simultaneously change voice settings from the preferences UI
-        // we need to stay in sync
-        childSetValue("voice_enable", gSavedSettings.getBOOL("EnableVoiceChat") ? "1" : "0");
-
-        // show appropriate text on first tab
-        childSetVisible("voice_intro_text3", !gSavedSettings.getBOOL("EnableVoiceChat"));
-        childSetVisible("voice_intro_text4", gSavedSettings.getBOOL("EnableVoiceChat"));
+// Library includes (after viewer)
+#include "lluictrlfactory.h"
 
-        LLFloater::draw();
-}
 
-void LLFloaterVoiceWizard::onOpen()
-{
-        LLFloaterDeviceSettings::hideInstance();
-
-        if(mDevicePanel)
-        {
-                mDevicePanel->onOpen();
-        }
-
-        LLFloater::onOpen();
-}
-
-void LLFloaterVoiceWizard::onClose(bool app_quitting)
-{
-        if(mDevicePanel)
-        {
-                mDevicePanel->onClose(app_quitting);
-        }
-
-        LLFloater::onClose(app_quitting);
-}
-
-
-// static
-void LLFloaterVoiceWizard::onClickNext(void *user_data)
-{
-        LLTabContainer* tabs = LLUICtrlFactory::getTabContainerByName((LLFloater*)user_data, "wizard_tabs");
-        if (tabs)
-        {
-                tabs->selectNextTab();
-        }
-}
-
-// static
-void LLFloaterVoiceWizard::onClickBack(void *user_data)
-{
-        LLTabContainer* tabs = LLUICtrlFactory::getTabContainerByName((LLFloater*)user_data, "wizard_tabs");
-        if (tabs)
-        {
-                tabs->selectPrevTab();
-        }
-}
-
-// static
-void LLFloaterVoiceWizard::onClickOK(void *user_data)
-{
-        LLFloaterVoiceWizard* self = (LLFloaterVoiceWizard*)user_data;
-
-        // propagate tuning mic volume to actual mic volume
-        self->mLogic->apply();
-        if (self->mDevicePanel)
-        {
-                self->mDevicePanel->apply();
-        }
-        self->close();
-}
-
-// static
-void LLFloaterVoiceWizard::onClickCancel(void *user_data)
-{
-        LLFloaterVoiceWizard* self = (LLFloaterVoiceWizard*)user_data;
-        
-        self->mLogic->cancel();
-        if (self->mDevicePanel)
-        {
-                self->mDevicePanel->cancel();
-        }
-        self->close();
-}
-
-// static
-void LLFloaterVoiceWizard::onCommitVoiceEnable(LLUICtrl* ctrl, void* user_data)
-{
-        gSavedSettings.setBOOL("EnableVoiceChat", ctrl->getValue().asInteger());
-}
-
-// static
-void* LLFloaterVoiceWizard::createPanelDeviceSettings(void* user_data)
-{
-        LLFloaterVoiceWizard* floaterp = (LLFloaterVoiceWizard*)user_data;
-        floaterp->mDevicePanel = new LLPanelDeviceSettings();
-        return floaterp->mDevicePanel;
-}
-
-
-//
-// LLPanelDeviceSettings
-//
-
-LLPanelDeviceSettings::LLPanelDeviceSettings()
+LLPanelVoiceDeviceSettings::LLPanelVoiceDeviceSettings()
 {
         mCtrlInputDevices = NULL;
         mCtrlOutputDevices = NULL;
@@ -235,18 +66,15 @@ LLPanelDeviceSettings::LLPanelDeviceSettings()
         //gVoiceClient->refreshDeviceLists();
 }
 
-LLPanelDeviceSettings::~LLPanelDeviceSettings()
+LLPanelVoiceDeviceSettings::~LLPanelVoiceDeviceSettings()
 {
 }
 
-BOOL LLPanelDeviceSettings::postBuild()
+BOOL LLPanelVoiceDeviceSettings::postBuild()
 {
-        LLSlider* volume_slider = gUICtrlFactory->getSliderBarByName(this, "mic_volume_slider");
-        if (volume_slider)
-        {
-                // set mic volume tuning slider based on last mic volume setting
-                volume_slider->setValue(mMicVolume);
-        }
+        LLSlider* volume_slider = getChild<LLSlider>("mic_volume_slider");
+        // set mic volume tuning slider based on last mic volume setting
+        volume_slider->setValue(mMicVolume);
 
         childSetCommitCallback("voice_input_device", onCommitInputDevice, this);
         childSetCommitCallback("voice_output_device", onCommitOutputDevice, this);
@@ -254,7 +82,7 @@ BOOL LLPanelDeviceSettings::postBuild()
         return TRUE;
 }
 
-void LLPanelDeviceSettings::draw()
+void LLPanelVoiceDeviceSettings::draw()
 {
         // let user know that volume indicator is not yet available
         childSetVisible("wait_text", !gVoiceClient->inTuningMode());
@@ -278,7 +106,7 @@ void LLPanelDeviceSettings::draw()
                 for(S32 power_bar_idx = 0; power_bar_idx < 5; power_bar_idx++)
                 {
                         LLString view_name = llformat("%s%d", "bar", power_bar_idx);
-                        LLView* bar_view = getChildByName(view_name, TRUE);
+                        LLView* bar_view = getChild<LLView>(view_name);
                         if (bar_view)
                         {
                                 if (power_bar_idx < discrete_power)
@@ -292,7 +120,7 @@ void LLPanelDeviceSettings::draw()
         }
 }
 
-void LLPanelDeviceSettings::apply()
+void LLPanelVoiceDeviceSettings::apply()
 {
         std::string s;
         if(mCtrlInputDevices)
@@ -311,7 +139,7 @@ void LLPanelDeviceSettings::apply()
         gSavedSettings.setF32("AudioLevelMic", mMicVolume);
 }
 
-void LLPanelDeviceSettings::cancel()
+void LLPanelVoiceDeviceSettings::cancel()
 {
         gSavedSettings.setString("VoiceInputAudioDevice", mInputDevice);
         gSavedSettings.setString("VoiceOutputAudioDevice", mOutputDevice);
@@ -323,20 +151,17 @@ void LLPanelDeviceSettings::cancel()
                 mCtrlOutputDevices->setSimple(mOutputDevice);
 }
 
-void LLPanelDeviceSettings::refresh()
+void LLPanelVoiceDeviceSettings::refresh()
 {
         //grab current volume
-        LLSlider* volume_slider = gUICtrlFactory->getSliderBarByName(this, "mic_volume_slider");
-        if (volume_slider)
-        {
-                // set mic volume tuning slider based on last mic volume setting
-                mMicVolume = (F32)volume_slider->getValue().asReal();
-                gVoiceClient->tuningSetMicVolume(mMicVolume);
-        }
+        LLSlider* volume_slider = getChild<LLSlider>("mic_volume_slider");
+        // set mic volume tuning slider based on last mic volume setting
+        mMicVolume = (F32)volume_slider->getValue().asReal();
+        gVoiceClient->tuningSetMicVolume(mMicVolume);
 
         // Fill in popup menus
-        mCtrlInputDevices = LLUICtrlFactory::getComboBoxByName(this, "voice_input_device");
-        mCtrlOutputDevices = LLUICtrlFactory::getComboBoxByName(this, "voice_output_device");
+        mCtrlInputDevices = getChild<LLComboBox>("voice_input_device");
+        mCtrlOutputDevices = getChild<LLComboBox>("voice_output_device");
 
         if(!gVoiceClient->deviceSettingsAvailable())
         {
@@ -398,7 +223,7 @@ void LLPanelDeviceSettings::refresh()
         }       
 }
 
-void LLPanelDeviceSettings::onOpen()
+void LLPanelVoiceDeviceSettings::onOpen()
 {
         mInputDevice = gSavedSettings.getString("VoiceInputAudioDevice");
         mOutputDevice = gSavedSettings.getString("VoiceOutputAudioDevice");
@@ -413,40 +238,39 @@ void LLPanelDeviceSettings::onOpen()
         LLVoiceChannel::suspend();
 }
 
-void LLPanelDeviceSettings::onClose(bool app_quitting)
+void LLPanelVoiceDeviceSettings::onClose(bool app_quitting)
 {
         gVoiceClient->tuningStop();
         LLVoiceChannel::resume();
 }
 
 // static
-void LLPanelDeviceSettings::onCommitInputDevice(LLUICtrl* ctrl, void* user_data)
+void LLPanelVoiceDeviceSettings::onCommitInputDevice(LLUICtrl* ctrl, void* user_data)
 {
         gSavedSettings.setString("VoiceInputAudioDevice", ctrl->getValue().asString());
 }
 
 // static
-void LLPanelDeviceSettings::onCommitOutputDevice(LLUICtrl* ctrl, void* user_data)
+void LLPanelVoiceDeviceSettings::onCommitOutputDevice(LLUICtrl* ctrl, void* user_data)
 {
         gSavedSettings.setString("VoiceOutputAudioDevice", ctrl->getValue().asString());
 }
 
 //
-// LLFloaterDeviceSettings
+// LLFloaterVoiceDeviceSettings
 //
 
-LLFloaterDeviceSettings::LLFloaterDeviceSettings(const LLSD& seed) : LLFloater("floater_device_settings"), mDevicePanel(NULL)
+LLFloaterVoiceDeviceSettings::LLFloaterVoiceDeviceSettings(const LLSD& seed) : LLFloater("floater_device_settings"), mDevicePanel(NULL)
 {
-        mFactoryMap["device_settings"] = LLCallbackMap(createPanelDeviceSettings, this);
+        mFactoryMap["device_settings"] = LLCallbackMap(createPanelVoiceDeviceSettings, this);
         // do not automatically open singleton floaters (as result of getInstance())
         BOOL no_open = FALSE;
-        gUICtrlFactory->buildFloater(this, "floater_device_settings.xml", &mFactoryMap, no_open);
+        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_device_settings.xml", &mFactoryMap, no_open);
         center();
 }
 
-void LLFloaterDeviceSettings::onOpen()
+void LLFloaterVoiceDeviceSettings::onOpen()
 {
-        LLFloaterVoiceWizard::hideInstance();
         if(mDevicePanel)
         {
                 mDevicePanel->onOpen();
@@ -455,7 +279,7 @@ void LLFloaterDeviceSettings::onOpen()
         LLFloater::onOpen();
 }
 
-void LLFloaterDeviceSettings::onClose(bool app_quitting)
+void LLFloaterVoiceDeviceSettings::onClose(bool app_quitting)
 {
         if(mDevicePanel)
         {
@@ -465,7 +289,7 @@ void LLFloaterDeviceSettings::onClose(bool app_quitting)
         setVisible(FALSE);
 }
 
-void LLFloaterDeviceSettings::apply()
+void LLFloaterVoiceDeviceSettings::apply()
 {
         if (mDevicePanel)
         {
@@ -473,7 +297,7 @@ void LLFloaterDeviceSettings::apply()
         }
 }
 
-void LLFloaterDeviceSettings::cancel()
+void LLFloaterVoiceDeviceSettings::cancel()
 {
         if (mDevicePanel)
         {
@@ -481,7 +305,7 @@ void LLFloaterDeviceSettings::cancel()
         }
 }
 
-void LLFloaterDeviceSettings::draw()
+void LLFloaterVoiceDeviceSettings::draw()
 {
         if (mDevicePanel)
         {
@@ -491,9 +315,9 @@ void LLFloaterDeviceSettings::draw()
 }
 
 // static
-void* LLFloaterDeviceSettings::createPanelDeviceSettings(void* user_data)
+void* LLFloaterVoiceDeviceSettings::createPanelVoiceDeviceSettings(void* user_data)
 {
-        LLFloaterDeviceSettings* floaterp = (LLFloaterDeviceSettings*)user_data;
-        floaterp->mDevicePanel = new LLPanelDeviceSettings();
+        LLFloaterVoiceDeviceSettings* floaterp = (LLFloaterVoiceDeviceSettings*)user_data;
+        floaterp->mDevicePanel = new LLPanelVoiceDeviceSettings();
         return floaterp->mDevicePanel;
 }