1 files changed, 32 insertions, 144 deletions

diff --git a/linden/indra/newview/llpanelweb.cpp b/linden/indra/newview/llpanelweb.cpp
index 13ed9bf..85ddc71 100644
--- a/linden/indra/newview/llpanelweb.cpp
+++ b/linden/indra/newview/llpanelweb.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -34,22 +34,12 @@
 // file include
 #include "llpanelweb.h"
 
-// linden library includes
-#include "llerror.h"
-#include "llrect.h"
-#include "llstring.h"
-
 // project includes
-#include "llbutton.h"
 #include "llcheckboxctrl.h"
-#include "lllineeditor.h"
-#include "llui.h"
+#include "llmediamanager.h"
 #include "lluictrlfactory.h"
 #include "llviewercontrol.h"
-#include "lluictrlfactory.h"
 #include "llviewerwindow.h"
-#include "llmediamanager.h"
-
 
 // helper functions for getting/freeing the web browser media
 // if creating/destroying these is too slow, we'll need to create
@@ -97,23 +87,21 @@ LLPanelWeb::LLPanelWeb()
 
 BOOL LLPanelWeb::postBuild()
 {
-        childSetAction( "clear_cache", onClickClearCache, this );
-        childSetAction( "clear_cookies", onClickClearCookies, this );
-        childSetCommitCallback("use_external_browser", onSelectBrowser, this );
-//      childSetEnabled( "connection_port", gSavedSettings.getBOOL( "CookiesEnabled" ) );
-        childSetCommitCallback( "cookies_enabled", onCommitCookies, this );
-        childSetCommitCallback( "web_proxy_editor", onCommitWebProxyAddress, this);
-        childSetCommitCallback( "web_proxy_port", onCommitWebProxyPort, this);
-        
-        childSetEnabled("web_proxy_editor", 
-                        gSavedSettings.getBOOL("BrowserProxyEnabled"));
-        childSetEnabled("web_proxy_port", 
-                        gSavedSettings.getBOOL("BrowserProxyEnabled"));
-        childSetEnabled("proxy_text_label", 
-                        gSavedSettings.getBOOL("BrowserProxyEnabled"));
+        childSetAction("clear_cache", onClickClearCache, this);
         childSetCommitCallback("web_proxy_enabled", onCommitWebProxyEnabled, this);
 
-        refresh();
+        std::string value = gSavedSettings.getBOOL("UseExternalBrowser") ? "external" : "internal";
+        childSetValue("use_external_browser", value);
+
+        childSetValue("cookies_enabled", gSavedSettings.getBOOL("CookiesEnabled"));
+
+        childSetValue("web_proxy_enabled", gSavedSettings.getBOOL("BrowserProxyEnabled"));
+        childSetValue("web_proxy_editor", gSavedSettings.getString("BrowserProxyAddress"));
+        childSetValue("web_proxy_port", gSavedSettings.getS32("BrowserProxyPort"));
+
+        childSetEnabled("proxy_text_label", gSavedSettings.getBOOL("BrowserProxyEnabled"));
+        childSetEnabled("web_proxy_editor", gSavedSettings.getBOOL("BrowserProxyEnabled"));
+        childSetEnabled("web_proxy_port", gSavedSettings.getBOOL("BrowserProxyEnabled"));
 
         return TRUE;
 }
@@ -127,50 +115,29 @@ LLPanelWeb::~LLPanelWeb()
 
 void LLPanelWeb::apply()
 {
-}
-
-void LLPanelWeb::refresh()
-{
-        LLPanel::refresh();
+        gSavedSettings.setBOOL("CookiesEnabled", childGetValue("cookies_enabled"));
+        gSavedSettings.setBOOL("BrowserProxyEnabled", childGetValue("web_proxy_enabled"));
+        gSavedSettings.setString("BrowserProxyAddress", childGetValue("web_proxy_editor"));
+        gSavedSettings.setS32("BrowserProxyPort", childGetValue("web_proxy_port"));
 
-        mCookiesEnabled = gSavedSettings.getBOOL("CookiesEnabled");
-        mWebProxyEnabled = gSavedSettings.getBOOL("BrowserProxyEnabled");
-        mWebProxyAddress = gSavedSettings.getString("BrowserProxyAddress");
-        mWebProxyPort =  gSavedSettings.getS32("BrowserProxyPort");
+        bool value = childGetValue("use_external_browser").asString() == "external" ? true : false;
+        gSavedSettings.setBOOL("UseExternalBrowser", value);
         
-        LLLineEditor* web_proxy_editor = getChild<LLLineEditor>("web_proxy_editor");
-        if (web_proxy_editor)
-        {
-                web_proxy_editor->setText( gSavedSettings.getString("BrowserProxyAddress") );
-        }
-        mExternalBrowser = gSavedSettings.getBOOL("UseExternalBrowser");
-
-        childSetValue("use_external_browser", mExternalBrowser ? "external" : "internal");
-
         LLMediaBase *media_source = get_web_media();
         if (media_source)
-                media_source->enableCookies(mCookiesEnabled);
-        free_web_media(media_source);
+        {
+                media_source->enableCookies(childGetValue("cookies_enabled"));
 
+                bool proxy_enable = childGetValue("web_proxy_enabled");
+                std::string proxy_address = childGetValue("web_proxy_editor");
+                int proxy_port = childGetValue("web_proxy_port");
+                media_source->enableProxy(proxy_enable, proxy_address, proxy_port);
+        }
+        free_web_media(media_source);
 }
 
 void LLPanelWeb::cancel()
 {
-        
-        gSavedSettings.setBOOL( "CookiesEnabled", mCookiesEnabled );
-        gSavedSettings.setBOOL( "BrowserProxyEnabled", mWebProxyEnabled );
-        gSavedSettings.setString( "BrowserProxyAddress", mWebProxyAddress );
-        gSavedSettings.setS32( "BrowserProxyPort", mWebProxyPort );
-
-        gSavedSettings.setBOOL("UseExternalBrowser", mExternalBrowser);
-        LLMediaBase *media_source = get_web_media();
-        if (media_source)
-        {
-                media_source->enableCookies(mCookiesEnabled);
-                media_source->enableProxy( mWebProxyEnabled, mWebProxyAddress, mWebProxyPort );
-        }
-        free_web_media(media_source);
-
 }
 
 // static
