From 32b3ed0a1362a4b0798ad71fac3450fb77cb7e41 Mon Sep 17 00:00:00 2001
From: Thomas Groman <tgroman@nuegia.net>
Date: Thu, 19 Sep 2019 00:41:48 -0700
Subject: merged from 0.6.7 codebase

---
 application/pages/global/ProxyPage.cpp | 97 ++++++++++++++++++----------------
 1 file changed, 51 insertions(+), 46 deletions(-)

(limited to 'application/pages/global/ProxyPage.cpp')

diff --git a/application/pages/global/ProxyPage.cpp b/application/pages/global/ProxyPage.cpp
index 7dbcb860..ee56a54e 100644
--- a/application/pages/global/ProxyPage.cpp
+++ b/application/pages/global/ProxyPage.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,81 +16,86 @@
 #include "ProxyPage.h"
 #include "ui_ProxyPage.h"
 
+#include <QTabBar>
+
 #include "settings/SettingsObject.h"
 #include "MultiMC.h"
-#include <QTabBar>
+#include "Env.h"
 
 ProxyPage::ProxyPage(QWidget *parent) : QWidget(parent), ui(new Ui::ProxyPage)
 {
-	ui->setupUi(this);
-	ui->tabWidget->tabBar()->hide();
-	loadSettings();
-	updateCheckboxStuff();
+    ui->setupUi(this);
+    ui->tabWidget->tabBar()->hide();
+    loadSettings();
+    updateCheckboxStuff();
 
-	connect(ui->proxyGroup, SIGNAL(buttonClicked(int)), SLOT(proxyChanged(int)));
+    connect(ui->proxyGroup, SIGNAL(buttonClicked(int)), SLOT(proxyChanged(int)));
 }
 
 ProxyPage::~ProxyPage()
 {
-	delete ui;
+    delete ui;
 }
 
 bool ProxyPage::apply()
 {
-	applySettings();
-	return true;
+    applySettings();
+    return true;
 }
 
 void ProxyPage::updateCheckboxStuff()
 {
-	ui->proxyAddrBox->setEnabled(!ui->proxyNoneBtn->isChecked() &&
-								 !ui->proxyDefaultBtn->isChecked());
-	ui->proxyAuthBox->setEnabled(!ui->proxyNoneBtn->isChecked() &&
-								 !ui->proxyDefaultBtn->isChecked());
+    ui->proxyAddrBox->setEnabled(!ui->proxyNoneBtn->isChecked() &&
+                                 !ui->proxyDefaultBtn->isChecked());
+    ui->proxyAuthBox->setEnabled(!ui->proxyNoneBtn->isChecked() &&
+                                 !ui->proxyDefaultBtn->isChecked());
 }
 
 void ProxyPage::proxyChanged(int)
 {
-	updateCheckboxStuff();
+    updateCheckboxStuff();
 }
 
 void ProxyPage::applySettings()
 {
-	auto s = MMC->settings();
+    auto s = MMC->settings();
+
+    // Proxy
+    QString proxyType = "None";
+    if (ui->proxyDefaultBtn->isChecked())
+        proxyType = "Default";
+    else if (ui->proxyNoneBtn->isChecked())
+        proxyType = "None";
+    else if (ui->proxySOCKS5Btn->isChecked())
+        proxyType = "SOCKS5";
+    else if (ui->proxyHTTPBtn->isChecked())
+        proxyType = "HTTP";
 
-	// Proxy
-	QString proxyType = "None";
-	if (ui->proxyDefaultBtn->isChecked())
-		proxyType = "Default";
-	else if (ui->proxyNoneBtn->isChecked())
-		proxyType = "None";
-	else if (ui->proxySOCKS5Btn->isChecked())
-		proxyType = "SOCKS5";
-	else if (ui->proxyHTTPBtn->isChecked())
-		proxyType = "HTTP";
+    s->set("ProxyType", proxyType);
+    s->set("ProxyAddr", ui->proxyAddrEdit->text());
+    s->set("ProxyPort", ui->proxyPortEdit->value());
+    s->set("ProxyUser", ui->proxyUserEdit->text());
+    s->set("ProxyPass", ui->proxyPassEdit->text());
 
-	s->set("ProxyType", proxyType);
-	s->set("ProxyAddr", ui->proxyAddrEdit->text());
-	s->set("ProxyPort", ui->proxyPortEdit->value());
-	s->set("ProxyUser", ui->proxyUserEdit->text());
-	s->set("ProxyPass", ui->proxyPassEdit->text());
+    ENV.updateProxySettings(proxyType, ui->proxyAddrEdit->text(), ui->proxyPortEdit->value(),
+            ui->proxyUserEdit->text(), ui->proxyPassEdit->text());
 }
 void ProxyPage::loadSettings()
 {
-	auto s = MMC->settings();
-	// Proxy
-	QString proxyType = s->get("ProxyType").toString();
-	if (proxyType == "Default")
-		ui->proxyDefaultBtn->setChecked(true);
-	else if (proxyType == "None")
-		ui->proxyNoneBtn->setChecked(true);
-	else if (proxyType == "SOCKS5")
-		ui->proxySOCKS5Btn->setChecked(true);
-	else if (proxyType == "HTTP")
-		ui->proxyHTTPBtn->setChecked(true);
+    auto s = MMC->settings();
+    // Proxy
+    QString proxyType = s->get("ProxyType").toString();
+    if (proxyType == "Default")
+        ui->proxyDefaultBtn->setChecked(true);
+    else if (proxyType == "None")
+        ui->proxyNoneBtn->setChecked(true);
+    else if (proxyType == "SOCKS5")
+        ui->proxySOCKS5Btn->setChecked(true);
+    else if (proxyType == "HTTP")
+        ui->proxyHTTPBtn->setChecked(true);
 
-	ui->proxyAddrEdit->setText(s->get("ProxyAddr").toString());
-	ui->proxyPortEdit->setValue(s->get("ProxyPort").value<qint16>());
-	ui->proxyUserEdit->setText(s->get("ProxyUser").toString());
-	ui->proxyPassEdit->setText(s->get("ProxyPass").toString());
+    ui->proxyAddrEdit->setText(s->get("ProxyAddr").toString());
+    ui->proxyPortEdit->setValue(s->get("ProxyPort").value<qint16>());
+    ui->proxyUserEdit->setText(s->get("ProxyUser").toString());
+    ui->proxyPassEdit->setText(s->get("ProxyPass").toString());
 }
-- 
cgit v1.2.3