@@ -192,94 +159,15 @@ void LLPanelWeb::callback_clear_browser_cache(S32 option, void* userdata)
 }
 
 // static
-void LLPanelWeb::onClickClearCookies(void*)
-{
-        gViewerWindow->alertXml("ConfirmClearCookies", callback_clear_cookies, 0);
-}
-
-//static
-void LLPanelWeb::callback_clear_cookies(S32 option, void* userdata)
-{
-        if ( option == 0 ) // YES
-        {
-                LLMediaBase *media_source = get_web_media();
-                if (media_source)
-                        media_source->clearCookies();
-                free_web_media(media_source);
-        }
-}
-
-// static
-void LLPanelWeb::onCommitCookies(LLUICtrl* ctrl, void* data)
-{
-  LLPanelWeb* self = (LLPanelWeb*)data;
-  LLCheckBoxCtrl* check = (LLCheckBoxCtrl*)ctrl;
-
-  if (!self || !check) return;
-
-  LLMediaBase *media_source = get_web_media();
-  if (media_source)
-          media_source->enableCookies(check->get());
-  free_web_media(media_source);
-}
-// static
 void LLPanelWeb::onCommitWebProxyEnabled(LLUICtrl* ctrl, void* data)
 {
         LLPanelWeb* self = (LLPanelWeb*)data;
         LLCheckBoxCtrl* check = (LLCheckBoxCtrl*)ctrl;
 
         if (!self || !check) return;
-        self->childSetEnabled("web_proxy_editor", 
-                                check->get());
-        self->childSetEnabled("web_proxy_port", 
-                                check->get());
-        self->childSetEnabled("proxy_text_label", 
-                                check->get());
-                
-        LLMediaBase *media_source = get_web_media();
-        if (media_source)
-        {
-                media_source->enableProxy( gSavedSettings.getBOOL("BrowserProxyEnabled"), 
-                        gSavedSettings.getString("BrowserProxyAddress"), 
-                        gSavedSettings.getS32("BrowserProxyPort") );
-        }
-        free_web_media(media_source);
-
-}
-
-void LLPanelWeb::onCommitWebProxyAddress(LLUICtrl *ctrl, void *userdata)
-{
-  LLLineEditor* web_proxy = (LLLineEditor*)ctrl;
-
-  if (web_proxy)
-  {
-          gSavedSettings.setString("BrowserProxyAddress", web_proxy->getText());
-  }     
-  LLMediaBase *media_source = get_web_media();
-  if (media_source)
-  {
-          media_source->enableProxy( gSavedSettings.getBOOL("BrowserProxyEnabled"), 
-                  gSavedSettings.getString("BrowserProxyAddress"), 
-                  gSavedSettings.getS32("BrowserProxyPort") );
-  }
-  free_web_media(media_source);
-}
+        self->childSetEnabled("web_proxy_editor", check->get());
+        self->childSetEnabled("web_proxy_port", check->get());
+        self->childSetEnabled("proxy_text_label", check->get());
 
-void LLPanelWeb::onCommitWebProxyPort(LLUICtrl *ctrl, void *userdata)
-{
-        LLMediaBase *media_source = get_web_media();
-        if (media_source)
-        {
-                media_source->enableProxy( gSavedSettings.getBOOL("BrowserProxyEnabled"), 
-                        gSavedSettings.getString("BrowserProxyAddress"), 
-                        gSavedSettings.getS32("BrowserProxyPort") );
-        }
-        free_web_media(media_source);
-}
 
-// static 
-void LLPanelWeb::onSelectBrowser(LLUICtrl* ctrl, void* data)
-{
-        // "external" or "internal"
-        gSavedSettings.setBOOL("UseExternalBrowser", ctrl->getValue().asString() == "external");
 }